Compare commits
2 Commits
todo/mvp0-
...
todo/mvp0-
| Author | SHA1 | Date | |
|---|---|---|---|
|
3b130568e9
|
|||
|
8390689c8d
|
20
TODO.md
20
TODO.md
@@ -51,11 +51,11 @@ This file is the single source of truth for roadmap and delivery progress.
|
||||
|
||||
- [x] [P1] Separate Next.js public app in monorepo
|
||||
- [x] [P1] App Router + TypeScript + `src/` structure
|
||||
- [~] [P1] Public app connected to shared data layer
|
||||
- [ ] [P1] Localized route structure and middleware rules
|
||||
- [ ] [P2] Public layout system (header/footer/navigation)
|
||||
- [ ] [P1] Header banner rendering from CMS-managed content
|
||||
- [ ] [P2] Basic SEO defaults (metadata, OG, sitemap, robots)
|
||||
- [x] [P1] Public app connected to shared data layer
|
||||
- [x] [P1] Localized route structure and middleware rules
|
||||
- [x] [P2] Public layout system (header/footer/navigation)
|
||||
- [x] [P1] Header banner rendering from CMS-managed content
|
||||
- [x] [P2] Basic SEO defaults (metadata, OG, sitemap, robots)
|
||||
|
||||
### Testing
|
||||
|
||||
@@ -63,11 +63,11 @@ This file is the single source of truth for roadmap and delivery progress.
|
||||
- [x] [P1] Playwright baseline with web/admin projects
|
||||
- [x] [P1] CI workflow for lint/typecheck/unit/e2e gates
|
||||
- [x] [P1] Test data strategy (seed fixtures + isolated e2e data)
|
||||
- [~] [P1] RBAC policy unit tests and permission regression suite
|
||||
- [ ] [P1] i18n unit tests (locale resolution, fallback, message key loading)
|
||||
- [x] [P1] RBAC policy unit tests and permission regression suite
|
||||
- [x] [P1] i18n unit tests (locale resolution, fallback, message key loading)
|
||||
- [x] [P1] i18n integration tests (admin/public locale switch and persistence)
|
||||
- [ ] [P1] i18n e2e smoke tests (localized headings/content per route)
|
||||
- [ ] [P1] CRUD contract tests for shared service patterns
|
||||
- [x] [P1] i18n e2e smoke tests (localized headings/content per route)
|
||||
- [x] [P1] CRUD contract tests for shared service patterns
|
||||
|
||||
### Documentation
|
||||
|
||||
@@ -204,6 +204,8 @@ This file is the single source of truth for roadmap and delivery progress.
|
||||
- [2026-02-10] E2E now runs with deterministic preparation (`test:e2e:prepare`: generate + migrate deploy + seed) before Playwright execution.
|
||||
- [2026-02-10] CI quality workflow `.gitea/workflows/ci.yml` enforces `check`, `typecheck`, `test`, and `test:e2e` against a PostgreSQL service.
|
||||
- [2026-02-10] Admin app now uses a shared shell with permission-aware navigation and dedicated IA routes (`/pages`, `/media`, `/users`, `/commissions`).
|
||||
- [2026-02-10] Public app now has a shared site layout (`banner/header/footer`), DB-backed header banner config, and SEO defaults (`metadata`, `robots`, `sitemap`).
|
||||
- [2026-02-10] Testing baseline now includes explicit RBAC regression checks, locale-resolution unit tests (admin/web), CRUD service contract tests, and i18n smoke e2e routes.
|
||||
|
||||
## How We Use This File
|
||||
|
||||
|
||||
17
apps/admin/src/i18n/server.test.ts
Normal file
17
apps/admin/src/i18n/server.test.ts
Normal file
@@ -0,0 +1,17 @@
|
||||
import { describe, expect, it } from "vitest"
|
||||
|
||||
import { resolveAdminLocaleFromCookieValue } from "./server"
|
||||
|
||||
describe("resolveAdminLocaleFromCookieValue", () => {
|
||||
it("accepts supported locales", () => {
|
||||
expect(resolveAdminLocaleFromCookieValue("de")).toBe("de")
|
||||
expect(resolveAdminLocaleFromCookieValue("en")).toBe("en")
|
||||
expect(resolveAdminLocaleFromCookieValue("es")).toBe("es")
|
||||
expect(resolveAdminLocaleFromCookieValue("fr")).toBe("fr")
|
||||
})
|
||||
|
||||
it("falls back to default locale for unknown values", () => {
|
||||
expect(resolveAdminLocaleFromCookieValue("it")).toBe("en")
|
||||
expect(resolveAdminLocaleFromCookieValue(undefined)).toBe("en")
|
||||
})
|
||||
})
|
||||
@@ -4,10 +4,7 @@ import { cookies } from "next/headers"
|
||||
import type { AdminMessages } from "./messages"
|
||||
import { ADMIN_LOCALE_COOKIE } from "./shared"
|
||||
|
||||
export async function resolveAdminLocale(): Promise<AppLocale> {
|
||||
const cookieStore = await cookies()
|
||||
const value = cookieStore.get(ADMIN_LOCALE_COOKIE)?.value
|
||||
|
||||
export function resolveAdminLocaleFromCookieValue(value: string | undefined): AppLocale {
|
||||
if (value && isAppLocale(value)) {
|
||||
return value
|
||||
}
|
||||
@@ -15,6 +12,12 @@ export async function resolveAdminLocale(): Promise<AppLocale> {
|
||||
return defaultLocale
|
||||
}
|
||||
|
||||
export async function resolveAdminLocale(): Promise<AppLocale> {
|
||||
const cookieStore = await cookies()
|
||||
const value = cookieStore.get(ADMIN_LOCALE_COOKIE)?.value
|
||||
return resolveAdminLocaleFromCookieValue(value)
|
||||
}
|
||||
|
||||
export async function getAdminMessages(locale: AppLocale): Promise<AdminMessages> {
|
||||
return (await import(`../messages/${locale}.json`)).default as AdminMessages
|
||||
}
|
||||
|
||||
13
apps/web/src/app/[locale]/about/page.tsx
Normal file
13
apps/web/src/app/[locale]/about/page.tsx
Normal file
@@ -0,0 +1,13 @@
|
||||
import { getTranslations } from "next-intl/server"
|
||||
|
||||
export default async function AboutPage() {
|
||||
const t = await getTranslations("About")
|
||||
|
||||
return (
|
||||
<section className="mx-auto w-full max-w-6xl space-y-4 px-6 py-16">
|
||||
<p className="text-sm uppercase tracking-[0.2em] text-neutral-500">{t("badge")}</p>
|
||||
<h1 className="text-4xl font-semibold tracking-tight">{t("title")}</h1>
|
||||
<p className="max-w-3xl text-neutral-600">{t("description")}</p>
|
||||
</section>
|
||||
)
|
||||
}
|
||||
13
apps/web/src/app/[locale]/contact/page.tsx
Normal file
13
apps/web/src/app/[locale]/contact/page.tsx
Normal file
@@ -0,0 +1,13 @@
|
||||
import { getTranslations } from "next-intl/server"
|
||||
|
||||
export default async function ContactPage() {
|
||||
const t = await getTranslations("Contact")
|
||||
|
||||
return (
|
||||
<section className="mx-auto w-full max-w-6xl space-y-4 px-6 py-16">
|
||||
<p className="text-sm uppercase tracking-[0.2em] text-neutral-500">{t("badge")}</p>
|
||||
<h1 className="text-4xl font-semibold tracking-tight">{t("title")}</h1>
|
||||
<p className="max-w-3xl text-neutral-600">{t("description")}</p>
|
||||
</section>
|
||||
)
|
||||
}
|
||||
@@ -1,7 +1,12 @@
|
||||
import { getPublicHeaderBanner } from "@cms/db"
|
||||
import { notFound } from "next/navigation"
|
||||
import { hasLocale, NextIntlClientProvider } from "next-intl"
|
||||
import { getTranslations } from "next-intl/server"
|
||||
import type { ReactNode } from "react"
|
||||
|
||||
import { PublicHeaderBanner } from "@/components/public-header-banner"
|
||||
import { PublicSiteFooter } from "@/components/public-site-footer"
|
||||
import { PublicSiteHeader } from "@/components/public-site-header"
|
||||
import { routing } from "@/i18n/routing"
|
||||
import { Providers } from "../providers"
|
||||
|
||||
@@ -12,6 +17,28 @@ type LocaleLayoutProps = {
|
||||
}>
|
||||
}
|
||||
|
||||
export async function generateMetadata({ params }: LocaleLayoutProps) {
|
||||
const { locale } = await params
|
||||
|
||||
if (!hasLocale(routing.locales, locale)) {
|
||||
return {}
|
||||
}
|
||||
|
||||
const t = await getTranslations({
|
||||
locale,
|
||||
namespace: "Seo",
|
||||
})
|
||||
|
||||
return {
|
||||
title: t("title"),
|
||||
description: t("description"),
|
||||
openGraph: {
|
||||
title: t("title"),
|
||||
description: t("description"),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
export default async function LocaleLayout({ children, params }: LocaleLayoutProps) {
|
||||
const { locale } = await params
|
||||
|
||||
@@ -19,9 +46,16 @@ export default async function LocaleLayout({ children, params }: LocaleLayoutPro
|
||||
notFound()
|
||||
}
|
||||
|
||||
const banner = await getPublicHeaderBanner()
|
||||
|
||||
return (
|
||||
<NextIntlClientProvider locale={locale}>
|
||||
<Providers>{children}</Providers>
|
||||
<Providers>
|
||||
<PublicHeaderBanner banner={banner} />
|
||||
<PublicSiteHeader />
|
||||
<main>{children}</main>
|
||||
<PublicSiteFooter />
|
||||
</Providers>
|
||||
</NextIntlClientProvider>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -2,20 +2,15 @@ import { listPosts } from "@cms/db"
|
||||
import { Button } from "@cms/ui/button"
|
||||
import { getTranslations } from "next-intl/server"
|
||||
|
||||
import { LanguageSwitcher } from "@/components/language-switcher"
|
||||
|
||||
export const dynamic = "force-dynamic"
|
||||
|
||||
export default async function HomePage() {
|
||||
const [posts, t] = await Promise.all([listPosts(), getTranslations("Home")])
|
||||
|
||||
return (
|
||||
<main className="mx-auto flex min-h-screen w-full max-w-3xl flex-col gap-6 px-6 py-16">
|
||||
<section className="mx-auto flex w-full max-w-6xl flex-col gap-6 px-6 py-16">
|
||||
<header className="space-y-3">
|
||||
<div className="flex flex-wrap items-center justify-between gap-3">
|
||||
<p className="text-sm uppercase tracking-[0.2em] text-neutral-500">{t("badge")}</p>
|
||||
<LanguageSwitcher />
|
||||
</div>
|
||||
<p className="text-sm uppercase tracking-[0.2em] text-neutral-500">{t("badge")}</p>
|
||||
<h1 className="text-4xl font-semibold tracking-tight">{t("title")}</h1>
|
||||
<p className="text-neutral-600">{t("description")}</p>
|
||||
</header>
|
||||
@@ -36,6 +31,6 @@ export default async function HomePage() {
|
||||
))}
|
||||
</ul>
|
||||
</section>
|
||||
</main>
|
||||
</section>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -3,9 +3,30 @@ import type { ReactNode } from "react"
|
||||
|
||||
import "./globals.css"
|
||||
|
||||
const metadataBase = new URL(process.env.CMS_WEB_ORIGIN ?? "http://localhost:3000")
|
||||
|
||||
export const metadata: Metadata = {
|
||||
title: "CMS Web",
|
||||
metadataBase,
|
||||
title: {
|
||||
default: "CMS Web",
|
||||
template: "%s | CMS Web",
|
||||
},
|
||||
description: "Public frontend for the CMS monorepo",
|
||||
applicationName: "CMS Web",
|
||||
openGraph: {
|
||||
type: "website",
|
||||
siteName: "CMS Web",
|
||||
title: "CMS Web",
|
||||
description: "Public frontend for the CMS monorepo",
|
||||
url: metadataBase,
|
||||
},
|
||||
alternates: {
|
||||
canonical: "/",
|
||||
},
|
||||
robots: {
|
||||
index: true,
|
||||
follow: true,
|
||||
},
|
||||
}
|
||||
|
||||
export default function RootLayout({ children }: { children: ReactNode }) {
|
||||
|
||||
13
apps/web/src/app/robots.ts
Normal file
13
apps/web/src/app/robots.ts
Normal file
@@ -0,0 +1,13 @@
|
||||
import type { MetadataRoute } from "next"
|
||||
|
||||
const baseUrl = process.env.CMS_WEB_ORIGIN ?? "http://localhost:3000"
|
||||
|
||||
export default function robots(): MetadataRoute.Robots {
|
||||
return {
|
||||
rules: {
|
||||
userAgent: "*",
|
||||
allow: "/",
|
||||
},
|
||||
sitemap: `${baseUrl}/sitemap.xml`,
|
||||
}
|
||||
}
|
||||
14
apps/web/src/app/sitemap.ts
Normal file
14
apps/web/src/app/sitemap.ts
Normal file
@@ -0,0 +1,14 @@
|
||||
import type { MetadataRoute } from "next"
|
||||
|
||||
const baseUrl = process.env.CMS_WEB_ORIGIN ?? "http://localhost:3000"
|
||||
|
||||
const publicRoutes = ["/", "/about", "/contact"]
|
||||
|
||||
export default function sitemap(): MetadataRoute.Sitemap {
|
||||
const now = new Date()
|
||||
|
||||
return publicRoutes.map((route) => ({
|
||||
url: `${baseUrl}${route}`,
|
||||
lastModified: now,
|
||||
}))
|
||||
}
|
||||
25
apps/web/src/components/public-header-banner.tsx
Normal file
25
apps/web/src/components/public-header-banner.tsx
Normal file
@@ -0,0 +1,25 @@
|
||||
import type { PublicHeaderBanner as PublicHeaderBannerData } from "@cms/db"
|
||||
import Link from "next/link"
|
||||
|
||||
type PublicHeaderBannerProps = {
|
||||
banner: PublicHeaderBannerData | null
|
||||
}
|
||||
|
||||
export function PublicHeaderBanner({ banner }: PublicHeaderBannerProps) {
|
||||
if (!banner) {
|
||||
return null
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="border-b border-amber-200 bg-amber-50">
|
||||
<div className="mx-auto flex w-full max-w-6xl flex-wrap items-center justify-between gap-3 px-6 py-2 text-sm text-amber-900">
|
||||
<p>{banner.message}</p>
|
||||
{banner.ctaLabel && banner.ctaHref ? (
|
||||
<Link href={banner.ctaHref} className="font-medium underline underline-offset-2">
|
||||
{banner.ctaLabel}
|
||||
</Link>
|
||||
) : null}
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
21
apps/web/src/components/public-site-footer.tsx
Normal file
21
apps/web/src/components/public-site-footer.tsx
Normal file
@@ -0,0 +1,21 @@
|
||||
"use client"
|
||||
|
||||
import { useTranslations } from "next-intl"
|
||||
|
||||
export function PublicSiteFooter() {
|
||||
const t = useTranslations("Layout")
|
||||
const year = new Date().getFullYear()
|
||||
|
||||
return (
|
||||
<footer className="border-t border-neutral-200 bg-neutral-50">
|
||||
<div className="mx-auto flex w-full max-w-6xl flex-wrap items-center justify-between gap-2 px-6 py-4 text-sm text-neutral-600">
|
||||
<p>
|
||||
{t("footer.copyright", {
|
||||
year,
|
||||
})}
|
||||
</p>
|
||||
<p>{t("footer.tagline")}</p>
|
||||
</div>
|
||||
</footer>
|
||||
)
|
||||
}
|
||||
44
apps/web/src/components/public-site-header.tsx
Normal file
44
apps/web/src/components/public-site-header.tsx
Normal file
@@ -0,0 +1,44 @@
|
||||
"use client"
|
||||
|
||||
import { useTranslations } from "next-intl"
|
||||
|
||||
import { Link } from "@/i18n/navigation"
|
||||
|
||||
import { LanguageSwitcher } from "./language-switcher"
|
||||
|
||||
export function PublicSiteHeader() {
|
||||
const t = useTranslations("Layout")
|
||||
|
||||
const navItems = [
|
||||
{ href: "/", label: t("nav.home") },
|
||||
{ href: "/about", label: t("nav.about") },
|
||||
{ href: "/contact", label: t("nav.contact") },
|
||||
]
|
||||
|
||||
return (
|
||||
<header className="border-b border-neutral-200 bg-white/80 backdrop-blur">
|
||||
<div className="mx-auto flex w-full max-w-6xl flex-wrap items-center justify-between gap-4 px-6 py-4">
|
||||
<Link
|
||||
href="/"
|
||||
className="text-sm font-semibold uppercase tracking-[0.2em] text-neutral-700"
|
||||
>
|
||||
{t("brand")}
|
||||
</Link>
|
||||
|
||||
<nav className="flex flex-wrap items-center gap-2">
|
||||
{navItems.map((item) => (
|
||||
<Link
|
||||
key={item.href}
|
||||
href={item.href}
|
||||
className="rounded-md border border-neutral-300 px-3 py-1.5 text-sm font-medium text-neutral-700 hover:bg-neutral-100"
|
||||
>
|
||||
{item.label}
|
||||
</Link>
|
||||
))}
|
||||
</nav>
|
||||
|
||||
<LanguageSwitcher />
|
||||
</div>
|
||||
</header>
|
||||
)
|
||||
}
|
||||
17
apps/web/src/i18n/request.test.ts
Normal file
17
apps/web/src/i18n/request.test.ts
Normal file
@@ -0,0 +1,17 @@
|
||||
import { describe, expect, it } from "vitest"
|
||||
|
||||
import { resolveRequestLocale } from "./request"
|
||||
|
||||
describe("resolveRequestLocale", () => {
|
||||
it("accepts supported locales", () => {
|
||||
expect(resolveRequestLocale("de")).toBe("de")
|
||||
expect(resolveRequestLocale("en")).toBe("en")
|
||||
expect(resolveRequestLocale("es")).toBe("es")
|
||||
expect(resolveRequestLocale("fr")).toBe("fr")
|
||||
})
|
||||
|
||||
it("falls back to default locale for unsupported values", () => {
|
||||
expect(resolveRequestLocale("it")).toBe("en")
|
||||
expect(resolveRequestLocale(undefined)).toBe("en")
|
||||
})
|
||||
})
|
||||
@@ -1,11 +1,16 @@
|
||||
import type { AppLocale } from "@cms/i18n"
|
||||
import { hasLocale } from "next-intl"
|
||||
import { getRequestConfig } from "next-intl/server"
|
||||
|
||||
import { routing } from "./routing"
|
||||
|
||||
export function resolveRequestLocale(requested: string | undefined): AppLocale {
|
||||
return hasLocale(routing.locales, requested) ? requested : routing.defaultLocale
|
||||
}
|
||||
|
||||
export default getRequestConfig(async ({ requestLocale }) => {
|
||||
const requested = await requestLocale
|
||||
const locale = hasLocale(routing.locales, requested) ? requested : routing.defaultLocale
|
||||
const locale = resolveRequestLocale(requested)
|
||||
|
||||
return {
|
||||
locale,
|
||||
|
||||
@@ -15,5 +15,31 @@
|
||||
"es": "Spanisch",
|
||||
"fr": "Französisch"
|
||||
}
|
||||
},
|
||||
"Layout": {
|
||||
"brand": "CMS Web",
|
||||
"nav": {
|
||||
"home": "Start",
|
||||
"about": "Über uns",
|
||||
"contact": "Kontakt"
|
||||
},
|
||||
"footer": {
|
||||
"copyright": "© {year} CMS Web",
|
||||
"tagline": "Powered by Next.js, Bun, Prisma und TanStack."
|
||||
}
|
||||
},
|
||||
"Seo": {
|
||||
"title": "CMS Web",
|
||||
"description": "Öffentliches Frontend für das CMS-Monorepo."
|
||||
},
|
||||
"About": {
|
||||
"badge": "Über uns",
|
||||
"title": "Über dieses Projekt",
|
||||
"description": "Diese öffentliche App ist die Frontend-Oberfläche für CMS-gesteuerte Inhalte und kommende dynamische Seiten."
|
||||
},
|
||||
"Contact": {
|
||||
"badge": "Kontakt",
|
||||
"title": "Kontakt",
|
||||
"description": "Kontakt- und Auftragsabläufe werden in den nächsten MVP-Schritten eingeführt."
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,5 +15,31 @@
|
||||
"es": "Spanish",
|
||||
"fr": "French"
|
||||
}
|
||||
},
|
||||
"Layout": {
|
||||
"brand": "CMS Web",
|
||||
"nav": {
|
||||
"home": "Home",
|
||||
"about": "About",
|
||||
"contact": "Contact"
|
||||
},
|
||||
"footer": {
|
||||
"copyright": "© {year} CMS Web",
|
||||
"tagline": "Powered by Next.js, Bun, Prisma, and TanStack."
|
||||
}
|
||||
},
|
||||
"Seo": {
|
||||
"title": "CMS Web",
|
||||
"description": "Public frontend for the CMS monorepo."
|
||||
},
|
||||
"About": {
|
||||
"badge": "About",
|
||||
"title": "About this project",
|
||||
"description": "This public app is the frontend surface for CMS-driven content and upcoming dynamic pages."
|
||||
},
|
||||
"Contact": {
|
||||
"badge": "Contact",
|
||||
"title": "Contact",
|
||||
"description": "Contact and commission flows will be introduced in upcoming MVP steps."
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,5 +15,31 @@
|
||||
"es": "Español",
|
||||
"fr": "Francés"
|
||||
}
|
||||
},
|
||||
"Layout": {
|
||||
"brand": "CMS Web",
|
||||
"nav": {
|
||||
"home": "Inicio",
|
||||
"about": "Acerca de",
|
||||
"contact": "Contacto"
|
||||
},
|
||||
"footer": {
|
||||
"copyright": "© {year} CMS Web",
|
||||
"tagline": "Impulsado por Next.js, Bun, Prisma y TanStack."
|
||||
}
|
||||
},
|
||||
"Seo": {
|
||||
"title": "CMS Web",
|
||||
"description": "Frontend público para el monorepo CMS."
|
||||
},
|
||||
"About": {
|
||||
"badge": "Acerca de",
|
||||
"title": "Sobre este proyecto",
|
||||
"description": "Esta app pública es la superficie frontend para contenido gestionado por CMS y próximas páginas dinámicas."
|
||||
},
|
||||
"Contact": {
|
||||
"badge": "Contacto",
|
||||
"title": "Contacto",
|
||||
"description": "Los flujos de contacto y comisiones se incorporarán en los siguientes pasos del MVP."
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,5 +15,31 @@
|
||||
"es": "Espagnol",
|
||||
"fr": "Français"
|
||||
}
|
||||
},
|
||||
"Layout": {
|
||||
"brand": "CMS Web",
|
||||
"nav": {
|
||||
"home": "Accueil",
|
||||
"about": "À propos",
|
||||
"contact": "Contact"
|
||||
},
|
||||
"footer": {
|
||||
"copyright": "© {year} CMS Web",
|
||||
"tagline": "Propulsé par Next.js, Bun, Prisma et TanStack."
|
||||
}
|
||||
},
|
||||
"Seo": {
|
||||
"title": "CMS Web",
|
||||
"description": "Frontend public pour le monorepo CMS."
|
||||
},
|
||||
"About": {
|
||||
"badge": "À propos",
|
||||
"title": "À propos de ce projet",
|
||||
"description": "Cette application publique est la surface frontend pour le contenu piloté par CMS et les futures pages dynamiques."
|
||||
},
|
||||
"Contact": {
|
||||
"badge": "Contact",
|
||||
"title": "Contact",
|
||||
"description": "Les flux de contact et de commission seront introduits dans les prochaines étapes MVP."
|
||||
}
|
||||
}
|
||||
|
||||
35
e2e/i18n-smoke.pw.ts
Normal file
35
e2e/i18n-smoke.pw.ts
Normal file
@@ -0,0 +1,35 @@
|
||||
import { expect, test } from "@playwright/test"
|
||||
|
||||
test.describe("i18n smoke", () => {
|
||||
test("web renders localized page headings on key routes", async ({ page }, testInfo) => {
|
||||
test.skip(testInfo.project.name !== "web-chromium")
|
||||
|
||||
await page.goto("/")
|
||||
await page.locator("select").first().selectOption("de")
|
||||
await expect(page.getByRole("heading", { name: /dein next\.js cms frontend/i })).toBeVisible()
|
||||
|
||||
await page.getByRole("link", { name: /über uns/i }).click()
|
||||
await expect(page.getByRole("heading", { name: /über dieses projekt/i })).toBeVisible()
|
||||
|
||||
await page.locator("select").first().selectOption("es")
|
||||
await expect(page.getByRole("heading", { name: /sobre este proyecto/i })).toBeVisible()
|
||||
|
||||
await page.getByRole("link", { name: /contacto/i }).click()
|
||||
await expect(page.getByRole("heading", { name: /^contacto$/i })).toBeVisible()
|
||||
})
|
||||
|
||||
test("admin login renders localized heading and labels", async ({ page }, testInfo) => {
|
||||
test.skip(testInfo.project.name !== "admin-chromium")
|
||||
|
||||
await page.goto("/login")
|
||||
await expect(page.getByRole("heading", { name: /sign in to cms admin/i })).toBeVisible()
|
||||
|
||||
await page.locator("select").first().selectOption("fr")
|
||||
await expect(page.getByRole("heading", { name: /se connecter à cms admin/i })).toBeVisible()
|
||||
await expect(page.getByLabel(/e-mail ou nom d’utilisateur/i)).toBeVisible()
|
||||
|
||||
await page.locator("select").first().selectOption("es")
|
||||
await expect(page.getByRole("heading", { name: /iniciar sesión en cms admin/i })).toBeVisible()
|
||||
await expect(page.getByLabel(/correo o nombre de usuario/i)).toBeVisible()
|
||||
})
|
||||
})
|
||||
@@ -28,4 +28,31 @@ describe("rbac model", () => {
|
||||
expect(permissionMatrix.editor.length).toBeGreaterThan(0)
|
||||
expect(permissionMatrix.manager.length).toBeGreaterThan(0)
|
||||
})
|
||||
|
||||
it("prevents privilege escalation for non-admin roles", () => {
|
||||
expect(hasPermission("editor", "users:manage_roles", "global")).toBe(false)
|
||||
expect(hasPermission("manager", "users:manage_roles", "global")).toBe(false)
|
||||
expect(hasPermission("editor", "dashboard:read", "global")).toBe(true)
|
||||
})
|
||||
|
||||
it("keeps role policy regressions visible for critical permissions", () => {
|
||||
const criticalChecks: Array<{
|
||||
role: "owner" | "support" | "admin" | "manager" | "editor"
|
||||
permission: Parameters<typeof hasPermission>[1]
|
||||
scope: Parameters<typeof hasPermission>[2]
|
||||
allowed: boolean
|
||||
}> = [
|
||||
{ role: "owner", permission: "users:manage_roles", scope: "global", allowed: true },
|
||||
{ role: "support", permission: "users:manage_roles", scope: "global", allowed: true },
|
||||
{ role: "admin", permission: "banner:write", scope: "global", allowed: true },
|
||||
{ role: "manager", permission: "users:write", scope: "global", allowed: false },
|
||||
{ role: "manager", permission: "users:write", scope: "team", allowed: true },
|
||||
{ role: "editor", permission: "news:publish", scope: "team", allowed: false },
|
||||
{ role: "editor", permission: "news:publish", scope: "own", allowed: true },
|
||||
]
|
||||
|
||||
for (const check of criticalChecks) {
|
||||
expect(hasPermission(check.role, check.permission, check.scope)).toBe(check.allowed)
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
124
packages/crud/src/contract.test.ts
Normal file
124
packages/crud/src/contract.test.ts
Normal file
@@ -0,0 +1,124 @@
|
||||
import { describe, expect, it } from "vitest"
|
||||
import { z } from "zod"
|
||||
|
||||
import { createCrudService } from "./service"
|
||||
|
||||
type RecordItem = {
|
||||
id: string
|
||||
title: string
|
||||
}
|
||||
|
||||
describe("crud service contract", () => {
|
||||
it("calls repository in expected order for update and delete", async () => {
|
||||
const calls: string[] = []
|
||||
const state = new Map<string, RecordItem>([["1", { id: "1", title: "Initial" }]])
|
||||
|
||||
const service = createCrudService({
|
||||
resource: "item",
|
||||
repository: {
|
||||
list: async () => {
|
||||
calls.push("list")
|
||||
return Array.from(state.values())
|
||||
},
|
||||
findById: async (id) => {
|
||||
calls.push(`findById:${id}`)
|
||||
return state.get(id) ?? null
|
||||
},
|
||||
create: async (input: { title: string }) => {
|
||||
calls.push("create")
|
||||
return {
|
||||
id: "2",
|
||||
title: input.title,
|
||||
}
|
||||
},
|
||||
update: async (id, input: { title?: string }) => {
|
||||
calls.push(`update:${id}`)
|
||||
const current = state.get(id)
|
||||
if (!current) {
|
||||
throw new Error("missing")
|
||||
}
|
||||
const updated = {
|
||||
...current,
|
||||
...input,
|
||||
}
|
||||
state.set(id, updated)
|
||||
return updated
|
||||
},
|
||||
delete: async (id) => {
|
||||
calls.push(`delete:${id}`)
|
||||
const current = state.get(id)
|
||||
if (!current) {
|
||||
throw new Error("missing")
|
||||
}
|
||||
state.delete(id)
|
||||
return current
|
||||
},
|
||||
},
|
||||
schemas: {
|
||||
create: z.object({
|
||||
title: z.string().min(3),
|
||||
}),
|
||||
update: z.object({
|
||||
title: z.string().min(3).optional(),
|
||||
}),
|
||||
},
|
||||
})
|
||||
|
||||
await service.update("1", { title: "Updated" })
|
||||
await service.delete("1")
|
||||
|
||||
expect(calls).toEqual(["findById:1", "update:1", "findById:1", "delete:1"])
|
||||
})
|
||||
|
||||
it("passes parsed payload to repository create/update contracts", async () => {
|
||||
let createPayload: unknown = null
|
||||
let updatePayload: unknown = null
|
||||
|
||||
const service = createCrudService({
|
||||
resource: "item",
|
||||
repository: {
|
||||
list: async () => [],
|
||||
findById: async () => ({
|
||||
id: "1",
|
||||
title: "Existing",
|
||||
}),
|
||||
create: async (input: { title: string }) => {
|
||||
createPayload = input
|
||||
return {
|
||||
id: "2",
|
||||
title: input.title,
|
||||
}
|
||||
},
|
||||
update: async (_id, input: { title?: string }) => {
|
||||
updatePayload = input
|
||||
return {
|
||||
id: "1",
|
||||
title: input.title ?? "Existing",
|
||||
}
|
||||
},
|
||||
delete: async () => ({
|
||||
id: "1",
|
||||
title: "Existing",
|
||||
}),
|
||||
},
|
||||
schemas: {
|
||||
create: z.object({
|
||||
title: z.string().trim().min(3),
|
||||
}),
|
||||
update: z.object({
|
||||
title: z.string().trim().min(3).optional(),
|
||||
}),
|
||||
},
|
||||
})
|
||||
|
||||
await service.create({
|
||||
title: " Created ",
|
||||
})
|
||||
await service.update("1", {
|
||||
title: " Updated ",
|
||||
})
|
||||
|
||||
expect(createPayload).toEqual({ title: "Created" })
|
||||
expect(updatePayload).toEqual({ title: "Updated" })
|
||||
})
|
||||
})
|
||||
@@ -12,6 +12,20 @@ async function main() {
|
||||
status: "published",
|
||||
},
|
||||
})
|
||||
|
||||
await db.systemSetting.upsert({
|
||||
where: { key: "public.header_banner" },
|
||||
update: {},
|
||||
create: {
|
||||
key: "public.header_banner",
|
||||
value: JSON.stringify({
|
||||
enabled: true,
|
||||
message: "New portfolio release is live.",
|
||||
ctaLabel: "Open latest posts",
|
||||
ctaHref: "/",
|
||||
}),
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
main()
|
||||
|
||||
@@ -7,4 +7,9 @@ export {
|
||||
registerPostCrudAuditHook,
|
||||
updatePost,
|
||||
} from "./posts"
|
||||
export { isAdminSelfRegistrationEnabled, setAdminSelfRegistrationEnabled } from "./settings"
|
||||
export type { PublicHeaderBanner } from "./settings"
|
||||
export {
|
||||
getPublicHeaderBanner,
|
||||
isAdminSelfRegistrationEnabled,
|
||||
setAdminSelfRegistrationEnabled,
|
||||
} from "./settings"
|
||||
|
||||
@@ -1,6 +1,20 @@
|
||||
import { db } from "./client"
|
||||
|
||||
const ADMIN_SELF_REGISTRATION_KEY = "admin.self_registration_enabled"
|
||||
const PUBLIC_HEADER_BANNER_KEY = "public.header_banner"
|
||||
|
||||
type PublicHeaderBannerRecord = {
|
||||
enabled: boolean
|
||||
message: string
|
||||
ctaLabel?: string
|
||||
ctaHref?: string
|
||||
}
|
||||
|
||||
export type PublicHeaderBanner = {
|
||||
message: string
|
||||
ctaLabel?: string
|
||||
ctaHref?: string
|
||||
}
|
||||
|
||||
function resolveEnvFallback(): boolean {
|
||||
return process.env.CMS_ADMIN_SELF_REGISTRATION_ENABLED === "true"
|
||||
@@ -18,6 +32,25 @@ function parseStoredBoolean(value: string): boolean | null {
|
||||
return null
|
||||
}
|
||||
|
||||
function parsePublicHeaderBanner(value: string): PublicHeaderBannerRecord | null {
|
||||
try {
|
||||
const parsed = JSON.parse(value) as Record<string, unknown>
|
||||
|
||||
if (typeof parsed.enabled !== "boolean" || typeof parsed.message !== "string") {
|
||||
return null
|
||||
}
|
||||
|
||||
return {
|
||||
enabled: parsed.enabled,
|
||||
message: parsed.message,
|
||||
ctaLabel: typeof parsed.ctaLabel === "string" ? parsed.ctaLabel : undefined,
|
||||
ctaHref: typeof parsed.ctaHref === "string" ? parsed.ctaHref : undefined,
|
||||
}
|
||||
} catch {
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
export async function isAdminSelfRegistrationEnabled(): Promise<boolean> {
|
||||
try {
|
||||
const setting = await db.systemSetting.findUnique({
|
||||
@@ -54,3 +87,30 @@ export async function setAdminSelfRegistrationEnabled(enabled: boolean): Promise
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
export async function getPublicHeaderBanner(): Promise<PublicHeaderBanner | null> {
|
||||
try {
|
||||
const setting = await db.systemSetting.findUnique({
|
||||
where: { key: PUBLIC_HEADER_BANNER_KEY },
|
||||
select: { value: true },
|
||||
})
|
||||
|
||||
if (!setting) {
|
||||
return null
|
||||
}
|
||||
|
||||
const parsed = parsePublicHeaderBanner(setting.value)
|
||||
|
||||
if (!parsed || !parsed.enabled) {
|
||||
return null
|
||||
}
|
||||
|
||||
return {
|
||||
message: parsed.message,
|
||||
ctaLabel: parsed.ctaLabel,
|
||||
ctaHref: parsed.ctaHref,
|
||||
}
|
||||
} catch {
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user