John O'Keefe
f1a6de7cd7
Theme flash (admin pages, docs, stats, progress — anywhere SSR'd):
the JWT middlewares built the context user WITHOUT the Theme column,
so every page rendering theme-{user.Theme} from c.Get("user") painted
an empty class (:root tokyo-night default) and only settled on the real
theme after initializeTheme -> loadUserTheme round-tripped the server.
Both middlewares now carry liveUser.Theme into the context user;
verified live: /admin /stats /progress /docs /docs-deep /dashboard
/collections all SSR theme-hackerman.
Defense in depth for the same bug: loadTheme() no longer re-applies
localStorage over a server-rendered body theme (applyTheme records even
the default, so any signed-out visit baked tokyo-night into localStorage
and every signed-in page flipped to it post-paint). Public auth/landing
bodies dropped their hardcoded theme classes so ThemeFlashGuard's
pre-paint html class actually governs them; docs theme <select> now
syncs from the body class and re-syncs after the profile fetch.
Sidebar state (the unpleasant part): the app sidebar's openPanel was
reinitialized from the pathname on every load; it now restores from
localStorage ('sidebar-open-panel') with the pathname default as
fallback and -persists every toggle. Docs sidebar sections/groups
carry data-key attributes and toggleCollapsible persists collapsed
state per key ('docs-nav-state'); restoreDocsNav() applies it at init —
server-rendered defaults still govern first visit.
make test green; rendering ownership OK (no new inline scripts); 146
vitests pass; live-verified SSR classes on 7 pages.
75 lines
3.2 KiB
Templ
75 lines
3.2 KiB
Templ
package templates
|
|
|
|
templ Login(sessionExpired bool, deleted bool, registrationEnabled bool) {
|
|
<!DOCTYPE html>
|
|
<html lang="en">
|
|
<head>
|
|
@ThemeFlashGuard()
|
|
<meta charset="UTF-8"/>
|
|
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
|
|
<title>Login - Bookhoard</title>
|
|
<script src="/static/htmx.min.js"></script>
|
|
<script type="module" src="/static/main.js"></script>
|
|
<link href="/static/style.css" rel="stylesheet"/>
|
|
<link rel="icon" type="image/svg+xml" href="/static/favicon.svg"/>
|
|
</head>
|
|
<body class="min-h-screen" x-data="login" x-init="initLoginTheme()">
|
|
<div class="brand-gradient min-h-screen flex flex-col items-center justify-center p-4 relative">
|
|
<select
|
|
id="theme-select"
|
|
@change="changeTheme()"
|
|
class="input absolute top-4 right-4 w-auto py-1.5 pr-8 text-sm cursor-pointer"
|
|
aria-label="Theme"
|
|
>
|
|
<optgroup label="Dark">
|
|
for _, opt := range ThemeOptionsFor(ModeDark) {
|
|
<option value={ opt.Name }>{ opt.Label }</option>
|
|
}
|
|
</optgroup>
|
|
<optgroup label="Light">
|
|
for _, opt := range ThemeOptionsFor(ModeLight) {
|
|
<option value={ opt.Name }>{ opt.Label }</option>
|
|
}
|
|
</optgroup>
|
|
</select>
|
|
<div class="w-full max-w-sm">
|
|
<a href="/" class="flex items-center justify-center gap-2.5 mb-8">
|
|
<span class="text-3xl">📚</span>
|
|
<span class="text-2xl font-bold tracking-tight" style="color: var(--text-primary)">Bookhoard</span>
|
|
</a>
|
|
if sessionExpired {
|
|
<div class="mb-4 p-3 rounded-xl flex items-start gap-2" style="background-color: color-mix(in srgb, var(--accent) 14%, transparent); border: 1px solid var(--accent);">
|
|
@Icon("info", "h-5 w-5 shrink-0")
|
|
<p class="text-sm" style="color: var(--text-primary)">Your session has expired. Please log in again to continue.</p>
|
|
</div>
|
|
}
|
|
if deleted {
|
|
<div class="mb-4 p-3 rounded-xl flex items-start gap-2" style="background-color: color-mix(in srgb, var(--status-success) 14%, transparent); border: 1px solid var(--status-success);">
|
|
@Icon("check-circle", "h-5 w-5 shrink-0")
|
|
<p class="text-sm" style="color: var(--text-primary)">Your account has been deleted successfully.</p>
|
|
</div>
|
|
}
|
|
<form hx-post="/api/auth/login" hx-target="#result" hx-swap="innerHTML" class="card p-6 space-y-4">
|
|
<div>
|
|
<label class="block text-xs font-semibold uppercase tracking-wide mb-2" style="color: var(--text-secondary)">Email or Username</label>
|
|
<input type="text" name="login" class="input" required/>
|
|
</div>
|
|
<div>
|
|
<label class="block text-xs font-semibold uppercase tracking-wide mb-2" style="color: var(--text-secondary)">Password</label>
|
|
<input type="password" name="password" class="input" required/>
|
|
</div>
|
|
<button type="submit" class="btn btn-primary w-full py-2.5">Sign In</button>
|
|
</form>
|
|
<div id="result" class="mt-4 text-center text-sm"></div>
|
|
if registrationEnabled {
|
|
<p class="text-center mt-6 text-sm" style="color: var(--text-secondary)">
|
|
Don't have an account?
|
|
<a href="/register" class="font-medium hover:underline" style="color: var(--accent)">Sign up</a>
|
|
</p>
|
|
}
|
|
</div>
|
|
</div>
|
|
</body>
|
|
</html>
|
|
}
|