All checks were successful
CD / Build and push images (push) Successful in 2m5s
CI / Lint, typecheck, test (push) Successful in 1m45s
CI / Auth e2e pack (push) Successful in 1m50s
CI / Build container images (push) Has been skipped
CD / Deploy to Test (push) Successful in 8s
CD / Smoke tests against Test (push) Successful in 1m11s
CD / Promote to Int (push) Successful in 10s
Backend: a generic maintenance-job scheduler (SchedulerService, `jobs` table) that any later maintenance job registers with instead of growing its own timer loop. Due-ness and the run-mutex both live in the DB row (`lastRunAt` survives a restart; claiming a due job is one atomic `UPDATE ... WHERE status != 'RUNNING'`), and an injectable ClockService lets tests simulate retention elapsing without waiting or faking the global clock. Trash endpoints: GET /ponds/:id/trash (list), POST /pages/:id/restore, DELETE /pages/:id/purge (manual, bypasses retention) — all sharing the same purge logic as the scheduled daily job (default 30-day retention, new trash.retentionDays instance setting). Purging deletes a page's content cache, update log, and attachment files/quota; page_versions is a placeholder until M3 exists. Direct navigation to a trashed page now 404s with a distinguishable `page_trashed` code for editors (a plain 404 for everyone else) instead of the generic not-found. Attachment.pageId — added in #27 but never wired up — now gets set on every page state save to whichever page's document currently embeds the file, which is what lets purge find a page's files. Frontend: a per-pond trash view (restore/purge), a "move to trash" action with confirmation in the page menu, and a trash link in the sidebar for pond owners. Also fixes react-query retrying 4xx responses for several seconds by default, which was masking the trash-hint 404 in the UI (and would have affected any other not-found/permission error the same way). Closes #31
51 lines
2.2 KiB
TypeScript
51 lines
2.2 KiB
TypeScript
import { Route, Routes } from 'react-router-dom';
|
|
|
|
import { RequireAnonymous, RequireAuth, RequireSiteAdmin } from './auth/guards';
|
|
import { AppLayout } from './layout/AppLayout';
|
|
import { AdminSettingsPage } from './pages/AdminSettingsPage';
|
|
import { HomePage } from './pages/HomePage';
|
|
import { NotFoundPage } from './pages/NotFoundPage';
|
|
import { PageEditorPage } from './pages/PageEditorPage';
|
|
import { PondHomePage } from './pages/PondHomePage';
|
|
import { SettingsPage } from './pages/SettingsPage';
|
|
import { TrashPage } from './pages/TrashPage';
|
|
import { ForgotPasswordPage } from './pages/auth/ForgotPasswordPage';
|
|
import { LoginPage } from './pages/auth/LoginPage';
|
|
import { ResetPasswordPage } from './pages/auth/ResetPasswordPage';
|
|
import { SignupPage } from './pages/auth/SignupPage';
|
|
import { VerifyEmailPage } from './pages/auth/VerifyEmailPage';
|
|
|
|
export function App(): React.JSX.Element {
|
|
return (
|
|
<Routes>
|
|
<Route element={<AppLayout />}>
|
|
<Route index element={<HomePage />} />
|
|
|
|
<Route element={<RequireAnonymous />}>
|
|
<Route path="login" element={<LoginPage />} />
|
|
<Route path="signup" element={<SignupPage />} />
|
|
<Route path="forgot-password" element={<ForgotPasswordPage />} />
|
|
</Route>
|
|
{/* Verify/reset work regardless of session state (mail links). */}
|
|
<Route path="verify-email" element={<VerifyEmailPage />} />
|
|
<Route path="reset-password" element={<ResetPasswordPage />} />
|
|
|
|
<Route element={<RequireAuth />}>
|
|
<Route path="settings" element={<SettingsPage />} />
|
|
<Route path="p/:pondSlug" element={<PondHomePage />} />
|
|
{/* Static segment "trash" wins react-router's ranking over the
|
|
dynamic :pageSlug sibling below — a page slugged "trash"
|
|
would be unreachable via direct URL, an accepted v1 gap. */}
|
|
<Route path="p/:pondSlug/trash" element={<TrashPage />} />
|
|
<Route path="p/:pondSlug/:pageSlug" element={<PageEditorPage />} />
|
|
</Route>
|
|
<Route element={<RequireSiteAdmin />}>
|
|
<Route path="admin" element={<AdminSettingsPage />} />
|
|
</Route>
|
|
|
|
<Route path="*" element={<NotFoundPage />} />
|
|
</Route>
|
|
</Routes>
|
|
);
|
|
}
|