@bygghammar/cms-platform 0.80.1 → 0.90.0-m7.10

package/src/backoffice/seo/PageSeoPanelView.tsx

@@ -9,6 +9,8 @@
 import { useEffect, useMemo, useState, type ReactNode } from "react";
 import { Download, ImageIcon, Images, RotateCcw, Save, Sparkles, X } from "lucide-react";
 
+import { EDIT_LOCK_TYPES } from "../../cms/edit-lock";
+import { EditLockBanner, EditLockFence, useEditLock } from "../EditLock";
 import {
   mergeMediaMetaIntoForm,
   pageSeoPreviewCanonical,
@@ -27,6 +29,13 @@ export type PageSeoPanelViewProps = {
   defaultLocale: string;
   /** True when the page exists only in the CMS (no code registry entry). */
   isCmsPage?: boolean;
+  /**
+   * Page this record belongs to. Supplying it puts the screen under the shared
+   * editing lock, so two administrators cannot overwrite each other's SEO. A
+   * host that omits it keeps the previous behaviour (server-side enforcement
+   * still applies whenever the host passes the session id on to the save).
+   */
+  pageKey?: string | null;
   /** Current registry route for a locale, shown in the preview panel. */
   registryRoute: (locale: string) => string;
   /** Public origin used to build the canonical preview URL. */
@@ -35,10 +44,14 @@ export type PageSeoPanelViewProps = {
   pageImages: readonly PageSeoImageCandidate[];
   /** Saved media-library metadata for an image URL, or null when none exists. */
   lookupMeta: (src: string) => PageSeoMediaMeta | null;
-  /** Persist the form. Return false when saving failed (host shows the error). */
-  onSave: (form: PageSeoFormShape) => Promise<boolean>;
+  /**
+   * Persist the form. Return false when saving failed (host shows the error).
+   * The editing-session id is passed through so the server can tell this
+   * editor's own save apart from someone else's.
+   */
+  onSave: (form: PageSeoFormShape, editSessionId?: string) => Promise<boolean>;
   /** Remove the override; only enabled when `canReset`. */
-  onReset: () => Promise<void>;
+  onReset: (editSessionId?: string) => Promise<void>;
   canReset?: boolean;
   renderMediaPicker: (args: { onPick: (url: string) => void; onClose: () => void }) => ReactNode;
   renderPageImagePicker: (args: {
@@ -58,6 +71,7 @@ export function PageSeoPanelView({
   locales,
   defaultLocale,
   isCmsPage,
+  pageKey,
   registryRoute,
   originForLocale,
   pageImages,
@@ -76,6 +90,7 @@ export function PageSeoPanelView({
   const [picking, setPicking] = useState(false);
   const [pickingOnPage, setPickingOnPage] = useState(false);
   const [form, setForm] = useState<PageSeoFormShape>(initialForm);
+  const lock = useEditLock({ resourceType: EDIT_LOCK_TYPES.pageSeo, resourceId: pageKey });
 
   useEffect(() => {
     setForm(initialForm);
@@ -130,7 +145,7 @@ export function PageSeoPanelView({
   const handleSave = async () => {
     setBusy(true);
     try {
-      if (await onSave(form)) setDirty(false);
+      if (await onSave(form, lock.sessionId)) setDirty(false);
     } finally {
       setBusy(false);
     }
@@ -145,7 +160,7 @@ export function PageSeoPanelView({
     if (!ask("Remove your changes and revert to the defaults from the codebase?")) return;
     setBusy(true);
     try {
-      await onReset();
+      await onReset(lock.sessionId);
     } finally {
       setBusy(false);
     }
@@ -163,213 +178,215 @@ export function PageSeoPanelView({
 
   return (
     <div>
-      {isCmsPage && (
-        <p className="mb-4 text-xs text-ink/55">
-          This page was created in the page builder. Its URL and metadata are stored in the CMS —
-          set the slug below (empty = site root).
-        </p>
-      )}
-      {locales.length > 1 && (
-        <div className="flex gap-2 border-b border-ink/10">
-          {locales.map((l) => (
-            <button
-              key={l}
-              onClick={() => setActiveLocale(l)}
-              className={[
-                "px-4 py-2 text-xs uppercase tracking-[0.22em] border-b-2 -mb-px",
-                activeLocale === l
-                  ? "border-ink text-ink"
-                  : "border-transparent text-ink/50 hover:text-ink",
-              ].join(" ")}
-            >
-              {l}
-            </button>
-          ))}
-        </div>
-      )}
-
-      <div className="mt-8 grid grid-cols-1 md:grid-cols-2 gap-6">
-        <Field label="Slug" hint={`Empty = root for ${activeLocale}. E.g. "boka"`}>
-          <input
-            value={form.slugs[activeLocale] ?? ""}
-            onChange={(e) => updateLocalized("slugs", activeLocale, e.target.value)}
-            className="seo-input"
-          />
-        </Field>
-        <Field label="Robots" hint="E.g. noindex,nofollow — empty = default">
-          <input
-            value={form.seo.robots}
-            onChange={(e) => updateString("robots", e.target.value)}
-            className="seo-input"
-          />
-        </Field>
-        <Field label="Title" full>
-          <input
-            value={form.seo.title[activeLocale] ?? ""}
-            onChange={(e) => updateLocalized("title", activeLocale, e.target.value)}
-            className="seo-input"
-          />
-        </Field>
-        <Field label="Meta description" full>
-          <textarea
-            rows={3}
-            value={form.seo.description[activeLocale] ?? ""}
-            onChange={(e) => updateLocalized("description", activeLocale, e.target.value)}
-            className="seo-input"
-          />
-        </Field>
-        <Field label="OG title" hint="Share title (fallback: title)">
-          <input
-            value={form.seo.ogTitle[activeLocale] ?? ""}
-            onChange={(e) => updateLocalized("ogTitle", activeLocale, e.target.value)}
-            className="seo-input"
-          />
-        </Field>
-        <Field label="OG description" hint="Share text (fallback: meta description)">
-          <input
-            value={form.seo.ogDescription[activeLocale] ?? ""}
-            onChange={(e) => updateLocalized("ogDescription", activeLocale, e.target.value)}
-            className="seo-input"
-          />
-        </Field>
-        <Field label="OG image" hint="Pick from the media library or paste an absolute https URL">
-          <div className="space-y-2">
-            <div className="flex gap-2">
-              <input
-                value={form.seo.ogImageSrc}
-                onChange={(e) => updateString("ogImageSrc", e.target.value)}
-                className="seo-input"
-                placeholder="https://…"
-              />
+      <EditLockBanner lock={lock} className="mb-6" />
+      <EditLockFence lock={lock}>
+        {isCmsPage && (
+          <p className="mb-4 text-xs text-ink/55">
+            This page was created in the page builder. Its URL and metadata are stored in the CMS —
+            set the slug below (empty = site root).
+          </p>
+        )}
+        {locales.length > 1 && (
+          <div className="flex gap-2 border-b border-ink/10">
+            {locales.map((l) => (
               <button
-                type="button"
-                onClick={() => setPicking(true)}
-                className="inline-flex shrink-0 items-center gap-1.5 border border-ink/20 px-3 text-[0.7rem] uppercase tracking-widest hover:border-sea"
+                key={l}
+                onClick={() => setActiveLocale(l)}
+                className={[
+                  "px-4 py-2 text-xs uppercase tracking-[0.22em] border-b-2 -mb-px",
+                  activeLocale === l
+                    ? "border-ink text-ink"
+                    : "border-transparent text-ink/50 hover:text-ink",
+                ].join(" ")}
               >
-                <ImageIcon className="size-3.5" />
-                Choose
+                {l}
               </button>
-              {form.seo.ogImageSrc ? (
+            ))}
+          </div>
+        )}
+
+        <div className="mt-8 grid grid-cols-1 md:grid-cols-2 gap-6">
+          <Field label="Slug" hint={`Empty = root for ${activeLocale}. E.g. "boka"`}>
+            <input
+              value={form.slugs[activeLocale] ?? ""}
+              onChange={(e) => updateLocalized("slugs", activeLocale, e.target.value)}
+              className="seo-input"
+            />
+          </Field>
+          <Field label="Robots" hint="E.g. noindex,nofollow — empty = default">
+            <input
+              value={form.seo.robots}
+              onChange={(e) => updateString("robots", e.target.value)}
+              className="seo-input"
+            />
+          </Field>
+          <Field label="Title" full>
+            <input
+              value={form.seo.title[activeLocale] ?? ""}
+              onChange={(e) => updateLocalized("title", activeLocale, e.target.value)}
+              className="seo-input"
+            />
+          </Field>
+          <Field label="Meta description" full>
+            <textarea
+              rows={3}
+              value={form.seo.description[activeLocale] ?? ""}
+              onChange={(e) => updateLocalized("description", activeLocale, e.target.value)}
+              className="seo-input"
+            />
+          </Field>
+          <Field label="OG title" hint="Share title (fallback: title)">
+            <input
+              value={form.seo.ogTitle[activeLocale] ?? ""}
+              onChange={(e) => updateLocalized("ogTitle", activeLocale, e.target.value)}
+              className="seo-input"
+            />
+          </Field>
+          <Field label="OG description" hint="Share text (fallback: meta description)">
+            <input
+              value={form.seo.ogDescription[activeLocale] ?? ""}
+              onChange={(e) => updateLocalized("ogDescription", activeLocale, e.target.value)}
+              className="seo-input"
+            />
+          </Field>
+          <Field label="OG image" hint="Pick from the media library or paste an absolute https URL">
+            <div className="space-y-2">
+              <div className="flex gap-2">
+                <input
+                  value={form.seo.ogImageSrc}
+                  onChange={(e) => updateString("ogImageSrc", e.target.value)}
+                  className="seo-input"
+                  placeholder="https://…"
+                />
                 <button
                   type="button"
-                  onClick={() => updateString("ogImageSrc", "")}
-                  className="inline-flex shrink-0 items-center border border-ink/20 px-2 text-ink/60 hover:border-sea"
-                  title="Clear"
+                  onClick={() => setPicking(true)}
+                  className="inline-flex shrink-0 items-center gap-1.5 border border-ink/20 px-3 text-[0.7rem] uppercase tracking-widest hover:border-sea"
                 >
-                  <X className="size-3.5" />
+                  <ImageIcon className="size-3.5" />
+                  Choose
+                </button>
+                {form.seo.ogImageSrc ? (
+                  <button
+                    type="button"
+                    onClick={() => updateString("ogImageSrc", "")}
+                    className="inline-flex shrink-0 items-center border border-ink/20 px-2 text-ink/60 hover:border-sea"
+                    title="Clear"
+                  >
+                    <X className="size-3.5" />
+                  </button>
+                ) : null}
+              </div>
+              <div className="flex flex-wrap gap-2">
+                <button
+                  type="button"
+                  disabled={!heroImage}
+                  onClick={() => heroImage && onPickMedia(heroImage.url)}
+                  className="inline-flex items-center gap-1.5 border border-ink/20 px-3 py-1.5 text-[0.7rem] uppercase tracking-widest hover:border-sea disabled:opacity-40"
+                  title={heroImage?.url}
+                >
+                  <Sparkles className="size-3.5" />
+                  Use hero image
                 </button>
-              ) : null}
-            </div>
-            <div className="flex flex-wrap gap-2">
-              <button
-                type="button"
-                disabled={!heroImage}
-                onClick={() => heroImage && onPickMedia(heroImage.url)}
-                className="inline-flex items-center gap-1.5 border border-ink/20 px-3 py-1.5 text-[0.7rem] uppercase tracking-widest hover:border-sea disabled:opacity-40"
-                title={heroImage?.url}
-              >
-                <Sparkles className="size-3.5" />
-                Use hero image
-              </button>
-              <button
-                type="button"
-                disabled={pageImages.length === 0}
-                onClick={() => setPickingOnPage(true)}
-                className="inline-flex items-center gap-1.5 border border-ink/20 px-3 py-1.5 text-[0.7rem] uppercase tracking-widest hover:border-sea disabled:opacity-40"
-              >
-                <Images className="size-3.5" />
-                Pick from this page ({pageImages.length})
-              </button>
-            </div>
-            {form.seo.ogImageSrc ? (
-              <div className="flex items-center gap-3">
-                <img
-                  src={form.seo.ogImageSrc}
-                  alt=""
-                  className="h-16 w-28 border border-ink/10 object-cover"
-                />
                 <button
                   type="button"
-                  onClick={() => {
-                    const ok = importFromMedia(form.seo.ogImageSrc, true);
-                    (ok ? notify.success : notify.info)(
-                      ok
-                        ? "Imported alt, OG title and description from the media library"
-                        : "This image has no metadata saved in the media library yet",
-                    );
-                  }}
-                  className="inline-flex items-center gap-1.5 border border-ink/20 px-3 py-1.5 text-[0.7rem] uppercase tracking-widest hover:border-sea"
+                  disabled={pageImages.length === 0}
+                  onClick={() => setPickingOnPage(true)}
+                  className="inline-flex items-center gap-1.5 border border-ink/20 px-3 py-1.5 text-[0.7rem] uppercase tracking-widest hover:border-sea disabled:opacity-40"
                 >
-                  <Download className="size-3.5" />
-                  Import image metadata
+                  <Images className="size-3.5" />
+                  Pick from this page ({pageImages.length})
                 </button>
               </div>
-            ) : null}
-          </div>
-        </Field>
-        <Field label={`OG image alt (${activeLocale})`}>
-          <input
-            value={form.seo.ogImageAlt[activeLocale] ?? ""}
-            onChange={(e) => updateLocalized("ogImageAlt", activeLocale, e.target.value)}
-            className="seo-input"
-          />
-        </Field>
-        <Field label="Keywords" full hint="Comma-separated list">
-          <input
-            value={form.seo.keywords[activeLocale] ?? ""}
-            onChange={(e) => updateLocalized("keywords", activeLocale, e.target.value)}
-            className="seo-input"
-          />
-        </Field>
-      </div>
+              {form.seo.ogImageSrc ? (
+                <div className="flex items-center gap-3">
+                  <img
+                    src={form.seo.ogImageSrc}
+                    alt=""
+                    className="h-16 w-28 border border-ink/10 object-cover"
+                  />
+                  <button
+                    type="button"
+                    onClick={() => {
+                      const ok = importFromMedia(form.seo.ogImageSrc, true);
+                      (ok ? notify.success : notify.info)(
+                        ok
+                          ? "Imported alt, OG title and description from the media library"
+                          : "This image has no metadata saved in the media library yet",
+                      );
+                    }}
+                    className="inline-flex items-center gap-1.5 border border-ink/20 px-3 py-1.5 text-[0.7rem] uppercase tracking-widest hover:border-sea"
+                  >
+                    <Download className="size-3.5" />
+                    Import image metadata
+                  </button>
+                </div>
+              ) : null}
+            </div>
+          </Field>
+          <Field label={`OG image alt (${activeLocale})`}>
+            <input
+              value={form.seo.ogImageAlt[activeLocale] ?? ""}
+              onChange={(e) => updateLocalized("ogImageAlt", activeLocale, e.target.value)}
+              className="seo-input"
+            />
+          </Field>
+          <Field label="Keywords" full hint="Comma-separated list">
+            <input
+              value={form.seo.keywords[activeLocale] ?? ""}
+              onChange={(e) => updateLocalized("keywords", activeLocale, e.target.value)}
+              className="seo-input"
+            />
+          </Field>
+        </div>
 
-      <div className="mt-10 border border-ink/10 bg-white p-6">
-        <div className="text-[0.65rem] uppercase tracking-[0.22em] text-ink/55">Preview</div>
-        <dl className="mt-4 grid grid-cols-1 md:grid-cols-[140px_1fr] gap-x-6 gap-y-2 text-sm">
-          <dt className="text-ink/50">Canonical</dt>
-          <dd className="font-mono text-ink/80 break-all">{previewCanonical}</dd>
-          <dt className="text-ink/50">Route</dt>
-          <dd className="font-mono text-ink/80">
-            {previewPath} (current registry: {registryRoute(activeLocale)})
-          </dd>
-          <dt className="text-ink/50">&lt;title&gt;</dt>
-          <dd className="text-ink/80">
-            {form.seo.title[activeLocale] || <em className="text-ink/40">empty</em>}
-          </dd>
-          <dt className="text-ink/50">description</dt>
-          <dd className="text-ink/80">
-            {form.seo.description[activeLocale] || <em className="text-ink/40">empty</em>}
-          </dd>
-        </dl>
-      </div>
+        <div className="mt-10 border border-ink/10 bg-white p-6">
+          <div className="text-[0.65rem] uppercase tracking-[0.22em] text-ink/55">Preview</div>
+          <dl className="mt-4 grid grid-cols-1 md:grid-cols-[140px_1fr] gap-x-6 gap-y-2 text-sm">
+            <dt className="text-ink/50">Canonical</dt>
+            <dd className="font-mono text-ink/80 break-all">{previewCanonical}</dd>
+            <dt className="text-ink/50">Route</dt>
+            <dd className="font-mono text-ink/80">
+              {previewPath} (current registry: {registryRoute(activeLocale)})
+            </dd>
+            <dt className="text-ink/50">&lt;title&gt;</dt>
+            <dd className="text-ink/80">
+              {form.seo.title[activeLocale] || <em className="text-ink/40">empty</em>}
+            </dd>
+            <dt className="text-ink/50">description</dt>
+            <dd className="text-ink/80">
+              {form.seo.description[activeLocale] || <em className="text-ink/40">empty</em>}
+            </dd>
+          </dl>
+        </div>
 
-      <div className="mt-8 flex flex-wrap items-center gap-3">
-        <button
-          onClick={handleSave}
-          disabled={busy || !dirty}
-          className="inline-flex items-center gap-2 bg-ink text-paper px-6 py-3 text-xs uppercase tracking-[0.22em] hover:bg-ink/85 disabled:opacity-50"
-        >
-          <Save className="size-4" />
-          {busy ? "Saving…" : "Save"}
-        </button>
-        <button
-          onClick={handleReset}
-          disabled={busy || !canReset}
-          className="inline-flex items-center gap-2 border border-ink/20 px-6 py-3 text-xs uppercase tracking-[0.22em] hover:border-ink disabled:opacity-40"
-        >
-          <RotateCcw className="size-4" />
-          Reset to default
-        </button>
-        {dirty && (
-          <span className="text-xs text-sea uppercase tracking-[0.22em]">unsaved changes</span>
-        )}
-      </div>
+        <div className="mt-8 flex flex-wrap items-center gap-3">
+          <button
+            onClick={handleSave}
+            disabled={busy || !dirty || lock.blocked}
+            className="inline-flex items-center gap-2 bg-ink text-paper px-6 py-3 text-xs uppercase tracking-[0.22em] hover:bg-ink/85 disabled:opacity-50"
+          >
+            <Save className="size-4" />
+            {busy ? "Saving…" : "Save"}
+          </button>
+          <button
+            onClick={handleReset}
+            disabled={busy || !canReset || lock.blocked}
+            className="inline-flex items-center gap-2 border border-ink/20 px-6 py-3 text-xs uppercase tracking-[0.22em] hover:border-ink disabled:opacity-40"
+          >
+            <RotateCcw className="size-4" />
+            Reset to default
+          </button>
+          {dirty && (
+            <span className="text-xs text-sea uppercase tracking-[0.22em]">unsaved changes</span>
+          )}
+        </div>
 
-      {picking && renderMediaPicker({ onPick: onPickMedia, onClose: () => setPicking(false) })}
-      {pickingOnPage &&
-        renderPageImagePicker({ onPick: onPickMedia, onClose: () => setPickingOnPage(false) })}
+        {picking && renderMediaPicker({ onPick: onPickMedia, onClose: () => setPicking(false) })}
+        {pickingOnPage &&
+          renderPageImagePicker({ onPick: onPickMedia, onClose: () => setPickingOnPage(false) })}
 
-      <style>{`
+        <style>{`
         .seo-input {
           width: 100%;
           background: white;
@@ -380,7 +397,8 @@ export function PageSeoPanelView({
           color: var(--ink);
         }
         .seo-input:focus { border-color: var(--sea); }
-      `}</style>
+        `}</style>
+      </EditLockFence>
     </div>
   );
 }

package/src/backoffice/shell/domain-guard.ts

@@ -3,25 +3,25 @@
  *
  * Returns the host the backoffice should be served from, or null when the
  * current host is fine (local dev, Lovable preview, or already the admin host).
+ *
+ * This is canonical-host routing, not an authorization boundary — roles are.
+ * So every uncertain case returns null and stays put: a missing, blank or
+ * malformed admin domain must not bounce an administrator to a hostname that
+ * serves nothing, which is a lockout with no way back in.
  */
-const DEV_HOST_SUFFIXES = [".lovable.app", ".lovableproject.com"];
+import { isValidCanonicalDomain, normalizeCanonicalDomain } from "../../site/host";
 
-function normalizeHost(value: string): string {
-  return value
-    .replace(/^https?:\/\//, "")
-    .replace(/\/+$/, "")
-    .replace(/^www\./, "")
-    .toLowerCase();
-}
+const DEV_HOST_SUFFIXES = [".lovable.app", ".lovableproject.com"];
 
 /** True for hosts where the admin-domain guard must not apply. */
 export function isDevelopmentHost(host: string): boolean {
-  const h = normalizeHost(host);
+  const h = normalizeCanonicalDomain(host);
   return (
     DEV_HOST_SUFFIXES.some((suffix) => h.endsWith(suffix)) ||
     h === "localhost" ||
-    h.startsWith("localhost:") ||
-    h.startsWith("127.0.0.1")
+    h.endsWith(".localhost") ||
+    h === "127.0.0.1" ||
+    h === "[::1]"
   );
 }
 
@@ -31,8 +31,21 @@ export function backofficeRedirectHost(
   adminDomain: string | null | undefined,
 ): string | null {
   if (!currentHost || isDevelopmentHost(currentHost)) return null;
-  const current = normalizeHost(currentHost);
-  const admin = normalizeHost(adminDomain ?? "");
-  if (!admin || current === admin) return null;
+
+  // The stored form is the destination — `www.` included when configured —
+  // and the comparison is against that exact hostname, not against an alias
+  // key. Apex and `www.` are aliases for *finding* the row; they are two
+  // different addresses to serve from, and the configured one is the answer.
+  // Folding them together here is what left `voyara.se` sitting on a
+  // deployment that had chosen `www.voyara.se`, cookies and all.
+  // Validated before normalizing, not after: normalizing strips the scheme, so
+  // `ftp://voyara.se` checked afterwards is the valid `voyara.se`.
+  const admin = isValidCanonicalDomain(adminDomain) ? normalizeCanonicalDomain(adminDomain ?? "") : "";
+  if (!admin) return null;
+  // A development host is never a destination either. `localhost` is what an
+  // unconfigured install resolves to, and sending a public request there is
+  // the lockout this guard exists to avoid.
+  if (isDevelopmentHost(admin)) return null;
+  if (normalizeCanonicalDomain(currentHost) === admin) return null;
   return admin;
 }

package/src/backoffice/shell/index.ts

@@ -9,9 +9,14 @@ export type { BackofficeNavItem, BackofficeNavKey, BackofficeNavOptions } from "
 export { backofficeRedirectHost, isDevelopmentHost } from "./domain-guard";
 export {
   FeatureDisabledNotice,
+  ModuleRoleNotice,
+  MY_ROLES_QUERY_KEY,
   SITE_SETTINGS_QUERY_KEY,
   useBackofficeNav,
   useFeatureEnabled,
   useFeatureGate,
+  useModuleGate,
+  useModuleRoleAllowed,
+  useMyRoles,
   useResolvedSiteConfig,
 } from "./use-resolved-config";

package/src/backoffice/shell/nav-model.ts

@@ -8,22 +8,23 @@
 import type { LucideProps } from "lucide-react";
 import {
   Blocks,
-  Calendar,
-  ClipboardList,
   FileText,
-  Globe,
-  GraduationCap,
   ImageIcon,
   Layers,
   LayoutDashboard,
   LayoutList,
-  MessageSquareQuote,
   ShieldCheck,
 } from "lucide-react";
 
 import type { SiteConfig } from "../../config/site-config";
+import { CMS_MODULE_LIST, type CmsModuleKey } from "../../config/modules";
 import type { BackofficeNavigationItem } from "../../navigation";
 
+/**
+ * Sidebar keys: the always-present screens plus every module that declares a
+ * nav entry. Module keys are no longer repeated here — a module contributing a
+ * sidebar item is a fact about the module, kept in one place.
+ */
 export type BackofficeNavKey =
   | "dashboard"
   | "pages"
@@ -32,12 +33,8 @@ export type BackofficeNavKey =
   | "sections"
   | "media"
   | "seo"
-  | "domains"
-  | "trips"
-  | "courses"
-  | "forms"
-  | "reviews"
-  | "admin";
+  | "admin"
+  | CmsModuleKey;
 
 export type BackofficeNavItem = BackofficeNavigationItem<LucideProps>;
 
@@ -51,7 +48,8 @@ type Definition = {
   feature?: keyof SiteConfig["features"];
 };
 
-const DEFINITIONS: readonly Definition[] = [
+/** Screens every site has, regardless of which modules are on. */
+const CORE: readonly Definition[] = [
   { key: "dashboard", path: "", label: "Dashboard", icon: LayoutDashboard, exact: true },
   { key: "pages", path: "/pages-builder", label: "Page builder", icon: Blocks },
   { key: "global-sections", path: "/global-sections", label: "Global Sections", icon: Layers },
@@ -59,17 +57,28 @@ const DEFINITIONS: readonly Definition[] = [
   { key: "sections", path: "/sections", label: "Shared content", icon: LayoutList },
   { key: "media", path: "/media", label: "Media", icon: ImageIcon },
   { key: "seo", path: "/seo", label: "SEO", icon: FileText },
-  { key: "domains", path: "/domains", label: "Domains", icon: Globe, feature: "domains" },
-  { key: "trips", path: "/trips", label: "Trips", icon: Calendar, feature: "trips" },
-  { key: "courses", path: "/kurser", label: "Courses", icon: GraduationCap, feature: "courses" },
-  { key: "forms", path: "/forms", label: "Forms", icon: ClipboardList, feature: "forms" },
-  {
-    key: "reviews",
-    path: "/recensioner",
-    label: "Reviews",
-    icon: MessageSquareQuote,
-    feature: "reviews",
-  },
+];
+
+/** Entries contributed by modules, each gated on its own flag. */
+const MODULE_ITEMS: readonly Definition[] = CMS_MODULE_LIST.flatMap((module) =>
+  module.nav === undefined
+    ? []
+    : [
+        {
+          key: module.key,
+          path: module.nav.path,
+          label: module.nav.label,
+          icon: module.nav.icon,
+          ...(module.nav.exact === undefined ? {} : { exact: module.nav.exact }),
+          feature: module.key,
+        },
+      ],
+);
+
+// Admin stays last: it is the catch-all for everything a module did not claim.
+const DEFINITIONS: readonly Definition[] = [
+  ...CORE,
+  ...MODULE_ITEMS,
   { key: "admin", path: "/admin", label: "Admin", icon: ShieldCheck },
 ];