4 files changed, 67 insertions, 20 deletions

diff --git a/management/endpoints.py b/management/endpoints.py
index 47602d6..ef44114 100644
--- a/management/endpoints.py
+++ b/management/endpoints.py
@@ -1,7 +1,9 @@
+from functools import wraps
+from urllib.parse import urlencode
+
 from fastapi import FastAPI, Request
 from sqlalchemy import func
 from sqlmodel import select
-from starlette.authentication import requires
 from starlette.middleware.authentication import AuthenticationMiddleware
 from starlette.middleware.sessions import SessionMiddleware
 from starlette.responses import RedirectResponse
@@ -21,6 +23,20 @@ templates = Jinja2Templates(directory=[
     'management/templates'
 ])
 
+
+def requires_session(func):
+    """Redirects to an absolute login URL instead of Starlette's `requires(redirect=...)`,
+    which resolves the redirect target via `request.url_for()` against whichever router is
+    bound into `request.scope` -- a lookup that only reaches `authentication`'s routes when
+    `management` happens to be mounted under a shared root app."""
+    @wraps(func)
+    async def wrapper(request: Request, *args, **kwargs):
+        if not {'authenticated', 'session'}.issubset(request.auth.scopes):
+            next_param = urlencode({'next': str(request.url)})
+            return RedirectResponse(f'/auth/login/?{next_param}', status_code=303)
+        return await func(request, *args, **kwargs)
+    return wrapper
+
 @management.get('/')
 async def index(request: Request):
     with get_session_context() as session:
@@ -34,12 +50,12 @@ async def index(request: Request):
 
 
 @management.get('/dashboard/')
-@requires(['authenticated', 'session'], redirect='get_login')
+@requires_session
 async def dashboard(request: Request):
     return templates.TemplateResponse(request, 'dashboard.html')
 
 @management.get('/users/')
-@requires(['authenticated', 'session'], redirect='get_login')
+@requires_session
 async def users(request: Request):
     with get_session_context() as session:
         query = select(User)
diff --git a/management/templates/base.html b/management/templates/base.html
index 0b9da11..7ba0adb 100644
--- a/management/templates/base.html
+++ b/management/templates/base.html
@@ -1,7 +1,18 @@
 {% extends 'global.html' %}
+{% import 'macros.html' as ui %}
 {% block template %}
-    <nav>
-        <a href="/auth/logout/">Logout</a>
+    <nav class="nav">
+        <div class="nav__brand">{{ ui.connector_icon(18) }} ttun</div>
+        <div class="nav__links">
+            <a class="nav__link{% if request.url.path == '/management/dashboard/' %} nav__link--active{% endif %}" href="/management/dashboard/">Dashboard</a>
+            <a class="nav__link{% if request.url.path == '/management/users/' %} nav__link--active{% endif %}" href="/management/users/">Users</a>
+        </div>
+        <div class="nav__actions">
+            {{ ui.status_badge('Session active', 'good') }}
+            <a class="nav__link" href="/auth/logout/">Sign out</a>
+        </div>
     </nav>
-    {% block content %}{% endblock %}
+    <div class="content">
+        {% block content %}{% endblock %}
+    </div>
 {% endblock %}
diff --git a/management/templates/dashboard.html b/management/templates/dashboard.html
index 201aa48..4babba9 100644
--- a/management/templates/dashboard.html
+++ b/management/templates/dashboard.html
@@ -1,9 +1,13 @@
 {% extends 'base.html' %}
-
 {% block content %}
-<div>
-    <ul>
-        <li><a href="/management/users/">Users</a></li>
-    </ul>
-</div>
+    <div class="content__header">
+        <span class="eyebrow">Dashboard</span>
+        <h1>Manage this server</h1>
+    </div>
+    <div class="module-grid">
+        <a class="module-card" href="/management/users/">
+            <div class="module-card__title">Users</div>
+            <p class="module-card__desc">Manage who can sign in to this server.</p>
+        </a>
+    </div>
 {% endblock %}
diff --git a/management/templates/users.html b/management/templates/users.html
index 272d2b4..3cf9103 100644
--- a/management/templates/users.html
+++ b/management/templates/users.html
@@ -1,11 +1,27 @@
 {% extends 'base.html' %}
-
 {% block content %}
-<div>
-    <ul>
-        {% for user in users %}
-            <li>{{ user.username }}</li>
-        {% endfor %}
-    </ul>
-</div>
+    <div class="content__header">
+        <span class="eyebrow">{{ users|length }} account{{ 's' if users|length != 1 else '' }}</span>
+        <h1>Users</h1>
+    </div>
+    <div class="table-wrap">
+        <table>
+            <thead>
+                <tr>
+                    <th>Username</th>
+                    <th>Email</th>
+                    <th>Created</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for user in users %}
+                    <tr>
+                        <td>{{ user.username }}</td>
+                        <td>{{ user.email }}</td>
+                        <td class="muted">{{ user.created.strftime('%Y-%m-%d %H:%M') }}</td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
 {% endblock %}