Un rafraîchissement (F5) sur /admin/monitoring affichait le JSON brut de
l'API au lieu de la page — même chose à craindre pour tout futur /admin/*
GET sans segment supplémentaire.
Cause : `server.mountRouter("/admin", adminRouter)` (app.ts) montait
l'API admin exactement sous /admin, la même racine que les pages
/admin/* d'apps/web, servies depuis la même origine/le même process en
prod (image Docker unique). Express matche par chemin, sans égard au
Accept — `GET /admin/monitoring` (route API) et la page du même nom
étaient en conflit direct ; l'API gagnait systématiquement (montée
avant serveStaticFrontend), donc chaque F5 sur cette page recevait le
JSON de l'API plutôt que index.html.
Seule /admin/monitoring collidait réellement aujourd'hui (seul
sous-routeur admin à répondre GET sur sa racine bare) mais le
mécanisme touche toute future route admin nommée comme sa page — d'où
un correctif structurel plutôt qu'un renommage ponctuel.
Correctif : l'API admin est montée sous /admin/api (app.ts), jamais
bare /admin. Toute la surface admin bouge en conséquence
(auth/metrics/monitoring/tech-steps/catalog) ; les pages front
(/admin/monitoring, /admin/catalogue, /admin/corrections...) sont
inchangées, seul admin-client.ts change de base URL. Mis à jour en
cohérence : commentaires JSDoc citant les routes (apps/api + apps/web +
packages/shared), specs/backend-architecture.md,
specs/batch-cooking-modele.md, les intercepts Cypress (globs + un
matcher regex qui avait échappé au premier passage) et les chemins
supertest du suite Mocha admin-*.test.ts.
Simplifie au passage admin-monitoring.cy.ts : le contournement
resourceType ajouté en #32 pour cette même collision n'a plus lieu
d'être une fois les chemins distincts (retour à un intercept déclaratif
simple) — le bug Cypress/Chrome qu'il avait mis au jour reste noté en
commentaire pour référence future.
Vérifié : pnpm lint clean ; build api+web clean ; suite e2e complète
28/28 fichiers, 116/116 tests verts (dont les 16 tests admin-*).
Suite Mocha apps/api non exécutable cette session (Postgres/Docker
injoignable) — chemins mis à jour mécaniquement en cohérence avec le
nouveau mount point, à faire tourner en CI/à la prochaine session avec
accès DB.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
167 lines
7.3 KiB
TypeScript
167 lines
7.3 KiB
TypeScript
import { Navigate, Outlet, Route, Routes } from "react-router-dom";
|
|
import { AdminAuthProvider } from "./features/admin/AdminAuthContext";
|
|
import { RequireAdmin } from "./features/admin/RequireAdmin";
|
|
import { RedirectIfAuthenticated } from "./features/auth/RedirectIfAuthenticated";
|
|
import { RequireAuth } from "./features/auth/RequireAuth";
|
|
import { AdminLayout } from "./layouts/AdminLayout";
|
|
import { AppLayout } from "./layouts/AppLayout";
|
|
import { CatalogPage as AdminCatalogPage } from "./pages/admin/catalog/CatalogPage";
|
|
import { CorrectionsPage as AdminCorrectionsPage } from "./pages/admin/corrections/CorrectionsPage";
|
|
import { DashboardPage as AdminDashboardPage } from "./pages/admin/dashboard/DashboardPage";
|
|
import { AdminLoginPage } from "./pages/admin/login/AdminLoginPage";
|
|
import { MonitoringPage as AdminMonitoringPage } from "./pages/admin/monitoring/MonitoringPage";
|
|
import { LoginPage } from "./pages/auth/LoginPage";
|
|
import { SignupPage } from "./pages/auth/SignupPage";
|
|
import { CookingSessionPage } from "./pages/cooking-session/CookingSessionPage";
|
|
import { OnboardingAllergensPage } from "./pages/onboarding/OnboardingAllergensPage";
|
|
import { OnboardingDietPage } from "./pages/onboarding/OnboardingDietPage";
|
|
import { OnboardingHouseholdPage } from "./pages/onboarding/OnboardingHouseholdPage";
|
|
import { OnboardingSourcesPage } from "./pages/onboarding/OnboardingSourcesPage";
|
|
import { PlanningPage } from "./pages/planning/PlanningPage";
|
|
import { ImportRecipePage } from "./pages/recipes/ImportRecipePage";
|
|
import { RecipeFormPage } from "./pages/recipes/RecipeFormPage";
|
|
import { RecipesPage } from "./pages/recipes/RecipesPage";
|
|
import { AccountSettingsPage } from "./pages/settings/AccountSettingsPage";
|
|
import { CreditsPage } from "./pages/settings/CreditsPage";
|
|
import { HouseholdSettingsPage } from "./pages/settings/HouseholdSettingsPage";
|
|
import { PreferencesPage } from "./pages/settings/PreferencesPage";
|
|
import { UserPreferencesPage } from "./pages/settings/UserPreferencesPage";
|
|
import { ShoppingListPage } from "./pages/shopping-list/ShoppingListPage";
|
|
|
|
/**
|
|
* Top-level route table. Every authenticated section is nested under one
|
|
* `RequireAuth` + `AppLayout` parent route (sidebar chrome + `/auth`
|
|
* guard applied once, not per-page — see {@link AppLayout}); `/login` and
|
|
* `/signup` redirect an already-logged-in visitor to `/` instead (see
|
|
* {@link RedirectIfAuthenticated}). Anything else falls back to `/`, which
|
|
* itself redirects to `/login` if needed.
|
|
*
|
|
* `/parametres/*` (compte/préférences alimentaires/foyer/préférences
|
|
* utilisateur/crédits) are the settings pages, reachable from the sidebar's
|
|
* bottom "Paramètres" menu and the account menu (see `AppLayout`) — nested under
|
|
* `AppLayout` like every other authenticated section. `/foyer` is the old,
|
|
* pre-split combined page's path; it now just redirects to
|
|
* `/parametres/foyer` so an existing bookmark/link keeps working.
|
|
*
|
|
* `/onboarding/*` (regime/foyer/sources/allergens, in that order) is also
|
|
* `RequireAuth`-gated — reached right after signup, once a session already
|
|
* exists — but deliberately its own top-level route group, *not* nested
|
|
* under `AppLayout`: a focused, distraction-free wizard with no sidebar,
|
|
* same full-page-card language as `/login`/`/signup` (see `onboarding.scss`).
|
|
* `/onboarding/sources` is conditional — only reached when the `foyer` step
|
|
* created/joined a household (see `OnboardingHouseholdPage`'s `goToNextStep`);
|
|
* skipped otherwise, straight to `/onboarding/allergenes`.
|
|
*
|
|
* `/admin/*` is the internal admin surface (metrics, monitoring, correction
|
|
* triage, off-catalog ingredient review). It's its own top-level group,
|
|
* wrapped in {@link AdminAuthProvider} so the `GET /admin/api/auth/me` session
|
|
* probe only runs under `/admin` — the admin session (cookie `admin_session`,
|
|
* `ADMIN_JWT_SECRET`) is entirely separate from the end-user one, so this is
|
|
* never nested under `RequireAuth`. `/admin/login` is the only
|
|
* unauthenticated admin route; everything else sits under `RequireAdmin` +
|
|
* `AdminLayout`.
|
|
*/
|
|
export function App() {
|
|
return (
|
|
<Routes>
|
|
<Route
|
|
element={
|
|
<RequireAuth>
|
|
<AppLayout />
|
|
</RequireAuth>
|
|
}
|
|
>
|
|
<Route path="/" element={<PlanningPage />} />
|
|
{/* Same component for both — a master-detail layout, not a
|
|
navigation to a separate page: the tab bar + table stay
|
|
mounted, only RecipesPage's detail panel changes with `:id`
|
|
(see RecipesPage.tsx). */}
|
|
<Route path="/recettes" element={<RecipesPage />} />
|
|
<Route path="/recettes/nouvelle" element={<RecipeFormPage />} />
|
|
<Route path="/recettes/importer/:sourceKey/:externalId" element={<ImportRecipePage />} />
|
|
<Route path="/recettes/sources/:sourceKey/:externalId" element={<RecipesPage />} />
|
|
<Route path="/recettes/:id" element={<RecipesPage />} />
|
|
<Route path="/recettes/:id/modifier" element={<RecipeFormPage />} />
|
|
<Route path="/liste-de-courses" element={<ShoppingListPage />} />
|
|
<Route path="/cuisiner" element={<CookingSessionPage />} />
|
|
<Route path="/parametres/compte" element={<AccountSettingsPage />} />
|
|
<Route path="/parametres/preferences" element={<PreferencesPage />} />
|
|
<Route path="/parametres/foyer" element={<HouseholdSettingsPage />} />
|
|
<Route path="/parametres/preferences-utilisateur" element={<UserPreferencesPage />} />
|
|
<Route path="/parametres/credits" element={<CreditsPage />} />
|
|
<Route path="/foyer" element={<Navigate to="/parametres/foyer" replace />} />
|
|
</Route>
|
|
<Route
|
|
path="/onboarding/regime"
|
|
element={
|
|
<RequireAuth>
|
|
<OnboardingDietPage />
|
|
</RequireAuth>
|
|
}
|
|
/>
|
|
<Route
|
|
path="/onboarding/foyer"
|
|
element={
|
|
<RequireAuth>
|
|
<OnboardingHouseholdPage />
|
|
</RequireAuth>
|
|
}
|
|
/>
|
|
<Route
|
|
path="/onboarding/sources"
|
|
element={
|
|
<RequireAuth>
|
|
<OnboardingSourcesPage />
|
|
</RequireAuth>
|
|
}
|
|
/>
|
|
<Route
|
|
path="/onboarding/allergenes"
|
|
element={
|
|
<RequireAuth>
|
|
<OnboardingAllergensPage />
|
|
</RequireAuth>
|
|
}
|
|
/>
|
|
<Route
|
|
path="/login"
|
|
element={
|
|
<RedirectIfAuthenticated>
|
|
<LoginPage />
|
|
</RedirectIfAuthenticated>
|
|
}
|
|
/>
|
|
<Route
|
|
path="/signup"
|
|
element={
|
|
<RedirectIfAuthenticated>
|
|
<SignupPage />
|
|
</RedirectIfAuthenticated>
|
|
}
|
|
/>
|
|
<Route
|
|
element={
|
|
<AdminAuthProvider>
|
|
<Outlet />
|
|
</AdminAuthProvider>
|
|
}
|
|
>
|
|
<Route path="/admin/login" element={<AdminLoginPage />} />
|
|
<Route
|
|
path="/admin"
|
|
element={
|
|
<RequireAdmin>
|
|
<AdminLayout />
|
|
</RequireAdmin>
|
|
}
|
|
>
|
|
<Route index element={<AdminDashboardPage />} />
|
|
<Route path="monitoring" element={<AdminMonitoringPage />} />
|
|
<Route path="corrections" element={<AdminCorrectionsPage />} />
|
|
<Route path="catalogue" element={<AdminCatalogPage />} />
|
|
</Route>
|
|
</Route>
|
|
<Route path="*" element={<Navigate to="/" replace />} />
|
|
</Routes>
|
|
);
|
|
}
|