Add username login and expiring reset links so accounts stay recoverable.
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
0277039b07
commit
89d149684e
24 files changed
+1595
-67
No files matched your search
+43
-11
@@ -1,5 +1,5 @@
|
||||
import { NavLink, Navigate, Outlet, Route, Routes, useLocation } from 'react-router-dom'
|
||||
import { LogOut } from 'lucide-react'
|
||||
import { LogOut, Settings } from 'lucide-react'
|
||||
import { useAuth } from './context/AuthContext.jsx'
|
||||
import { getMainNavItems } from './config/appNav.js'
|
||||
import LoginScreen from './pages/LoginScreen.jsx'
|
||||
@@ -13,6 +13,9 @@ import JournalDayPage from './pages/JournalDayPage.jsx'
|
||||
import JournalEditorPage from './pages/JournalEditorPage.jsx'
|
||||
import JournalSourcePage from './pages/JournalSourcePage.jsx'
|
||||
import SettingsPage from './pages/SettingsPage.jsx'
|
||||
import ForgotPasswordPage from './pages/ForgotPasswordPage.jsx'
|
||||
import ResetPasswordPage from './pages/ResetPasswordPage.jsx'
|
||||
import VerifyEmailPage from './pages/VerifyEmailPage.jsx'
|
||||
import AdminHomePage from './pages/AdminHomePage.jsx'
|
||||
import AdminUsersPage from './pages/AdminUsersPage.jsx'
|
||||
import AdminPromptsPage from './pages/AdminPromptsPage.jsx'
|
||||
@@ -33,8 +36,10 @@ function navItemActive(pathname, item, routerIsActive) {
|
||||
return routerIsActive
|
||||
}
|
||||
|
||||
function BottomNav({ isAdmin }) {
|
||||
const items = getMainNavItems(isAdmin)
|
||||
function BottomNav({ isAdmin, limited }) {
|
||||
const items = limited
|
||||
? [{ to: '/settings', label: 'Einstellungen', icon: Settings }]
|
||||
: getMainNavItems(isAdmin)
|
||||
const loc = useLocation()
|
||||
return (
|
||||
<nav className="bottom-nav">
|
||||
@@ -58,8 +63,10 @@ function BottomNav({ isAdmin }) {
|
||||
)
|
||||
}
|
||||
|
||||
function DesktopSidebar({ isAdmin, onLogout, name }) {
|
||||
const items = getMainNavItems(isAdmin)
|
||||
function DesktopSidebar({ isAdmin, onLogout, name, limited }) {
|
||||
const items = limited
|
||||
? [{ to: '/settings', label: 'Einstellungen', icon: Settings }]
|
||||
: getMainNavItems(isAdmin)
|
||||
const loc = useLocation()
|
||||
return (
|
||||
<aside className="desktop-sidebar">
|
||||
@@ -92,7 +99,7 @@ function DesktopSidebar({ isAdmin, onLogout, name }) {
|
||||
)
|
||||
}
|
||||
|
||||
function AppShell() {
|
||||
function AppShell({ limited = false }) {
|
||||
const { session, isAdmin, logout } = useAuth()
|
||||
const { confirmLeave } = useUnsavedChanges()
|
||||
const onLogout = () => {
|
||||
@@ -101,16 +108,19 @@ function AppShell() {
|
||||
}
|
||||
return (
|
||||
<div className="app-shell">
|
||||
<DesktopSidebar isAdmin={isAdmin} onLogout={onLogout} name={session?.profile?.name} />
|
||||
<DesktopSidebar isAdmin={isAdmin} onLogout={onLogout} name={session?.profile?.name} limited={limited} />
|
||||
<div className="app-main">
|
||||
<header className="mobile-header">
|
||||
<strong>Kanshō</strong>
|
||||
<button type="button" className="ghost" onClick={onLogout}>Abmelden</button>
|
||||
</header>
|
||||
<main className="page">
|
||||
{limited && (
|
||||
<p className="error">Die E-Mail-Adresse ist noch nicht bestätigt. Bis dahin bleibt nur der Kontobereich offen.</p>
|
||||
)}
|
||||
<Outlet />
|
||||
</main>
|
||||
<BottomNav isAdmin={isAdmin} />
|
||||
<BottomNav isAdmin={isAdmin} limited={limited} />
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
@@ -126,13 +136,24 @@ export default function App() {
|
||||
return <SetupScreen />
|
||||
}
|
||||
if (!session) {
|
||||
return <LoginScreen />
|
||||
return (
|
||||
<Routes>
|
||||
<Route path="/forgot-password" element={<ForgotPasswordPage />} />
|
||||
<Route path="/reset-password" element={<ResetPasswordPage />} />
|
||||
<Route path="/verify-email" element={<VerifyEmailPage />} />
|
||||
<Route path="*" element={<LoginScreen />} />
|
||||
</Routes>
|
||||
)
|
||||
}
|
||||
|
||||
const verified = Boolean(session.profile?.email_verified_at)
|
||||
|
||||
return (
|
||||
<UnsavedProvider>
|
||||
<Routes>
|
||||
<Route element={<AppShell />}>
|
||||
<Route element={<AppShell limited={!verified} />}>
|
||||
{verified ? (
|
||||
<>
|
||||
<Route path="/" element={<HomePage />} />
|
||||
<Route path="/journal" element={<JournalSpacesPage />} />
|
||||
<Route path="/journal/:spaceId" element={<JournalSpacePage />} />
|
||||
@@ -141,6 +162,9 @@ export default function App() {
|
||||
<Route path="/journal/:spaceId/:dayId/entry" element={<JournalEditorPage />} />
|
||||
<Route path="/journal/:spaceId/:dayId/source/:conversationId" element={<JournalSourcePage />} />
|
||||
<Route path="/settings" element={<SettingsPage />} />
|
||||
<Route path="/forgot-password" element={<ForgotPasswordPage />} />
|
||||
<Route path="/reset-password" element={<ResetPasswordPage />} />
|
||||
<Route path="/verify-email" element={<VerifyEmailPage />} />
|
||||
<Route element={<RequireAdmin />}>
|
||||
<Route path="/dialog" element={<DialoguePage />} />
|
||||
<Route path="/admin" element={<AdminShell />}>
|
||||
@@ -156,8 +180,16 @@ export default function App() {
|
||||
<Route path="debug" element={<AdminDebugPage />} />
|
||||
</Route>
|
||||
</Route>
|
||||
<Route path="*" element={<Navigate to="/" replace />} />
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<Route path="/settings" element={<SettingsPage />} />
|
||||
<Route path="/verify-email" element={<VerifyEmailPage />} />
|
||||
<Route path="*" element={<Navigate to="/settings" replace />} />
|
||||
</>
|
||||
)}
|
||||
</Route>
|
||||
<Route path="*" element={<Navigate to="/" replace />} />
|
||||
</Routes>
|
||||
</UnsavedProvider>
|
||||
)
|
||||
|
||||
@@ -89,6 +89,20 @@ export function AuthProvider({ children }) {
|
||||
setSession(null)
|
||||
}
|
||||
|
||||
const refreshProfile = async () => {
|
||||
const token = session?.token || localStorage.getItem(TOKEN_KEY)
|
||||
if (!token) return null
|
||||
const me = await fetch('/api/auth/me', { headers: { 'X-Auth-Token': token } })
|
||||
if (!me.ok) {
|
||||
localStorage.removeItem(TOKEN_KEY)
|
||||
setSession(null)
|
||||
return null
|
||||
}
|
||||
const profile = await me.json()
|
||||
setSession({ token, profile_id: profile.id, role: profile.role, profile })
|
||||
return profile
|
||||
}
|
||||
|
||||
return (
|
||||
<AuthContext.Provider value={{
|
||||
session,
|
||||
@@ -97,7 +111,8 @@ export function AuthProvider({ children }) {
|
||||
isAdmin: session?.role === 'admin',
|
||||
login,
|
||||
setup,
|
||||
logout
|
||||
logout,
|
||||
refreshProfile
|
||||
}}>
|
||||
{children}
|
||||
</AuthContext.Provider>
|
||||
|
||||
@@ -0,0 +1,112 @@
|
||||
import { useState } from 'react'
|
||||
import { api } from '../api.js'
|
||||
import { useAuth } from '../context/AuthContext.jsx'
|
||||
|
||||
function statusLabel(verified, pending) {
|
||||
if (pending) return `Bestätigung offen für ${pending}`
|
||||
return verified ? 'bestätigt' : 'nicht bestätigt'
|
||||
}
|
||||
|
||||
export default function AccountPanel() {
|
||||
const { session, refreshProfile } = useAuth()
|
||||
const profile = session?.profile || {}
|
||||
const [username, setUsername] = useState(profile.username || '')
|
||||
const [email, setEmail] = useState('')
|
||||
const [secondary, setSecondary] = useState('')
|
||||
const [password, setPassword] = useState('')
|
||||
const [message, setMessage] = useState('')
|
||||
const [error, setError] = useState('')
|
||||
const [busy, setBusy] = useState(false)
|
||||
|
||||
const save = async (body) => {
|
||||
setBusy(true)
|
||||
setError('')
|
||||
setMessage('')
|
||||
try {
|
||||
await api('/api/users/me', { token: session.token, method: 'PATCH', body })
|
||||
await refreshProfile()
|
||||
setMessage('Gespeichert.')
|
||||
setPassword('')
|
||||
setEmail('')
|
||||
setSecondary('')
|
||||
} catch (err) {
|
||||
setError(err.message)
|
||||
await refreshProfile()
|
||||
} finally {
|
||||
setBusy(false)
|
||||
}
|
||||
}
|
||||
|
||||
const resend = async (purpose) => {
|
||||
setBusy(true)
|
||||
setError('')
|
||||
setMessage('')
|
||||
try {
|
||||
await api('/api/auth/resend-verification', { token: session.token, method: 'POST', body: { purpose } })
|
||||
setMessage('Bestätigungslink wurde gesendet.')
|
||||
} catch (err) {
|
||||
setError(err.message)
|
||||
} finally {
|
||||
setBusy(false)
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="stack">
|
||||
<h2>Konto</h2>
|
||||
<p className="muted">
|
||||
Primäre E-Mail: {profile.email} ({statusLabel(profile.email_verified, profile.pending_email)})
|
||||
</p>
|
||||
<p className="muted">
|
||||
Zweite E-Mail: {profile.secondary_email || 'keine'} ({statusLabel(profile.secondary_email_verified, profile.pending_secondary_email)})
|
||||
</p>
|
||||
{message && <p>{message}</p>}
|
||||
{error && <p className="error">{error}</p>}
|
||||
<form className="stack" onSubmit={(event) => { event.preventDefault(); save({ username }) }}>
|
||||
<label>
|
||||
Benutzername
|
||||
<input value={username} onChange={(e) => setUsername(e.target.value)} autoComplete="username" />
|
||||
</label>
|
||||
<button type="submit" disabled={busy}>Benutzername speichern</button>
|
||||
</form>
|
||||
<form className="stack" onSubmit={(event) => { event.preventDefault(); save({ email }) }}>
|
||||
<label>
|
||||
Neue primäre E-Mail
|
||||
<input type="email" value={email} onChange={(e) => setEmail(e.target.value)} required />
|
||||
</label>
|
||||
<button type="submit" disabled={busy}>Bestätigung senden</button>
|
||||
</form>
|
||||
{(!profile.email_verified || profile.pending_email) && (
|
||||
<button type="button" className="ghost" disabled={busy} onClick={() => resend('primary')}>
|
||||
Bestätigung der primären E-Mail erneut senden
|
||||
</button>
|
||||
)}
|
||||
<form className="stack" onSubmit={(event) => { event.preventDefault(); save({ secondary_email: secondary }) }}>
|
||||
<label>
|
||||
Zweite E-Mail
|
||||
<input type="email" value={secondary} onChange={(e) => setSecondary(e.target.value)} placeholder={profile.secondary_email || ''} />
|
||||
</label>
|
||||
<div className="row-actions">
|
||||
<button type="submit" disabled={busy || !secondary.trim()}>Zweite E-Mail bestätigen lassen</button>
|
||||
{profile.secondary_email && (
|
||||
<button type="button" className="ghost" disabled={busy} onClick={() => save({ secondary_email: '' })}>
|
||||
Zweite E-Mail entfernen
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
</form>
|
||||
{(profile.pending_secondary_email || (profile.secondary_email && !profile.secondary_email_verified)) && (
|
||||
<button type="button" className="ghost" disabled={busy} onClick={() => resend('secondary')}>
|
||||
Bestätigung der zweiten E-Mail erneut senden
|
||||
</button>
|
||||
)}
|
||||
<form className="stack" onSubmit={(event) => { event.preventDefault(); save({ password }) }}>
|
||||
<label>
|
||||
Neues Passwort
|
||||
<input type="password" value={password} onChange={(e) => setPassword(e.target.value)} required minLength={4} />
|
||||
</label>
|
||||
<button type="submit" disabled={busy}>Passwort ändern</button>
|
||||
</form>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -2,24 +2,42 @@ import { useEffect, useState } from 'react'
|
||||
import { api } from '../api.js'
|
||||
import { useAuth } from '../context/AuthContext.jsx'
|
||||
|
||||
const emptyForm = { email: '', name: '', password: '', role: 'user' }
|
||||
const emptyForm = { email: '', name: '', password: '', role: 'user', username: '' }
|
||||
|
||||
function verifiedLabel(ok) {
|
||||
return ok ? 'bestätigt' : 'offen'
|
||||
}
|
||||
|
||||
export default function AdminUsersPage() {
|
||||
const { session } = useAuth()
|
||||
const [users, setUsers] = useState([])
|
||||
const [form, setForm] = useState(emptyForm)
|
||||
const [editId, setEditId] = useState('')
|
||||
const [edit, setEdit] = useState(null)
|
||||
const [error, setError] = useState('')
|
||||
const [message, setMessage] = useState('')
|
||||
|
||||
const load = () => api('/api/users', { token: session.token }).then(setUsers).catch((e) => setError(e.message))
|
||||
|
||||
useEffect(() => { load() }, [session.token])
|
||||
|
||||
const create = async (e) => {
|
||||
e.preventDefault()
|
||||
const activeAdmins = users.filter((user) => user.role === 'admin' && user.status === 'active').length
|
||||
|
||||
const create = async (event) => {
|
||||
event.preventDefault()
|
||||
setError('')
|
||||
setMessage('')
|
||||
try {
|
||||
await api('/api/users', { token: session.token, method: 'POST', body: form })
|
||||
const body = {
|
||||
email: form.email,
|
||||
name: form.name,
|
||||
password: form.password,
|
||||
role: form.role
|
||||
}
|
||||
if (form.username.trim()) body.username = form.username.trim()
|
||||
await api('/api/users', { token: session.token, method: 'POST', body })
|
||||
setForm(emptyForm)
|
||||
setMessage('Nutzer angelegt. Die primäre E-Mail muss noch bestätigt werden.')
|
||||
await load()
|
||||
} catch (err) {
|
||||
setError(err.message)
|
||||
@@ -28,6 +46,7 @@ export default function AdminUsersPage() {
|
||||
|
||||
const toggleStatus = async (user) => {
|
||||
setError('')
|
||||
setMessage('')
|
||||
try {
|
||||
await api(`/api/users/${user.id}`, {
|
||||
token: session.token,
|
||||
@@ -40,36 +59,145 @@ export default function AdminUsersPage() {
|
||||
}
|
||||
}
|
||||
|
||||
const changeRole = async (user, role) => {
|
||||
setError('')
|
||||
setMessage('')
|
||||
try {
|
||||
await api(`/api/users/${user.id}`, { token: session.token, method: 'PATCH', body: { role } })
|
||||
await load()
|
||||
} catch (err) {
|
||||
setError(err.message)
|
||||
}
|
||||
}
|
||||
|
||||
const openEdit = (user) => {
|
||||
setEditId(user.id)
|
||||
setEdit({
|
||||
username: user.username || '',
|
||||
email: '',
|
||||
secondary_email: ''
|
||||
})
|
||||
}
|
||||
|
||||
const saveEdit = async (event) => {
|
||||
event.preventDefault()
|
||||
setError('')
|
||||
setMessage('')
|
||||
const body = {}
|
||||
if (edit.username !== (users.find((user) => user.id === editId)?.username || '')) {
|
||||
body.username = edit.username
|
||||
}
|
||||
if (edit.email.trim()) body.email = edit.email.trim()
|
||||
if (edit.secondary_email.trim()) body.secondary_email = edit.secondary_email.trim()
|
||||
if (!Object.keys(body).length) return
|
||||
try {
|
||||
await api(`/api/users/${editId}`, { token: session.token, method: 'PATCH', body })
|
||||
setMessage('Gespeichert. Geänderte E-Mail-Adressen gelten erst nach der Bestätigung.')
|
||||
setEditId('')
|
||||
setEdit(null)
|
||||
await load()
|
||||
} catch (err) {
|
||||
setError(err.message)
|
||||
}
|
||||
}
|
||||
|
||||
const sendReset = async (user) => {
|
||||
setError('')
|
||||
setMessage('')
|
||||
try {
|
||||
await api(`/api/users/${user.id}/password-reset`, { token: session.token, method: 'POST' })
|
||||
setMessage(`Reset-Link für ${user.name} wurde gesendet.`)
|
||||
} catch (err) {
|
||||
setError(err.message)
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<section className="card">
|
||||
<h1>Nutzer</h1>
|
||||
<p className="muted">Ein Login ist ein Profil. Keine Profilumschaltung, kein Vereinsmodell.</p>
|
||||
<p className="muted">Ein Login ist ein Profil. Benutzername und zweite E-Mail gehören zu demselben Profil.</p>
|
||||
{error && <p className="error">{error}</p>}
|
||||
{message && <p>{message}</p>}
|
||||
<div className="table-scroll">
|
||||
<table className="plain">
|
||||
<thead>
|
||||
<tr><th>Name</th><th>E-Mail</th><th>Rolle</th><th>Status</th><th /></tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{users.map((user) => (
|
||||
<tr key={user.id}>
|
||||
<td>{user.name}</td>
|
||||
<td>{user.email}</td>
|
||||
<td>{user.role}</td>
|
||||
<td>{user.status}</td>
|
||||
<td>
|
||||
<button type="button" className="ghost" onClick={() => toggleStatus(user)}>
|
||||
{user.status === 'active' ? 'Deaktivieren' : 'Aktivieren'}
|
||||
</button>
|
||||
</td>
|
||||
<table className="plain">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<th>Benutzername</th>
|
||||
<th>E-Mail</th>
|
||||
<th>Zweite E-Mail</th>
|
||||
<th>Rolle</th>
|
||||
<th>Status</th>
|
||||
<th />
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
</thead>
|
||||
<tbody>
|
||||
{users.map((user) => {
|
||||
const lastAdmin = user.role === 'admin' && user.status === 'active' && activeAdmins < 2
|
||||
return (
|
||||
<tr key={user.id}>
|
||||
<td>{user.name}</td>
|
||||
<td>{user.username || '—'}</td>
|
||||
<td>
|
||||
{user.email}
|
||||
<div className="muted">{verifiedLabel(user.email_verified)}{user.pending_email ? ` · neu: ${user.pending_email}` : ''}</div>
|
||||
</td>
|
||||
<td>
|
||||
{user.secondary_email || '—'}
|
||||
<div className="muted">
|
||||
{user.secondary_email ? verifiedLabel(user.secondary_email_verified) : ''}
|
||||
{user.pending_secondary_email ? ` · neu: ${user.pending_secondary_email}` : ''}
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<select
|
||||
value={user.role}
|
||||
disabled={lastAdmin && user.role === 'admin'}
|
||||
onChange={(event) => changeRole(user, event.target.value)}
|
||||
>
|
||||
<option value="user">user</option>
|
||||
<option value="admin">admin</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>{user.status}</td>
|
||||
<td>
|
||||
<div className="row-actions">
|
||||
<button type="button" className="ghost" onClick={() => openEdit(user)}>Bearbeiten</button>
|
||||
<button
|
||||
type="button"
|
||||
className="ghost"
|
||||
disabled={user.id === session.profile_id}
|
||||
onClick={() => sendReset(user)}
|
||||
>
|
||||
Reset-Link
|
||||
</button>
|
||||
<button type="button" className="ghost" disabled={lastAdmin} onClick={() => toggleStatus(user)}>
|
||||
{user.status === 'active' ? 'Deaktivieren' : 'Aktivieren'}
|
||||
</button>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
)
|
||||
})}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
{edit && (
|
||||
<form className="stack" onSubmit={saveEdit}>
|
||||
<h2>Nutzer bearbeiten</h2>
|
||||
<label>Benutzername <input value={edit.username} onChange={(e) => setEdit({ ...edit, username: e.target.value })} /></label>
|
||||
<label>Neue primäre E-Mail <input type="email" value={edit.email} onChange={(e) => setEdit({ ...edit, email: e.target.value })} /></label>
|
||||
<label>Neue zweite E-Mail <input type="email" value={edit.secondary_email} onChange={(e) => setEdit({ ...edit, secondary_email: e.target.value })} /></label>
|
||||
<div className="row-actions">
|
||||
<button type="submit">Speichern</button>
|
||||
<button type="button" className="ghost" onClick={() => { setEdit(null); setEditId('') }}>Abbrechen</button>
|
||||
</div>
|
||||
</form>
|
||||
)}
|
||||
<form className="stack" onSubmit={create}>
|
||||
<h2>Nutzer anlegen</h2>
|
||||
<label>Name <input value={form.name} onChange={(e) => setForm({ ...form, name: e.target.value })} required /></label>
|
||||
<label>Benutzername <input value={form.username} onChange={(e) => setForm({ ...form, username: e.target.value })} /></label>
|
||||
<label>E-Mail <input type="email" value={form.email} onChange={(e) => setForm({ ...form, email: e.target.value })} required /></label>
|
||||
<label>Passwort <input type="password" value={form.password} onChange={(e) => setForm({ ...form, password: e.target.value })} required minLength={4} /></label>
|
||||
<label>
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
import { useState } from 'react'
|
||||
import { Link } from 'react-router-dom'
|
||||
import { api } from '../api.js'
|
||||
|
||||
export default function ForgotPasswordPage() {
|
||||
const [email, setEmail] = useState('')
|
||||
const [message, setMessage] = useState('')
|
||||
const [error, setError] = useState('')
|
||||
const [busy, setBusy] = useState(false)
|
||||
|
||||
const onSubmit = async (event) => {
|
||||
event.preventDefault()
|
||||
setBusy(true)
|
||||
setError('')
|
||||
setMessage('')
|
||||
try {
|
||||
const result = await api('/api/auth/forgot-password', { method: 'POST', body: { email } })
|
||||
setMessage(result.message || 'Wenn ein Konto existiert, wurde ein Link gesendet.')
|
||||
} catch (err) {
|
||||
setError(err.message)
|
||||
} finally {
|
||||
setBusy(false)
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="auth-screen">
|
||||
<form className="card" onSubmit={onSubmit}>
|
||||
<h1>Passwort vergessen</h1>
|
||||
<p>Gib die E-Mail-Adresse oder den Benutzernamen ein. Der Link gilt 60 Minuten.</p>
|
||||
<label>
|
||||
E-Mail oder Benutzername
|
||||
<input type="text" value={email} onChange={(e) => setEmail(e.target.value)} required autoComplete="username" />
|
||||
</label>
|
||||
{message && <p>{message}</p>}
|
||||
{error && <p className="error">{error}</p>}
|
||||
<button type="submit" disabled={busy}>{busy ? 'Sende …' : 'Link anfordern'}</button>
|
||||
<Link to="/">Zur Anmeldung</Link>
|
||||
</form>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
import { useState } from 'react'
|
||||
import { Link } from 'react-router-dom'
|
||||
import { useAuth } from '../context/AuthContext.jsx'
|
||||
|
||||
export default function LoginScreen() {
|
||||
@@ -27,8 +28,14 @@ export default function LoginScreen() {
|
||||
<h1>Kanshō</h1>
|
||||
<p>Anmelden, um den Reflexionsraum fortzusetzen.</p>
|
||||
<label>
|
||||
E-Mail
|
||||
<input type="email" value={email} onChange={(e) => setEmail(e.target.value)} required />
|
||||
E-Mail oder Benutzername
|
||||
<input
|
||||
type="text"
|
||||
autoComplete="username"
|
||||
value={email}
|
||||
onChange={(e) => setEmail(e.target.value)}
|
||||
required
|
||||
/>
|
||||
</label>
|
||||
<label>
|
||||
Passwort
|
||||
@@ -36,6 +43,7 @@ export default function LoginScreen() {
|
||||
</label>
|
||||
{error && <p className="error">{error}</p>}
|
||||
<button type="submit" disabled={busy}>{busy ? 'Prüfe …' : 'Anmelden'}</button>
|
||||
<Link to="/forgot-password">Passwort vergessen</Link>
|
||||
</form>
|
||||
</div>
|
||||
)
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
import { useState } from 'react'
|
||||
import { Link, useSearchParams } from 'react-router-dom'
|
||||
import { api } from '../api.js'
|
||||
|
||||
export default function ResetPasswordPage() {
|
||||
const [params] = useSearchParams()
|
||||
const [password, setPassword] = useState('')
|
||||
const [message, setMessage] = useState('')
|
||||
const [error, setError] = useState('')
|
||||
const [busy, setBusy] = useState(false)
|
||||
const token = params.get('token') || ''
|
||||
|
||||
const onSubmit = async (event) => {
|
||||
event.preventDefault()
|
||||
setBusy(true)
|
||||
setError('')
|
||||
try {
|
||||
await api('/api/auth/reset-password', { method: 'POST', body: { token, password } })
|
||||
setMessage('Das Passwort ist geändert. Du kannst dich neu anmelden.')
|
||||
} catch (err) {
|
||||
setError(err.message)
|
||||
} finally {
|
||||
setBusy(false)
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="auth-screen">
|
||||
<form className="card" onSubmit={onSubmit}>
|
||||
<h1>Neues Passwort</h1>
|
||||
{!token && <p className="error">Der Link enthält kein Token.</p>}
|
||||
<label>
|
||||
Neues Passwort
|
||||
<input type="password" value={password} onChange={(e) => setPassword(e.target.value)} required minLength={4} />
|
||||
</label>
|
||||
{message && <p>{message}</p>}
|
||||
{error && <p className="error">{error}</p>}
|
||||
<button type="submit" disabled={busy || !token}>{busy ? 'Speichere …' : 'Passwort setzen'}</button>
|
||||
<Link to="/">Zur Anmeldung</Link>
|
||||
</form>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
import { useEffect, useId, useState } from 'react'
|
||||
import { useAuth } from '../context/AuthContext.jsx'
|
||||
import { api } from '../api.js'
|
||||
import AccountPanel from './AccountPanel.jsx'
|
||||
|
||||
const KIND_LABELS = {
|
||||
journal_entry: 'Finale Fassung (Stimme)',
|
||||
@@ -456,6 +457,9 @@ export default function SettingsPage() {
|
||||
return (
|
||||
<section className="card">
|
||||
<h1>Einstellungen</h1>
|
||||
<AccountPanel />
|
||||
{session?.profile?.email_verified_at ? (
|
||||
<>
|
||||
<dl className="meta">
|
||||
<dt>Name</dt>
|
||||
<dd>{session?.profile?.name}</dd>
|
||||
@@ -815,6 +819,10 @@ export default function SettingsPage() {
|
||||
}}
|
||||
onError={setError}
|
||||
/>
|
||||
</>
|
||||
) : (
|
||||
<p className="muted">Bitte bestätige zuerst deine E-Mail-Adresse. Danach steht der Reflexionsraum wieder zur Verfügung.</p>
|
||||
)}
|
||||
</section>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
import { useState } from 'react'
|
||||
import { Link, useSearchParams } from 'react-router-dom'
|
||||
import { api } from '../api.js'
|
||||
import { useAuth } from '../context/AuthContext.jsx'
|
||||
|
||||
export default function VerifyEmailPage() {
|
||||
const [params] = useSearchParams()
|
||||
const { session, refreshProfile } = useAuth()
|
||||
const [message, setMessage] = useState('')
|
||||
const [error, setError] = useState('')
|
||||
const [busy, setBusy] = useState(false)
|
||||
const token = params.get('token') || ''
|
||||
|
||||
const confirm = async (event) => {
|
||||
event.preventDefault()
|
||||
setBusy(true)
|
||||
setError('')
|
||||
try {
|
||||
await api('/api/auth/verify-email', { method: 'POST', body: { token } })
|
||||
if (session?.token) await refreshProfile()
|
||||
setMessage('Die E-Mail-Adresse ist bestätigt.')
|
||||
} catch (err) {
|
||||
setError(err.message)
|
||||
} finally {
|
||||
setBusy(false)
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="auth-screen">
|
||||
<form className="card" onSubmit={confirm}>
|
||||
<h1>E-Mail bestätigen</h1>
|
||||
{!token && <p className="error">Der Link enthält kein Token.</p>}
|
||||
<p>Der Link gilt 24 Stunden und kann nur einmal verwendet werden.</p>
|
||||
{message && <p>{message}</p>}
|
||||
{error && <p className="error">{error}</p>}
|
||||
<button type="submit" disabled={busy || !token}>{busy ? 'Prüfe …' : 'Adresse bestätigen'}</button>
|
||||
<Link to={session ? '/settings' : '/'}>{session ? 'Zum Konto' : 'Zur Anmeldung'}</Link>
|
||||
</form>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
Reference in new issue
Block a user