Compare commits

...

3 Commits

8 changed files with 332 additions and 115 deletions

View File

@@ -137,14 +137,14 @@ This file is the single source of truth for roadmap and delivery progress.
### Admin App (Primary Focus)
- [~] [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)
- [~] [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] Portfolio grouping primitives (galleries, albums, categories, tags) with ordering/visibility controls
- [x] [P1] Artwork refinement fields (medium, dimensions, year, framing, availability, price visibility)
- [ ] [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] Artwork rendition management (thumbnail, card, full, retina/custom sizes)
- [x] [P1] Type-specific processing presets (artwork/banner/promo/video/gif) with validation rules
- [ ] [P1] Users management (invite, roles, status)
- [ ] [P1] Disable/ban user function and enforcement in auth/session checks
- [~] [P1] Owner/support protection rules in user management actions (cannot delete/demote)
@@ -363,6 +363,9 @@ 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] 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 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] 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] 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 {
getMediaUploadMaxBytes,
isMimeAllowedForMediaType,
mediaAssetTypeSchema,
} from "@cms/content"
import { hasPermission } from "@cms/content/rbac"
import { createMediaAsset } from "@cms/db"
@@ -7,33 +12,7 @@ import { storeUpload } from "@/lib/media/storage"
export const runtime = "nodejs"
const MAX_UPLOAD_BYTES = Number(process.env.CMS_MEDIA_UPLOAD_MAX_BYTES ?? 25 * 1024 * 1024)
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: "",
},
}
const MAX_UPLOAD_BYTES_OVERRIDE = Number(process.env.CMS_MEDIA_UPLOAD_MAX_BYTES ?? 0)
function parseTextField(formData: FormData, field: string): string {
const value = formData.get(field)
@@ -88,24 +67,6 @@ function deriveTitleFromFilename(fileName: string): string {
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 {
return Response.json(
{
@@ -147,12 +108,13 @@ export async function POST(request: Request): Promise<Response> {
return badRequest("Invalid form payload.")
}
const type = parseTextField(formData, "type")
const parsedType = mediaAssetTypeSchema.safeParse(parseTextField(formData, "type"))
const fileEntry = formData.get("file")
if (!type) {
if (!parsedType.success) {
return badRequest("Type is required.")
}
const type = parsedType.data
if (!(fileEntry instanceof File)) {
return badRequest("File is required.")
@@ -162,13 +124,17 @@ export async function POST(request: Request): Promise<Response> {
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(
`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}.`)
}

View File

@@ -5,6 +5,7 @@ import {
createCategory,
createGallery,
createTag,
deleteArtworkRendition,
deleteGrouping,
linkArtworkToGrouping,
listArtworks,
@@ -316,6 +317,21 @@ async function attachRenditionAction(formData: FormData) {
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({
searchParams,
}: {
@@ -641,6 +657,7 @@ export default async function PortfolioPage({
<option value="thumbnail">thumbnail</option>
<option value="card">card</option>
<option value="full">full</option>
<option value="retina">retina</option>
<option value="custom">custom</option>
</select>
<input
@@ -719,7 +736,40 @@ export default async function PortfolioPage({
? `price: ${(artwork.priceAmountCents / 100).toFixed(2)} ${artwork.priceCurrency} (${artwork.isPriceVisible ? "visible" : "hidden"})`
: "price: -"}
</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">
g:{artwork.galleryLinks.length} a:{artwork.albumLinks.length} c:
{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({
name,
initialContent,
@@ -156,13 +175,29 @@ export function PageBlockEditor({
<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 className="flex items-center gap-2">
<button
type="button"
className="rounded border px-2 py-1"
onClick={() => setBlocks((prev) => moveBlock(prev, block.id, "up"))}
>
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>
{block.type === "hero" ? (
@@ -187,6 +222,26 @@ export function PageBlockEditor({
placeholder="Subheading"
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>
) : null}
@@ -203,22 +258,34 @@ export function PageBlockEditor({
) : 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"
/>
<div className="space-y-2">
<input
value={block.title ?? ""}
onChange={(event) =>
setBlocks((prev) =>
updateBlock(prev, block.id, { title: event.target.value || null }),
)
}
placeholder="Gallery title"
className="w-full rounded border border-neutral-300 px-2 py-1 text-sm"
/>
<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"
/>
</div>
) : null}
{block.type === "cta" ? (
@@ -239,50 +306,101 @@ export function PageBlockEditor({
placeholder="Link href"
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>
) : 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"
/>
<div className="space-y-2">
<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"
/>
<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}
{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"
/>
<div className="space-y-2">
<input
value={block.title ?? ""}
onChange={(event) =>
setBlocks((prev) =>
updateBlock(prev, block.id, { title: event.target.value || null }),
)
}
placeholder="Price card section title"
className="w-full rounded border border-neutral-300 px-2 py-1 text-sm"
/>
<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"
/>
</div>
) : null}
</article>
))}

View File

@@ -12,6 +12,16 @@ type PublicPageViewProps = {
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) {
const blocks = (() => {
try {
@@ -106,6 +116,7 @@ export function PublicPageView({ page }: PublicPageViewProps) {
}
if (block.type === "form") {
const formLink = resolveFormLink(block.formKey)
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>
@@ -113,6 +124,12 @@ export function PublicPageView({ page }: PublicPageViewProps) {
{block.description || "Form integration pending."}
</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>
)
}

View File

@@ -9,7 +9,57 @@ export const mediaAssetTypeSchema = z.enum([
"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({
id: z.string().uuid().optional(),

View File

@@ -24,6 +24,7 @@ export {
createGallery,
createMediaAsset,
createTag,
deleteArtworkRendition,
deleteGrouping,
deleteMediaAsset,
getMediaAssetById,

View File

@@ -33,10 +33,14 @@ export async function listArtworks(limit = 24) {
take: limit,
include: {
renditions: {
orderBy: [{ isPrimary: "desc" }, { updatedAt: "desc" }],
select: {
id: true,
slot: true,
mediaAssetId: true,
width: true,
height: true,
isPrimary: true,
},
},
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() {
const [mediaAssets, artworks, galleries, albums, categories, tags] = await Promise.all([
db.mediaAsset.count(),
@@ -473,6 +483,7 @@ export async function listPublishedArtworks(input: ListPublishedArtworksInput =
isPublished: true,
},
},
orderBy: [{ isPrimary: "desc" }, { updatedAt: "desc" }],
include: {
mediaAsset: {
select: {
@@ -547,6 +558,7 @@ export async function getPublishedArtworkBySlug(slug: string) {
isPublished: true,
},
},
orderBy: [{ isPrimary: "desc" }, { updatedAt: "desc" }],
include: {
mediaAsset: {
select: {