From c83d7e03b607447cb203c0a17edaca9baf1d087f Mon Sep 17 00:00:00 2001
From: Syndamia <kamen@syndamia.com>
Date: Sun, 2 Feb 2025 12:34:53 +0200
Subject: feat(views): Move login and logout to session/create and
 session/delete

---
 controllers/login.php          | 31 -------------------------------
 controllers/session.php        | 31 +++++++++++++++++++++++++++++++
 views/global/router.php        |  8 ++++----
 views/login/index.php          | 23 -----------------------
 views/login/meta.php           |  4 ----
 views/logout/index.php         | 21 ---------------------
 views/logout/meta.php          |  4 ----
 views/session/create/index.php | 23 +++++++++++++++++++++++
 views/session/create/meta.php  |  4 ++++
 views/session/delete/index.php | 21 +++++++++++++++++++++
 views/session/delete/meta.php  |  4 ++++
 11 files changed, 87 insertions(+), 87 deletions(-)
 delete mode 100644 controllers/login.php
 create mode 100644 controllers/session.php
 delete mode 100644 views/login/index.php
 delete mode 100644 views/login/meta.php
 delete mode 100644 views/logout/index.php
 delete mode 100644 views/logout/meta.php
 create mode 100644 views/session/create/index.php
 create mode 100644 views/session/create/meta.php
 create mode 100644 views/session/delete/index.php
 create mode 100644 views/session/delete/meta.php

diff --git a/controllers/login.php b/controllers/login.php
deleted file mode 100644
index 179afe6..0000000
--- a/controllers/login.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-namespace Controller;
-use Database;
-use Exception;
-
-function on_post() {
-    global $user_status;
-    global $token;
-    $user_status = "";
-
-    try {
-        $user = Database\User::fromDB($_POST["username"]);
-        if (password_verify($_POST["password"], $user->Password)) {
-            $token = Database\Cookie::create($user->UID);
-        }
-        else {
-            $user_status = "Incorrect password!";
-        }
-    }
-    catch(Exception $e) {
-        $user_status = "User \"" . $_POST["username"] . "\" doesn't exist!";
-    }
-}
-
-function on_delete() {
-    global $TOKEN;
-    try {
-        Database\Cookie::delete($TOKEN);
-    }
-    catch(Exception $e) {}
-}
diff --git a/controllers/session.php b/controllers/session.php
new file mode 100644
index 0000000..179afe6
--- /dev/null
+++ b/controllers/session.php
@@ -0,0 +1,31 @@
+<?php
+namespace Controller;
+use Database;
+use Exception;
+
+function on_post() {
+    global $user_status;
+    global $token;
+    $user_status = "";
+
+    try {
+        $user = Database\User::fromDB($_POST["username"]);
+        if (password_verify($_POST["password"], $user->Password)) {
+            $token = Database\Cookie::create($user->UID);
+        }
+        else {
+            $user_status = "Incorrect password!";
+        }
+    }
+    catch(Exception $e) {
+        $user_status = "User \"" . $_POST["username"] . "\" doesn't exist!";
+    }
+}
+
+function on_delete() {
+    global $TOKEN;
+    try {
+        Database\Cookie::delete($TOKEN);
+    }
+    catch(Exception $e) {}
+}
diff --git a/views/global/router.php b/views/global/router.php
index c86f0f4..b668f33 100644
--- a/views/global/router.php
+++ b/views/global/router.php
@@ -37,8 +37,8 @@ function route_view() {
         case '/archive': return '/archive';
         case '/user': return '/user';
         case '/register': return '/user/create';
-        case '/login': return '/login';
-        case '/logout': return '/logout';
+        case '/login': return '/session/create';
+        case '/logout': return '/session/delete';
         case '/list': return '/list';
 
         case '/authenticate':
@@ -62,10 +62,10 @@ function redirect(string $href) {
     exit;
 }
 
-function require_login() {
+function require_login(string $redirect = '/login') {
     global $TOKEN;
     if ($TOKEN === '') {
-        redirect('/login');
+        redirect($redirect);
     }
 }
 
diff --git a/views/login/index.php b/views/login/index.php
deleted file mode 100644
index da0d8e2..0000000
--- a/views/login/index.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<h1>Login</h1>
-
-<hr class="new-section"/>
-
-<form action="#" method="POST" class="font-115 flex-col-centered max-width-20 center-margin">
-    <?php if (isset($user_status)): ?>
-        <?php if ($user_status !== ""): ?>
-            <p class="item error"><span>
-                <strong>Error:</strong> <?= $user_status ?>
-            </span></p>
-        <?php else: ?>
-            <script type="text/javascript">
-                cookieStorage.setItem("token", "<?= $token ?>");
-                window.location.href = "/";
-            </script>
-        <?php endif; ?>
-    <?php endif; ?>
-
-    <input type="text" name="username" placeholder="Username" minlength="1" pattern="[A-Za-z][A-Za-z_0-9]*">
-    <input type="password" name="password" placeholder="Password" minlength="4">
-    <input type="submit" value="Login">
-</form>
-
diff --git a/views/login/meta.php b/views/login/meta.php
deleted file mode 100644
index 06be3e8..0000000
--- a/views/login/meta.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$title = 'Login to your account';
-$controller = 'login';
diff --git a/views/logout/index.php b/views/logout/index.php
deleted file mode 100644
index 87878ed..0000000
--- a/views/logout/index.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<h2>Logging you out...</h2>
-
-<script type="text/javascript">
-    if (!cookieStorage.getItem('token')) {
-        window.location.href = '/';
-    }
-
-    function deleteToken(response) {
-        let request = new XMLHttpRequest();
-        request.onreadystatechange = function() {
-            if (request.readyState < 4) return;
-
-            window.location.href = '/';
-        }
-        request.open("DELETE", "#", true);
-        request.send(null);
-
-        cookieStorage.removeItem('token');
-    }
-    authenticated(deleteToken);
-</script>
diff --git a/views/logout/meta.php b/views/logout/meta.php
deleted file mode 100644
index be189c2..0000000
--- a/views/logout/meta.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$title = 'Logging out';
-$controller = 'login';
diff --git a/views/session/create/index.php b/views/session/create/index.php
new file mode 100644
index 0000000..da0d8e2
--- /dev/null
+++ b/views/session/create/index.php
@@ -0,0 +1,23 @@
+<h1>Login</h1>
+
+<hr class="new-section"/>
+
+<form action="#" method="POST" class="font-115 flex-col-centered max-width-20 center-margin">
+    <?php if (isset($user_status)): ?>
+        <?php if ($user_status !== ""): ?>
+            <p class="item error"><span>
+                <strong>Error:</strong> <?= $user_status ?>
+            </span></p>
+        <?php else: ?>
+            <script type="text/javascript">
+                cookieStorage.setItem("token", "<?= $token ?>");
+                window.location.href = "/";
+            </script>
+        <?php endif; ?>
+    <?php endif; ?>
+
+    <input type="text" name="username" placeholder="Username" minlength="1" pattern="[A-Za-z][A-Za-z_0-9]*">
+    <input type="password" name="password" placeholder="Password" minlength="4">
+    <input type="submit" value="Login">
+</form>
+
diff --git a/views/session/create/meta.php b/views/session/create/meta.php
new file mode 100644
index 0000000..aee959b
--- /dev/null
+++ b/views/session/create/meta.php
@@ -0,0 +1,4 @@
+<?php
+
+$title = 'Login to your account';
+$controller = 'session';
diff --git a/views/session/delete/index.php b/views/session/delete/index.php
new file mode 100644
index 0000000..065cde2
--- /dev/null
+++ b/views/session/delete/index.php
@@ -0,0 +1,21 @@
+<?php
+    require_login('/');
+?>
+
+<h2>Logging you out...</h2>
+
+<script type="text/javascript">
+    function deleteToken(response) {
+        let request = new XMLHttpRequest();
+        request.onreadystatechange = function() {
+            if (request.readyState < 4) return;
+
+            window.location.href = '/';
+        }
+        request.open("DELETE", "#", true);
+        request.send(null);
+
+        cookieStorage.removeItem('token');
+    }
+    authenticated(deleteToken);
+</script>
diff --git a/views/session/delete/meta.php b/views/session/delete/meta.php
new file mode 100644
index 0000000..acb2f46
--- /dev/null
+++ b/views/session/delete/meta.php
@@ -0,0 +1,4 @@
+<?php
+
+$title = 'Logging out';
+$controller = 'session';
-- 
cgit v1.2.3