Add nsfw handling. Add zustand for global store

Dockerfile.dev

@@ -18,6 +18,12 @@ RUN bunx prisma generate
 
 # Uncomment the following line in case you want to disable telemetry during the build.
 ENV NEXT_TELEMETRY_DISABLED=1
+ARG GIT_SHA=unknown
+ARG APP_VERSION=0.0.0
+ARG DEPLOY_ENV=production
+ENV NEXT_PUBLIC_GIT_SHA=$GIT_SHA \
+    NEXT_PUBLIC_APP_VERSION=$APP_VERSION \
+    NEXT_PUBLIC_DEPLOY_ENV=$DEPLOY_ENV
 ARG DATABASE_URL
 ENV DATABASE_URL=$DATABASE_URL
 
@@ -33,6 +39,12 @@ ENV NEXT_TELEMETRY_DISABLED=1
 ENV NODE_ENV=production \
     PORT=3000 \
     HOSTNAME="0.0.0.0"
+ARG GIT_SHA=unknown
+ARG APP_VERSION=0.0.0
+ARG DEPLOY_ENV=production
+ENV NEXT_PUBLIC_GIT_SHA=$GIT_SHA \
+    NEXT_PUBLIC_APP_VERSION=$APP_VERSION \
+    NEXT_PUBLIC_DEPLOY_ENV=$DEPLOY_ENV
 
 RUN groupadd --system --gid 1001 nodejs && \
     useradd --system --uid 1001 --no-log-init -g nodejs nextjs

Dockerfile.prod

@@ -14,7 +14,6 @@ FROM base AS builder
 WORKDIR /app
 COPY --from=deps /app/node_modules ./node_modules
 COPY . .
-# RUN bunx prisma migrate deploy
 RUN bunx prisma generate
 
 # Uncomment the following line in case you want to disable telemetry during the build.

bun.lock

@@ -5,8 +5,8 @@
     "": {
       "name": "app.gaertan.art",
       "dependencies": {
-        "@aws-sdk/client-s3": "^3.974.0",
+        "@aws-sdk/client-s3": "^3.980.0",
-        "@aws-sdk/s3-request-presigner": "^3.974.0",
+        "@aws-sdk/s3-request-presigner": "^3.980.0",
         "@hookform/resolvers": "^5.2.2",
         "@prisma/adapter-pg": "^7.3.0",
         "@prisma/client": "^7.3.0",
@@ -27,15 +27,16 @@
         "lucide-react": "^0.561.0",
         "next": "16.1.6",
         "next-themes": "^0.4.6",
-        "pg": "^8.17.2",
+        "pg": "^8.18.0",
         "react": "19.2.4",
         "react-dom": "19.2.4",
         "react-hook-form": "^7.71.1",
         "react-markdown": "^10.1.0",
-        "simple-icons": "^16.6.0",
+        "simple-icons": "^16.7.0",
         "sonner": "^2.0.7",
         "tailwind-merge": "^3.4.0",
         "zod": "^4.3.6",
+        "zustand": "^5.0.6",
       },
       "devDependencies": {
         "@biomejs/biome": "2.2.0",
@@ -944,6 +945,8 @@
 
     "zod": ["zod@4.3.6", "", {}, "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg=="],
 
+    "zustand": ["zustand@5.0.11", "", { "peerDependencies": { "@types/react": ">=18.0.0", "immer": ">=9.0.6", "react": ">=18.0.0", "use-sync-external-store": ">=1.2.0" }, "optionalPeers": ["@types/react", "immer", "react", "use-sync-external-store"] }, "sha512-fdZY+dk7zn/vbWNCYmzZULHRrss0jx5pPFiOuMZ/5HJN6Yv3u+1Wswy/4MpZEkEGhtNH+pwxZB8OKgUBPzYAGg=="],
+
     "zwitch": ["zwitch@2.0.4", "", {}, "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A=="],
 
     "@aws-crypto/crc32/@aws-sdk/types": ["@aws-sdk/types@3.953.0", "", { "dependencies": { "@smithy/types": "^4.10.0", "tslib": "^2.6.2" } }, "sha512-M9Iwg9kTyqTErI0vOTVVpcnTHWzS3VplQppy8MuL02EE+mJ0BIwpWfsaAPQW+/XnVpdNpWZTsHcNE29f1+hR8g=="],

package.json

@@ -42,6 +42,7 @@
     "simple-icons": "^16.7.0",
     "sonner": "^2.0.7",
     "tailwind-merge": "^3.4.0",
+    "zustand": "^5.0.6",
     "zod": "^4.3.6"
   },
   "devDependencies": {

prisma/schema.prisma

@@ -47,13 +47,13 @@ model Artwork {
   galleryId String?
   gallery   Gallery? @relation(fields: [galleryId], references: [id])
 
-  metadata ArtworkMetadata?
+  metadata  ArtworkMetadata?
   timelapse ArtworkTimelapse?
 
   albums     Album[]
   categories ArtCategory[]
   colors     ArtworkColor[]
-  tags       ArtTag[]
+  tags       Tag[]          @relation("ArtworkTags")
   variants   FileVariant[]
 
   @@index([colorStatus])
@@ -101,43 +101,7 @@ model ArtCategory {
   description String?
 
   artworks Artwork[]
-  tags     ArtTag[]
+  tagLinks TagCategory[]
-}
-
-model ArtTag {
-  id        String   @id @default(cuid())
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
-  sortIndex Int      @default(0)
-
-  name             String  @unique
-  slug             String  @unique
-  isParent         Boolean @default(false)
-  showOnAnimalPage Boolean @default(false)
-
-  description String?
-
-  aliases    ArtTagAlias[]
-  artworks   Artwork[]
-  categories ArtCategory[]
-
-  parentId String?
-  parent   ArtTag?  @relation("TagHierarchy", fields: [parentId], references: [id], onDelete: SetNull)
-  children ArtTag[] @relation("TagHierarchy")
-}
-
-model ArtTagAlias {
-  id        String   @id @default(cuid())
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
-
-  alias String @unique
-
-  tagId String
-  tag   ArtTag @relation(fields: [tagId], references: [id], onDelete: Cascade)
-
-  @@unique([tagId, alias])
-  @@index([alias])
 }
 
 model Color {
@@ -201,12 +165,12 @@ model ArtworkTimelapse {
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 
-  artworkId String @unique
+  artworkId String  @unique
   artwork   Artwork @relation(fields: [artworkId], references: [id], onDelete: Cascade)
 
   enabled Boolean @default(false)
 
-  s3Key     String @unique
+  s3Key     String  @unique
   fileName  String?
   mimeType  String?
   sizeBytes Int?
@@ -248,6 +212,72 @@ model FileVariant {
   @@unique([artworkId, type])
 }
 
+model Tag {
+  id        String   @id @default(cuid())
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+  sortIndex Int      @default(0)
+
+  name      String  @unique
+  slug      String  @unique
+  isVisible Boolean @default(true)
+
+  description String?
+
+  aliases               TagAlias[]
+  categoryLinks         TagCategory[]
+  categoryParents       TagCategory[]          @relation("TagCategoryParent")
+  artworks              Artwork[]              @relation("ArtworkTags")
+  commissionTypes       CommissionType[]       @relation("CommissionTypeTags")
+  commissionCustomCards CommissionCustomCard[] @relation("CommissionCustomCardTags")
+  miniatures            Miniature[]            @relation("MiniatureTags")
+}
+
+model TagAlias {
+  id        String   @id @default(cuid())
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  alias String @unique
+
+  tagId String
+  tag   Tag    @relation(fields: [tagId], references: [id], onDelete: Cascade)
+
+  @@unique([tagId, alias])
+  @@index([alias])
+}
+
+model TagCategory {
+  id        String   @id @default(cuid())
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  tagId      String
+  categoryId String
+
+  isParent         Boolean @default(false)
+  showOnAnimalPage Boolean @default(false)
+  parentTagId      String?
+
+  tag       Tag         @relation(fields: [tagId], references: [id], onDelete: Cascade)
+  category  ArtCategory @relation(fields: [categoryId], references: [id], onDelete: Cascade)
+  parentTag Tag?        @relation("TagCategoryParent", fields: [parentTagId], references: [id], onDelete: SetNull)
+
+  @@unique([tagId, categoryId])
+  @@index([categoryId])
+  @@index([tagId])
+  @@index([parentTagId])
+  @@index([categoryId, parentTagId])
+}
+
+model Miniature {
+  id        String   @id @default(cuid())
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  tags Tag[] @relation("MiniatureTags")
+}
+
 model Commission {
   id        String   @id @default(cuid())
   createdAt DateTime @default(now())
@@ -265,6 +295,8 @@ model CommissionType {
 
   description String?
 
+  tags Tag[] @relation("CommissionTypeTags")
+
   options      CommissionTypeOption[]
   extras       CommissionTypeExtra[]
   customInputs CommissionTypeCustomInput[]
@@ -279,13 +311,14 @@ model CommissionCustomCard {
 
   name String
 
-  description String?
+  description       String?
   referenceImageUrl String?
-  isVisible Boolean @default(true)
+  isVisible         Boolean @default(true)
-  isSpecialOffer Boolean @default(false)
+  isSpecialOffer    Boolean @default(false)
 
-  options CommissionCustomCardOption[]
+  tags     Tag[]                        @relation("CommissionCustomCardTags")
-  extras  CommissionCustomCardExtra[]
+  options  CommissionCustomCardOption[]
+  extras   CommissionCustomCardExtra[]
   requests CommissionRequest[]
 
   @@index([isVisible, sortIndex])
@@ -301,9 +334,9 @@ model CommissionOption {
 
   description String?
 
-  types    CommissionTypeOption[]
+  types       CommissionTypeOption[]
   customCards CommissionCustomCardOption[]
-  requests CommissionRequest[]
+  requests    CommissionRequest[]
 }
 
 model CommissionTypeOption {
@@ -335,8 +368,8 @@ model CommissionExtra {
 
   description String?
 
-  requests CommissionRequest[]
+  requests    CommissionRequest[]
-  types    CommissionTypeExtra[]
+  types       CommissionTypeExtra[]
   customCards CommissionCustomCardExtra[]
 }
 
@@ -444,12 +477,12 @@ model CommissionRequest {
   userAgent       String?
   customFields    Json?
 
-  optionId String?
+  optionId     String?
-  typeId   String?
+  typeId       String?
   customCardId String?
-  option   CommissionOption? @relation(fields: [optionId], references: [id])
+  option       CommissionOption?     @relation(fields: [optionId], references: [id])
-  type     CommissionType?   @relation(fields: [typeId], references: [id])
+  type         CommissionType?       @relation(fields: [typeId], references: [id])
-  customCard CommissionCustomCard? @relation(fields: [customCardId], references: [id])
+  customCard   CommissionCustomCard? @relation(fields: [customCardId], references: [id])
 
   extras CommissionExtra[]
   files  CommissionRequestFile[]
@@ -460,9 +493,9 @@ model CommissionGuidelines {
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 
-  markdown String
+  markdown        String
   exampleImageUrl String?
-  isActive Boolean @default(true)
+  isActive        Boolean @default(true)
 
   @@index([isActive])
 }

src/actions/animalStudies/getAnimalStudiesPage.ts

@@ -51,6 +51,7 @@ export async function getAnimalStudiesPage(input: unknown): Promise<AnimalStudie
       id: true,
       name: true,
       altText: true,
+      nsfw: true,
       sortKey: true,
       file: { select: { fileKey: true } },
       variants: {
@@ -80,6 +81,7 @@ export async function getAnimalStudiesPage(input: unknown): Promise<AnimalStudie
       id: r.id,
       name: r.name,
       altText: r.altText,
+      nsfw: r.nsfw ?? false,
       fileKey: r.file.fileKey,
       width: w,
       height: h,

src/actions/portfolio/getPortfolioArtworksPage.ts

@@ -12,6 +12,7 @@ export type PortfolioArtworkItem = {
   id: string;
   name: string;
   altText: string | null;
+  nsfw: boolean;
 
   sortKey: number | null;
   year: number | null;
@@ -113,6 +114,7 @@ export async function getPortfolioArtworksPage(args: {
     id: true,
     name: true,
     altText: true,
+    nsfw: true,
     year: true,
     sortKey: true,
     file: { select: { fileKey: true } },
@@ -138,6 +140,7 @@ export async function getPortfolioArtworksPage(args: {
       id: r.id,
       name: r.name,
       altText: r.altText ?? null,
+      nsfw: r.nsfw ?? false,
       sortKey: r.sortKey ?? null,
       year: r.year ?? null,
       fileKey: r.file.fileKey,

src/actions/portfolio/getTaggedArtworksPage.ts

@@ -0,0 +1,176 @@
+"use server";
+
+import type { Prisma } from "@/generated/prisma/browser";
+import { prisma } from "@/lib/prisma";
+
+export type Cursor = {
+  afterSortKey: number | null;
+  afterId: string;
+} | null;
+
+export type TaggedArtworkItem = {
+  id: string;
+  name: string;
+  altText: string | null;
+  nsfw: boolean;
+  sortKey: number | null;
+  year: number | null;
+  fileKey: string;
+  thumbW: number;
+  thumbH: number;
+  dominantHex: string;
+};
+
+type VariantPick = { type: string; width: number; height: number };
+function pickVariant(variants: VariantPick[], type: string) {
+  return variants.find((v) => v.type === type) ?? null;
+}
+
+export async function getTaggedArtworksPage(args: {
+  take?: number;
+  cursor?: Cursor;
+  tagSlugs: string[];
+  onlyPublished?: boolean;
+}): Promise<{
+  items: TaggedArtworkItem[];
+  nextCursor: Cursor;
+  total: number;
+}> {
+  const { take = 60, cursor = null, tagSlugs, onlyPublished = true } = args;
+
+  const filteredSlugs = tagSlugs.map((s) => s.trim()).filter(Boolean);
+  if (filteredSlugs.length === 0) {
+    return { items: [], nextCursor: null, total: 0 };
+  }
+
+  const baseWhere: Prisma.ArtworkWhereInput = {
+    ...(onlyPublished ? { published: true } : {}),
+    tags: { some: { slug: { in: filteredSlugs } } },
+    variants: { some: { type: "thumbnail" } },
+  };
+
+  const total = await prisma.artwork.count({ where: baseWhere });
+
+  const select = {
+    id: true,
+    name: true,
+    altText: true,
+    nsfw: true,
+    year: true,
+    sortKey: true,
+    file: { select: { fileKey: true } },
+    variants: {
+      where: { type: "thumbnail" },
+      select: { type: true, width: true, height: true },
+      take: 1,
+    },
+    colors: {
+      where: { type: "Vibrant" },
+      select: { color: { select: { hex: true } } },
+      take: 1,
+    },
+  } satisfies Prisma.ArtworkSelect;
+
+  type ArtworkRow = Prisma.ArtworkGetPayload<{ select: typeof select }>;
+
+  const mapRow = (r: ArtworkRow): TaggedArtworkItem | null => {
+    const thumb = pickVariant(r.variants, "thumbnail");
+    if (!thumb?.width || !thumb?.height) return null;
+
+    return {
+      id: r.id,
+      name: r.name,
+      altText: r.altText ?? null,
+      nsfw: r.nsfw ?? false,
+      sortKey: r.sortKey ?? null,
+      year: r.year ?? null,
+      fileKey: r.file.fileKey,
+      thumbW: thumb.width,
+      thumbH: thumb.height,
+      dominantHex: r.colors[0]?.color?.hex ?? "#999999",
+    };
+  };
+
+  let items: TaggedArtworkItem[] = [];
+  let nextCursor: Cursor = null;
+
+  const inNullSegment = cursor?.afterSortKey === null;
+
+  if (!inNullSegment) {
+    const whereA: Prisma.ArtworkWhereInput = {
+      AND: [baseWhere, { sortKey: { not: null } }],
+    };
+
+    if (cursor?.afterSortKey != null) {
+      const sk = Number(cursor.afterSortKey);
+      whereA.OR = [
+        { sortKey: { gt: sk } },
+        { AND: [{ sortKey: sk }, { id: { gt: cursor.afterId } }] },
+      ];
+    }
+
+    const rowsA = await prisma.artwork.findMany({
+      where: whereA,
+      orderBy: [{ sortKey: "asc" }, { id: "asc" }],
+      take: Math.min(take, 200),
+      select,
+    });
+
+    items = rowsA.map(mapRow).filter((x): x is TaggedArtworkItem => x !== null);
+
+    if (items.length >= take) {
+      const last = items.at(-1);
+      if (!last || last.sortKey == null) {
+        return { items, nextCursor: null, total };
+      }
+      nextCursor = { afterSortKey: last.sortKey, afterId: last.id };
+      return { items, nextCursor, total };
+    }
+
+    const remaining = take - items.length;
+
+    const whereB: Prisma.ArtworkWhereInput = {
+      AND: [baseWhere, { sortKey: null }],
+    };
+
+    const rowsB = await prisma.artwork.findMany({
+      where: whereB,
+      orderBy: [{ id: "asc" }],
+      take: Math.min(remaining, 200),
+      select,
+    });
+
+    const more = rowsB.map(mapRow).filter((x): x is TaggedArtworkItem => x !== null);
+    items = items.concat(more);
+
+    const last = items[items.length - 1];
+    nextCursor =
+      items.length < take || !last
+        ? null
+        : { afterSortKey: last.sortKey ?? null, afterId: last.id };
+
+    return { items, nextCursor, total };
+  }
+
+  const whereB: Prisma.ArtworkWhereInput = {
+    AND: [baseWhere, { sortKey: null }],
+    ...(cursor ? { id: { gt: cursor.afterId } } : {}),
+  };
+
+  const rowsB = await prisma.artwork.findMany({
+    where: whereB,
+    orderBy: [{ id: "asc" }],
+    take: Math.min(take, 200),
+    select,
+  });
+
+  items = rowsB.map(mapRow).filter((x): x is TaggedArtworkItem => x !== null);
+
+  const last = items[items.length - 1];
+  nextCursor =
+    items.length < take || !last
+      ? null
+      : { afterSortKey: null, afterId: last.id };
+
+  return { items, nextCursor, total };
+}

src/app/(normal)/artworks/animalstudies/index/page.tsx

@@ -30,14 +30,22 @@ function sortArtworks(a: SimpleArtwork, b: SimpleArtwork) {
 }
 
 export default async function AnimalListPage() {
-  const tags = await prisma.artTag.findMany({
+  const tags = await prisma.tag.findMany({
-    where: { showOnAnimalPage: true },
+    where: {
+      isVisible: true,
+      categoryLinks: {
+        some: { category: { name: "Animal Studies" }, showOnAnimalPage: true },
+      },
+    },
     select: {
       id: true,
       name: true,
       slug: true,
       sortIndex: true,
-      parentId: true,
+      categoryLinks: {
+        where: { category: { name: "Animal Studies" } },
+        select: { parentTagId: true },
+      },
       artworks: {
         where: {
           published: true,
@@ -50,10 +58,15 @@ export default async function AnimalListPage() {
     orderBy: [{ sortIndex: "asc" }, { name: "asc" }],
   });
 
-  const byId = new Map(tags.map((t) => [t.id, t]));
+  const tagsWithParents = tags.map((t) => ({
-  const childrenByParentId = new Map<string, typeof tags>();
+    ...t,
+    parentId: t.categoryLinks[0]?.parentTagId ?? null,
+  }));
 
-  for (const t of tags) {
+  const byId = new Map(tagsWithParents.map((t) => [t.id, t]));
+  const childrenByParentId = new Map<string, typeof tagsWithParents>();
+
+  for (const t of tagsWithParents) {
     if (!t.parentId) continue;
     const arr = childrenByParentId.get(t.parentId) ?? [];
     arr.push(t);
@@ -64,12 +77,12 @@ export default async function AnimalListPage() {
     childrenByParentId.set(pid, arr.slice().sort(sortBySortIndexName));
   }
 
-  const parents = tags
+  const parents = tagsWithParents
     .filter((t) => t.parentId === null)
     .slice()
     .sort(sortBySortIndexName);
 
-  const orphans = tags
+  const orphans = tagsWithParents
     .filter((t) => t.parentId !== null && !byId.has(t.parentId))
     .slice()
     .sort(sortBySortIndexName);

src/app/(normal)/artworks/animalstudies/page.tsx

@@ -17,17 +17,28 @@ function parseTagsParam(tags: string | string[] | undefined): string[] {
 function expandSelectedWithChildren(
   selectedSlugs: string[],
   tagsForFilter: Array<{
+    id: string;
     slug: string;
-    children: Array<{ slug: string }>;
+    parentId: string | null;
   }>,
 ) {
   const bySlug = new Map(tagsForFilter.map((t) => [t.slug, t]));
+  const childrenByParentId = new Map<string, typeof tagsForFilter>();
+
+  for (const t of tagsForFilter) {
+    if (!t.parentId) continue;
+    const arr = childrenByParentId.get(t.parentId) ?? [];
+    arr.push(t);
+    childrenByParentId.set(t.parentId, arr);
+  }
+
   const out = new Set(selectedSlugs);
 
   for (const slug of selectedSlugs) {
     const t = bySlug.get(slug);
     if (!t) continue;
-    for (const c of t.children ?? []) out.add(c.slug);
+    const children = childrenByParentId.get(t.id) ?? [];
+    for (const c of children) out.add(c.slug);
   }
 
   return Array.from(out);
@@ -41,24 +52,31 @@ export default async function AnimalStudiesPage({
   const { tags } = await searchParams;
 
   const selectedTagSlugs = parseTagsParam(tags);
-  const tagsForFilter = await prisma.artTag.findMany({
+  const tagLinks = await prisma.tagCategory.findMany({
-    where: { showOnAnimalPage: true },
+    where: {
+      showOnAnimalPage: true,
+      category: { name: "Animal Studies" },
+      tag: { isVisible: true },
+    },
     select: {
-      id: true,
+      parentTagId: true,
-      name: true,
+      tag: {
-      slug: true,
+        select: { id: true, name: true, slug: true, sortIndex: true },
-      sortIndex: true,
-      parentId: true,
-      parent: { select: { id: true, name: true, slug: true, sortIndex: true } },
-      children: {
-        where: { showOnAnimalPage: true },
-        select: { id: true, name: true, slug: true, sortIndex: true, parentId: true },
-        orderBy: [{ sortIndex: "asc" }, { name: "asc" }],
       },
     },
-    orderBy: [{ sortIndex: "asc" }, { name: "asc" }],
+    orderBy: [{ tag: { sortIndex: "asc" } }, { tag: { name: "asc" } }],
   });
 
+  const tagsForFilter = tagLinks.map((link) => ({
+    id: link.tag.id,
+    name: link.tag.name,
+    slug: link.tag.slug,
+    sortIndex: link.tag.sortIndex,
+    parentId: link.parentTagId,
+    parent: null,
+    children: [],
+  }));
+
   const expandedTagSlugs = expandSelectedWithChildren(selectedTagSlugs, tagsForFilter);
 
   return (

src/app/(normal)/artworks/single/[id]/page.tsx

@@ -1,12 +1,13 @@
 import ArtworkMetaCard from "@/components/artworks/ArtworkMetaCard";
 import ArtworkTimelapseViewer from "@/components/artworks/ArtworkTimelapseViewer";
 import { ContextBackButton } from "@/components/artworks/ContextBackButton";
+import NsfwConsentDialog from "@/components/nsfw/NsfwConsentDialog";
+import NsfwImage from "@/components/nsfw/NsfwImage";
+import NsfwLink from "@/components/nsfw/NsfwLink";
 import { Button } from "@/components/ui/button";
 import { prisma } from "@/lib/prisma";
 import { cn } from "@/lib/utils";
 import { PlayCircle } from "lucide-react";
-import Image from "next/image";
-import Link from "next/link";
 
 export default async function SingleArtworkPage({
   params,
@@ -49,6 +50,7 @@ export default async function SingleArtworkPage({
 
   return (
     <div className="px-4 sm:px-8 py-4">
+      <NsfwConsentDialog hasNsfw={Boolean(artwork.nsfw)} />
       <div className="relative w-full min-h-10 flex items-center mb-4">
         <div className="z-10 hidden sm:block">
           <ContextBackButton />
@@ -69,16 +71,17 @@ export default async function SingleArtworkPage({
             className="relative w-full bg-muted items-center justify-center"
             style={{ aspectRatio: "4 / 3" }}
           >
-            <Link href={`/raw/${artwork.id}`}>
+            <NsfwLink href={`/raw/${artwork.id}`} nsfw={Boolean(artwork.nsfw)}>
-              <Image
+              <NsfwImage
                 src={`/api/image/resized/${artwork.file.fileKey}.webp`}
                 alt={artwork.altText || "Artwork"}
                 fill={!width || !height}
                 width={width}
                 height={height}
+                nsfw={Boolean(artwork.nsfw)}
                 className={cn("object-cover transition duration-300")}
               />
-            </Link>
+            </NsfwLink>
           </div>
         </div>
         {artwork.timelapse?.enabled ? (

src/app/(normal)/artworks/tagged/page.tsx

@@ -0,0 +1,48 @@
+import TaggedGallery from "@/components/portfolio/TaggedGallery";
+import { prisma } from "@/lib/prisma";
+
+function parseTagsParam(tags: string | string[] | undefined): string[] {
+  if (!tags) return [];
+  const raw = Array.isArray(tags) ? tags.join(",") : tags;
+  return raw
+    .split(",")
+    .map((s) => s.trim())
+    .filter(Boolean);
+}
+
+export default async function TaggedPortfolioPage({
+  searchParams,
+}: {
+  searchParams: { tags?: string | string[] };
+}) {
+  const { tags } = await searchParams;
+  const selectedTagSlugs = parseTagsParam(tags);
+
+  const tagsSelected = selectedTagSlugs.length
+    ? await prisma.tag.findMany({
+      where: { slug: { in: selectedTagSlugs } },
+      select: { id: true, name: true, slug: true },
+      orderBy: [{ sortIndex: "asc" }, { name: "asc" }],
+    })
+    : [];
+
+  return (
+    <div className="mx-auto w-full max-w-6xl px-4 py-8">
+      <header className="mb-6 flex flex-col gap-4 sm:flex-row sm:items-end sm:justify-between">
+        <div className="space-y-1">
+          <h1 className="text-2xl font-semibold tracking-tight sm:text-3xl">
+            {tagsSelected.length ? (
+              <div className="flex flex-wrap gap-2">
+                List of artworks tagged with:
+                {tagsSelected.map((t) => (
+                  <span key={t.name.toLowerCase()}> {t.name.toLowerCase()}</span>
+                ))}
+              </div>
+            ) : "No tags selected"}
+          </h1>
+        </div>
+      </header>
+      <TaggedGallery tagSlugs={selectedTagSlugs} />
+    </div>
+  );
+}

src/app/(normal)/commissions/page.tsx

@@ -19,7 +19,11 @@ export default async function CommissionsPage() {
       include: {
         options: { include: { option: true }, orderBy: { sortIndex: "asc" } },
         extras: { include: { extra: true }, orderBy: { sortIndex: "asc" } },
-        customInputs: { include: { customInput: true }, orderBy: { sortIndex: "asc" } },
+        customInputs: {
+          include: { customInput: true },
+          orderBy: { sortIndex: "asc" },
+        },
+        tags: true,
       },
       orderBy: [{ sortIndex: "asc" }, { name: "asc" }],
     }),
@@ -28,6 +32,7 @@ export default async function CommissionsPage() {
       include: {
         options: { include: { option: true }, orderBy: { sortIndex: "asc" } },
         extras: { include: { extra: true }, orderBy: { sortIndex: "asc" } },
+        tags: true,
       },
       orderBy: [{ sortIndex: "asc" }, { name: "asc" }],
     }),
@@ -49,7 +54,7 @@ export default async function CommissionsPage() {
           {guidelines?.exampleImageUrl ? (
             <Dialog>
               <DialogTrigger asChild>
-                <Button variant="secondary">View example</Button>
+                <Button variant="secondary">View type example</Button>
               </DialogTrigger>
               <DialogContent className="flex w-auto! max-w-[95vw]! flex-col p-4 sm:p-6">
                 <DialogHeader className="sr-only">
@@ -80,7 +85,10 @@ export default async function CommissionsPage() {
         <CommissionGuidelines />
       </div>
       <hr />
-      <h2 id="commission-request-form" className="text-2xl font-semibold scroll-mt-24">
+      <h2
+        id="commission-request-form"
+        className="text-2xl font-semibold scroll-mt-24"
+      >
         Request a Commission
       </h2>
       <CommissionOrderForm types={commissions} customCards={customCards} />

src/components/commissions/CommissionCard.tsx

@@ -1,52 +1,43 @@
-"use client"
+"use client";
 
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
+import { Button } from "@/components/ui/button";
-import type { CommissionExtra, CommissionOption, CommissionType, CommissionTypeExtra, CommissionTypeOption } from "@/generated/prisma/client"
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import type {
+  CommissionExtra,
+  CommissionOption,
+  CommissionType,
+  CommissionTypeExtra,
+  CommissionTypeOption,
+  Tag,
+} from "@/generated/prisma/client";
+import Link from "next/link";
 
 type CommissionTypeWithItems = CommissionType & {
   options: (CommissionTypeOption & {
-    option: CommissionOption | null
+    option: CommissionOption | null;
-  })[]
+  })[];
   extras: (CommissionTypeExtra & {
-    extra: CommissionExtra | null
+    extra: CommissionExtra | null;
-  })[]
+  })[];
-}
+  tags: Tag[];
-
+};
-export function CommissionCard({ commission }: { commission: CommissionTypeWithItems }) {
-  // const [open, setOpen] = useState(false)
 
+export function CommissionCard({
+  commission,
+}: {
+  commission: CommissionTypeWithItems;
+}) {
   return (
     <div className="flex flex-col h-full">
       <Card className="flex flex-col flex-1">
         <CardHeader>
           <CardTitle className="text-xl font-bold">{commission.name}</CardTitle>
-          <p className="text-muted-foreground text-sm">{commission.description}</p>
+          <p className="text-muted-foreground text-sm">
+            {commission.description}
+          </p>
         </CardHeader>
 
-        <CardContent className="flex flex-col justify-start gap-4">
+        <CardContent className="flex flex-col flex-1 justify-start gap-4">
-          {/* {examples && examples.length > 0 && (
-            <Collapsible open={open} onOpenChange={setOpen}>
-              <CollapsibleTrigger className="text-sm underline text-muted-foreground">
-                {open ? "Hide Examples" : "See Examples"}
-              </CollapsibleTrigger>
-              <CollapsibleContent asChild>
-                <div className="overflow-hidden transition-all data-[state=closed]:max-h-0 data-[state=open]:max-h-[300px]">
-                  <div className="flex gap-2 mt-2 overflow-x-auto">
-                    {examples.map((src, idx) => (
-                      <Image
-                        key={src + idx}
-                        src={src}
-                        width={100}
-                        height={100}
-                        alt={`${type.name} example ${idx + 1}`}
-                        className="h-24 w-auto rounded border"
-                      />
-                    ))}
-                  </div>
-                </div>
-              </CollapsibleContent>
-            </Collapsible>
-          )} */}
           <div>
             <h4 className="font-semibold">Options</h4>
             <ul className="pl-4 list-disc">
@@ -66,7 +57,9 @@ export function CommissionCard({ commission }: { commission: CommissionTypeWithI
           </div>
 
           <div>
-            {commission.extras.length > 0 && <h4 className="font-semibold">Extras</h4>}
+            {commission.extras.length > 0 && (
+              <h4 className="font-semibold">Extras</h4>
+            )}
             <ul className="pl-4 list-disc">
               {commission.extras.map((extra) => (
                 <li key={extra.id}>
@@ -82,16 +75,21 @@ export function CommissionCard({ commission }: { commission: CommissionTypeWithI
               ))}
             </ul>
           </div>
-
-          {/* <div className="flex flex-wrap gap-2">
-            {commission.extras.map((extra) => (
-              <Badge variant="outline" key={extra.id}>
-                {extra.extra?.name}
-              </Badge>
-            ))}
-          </div> */}
         </CardContent>
+        {commission.tags.length > 0 ? (
+          <div className="mt-auto px-6 pb-6">
+            <Link
+              href={`/portfolio/tagged?tags=${encodeURIComponent(
+                commission.tags.map((t) => t.slug).join(","),
+              )}`}
+            >
+              <Button variant="secondary" className="w-full">
+                View example artworks
+              </Button>
+            </Link>
+          </div>
+        ) : null}
       </Card>
     </div>
-  )
+  );
 }

src/components/commissions/CommissionCustomCard.tsx

@@ -1,5 +1,6 @@
 "use client";
 
+import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import {
   Dialog,
@@ -8,8 +9,10 @@ import {
   DialogTitle,
   DialogTrigger,
 } from "@/components/ui/dialog";
+import type { Tag } from "@/generated/prisma/client";
 import { cn } from "@/lib/utils";
 import Image from "next/image";
+import Link from "next/link";
 
 type CustomCardOption = {
   id: string;
@@ -33,6 +36,7 @@ export type CommissionCustomCardWithItems = {
   description: string | null;
   referenceImageUrl: string | null;
   isSpecialOffer: boolean;
+  tags: Tag[];
   options: CustomCardOption[];
   extras: CustomCardExtra[];
 };
@@ -50,7 +54,7 @@ export function CommissionCustomCard({
             "flex flex-col h-full relative shadow-sm",
             card.isSpecialOffer
               ? "border-2 border-primary/50"
-              : "border-border"
+              : "border-border",
           )}
         >
           {card.isSpecialOffer ? (
@@ -143,6 +147,19 @@ export function CommissionCustomCard({
               </ul>
             </div>
           </CardContent>
+          {card.tags.length > 0 ? (
+            <div className="mt-auto px-6 pb-6">
+              <Link
+                href={`/portfolio/tagged?tags=${encodeURIComponent(
+                  card.tags.map((t) => t.slug).join(","),
+                )}`}
+              >
+                <Button variant="secondary" className="w-full">
+                  View example artworks
+                </Button>
+              </Link>
+            </div>
+          ) : null}
         </Card>
       </div>
     </div>

src/components/gallery/JustifiedGallery.tsx

@@ -1,6 +1,9 @@
 "use client";
 
+import NsfwBadge from "@/components/nsfw/NsfwBadge";
+import NsfwConsentDialog from "@/components/nsfw/NsfwConsentDialog";
 import { cn } from "@/lib/utils";
+import { useNsfwStore } from "@/stores/nsfw-store";
 import Image from "next/image";
 import Link from "next/link";
 import {
@@ -24,6 +27,9 @@ export type JustifiedGalleryItem = {
 
   /** Optional: dominant color for hover ring. */
   dominantHex?: string | null;
+
+  /** Optional: NSFW flag */
+  nsfw?: boolean | null;
 };
 
 type Props = {
@@ -44,6 +50,9 @@ type Props = {
   maxRowItems?: number; // desktop
   maxRowItemsMobile?: number; // <640px
   gap?: number; // px
+  gapNarrow?: number; // px for narrower containers
+  gapNarrowMaxWidth?: number; // px breakpoint for gapNarrow
+  gapBreakpoints?: Array<{ maxWidth: number; gap: number }>;
   debug?: boolean;
   className?: string;
 };
@@ -85,12 +94,39 @@ export default function JustifiedGallery({
   maxRowItems = 5,
   maxRowItemsMobile = 3,
   gap = 12,
+  gapNarrow,
+  gapNarrowMaxWidth = 720,
+  gapBreakpoints,
   debug = false,
   className,
 }: Props) {
+  const consent = useNsfwStore((s) => s.consent);
+  const allowNsfw = consent === "allow";
+  const hasNsfw = useMemo(() => items.some((i) => i.nsfw), [items]);
+
   const containerRef = useRef<HTMLDivElement | null>(null);
   const sentinelRef = useRef<HTMLDivElement | null>(null);
   const [containerWidth, setContainerWidth] = useState(0);
+  const effectiveGap = (() => {
+    if (gapBreakpoints && containerWidth > 0) {
+      const sorted = [...gapBreakpoints].sort(
+        (a, b) => a.maxWidth - b.maxWidth,
+      );
+      for (const bp of sorted) {
+        if (containerWidth <= bp.maxWidth) return bp.gap;
+      }
+    }
+
+    if (
+      gapNarrow != null &&
+      containerWidth > 0 &&
+      containerWidth <= gapNarrowMaxWidth
+    ) {
+      return gapNarrow;
+    }
+
+    return gap;
+  })();
 
   // Measure container width (responsive)
   useEffect(() => {
@@ -143,7 +179,7 @@ export default function JustifiedGallery({
     const flush = () => {
       if (current.length === 0) return;
 
-      const gaps = gap * (current.length - 1);
+      const gaps = effectiveGap * (current.length - 1);
       const widthWithoutGaps = Math.max(0, available - gaps);
 
       // Compute row height so it exactly fills the row width.
@@ -172,14 +208,15 @@ export default function JustifiedGallery({
       aspectSum += a;
 
       // Estimate the row width if we were to keep targetH
-      const estimatedWidth = aspectSum * targetH + gap * (current.length - 1);
+      const estimatedWidth =
+        aspectSum * targetH + effectiveGap * (current.length - 1);
 
       // If we've filled the row (or reached max items) and have at least 2 tiles, flush.
       if (
         (estimatedWidth >= available || current.length >= maxItems) &&
         current.length > 1
       ) {
-        const gaps = gap * (current.length - 1);
+        const gaps = effectiveGap * (current.length - 1);
         const widthWithoutGaps = Math.max(0, available - gaps);
         const computedH = widthWithoutGaps / aspectSum;
 
@@ -227,7 +264,7 @@ export default function JustifiedGallery({
   }, [
     items,
     containerWidth,
-    gap,
+    effectiveGap,
     targetRowHeight,
     targetRowHeightMobile,
     maxRowHeight,
@@ -248,6 +285,7 @@ export default function JustifiedGallery({
       ref={containerRef}
       className={cn("mx-auto w-full max-w-6xl", className)}
     >
+      <NsfwConsentDialog hasNsfw={hasNsfw} />
       <div className="space-y-3">
         {rows.map((row, idx) => (
           <div key={getRowKey(row)}>
@@ -260,7 +298,7 @@ export default function JustifiedGallery({
                     ? "justify-start"
                     : "justify-between",
               )}
-              style={{ columnGap: gap }}
+              style={{ columnGap: effectiveGap }}
             >
               {row.map((t) => (
                 <GalleryTile
@@ -269,13 +307,15 @@ export default function JustifiedGallery({
                   hrefBase={hrefBase}
                   hrefFrom={hrefFrom}
                   showCaption={showCaption}
+                  allowNsfw={allowNsfw}
                 />
               ))}
             </div>
             {debug ? (
               <div className="text-xs text-muted-foreground font-mono">
                 {`row ${idx + 1} | h=${Math.round(row[0]?.h ?? 0)} | w=${Math.round(
-                  row.reduce((sum, t) => sum + t.w, 0) + gap * (row.length - 1),
+                  row.reduce((sum, t) => sum + t.w, 0) +
+                  effectiveGap * (row.length - 1),
                 )} | items=${row.length} | `}
                 {row
                   .map(
@@ -302,16 +342,20 @@ function GalleryTile({
   hrefBase,
   hrefFrom,
   showCaption,
+  allowNsfw,
 }: {
   tile: RowTile;
   hrefBase: string;
   hrefFrom: string;
   showCaption: boolean;
+  allowNsfw: boolean;
 }) {
   const { item, w, h } = tile;
 
   const href = `${hrefBase}/${item.id}?from=${encodeURIComponent(hrefFrom)}`;
   const src = `/api/image/gallery/${item.fileKey}.webp`;
+  const isNsfw = Boolean(item.nsfw);
+  const shouldBlur = isNsfw && !allowNsfw;
 
   const style: CSSProperties & { "--dom"?: string } = {};
   const dom = normalizeColor(item.dominantHex);
@@ -346,11 +390,26 @@ function GalleryTile({
         alt={item.altText ?? item.name ?? "Artwork"}
         width={w}
         height={h}
-        className="h-full w-full object-cover"
+        className={cn(
+          "h-full w-full object-cover transition-[filter,transform] duration-200",
+          shouldBlur ? "blur-2xl scale-[1.02]" : "blur-0",
+        )}
         // Tiles are thumbnail-ish; bias Next toward small resources.
         sizes="(max-width: 640px) 90vw, (max-width: 1024px) 50vw, 320px"
       />
 
+      {isNsfw ? (
+        shouldBlur ? null : (
+          <NsfwBadge className="absolute left-2 bottom-2 z-10" />
+        )
+      ) : null}
+
+      {shouldBlur ? (
+        <div className="absolute inset-0 z-10 flex items-center justify-center bg-black/45">
+          <NsfwBadge className="scale-110 shadow-md" />
+        </div>
+      ) : null}
+
       {showCaption ? (
         <div className="pointer-events-none absolute inset-x-0 top-0 bg-black/60 p-3">
           <div className="text-sm font-medium text-white line-clamp-1">

src/components/global/Header.tsx

@@ -1,4 +1,5 @@
 import ModeToggle from "./ModeToggle";
+import NsfwModeToggle from "./NsfwModeToggle";
 import TopNav from "./TopNav";
 
 export default function Header() {
@@ -7,7 +8,10 @@ export default function Header() {
     <div className="w-full">
       <div className="flex items-center justify-between px-4 md:px-8 py-2">
         <TopNav />
-        <ModeToggle />
+        <div className="flex items-center gap-2">
+          <NsfwModeToggle />
+          <ModeToggle />
+        </div>
       </div>
     </div>
   );

src/components/global/NsfwModeToggle.tsx

@@ -0,0 +1,42 @@
+"use client";
+
+import { Eye, EyeOff } from "lucide-react";
+
+import { Button } from "@/components/ui/button";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
+import { useNsfwStore } from "@/stores/nsfw-store";
+
+export default function NsfwModeToggle() {
+  const consent = useNsfwStore((s) => s.consent);
+  const setConsent = useNsfwStore((s) => s.setConsent);
+
+  const enabled = consent === "allow";
+
+  return (
+    <DropdownMenu>
+      <DropdownMenuTrigger asChild>
+        <Button variant="outline" size="icon">
+          {enabled ? (
+            <Eye className="h-[1.2rem] w-[1.2rem]" />
+          ) : (
+            <EyeOff className="h-[1.2rem] w-[1.2rem]" />
+          )}
+          <span className="sr-only">Toggle NSFW mode</span>
+        </Button>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent align="end">
+        <DropdownMenuItem onClick={() => setConsent("allow")}>
+          Allow NSFW Content
+        </DropdownMenuItem>
+        <DropdownMenuItem onClick={() => setConsent("deny")}>
+          Hide NSFW Content
+        </DropdownMenuItem>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  );
+}

src/components/nsfw/NsfwBadge.tsx

@@ -0,0 +1,19 @@
+"use client";
+
+import { EyeOff } from "lucide-react";
+
+import { cn } from "@/lib/utils";
+
+export default function NsfwBadge({ className }: { className?: string }) {
+  return (
+    <div
+      className={cn(
+        "inline-flex items-center gap-1 rounded-full bg-black/70 px-2 py-1 text-xs font-semibold text-white shadow-sm",
+        className,
+      )}
+    >
+      <EyeOff className="h-3 w-3" />
+      NSFW
+    </div>
+  );
+}

src/components/nsfw/NsfwConsentDialog.tsx

@@ -0,0 +1,75 @@
+"use client";
+
+import { Button } from "@/components/ui/button";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog";
+import { EyeOff } from "lucide-react";
+import { useEffect, useState } from "react";
+
+import { useNsfwStore } from "@/stores/nsfw-store";
+
+export default function NsfwConsentDialog({ hasNsfw }: { hasNsfw: boolean }) {
+  const consent = useNsfwStore((s) => s.consent);
+  const setConsent = useNsfwStore((s) => s.setConsent);
+
+  const [open, setOpen] = useState(false);
+
+  useEffect(() => {
+    if (!hasNsfw) {
+      setOpen(false);
+      return;
+    }
+    if (consent === "unset") setOpen(true);
+    else setOpen(false);
+  }, [hasNsfw, consent]);
+
+  if (!hasNsfw) return null;
+
+  return (
+    <Dialog
+      open={open}
+      onOpenChange={(next) => {
+        if (!next && consent === "unset") return;
+        setOpen(next);
+      }}
+    >
+      <DialogContent showCloseButton={false}>
+        <DialogHeader>
+          <DialogTitle className="flex items-center gap-2">
+            <EyeOff className="h-5 w-5 text-destructive" />
+            Sensitive Content
+          </DialogTitle>
+          <DialogDescription>
+            Sensitive artworks ahead. Confirm you’re 18+ to view it. You can
+            change this anytime with the NSFW toggle in the header.
+          </DialogDescription>
+        </DialogHeader>
+        <DialogFooter>
+          <Button
+            variant="outline"
+            onClick={() => {
+              setConsent("deny");
+              setOpen(false);
+            }}
+          >
+            Keep blurred
+          </Button>
+          <Button
+            onClick={() => {
+              setConsent("allow");
+              setOpen(false);
+            }}
+          >
+            I’m 18+ · Show
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}

src/components/nsfw/NsfwImage.tsx

@@ -0,0 +1,47 @@
+"use client";
+
+import Image, { type ImageProps } from "next/image";
+
+import { cn } from "@/lib/utils";
+import { useNsfwStore } from "@/stores/nsfw-store";
+
+import NsfwBadge from "./NsfwBadge";
+
+type NsfwImageProps = ImageProps & {
+  nsfw?: boolean;
+  wrapperClassName?: string;
+};
+
+export default function NsfwImage({
+  nsfw = false,
+  wrapperClassName,
+  className,
+  ...props
+}: NsfwImageProps) {
+  const consent = useNsfwStore((s) => s.consent);
+  const allowNsfw = consent === "allow";
+  const shouldBlur = nsfw && !allowNsfw;
+
+  return (
+    <div>
+      <Image
+        {...props}
+        className={cn(
+          "transition-[filter,transform] duration-200",
+          shouldBlur ? "blur-2xl scale-[1.02]" : "blur-0",
+          className,
+        )}
+      />
+
+      {nsfw ? shouldBlur ? null : (
+        <NsfwBadge className="absolute left-2 bottom-2 z-10" />
+      ) : null}
+
+      {shouldBlur ? (
+        <div className="absolute inset-0 z-10 flex items-center justify-center bg-black/45">
+          <NsfwBadge className="scale-110 shadow-md" />
+        </div>
+      ) : null}
+    </div>
+  );
+}

src/components/nsfw/NsfwLink.tsx

@@ -0,0 +1,38 @@
+"use client";
+
+import Link from "next/link";
+import { cn } from "@/lib/utils";
+import { useNsfwStore } from "@/stores/nsfw-store";
+
+export default function NsfwLink({
+  href,
+  nsfw = false,
+  className,
+  children,
+}: {
+  href: string;
+  nsfw?: boolean;
+  className?: string;
+  children: React.ReactNode;
+}) {
+  const consent = useNsfwStore((s) => s.consent);
+  const allowNsfw = consent === "allow";
+  const blocked = nsfw && !allowNsfw;
+
+  if (blocked) {
+    return (
+      <div
+        className={cn("block cursor-not-allowed", className)}
+        aria-disabled="true"
+      >
+        {children}
+      </div>
+    );
+  }
+
+  return (
+    <Link href={href} className={cn("block", className)}>
+      {children}
+    </Link>
+  );
+}

src/components/portfolio/PortfolioGallery.tsx

@@ -31,6 +31,12 @@ export default function PortfolioGallery({
   const [items, setItems] = useState<PortfolioArtworkItem[]>([]);
   const [done, setDone] = useState(false);
   const [loading, setLoading] = useState(false);
+  const showScreenDebug = false;
+  const [screen, setScreen] = useState<{
+    width: number;
+    height: number;
+    dpr: number;
+  } | null>(null);
 
   const inFlight = useRef(false);
   const doneRef = useRef(false);
@@ -80,10 +86,31 @@ export default function PortfolioGallery({
     void loadMore();
   }, [loadMore]);
 
+  useEffect(() => {
+    if (!showScreenDebug) return;
+
+    const update = () => {
+      setScreen({
+        width: window.innerWidth,
+        height: window.innerHeight,
+        dpr: window.devicePixelRatio || 1,
+      });
+    };
+
+    update();
+    window.addEventListener("resize", update);
+    window.addEventListener("orientationchange", update);
+    return () => {
+      window.removeEventListener("resize", update);
+      window.removeEventListener("orientationchange", update);
+    };
+  }, []);
+
   const galleryItems: JustifiedGalleryItem[] = items.map((it) => ({
     id: it.id,
     name: it.name,
     altText: it.altText,
+    nsfw: it.nsfw,
     fileKey: it.fileKey,
     width: it.thumbW,
     height: it.thumbH,
@@ -111,7 +138,12 @@ export default function PortfolioGallery({
   }
 
   return (
-    <div className="w-full">
+    <div className="relative w-full">
+      {showScreenDebug && screen ? (
+        <div className="pointer-events-none absolute right-2 top-2 z-10 rounded border border-border/60 bg-background/80 px-2 py-1 text-[11px] font-mono text-muted-foreground shadow-sm">
+          Screen {screen.width} × {screen.height} · {screen.dpr}x
+        </div>
+      ) : null}
       <JustifiedGallery
         items={galleryItems}
         hrefFrom="portfolio"
@@ -123,6 +155,11 @@ export default function PortfolioGallery({
         maxRowItems={5}
         maxRowItemsMobile={1}
         gap={12}
+        gapBreakpoints={[
+          { maxWidth: 685, gap: 6 },
+          { maxWidth: 910, gap: 8 },
+          { maxWidth: 1130, gap: 10 },
+        ]}
         onLoadMore={done ? undefined : () => void loadMore()}
         hasMore={!done}
         isLoadingMore={loading}

src/components/portfolio/TaggedGallery.tsx

@@ -0,0 +1,118 @@
+"use client";
+
+import type {
+  Cursor,
+  TaggedArtworkItem,
+} from "@/actions/portfolio/getTaggedArtworksPage";
+import { getTaggedArtworksPage } from "@/actions/portfolio/getTaggedArtworksPage";
+import JustifiedGallery, {
+  type JustifiedGalleryItem,
+} from "@/components/gallery/JustifiedGallery";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+
+export default function TaggedGallery({ tagSlugs }: { tagSlugs: string[] }) {
+  const normalizedSlugs = useMemo(
+    () => tagSlugs.map((s) => s.trim()).filter(Boolean),
+    [tagSlugs],
+  );
+  const resetKey = useMemo(
+    () => normalizedSlugs.slice().sort().join(","),
+    [normalizedSlugs],
+  );
+
+  const [items, setItems] = useState<TaggedArtworkItem[]>([]);
+  const [done, setDone] = useState(false);
+  const [loading, setLoading] = useState(false);
+
+  const inFlight = useRef(false);
+  const doneRef = useRef(false);
+  doneRef.current = done;
+  const cursorRef = useRef<Cursor>(null);
+
+  useEffect(() => {
+    void resetKey;
+    setItems([]);
+    setDone(false);
+    doneRef.current = false;
+    inFlight.current = false;
+    cursorRef.current = null;
+  }, [resetKey]);
+
+  const loadMore = useCallback(async () => {
+    if (inFlight.current || doneRef.current || normalizedSlugs.length === 0)
+      return 0;
+    inFlight.current = true;
+    setLoading(true);
+
+    try {
+      const data = await getTaggedArtworksPage({
+        take: 60,
+        cursor: cursorRef.current,
+        tagSlugs: normalizedSlugs,
+        onlyPublished: true,
+      });
+
+      setItems((prev) => {
+        const seen = new Set(prev.map((x) => x.id));
+        const next = data.items.filter((x) => !seen.has(x.id));
+        return prev.concat(next);
+      });
+
+      cursorRef.current = data.nextCursor;
+      if (!data.nextCursor) setDone(true);
+
+      return data.items.length;
+    } finally {
+      setLoading(false);
+      inFlight.current = false;
+    }
+  }, [normalizedSlugs]);
+
+  useEffect(() => {
+    void loadMore();
+  }, [loadMore]);
+
+  const galleryItems: JustifiedGalleryItem[] = items.map((it) => ({
+    id: it.id,
+    name: it.name,
+    altText: it.altText,
+    nsfw: it.nsfw,
+    fileKey: it.fileKey,
+    width: it.thumbW,
+    height: it.thumbH,
+    dominantHex: it.dominantHex,
+  }));
+
+  if (!loading && done && galleryItems.length === 0) {
+    return (
+      <p className="text-muted-foreground text-center py-20">
+        No artworks to display
+      </p>
+    );
+  }
+
+  return (
+    <div className="w-full">
+      <JustifiedGallery
+        items={galleryItems}
+        hrefFrom="portfolio"
+        showCaption={false}
+        debug={false}
+        targetRowHeight={160}
+        targetRowHeightMobile={160}
+        maxRowHeight={300}
+        maxRowItems={5}
+        maxRowItemsMobile={1}
+        gap={12}
+        gapBreakpoints={[
+          { maxWidth: 685, gap: 6 },
+          { maxWidth: 910, gap: 8 },
+          { maxWidth: 1130, gap: 10 },
+        ]}
+        onLoadMore={done ? undefined : () => void loadMore()}
+        hasMore={!done}
+        isLoadingMore={loading}
+      />
+    </div>
+  );
+}

src/stores/nsfw-store.ts

@@ -0,0 +1,30 @@
+"use client";
+
+import { create } from "zustand";
+import { createJSONStorage, persist } from "zustand/middleware";
+
+export type NsfwConsent = "unset" | "allow" | "deny";
+
+type NsfwStore = {
+  consent: NsfwConsent;
+  setConsent: (consent: NsfwConsent) => void;
+  allow: () => void;
+  deny: () => void;
+  reset: () => void;
+};
+
+export const useNsfwStore = create<NsfwStore>()(
+  persist(
+    (set) => ({
+      consent: "unset",
+      setConsent: (consent) => set({ consent }),
+      allow: () => set({ consent: "allow" }),
+      deny: () => set({ consent: "deny" }),
+      reset: () => set({ consent: "unset" }),
+    }),
+    {
+      name: "gaertan-nsfw-consent",
+      storage: createJSONStorage(() => localStorage),
+    },
+  ),
+);