style(web_server.py): fix type in index()

refactor(web_server.py): redirect from / to /panel if logged in
refactor(web_server.py): render login.html instead of bare form in /login
2025-06-16 10:45:44 +02:00 · 2025-06-16 10:45:08 +02:00 · 2025-06-16 10:44:00 +02:00 · 2025-06-16 10:43:18 +02:00 · 2025-06-16 10:39:45 +02:00 · 2025-06-16 10:38:54 +02:00
9 changed files with 135 additions and 22 deletions
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -0,0 +1,22 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch Flask",
+            "type": "debugpy",
+            "request": "launch",
+            "module": "flask",
+            "env": {
+                "FLASK_APP": "judas_server/web/web_server.py",
+            },
+            "args": [
+                "run",
+            ],
+            "console": "internalConsole",
+            "justMyCode": true,
+        }
+    ]
+}
--- a/judas_server/web/static/css/style.css
+++ b/judas_server/web/static/css/style.css
@@ -4,6 +4,27 @@
    box-sizing: border-box;
 }

+body {
+    background-color: #b48ead;
+    font-family: monospace, sans-serif !important;
+    color: #eceff4;
+}
+
+input {
+    font-family: inherit;
+    color: #eceff4;
+    background-color: #434c5e;
+    border: none;
+    border-radius: 0.25rem;
+    padding: 0.25rem;
+}
+
+#wrapper {
+    display: flex;
+    flex-direction: column;
+    min-height: 100vh;
+}
+
 header {
    display: flex;
    justify-content: space-between;
@@ -14,7 +35,32 @@ header {
 }

 main {
-    padding: 2rem;
-    background-color: #eceff4;
-    color: #2e3440;
+    padding: 1rem;
+    background-color: #3b4252;
+    flex-grow: 1;
+}
+
+header a {
+    text-decoration: none;
+    color: #eceff4;
+}
+
+.button {
+    display: inline-block;
+    padding: 0.5rem 1rem;
+    background-color: #8fbcbb;
+    color: #2e3440;
+    border: none;
+    border-radius: 0.25rem;
+    text-decoration: none;
+    transition: 0.3s ease-in-out;
+}
+
+.button:hover {
+    background-color: #81a1c1;
+    cursor: pointer;
+}
+
+.center {
+    text-align: center;
 }
--- a/judas_server/web/templates/details.html
+++ b/judas_server/web/templates/details.html
@@ -9,8 +9,8 @@
 <body>
    <div id="wrapper">
        <header>
-            <h1><a href="{{ url_for('panel') }}">judas panel</a></h1>
-            <p>Welcome, {{ username }}! <a href="{{ url_for('logout') }}">Logout</a></p>
+            <h1><a href="{{ url_for('index') }}">judas</a></h1>
+            <p><a class="button" href="{{ url_for('logout') }}">Logout</a></p>
        </header>
        <main>
            <h2>Details for PC ID: {{ pc.id }}</h2>
--- a/judas_server/web/templates/index.html
+++ b/judas_server/web/templates/index.html
@@ -9,13 +9,41 @@
 <body>
    <div id="wrapper">
        <header>
-            <h1>judas</h1>
+            <h1><a href="{{ url_for('index') }}">judas</a></h1>
            {% if logged %}
            <p>Welcome, {{ username }}! <a href="{{ url_for('logout') }}">Logout</a></p>
            {% else %}
-            <p><a href="{{ url_for('login') }}">Login</a></p>
+            <p><a class="button" href="{{ url_for('login') }}">Login</a></p>
            {% endif %}
        </header>
+        <main class="center">
+            <p>Welcome to</p>
+            <h2 id="typing-text" style="font-size: 3rem;">judas</h2>
+            <p>a remote PC fleet management system</p>
+            <br>
+            <p style="color: #bf616a;"><strong>Notice:</strong> Please use this system responsibly and in accordance with all applicable laws and organizational policies.</p>
+            <p>Please log in to manage your remote PCs.</p>
+        </main>
    </div>
+    <script>
+        var i = 0;
+        var txt = document.getElementById("typing-text").innerHTML;
+        var minSpeed = 50;
+        var maxSpeed = 200;
+
+        document.getElementById("typing-text").innerHTML = "";
+
+        function typeWriter() {
+            if (i < txt.length) {
+                document.getElementById("typing-text").innerHTML += txt.charAt(i);
+                i++;
+
+                var randomDelay = Math.floor(Math.random() * (maxSpeed - minSpeed + 1)) + minSpeed;
+                setTimeout(typeWriter, randomDelay);
+            }
+        }
+
+        typeWriter();
+    </script>
 </body>
 </html>
--- a/judas_server/web/templates/login.html
+++ b/judas_server/web/templates/login.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>judas - login page</title>
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}">
+</head>
+<body>
+    <div id="wrapper">
+        <header>
+            <h1><a href="{{ url_for('index') }}">judas</a></h1>
+        </header>
+        <main class="center">
+            <form method="post">
+                <label for="password">Password:</label>
+                <input type="password" id="password" name="password" required>
+                <br><br>
+                <input type="submit" value="Login" class="button">
+            </form>
+        </main>
+    </div>
+</body>
+</html>
--- a/judas_server/web/templates/panel.html
+++ b/judas_server/web/templates/panel.html
@@ -9,8 +9,8 @@
 <body>
    <div id="wrapper">
        <header>
-            <h1><a href="{{ url_for('panel') }}">judas panel</a></h1>
-            <p>Welcome, {{ username }}! <a href="{{ url_for('logout') }}">Logout</a></p>
+            <h1><a href="{{ url_for('index') }}">judas</a></h1>
+            <p><a class="button" href="{{ url_for('logout') }}">Logout</a></p>
        </header>
        <main>
            <table border="1">
--- a/judas_server/web/templates/stream.html
+++ b/judas_server/web/templates/stream.html
@@ -8,8 +8,8 @@
 <body>
 <div id="wrapper">
    <header>
-        <h1><a href="{{ url_for('panel') }}">judas panel</a></h1>
-        <p>Welcome, {{ username }}! <a href="{{ url_for('logout') }}">Logout</a></p>
+        <h1><a href="{{ url_for('index') }}">judas</a></h1>
+        <p><a class="button" href="{{ url_for('logout') }}">Logout</a></p>
    </header>
 </div>
 </body>
--- a/judas_server/web/web_server.py
+++ b/judas_server/web/web_server.py
@@ -52,12 +52,10 @@ def load_user(user_id: str) -> User | None:


@app.route("/")
-def index() -> str:
+def index() -> flask.Response | str:
    """Renders the index page with a link to the login page."""
    if flask_login.current_user.is_authenticated:
-        return flask.render_template(
-            "index.html", logged=True, username=flask_login.current_user.id
-        )
+        return flask.redirect(flask.url_for("panel"))
    else:
        return flask.render_template(
            "index.html", logged=False, login_url=flask.url_for("login")
@@ -75,12 +73,7 @@ def login() -> str:
            return flask.redirect(flask.url_for("panel"))
        else:
            return "Invalid password", 401
-    return """
-        <form method="post">
-            Password: <input type="password" name="password">
-            <input type="submit" value="Login">
-        </form>
-    """
+    return flask.render_template("login.html")


@app.route("/logout")
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,7 +11,7 @@ readme = "README.md"
 license = {text = "GPL-3.0"}

 [tool.pdm.scripts]
-start = "flask --app judas_server/web/web_server.py run"
+web = "flask --app judas_server/web/web_server.py run"

 [tool.pdm]
 distribution = false
Author	SHA1	Message	Date
Artur Borecki	f3f521efe2	style(web_server.py): fix type in `index()`	2025-06-16 10:45:44 +02:00
Adam Kędryna	feb7a71816	refactor(web_server.py): redirect from `/` to `/panel` if logged in	2025-06-16 10:45:08 +02:00
Adam Kędryna	e15f02be05	refactor(web_server.py): render login.html instead of bare form in `/login`	2025-06-16 10:44:00 +02:00
Adam Kędryna	5031799072	feat(login.html): add basic login page	2025-06-16 10:43:18 +02:00
Adam Kędryna	26fac14802	refactor(stream.html): make logout button pretty and fix name in header	2025-06-16 10:39:45 +02:00
Adam Kędryna	75694f9200	refactor(details.html): make logout button pretty and fix name in header	2025-06-16 10:38:54 +02:00
Adam Kędryna	522c14793a	refactor(panel.html): make logout button pretty and fix name in header	2025-06-16 10:38:23 +02:00
Artur Borecki	9a074f17d8	style(index.html): add newline at end of file	2025-06-16 10:37:13 +02:00
Adam Kędryna	6ec1af2cf7	feat(index.html): add pretty typewriter effect to header on main	2025-06-16 10:36:46 +02:00
Adam Kędryna	ff911bc8bc	feat(index.html): add welcome text and a disclaimer	2025-06-16 10:36:14 +02:00
Adam Kędryna	446e5fbc04	feat(index.html): add link to homepage to app name in header	2025-06-16 10:34:52 +02:00
Adam Kędryna	04c46f1e98	refactor(style.css): add barebones stylesheet	2025-06-16 10:32:04 +02:00
Artur Borecki	2786f39b9b	chore(.vscode/launch.json): add launch task for flask app	2025-06-16 10:30:16 +02:00
Artur Borecki	ad479fe0d7	build(pyproject.toml): rename `start` script to `web`	2025-06-16 10:28:56 +02:00