feat(pages): add reusable page block editor and renderer baseline
This commit is contained in:
42
TODO.md
42
TODO.md
@@ -190,21 +190,39 @@ This file is the single source of truth for roadmap and delivery progress.
|
|||||||
- [ ] [P2] Add code-level diagrams (Mermaid) for service boundaries and data relationships
|
- [ ] [P2] Add code-level diagrams (Mermaid) for service boundaries and data relationships
|
||||||
- [ ] [P2] Add route/action inventory for admin and public apps with linked source files
|
- [ ] [P2] Add route/action inventory for admin and public apps with linked source files
|
||||||
|
|
||||||
## MVP 1.5: UX/UI And Theming
|
## MVP 1.5: MVP1 Refinements (Planned)
|
||||||
|
|
||||||
### MVP1.5 Suggested Branch Order
|
### Scope
|
||||||
|
|
||||||
- [ ] [P1] `todo/mvp15-design-tokens-foundation`:
|
- [ ] [P1] Refine and harden all completed MVP1 modules (pages, navigation, media, portfolio, commissions, news)
|
||||||
|
- [ ] [P1] Resolve UX rough edges discovered during MVP1 implementation
|
||||||
|
- [ ] [P1] Improve admin workflows and reduce editor friction for daily use
|
||||||
|
- [ ] [P1] Stabilize public rendering behavior with better fallbacks and consistency
|
||||||
|
|
||||||
|
## MVP 2: MVP1 Quality Refinements (Planned)
|
||||||
|
|
||||||
|
### Scope
|
||||||
|
|
||||||
|
- [ ] [P1] Finish non-blocking enhancements postponed from MVP1 implementation
|
||||||
|
- [ ] [P1] Improve data modeling consistency and migration hygiene for MVP1 modules
|
||||||
|
- [ ] [P1] Consolidate reusable UI and domain primitives introduced during MVP1
|
||||||
|
- [ ] [P1] Address integration debt before moving to larger design/production phases
|
||||||
|
|
||||||
|
## MVP 3: UX/UI And Theming
|
||||||
|
|
||||||
|
### MVP3 Suggested Branch Order
|
||||||
|
|
||||||
|
- [ ] [P1] `todo/mvp3-design-tokens-foundation`:
|
||||||
establish shared design tokens (color, spacing, radius, typography scale, motion) in `@cms/ui` and app-level theme contracts
|
establish shared design tokens (color, spacing, radius, typography scale, motion) in `@cms/ui` and app-level theme contracts
|
||||||
- [ ] [P1] `todo/mvp15-admin-layout-polish`:
|
- [ ] [P1] `todo/mvp3-admin-layout-polish`:
|
||||||
refine admin shell, navigation hierarchy, spacing rhythm, table/form visual consistency, empty/loading/error states
|
refine admin shell, navigation hierarchy, spacing rhythm, table/form visual consistency, empty/loading/error states
|
||||||
- [ ] [P1] `todo/mvp15-public-layout-and-templates`:
|
- [ ] [P1] `todo/mvp3-public-layout-and-templates`:
|
||||||
define public visual direction (hero/header/footer/content widths), page templates for home/content/news/portfolio
|
define public visual direction (hero/header/footer/content widths), page templates for home/content/news/portfolio
|
||||||
- [ ] [P2] `todo/mvp15-component-library-pass`:
|
- [ ] [P2] `todo/mvp3-component-library-pass`:
|
||||||
align shadcn-based primitives with CMS brand system (buttons, inputs, cards, badges, tabs, dialogs, toasts)
|
align shadcn-based primitives with CMS brand system (buttons, inputs, cards, badges, tabs, dialogs, toasts)
|
||||||
- [ ] [P2] `todo/mvp15-responsive-and-a11y-pass`:
|
- [ ] [P2] `todo/mvp3-responsive-and-a11y-pass`:
|
||||||
mobile/tablet breakpoints, keyboard flow, focus states, contrast checks, reduced-motion support
|
mobile/tablet breakpoints, keyboard flow, focus states, contrast checks, reduced-motion support
|
||||||
- [ ] [P2] `todo/mvp15-visual-regression-baseline`:
|
- [ ] [P2] `todo/mvp3-visual-regression-baseline`:
|
||||||
add screenshot baselines for critical admin/public routes to guard layout regressions
|
add screenshot baselines for critical admin/public routes to guard layout regressions
|
||||||
|
|
||||||
### Deliverables
|
### Deliverables
|
||||||
@@ -214,7 +232,7 @@ This file is the single source of truth for roadmap and delivery progress.
|
|||||||
- [ ] [P2] Shared UI primitives are consistent across admin and public apps
|
- [ ] [P2] Shared UI primitives are consistent across admin and public apps
|
||||||
- [ ] [P2] Core routes have visual-regression coverage for the new layout baseline
|
- [ ] [P2] Core routes have visual-regression coverage for the new layout baseline
|
||||||
|
|
||||||
## MVP 2: Production Readiness
|
## MVP 4: Production Readiness
|
||||||
|
|
||||||
### Admin App
|
### Admin App
|
||||||
|
|
||||||
@@ -253,9 +271,9 @@ This file is the single source of truth for roadmap and delivery progress.
|
|||||||
|
|
||||||
### Testing
|
### Testing
|
||||||
|
|
||||||
- [~] [P1] Testing workstream moved to `MVP 3: Testing and Quality` and temporarily paused to prioritize feature delivery
|
- [~] [P1] Testing workstream moved to `MVP 5: Testing and Quality` and temporarily paused to prioritize feature delivery
|
||||||
|
|
||||||
## MVP 3: Testing and Quality
|
## MVP 5: Testing and Quality
|
||||||
|
|
||||||
### Status
|
### Status
|
||||||
|
|
||||||
@@ -316,7 +334,7 @@ This file is the single source of truth for roadmap and delivery progress.
|
|||||||
- [2026-02-11] Release workflow now publishes changelog-derived notes to Gitea releases and supports executable production rollback via SSH + compose tag switch.
|
- [2026-02-11] Release workflow now publishes changelog-derived notes to Gitea releases and supports executable production rollback via SSH + compose tag switch.
|
||||||
- [2026-02-11] Branch protection verification checklist is now documented; final UI-level verification remains environment-specific.
|
- [2026-02-11] Branch protection verification checklist is now documented; final UI-level verification remains environment-specific.
|
||||||
- [2026-02-11] Added a staging deployment execution checklist and deployment-record template to capture first real-host rollout evidence.
|
- [2026-02-11] Added a staging deployment execution checklist and deployment-record template to capture first real-host rollout evidence.
|
||||||
- [2026-02-11] Artist-focused feature map refined: MVP1 covers portfolio media/domain CRUD + announcements + customer/commission linking; MVP2 covers advanced automation (watermark, palette extraction, media transform pipelines).
|
- [2026-02-11] Artist-focused feature map refined: MVP1 covers portfolio media/domain CRUD + announcements + customer/commission linking; MVP4 covers advanced automation (watermark, palette extraction, media transform pipelines).
|
||||||
- [2026-02-11] `gaertan` inspiration to reuse: S3 object strategy with signed delivery, commission type/options/extras/custom-input modeling, request-status kanban mapping, and gallery rendition/color extraction patterns.
|
- [2026-02-11] `gaertan` inspiration to reuse: S3 object strategy with signed delivery, commission type/options/extras/custom-input modeling, request-status kanban mapping, and gallery rendition/color extraction patterns.
|
||||||
- [2026-02-11] MVP1 media foundation started: portfolio domain models (`MediaAsset`, `Artwork`, galleries/albums/categories/tags, rendition links) plus initial admin `/media` and `/portfolio` data views.
|
- [2026-02-11] MVP1 media foundation started: portfolio domain models (`MediaAsset`, `Artwork`, galleries/albums/categories/tags, rendition links) plus initial admin `/media` and `/portfolio` data views.
|
||||||
- [2026-02-11] `prisma migrate dev --name media_foundation` can fail when DB endpoint is unreachable; apply this named migration once `DATABASE_URL` host is reachable again.
|
- [2026-02-11] `prisma migrate dev --name media_foundation` can fail when DB endpoint is unreachable; apply this named migration once `DATABASE_URL` host is reachable again.
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import Link from "next/link"
|
|||||||
import { redirect } from "next/navigation"
|
import { redirect } from "next/navigation"
|
||||||
|
|
||||||
import { AdminShell } from "@/components/admin-shell"
|
import { AdminShell } from "@/components/admin-shell"
|
||||||
|
import { PageBlockEditor } from "@/components/pages/page-block-editor"
|
||||||
import { requirePermissionForRoute } from "@/lib/route-guards"
|
import { requirePermissionForRoute } from "@/lib/route-guards"
|
||||||
|
|
||||||
export const dynamic = "force-dynamic"
|
export const dynamic = "force-dynamic"
|
||||||
@@ -242,16 +243,7 @@ export default async function PageEditorPage({ params, searchParams }: PageProps
|
|||||||
/>
|
/>
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<label className="space-y-1">
|
<PageBlockEditor name="content" initialContent={page.content} />
|
||||||
<span className="text-xs text-neutral-600">Content</span>
|
|
||||||
<textarea
|
|
||||||
name="content"
|
|
||||||
rows={10}
|
|
||||||
defaultValue={page.content}
|
|
||||||
required
|
|
||||||
className="w-full rounded border border-neutral-300 px-3 py-2 text-sm"
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<div className="grid gap-3 md:grid-cols-2">
|
<div className="grid gap-3 md:grid-cols-2">
|
||||||
<label className="space-y-1">
|
<label className="space-y-1">
|
||||||
@@ -368,16 +360,11 @@ export default async function PageEditorPage({ params, searchParams }: PageProps
|
|||||||
/>
|
/>
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<label className="space-y-1">
|
<PageBlockEditor
|
||||||
<span className="text-xs text-neutral-600">Content</span>
|
|
||||||
<textarea
|
|
||||||
name="content"
|
name="content"
|
||||||
rows={8}
|
initialContent={selectedTranslation?.content ?? page.content}
|
||||||
defaultValue={selectedTranslation?.content ?? page.content}
|
label="Translation Blocks"
|
||||||
required
|
|
||||||
className="w-full rounded border border-neutral-300 px-3 py-2 text-sm"
|
|
||||||
/>
|
/>
|
||||||
</label>
|
|
||||||
|
|
||||||
<div className="grid gap-3 md:grid-cols-2">
|
<div className="grid gap-3 md:grid-cols-2">
|
||||||
<label className="space-y-1">
|
<label className="space-y-1">
|
||||||
|
|||||||
@@ -11,7 +11,9 @@ describe("CreatePageForm", () => {
|
|||||||
|
|
||||||
expect((screen.getByLabelText("Title") as HTMLInputElement).name).toBe("title")
|
expect((screen.getByLabelText("Title") as HTMLInputElement).name).toBe("title")
|
||||||
expect((screen.getByLabelText("Slug") as HTMLInputElement).name).toBe("slug")
|
expect((screen.getByLabelText("Slug") as HTMLInputElement).name).toBe("slug")
|
||||||
expect((screen.getByLabelText("Content") as HTMLTextAreaElement).name).toBe("content")
|
const contentField = document.querySelector('input[name="content"]') as HTMLInputElement | null
|
||||||
|
expect(contentField).not.toBeNull()
|
||||||
|
expect(contentField?.value.startsWith("[")).toBe(true)
|
||||||
|
|
||||||
const status = screen.getByLabelText("Status") as HTMLSelectElement
|
const status = screen.getByLabelText("Status") as HTMLSelectElement
|
||||||
expect(status.value).toBe("draft")
|
expect(status.value).toBe("draft")
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
|
import { serializePageBlocks } from "@cms/content"
|
||||||
import { Button } from "@cms/ui/button"
|
import { Button } from "@cms/ui/button"
|
||||||
|
|
||||||
|
import { PageBlockEditor } from "./page-block-editor"
|
||||||
|
|
||||||
type CreatePageFormProps = {
|
type CreatePageFormProps = {
|
||||||
action: (formData: FormData) => void | Promise<void>
|
action: (formData: FormData) => void | Promise<void>
|
||||||
}
|
}
|
||||||
@@ -46,15 +49,16 @@ export function CreatePageForm({ action }: CreatePageFormProps) {
|
|||||||
/>
|
/>
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<label className="space-y-1">
|
<PageBlockEditor
|
||||||
<span className="text-xs text-neutral-600">Content</span>
|
|
||||||
<textarea
|
|
||||||
name="content"
|
name="content"
|
||||||
rows={6}
|
initialContent={serializePageBlocks([
|
||||||
required
|
{
|
||||||
className="w-full rounded border border-neutral-300 px-3 py-2 text-sm"
|
id: "initial-rich-text",
|
||||||
|
type: "rich_text",
|
||||||
|
body: "",
|
||||||
|
},
|
||||||
|
])}
|
||||||
/>
|
/>
|
||||||
</label>
|
|
||||||
|
|
||||||
<div className="grid gap-3 md:grid-cols-2">
|
<div className="grid gap-3 md:grid-cols-2">
|
||||||
<label className="space-y-1">
|
<label className="space-y-1">
|
||||||
|
|||||||
292
apps/admin/src/components/pages/page-block-editor.tsx
Normal file
292
apps/admin/src/components/pages/page-block-editor.tsx
Normal file
@@ -0,0 +1,292 @@
|
|||||||
|
"use client"
|
||||||
|
|
||||||
|
import { type PageBlock, type PageBlocks, parsePageBlocks, serializePageBlocks } from "@cms/content"
|
||||||
|
import { useMemo, useState } from "react"
|
||||||
|
|
||||||
|
type PageBlockEditorProps = {
|
||||||
|
name: string
|
||||||
|
initialContent: string
|
||||||
|
label?: string
|
||||||
|
}
|
||||||
|
|
||||||
|
function randomId(prefix: string): string {
|
||||||
|
return `${prefix}-${Math.random().toString(36).slice(2, 10)}`
|
||||||
|
}
|
||||||
|
|
||||||
|
function normalizeInitialBlocks(initialContent: string): PageBlocks {
|
||||||
|
if (!initialContent.trim()) {
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
id: randomId("rich"),
|
||||||
|
type: "rich_text",
|
||||||
|
body: "",
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
return parsePageBlocks(initialContent)
|
||||||
|
} catch {
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
id: randomId("rich"),
|
||||||
|
type: "rich_text",
|
||||||
|
body: initialContent,
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateBlock(blocks: PageBlocks, blockId: string, next: Partial<PageBlock>): PageBlocks {
|
||||||
|
return blocks.map((block) =>
|
||||||
|
block.id === blockId ? ({ ...block, ...next } as PageBlock) : block,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function PageBlockEditor({
|
||||||
|
name,
|
||||||
|
initialContent,
|
||||||
|
label = "Page Blocks",
|
||||||
|
}: PageBlockEditorProps) {
|
||||||
|
const [blocks, setBlocks] = useState<PageBlocks>(() => normalizeInitialBlocks(initialContent))
|
||||||
|
|
||||||
|
const serialized = useMemo(() => serializePageBlocks(blocks), [blocks])
|
||||||
|
|
||||||
|
function addBlock(type: PageBlock["type"]) {
|
||||||
|
if (type === "hero") {
|
||||||
|
setBlocks((prev) => [
|
||||||
|
...prev,
|
||||||
|
{
|
||||||
|
id: randomId("hero"),
|
||||||
|
type,
|
||||||
|
heading: "Hero heading",
|
||||||
|
subheading: null,
|
||||||
|
ctaHref: null,
|
||||||
|
ctaLabel: null,
|
||||||
|
},
|
||||||
|
])
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if (type === "rich_text") {
|
||||||
|
setBlocks((prev) => [...prev, { id: randomId("rich"), type, body: "" }])
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if (type === "gallery") {
|
||||||
|
setBlocks((prev) => [...prev, { id: randomId("gallery"), type, title: null, imageIds: [] }])
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if (type === "cta") {
|
||||||
|
setBlocks((prev) => [
|
||||||
|
...prev,
|
||||||
|
{ id: randomId("cta"), type, label: "Open", href: "/", variant: "primary" },
|
||||||
|
])
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if (type === "form") {
|
||||||
|
setBlocks((prev) => [
|
||||||
|
...prev,
|
||||||
|
{ id: randomId("form"), type, formKey: "contact", title: null, description: null },
|
||||||
|
])
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
setBlocks((prev) => [
|
||||||
|
...prev,
|
||||||
|
{ id: randomId("price"), type: "price_cards", title: null, cards: [] },
|
||||||
|
])
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="space-y-3 rounded border border-neutral-200 p-3">
|
||||||
|
<input type="hidden" name={name} value={serialized} />
|
||||||
|
<div className="flex flex-wrap items-center gap-2">
|
||||||
|
<span className="text-xs text-neutral-600">{label}</span>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="rounded border px-2 py-1 text-xs"
|
||||||
|
onClick={() => addBlock("hero")}
|
||||||
|
>
|
||||||
|
+ Hero
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="rounded border px-2 py-1 text-xs"
|
||||||
|
onClick={() => addBlock("rich_text")}
|
||||||
|
>
|
||||||
|
+ Rich text
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="rounded border px-2 py-1 text-xs"
|
||||||
|
onClick={() => addBlock("gallery")}
|
||||||
|
>
|
||||||
|
+ Gallery
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="rounded border px-2 py-1 text-xs"
|
||||||
|
onClick={() => addBlock("cta")}
|
||||||
|
>
|
||||||
|
+ CTA
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="rounded border px-2 py-1 text-xs"
|
||||||
|
onClick={() => addBlock("form")}
|
||||||
|
>
|
||||||
|
+ Form
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="rounded border px-2 py-1 text-xs"
|
||||||
|
onClick={() => addBlock("price_cards")}
|
||||||
|
>
|
||||||
|
+ Price cards
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="space-y-3">
|
||||||
|
{blocks.map((block, index) => (
|
||||||
|
<article key={block.id} className="space-y-2 rounded border border-neutral-200 p-3">
|
||||||
|
<div className="flex items-center justify-between text-xs text-neutral-600">
|
||||||
|
<span>
|
||||||
|
#{index + 1} {block.type}
|
||||||
|
</span>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="rounded border px-2 py-1"
|
||||||
|
onClick={() => setBlocks((prev) => prev.filter((entry) => entry.id !== block.id))}
|
||||||
|
>
|
||||||
|
Remove
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{block.type === "hero" ? (
|
||||||
|
<div className="grid gap-2 md:grid-cols-2">
|
||||||
|
<input
|
||||||
|
value={block.heading}
|
||||||
|
onChange={(event) =>
|
||||||
|
setBlocks((prev) =>
|
||||||
|
updateBlock(prev, block.id, { heading: event.target.value }),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
placeholder="Heading"
|
||||||
|
className="rounded border border-neutral-300 px-2 py-1 text-sm"
|
||||||
|
/>
|
||||||
|
<input
|
||||||
|
value={block.subheading ?? ""}
|
||||||
|
onChange={(event) =>
|
||||||
|
setBlocks((prev) =>
|
||||||
|
updateBlock(prev, block.id, { subheading: event.target.value || null }),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
placeholder="Subheading"
|
||||||
|
className="rounded border border-neutral-300 px-2 py-1 text-sm"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
) : null}
|
||||||
|
|
||||||
|
{block.type === "rich_text" ? (
|
||||||
|
<textarea
|
||||||
|
rows={5}
|
||||||
|
value={block.body}
|
||||||
|
onChange={(event) =>
|
||||||
|
setBlocks((prev) => updateBlock(prev, block.id, { body: event.target.value }))
|
||||||
|
}
|
||||||
|
placeholder="Text"
|
||||||
|
className="w-full rounded border border-neutral-300 px-2 py-1 text-sm"
|
||||||
|
/>
|
||||||
|
) : null}
|
||||||
|
|
||||||
|
{block.type === "gallery" ? (
|
||||||
|
<textarea
|
||||||
|
rows={3}
|
||||||
|
value={block.imageIds.join(",")}
|
||||||
|
onChange={(event) =>
|
||||||
|
setBlocks((prev) =>
|
||||||
|
updateBlock(prev, block.id, {
|
||||||
|
imageIds: event.target.value
|
||||||
|
.split(",")
|
||||||
|
.map((entry) => entry.trim())
|
||||||
|
.filter((entry) => entry.length > 0),
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
placeholder="Media asset IDs (comma separated UUIDs)"
|
||||||
|
className="w-full rounded border border-neutral-300 px-2 py-1 text-sm"
|
||||||
|
/>
|
||||||
|
) : null}
|
||||||
|
|
||||||
|
{block.type === "cta" ? (
|
||||||
|
<div className="grid gap-2 md:grid-cols-2">
|
||||||
|
<input
|
||||||
|
value={block.label}
|
||||||
|
onChange={(event) =>
|
||||||
|
setBlocks((prev) => updateBlock(prev, block.id, { label: event.target.value }))
|
||||||
|
}
|
||||||
|
placeholder="Button label"
|
||||||
|
className="rounded border border-neutral-300 px-2 py-1 text-sm"
|
||||||
|
/>
|
||||||
|
<input
|
||||||
|
value={block.href}
|
||||||
|
onChange={(event) =>
|
||||||
|
setBlocks((prev) => updateBlock(prev, block.id, { href: event.target.value }))
|
||||||
|
}
|
||||||
|
placeholder="Link href"
|
||||||
|
className="rounded border border-neutral-300 px-2 py-1 text-sm"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
) : null}
|
||||||
|
|
||||||
|
{block.type === "form" ? (
|
||||||
|
<input
|
||||||
|
value={block.formKey}
|
||||||
|
onChange={(event) =>
|
||||||
|
setBlocks((prev) => updateBlock(prev, block.id, { formKey: event.target.value }))
|
||||||
|
}
|
||||||
|
placeholder="Form key (e.g. contact, commission)"
|
||||||
|
className="w-full rounded border border-neutral-300 px-2 py-1 text-sm"
|
||||||
|
/>
|
||||||
|
) : null}
|
||||||
|
|
||||||
|
{block.type === "price_cards" ? (
|
||||||
|
<textarea
|
||||||
|
rows={4}
|
||||||
|
value={block.cards
|
||||||
|
.map((card) => [card.name, card.price ?? "", card.description ?? ""].join("|"))
|
||||||
|
.join("\n")}
|
||||||
|
onChange={(event) =>
|
||||||
|
setBlocks((prev) =>
|
||||||
|
updateBlock(prev, block.id, {
|
||||||
|
cards: event.target.value
|
||||||
|
.split("\n")
|
||||||
|
.map((line) => line.trim())
|
||||||
|
.filter((line) => line.length > 0)
|
||||||
|
.map((line, lineIndex) => {
|
||||||
|
const [name, price, description] = line
|
||||||
|
.split("|")
|
||||||
|
.map((entry) => entry.trim())
|
||||||
|
return {
|
||||||
|
id: `card-${lineIndex}`,
|
||||||
|
name: name || `Card ${lineIndex + 1}`,
|
||||||
|
price: price || null,
|
||||||
|
description: description || null,
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
placeholder="One card per line: Name|Price|Description"
|
||||||
|
className="w-full rounded border border-neutral-300 px-2 py-1 text-sm"
|
||||||
|
/>
|
||||||
|
) : null}
|
||||||
|
</article>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -1,3 +1,6 @@
|
|||||||
|
import { parsePageBlocks } from "@cms/content"
|
||||||
|
import Image from "next/image"
|
||||||
|
|
||||||
type PageEntity = {
|
type PageEntity = {
|
||||||
title: string
|
title: string
|
||||||
status: string
|
status: string
|
||||||
@@ -10,6 +13,20 @@ type PublicPageViewProps = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function PublicPageView({ page }: PublicPageViewProps) {
|
export function PublicPageView({ page }: PublicPageViewProps) {
|
||||||
|
const blocks = (() => {
|
||||||
|
try {
|
||||||
|
return parsePageBlocks(page.content)
|
||||||
|
} catch {
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
id: "fallback-rich-text",
|
||||||
|
type: "rich_text" as const,
|
||||||
|
body: page.content,
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}
|
||||||
|
})()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<article className="mx-auto flex w-full max-w-4xl flex-col gap-6 px-6 py-16">
|
<article className="mx-auto flex w-full max-w-4xl flex-col gap-6 px-6 py-16">
|
||||||
<header className="space-y-3">
|
<header className="space-y-3">
|
||||||
@@ -18,8 +35,105 @@ export function PublicPageView({ page }: PublicPageViewProps) {
|
|||||||
{page.summary ? <p className="text-neutral-600">{page.summary}</p> : null}
|
{page.summary ? <p className="text-neutral-600">{page.summary}</p> : null}
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
<section className="prose prose-neutral max-w-none whitespace-pre-wrap rounded-xl border border-neutral-200 bg-white p-6 text-neutral-800">
|
<section className="space-y-4 rounded-xl border border-neutral-200 bg-white p-6 text-neutral-800">
|
||||||
{page.content}
|
{blocks.map((block) => {
|
||||||
|
if (block.type === "hero") {
|
||||||
|
return (
|
||||||
|
<section key={block.id} className="space-y-2 rounded border border-neutral-200 p-4">
|
||||||
|
<h2 className="text-2xl font-semibold">{block.heading}</h2>
|
||||||
|
{block.subheading ? <p className="text-neutral-600">{block.subheading}</p> : null}
|
||||||
|
{block.ctaLabel && block.ctaHref ? (
|
||||||
|
<a
|
||||||
|
href={block.ctaHref}
|
||||||
|
className="inline-flex rounded bg-neutral-900 px-3 py-1.5 text-sm text-white"
|
||||||
|
>
|
||||||
|
{block.ctaLabel}
|
||||||
|
</a>
|
||||||
|
) : null}
|
||||||
|
</section>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (block.type === "rich_text") {
|
||||||
|
return (
|
||||||
|
<section
|
||||||
|
key={block.id}
|
||||||
|
className="prose prose-neutral max-w-none whitespace-pre-wrap"
|
||||||
|
>
|
||||||
|
{block.body}
|
||||||
|
</section>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (block.type === "gallery") {
|
||||||
|
return (
|
||||||
|
<section key={block.id} className="space-y-3">
|
||||||
|
{block.title ? <h3 className="text-lg font-medium">{block.title}</h3> : null}
|
||||||
|
<div className="grid gap-3 sm:grid-cols-2">
|
||||||
|
{block.imageIds.length === 0 ? (
|
||||||
|
<p className="text-sm text-neutral-500">No media linked yet.</p>
|
||||||
|
) : (
|
||||||
|
block.imageIds.map((imageId) => (
|
||||||
|
<Image
|
||||||
|
key={imageId}
|
||||||
|
src={`/api/media/file/${imageId}`}
|
||||||
|
alt=""
|
||||||
|
width={1200}
|
||||||
|
height={800}
|
||||||
|
className="h-48 w-full rounded border border-neutral-200 object-cover"
|
||||||
|
/>
|
||||||
|
))
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (block.type === "cta") {
|
||||||
|
return (
|
||||||
|
<a
|
||||||
|
key={block.id}
|
||||||
|
href={block.href}
|
||||||
|
className={`inline-flex rounded px-3 py-2 text-sm ${
|
||||||
|
block.variant === "secondary"
|
||||||
|
? "border border-neutral-300 text-neutral-800"
|
||||||
|
: "bg-neutral-900 text-white"
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
{block.label}
|
||||||
|
</a>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (block.type === "form") {
|
||||||
|
return (
|
||||||
|
<section key={block.id} className="space-y-2 rounded border border-neutral-200 p-4">
|
||||||
|
<h3 className="text-lg font-medium">{block.title || "Form block"}</h3>
|
||||||
|
<p className="text-sm text-neutral-600">
|
||||||
|
{block.description || "Form integration pending."}
|
||||||
|
</p>
|
||||||
|
<p className="text-xs text-neutral-500">formKey: {block.formKey}</p>
|
||||||
|
</section>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<section key={block.id} className="space-y-2 rounded border border-neutral-200 p-4">
|
||||||
|
{block.title ? <h3 className="text-lg font-medium">{block.title}</h3> : null}
|
||||||
|
<div className="grid gap-3 md:grid-cols-2">
|
||||||
|
{block.cards.map((card) => (
|
||||||
|
<article key={card.id} className="rounded border border-neutral-200 p-3">
|
||||||
|
<h4 className="font-medium">{card.name}</h4>
|
||||||
|
{card.price ? <p className="text-sm text-neutral-700">{card.price}</p> : null}
|
||||||
|
{card.description ? (
|
||||||
|
<p className="text-sm text-neutral-600">{card.description}</p>
|
||||||
|
) : null}
|
||||||
|
</article>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
)
|
||||||
|
})}
|
||||||
</section>
|
</section>
|
||||||
</article>
|
</article>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,6 +6,8 @@ import {
|
|||||||
createCustomerInputSchema,
|
createCustomerInputSchema,
|
||||||
createNavigationMenuInputSchema,
|
createNavigationMenuInputSchema,
|
||||||
createPageInputSchema,
|
createPageInputSchema,
|
||||||
|
parsePageBlocks,
|
||||||
|
serializePageBlocks,
|
||||||
updateCommissionStatusInputSchema,
|
updateCommissionStatusInputSchema,
|
||||||
updateNavigationItemInputSchema,
|
updateNavigationItemInputSchema,
|
||||||
} from "./index"
|
} from "./index"
|
||||||
@@ -64,4 +66,23 @@ describe("domain schemas", () => {
|
|||||||
expect(menu.success).toBe(true)
|
expect(menu.success).toBe(true)
|
||||||
expect(navUpdate.success).toBe(false)
|
expect(navUpdate.success).toBe(false)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it("parses and serializes page blocks with legacy fallback", () => {
|
||||||
|
const legacy = parsePageBlocks("Legacy body")
|
||||||
|
expect(legacy[0]?.type).toBe("rich_text")
|
||||||
|
|
||||||
|
const serialized = serializePageBlocks([
|
||||||
|
{
|
||||||
|
id: "hero-1",
|
||||||
|
type: "hero",
|
||||||
|
heading: "Hello",
|
||||||
|
subheading: null,
|
||||||
|
ctaLabel: null,
|
||||||
|
ctaHref: null,
|
||||||
|
},
|
||||||
|
])
|
||||||
|
|
||||||
|
const parsed = parsePageBlocks(serialized)
|
||||||
|
expect(parsed[0]?.type).toBe("hero")
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -3,6 +3,98 @@ import { z } from "zod"
|
|||||||
export const pageStatusSchema = z.enum(["draft", "published"])
|
export const pageStatusSchema = z.enum(["draft", "published"])
|
||||||
export const pageLocaleSchema = z.enum(["de", "en", "es", "fr"])
|
export const pageLocaleSchema = z.enum(["de", "en", "es", "fr"])
|
||||||
|
|
||||||
|
const pageBlockBaseSchema = z.object({
|
||||||
|
id: z.string().min(1),
|
||||||
|
})
|
||||||
|
|
||||||
|
export const heroPageBlockSchema = pageBlockBaseSchema.extend({
|
||||||
|
type: z.literal("hero"),
|
||||||
|
heading: z.string().min(1).max(180),
|
||||||
|
subheading: z.string().max(500).nullable().optional(),
|
||||||
|
ctaLabel: z.string().max(80).nullable().optional(),
|
||||||
|
ctaHref: z.string().max(500).nullable().optional(),
|
||||||
|
})
|
||||||
|
|
||||||
|
export const richTextPageBlockSchema = pageBlockBaseSchema.extend({
|
||||||
|
type: z.literal("rich_text"),
|
||||||
|
body: z.string().min(1),
|
||||||
|
})
|
||||||
|
|
||||||
|
export const galleryPageBlockSchema = pageBlockBaseSchema.extend({
|
||||||
|
type: z.literal("gallery"),
|
||||||
|
title: z.string().max(180).nullable().optional(),
|
||||||
|
imageIds: z.array(z.string().uuid()).default([]),
|
||||||
|
})
|
||||||
|
|
||||||
|
export const ctaPageBlockSchema = pageBlockBaseSchema.extend({
|
||||||
|
type: z.literal("cta"),
|
||||||
|
label: z.string().min(1).max(80),
|
||||||
|
href: z.string().max(500),
|
||||||
|
variant: z.enum(["primary", "secondary"]).default("primary"),
|
||||||
|
})
|
||||||
|
|
||||||
|
export const formPageBlockSchema = pageBlockBaseSchema.extend({
|
||||||
|
type: z.literal("form"),
|
||||||
|
formKey: z.string().min(1).max(120),
|
||||||
|
title: z.string().max(180).nullable().optional(),
|
||||||
|
description: z.string().max(500).nullable().optional(),
|
||||||
|
})
|
||||||
|
|
||||||
|
export const priceCardsPageBlockSchema = pageBlockBaseSchema.extend({
|
||||||
|
type: z.literal("price_cards"),
|
||||||
|
title: z.string().max(180).nullable().optional(),
|
||||||
|
cards: z
|
||||||
|
.array(
|
||||||
|
z.object({
|
||||||
|
id: z.string().min(1),
|
||||||
|
name: z.string().min(1).max(180),
|
||||||
|
price: z.string().max(80).nullable().optional(),
|
||||||
|
description: z.string().max(500).nullable().optional(),
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
.default([]),
|
||||||
|
})
|
||||||
|
|
||||||
|
export const pageBlockSchema = z.discriminatedUnion("type", [
|
||||||
|
heroPageBlockSchema,
|
||||||
|
richTextPageBlockSchema,
|
||||||
|
galleryPageBlockSchema,
|
||||||
|
ctaPageBlockSchema,
|
||||||
|
formPageBlockSchema,
|
||||||
|
priceCardsPageBlockSchema,
|
||||||
|
])
|
||||||
|
|
||||||
|
export const pageBlocksSchema = z.array(pageBlockSchema)
|
||||||
|
|
||||||
|
function isJsonLike(value: string): boolean {
|
||||||
|
const trimmed = value.trim()
|
||||||
|
return trimmed.startsWith("{") || trimmed.startsWith("[")
|
||||||
|
}
|
||||||
|
|
||||||
|
export function parsePageBlocks(content: string): z.infer<typeof pageBlocksSchema> {
|
||||||
|
if (!isJsonLike(content)) {
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
id: "legacy-rich-text",
|
||||||
|
type: "rich_text",
|
||||||
|
body: content,
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
const parsed = JSON.parse(content)
|
||||||
|
|
||||||
|
if (!Array.isArray(parsed)) {
|
||||||
|
throw new Error("Page block payload must be an array.")
|
||||||
|
}
|
||||||
|
|
||||||
|
return pageBlocksSchema.parse(parsed)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function serializePageBlocks(blocks: z.infer<typeof pageBlocksSchema>): string {
|
||||||
|
return JSON.stringify(pageBlocksSchema.parse(blocks))
|
||||||
|
}
|
||||||
|
|
||||||
export const createPageInputSchema = z.object({
|
export const createPageInputSchema = z.object({
|
||||||
title: z.string().min(1).max(180),
|
title: z.string().min(1).max(180),
|
||||||
slug: z.string().min(1).max(180),
|
slug: z.string().min(1).max(180),
|
||||||
@@ -67,3 +159,5 @@ export type UpsertPageTranslationInput = z.infer<typeof upsertPageTranslationInp
|
|||||||
export type CreateNavigationMenuInput = z.infer<typeof createNavigationMenuInputSchema>
|
export type CreateNavigationMenuInput = z.infer<typeof createNavigationMenuInputSchema>
|
||||||
export type CreateNavigationItemInput = z.infer<typeof createNavigationItemInputSchema>
|
export type CreateNavigationItemInput = z.infer<typeof createNavigationItemInputSchema>
|
||||||
export type UpdateNavigationItemInput = z.infer<typeof updateNavigationItemInputSchema>
|
export type UpdateNavigationItemInput = z.infer<typeof updateNavigationItemInputSchema>
|
||||||
|
export type PageBlock = z.infer<typeof pageBlockSchema>
|
||||||
|
export type PageBlocks = z.infer<typeof pageBlocksSchema>
|
||||||
|
|||||||
Reference in New Issue
Block a user