Compare commits
7 Commits
todo/mvp0-
...
todo/mvp0-
| Author | SHA1 | Date | |
|---|---|---|---|
|
8390689c8d
|
|||
|
bf1a92d129
|
|||
|
36b09cd9d7
|
|||
| 70fc154f97 | |||
| c4d0499d12 | |||
| d16fb6e121 | |||
| a508e3203a |
24
TODO.md
24
TODO.md
@@ -32,30 +32,30 @@ This file is the single source of truth for roadmap and delivery progress.
|
|||||||
- [x] [P1] First-start onboarding route for initial owner creation (`/welcome`)
|
- [x] [P1] First-start onboarding route for initial owner creation (`/welcome`)
|
||||||
- [x] [P1] Split auth entry points (`/welcome`, `/login`, `/register`) with cross-links
|
- [x] [P1] Split auth entry points (`/welcome`, `/login`, `/register`) with cross-links
|
||||||
- [x] [P2] Support fallback sign-in route (`/support/:key`) as break-glass access
|
- [x] [P2] Support fallback sign-in route (`/support/:key`) as break-glass access
|
||||||
- [~] [P1] Reusable CRUD base patterns (list/detail/editor/service/repository)
|
- [x] [P1] Reusable CRUD base patterns (list/detail/editor/service/repository)
|
||||||
- [~] [P1] Shared CRUD validation strategy (Zod + server-side enforcement)
|
- [x] [P1] Shared CRUD validation strategy (Zod + server-side enforcement)
|
||||||
- [~] [P1] Shared error and audit hooks for CRUD mutations
|
- [x] [P1] Shared error and audit hooks for CRUD mutations
|
||||||
|
|
||||||
### Admin App
|
### Admin App
|
||||||
|
|
||||||
- [x] [P1] Separate Next.js admin app in monorepo
|
- [x] [P1] Separate Next.js admin app in monorepo
|
||||||
- [x] [P1] App Router + TypeScript + `src/` structure
|
- [x] [P1] App Router + TypeScript + `src/` structure
|
||||||
- [x] [P1] Shared DB access via `@cms/db`
|
- [x] [P1] Shared DB access via `@cms/db`
|
||||||
- [~] [P2] Base admin dashboard shell and roadmap page (`/todo`)
|
- [x] [P2] Base admin dashboard shell and roadmap page (`/todo`)
|
||||||
- [x] [P1] Authentication and session model (`admin`, `editor`, `manager`)
|
- [x] [P1] Authentication and session model (`admin`, `editor`, `manager`)
|
||||||
- [x] [P1] Protected admin routes and session handling
|
- [x] [P1] Protected admin routes and session handling
|
||||||
- [~] [P1] Temporary admin posts CRUD sandbox for baseline functional validation
|
- [x] [P1] Temporary admin posts CRUD sandbox for baseline functional validation
|
||||||
- [~] [P1] Core admin IA (pages/media/users/commissions/settings)
|
- [x] [P1] Core admin IA (pages/media/users/commissions/settings)
|
||||||
|
|
||||||
### Public App
|
### Public App
|
||||||
|
|
||||||
- [x] [P1] Separate Next.js public app in monorepo
|
- [x] [P1] Separate Next.js public app in monorepo
|
||||||
- [x] [P1] App Router + TypeScript + `src/` structure
|
- [x] [P1] App Router + TypeScript + `src/` structure
|
||||||
- [~] [P1] Public app connected to shared data layer
|
- [x] [P1] Public app connected to shared data layer
|
||||||
- [ ] [P1] Localized route structure and middleware rules
|
- [x] [P1] Localized route structure and middleware rules
|
||||||
- [ ] [P2] Public layout system (header/footer/navigation)
|
- [x] [P2] Public layout system (header/footer/navigation)
|
||||||
- [ ] [P1] Header banner rendering from CMS-managed content
|
- [x] [P1] Header banner rendering from CMS-managed content
|
||||||
- [ ] [P2] Basic SEO defaults (metadata, OG, sitemap, robots)
|
- [x] [P2] Basic SEO defaults (metadata, OG, sitemap, robots)
|
||||||
|
|
||||||
### Testing
|
### Testing
|
||||||
|
|
||||||
@@ -203,6 +203,8 @@ This file is the single source of truth for roadmap and delivery progress.
|
|||||||
- [2026-02-10] Admin self-registration policy is now managed via `/settings` and persisted in `system_setting`; env var is fallback/default only.
|
- [2026-02-10] Admin self-registration policy is now managed via `/settings` and persisted in `system_setting`; env var is fallback/default only.
|
||||||
- [2026-02-10] E2E now runs with deterministic preparation (`test:e2e:prepare`: generate + migrate deploy + seed) before Playwright execution.
|
- [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] 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`).
|
||||||
|
|
||||||
## How We Use This File
|
## How We Use This File
|
||||||
|
|
||||||
|
|||||||
34
apps/admin/src/app/commissions/page.tsx
Normal file
34
apps/admin/src/app/commissions/page.tsx
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
import { AdminSectionPlaceholder } from "@/components/admin-section-placeholder"
|
||||||
|
import { AdminShell } from "@/components/admin-shell"
|
||||||
|
import { requirePermissionForRoute } from "@/lib/route-guards"
|
||||||
|
|
||||||
|
export const dynamic = "force-dynamic"
|
||||||
|
|
||||||
|
export default async function CommissionsManagementPage() {
|
||||||
|
const role = await requirePermissionForRoute({
|
||||||
|
nextPath: "/commissions",
|
||||||
|
permission: "commissions:read",
|
||||||
|
scope: "own",
|
||||||
|
})
|
||||||
|
|
||||||
|
return (
|
||||||
|
<AdminShell
|
||||||
|
role={role}
|
||||||
|
activePath="/commissions"
|
||||||
|
badge="Admin App"
|
||||||
|
title="Commissions"
|
||||||
|
description="Prepare commissions intake and kanban workflow tooling."
|
||||||
|
>
|
||||||
|
<AdminSectionPlaceholder
|
||||||
|
feature="Commissions Workflow"
|
||||||
|
summary="This route is reserved for request intake, ownership assignment, and kanban transitions."
|
||||||
|
requiredPermission="commissions:read (own)"
|
||||||
|
nextSteps={[
|
||||||
|
"Add commissions board with status columns.",
|
||||||
|
"Add assignment, due-date, and notes editing.",
|
||||||
|
"Add transition rules and audit history.",
|
||||||
|
]}
|
||||||
|
/>
|
||||||
|
</AdminShell>
|
||||||
|
)
|
||||||
|
}
|
||||||
34
apps/admin/src/app/media/page.tsx
Normal file
34
apps/admin/src/app/media/page.tsx
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
import { AdminSectionPlaceholder } from "@/components/admin-section-placeholder"
|
||||||
|
import { AdminShell } from "@/components/admin-shell"
|
||||||
|
import { requirePermissionForRoute } from "@/lib/route-guards"
|
||||||
|
|
||||||
|
export const dynamic = "force-dynamic"
|
||||||
|
|
||||||
|
export default async function MediaManagementPage() {
|
||||||
|
const role = await requirePermissionForRoute({
|
||||||
|
nextPath: "/media",
|
||||||
|
permission: "media:read",
|
||||||
|
scope: "team",
|
||||||
|
})
|
||||||
|
|
||||||
|
return (
|
||||||
|
<AdminShell
|
||||||
|
role={role}
|
||||||
|
activePath="/media"
|
||||||
|
badge="Admin App"
|
||||||
|
title="Media"
|
||||||
|
description="Prepare media library and enrichment workflows."
|
||||||
|
>
|
||||||
|
<AdminSectionPlaceholder
|
||||||
|
feature="Media Library"
|
||||||
|
summary="This route is ready for media browsing, upload, and metadata refinement features."
|
||||||
|
requiredPermission="media:read (team)"
|
||||||
|
nextSteps={[
|
||||||
|
"Add media upload and asset listing.",
|
||||||
|
"Add enrichment fields (alt text, source, tags).",
|
||||||
|
"Add artwork-specific refinement fields.",
|
||||||
|
]}
|
||||||
|
/>
|
||||||
|
</AdminShell>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -5,11 +5,10 @@ import { revalidatePath } from "next/cache"
|
|||||||
import Link from "next/link"
|
import Link from "next/link"
|
||||||
import { redirect } from "next/navigation"
|
import { redirect } from "next/navigation"
|
||||||
|
|
||||||
import { AdminLocaleSwitcher } from "@/components/admin-locale-switcher"
|
import { AdminShell } from "@/components/admin-shell"
|
||||||
import { translateMessage } from "@/i18n/messages"
|
import { translateMessage } from "@/i18n/messages"
|
||||||
import { getAdminMessages, resolveAdminLocale } from "@/i18n/server"
|
import { getAdminMessages, resolveAdminLocale } from "@/i18n/server"
|
||||||
import { resolveRoleFromServerContext } from "@/lib/access-server"
|
import { requirePermissionForRoute } from "@/lib/route-guards"
|
||||||
import { LogoutButton } from "./logout-button"
|
|
||||||
|
|
||||||
export const dynamic = "force-dynamic"
|
export const dynamic = "force-dynamic"
|
||||||
|
|
||||||
@@ -39,11 +38,11 @@ function readOptionalField(formData: FormData, field: string): string | undefine
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function requireNewsWritePermission() {
|
async function requireNewsWritePermission() {
|
||||||
const role = await resolveRoleFromServerContext()
|
await requirePermissionForRoute({
|
||||||
|
nextPath: "/",
|
||||||
if (!role || !hasPermission(role, "news:write", "team")) {
|
permission: "news:write",
|
||||||
redirect("/unauthorized?required=news:write&scope=team")
|
scope: "team",
|
||||||
}
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
function redirectWithState(params: { notice?: string; error?: string }) {
|
function redirectWithState(params: { notice?: string; error?: string }) {
|
||||||
@@ -156,15 +155,11 @@ export default async function AdminHomePage({
|
|||||||
}: {
|
}: {
|
||||||
searchParams: Promise<SearchParamsInput>
|
searchParams: Promise<SearchParamsInput>
|
||||||
}) {
|
}) {
|
||||||
const role = await resolveRoleFromServerContext()
|
const role = await requirePermissionForRoute({
|
||||||
|
nextPath: "/",
|
||||||
if (!role) {
|
permission: "news:read",
|
||||||
redirect("/login?next=/")
|
scope: "team",
|
||||||
}
|
})
|
||||||
|
|
||||||
if (!hasPermission(role, "news:read", "team")) {
|
|
||||||
redirect("/unauthorized?required=news:read&scope=team")
|
|
||||||
}
|
|
||||||
|
|
||||||
const [resolvedSearchParams, locale, posts] = await Promise.all([
|
const [resolvedSearchParams, locale, posts] = await Promise.all([
|
||||||
searchParams,
|
searchParams,
|
||||||
@@ -179,21 +174,14 @@ export default async function AdminHomePage({
|
|||||||
const canCreatePost = hasPermission(role, "news:write", "team")
|
const canCreatePost = hasPermission(role, "news:write", "team")
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<main className="mx-auto flex min-h-screen w-full max-w-4xl flex-col gap-8 px-6 py-16">
|
<AdminShell
|
||||||
<header className="space-y-3">
|
role={role}
|
||||||
<div className="flex items-center justify-between gap-3">
|
activePath="/"
|
||||||
<p className="text-sm uppercase tracking-[0.2em] text-neutral-500">
|
badge={t("dashboard.badge", "Admin App")}
|
||||||
{t("dashboard.badge", "Admin App")}
|
title={t("dashboard.title", "Content Dashboard")}
|
||||||
</p>
|
description={t("dashboard.description", "Manage posts from a dedicated admin surface.")}
|
||||||
<AdminLocaleSwitcher />
|
actions={
|
||||||
</div>
|
<>
|
||||||
<h1 className="text-4xl font-semibold tracking-tight">
|
|
||||||
{t("dashboard.title", "Content Dashboard")}
|
|
||||||
</h1>
|
|
||||||
<p className="text-neutral-600">
|
|
||||||
{t("dashboard.description", "Manage posts from a dedicated admin surface.")}
|
|
||||||
</p>
|
|
||||||
<div className="flex items-center gap-3 pt-2">
|
|
||||||
<Link
|
<Link
|
||||||
href="/todo"
|
href="/todo"
|
||||||
className="inline-flex rounded-md border border-neutral-300 px-4 py-2 text-sm font-medium hover:bg-neutral-100"
|
className="inline-flex rounded-md border border-neutral-300 px-4 py-2 text-sm font-medium hover:bg-neutral-100"
|
||||||
@@ -206,10 +194,9 @@ export default async function AdminHomePage({
|
|||||||
>
|
>
|
||||||
{t("settings.title", "Settings")}
|
{t("settings.title", "Settings")}
|
||||||
</Link>
|
</Link>
|
||||||
<LogoutButton />
|
</>
|
||||||
</div>
|
}
|
||||||
</header>
|
>
|
||||||
|
|
||||||
{notice ? (
|
{notice ? (
|
||||||
<section className="rounded-xl border border-emerald-300 bg-emerald-50 px-4 py-3 text-sm text-emerald-800">
|
<section className="rounded-xl border border-emerald-300 bg-emerald-50 px-4 py-3 text-sm text-emerald-800">
|
||||||
{notice}
|
{notice}
|
||||||
@@ -413,6 +400,6 @@ export default async function AdminHomePage({
|
|||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
</main>
|
</AdminShell>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
34
apps/admin/src/app/pages/page.tsx
Normal file
34
apps/admin/src/app/pages/page.tsx
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
import { AdminSectionPlaceholder } from "@/components/admin-section-placeholder"
|
||||||
|
import { AdminShell } from "@/components/admin-shell"
|
||||||
|
import { requirePermissionForRoute } from "@/lib/route-guards"
|
||||||
|
|
||||||
|
export const dynamic = "force-dynamic"
|
||||||
|
|
||||||
|
export default async function PagesManagementPage() {
|
||||||
|
const role = await requirePermissionForRoute({
|
||||||
|
nextPath: "/pages",
|
||||||
|
permission: "pages:read",
|
||||||
|
scope: "team",
|
||||||
|
})
|
||||||
|
|
||||||
|
return (
|
||||||
|
<AdminShell
|
||||||
|
role={role}
|
||||||
|
activePath="/pages"
|
||||||
|
badge="Admin App"
|
||||||
|
title="Pages"
|
||||||
|
description="Manage page entities and publication workflows."
|
||||||
|
>
|
||||||
|
<AdminSectionPlaceholder
|
||||||
|
feature="Page Management"
|
||||||
|
summary="This MVP0 scaffold defines information architecture and access boundaries for future page CRUD."
|
||||||
|
requiredPermission="pages:read (team)"
|
||||||
|
nextSteps={[
|
||||||
|
"Add page entity list and search.",
|
||||||
|
"Add create/edit draft flows with validation.",
|
||||||
|
"Add publish/unpublish scheduling controls.",
|
||||||
|
]}
|
||||||
|
/>
|
||||||
|
</AdminShell>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -1,14 +1,13 @@
|
|||||||
import { hasPermission } from "@cms/content/rbac"
|
|
||||||
import { isAdminSelfRegistrationEnabled, setAdminSelfRegistrationEnabled } from "@cms/db"
|
import { isAdminSelfRegistrationEnabled, setAdminSelfRegistrationEnabled } from "@cms/db"
|
||||||
import { Button } from "@cms/ui/button"
|
import { Button } from "@cms/ui/button"
|
||||||
import { revalidatePath } from "next/cache"
|
import { revalidatePath } from "next/cache"
|
||||||
import Link from "next/link"
|
import Link from "next/link"
|
||||||
import { redirect } from "next/navigation"
|
import { redirect } from "next/navigation"
|
||||||
|
|
||||||
import { AdminLocaleSwitcher } from "@/components/admin-locale-switcher"
|
import { AdminShell } from "@/components/admin-shell"
|
||||||
import { translateMessage } from "@/i18n/messages"
|
import { translateMessage } from "@/i18n/messages"
|
||||||
import { getAdminMessages, resolveAdminLocale } from "@/i18n/server"
|
import { getAdminMessages, resolveAdminLocale } from "@/i18n/server"
|
||||||
import { resolveRoleFromServerContext } from "@/lib/access-server"
|
import { requirePermissionForRoute } from "@/lib/route-guards"
|
||||||
|
|
||||||
type SearchParamsInput = Promise<Record<string, string | string[] | undefined>>
|
type SearchParamsInput = Promise<Record<string, string | string[] | undefined>>
|
||||||
|
|
||||||
@@ -21,15 +20,11 @@ function toSingleValue(input: string | string[] | undefined): string | null {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function requireSettingsPermission() {
|
async function requireSettingsPermission() {
|
||||||
const role = await resolveRoleFromServerContext()
|
await requirePermissionForRoute({
|
||||||
|
nextPath: "/settings",
|
||||||
if (!role) {
|
permission: "users:manage_roles",
|
||||||
redirect("/login?next=/settings")
|
scope: "global",
|
||||||
}
|
})
|
||||||
|
|
||||||
if (!hasPermission(role, "users:manage_roles", "global")) {
|
|
||||||
redirect("/unauthorized?required=users:manage_roles&scope=global")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function getSettingsTranslator() {
|
async function getSettingsTranslator() {
|
||||||
@@ -85,7 +80,11 @@ async function updateRegistrationPolicyAction(formData: FormData) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export default async function SettingsPage({ searchParams }: { searchParams: SearchParamsInput }) {
|
export default async function SettingsPage({ searchParams }: { searchParams: SearchParamsInput }) {
|
||||||
await requireSettingsPermission()
|
const role = await requirePermissionForRoute({
|
||||||
|
nextPath: "/settings",
|
||||||
|
permission: "users:manage_roles",
|
||||||
|
scope: "global",
|
||||||
|
})
|
||||||
|
|
||||||
const [params, locale, isRegistrationEnabled] = await Promise.all([
|
const [params, locale, isRegistrationEnabled] = await Promise.all([
|
||||||
searchParams,
|
searchParams,
|
||||||
@@ -99,31 +98,24 @@ export default async function SettingsPage({ searchParams }: { searchParams: Sea
|
|||||||
const error = toSingleValue(params.error)
|
const error = toSingleValue(params.error)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<main className="mx-auto flex min-h-screen w-full max-w-4xl flex-col gap-8 px-6 py-16">
|
<AdminShell
|
||||||
<header className="space-y-3">
|
role={role}
|
||||||
<div className="flex items-center justify-between gap-3">
|
activePath="/settings"
|
||||||
<p className="text-sm uppercase tracking-[0.2em] text-neutral-500">
|
badge={t("settings.badge", "Admin Settings")}
|
||||||
{t("settings.badge", "Admin Settings")}
|
title={t("settings.title", "Settings")}
|
||||||
</p>
|
description={t(
|
||||||
<AdminLocaleSwitcher />
|
"settings.description",
|
||||||
</div>
|
"Manage runtime policies for the admin authentication and onboarding flow.",
|
||||||
<h1 className="text-4xl font-semibold tracking-tight">{t("settings.title", "Settings")}</h1>
|
)}
|
||||||
<p className="text-neutral-600">
|
actions={
|
||||||
{t(
|
<Link
|
||||||
"settings.description",
|
href="/"
|
||||||
"Manage runtime policies for the admin authentication and onboarding flow.",
|
className="inline-flex rounded-md border border-neutral-300 px-4 py-2 text-sm font-medium hover:bg-neutral-100"
|
||||||
)}
|
>
|
||||||
</p>
|
{t("settings.actions.backToDashboard", "Back to dashboard")}
|
||||||
<div className="flex items-center gap-3 pt-2">
|
</Link>
|
||||||
<Link
|
}
|
||||||
href="/"
|
>
|
||||||
className="inline-flex rounded-md border border-neutral-300 px-4 py-2 text-sm font-medium hover:bg-neutral-100"
|
|
||||||
>
|
|
||||||
{t("settings.actions.backToDashboard", "Back to dashboard")}
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
</header>
|
|
||||||
|
|
||||||
{notice ? (
|
{notice ? (
|
||||||
<section className="rounded-xl border border-emerald-300 bg-emerald-50 px-4 py-3 text-sm text-emerald-800">
|
<section className="rounded-xl border border-emerald-300 bg-emerald-50 px-4 py-3 text-sm text-emerald-800">
|
||||||
{notice}
|
{notice}
|
||||||
@@ -183,6 +175,6 @@ export default async function SettingsPage({ searchParams }: { searchParams: Sea
|
|||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
</main>
|
</AdminShell>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
import { readFile } from "node:fs/promises"
|
import { readFile } from "node:fs/promises"
|
||||||
import path from "node:path"
|
import path from "node:path"
|
||||||
import { hasPermission } from "@cms/content/rbac"
|
|
||||||
import Link from "next/link"
|
import Link from "next/link"
|
||||||
import { redirect } from "next/navigation"
|
|
||||||
|
|
||||||
import { resolveRoleFromServerContext } from "@/lib/access-server"
|
import { AdminShell } from "@/components/admin-shell"
|
||||||
|
import { requirePermissionForRoute } from "@/lib/route-guards"
|
||||||
|
|
||||||
export const dynamic = "force-dynamic"
|
export const dynamic = "force-dynamic"
|
||||||
|
|
||||||
@@ -405,15 +404,11 @@ function filterButtonClass(active: boolean): string {
|
|||||||
export default async function AdminTodoPage(props: {
|
export default async function AdminTodoPage(props: {
|
||||||
searchParams?: SearchParamsInput | Promise<SearchParamsInput>
|
searchParams?: SearchParamsInput | Promise<SearchParamsInput>
|
||||||
}) {
|
}) {
|
||||||
const role = await resolveRoleFromServerContext()
|
const role = await requirePermissionForRoute({
|
||||||
|
nextPath: "/todo",
|
||||||
if (!role) {
|
permission: "roadmap:read",
|
||||||
redirect("/login?next=/todo")
|
scope: "global",
|
||||||
}
|
})
|
||||||
|
|
||||||
if (!hasPermission(role, "roadmap:read", "global")) {
|
|
||||||
redirect("/unauthorized?required=roadmap:read&scope=global")
|
|
||||||
}
|
|
||||||
|
|
||||||
const content = await getTodoMarkdown()
|
const content = await getTodoMarkdown()
|
||||||
const sections = parseTodo(content)
|
const sections = parseTodo(content)
|
||||||
@@ -434,26 +429,21 @@ export default async function AdminTodoPage(props: {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<main className="mx-auto flex min-h-screen w-full max-w-6xl flex-col gap-8 px-6 py-12">
|
<AdminShell
|
||||||
<header className="space-y-4">
|
role={role}
|
||||||
<p className="text-sm uppercase tracking-[0.2em] text-neutral-500">Admin App</p>
|
activePath="/todo"
|
||||||
<div className="flex flex-wrap items-end justify-between gap-4">
|
badge="Admin App"
|
||||||
<div className="space-y-2">
|
title="Roadmap and Progress"
|
||||||
<h1 className="text-4xl font-semibold tracking-tight">Roadmap and Progress</h1>
|
description="Structured view from root TODO.md (single source of truth)."
|
||||||
<p className="text-neutral-600">
|
actions={
|
||||||
Structured view from root `TODO.md` (single source of truth).
|
<Link
|
||||||
</p>
|
href="/"
|
||||||
</div>
|
className="inline-flex rounded-md border border-neutral-300 px-4 py-2 text-sm font-medium hover:bg-neutral-100"
|
||||||
|
>
|
||||||
<Link
|
Back to dashboard
|
||||||
href="/"
|
</Link>
|
||||||
className="inline-flex rounded-md border border-neutral-300 px-4 py-2 text-sm font-medium hover:bg-neutral-100"
|
}
|
||||||
>
|
>
|
||||||
Back to dashboard
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
</header>
|
|
||||||
|
|
||||||
<section className="rounded-xl border border-neutral-200 bg-neutral-50 p-5">
|
<section className="rounded-xl border border-neutral-200 bg-neutral-50 p-5">
|
||||||
<div className="mb-4 flex items-center justify-between gap-4">
|
<div className="mb-4 flex items-center justify-between gap-4">
|
||||||
<p className="text-sm font-medium text-neutral-600">Weighted completion</p>
|
<p className="text-sm font-medium text-neutral-600">Weighted completion</p>
|
||||||
@@ -607,6 +597,6 @@ export default async function AdminTodoPage(props: {
|
|||||||
{content}
|
{content}
|
||||||
</pre>
|
</pre>
|
||||||
</details>
|
</details>
|
||||||
</main>
|
</AdminShell>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
34
apps/admin/src/app/users/page.tsx
Normal file
34
apps/admin/src/app/users/page.tsx
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
import { AdminSectionPlaceholder } from "@/components/admin-section-placeholder"
|
||||||
|
import { AdminShell } from "@/components/admin-shell"
|
||||||
|
import { requirePermissionForRoute } from "@/lib/route-guards"
|
||||||
|
|
||||||
|
export const dynamic = "force-dynamic"
|
||||||
|
|
||||||
|
export default async function UsersManagementPage() {
|
||||||
|
const role = await requirePermissionForRoute({
|
||||||
|
nextPath: "/users",
|
||||||
|
permission: "users:read",
|
||||||
|
scope: "own",
|
||||||
|
})
|
||||||
|
|
||||||
|
return (
|
||||||
|
<AdminShell
|
||||||
|
role={role}
|
||||||
|
activePath="/users"
|
||||||
|
badge="Admin App"
|
||||||
|
title="Users"
|
||||||
|
description="Prepare user lifecycle and role management operations."
|
||||||
|
>
|
||||||
|
<AdminSectionPlaceholder
|
||||||
|
feature="Users Management"
|
||||||
|
summary="This route sets the guardrail and UX entrypoint for role assignment, status, and invitation flows."
|
||||||
|
requiredPermission="users:read (own)"
|
||||||
|
nextSteps={[
|
||||||
|
"Add user list, filter, and detail views.",
|
||||||
|
"Add role and permission editing actions with owner/support safety rules.",
|
||||||
|
"Add disable/ban and invite workflows.",
|
||||||
|
]}
|
||||||
|
/>
|
||||||
|
</AdminShell>
|
||||||
|
)
|
||||||
|
}
|
||||||
40
apps/admin/src/components/admin-section-placeholder.tsx
Normal file
40
apps/admin/src/components/admin-section-placeholder.tsx
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
import type { ReactNode } from "react"
|
||||||
|
|
||||||
|
type AdminSectionPlaceholderProps = {
|
||||||
|
feature: string
|
||||||
|
summary: string
|
||||||
|
requiredPermission: string
|
||||||
|
nextSteps: string[]
|
||||||
|
children?: ReactNode
|
||||||
|
}
|
||||||
|
|
||||||
|
export function AdminSectionPlaceholder({
|
||||||
|
feature,
|
||||||
|
summary,
|
||||||
|
requiredPermission,
|
||||||
|
nextSteps,
|
||||||
|
children,
|
||||||
|
}: AdminSectionPlaceholderProps) {
|
||||||
|
return (
|
||||||
|
<section className="space-y-5 rounded-xl border border-neutral-200 p-6">
|
||||||
|
<div className="space-y-2">
|
||||||
|
<h2 className="text-xl font-medium">{feature}</h2>
|
||||||
|
<p className="text-sm text-neutral-600">{summary}</p>
|
||||||
|
<p className="text-xs uppercase tracking-wide text-neutral-500">
|
||||||
|
Required permission: {requiredPermission}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{children}
|
||||||
|
|
||||||
|
<div className="rounded-lg border border-neutral-200 bg-neutral-50 p-4">
|
||||||
|
<p className="text-sm font-medium text-neutral-800">Planned next steps</p>
|
||||||
|
<ul className="mt-2 list-disc space-y-1 pl-5 text-sm text-neutral-600">
|
||||||
|
{nextSteps.map((step) => (
|
||||||
|
<li key={step}>{step}</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
)
|
||||||
|
}
|
||||||
117
apps/admin/src/components/admin-shell.tsx
Normal file
117
apps/admin/src/components/admin-shell.tsx
Normal file
@@ -0,0 +1,117 @@
|
|||||||
|
import { hasPermission, type Permission, type PermissionScope, type Role } from "@cms/content/rbac"
|
||||||
|
import Link from "next/link"
|
||||||
|
import type { ReactNode } from "react"
|
||||||
|
|
||||||
|
import { LogoutButton } from "@/app/logout-button"
|
||||||
|
import { AdminLocaleSwitcher } from "@/components/admin-locale-switcher"
|
||||||
|
|
||||||
|
type AdminShellProps = {
|
||||||
|
role: Role
|
||||||
|
activePath: string
|
||||||
|
badge: string
|
||||||
|
title: string
|
||||||
|
description: string
|
||||||
|
actions?: ReactNode
|
||||||
|
children: ReactNode
|
||||||
|
}
|
||||||
|
|
||||||
|
type NavItem = {
|
||||||
|
href: string
|
||||||
|
label: string
|
||||||
|
permission: Permission
|
||||||
|
scope: PermissionScope
|
||||||
|
}
|
||||||
|
|
||||||
|
const navItems: NavItem[] = [
|
||||||
|
{ href: "/", label: "Dashboard", permission: "dashboard:read", scope: "global" },
|
||||||
|
{ href: "/pages", label: "Pages", permission: "pages:read", scope: "team" },
|
||||||
|
{ href: "/media", label: "Media", permission: "media:read", scope: "team" },
|
||||||
|
{ href: "/users", label: "Users", permission: "users:read", scope: "own" },
|
||||||
|
{ href: "/commissions", label: "Commissions", permission: "commissions:read", scope: "own" },
|
||||||
|
{ href: "/settings", label: "Settings", permission: "users:manage_roles", scope: "global" },
|
||||||
|
{ href: "/todo", label: "Roadmap", permission: "roadmap:read", scope: "global" },
|
||||||
|
]
|
||||||
|
|
||||||
|
function navItemClass(active: boolean): string {
|
||||||
|
if (active) {
|
||||||
|
return "bg-neutral-900 text-white border-neutral-900"
|
||||||
|
}
|
||||||
|
|
||||||
|
return "bg-white text-neutral-700 border-neutral-300 hover:bg-neutral-100"
|
||||||
|
}
|
||||||
|
|
||||||
|
function isActiveRoute(activePath: string, href: string): boolean {
|
||||||
|
if (href === "/") {
|
||||||
|
return activePath === "/"
|
||||||
|
}
|
||||||
|
|
||||||
|
return activePath === href || activePath.startsWith(`${href}/`)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function AdminShell({
|
||||||
|
role,
|
||||||
|
activePath,
|
||||||
|
badge,
|
||||||
|
title,
|
||||||
|
description,
|
||||||
|
actions,
|
||||||
|
children,
|
||||||
|
}: AdminShellProps) {
|
||||||
|
return (
|
||||||
|
<div className="mx-auto flex min-h-screen w-full max-w-7xl gap-8 px-6 py-10">
|
||||||
|
<aside className="sticky top-0 hidden h-fit w-64 shrink-0 space-y-4 lg:block">
|
||||||
|
<div className="rounded-xl border border-neutral-200 bg-white p-4">
|
||||||
|
<p className="text-xs font-semibold uppercase tracking-[0.2em] text-neutral-500">
|
||||||
|
CMS Admin
|
||||||
|
</p>
|
||||||
|
<p className="mt-2 text-sm text-neutral-600">Role: {role}</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<nav className="space-y-2">
|
||||||
|
{navItems
|
||||||
|
.filter((item) => hasPermission(role, item.permission, item.scope))
|
||||||
|
.map((item) => (
|
||||||
|
<Link
|
||||||
|
key={item.href}
|
||||||
|
href={item.href}
|
||||||
|
className={`block rounded-md border px-3 py-2 text-sm font-medium ${navItemClass(isActiveRoute(activePath, item.href))}`}
|
||||||
|
>
|
||||||
|
{item.label}
|
||||||
|
</Link>
|
||||||
|
))}
|
||||||
|
</nav>
|
||||||
|
</aside>
|
||||||
|
|
||||||
|
<div className="min-w-0 flex-1 space-y-8">
|
||||||
|
<nav className="flex flex-wrap gap-2 lg:hidden">
|
||||||
|
{navItems
|
||||||
|
.filter((item) => hasPermission(role, item.permission, item.scope))
|
||||||
|
.map((item) => (
|
||||||
|
<Link
|
||||||
|
key={`mobile-${item.href}`}
|
||||||
|
href={item.href}
|
||||||
|
className={`rounded-md border px-3 py-2 text-sm font-medium ${navItemClass(isActiveRoute(activePath, item.href))}`}
|
||||||
|
>
|
||||||
|
{item.label}
|
||||||
|
</Link>
|
||||||
|
))}
|
||||||
|
</nav>
|
||||||
|
|
||||||
|
<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">{badge}</p>
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<AdminLocaleSwitcher />
|
||||||
|
<LogoutButton />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<h1 className="text-4xl font-semibold tracking-tight">{title}</h1>
|
||||||
|
<p className="text-neutral-600">{description}</p>
|
||||||
|
{actions ? <div className="flex flex-wrap items-center gap-3 pt-1">{actions}</div> : null}
|
||||||
|
</header>
|
||||||
|
|
||||||
|
{children}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -21,4 +21,23 @@ describe("admin route access rules", () => {
|
|||||||
scope: "global",
|
scope: "global",
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it("maps new admin IA routes to dedicated permissions", () => {
|
||||||
|
expect(getRequiredPermission("/pages")).toEqual({
|
||||||
|
permission: "pages:read",
|
||||||
|
scope: "team",
|
||||||
|
})
|
||||||
|
expect(getRequiredPermission("/media")).toEqual({
|
||||||
|
permission: "media:read",
|
||||||
|
scope: "team",
|
||||||
|
})
|
||||||
|
expect(getRequiredPermission("/users")).toEqual({
|
||||||
|
permission: "users:read",
|
||||||
|
scope: "own",
|
||||||
|
})
|
||||||
|
expect(getRequiredPermission("/commissions")).toEqual({
|
||||||
|
permission: "commissions:read",
|
||||||
|
scope: "own",
|
||||||
|
})
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -43,6 +43,34 @@ const guardRules: GuardRule[] = [
|
|||||||
scope: "global",
|
scope: "global",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
route: /^\/pages(?:\/|$)/,
|
||||||
|
requirement: {
|
||||||
|
permission: "pages:read",
|
||||||
|
scope: "team",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
route: /^\/media(?:\/|$)/,
|
||||||
|
requirement: {
|
||||||
|
permission: "media:read",
|
||||||
|
scope: "team",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
route: /^\/users(?:\/|$)/,
|
||||||
|
requirement: {
|
||||||
|
permission: "users:read",
|
||||||
|
scope: "own",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
route: /^\/commissions(?:\/|$)/,
|
||||||
|
requirement: {
|
||||||
|
permission: "commissions:read",
|
||||||
|
scope: "own",
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
route: /^\/settings(?:\/|$)/,
|
route: /^\/settings(?:\/|$)/,
|
||||||
requirement: {
|
requirement: {
|
||||||
|
|||||||
30
apps/admin/src/lib/route-guards.ts
Normal file
30
apps/admin/src/lib/route-guards.ts
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
import { hasPermission, type Permission, type PermissionScope, type Role } from "@cms/content/rbac"
|
||||||
|
import { redirect } from "next/navigation"
|
||||||
|
|
||||||
|
import { resolveRoleFromServerContext } from "@/lib/access-server"
|
||||||
|
|
||||||
|
type RequirePermissionParams = {
|
||||||
|
nextPath: string
|
||||||
|
permission: Permission
|
||||||
|
scope: PermissionScope
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function requireRoleForRoute(nextPath: string): Promise<Role> {
|
||||||
|
const role = await resolveRoleFromServerContext()
|
||||||
|
|
||||||
|
if (!role) {
|
||||||
|
redirect(`/login?next=${encodeURIComponent(nextPath)}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
return role
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function requirePermissionForRoute(params: RequirePermissionParams): Promise<Role> {
|
||||||
|
const role = await requireRoleForRoute(params.nextPath)
|
||||||
|
|
||||||
|
if (!hasPermission(role, params.permission, params.scope)) {
|
||||||
|
redirect(`/unauthorized?required=${params.permission}&scope=${params.scope}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
return role
|
||||||
|
}
|
||||||
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 { notFound } from "next/navigation"
|
||||||
import { hasLocale, NextIntlClientProvider } from "next-intl"
|
import { hasLocale, NextIntlClientProvider } from "next-intl"
|
||||||
|
import { getTranslations } from "next-intl/server"
|
||||||
import type { ReactNode } from "react"
|
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 { routing } from "@/i18n/routing"
|
||||||
import { Providers } from "../providers"
|
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) {
|
export default async function LocaleLayout({ children, params }: LocaleLayoutProps) {
|
||||||
const { locale } = await params
|
const { locale } = await params
|
||||||
|
|
||||||
@@ -19,9 +46,16 @@ export default async function LocaleLayout({ children, params }: LocaleLayoutPro
|
|||||||
notFound()
|
notFound()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const banner = await getPublicHeaderBanner()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<NextIntlClientProvider locale={locale}>
|
<NextIntlClientProvider locale={locale}>
|
||||||
<Providers>{children}</Providers>
|
<Providers>
|
||||||
|
<PublicHeaderBanner banner={banner} />
|
||||||
|
<PublicSiteHeader />
|
||||||
|
<main>{children}</main>
|
||||||
|
<PublicSiteFooter />
|
||||||
|
</Providers>
|
||||||
</NextIntlClientProvider>
|
</NextIntlClientProvider>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,20 +2,15 @@ import { listPosts } from "@cms/db"
|
|||||||
import { Button } from "@cms/ui/button"
|
import { Button } from "@cms/ui/button"
|
||||||
import { getTranslations } from "next-intl/server"
|
import { getTranslations } from "next-intl/server"
|
||||||
|
|
||||||
import { LanguageSwitcher } from "@/components/language-switcher"
|
|
||||||
|
|
||||||
export const dynamic = "force-dynamic"
|
export const dynamic = "force-dynamic"
|
||||||
|
|
||||||
export default async function HomePage() {
|
export default async function HomePage() {
|
||||||
const [posts, t] = await Promise.all([listPosts(), getTranslations("Home")])
|
const [posts, t] = await Promise.all([listPosts(), getTranslations("Home")])
|
||||||
|
|
||||||
return (
|
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">
|
<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>
|
||||||
<p className="text-sm uppercase tracking-[0.2em] text-neutral-500">{t("badge")}</p>
|
|
||||||
<LanguageSwitcher />
|
|
||||||
</div>
|
|
||||||
<h1 className="text-4xl font-semibold tracking-tight">{t("title")}</h1>
|
<h1 className="text-4xl font-semibold tracking-tight">{t("title")}</h1>
|
||||||
<p className="text-neutral-600">{t("description")}</p>
|
<p className="text-neutral-600">{t("description")}</p>
|
||||||
</header>
|
</header>
|
||||||
@@ -36,6 +31,6 @@ export default async function HomePage() {
|
|||||||
))}
|
))}
|
||||||
</ul>
|
</ul>
|
||||||
</section>
|
</section>
|
||||||
</main>
|
</section>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,9 +3,30 @@ import type { ReactNode } from "react"
|
|||||||
|
|
||||||
import "./globals.css"
|
import "./globals.css"
|
||||||
|
|
||||||
|
const metadataBase = new URL(process.env.CMS_WEB_ORIGIN ?? "http://localhost:3000")
|
||||||
|
|
||||||
export const metadata: Metadata = {
|
export const metadata: Metadata = {
|
||||||
title: "CMS Web",
|
metadataBase,
|
||||||
|
title: {
|
||||||
|
default: "CMS Web",
|
||||||
|
template: "%s | CMS Web",
|
||||||
|
},
|
||||||
description: "Public frontend for the CMS monorepo",
|
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 }) {
|
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>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -15,5 +15,31 @@
|
|||||||
"es": "Spanisch",
|
"es": "Spanisch",
|
||||||
"fr": "Französisch"
|
"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",
|
"es": "Spanish",
|
||||||
"fr": "French"
|
"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",
|
"es": "Español",
|
||||||
"fr": "Francés"
|
"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",
|
"es": "Espagnol",
|
||||||
"fr": "Français"
|
"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."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,8 @@ MVP0 now includes a shared CRUD foundation package: `@cms/crud`.
|
|||||||
Current baseline:
|
Current baseline:
|
||||||
|
|
||||||
- Shared service factory: `createCrudService`
|
- Shared service factory: `createCrudService`
|
||||||
|
- Repository contract: `list`, `findById`, `create`, `update`, `delete`
|
||||||
|
- Service surface for list/detail/editor flows: `list`, `getById`, `create`, `update`, `delete`
|
||||||
- Shared validation error type: `CrudValidationError`
|
- Shared validation error type: `CrudValidationError`
|
||||||
- Shared not-found error type: `CrudNotFoundError`
|
- Shared not-found error type: `CrudNotFoundError`
|
||||||
- Shared mutation audit hook contract: `CrudAuditHook`
|
- Shared mutation audit hook contract: `CrudAuditHook`
|
||||||
@@ -24,6 +26,11 @@ Current baseline:
|
|||||||
- `registerPostCrudAuditHook`
|
- `registerPostCrudAuditHook`
|
||||||
|
|
||||||
Validation for create/update is enforced by `@cms/content` schemas.
|
Validation for create/update is enforced by `@cms/content` schemas.
|
||||||
|
Contract tests validate:
|
||||||
|
|
||||||
|
- repository list/detail behavior via CRUD service
|
||||||
|
- validation and not-found errors
|
||||||
|
- audit payload propagation (`actor`, `metadata`)
|
||||||
|
|
||||||
The admin dashboard currently includes a temporary posts CRUD sandbox to validate this flow through a real app UI.
|
The admin dashboard currently includes a temporary posts CRUD sandbox to validate this flow through a real app UI.
|
||||||
|
|
||||||
|
|||||||
@@ -63,6 +63,32 @@ function createMemoryRepository() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
describe("createCrudService", () => {
|
describe("createCrudService", () => {
|
||||||
|
it("supports list and detail lookups through the repository contract", async () => {
|
||||||
|
const service = createCrudService({
|
||||||
|
resource: "fake-entity",
|
||||||
|
repository: createMemoryRepository(),
|
||||||
|
schemas: {
|
||||||
|
create: z.object({
|
||||||
|
title: z.string().min(3),
|
||||||
|
}),
|
||||||
|
update: z.object({
|
||||||
|
title: z.string().min(3).optional(),
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
const createdA = await service.create({ title: "First" })
|
||||||
|
const createdB = await service.create({ title: "Second" })
|
||||||
|
|
||||||
|
expect(await service.getById(createdA.id)).toEqual(createdA)
|
||||||
|
expect(await service.getById("missing")).toBeNull()
|
||||||
|
|
||||||
|
const listed = await service.list()
|
||||||
|
expect(listed).toHaveLength(2)
|
||||||
|
expect(listed).toContainEqual(createdA)
|
||||||
|
expect(listed).toContainEqual(createdB)
|
||||||
|
})
|
||||||
|
|
||||||
it("validates create and update payloads", async () => {
|
it("validates create and update payloads", async () => {
|
||||||
const service = createCrudService({
|
const service = createCrudService({
|
||||||
resource: "fake-entity",
|
resource: "fake-entity",
|
||||||
@@ -106,8 +132,13 @@ describe("createCrudService", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
it("emits audit events for create, update and delete", async () => {
|
it("emits audit events for create, update and delete", async () => {
|
||||||
const events: Array<{ action: string; beforeTitle: string | null; afterTitle: string | null }> =
|
const events: Array<{
|
||||||
[]
|
action: string
|
||||||
|
beforeTitle: string | null
|
||||||
|
afterTitle: string | null
|
||||||
|
actorRole: string | null
|
||||||
|
requestId: string | null
|
||||||
|
}> = []
|
||||||
const service = createCrudService({
|
const service = createCrudService({
|
||||||
resource: "fake-entity",
|
resource: "fake-entity",
|
||||||
repository: createMemoryRepository(),
|
repository: createMemoryRepository(),
|
||||||
@@ -125,6 +156,9 @@ describe("createCrudService", () => {
|
|||||||
action: event.action,
|
action: event.action,
|
||||||
beforeTitle: event.before?.title ?? null,
|
beforeTitle: event.before?.title ?? null,
|
||||||
afterTitle: event.after?.title ?? null,
|
afterTitle: event.after?.title ?? null,
|
||||||
|
actorRole: event.actor?.role ?? null,
|
||||||
|
requestId:
|
||||||
|
typeof event.metadata?.requestId === "string" ? event.metadata.requestId : null,
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
@@ -134,6 +168,9 @@ describe("createCrudService", () => {
|
|||||||
{ title: "Created" },
|
{ title: "Created" },
|
||||||
{
|
{
|
||||||
actor: { id: "u-1", role: "owner" },
|
actor: { id: "u-1", role: "owner" },
|
||||||
|
metadata: {
|
||||||
|
requestId: "req-1",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -145,16 +182,22 @@ describe("createCrudService", () => {
|
|||||||
action: "create",
|
action: "create",
|
||||||
beforeTitle: null,
|
beforeTitle: null,
|
||||||
afterTitle: "Created",
|
afterTitle: "Created",
|
||||||
|
actorRole: "owner",
|
||||||
|
requestId: "req-1",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
action: "update",
|
action: "update",
|
||||||
beforeTitle: "Created",
|
beforeTitle: "Created",
|
||||||
afterTitle: "Updated",
|
afterTitle: "Updated",
|
||||||
|
actorRole: null,
|
||||||
|
requestId: null,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
action: "delete",
|
action: "delete",
|
||||||
beforeTitle: "Updated",
|
beforeTitle: "Updated",
|
||||||
afterTitle: null,
|
afterTitle: null,
|
||||||
|
actorRole: null,
|
||||||
|
requestId: null,
|
||||||
},
|
},
|
||||||
])
|
])
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -12,6 +12,20 @@ async function main() {
|
|||||||
status: "published",
|
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()
|
main()
|
||||||
|
|||||||
@@ -7,4 +7,9 @@ export {
|
|||||||
registerPostCrudAuditHook,
|
registerPostCrudAuditHook,
|
||||||
updatePost,
|
updatePost,
|
||||||
} from "./posts"
|
} 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"
|
import { db } from "./client"
|
||||||
|
|
||||||
const ADMIN_SELF_REGISTRATION_KEY = "admin.self_registration_enabled"
|
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 {
|
function resolveEnvFallback(): boolean {
|
||||||
return process.env.CMS_ADMIN_SELF_REGISTRATION_ENABLED === "true"
|
return process.env.CMS_ADMIN_SELF_REGISTRATION_ENABLED === "true"
|
||||||
@@ -18,6 +32,25 @@ function parseStoredBoolean(value: string): boolean | null {
|
|||||||
return 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> {
|
export async function isAdminSelfRegistrationEnabled(): Promise<boolean> {
|
||||||
try {
|
try {
|
||||||
const setting = await db.systemSetting.findUnique({
|
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