Compare commits

...

4 Commits

11 changed files with 471 additions and 126 deletions

12
TODO.md
View File

@@ -137,14 +137,14 @@ This file is the single source of truth for roadmap and delivery progress.
### Admin App (Primary Focus) ### Admin App (Primary Focus)
- [~] [P1] Page management (create/edit/publish/unpublish/schedule) - [~] [P1] Page management (create/edit/publish/unpublish/schedule)
- [ ] [P1] Page builder with reusable content blocks (hero, rich text, gallery, CTA, forms, price cards) - [x] [P1] Page builder with reusable content blocks (hero, rich text, gallery, CTA, forms, price cards)
- [~] [P1] Navigation management (menus, nested items, order, visibility) - [x] [P1] Navigation management (menus, nested items, order, visibility)
- [~] [P1] Media library (upload, browse, replace, delete) with media-type classification (artwork, banner, promo, generic, video/gif) - [~] [P1] Media library (upload, browse, replace, delete) with media-type classification (artwork, banner, promo, generic, video/gif)
- [x] [P1] Media enrichment metadata (alt text, copyright, author, source, tags, licensing, usage context) - [x] [P1] Media enrichment metadata (alt text, copyright, author, source, tags, licensing, usage context)
- [x] [P1] Portfolio grouping primitives (galleries, albums, categories, tags) with ordering/visibility controls - [x] [P1] Portfolio grouping primitives (galleries, albums, categories, tags) with ordering/visibility controls
- [x] [P1] Artwork refinement fields (medium, dimensions, year, framing, availability, price visibility) - [x] [P1] Artwork refinement fields (medium, dimensions, year, framing, availability, price visibility)
- [ ] [P1] Artwork rendition management (thumbnail, card, full, retina/custom sizes) - [x] [P1] Artwork rendition management (thumbnail, card, full, retina/custom sizes)
- [ ] [P1] Type-specific processing presets (artwork/banner/promo/video/gif) with validation rules - [x] [P1] Type-specific processing presets (artwork/banner/promo/video/gif) with validation rules
- [ ] [P1] Users management (invite, roles, status) - [ ] [P1] Users management (invite, roles, status)
- [ ] [P1] Disable/ban user function and enforcement in auth/session checks - [ ] [P1] Disable/ban user function and enforcement in auth/session checks
- [~] [P1] Owner/support protection rules in user management actions (cannot delete/demote) - [~] [P1] Owner/support protection rules in user management actions (cannot delete/demote)
@@ -363,6 +363,10 @@ This file is the single source of truth for roadmap and delivery progress.
- [2026-02-12] Public portfolio baseline added with `/{locale}/portfolio` and `/{locale}/portfolio/{slug}`, including published-artwork filters (gallery/album/category/tag), rendition image streaming via web `/api/media/file/:id`, and media-aware artwork detail rendering. - [2026-02-12] Public portfolio baseline added with `/{locale}/portfolio` and `/{locale}/portfolio/{slug}`, including published-artwork filters (gallery/album/category/tag), rendition image streaming via web `/api/media/file/:id`, and media-aware artwork detail rendering.
- [2026-02-12] Portfolio grouping controls completed in admin `/portfolio`: galleries/albums/categories/tags now support visibility and sort-order management (create/update/delete), and public tag filters now respect visibility. - [2026-02-12] Portfolio grouping controls completed in admin `/portfolio`: galleries/albums/categories/tags now support visibility and sort-order management (create/update/delete), and public tag filters now respect visibility.
- [2026-02-12] Artwork refinement baseline completed: admin `/portfolio` now captures/edits medium, dimensions, year, framing, availability, publish state, and optional price visibility (`priceAmountCents` + `priceCurrency`), with public artwork detail rendering visible prices only. - [2026-02-12] Artwork refinement baseline completed: admin `/portfolio` now captures/edits medium, dimensions, year, framing, availability, publish state, and optional price visibility (`priceAmountCents` + `priceCurrency`), with public artwork detail rendering visible prices only.
- [2026-02-12] Artwork rendition management completed: admin `/portfolio` supports `thumbnail/card/full/retina/custom` slot assignment with dimensions and primary flag, plus per-artwork rendition listing and delete controls.
- [2026-02-12] Media type presets baseline completed in upload API: server-side validation now uses shared per-type rules (mime + max size) for `artwork/banner/promotion/video/gif/generic`, with optional env cap override via `CMS_MEDIA_UPLOAD_MAX_BYTES`.
- [2026-02-12] Page builder reusable blocks completed: admin block editor now supports full field editing + ordering controls for hero/rich-text/gallery/cta/form/price-cards; public renderer includes form-link behavior for `contact`/`commission` keys.
- [2026-02-12] Navigation management completed: admin `/navigation` now supports menu update/delete controls, nested item parent selection via menu-local dropdown, and full order/visibility updates across menus and items.
- [2026-02-12] Public UX pass: commission request flow now reports explicit invalid budget range errors, and header navigation now falls back to localized defaults (`home`, `portfolio`, `news`, `commissions`) when no CMS menu exists; seed data now creates those default menu entries. - [2026-02-12] Public UX pass: commission request flow now reports explicit invalid budget range errors, and header navigation now falls back to localized defaults (`home`, `portfolio`, `news`, `commissions`) when no CMS menu exists; seed data now creates those default menu entries.
- [2026-02-12] Added `e2e/public-rendering.pw.ts` web coverage for fallback navigation visibility, portfolio routes, and commission submission validation (invalid budget range + successful submission path). - [2026-02-12] Added `e2e/public-rendering.pw.ts` web coverage for fallback navigation visibility, portfolio routes, and commission submission validation (invalid budget range + successful submission path).
- [2026-02-12] Testing execution is temporarily paused for delivery velocity: root test scripts are stubbed and CI test steps are disabled; all testing backlog is consolidated under `MVP 3: Testing and Quality`. - [2026-02-12] Testing execution is temporarily paused for delivery velocity: root test scripts are stubbed and CI test steps are disabled; all testing backlog is consolidated under `MVP 3: Testing and Quality`.

View File

@@ -1,4 +1,9 @@
import { randomUUID } from "node:crypto" import { randomUUID } from "node:crypto"
import {
getMediaUploadMaxBytes,
isMimeAllowedForMediaType,
mediaAssetTypeSchema,
} from "@cms/content"
import { hasPermission } from "@cms/content/rbac" import { hasPermission } from "@cms/content/rbac"
import { createMediaAsset } from "@cms/db" import { createMediaAsset } from "@cms/db"
@@ -7,33 +12,7 @@ import { storeUpload } from "@/lib/media/storage"
export const runtime = "nodejs" export const runtime = "nodejs"
const MAX_UPLOAD_BYTES = Number(process.env.CMS_MEDIA_UPLOAD_MAX_BYTES ?? 25 * 1024 * 1024) const MAX_UPLOAD_BYTES_OVERRIDE = Number(process.env.CMS_MEDIA_UPLOAD_MAX_BYTES ?? 0)
type AllowedRule = {
mimePrefix?: string
mimeExact?: string[]
}
const ALLOWED_MIME_BY_TYPE: Record<string, AllowedRule> = {
artwork: {
mimePrefix: "image/",
},
banner: {
mimePrefix: "image/",
},
promotion: {
mimePrefix: "image/",
},
video: {
mimePrefix: "video/",
},
gif: {
mimeExact: ["image/gif"],
},
generic: {
mimePrefix: "",
},
}
function parseTextField(formData: FormData, field: string): string { function parseTextField(formData: FormData, field: string): string {
const value = formData.get(field) const value = formData.get(field)
@@ -88,24 +67,6 @@ function deriveTitleFromFilename(fileName: string): string {
return normalized.length > 0 ? normalized : "Untitled media" return normalized.length > 0 ? normalized : "Untitled media"
} }
function isMimeAllowed(mediaType: string, mimeType: string): boolean {
const rule = ALLOWED_MIME_BY_TYPE[mediaType]
if (!rule) {
return false
}
if (rule.mimeExact?.includes(mimeType)) {
return true
}
if (rule.mimePrefix === "") {
return true
}
return rule.mimePrefix ? mimeType.startsWith(rule.mimePrefix) : false
}
function badRequest(message: string): Response { function badRequest(message: string): Response {
return Response.json( return Response.json(
{ {
@@ -147,12 +108,13 @@ export async function POST(request: Request): Promise<Response> {
return badRequest("Invalid form payload.") return badRequest("Invalid form payload.")
} }
const type = parseTextField(formData, "type") const parsedType = mediaAssetTypeSchema.safeParse(parseTextField(formData, "type"))
const fileEntry = formData.get("file") const fileEntry = formData.get("file")
if (!type) { if (!parsedType.success) {
return badRequest("Type is required.") return badRequest("Type is required.")
} }
const type = parsedType.data
if (!(fileEntry instanceof File)) { if (!(fileEntry instanceof File)) {
return badRequest("File is required.") return badRequest("File is required.")
@@ -162,13 +124,17 @@ export async function POST(request: Request): Promise<Response> {
return badRequest("File is empty.") return badRequest("File is empty.")
} }
if (fileEntry.size > MAX_UPLOAD_BYTES) { const typeMaxBytes = getMediaUploadMaxBytes(type)
const effectiveMaxBytes =
MAX_UPLOAD_BYTES_OVERRIDE > 0 ? Math.min(MAX_UPLOAD_BYTES_OVERRIDE, typeMaxBytes) : typeMaxBytes
if (fileEntry.size > effectiveMaxBytes) {
return badRequest( return badRequest(
`File is too large. Maximum upload is ${Math.floor(MAX_UPLOAD_BYTES / 1024 / 1024)} MB.`, `File is too large for ${type}. Maximum upload is ${Math.floor(effectiveMaxBytes / 1024 / 1024)} MB.`,
) )
} }
if (!isMimeAllowed(type, fileEntry.type)) { if (!isMimeAllowedForMediaType(type, fileEntry.type)) {
return badRequest(`File type ${fileEntry.type || "unknown"} is not allowed for ${type}.`) return badRequest(`File type ${fileEntry.type || "unknown"} is not allowed for ${type}.`)
} }

View File

@@ -2,9 +2,11 @@ import {
createNavigationItem, createNavigationItem,
createNavigationMenu, createNavigationMenu,
deleteNavigationItem, deleteNavigationItem,
deleteNavigationMenu,
listNavigationMenus, listNavigationMenus,
listPages, listPages,
updateNavigationItem, updateNavigationItem,
updateNavigationMenu,
upsertNavigationItemTranslation, upsertNavigationItemTranslation,
} from "@cms/db" } from "@cms/db"
import { Button } from "@cms/ui/button" import { Button } from "@cms/ui/button"
@@ -131,6 +133,50 @@ async function createItemAction(formData: FormData) {
redirectWithState({ notice: "Navigation item created." }) redirectWithState({ notice: "Navigation item created." })
} }
async function updateMenuAction(formData: FormData) {
"use server"
await requirePermissionForRoute({
nextPath: "/navigation",
permission: "navigation:write",
scope: "team",
})
try {
await updateNavigationMenu({
id: readInputString(formData, "id"),
name: readInputString(formData, "name"),
slug: readInputString(formData, "slug"),
location: readInputString(formData, "location"),
isVisible: readInputString(formData, "isVisible") === "true",
})
} catch {
redirectWithState({ error: "Failed to update navigation menu." })
}
revalidatePath("/navigation")
redirectWithState({ notice: "Navigation menu updated." })
}
async function deleteMenuAction(formData: FormData) {
"use server"
await requirePermissionForRoute({
nextPath: "/navigation",
permission: "navigation:write",
scope: "team",
})
try {
await deleteNavigationMenu(readInputString(formData, "id"))
} catch {
redirectWithState({ error: "Failed to delete navigation menu." })
}
revalidatePath("/navigation")
redirectWithState({ notice: "Navigation menu deleted." })
}
async function updateItemAction(formData: FormData) { async function updateItemAction(formData: FormData) {
"use server" "use server"
@@ -279,14 +325,58 @@ export default async function NavigationManagementPage({
) : ( ) : (
menus.map((menu) => ( menus.map((menu) => (
<article key={menu.id} className="rounded-xl border border-neutral-200 p-6"> <article key={menu.id} className="rounded-xl border border-neutral-200 p-6">
<div className="flex flex-wrap items-center justify-between gap-2"> <form action={updateMenuAction} className="rounded border border-neutral-200 p-3">
<h3 className="text-lg font-medium"> <input type="hidden" name="id" value={menu.id} />
{menu.name} <span className="text-sm text-neutral-500">({menu.location})</span> <div className="grid gap-3 md:grid-cols-4">
</h3> <label className="space-y-1">
<span className="text-xs text-neutral-500"> <span className="text-xs text-neutral-600">Menu name</span>
{menu.isVisible ? "visible" : "hidden"} <input
</span> name="name"
</div> defaultValue={menu.name}
className="w-full rounded border border-neutral-300 px-3 py-2 text-sm"
/>
</label>
<label className="space-y-1">
<span className="text-xs text-neutral-600">Slug</span>
<input
name="slug"
defaultValue={menu.slug}
className="w-full rounded border border-neutral-300 px-3 py-2 text-sm"
/>
</label>
<label className="space-y-1">
<span className="text-xs text-neutral-600">Location</span>
<input
name="location"
defaultValue={menu.location}
className="w-full rounded border border-neutral-300 px-3 py-2 text-sm"
/>
</label>
<label className="space-y-1">
<span className="text-xs text-neutral-600">Visible</span>
<select
name="isVisible"
defaultValue={menu.isVisible ? "true" : "false"}
className="w-full rounded border border-neutral-300 px-3 py-2 text-sm"
>
<option value="true">Visible</option>
<option value="false">Hidden</option>
</select>
</label>
</div>
<div className="mt-3 flex items-center gap-2">
<Button type="submit" size="sm">
Save menu
</Button>
<button
type="submit"
formAction={deleteMenuAction}
className="rounded-md border border-red-300 px-3 py-2 text-sm text-red-700"
>
Delete menu
</button>
</div>
</form>
<div className="mt-4 space-y-3"> <div className="mt-4 space-y-3">
{menu.items.length === 0 ? ( {menu.items.length === 0 ? (
@@ -348,11 +438,20 @@ export default async function NavigationManagementPage({
</label> </label>
<label className="space-y-1"> <label className="space-y-1">
<span className="text-xs text-neutral-600">Parent id</span> <span className="text-xs text-neutral-600">Parent id</span>
<input <select
name="parentId" name="parentId"
defaultValue={item.parentId ?? ""} defaultValue={item.parentId ?? ""}
className="w-full rounded border border-neutral-300 px-3 py-2 text-sm" className="w-full rounded border border-neutral-300 px-3 py-2 text-sm"
/> >
<option value="">(none)</option>
{menu.items
.filter((entry) => entry.id !== item.id)
.map((entry) => (
<option key={`${item.id}-parent-${entry.id}`} value={entry.id}>
{entry.label}
</option>
))}
</select>
</label> </label>
</div> </div>

View File

@@ -5,6 +5,7 @@ import {
createCategory, createCategory,
createGallery, createGallery,
createTag, createTag,
deleteArtworkRendition,
deleteGrouping, deleteGrouping,
linkArtworkToGrouping, linkArtworkToGrouping,
listArtworks, listArtworks,
@@ -316,6 +317,21 @@ async function attachRenditionAction(formData: FormData) {
redirectWithState({ notice: "Rendition attached." }) redirectWithState({ notice: "Rendition attached." })
} }
async function deleteRenditionAction(formData: FormData) {
"use server"
await requireWritePermission()
try {
await deleteArtworkRendition(readField(formData, "renditionId"))
} catch {
redirectWithState({ error: "Failed to delete rendition." })
}
revalidatePath("/portfolio")
redirectWithState({ notice: "Rendition deleted." })
}
export default async function PortfolioPage({ export default async function PortfolioPage({
searchParams, searchParams,
}: { }: {
@@ -641,6 +657,7 @@ export default async function PortfolioPage({
<option value="thumbnail">thumbnail</option> <option value="thumbnail">thumbnail</option>
<option value="card">card</option> <option value="card">card</option>
<option value="full">full</option> <option value="full">full</option>
<option value="retina">retina</option>
<option value="custom">custom</option> <option value="custom">custom</option>
</select> </select>
<input <input
@@ -719,7 +736,40 @@ export default async function PortfolioPage({
? `price: ${(artwork.priceAmountCents / 100).toFixed(2)} ${artwork.priceCurrency} (${artwork.isPriceVisible ? "visible" : "hidden"})` ? `price: ${(artwork.priceAmountCents / 100).toFixed(2)} ${artwork.priceCurrency} (${artwork.isPriceVisible ? "visible" : "hidden"})`
: "price: -"} : "price: -"}
</td> </td>
<td className="py-3 pr-4">{artwork.renditions.length}</td> <td className="py-3 pr-4">
<div className="space-y-1">
{artwork.renditions.length === 0 ? (
<span className="text-xs text-neutral-500">0</span>
) : (
artwork.renditions.map((rendition) => (
<form
key={rendition.id}
action={deleteRenditionAction}
className="flex items-center gap-2 text-xs"
>
<input type="hidden" name="renditionId" value={rendition.id} />
<span className="rounded bg-neutral-100 px-2 py-1 font-mono">
{rendition.slot}
</span>
<span className="text-neutral-500">
{rendition.width ?? "-"}x{rendition.height ?? "-"}
</span>
{rendition.isPrimary ? (
<span className="rounded bg-emerald-100 px-2 py-1 text-emerald-700">
primary
</span>
) : null}
<button
type="submit"
className="rounded border border-red-300 px-2 py-1 text-red-700 hover:bg-red-50"
>
delete
</button>
</form>
))
)}
</div>
</td>
<td className="py-3 pr-4 text-neutral-600"> <td className="py-3 pr-4 text-neutral-600">
g:{artwork.galleryLinks.length} a:{artwork.albumLinks.length} c: g:{artwork.galleryLinks.length} a:{artwork.albumLinks.length} c:
{artwork.categoryLinks.length} t:{artwork.tagLinks.length} {artwork.categoryLinks.length} t:{artwork.tagLinks.length}

View File

@@ -43,6 +43,25 @@ function updateBlock(blocks: PageBlocks, blockId: string, next: Partial<PageBloc
) )
} }
function moveBlock(blocks: PageBlocks, blockId: string, direction: "up" | "down"): PageBlocks {
const index = blocks.findIndex((entry) => entry.id === blockId)
if (index < 0) {
return blocks
}
const nextIndex = direction === "up" ? index - 1 : index + 1
if (nextIndex < 0 || nextIndex >= blocks.length) {
return blocks
}
const next = [...blocks]
const current = next[index]
next[index] = next[nextIndex]
next[nextIndex] = current
return next
}
export function PageBlockEditor({ export function PageBlockEditor({
name, name,
initialContent, initialContent,
@@ -156,13 +175,29 @@ export function PageBlockEditor({
<span> <span>
#{index + 1} {block.type} #{index + 1} {block.type}
</span> </span>
<button <div className="flex items-center gap-2">
type="button" <button
className="rounded border px-2 py-1" type="button"
onClick={() => setBlocks((prev) => prev.filter((entry) => entry.id !== block.id))} className="rounded border px-2 py-1"
> onClick={() => setBlocks((prev) => moveBlock(prev, block.id, "up"))}
Remove >
</button> Up
</button>
<button
type="button"
className="rounded border px-2 py-1"
onClick={() => setBlocks((prev) => moveBlock(prev, block.id, "down"))}
>
Down
</button>
<button
type="button"
className="rounded border px-2 py-1"
onClick={() => setBlocks((prev) => prev.filter((entry) => entry.id !== block.id))}
>
Remove
</button>
</div>
</div> </div>
{block.type === "hero" ? ( {block.type === "hero" ? (
@@ -187,6 +222,26 @@ export function PageBlockEditor({
placeholder="Subheading" placeholder="Subheading"
className="rounded border border-neutral-300 px-2 py-1 text-sm" className="rounded border border-neutral-300 px-2 py-1 text-sm"
/> />
<input
value={block.ctaLabel ?? ""}
onChange={(event) =>
setBlocks((prev) =>
updateBlock(prev, block.id, { ctaLabel: event.target.value || null }),
)
}
placeholder="CTA label"
className="rounded border border-neutral-300 px-2 py-1 text-sm"
/>
<input
value={block.ctaHref ?? ""}
onChange={(event) =>
setBlocks((prev) =>
updateBlock(prev, block.id, { ctaHref: event.target.value || null }),
)
}
placeholder="CTA href"
className="rounded border border-neutral-300 px-2 py-1 text-sm"
/>
</div> </div>
) : null} ) : null}
@@ -203,22 +258,34 @@ export function PageBlockEditor({
) : null} ) : null}
{block.type === "gallery" ? ( {block.type === "gallery" ? (
<textarea <div className="space-y-2">
rows={3} <input
value={block.imageIds.join(",")} value={block.title ?? ""}
onChange={(event) => onChange={(event) =>
setBlocks((prev) => setBlocks((prev) =>
updateBlock(prev, block.id, { updateBlock(prev, block.id, { title: event.target.value || null }),
imageIds: event.target.value )
.split(",") }
.map((entry) => entry.trim()) placeholder="Gallery title"
.filter((entry) => entry.length > 0), className="w-full rounded border border-neutral-300 px-2 py-1 text-sm"
}), />
) <textarea
} rows={3}
placeholder="Media asset IDs (comma separated UUIDs)" value={block.imageIds.join(",")}
className="w-full rounded border border-neutral-300 px-2 py-1 text-sm" 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"
/>
</div>
) : null} ) : null}
{block.type === "cta" ? ( {block.type === "cta" ? (
@@ -239,50 +306,101 @@ export function PageBlockEditor({
placeholder="Link href" placeholder="Link href"
className="rounded border border-neutral-300 px-2 py-1 text-sm" className="rounded border border-neutral-300 px-2 py-1 text-sm"
/> />
<select
value={block.variant}
onChange={(event) =>
setBlocks((prev) =>
updateBlock(prev, block.id, {
variant: event.target.value as "primary" | "secondary",
}),
)
}
className="rounded border border-neutral-300 px-2 py-1 text-sm"
>
<option value="primary">Primary</option>
<option value="secondary">Secondary</option>
</select>
</div> </div>
) : null} ) : null}
{block.type === "form" ? ( {block.type === "form" ? (
<input <div className="space-y-2">
value={block.formKey} <input
onChange={(event) => value={block.formKey}
setBlocks((prev) => updateBlock(prev, block.id, { formKey: event.target.value })) onChange={(event) =>
} setBlocks((prev) =>
placeholder="Form key (e.g. contact, commission)" updateBlock(prev, block.id, { formKey: event.target.value }),
className="w-full rounded border border-neutral-300 px-2 py-1 text-sm" )
/> }
placeholder="Form key (e.g. contact, commission)"
className="w-full rounded border border-neutral-300 px-2 py-1 text-sm"
/>
<input
value={block.title ?? ""}
onChange={(event) =>
setBlocks((prev) =>
updateBlock(prev, block.id, { title: event.target.value || null }),
)
}
placeholder="Form title"
className="w-full rounded border border-neutral-300 px-2 py-1 text-sm"
/>
<textarea
rows={2}
value={block.description ?? ""}
onChange={(event) =>
setBlocks((prev) =>
updateBlock(prev, block.id, { description: event.target.value || null }),
)
}
placeholder="Form description"
className="w-full rounded border border-neutral-300 px-2 py-1 text-sm"
/>
</div>
) : null} ) : null}
{block.type === "price_cards" ? ( {block.type === "price_cards" ? (
<textarea <div className="space-y-2">
rows={4} <input
value={block.cards value={block.title ?? ""}
.map((card) => [card.name, card.price ?? "", card.description ?? ""].join("|")) onChange={(event) =>
.join("\n")} setBlocks((prev) =>
onChange={(event) => updateBlock(prev, block.id, { title: event.target.value || null }),
setBlocks((prev) => )
updateBlock(prev, block.id, { }
cards: event.target.value placeholder="Price card section title"
.split("\n") className="w-full rounded border border-neutral-300 px-2 py-1 text-sm"
.map((line) => line.trim()) />
.filter((line) => line.length > 0) <textarea
.map((line, lineIndex) => { rows={4}
const [name, price, description] = line value={block.cards
.split("|") .map((card) => [card.name, card.price ?? "", card.description ?? ""].join("|"))
.map((entry) => entry.trim()) .join("\n")}
return { onChange={(event) =>
id: `card-${lineIndex}`, setBlocks((prev) =>
name: name || `Card ${lineIndex + 1}`, updateBlock(prev, block.id, {
price: price || null, cards: event.target.value
description: description || null, .split("\n")
} .map((line) => line.trim())
}), .filter((line) => line.length > 0)
}), .map((line, lineIndex) => {
) const [name, price, description] = line
} .split("|")
placeholder="One card per line: Name|Price|Description" .map((entry) => entry.trim())
className="w-full rounded border border-neutral-300 px-2 py-1 text-sm" 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"
/>
</div>
) : null} ) : null}
</article> </article>
))} ))}

View File

@@ -12,6 +12,16 @@ type PublicPageViewProps = {
page: PageEntity page: PageEntity
} }
function resolveFormLink(formKey: string): { href: string; label: string } {
const normalized = formKey.trim().toLowerCase()
if (normalized === "commission" || normalized === "commissions") {
return { href: "/commissions", label: "Open commission form" }
}
return { href: `/#form-${normalized || "contact"}`, label: "Open contact form" }
}
export function PublicPageView({ page }: PublicPageViewProps) { export function PublicPageView({ page }: PublicPageViewProps) {
const blocks = (() => { const blocks = (() => {
try { try {
@@ -106,6 +116,7 @@ export function PublicPageView({ page }: PublicPageViewProps) {
} }
if (block.type === "form") { if (block.type === "form") {
const formLink = resolveFormLink(block.formKey)
return ( return (
<section key={block.id} className="space-y-2 rounded border border-neutral-200 p-4"> <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> <h3 className="text-lg font-medium">{block.title || "Form block"}</h3>
@@ -113,6 +124,12 @@ export function PublicPageView({ page }: PublicPageViewProps) {
{block.description || "Form integration pending."} {block.description || "Form integration pending."}
</p> </p>
<p className="text-xs text-neutral-500">formKey: {block.formKey}</p> <p className="text-xs text-neutral-500">formKey: {block.formKey}</p>
<a
href={formLink.href}
className="inline-flex rounded border border-neutral-300 px-3 py-1.5 text-sm"
>
{formLink.label}
</a>
</section> </section>
) )
} }

View File

@@ -9,7 +9,57 @@ export const mediaAssetTypeSchema = z.enum([
"generic", "generic",
]) ])
export const artworkRenditionSlotSchema = z.enum(["thumbnail", "card", "full", "custom"]) export type MediaUploadRule = {
maxBytes: number
allowedMimePrefix?: string
allowedMimeExact?: string[]
}
export const mediaUploadRulesByType: Record<MediaAssetType, MediaUploadRule> = {
artwork: {
maxBytes: 40 * 1024 * 1024,
allowedMimePrefix: "image/",
},
banner: {
maxBytes: 20 * 1024 * 1024,
allowedMimePrefix: "image/",
},
promotion: {
maxBytes: 20 * 1024 * 1024,
allowedMimePrefix: "image/",
},
video: {
maxBytes: 250 * 1024 * 1024,
allowedMimePrefix: "video/",
},
gif: {
maxBytes: 40 * 1024 * 1024,
allowedMimeExact: ["image/gif"],
},
generic: {
maxBytes: 50 * 1024 * 1024,
},
}
export function isMimeAllowedForMediaType(type: MediaAssetType, mimeType: string): boolean {
const rule = mediaUploadRulesByType[type]
if (rule.allowedMimeExact?.includes(mimeType)) {
return true
}
if (rule.allowedMimePrefix) {
return mimeType.startsWith(rule.allowedMimePrefix)
}
return true
}
export function getMediaUploadMaxBytes(type: MediaAssetType): number {
return mediaUploadRulesByType[type].maxBytes
}
export const artworkRenditionSlotSchema = z.enum(["thumbnail", "card", "full", "retina", "custom"])
export const createMediaAssetInputSchema = z.object({ export const createMediaAssetInputSchema = z.object({
id: z.string().uuid().optional(), id: z.string().uuid().optional(),

View File

@@ -133,6 +133,14 @@ export const createNavigationMenuInputSchema = z.object({
isVisible: z.boolean().default(true), isVisible: z.boolean().default(true),
}) })
export const updateNavigationMenuInputSchema = z.object({
id: z.string().uuid(),
name: z.string().min(1).max(180).optional(),
slug: z.string().min(1).max(180).optional(),
location: z.string().min(1).max(80).optional(),
isVisible: z.boolean().optional(),
})
export const createNavigationItemInputSchema = z.object({ export const createNavigationItemInputSchema = z.object({
menuId: z.string().uuid(), menuId: z.string().uuid(),
label: z.string().min(1).max(180), label: z.string().min(1).max(180),
@@ -157,6 +165,7 @@ export type CreatePageInput = z.infer<typeof createPageInputSchema>
export type UpdatePageInput = z.infer<typeof updatePageInputSchema> export type UpdatePageInput = z.infer<typeof updatePageInputSchema>
export type UpsertPageTranslationInput = z.infer<typeof upsertPageTranslationInputSchema> export type UpsertPageTranslationInput = z.infer<typeof upsertPageTranslationInputSchema>
export type CreateNavigationMenuInput = z.infer<typeof createNavigationMenuInputSchema> export type CreateNavigationMenuInput = z.infer<typeof createNavigationMenuInputSchema>
export type UpdateNavigationMenuInput = z.infer<typeof updateNavigationMenuInputSchema>
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 PageBlock = z.infer<typeof pageBlockSchema>

View File

@@ -24,6 +24,7 @@ export {
createGallery, createGallery,
createMediaAsset, createMediaAsset,
createTag, createTag,
deleteArtworkRendition,
deleteGrouping, deleteGrouping,
deleteMediaAsset, deleteMediaAsset,
getMediaAssetById, getMediaAssetById,
@@ -45,6 +46,7 @@ export {
createNavigationMenu, createNavigationMenu,
createPage, createPage,
deleteNavigationItem, deleteNavigationItem,
deleteNavigationMenu,
deletePage, deletePage,
getPageById, getPageById,
getPublishedPageBySlug, getPublishedPageBySlug,
@@ -55,6 +57,7 @@ export {
listPublicNavigation, listPublicNavigation,
listPublishedPageSlugs, listPublishedPageSlugs,
updateNavigationItem, updateNavigationItem,
updateNavigationMenu,
updatePage, updatePage,
upsertNavigationItemTranslation, upsertNavigationItemTranslation,
upsertPageTranslation, upsertPageTranslation,

View File

@@ -33,10 +33,14 @@ export async function listArtworks(limit = 24) {
take: limit, take: limit,
include: { include: {
renditions: { renditions: {
orderBy: [{ isPrimary: "desc" }, { updatedAt: "desc" }],
select: { select: {
id: true, id: true,
slot: true, slot: true,
mediaAssetId: true, mediaAssetId: true,
width: true,
height: true,
isPrimary: true,
}, },
}, },
galleryLinks: { galleryLinks: {
@@ -340,6 +344,12 @@ export async function attachArtworkRendition(input: unknown) {
}) })
} }
export async function deleteArtworkRendition(id: string) {
return db.artworkRendition.delete({
where: { id },
})
}
export async function getMediaFoundationSummary() { export async function getMediaFoundationSummary() {
const [mediaAssets, artworks, galleries, albums, categories, tags] = await Promise.all([ const [mediaAssets, artworks, galleries, albums, categories, tags] = await Promise.all([
db.mediaAsset.count(), db.mediaAsset.count(),
@@ -473,6 +483,7 @@ export async function listPublishedArtworks(input: ListPublishedArtworksInput =
isPublished: true, isPublished: true,
}, },
}, },
orderBy: [{ isPrimary: "desc" }, { updatedAt: "desc" }],
include: { include: {
mediaAsset: { mediaAsset: {
select: { select: {
@@ -547,6 +558,7 @@ export async function getPublishedArtworkBySlug(slug: string) {
isPublished: true, isPublished: true,
}, },
}, },
orderBy: [{ isPrimary: "desc" }, { updatedAt: "desc" }],
include: { include: {
mediaAsset: { mediaAsset: {
select: { select: {

View File

@@ -3,6 +3,7 @@ import {
createNavigationMenuInputSchema, createNavigationMenuInputSchema,
createPageInputSchema, createPageInputSchema,
updateNavigationItemInputSchema, updateNavigationItemInputSchema,
updateNavigationMenuInputSchema,
updatePageInputSchema, updatePageInputSchema,
upsertPageTranslationInputSchema, upsertPageTranslationInputSchema,
} from "@cms/content" } from "@cms/content"
@@ -297,6 +298,22 @@ export async function createNavigationMenu(input: unknown) {
}) })
} }
export async function updateNavigationMenu(input: unknown) {
const payload = updateNavigationMenuInputSchema.parse(input)
const { id, ...data } = payload
return db.navigationMenu.update({
where: { id },
data,
})
}
export async function deleteNavigationMenu(id: string) {
return db.navigationMenu.delete({
where: { id },
})
}
export async function createNavigationItem(input: unknown) { export async function createNavigationItem(input: unknown) {
const payload = createNavigationItemInputSchema.parse(input) const payload = createNavigationItemInputSchema.parse(input)