23d6379be8
Groundwork for the Car Wash pilot (wiki/decisions/venue-modules.md, build-order
steps 1 + 3). No Car Wash code yet; validation is the first module behind the
seam, unchanged in behaviour.
- @parking/shared: MODULE_IDS, ModuleManifest, MODULES (parking required;
validation dependsOn parking), parseEntitledModules / resolveModuleActivation
/ effectiveModules as pure functions.
- DB: site_config.modules_json (migration 0026, hand-written + journal;
additive, nullable = everything entitled).
- Server: modules.ts (entitledModules from MODULES_ENTITLED env, activated
from site_config, effective set, requireModule preHandler → 403
module_disabled); modules/index.ts registers folder-based modules by
iterating the registry (modules/validation); site-config GET exposes
modules/modulesEntitled/modulesActivated, PUT takes the full desired set,
enforces entitlement + dependency rules (400 with reason) and signs one
config_change per module that actually flips; /api/auth/me carries the
effective set; validation routes guarded requireModule → requirePermission.
- Web: lib/modules.ts + modules/{index,validation}; router.tsx spreads
WEB_MODULES into nav + route tree (validate route no longer named there);
Setup → Site "Modules" panel (required shown disabled, dependencies as
hints, server refusal shown verbatim); validation sections + programs fetch
gated on the module; App invalidates the router whenever the session
changes (route-context consumers only re-read on navigation — the nav was
stale after a flip, and after every other setUser too).
- Lavazh validation station retired (STATIONS = ["bar"]; rows untouched).
- Deploy: MODULES_ENTITLED=parking,validation explicit in both booth stacks;
documented in .env.example.
- Tests: modules.test.ts (7); suite 329/329; web build clean; Playwright
round-trip on /setup/site verified live.
Claude-Session: https://claude.ai/code/session_01FWncR69HgGPuei1dLrW3cU
96 lines
3.4 KiB
TypeScript
96 lines
3.4 KiB
TypeScript
import { useEffect, useState } from "react";
|
|
import { QueryClientProvider } from "@tanstack/react-query";
|
|
import { RouterProvider } from "@tanstack/react-router";
|
|
import { fetchMe, type SessionUser } from "./api.js";
|
|
import { Login } from "./Login.js";
|
|
import { ConnectScreen } from "./ConnectScreen.js";
|
|
import { queryClient } from "./lib/query.js";
|
|
import { setLanguage } from "./lib/i18n/index.js";
|
|
import { applyTheme, applyFontScale } from "./lib/theme.js";
|
|
import { router } from "./router.js";
|
|
import { initApiBase, inTauri } from "./lib/origin.js";
|
|
|
|
// App root: bootstraps the session (cookie-based, from /api/auth/me), then hands
|
|
// off to TanStack Router inside the QueryClient provider. The router renders the
|
|
// terminal chrome + screens; auth gating stays here (Login until signed in), and
|
|
// the signed-in user flows into the router context for role-based route guards.
|
|
// See wiki/entities/react-vite-spa.md and local-jwt-auth.md.
|
|
//
|
|
// Desktop shell only: BEFORE any of that, the backend origin itself must be
|
|
// known — the same installer is used at every booth (see lib/origin.ts /
|
|
// backend-config.ts), so on first launch (or after the operator clears it)
|
|
// there is no server to call fetchMe() against yet. ConnectScreen gates that;
|
|
// a browser build always has a same-origin backend, so `needsConnect` is
|
|
// always false there and this is skipped entirely.
|
|
|
|
export function App() {
|
|
const [user, setUser] = useState<SessionUser | null>(null);
|
|
const [loading, setLoading] = useState(true);
|
|
const [needsConnect, setNeedsConnect] = useState(false);
|
|
|
|
useEffect(() => {
|
|
initApiBase().then((saved) => {
|
|
if (inTauri() && !saved) {
|
|
setNeedsConnect(true);
|
|
setLoading(false);
|
|
return;
|
|
}
|
|
fetchMe()
|
|
.then(setUser)
|
|
.finally(() => setLoading(false));
|
|
});
|
|
}, []);
|
|
|
|
// Route-context consumers (RootLayout's nav, route beforeLoad guards) only re-read
|
|
// the router context on navigation — NOT when this `user` state changes. So after
|
|
// any session refresh (login, profile edit, a venue-module flip in Setup → Site)
|
|
// re-validate the current matches once React has committed the new context.
|
|
useEffect(() => {
|
|
if (user) void router.invalidate();
|
|
}, [user]);
|
|
|
|
// Apply the signed-in user's preferred language + theme + font scale whenever they
|
|
// resolve/change (login, bootstrap, or a toggle). Albanian + dark + 100% are the defaults
|
|
// before auth resolves; on logout, fall back so the Login screen is consistent.
|
|
useEffect(() => {
|
|
if (user) {
|
|
setLanguage(user.language);
|
|
applyTheme(user.theme);
|
|
applyFontScale(user.fontScale);
|
|
} else {
|
|
applyTheme("dark");
|
|
applyFontScale(100);
|
|
}
|
|
}, [user]);
|
|
|
|
if (loading) {
|
|
return <div className="flex h-screen items-center justify-center text-term-muted">loading…</div>;
|
|
}
|
|
if (needsConnect) {
|
|
return (
|
|
<ConnectScreen
|
|
onConnected={() => {
|
|
setNeedsConnect(false);
|
|
setLoading(true);
|
|
fetchMe()
|
|
.then(setUser)
|
|
.finally(() => setLoading(false));
|
|
}}
|
|
/>
|
|
);
|
|
}
|
|
if (!user) {
|
|
return (
|
|
<QueryClientProvider client={queryClient}>
|
|
<Login onLoggedIn={setUser} />
|
|
</QueryClientProvider>
|
|
);
|
|
}
|
|
|
|
return (
|
|
<QueryClientProvider client={queryClient}>
|
|
<RouterProvider router={router} context={{ user, setUser }} />
|
|
</QueryClientProvider>
|
|
);
|
|
}
|