Fix login flow after rollback

This commit is contained in:
adminsopel
2026-05-01 10:13:50 +02:00
parent 96e1fb2a4e
commit 096bd5976b
9 changed files with 22 additions and 759 deletions

View File

@@ -155,7 +155,7 @@ $('#loginForm').addEventListener('submit', async e=>{
e.preventDefault();
$('#loginError').textContent = '';
const fd = new FormData(e.currentTarget);
try { await api('/api/login', {method:'POST', body: JSON.stringify(Object.fromEntries(fd))}); await init(); }
try { await api('/api/login', {method:'POST', body: JSON.stringify(Object.fromEntries(fd))}); window.location.href = '/'; return; }
catch(err){ $('#loginError').textContent = err.message; }
});
$('#logoutBtn').addEventListener('click', async()=>{ await api('/api/logout',{method:'POST',body:'{}'}); location.reload(); });
@@ -221,94 +221,3 @@ $('#rejectPhotoBtn').addEventListener('click', async()=>{
});
init();
function renderAccountView() {
const main = document.querySelector("#content") || document.querySelector("main") || document.querySelector(".main");
if (!main) return;
const user = state.user || {};
main.innerHTML = `
<div class="header">
<h1>Moje konto</h1>
<p>Zmień swoje hasło i sprawdź informacje o koncie.</p>
</div>
<div class="card account-card" style="padding:24px;margin-top:24px;">
<h2>Dane konta</h2>
<div class="list-row"><strong>Login</strong><span>${escapeHtml(user.username || '')}</span></div>
<div class="list-row"><strong>Nazwa</strong><span>${escapeHtml(user.display_name || '')}</span></div>
<div class="list-row"><strong>Rola</strong><span>${escapeHtml(user.role || '')}</span></div>
</div>
<div class="card account-card" style="padding:24px;margin-top:18px;">
<h2>Zmiana hasła</h2>
<form id="changePasswordForm">
<div class="field">
<label>Obecne hasło</label>
<input name="current_password" type="password" required />
</div>
<div class="field">
<label>Nowe hasło</label>
<input name="new_password" type="password" minlength="8" required />
</div>
<div class="field">
<label>Powtórz nowe hasło</label>
<input name="repeat_password" type="password" minlength="8" required />
</div>
<div class="form-error" id="changePasswordError"></div>
<button class="primary-btn" type="submit" style="margin-top:16px;">Zmień hasło</button>
</form>
</div>
`;
document.querySelector("#changePasswordForm")?.addEventListener("submit", async (e) => {
e.preventDefault();
const fd = new FormData(e.currentTarget);
const current_password = fd.get("current_password");
const new_password = fd.get("new_password");
const repeat_password = fd.get("repeat_password");
const err = document.querySelector("#changePasswordError");
if (new_password !== repeat_password) {
err.textContent = "Nowe hasła nie są takie same.";
return;
}
try {
const res = await api("/api/me/password", {
method: "POST",
body: JSON.stringify({ current_password, new_password })
});
if (!res.ok) {
err.textContent = res.error || "Nie udało się zmienić hasła.";
return;
}
err.style.color = "#16a34a";
err.textContent = "Hasło zostało zmienione.";
e.currentTarget.reset();
} catch (ex) {
err.textContent = "Błąd połączenia z serwerem.";
}
});
}
function escapeHtml(value) {
return String(value ?? "")
.replaceAll("&", "&amp;")
.replaceAll("<", "&lt;")
.replaceAll(">", "&gt;")
.replaceAll('"', "&quot;")
.replaceAll("'", "&#039;");
}
document.addEventListener("click", (e) => {
const btn = e.target.closest("[data-view='account']");
if (!btn) return;
e.preventDefault();
state.currentView = "account";
document.querySelectorAll(".nav-btn").forEach(b => b.classList.remove("active"));
btn.classList.add("active");
renderAccountView();
});

View File

@@ -4,15 +4,15 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>Albumik</title>
<link rel="stylesheet" href="/styles.css" />
<link rel="stylesheet" href="styles.css" />
</head>
<body>
<div id="login" class="login-shell hidden">
<div class="login-card">
<img class="login-logo-small" src="/assets/albumik-logo.png" alt="Albumik" />
<div class="brand-badge">A</div>
<h1>Albumik</h1>
<p>Lekki prywatny album zdjęć na Twoim serwerze.</p>
<form id="loginForm">
<form id="loginForm" method="post">
<label>Login</label>
<input name="username" autocomplete="username" placeholder="admin" required />
<label>Hasło</label>
@@ -21,7 +21,6 @@
<div id="loginError" class="error-line"></div>
</form>
</div>
</section>
</div>
<div id="app" class="app hidden">
@@ -40,8 +39,7 @@
<button class="nav-item" data-view="tags"><span>Tagi</span></button>
<button class="nav-item admin-only" data-view="users"><span>Użytkownicy</span></button>
<button class="nav-item admin-only" data-view="logs"><span>Dziennik</span></button>
<button class="nav-btn" data-view="account">Moje konto</button>
</nav>
</nav>
<div class="sidebar-footer">
<div id="currentUser" class="current-user"></div>
<button id="logoutBtn" class="ghost-btn">Wyloguj</button>
@@ -192,6 +190,6 @@
</div>
</dialog>
<script src="/app.js"></script>
<script src="app.js"></script>
</body>
</html>

File diff suppressed because one or more lines are too long