Author SHA1 Message Date
unknownandClaude Opus 5.5 f2304b28e5 fix(update): update.sh als ausfuehrbar einchecken
Bisher lag das Skript mit Modus 100644 im Repo. Ein chmod +x auf dem
Server galt dann als lokale Aenderung, und update.sh brach vor dem Pull
mit "Es gibt lokale Aenderungen" ab.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-25 15:20:53 +01:00
56 changed files with 267 additions and 1421 deletions
-23
View File
@@ -7,29 +7,6 @@ die Versionierung [Semantic Versioning](https://semver.org/lang/de/).
## [Unreleased]
Ein neues Gesicht: Bricktrack sieht jetzt aus wie das, was es verwaltet.
### Hinzugefügt
- **Designauswahl** unter Konto → Design: Klemmbaustein (neuer Standard),
Warm, Nachtblau (dunkel), Bonbon, Bauklotz und Schlicht (der bisherige
Look). Die Wahl gilt pro Gerät und wirkt sofort.
- **Platzhalter für Sets ohne Bild**: Farbe des Herstellers, gezeichneter
Stein und Setnummer statt eines grauen „Bild fehlt".
- **Startseite als Überblick**: Steinreihe für den Fortschritt (bei mehreren
Sammlern in deren Farben), Teile, Wert, nächster Wunschlisten-Termin mit
Countdown und Abkürzungen.
- Neues Logo als Baustein, Schriften lokal gebündelt (kein CDN).
### Geändert
- Karten, Buttons und Badges tragen im Standard-Design Konturen, eine feste
Unterkante und Noppen. In der Sammlung und auf der öffentlichen
Wunschliste zeigen die Noppen den Sammler bzw. ob ein Wunsch reserviert ist.
- Die öffentliche Wunschliste hat einen farbigen Kopf mit Anlass und Datum.
- Screenshots der Anleitung zeigen die feste Navigation nicht mehr mitten
im Bild.
## [0.3.0] - 2026-09-07
Phase 3: mehrere Kinder, Wertentwicklung, Erinnerungen und ein Schutz vor
-10
View File
@@ -63,16 +63,6 @@ Bild-URLs, die der Nutzer selbst hinterlegt hat.
| `src/lib/reminder-job.ts`, `src/lib/mailer.ts` | Versand und Zeitplan |
| `src/lib/export.ts` | Export und Import des gesamten Bestands |
| `src/lib/money.ts`, `src/lib/format.ts` | Cent-Umrechnung, dd.MM.yyyy |
| `src/lib/design.ts`, `src/app/designs.css` | Designs: Namen und Cookie bzw. Tokens je `data-design` |
| `src/components/brick/` | Noppen, Logo, Platzhalter fuer Sets ohne Bild |
### Designs
Das Design steht als `data-design` am `<html>` (Cookie `bricktrack-design`,
pro Geraet, Standard `klemmbaustein`). Komponenten benutzen nur Tokens
(`bg-primary`, `border-edge`, `--edge-w`, `--lift`, `bg-tone-1` ...), nie feste
Farben - sonst stimmt ein Design nicht mehr. Karten mit Noppen: `<Studs />`
neben die Karte in einen `relative`-Wrapper, die Karte selbst mit `brick`.
## Befehle
+6 -31
View File
@@ -32,7 +32,6 @@ Kinderzimmer, nicht für den Schreibtisch.
18. [Erinnerung vor dem Termin](#18-erinnerungen)
19. [Schutz vor doppelten Einträgen](#19-dubletten)
20. [Antworten auf die zwei wichtigen Fragen](#20-die-zwei-fragen)
21. [Ein anderes Design](#21-design)
---
@@ -53,20 +52,17 @@ gleich danach unter „Konto" (siehe [Abschnitt 10](#10-passkeys-einrichten)).
![Startseite](bilder/02-start.png)
Die Startseite zeigt auf einen Blick, wo die Sammlung steht:
Die Startseite ist die Abzweigung zu den vier Bereichen:
| | |
|---|---|
| **Steinreihe** | Zehn Plätze für den ganzen Katalog. Jeder volle Stein ist ein Zehntel, das schon da ist – bei mehreren Kindern in deren Farbe |
| **Teile und Wert** | Alle verbauten Teile und was die Sammlung heute wert ist |
| **Nächster Termin** | Die nächste Wunschliste mit Datum, wie viele Tage noch bleiben und wie viel offen ist |
| **Abkürzungen** | Direkt zu den fehlenden Sets, zu den Wunschlisten oder zu einem neuen Set |
| **Katalog** | Alle bekannten Sets – egal ob vorhanden oder nicht |
| **Fehlende Sets** | Der direkte Weg zu allem, was noch fehlt |
| **Sammlung** | Was tatsächlich da ist |
| **Wunschlisten** | Zum Teilen mit Familie und Freunden |
Unten am Bildschirmrand liegt die Navigation – auf dem Handy mit dem Daumen
erreichbar. Der aktive Bereich sitzt auf einer kleinen Platte.
Sets ohne Bild bekommen einen farbigen Platzhalter mit der Setnummer. Jeder
Hersteller hat seine eigene Farbe – Lego gelb, Playmobil blau, Cobi grün.
erreichbar.
---
@@ -552,27 +548,6 @@ Haken dran, habt ihr es schon.
---
## 21. Design
![Startseite im Design Nachtblau](bilder/25-design-nachtblau.png)
Unter **Konto → Design** gibt es sechs Looks zur Auswahl:
| Design | |
|---|---|
| **Klemmbaustein** | Der Standard: Karten mit Noppen, dunkle Konturen, kräftige Steinfarben |
| **Warm** | Ruhiger Sandton mit Ziegelrot |
| **Nachtblau** | Dunkel mit gelbem Akzent – angenehm am Abend |
| **Bonbon** | Weiches Lila mit Pastellfarben |
| **Bauklotz** | Primärfarben und dicke schwarze Konturen |
| **Schlicht** | Neutrales Grau, so wie Bricktrack bis Version 0.3 aussah |
Die Auswahl wirkt sofort und gilt **für das Gerät**, nicht für das Konto: Das
Tablet im Kinderzimmer kann bunt sein, während das Handy dunkel bleibt.
Öffentliche Wunschlisten sehen Gäste immer im Standard-Design.
---
## Kleinigkeiten, die den Alltag leichter machen
- **Filter stecken in der URL.** Ein Lesezeichen auf
-8
View File
@@ -59,14 +59,6 @@ Laeuft vollstaendig im Docker-Stack.
rueckt und Eintraege unreserviert sind
- [x] Dublettenpruefung beim Anlegen von Sets
## Design (unveröffentlicht)
- [x] Designauswahl pro Gerät, sechs Designs, Standard „Klemmbaustein"
- [x] Platzhalter für Sets ohne Bild, neues Logo, Schriften lokal
- [x] Startseite als Überblick mit Steinreihe und nächstem Termin
- [ ] Filter im Katalog als Reiter statt Auswahlfelder
- [ ] Scan-Button mittig in der unteren Navigation
## Danach
Phase 1 bis 3 sind umgesetzt. Was noch offen ist, steht hier - ohne Termin
Binary file not shown.

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 162 KiB

After

Width:  |  Height:  |  Size: 99 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 109 KiB

After

Width:  |  Height:  |  Size: 99 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 435 KiB

After

Width:  |  Height:  |  Size: 294 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 322 KiB

After

Width:  |  Height:  |  Size: 204 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 361 KiB

After

Width:  |  Height:  |  Size: 211 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 446 KiB

After

Width:  |  Height:  |  Size: 212 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 329 KiB

After

Width:  |  Height:  |  Size: 224 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 322 KiB

After

Width:  |  Height:  |  Size: 198 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 104 KiB

After

Width:  |  Height:  |  Size: 79 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 475 KiB

After

Width:  |  Height:  |  Size: 326 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 234 KiB

After

Width:  |  Height:  |  Size: 155 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 597 KiB

After

Width:  |  Height:  |  Size: 244 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 248 KiB

After

Width:  |  Height:  |  Size: 343 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 476 KiB

After

Width:  |  Height:  |  Size: 328 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 283 KiB

After

Width:  |  Height:  |  Size: 112 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 299 KiB

After

Width:  |  Height:  |  Size: 211 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 205 KiB

After

Width:  |  Height:  |  Size: 122 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 281 KiB

After

Width:  |  Height:  |  Size: 124 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 297 KiB

After

Width:  |  Height:  |  Size: 257 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 KiB

After

Width:  |  Height:  |  Size: 129 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 368 KiB

After

Width:  |  Height:  |  Size: 238 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 336 KiB

After

Width:  |  Height:  |  Size: 224 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 222 KiB

After

Width:  |  Height:  |  Size: 185 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 136 KiB

-17
View File
@@ -19,9 +19,6 @@ function shotPath(name: string) {
async function shoot(page: Page, name: string) {
// Let fonts and images settle so the picture is not half-rendered.
await page.waitForLoadState('networkidle');
// A fixed bottom bar would be painted where the first viewport ends, in the
// middle of a full-page picture. In flow it lands at the end, where it belongs.
await page.addStyleTag({ content: '.fixed.bottom-0 { position: static !important; }' });
await page.screenshot({ path: shotPath(name), fullPage: true });
}
@@ -120,8 +117,6 @@ test('Screenshots fuer die Anleitung', async ({ page, browser }) => {
await visitor.getByRole('button', { name: 'Reservieren' }).click();
await expect(visitor.getByText('Reservierung gespeichert')).toBeVisible();
await visitor.getByRole('button', { name: 'Alles klar' }).click();
// Otherwise the picture catches the dialog halfway through fading out.
await expect(visitor.getByRole('dialog')).toBeHidden();
await shoot(visitor, '14-reserviert');
await visitorContext.close();
@@ -134,18 +129,6 @@ test('Screenshots fuer die Anleitung', async ({ page, browser }) => {
await expect(page.getByText('Passkeys', { exact: true })).toBeVisible();
await shoot(page, '16-konto-passkeys');
// The same start page in the dark design, then back to the default.
await page.getByText('Nachtblau').click();
await expect(page.locator('html')).toHaveAttribute('data-design', 'nacht');
// The look switches at once; the cookie follows with the server action.
await page.waitForLoadState('networkidle');
await visit(page, '/');
await expect(page.locator('html')).toHaveAttribute('data-design', 'nacht');
await shoot(page, '25-design-nachtblau');
await visit(page, '/konto');
await page.getByText('Klemmbaustein').click();
await expect(page.locator('html')).toHaveAttribute('data-design', 'klemmbaustein');
// --- 12. Lego import ------------------------------------------------------
// The screenshot container runs with a placeholder API key so the manual
// shows the form, not the "not configured" hint. Nothing is submitted.
-6
View File
@@ -24,12 +24,6 @@
},
"dependencies": {
"@better-auth/passkey": "^1.7.3",
"@fontsource-variable/archivo": "^5.3.0",
"@fontsource-variable/bricolage-grotesque": "^5.3.0",
"@fontsource-variable/fredoka": "^5.3.0",
"@fontsource-variable/inter": "^5.3.0",
"@fontsource-variable/nunito": "^5.3.0",
"@fontsource-variable/outfit": "^5.3.0",
"@zxing/browser": "^0.2.1",
"@zxing/library": "^0.23.0",
"better-auth": "^1.7.3",
-48
View File
@@ -11,24 +11,6 @@ importers:
'@better-auth/passkey':
specifier: ^1.7.3
version: 1.7.3(@better-auth/core@1.7.3(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.4.0(zod@4.5.4))(jose@6.2.12)(kysely@0.29.5)(nanostores@1.5.3))(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-auth@1.7.3(better-sqlite3@13.0.3)(drizzle-kit@0.31.10)(drizzle-orm@0.45.2(@types/better-sqlite3@9.6.0)(better-sqlite3@13.0.3)(kysely@0.29.5))(next@15.5.25(@babel/core@7.29.7)(@playwright/test@1.63.0)(@types/node@20.19.43)(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(vitest@5.0.0(@types/node@20.19.43)(vite@8.2.2(@types/node@20.19.43)(esbuild@0.25.12)(jiti@2.7.0)(tsx@4.23.13))))(better-call@1.4.0(zod@4.5.4))(nanostores@1.5.3)
'@fontsource-variable/archivo':
specifier: ^5.3.0
version: 5.3.0
'@fontsource-variable/bricolage-grotesque':
specifier: ^5.3.0
version: 5.3.0
'@fontsource-variable/fredoka':
specifier: ^5.3.0
version: 5.3.0
'@fontsource-variable/inter':
specifier: ^5.3.0
version: 5.3.0
'@fontsource-variable/nunito':
specifier: ^5.3.0
version: 5.3.0
'@fontsource-variable/outfit':
specifier: ^5.3.0
version: 5.3.0
'@zxing/browser':
specifier: ^0.2.1
version: 0.2.1(@zxing/library@0.23.0)
@@ -905,24 +887,6 @@ packages:
'@floating-ui/utils@0.2.12':
resolution: {integrity: sha512-HpCo8tmWzLVad5s2d19EhAz5zqrrQ6s69qd6moPMQvkOuSwDT1YgRfWSVuc4ennqrgv3OHppiOGMQ7oC13yIww==}
'@fontsource-variable/archivo@5.3.0':
resolution: {integrity: sha512-HogK8FJelrD1o7TlZlkIVtHgc20bO5PZRWE7mUeUTdMN055alznQV6/00J00IBeu8FQAH4s3zW9UJNvKExXf+g==}
'@fontsource-variable/bricolage-grotesque@5.3.0':
resolution: {integrity: sha512-TLi9Q4hJjS2UvoTMRSS2nHu6c4R56lAw60NR9QYtVRCHn0XtsFpiEhNffZ8Glsoxu6wEEwLKBP8lb94J52PNBA==}
'@fontsource-variable/fredoka@5.3.0':
resolution: {integrity: sha512-13w98iw2RcmYfZQRZPLSu+0YJK3HHm5A2XrpU26moFIAePmfiKfvkmEJUgkc8r5GNR+pbDijOueS1KdGAMAWmQ==}
'@fontsource-variable/inter@5.3.0':
resolution: {integrity: sha512-OupL48va4JNofb97w6NYeF9S7W/kHNKM0Er8Dem5nqi4jeOLrVJDoE8tZEpnMJmtkvNbB1EIPPwHcdkF6b1oUA==}
'@fontsource-variable/nunito@5.3.0':
resolution: {integrity: sha512-tw0ch7evIDSwoeUy+0XzocYHfbRWLeCRPJy22KgbrLjDLAbNw/fErBiil10Ssrs3Sjr55zaZrr36a975j8cBkQ==}
'@fontsource-variable/outfit@5.3.0':
resolution: {integrity: sha512-fPb5XnYK0k7SbR++HEmm4+ZqDszmLKQ+sPRUr8oQ/KNC0vy6r6hazJFe8iYozv4cqlHbvJ/JECkJWrfDodUMVQ==}
'@hexagon/base64@1.1.28':
resolution: {integrity: sha512-lhqDEAvWixy3bZ+UOYbPwUbBkwBq5C1LAJ/xPC8Oi+lL54oyakv/npbA0aU2hgCsx/1NUd4IBvV03+aUBWxerw==}
@@ -5695,18 +5659,6 @@ snapshots:
'@floating-ui/utils@0.2.12': {}
'@fontsource-variable/archivo@5.3.0': {}
'@fontsource-variable/bricolage-grotesque@5.3.0': {}
'@fontsource-variable/fredoka@5.3.0': {}
'@fontsource-variable/inter@5.3.0': {}
'@fontsource-variable/nunito@5.3.0': {}
'@fontsource-variable/outfit@5.3.0': {}
'@hexagon/base64@1.1.28': {}
'@hono/node-server@2.1.1(hono@4.13.7)':
+10 -18
View File
@@ -1,9 +1,7 @@
import type { Metadata } from 'next';
import Link from 'next/link';
import { notFound } from 'next/navigation';
import { Check, ExternalLink, Gift, Pencil } from 'lucide-react';
import { SetPlaceholder } from '@/components/brick/set-placeholder';
import { Studs } from '@/components/brick/studs';
import { Check, ExternalLink, Gift, ImageOff, Pencil } from 'lucide-react';
import { InstructionsSection } from '@/components/katalog/instructions-section';
import { PhotosSection } from '@/components/katalog/photos-section';
import { PriceSection } from '@/components/katalog/price-section';
@@ -116,21 +114,15 @@ export default async function SetDetailPage({ params, searchParams }: Props) {
</div>
<div className="grid gap-6 md:grid-cols-[minmax(0,320px)_1fr]">
<div className="relative self-start">
<Studs count={4} />
<div className="brick overflow-hidden rounded-xl bg-muted">
{image ? (
// eslint-disable-next-line @next/next/no-img-element
<img src={image} alt="" className="aspect-square w-full object-contain p-3" />
) : (
<SetPlaceholder
setNumber={set.setNumber}
manufacturerName={set.manufacturerName}
size="lg"
className="aspect-square"
/>
)}
</div>
<div className="overflow-hidden rounded-xl border border-border bg-muted">
{image ? (
// eslint-disable-next-line @next/next/no-img-element
<img src={image} alt="" className="aspect-square w-full object-contain p-3" />
) : (
<div className="flex aspect-square items-center justify-center text-muted-foreground">
<ImageOff className="size-10" aria-hidden />
</div>
)}
</div>
<div className="space-y-4">
+1 -28
View File
@@ -1,16 +1,12 @@
'use server';
import { revalidatePath } from 'next/cache';
import { cookies, headers } from 'next/headers';
import { headers } from 'next/headers';
import { z } from 'zod';
import { env } from '@/env';
import { auth } from '@/lib/auth';
import { DESIGN_COOKIE, DESIGNS } from '@/lib/design';
import { requireUser } from '@/lib/session';
const idSchema = z.object({ id: z.string().min(1) });
const renameSchema = idSchema.extend({ name: z.string().trim().min(1).max(60) });
const designSchema = z.object({ design: z.enum(DESIGNS) });
export type ActionResult = { ok: true } | { ok: false; error: string };
@@ -47,26 +43,3 @@ export async function renamePasskeyAction(input: unknown): Promise<ActionResult>
revalidatePath('/konto');
return { ok: true };
}
/**
* The design is a per-device choice: a cookie, not a column on the user. That
* way it also covers the login page and lets two children's tablets look
* different.
*/
export async function setDesignAction(input: unknown): Promise<ActionResult> {
await requireUser();
const parsed = designSchema.safeParse(input);
if (!parsed.success) return { ok: false, error: 'Unbekanntes Design.' };
(await cookies()).set(DESIGN_COOKIE, parsed.data.design, {
httpOnly: true,
secure: env.isProduction,
sameSite: 'lax',
path: '/',
maxAge: 60 * 60 * 24 * 365,
});
revalidatePath('/', 'layout');
return { ok: true };
}
+1 -16
View File
@@ -1,11 +1,9 @@
import type { Metadata } from 'next';
import { cookies, headers } from 'next/headers';
import { headers } from 'next/headers';
import { PasskeyManager, type PasskeyRow } from '@/components/auth/passkey-manager';
import { DesignPicker } from '@/components/konto/design-picker';
import { Badge } from '@/components/ui/badge';
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
import { auth } from '@/lib/auth';
import { DESIGN_COOKIE, resolveDesign } from '@/lib/design';
import { requireUser } from '@/lib/session';
export const metadata: Metadata = { title: 'Konto' };
@@ -19,7 +17,6 @@ export default async function AccountPage() {
name: passkey.name ?? null,
createdAt: passkey.createdAt ? new Date(passkey.createdAt) : null,
}));
const design = resolveDesign((await cookies()).get(DESIGN_COOKIE)?.value);
return (
<div className="space-y-6">
@@ -48,18 +45,6 @@ export default async function AccountPage() {
</CardContent>
</Card>
<Card>
<CardHeader>
<CardTitle>Design</CardTitle>
<CardDescription>
Gilt für dieses Gerät. Öffentliche Wunschlisten sehen Gäste im Standard-Design.
</CardDescription>
</CardHeader>
<CardContent>
<DesignPicker current={design} />
</CardContent>
</Card>
<Card>
<CardHeader>
<CardTitle>Passkeys</CardTitle>
+45 -173
View File
@@ -1,186 +1,58 @@
import Link from 'next/link';
import { ChevronRight, Gift, PackageSearch, Plus } from 'lucide-react';
import { cn } from 'cn';
import { Studs } from '@/components/brick/studs';
import { Button } from '@/components/ui/button';
import { brickRow } from '@/lib/brick-row';
import { collectorDotClass } from '@/lib/collector-colors';
import { formatDate, formatNumber, pluralize } from '@/lib/format';
import { formatEuro } from '@/lib/money';
import { countMissingSets, getCollectionStats } from '@/lib/queries/collection';
import { countItemsPerCollector, listCollectors } from '@/lib/queries/collectors';
import { listWishlists } from '@/lib/queries/wishlists';
import { daysUntil } from '@/lib/reminders';
import { Boxes, Gift, LayoutGrid, PackageSearch } from 'lucide-react';
import { Card, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
import { requireUser } from '@/lib/session';
function daysLabel(days: number): string {
if (days === 0) return 'heute';
if (days === 1) return 'morgen';
return `in ${days} Tagen`;
}
const shortcuts = [
{
href: '/katalog',
icon: LayoutGrid,
title: 'Katalog',
description: 'Alle bekannten Sets durchsuchen und neue anlegen.',
},
{
href: '/katalog?besitz=fehlt',
icon: PackageSearch,
title: 'Fehlende Sets',
description: 'Was noch nicht in der Sammlung ist – direkt auf die Wunschliste.',
},
{
href: '/sammlung',
icon: Boxes,
title: 'Sammlung',
description: 'Alles, was tatsächlich da ist – mit Standort und Zustand.',
},
{
href: '/wunschlisten',
icon: Gift,
title: 'Wunschlisten',
description: 'Listen anlegen und per Link mit Familie und Freunden teilen.',
},
] as const;
export default async function DashboardPage() {
const user = await requireUser();
const stats = getCollectionStats();
const missing = countMissingSets();
const totalSets = stats.setCount + missing;
const collectors = listCollectors();
const perCollector = countItemsPerCollector();
const showCollectors = collectors.length > 1;
const bricks = brickRow(
stats.setCount,
totalSets,
showCollectors
? collectors.map((entry) => ({ key: entry.id, count: perCollector.get(entry.id) ?? 0 }))
: [],
);
const colorById = new Map(collectors.map((entry) => [entry.id, entry.color]));
// The next date someone could bring a present for.
const now = new Date();
const nextEvent =
listWishlists(user.id)
.filter((list) => list.eventDate && daysUntil(list.eventDate, now) >= 0)
.sort((a, b) => a.eventDate!.getTime() - b.eventDate!.getTime())[0] ?? null;
return (
<div className="mx-auto max-w-2xl space-y-7">
<h1 className="text-3xl font-semibold tracking-tight">Hallo {user.name}!</h1>
<div className="space-y-6">
<div>
<h1 className="text-2xl font-semibold tracking-tight">Hallo {user.name}</h1>
<p className="text-sm text-muted-foreground">Was möchtest du tun?</p>
</div>
<section className="relative">
<Studs count={3} />
<div className="brick rounded-xl bg-card p-4 text-card-foreground">
<div className="flex items-baseline justify-between gap-3">
<h2 className="text-lg font-semibold">Unsere Sammlung</h2>
<p className="text-sm font-semibold text-muted-foreground">
{formatNumber(stats.setCount)} von {pluralize(totalSets, 'Set', 'Sets')}
</p>
</div>
<ol
aria-label={`${formatNumber(stats.setCount)} von ${formatNumber(totalSets)} Sets vorhanden`}
className="mt-5 grid grid-cols-10 items-end gap-1.5"
>
{bricks.map((key, index) => (
<li key={index} aria-hidden className="relative">
{key === null ? (
<span className="block h-7 rounded-[6px] border-2 border-dashed border-muted-foreground/50" />
) : (
<>
<span
className={cn(
'stud mx-auto mb-[calc(var(--edge-w)*-1)] !h-1.5 !w-3 !rounded-t-[4px] [display:var(--studs)]',
key ? collectorDotClass(colorById.get(key)) : 'bg-secondary',
)}
/>
<span
className={cn(
'block h-7 rounded-[6px] border-[length:var(--edge-w)] border-edge',
key ? collectorDotClass(colorById.get(key)) : 'bg-secondary',
)}
/>
</>
)}
</li>
))}
</ol>
{showCollectors ? (
<ul className="mt-3 flex flex-wrap gap-x-4 gap-y-1 text-xs font-semibold">
{collectors.map((entry) => (
<li key={entry.id} className="flex items-center gap-1.5">
<span
aria-hidden
className={cn(
'size-3 rounded-[3px] border-[length:var(--edge-w)] border-edge',
collectorDotClass(entry.color),
)}
/>
{entry.name}
</li>
))}
<li className="flex items-center gap-1.5 text-muted-foreground">
<span
aria-hidden
className="size-3 rounded-[3px] border-2 border-dashed border-muted-foreground/50"
/>
fehlt noch
</li>
</ul>
) : null}
</div>
</section>
<section className="grid grid-cols-2 gap-3">
<div className="relative">
<Studs studClassName="bg-secondary" />
<div className="brick h-full rounded-xl bg-secondary p-4 text-secondary-foreground">
<p className="text-2xl font-bold tabular-nums [font-family:var(--font-display)]">
{formatNumber(stats.pieceCount)}
</p>
<p className="text-sm font-semibold">Teile verbaut</p>
</div>
</div>
<div className="relative">
<Studs studClassName="bg-owned" />
<div className="brick h-full rounded-xl bg-owned p-4 text-owned-foreground">
<p className="text-2xl font-bold tabular-nums [font-family:var(--font-display)]">
{formatEuro(stats.currentValueCents)}
</p>
<p className="text-sm font-semibold">
{stats.currentValueCents === stats.retailValueCents ? 'Wert nach UVP' : 'Aktueller Wert'}
</p>
</div>
</div>
</section>
{nextEvent?.eventDate ? (
<Link href={`/wunschlisten/${nextEvent.id}`} className="relative block rounded-xl">
<Studs count={4} studClassName="bg-primary" />
<div className="brick flex items-center gap-4 rounded-xl bg-primary p-4 text-primary-foreground">
<div className="flex size-14 shrink-0 flex-col items-center justify-center rounded-lg border-[length:var(--edge-w)] border-edge bg-card text-card-foreground">
<span className="text-xl leading-none font-bold [font-family:var(--font-display)]">
{formatDate(nextEvent.eventDate).slice(0, 5)}
</span>
</div>
<div className="min-w-0 flex-1">
<p className="truncate text-lg font-semibold [font-family:var(--font-display)]">
{nextEvent.title}
</p>
<p className="text-sm font-semibold">
{daysLabel(daysUntil(nextEvent.eventDate, now))} ·{' '}
{nextEvent.openCount === 1
? '1 Wunsch noch offen'
: `${formatNumber(nextEvent.openCount)} Wünsche noch offen`}
</p>
</div>
<ChevronRight className="size-5 shrink-0" aria-hidden />
</div>
</Link>
) : null}
<section className="flex flex-wrap gap-3">
<Button asChild variant="outline" size="lg">
<Link href="/katalog?besitz=fehlt">
<PackageSearch aria-hidden />
{missing === 1 ? '1 Set fehlt noch' : `${formatNumber(missing)} Sets fehlen noch`}
<div className="grid gap-3 sm:grid-cols-2">
{shortcuts.map((shortcut) => (
<Link key={shortcut.href} href={shortcut.href} className="group">
<Card className="h-full transition-colors group-hover:border-primary/40">
<CardHeader>
<shortcut.icon className="size-6 text-primary" aria-hidden />
<CardTitle>{shortcut.title}</CardTitle>
<CardDescription>{shortcut.description}</CardDescription>
</CardHeader>
</Card>
</Link>
</Button>
<Button asChild variant="outline" size="lg">
<Link href="/wunschlisten">
<Gift aria-hidden />
Wunschlisten
</Link>
</Button>
<Button asChild size="lg">
<Link href="/katalog/neu">
<Plus aria-hidden />
Set anlegen
</Link>
</Button>
</section>
))}
</div>
</div>
);
}
+10 -24
View File
@@ -1,14 +1,12 @@
import type { Metadata } from 'next';
import Link from 'next/link';
import { Boxes, Euro, Layers, PackageSearch } from 'lucide-react';
import { SetPlaceholder } from '@/components/brick/set-placeholder';
import { Studs } from '@/components/brick/studs';
import { Boxes, Euro, ImageOff, Layers, PackageSearch } from 'lucide-react';
import { CollectorFilter } from '@/components/layout/collector-filter';
import { CollectionFilters } from '@/components/sammlung/collection-filters';
import { Badge } from '@/components/ui/badge';
import { Card, CardContent } from '@/components/ui/card';
import { formatDate, formatNumber, pluralize } from '@/lib/format';
import { collectorBadgeClass, collectorDotClass } from '@/lib/collector-colors';
import { collectorBadgeClass } from '@/lib/collector-colors';
import { setImageSrc } from '@/lib/images';
import { completenessLabel, statusLabel } from '@/lib/labels';
import { formatEuro } from '@/lib/money';
@@ -124,31 +122,23 @@ export default async function SammlungPage({ searchParams }: { searchParams: Sea
</Link>
</div>
) : (
<ul className="space-y-5 pt-2">
<ul className="divide-y divide-border rounded-lg border border-border">
{items.map((item) => {
const image = setImageSrc(item);
return (
<li key={item.id} className="relative">
{/* The studs carry the collector's colour once there is more than one. */}
<Studs
studClassName={
collectors.length > 1 ? collectorDotClass(item.collectorColor) : undefined
}
/>
<li key={item.id}>
<Link
href={`/katalog/${item.setId}`}
className="brick flex items-center gap-3 rounded-xl bg-card p-3 transition-colors hover:bg-muted/50"
className="flex items-center gap-3 p-3 transition-colors hover:bg-muted/50"
>
<div className="size-16 shrink-0 overflow-hidden rounded-lg border-[length:max(1px,var(--edge-w))] border-edge bg-muted">
<div className="size-14 shrink-0 overflow-hidden rounded-lg border border-border bg-muted">
{image ? (
// eslint-disable-next-line @next/next/no-img-element
<img src={image} alt="" loading="lazy" className="size-full object-contain" />
) : (
<SetPlaceholder
setNumber={item.setNumber}
manufacturerName={item.manufacturerName}
size="sm"
/>
<div className="flex size-full items-center justify-center text-muted-foreground">
<ImageOff className="size-5" aria-hidden />
</div>
)}
</div>
@@ -160,11 +150,7 @@ export default async function SammlungPage({ searchParams }: { searchParams: Sea
.join(' · ')}
</p>
<div className="mt-1 flex flex-wrap items-center gap-1">
{/* Green like "Vorhanden" in the catalog; red stays for actions. */}
<Badge
variant={item.status === 'sold' ? 'outline' : 'default'}
className={item.status === 'sold' ? undefined : 'bg-owned text-owned-foreground'}
>
<Badge variant={item.status === 'sold' ? 'outline' : 'default'}>
{statusLabel(item.status)}
</Badge>
{item.completeness !== 'unknown' ? (
+3 -6
View File
@@ -1,14 +1,11 @@
import Link from 'next/link';
import { BrickLogo } from '@/components/brick/logo';
import { Blocks } from 'lucide-react';
export default function AuthLayout({ children }: { children: React.ReactNode }) {
return (
<div className="flex min-h-dvh flex-col items-center justify-center gap-8 px-4 py-10">
<Link
href="/"
className="flex items-center gap-2 text-2xl font-bold tracking-tight [font-family:var(--font-display)]"
>
<BrickLogo className="h-8 w-9" />
<Link href="/" className="flex items-center gap-2 text-xl font-semibold tracking-tight">
<Blocks className="size-6 text-primary" aria-hidden />
Bricktrack
</Link>
<main className="w-full max-w-sm">{children}</main>
-301
View File
@@ -1,301 +0,0 @@
/*
* Selectable designs. Each one is a set of tokens under :root[data-design=...]
* (the attribute is set in the root layout from a cookie, see src/lib/design.ts).
* The neutral "schlicht" design uses the defaults from globals.css.
*
* Token additions on top of shadcn:
* --font-display headings and big numbers
* --edge, --edge-w outline of cards, buttons and badges
* --lift(-sm) the hard bottom edge that makes a card look like a brick
* --studs "flex" shows the studs on top of cards, "none" hides them
* --tone-1..5 placeholder colours for sets without an image
* --owned the "Vorhanden" badge
*/
/* --- Klemmbaustein (default) --------------------------------------------- */
:root[data-design='klemmbaustein'] {
--font-sans: 'Nunito Variable', ui-sans-serif, system-ui, sans-serif;
--font-display: 'Fredoka Variable', ui-sans-serif, system-ui, sans-serif;
--radius: 1rem;
--background: #fff6e5;
--foreground: #24203f;
--card: #ffffff;
--card-foreground: #24203f;
--popover: #ffffff;
--popover-foreground: #24203f;
--primary: #d63a30;
--primary-foreground: #ffffff;
--secondary: #ffc93c;
--secondary-foreground: #24203f;
--muted: #f6ead0;
--muted-foreground: #5f5a78;
--accent: #ffe9b0;
--accent-foreground: #24203f;
--destructive: #c62828;
--border: rgb(36 32 63 / 0.16);
--input: #24203f;
--ring: #2f6bea;
--logo: #ffc93c;
--edge: #24203f;
--edge-w: 2px;
--lift: 0 4px 0 #24203f;
--lift-sm: 0 3px 0 #24203f;
--studs: flex;
--owned: #2ebd85;
--owned-foreground: #24203f;
--tone-ink: #24203f;
--tone-1: #ffe08a;
--tone-2: #bfd6ff;
--tone-3: #bdebd3;
--tone-4: #ffc9d9;
--tone-5: #e2d6ff;
}
/* --- Warm ---------------------------------------------------------------- */
:root[data-design='warm'] {
--font-sans: 'Inter Variable', ui-sans-serif, system-ui, sans-serif;
--font-display: 'Bricolage Grotesque Variable', ui-sans-serif, system-ui, sans-serif;
--radius: 0.875rem;
--background: #f6f3ec;
--foreground: #1d1b17;
--card: #ffffff;
--card-foreground: #1d1b17;
--popover: #ffffff;
--popover-foreground: #1d1b17;
--primary: #c8381f;
--primary-foreground: #ffffff;
--secondary: #fbe3a6;
--secondary-foreground: #1d1b17;
--muted: #ece6da;
--muted-foreground: #5f594f;
--accent: #fbe3a6;
--accent-foreground: #1d1b17;
--destructive: #b42318;
--border: #e2dbcd;
--input: #d6cebf;
--ring: #c8381f;
--edge: transparent;
--edge-w: 0px;
--lift: 0 1px 2px rgb(29 27 23 / 0.06);
--lift-sm: none;
--studs: none;
--owned: #1f7a4d;
--owned-foreground: #ffffff;
--tone-ink: #1d1b17;
--tone-1: #fbe3a6;
--tone-2: #d6e6f5;
--tone-3: #dde8d2;
--tone-4: #f6d5cc;
--tone-5: #e5ddf0;
}
/* --- Nachtblau (dark) ---------------------------------------------------- */
:root[data-design='nacht'] {
color-scheme: dark;
--font-sans: 'Inter Variable', ui-sans-serif, system-ui, sans-serif;
--font-display: 'Outfit Variable', ui-sans-serif, system-ui, sans-serif;
--radius: 1.125rem;
--background: #0e1422;
--foreground: #f2f4f8;
--card: #182136;
--card-foreground: #f2f4f8;
--popover: #1b2540;
--popover-foreground: #f2f4f8;
--primary: #ffc93c;
--primary-foreground: #1a1300;
--secondary: #222d45;
--secondary-foreground: #f2f4f8;
--muted: #222d45;
--muted-foreground: #a3adc2;
--accent: #2a3654;
--accent-foreground: #f2f4f8;
--destructive: #f87171;
--border: #2c3854;
--input: #34405e;
--ring: #ffc93c;
--edge: transparent;
--edge-w: 0px;
--lift: none;
--lift-sm: none;
--studs: none;
--owned: #1e4d3a;
--owned-foreground: #8fe3b8;
--tone-ink: #f2f4f8;
--tone-1: #3a3218;
--tone-2: #1b2c44;
--tone-3: #22331e;
--tone-4: #3d2230;
--tone-5: #2c2546;
}
/* --- Bonbon -------------------------------------------------------------- */
:root[data-design='bonbon'] {
--font-sans: 'Nunito Variable', ui-sans-serif, system-ui, sans-serif;
--font-display: 'Fredoka Variable', ui-sans-serif, system-ui, sans-serif;
--radius: 1.5rem;
--background: #f4f0ff;
--foreground: #23194a;
--card: #ffffff;
--card-foreground: #23194a;
--popover: #ffffff;
--popover-foreground: #23194a;
--primary: #6d4aff;
--primary-foreground: #ffffff;
--secondary: #ede7ff;
--secondary-foreground: #4b2fc4;
--muted: #ede7ff;
--muted-foreground: #5e567c;
--accent: #ede7ff;
--accent-foreground: #23194a;
--destructive: #c62828;
--border: #e4ddf7;
--input: #d8cff3;
--ring: #6d4aff;
--edge: transparent;
--edge-w: 0px;
--lift: 0 8px 24px rgb(35 25 74 / 0.08);
--lift-sm: none;
--studs: none;
--owned: #157a57;
--owned-foreground: #ffffff;
--tone-ink: #23194a;
--tone-1: #fff1c7;
--tone-2: #dff0ff;
--tone-3: #ddf7ea;
--tone-4: #ffe1d1;
--tone-5: #ffddeb;
}
/* --- Bauklotz ------------------------------------------------------------ */
:root[data-design='bauklotz'] {
--font-sans: 'Archivo Variable', ui-sans-serif, system-ui, sans-serif;
--font-display: 'Archivo Variable', ui-sans-serif, system-ui, sans-serif;
--radius: 0.75rem;
--background: #fffbef;
--foreground: #111111;
--card: #ffffff;
--card-foreground: #111111;
--popover: #ffffff;
--popover-foreground: #111111;
--primary: #1e5eff;
--primary-foreground: #ffffff;
--secondary: #ffd500;
--secondary-foreground: #111111;
--muted: #f3eedc;
--muted-foreground: #4a4a4a;
--accent: #ffd500;
--accent-foreground: #111111;
--destructive: #c62828;
--border: rgb(17 17 17 / 0.2);
--input: #111111;
--ring: #1e5eff;
--logo: #ffd500;
--edge: #111111;
--edge-w: 2.5px;
--lift: 4px 4px 0 #111111;
--lift-sm: 3px 3px 0 #111111;
--studs: none;
--owned: #111111;
--owned-foreground: #ffffff;
--tone-ink: #111111;
--tone-1: #ffd500;
--tone-2: #7fb2ff;
--tone-3: #8bd17c;
--tone-4: #ff8a7a;
--tone-5: #c9a7ff;
}
:root[data-design='bauklotz'] :is(h1, h2) {
font-weight: 900;
text-transform: uppercase;
letter-spacing: -0.01em;
}
/*
* Surfaces. Unlayered on purpose: these must win over the utility classes of
* the shadcn components, which carry the neutral look. Focused elements keep
* their ring (also a box-shadow), so the lift steps aside for it.
*/
[data-slot='card'] {
border: var(--edge-w) solid var(--edge);
box-shadow: var(--lift);
}
:root:is([data-design='klemmbaustein'], [data-design='bauklotz']) {
& [data-slot='button']:is(
[data-variant='default'],
[data-variant='outline'],
[data-variant='secondary'],
[data-variant='destructive']
) {
border-width: var(--edge-w);
border-color: var(--edge);
font-weight: 700;
&:not(:focus-visible) {
box-shadow: var(--lift-sm);
}
&:active:not(:disabled) {
translate: 0 2px;
box-shadow: none;
}
}
& [data-slot='badge'] {
border-width: 2px;
border-color: var(--edge);
border-radius: calc(var(--radius) * 0.5);
font-weight: 800;
}
& :is([data-slot='input'], [data-slot='textarea'], [data-slot='native-select'], [data-slot='select-trigger']) {
border-width: var(--edge-w);
border-color: var(--edge);
}
& :is([data-slot='dialog-content'], [data-slot='alert-dialog-content'], [data-slot='popover-content'], [data-slot='dropdown-menu-content'], [data-slot='select-content']) {
border: var(--edge-w) solid var(--edge);
box-shadow: var(--lift);
}
}
/* A surface outside the shadcn components (set tiles, list entries). */
@utility brick {
border: var(--edge-w) solid var(--edge);
box-shadow: var(--lift);
}
/* --- Studs ---------------------------------------------------------------- */
/* In a layer, so a utility class on a stud (collector colour) still wins. */
@layer components {
.studs {
display: var(--studs);
position: absolute;
top: calc(var(--edge-w) - 10px);
left: 16px;
gap: 10px;
pointer-events: none;
}
.stud {
display: block;
width: 20px;
height: 10px;
box-sizing: border-box;
border: var(--edge-w) solid var(--edge);
border-bottom: 0;
border-radius: 7px 7px 0 0;
background: var(--card);
}
}
+1 -32
View File
@@ -1,7 +1,6 @@
@import "tailwindcss";
@import "tw-animate-css";
@import "shadcn/tailwind.css";
@import "./designs.css";
@custom-variant dark (&:is(.dark *));
@@ -11,7 +10,6 @@
"Segoe UI Emoji";
--font-mono: ui-monospace, SFMono-Regular, "SF Mono", Menlo, Consolas,
"Liberation Mono", monospace;
--font-display: var(--font-sans);
}
@@ -20,16 +18,7 @@
--color-foreground: var(--foreground);
--font-sans: var(--font-sans);
--font-mono: var(--font-mono);
--font-heading: var(--font-display);
--color-edge: var(--edge);
--color-owned: var(--owned);
--color-owned-foreground: var(--owned-foreground);
--color-tone-ink: var(--tone-ink);
--color-tone-1: var(--tone-1);
--color-tone-2: var(--tone-2);
--color-tone-3: var(--tone-3);
--color-tone-4: var(--tone-4);
--color-tone-5: var(--tone-5);
--font-heading: var(--font-sans);
--color-sidebar-ring: var(--sidebar-ring);
--color-sidebar-border: var(--sidebar-border);
--color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
@@ -101,21 +90,6 @@
--sidebar-accent-foreground: oklch(0.205 0 0);
--sidebar-border: oklch(0.922 0 0);
--sidebar-ring: oklch(0.708 0 0);
/* Brick look: outline, "lift" (the hard bottom edge) and studs. The
neutral design has none of it; see designs.css for the others. */
--edge: oklch(0.145 0 0 / 10%);
--edge-w: 1px;
--lift: none;
--lift-sm: none;
--studs: none;
--owned: oklch(0.596 0.145 163.225);
--owned-foreground: oklch(1 0 0);
--tone-ink: oklch(0.556 0 0);
--tone-1: oklch(0.97 0 0);
--tone-2: oklch(0.97 0 0);
--tone-3: oklch(0.97 0 0);
--tone-4: oklch(0.97 0 0);
--tone-5: oklch(0.97 0 0);
}
.dark {
@@ -162,9 +136,4 @@
html {
@apply font-sans;
}
h1,
h2,
h3 {
font-family: var(--font-display);
}
}
+11 -30
View File
@@ -1,14 +1,6 @@
import type { Metadata, Viewport } from 'next';
import { cookies } from 'next/headers';
import '@fontsource-variable/archivo';
import '@fontsource-variable/bricolage-grotesque';
import '@fontsource-variable/fredoka';
import '@fontsource-variable/inter';
import '@fontsource-variable/nunito';
import '@fontsource-variable/outfit';
import { ServiceWorkerRegistration } from '@/components/layout/service-worker';
import { Toaster } from '@/components/ui/sonner';
import { DESIGN_COOKIE, DESIGN_INFO, resolveDesign } from '@/lib/design';
import './globals.css';
export const metadata: Metadata = {
@@ -33,30 +25,19 @@ export const metadata: Metadata = {
robots: { index: false, follow: false },
};
async function currentDesign() {
return resolveDesign((await cookies()).get(DESIGN_COOKIE)?.value);
}
export async function generateViewport(): Promise<Viewport> {
const design = await currentDesign();
return {
width: 'device-width',
initialScale: 1,
viewportFit: 'cover',
themeColor: DESIGN_INFO[design].themeColor,
};
}
export default async function RootLayout({ children }: Readonly<{ children: React.ReactNode }>) {
const design = await currentDesign();
export const viewport: Viewport = {
width: 'device-width',
initialScale: 1,
viewportFit: 'cover',
themeColor: [
{ media: '(prefers-color-scheme: light)', color: '#ffffff' },
{ media: '(prefers-color-scheme: dark)', color: '#0a0a0a' },
],
};
export default function RootLayout({ children }: Readonly<{ children: React.ReactNode }>) {
return (
<html
lang="de"
data-design={design}
className={DESIGN_INFO[design].dark ? 'dark' : undefined}
suppressHydrationWarning
>
<html lang="de" suppressHydrationWarning>
<body className="min-h-dvh bg-background text-foreground antialiased">
{children}
<Toaster position="top-center" richColors closeButton />
+42 -50
View File
@@ -1,8 +1,6 @@
import type { Metadata } from 'next';
import { notFound } from 'next/navigation';
import { CalendarDays, Gift } from 'lucide-react';
import { BrickLogo } from '@/components/brick/logo';
import { Studs } from '@/components/brick/studs';
import { Blocks, CalendarDays, Gift } from 'lucide-react';
import { PublicWishlist, type PublicItem } from '@/components/wunschlisten/public-wishlist';
import { Badge } from '@/components/ui/badge';
import { formatDate, pluralize } from '@/lib/format';
@@ -56,56 +54,50 @@ export default async function PublicWishlistPage({ params }: Props) {
const openCount = items.filter((item) => !item.isReserved).length;
return (
<div className="min-h-dvh">
<header className="border-b-[length:max(1px,var(--edge-w))] border-edge bg-primary text-primary-foreground">
<div className="mx-auto w-full max-w-2xl space-y-3 px-4 pt-6 pb-10">
<div className="flex items-center gap-2 text-sm font-semibold">
<BrickLogo className="h-5 w-6" />
Bricktrack
</div>
<h1 className="text-3xl font-semibold tracking-tight">{list.title}</h1>
<div className="flex flex-wrap items-center gap-2">
<Badge className="gap-1 bg-card text-card-foreground">
<Gift className="size-3" aria-hidden />
{occasionLabel(list.occasion)}
</Badge>
{list.eventDate ? (
<Badge className="gap-1 bg-card text-card-foreground">
<CalendarDays className="size-3" aria-hidden />
{formatDate(list.eventDate)}
</Badge>
) : null}
<Badge variant="secondary">
{pluralize(openCount, 'Wunsch noch offen', 'Wünsche noch offen')}
</Badge>
</div>
<div className="mx-auto min-h-dvh w-full max-w-2xl px-4 py-8">
<header className="space-y-3 border-b border-border pb-6">
<div className="flex items-center gap-2 text-sm text-muted-foreground">
<Blocks className="size-4 text-primary" aria-hidden />
Bricktrack
</div>
<h1 className="text-2xl font-semibold tracking-tight">{list.title}</h1>
<div className="flex flex-wrap items-center gap-2">
<Badge variant="secondary" className="gap-1">
<Gift className="size-3" aria-hidden />
{occasionLabel(list.occasion)}
</Badge>
{list.eventDate ? (
<Badge variant="outline" className="gap-1">
<CalendarDays className="size-3" aria-hidden />
{formatDate(list.eventDate)}
</Badge>
) : null}
<span className="text-sm text-muted-foreground">
{pluralize(openCount, 'Wunsch noch offen', 'Wünsche noch offen')}
</span>
</div>
{list.note ? (
<p className="rounded-lg bg-muted p-3 text-sm whitespace-pre-line">{list.note}</p>
) : null}
<p className="text-xs text-muted-foreground">
Klick auf „Das schenke ich“, damit niemand dasselbe doppelt kauft. Eine Anmeldung
brauchst du dafür nicht.
</p>
</header>
<div className="mx-auto w-full max-w-2xl px-4 pb-8">
<div className="relative -mt-5">
<Studs />
<div className="brick space-y-2 rounded-xl bg-card p-4 text-card-foreground">
{list.note ? <p className="text-sm whitespace-pre-line">{list.note}</p> : null}
<p className="text-xs text-muted-foreground">
Klick auf „Das schenke ich“, damit niemand dasselbe doppelt kauft. Eine Anmeldung
brauchst du dafür nicht.
</p>
</div>
</div>
<main className="py-6">
{items.length === 0 ? (
<p className="rounded-lg border border-dashed border-border p-8 text-center text-sm text-muted-foreground">
Auf dieser Liste steht gerade nichts.
</p>
) : (
<PublicWishlist shareToken={shareToken} items={items} />
)}
</main>
</div>
<main className="py-6">
{items.length === 0 ? (
<p className="rounded-lg border border-dashed border-border p-8 text-center text-sm text-muted-foreground">
Auf dieser Liste steht gerade nichts.
</p>
) : (
<PublicWishlist shareToken={shareToken} items={items} />
)}
</main>
</div>
);
}
-18
View File
@@ -1,18 +0,0 @@
/** The app mark: a 2x1 brick in the design's logo colour. */
export function BrickLogo({ className }: { className?: string }) {
return (
<svg viewBox="0 0 38 32" aria-hidden className={className}>
<g
style={{
fill: 'var(--logo, var(--primary))',
stroke: 'var(--edge)',
strokeWidth: 'var(--edge-w)',
}}
>
<rect x="9" y="2" width="8" height="8" rx="2.5" />
<rect x="21" y="2" width="8" height="8" rx="2.5" />
<rect x="2" y="8" width="34" height="22" rx="6" />
</g>
</svg>
);
}
-66
View File
@@ -1,66 +0,0 @@
import { cn } from 'cn';
import { toneIndex } from '@/lib/design';
const TONE_CLASSES: Record<number, string> = {
1: 'bg-tone-1',
2: 'bg-tone-2',
3: 'bg-tone-3',
4: 'bg-tone-4',
5: 'bg-tone-5',
};
/**
* Stand-in for a set without an image: the manufacturer's tone, a drawn
* brick and the set number. Reads as intended rather than as "image broken".
*/
export function SetPlaceholder({
setNumber,
manufacturerName,
size = 'md',
className,
}: {
setNumber: string;
manufacturerName: string;
size?: 'sm' | 'md' | 'lg';
className?: string;
}) {
const tone = TONE_CLASSES[toneIndex(manufacturerName)];
return (
<div
className={cn(
'relative flex size-full items-end overflow-hidden text-tone-ink',
size === 'sm' ? 'p-1.5' : 'p-3',
tone,
className,
)}
>
{size !== 'sm' ? (
<svg
viewBox="0 0 70 44"
aria-hidden
className={cn(
'absolute opacity-40',
size === 'lg' ? 'top-[18%] right-[12%] w-2/5' : 'top-3 right-3 w-1/3',
)}
>
<g fill="none" stroke="currentColor" strokeWidth="2.5">
<rect x="12" y="2" width="16" height="10" rx="3" />
<rect x="42" y="2" width="16" height="10" rx="3" />
<rect x="2" y="10" width="66" height="32" rx="7" />
</g>
</svg>
) : null}
<span
className={cn(
'relative leading-none font-bold tracking-tight [font-family:var(--font-display)] tabular-nums',
size === 'sm' && 'text-xs',
size === 'md' && (setNumber.length > 6 ? 'text-lg' : 'text-2xl'),
size === 'lg' && 'text-5xl',
)}
>
{setNumber}
</span>
</div>
);
}
-25
View File
@@ -1,25 +0,0 @@
import { cn } from 'cn';
/**
* The row of studs on top of a card. Purely decorative and only visible in
* designs that set `--studs: flex`. The parent must be `relative` and must not
* clip its overflow - place it next to the card, not inside.
*/
export function Studs({
count = 2,
className,
studClassName,
}: {
count?: number;
className?: string;
/** Colour of the studs, e.g. the collector's dot class. */
studClassName?: string;
}) {
return (
<span aria-hidden className={cn('studs', className)}>
{Array.from({ length: count }, (_, index) => (
<span key={index} className={cn('stud', studClassName)} />
))}
</span>
);
}
+1 -2
View File
@@ -217,8 +217,7 @@ export function CatalogGrid({
'relative rounded-xl text-left outline-none transition-opacity',
'focus-visible:ring-3 focus-visible:ring-ring/50',
owned && 'cursor-not-allowed opacity-50',
isSelected &&
'[&_.brick]:outline-3 [&_.brick]:outline-offset-2 [&_.brick]:outline-primary',
isSelected && '[&>div]:border-primary [&>div]:ring-2 [&>div]:ring-primary/40',
)}
>
<SetCardContent set={item} />
+48 -53
View File
@@ -1,8 +1,6 @@
import Link from 'next/link';
import { Check, Gift } from 'lucide-react';
import { Check, Gift, ImageOff } from 'lucide-react';
import { cn } from 'cn';
import { SetPlaceholder } from '@/components/brick/set-placeholder';
import { Studs } from '@/components/brick/studs';
import type { CatalogRow } from '@/lib/queries/catalog';
import { formatEuro } from '@/lib/money';
import { setImageSrc } from '@/lib/images';
@@ -19,59 +17,56 @@ export function SetCardContent({ set }: { set: CatalogRow }) {
const owned = set.ownedCopies > 0;
return (
<div className="relative h-full">
<Studs count={3} />
<div className="brick flex h-full flex-col overflow-hidden rounded-xl bg-card transition-colors">
<div className="relative aspect-square border-b-[length:var(--edge-w)] border-edge bg-muted">
{image ? (
// Plain img: images are either local files or a URL the user entered,
// and the optimizer must never fetch arbitrary remote hosts.
// eslint-disable-next-line @next/next/no-img-element
<img
src={image}
alt=""
loading="lazy"
decoding="async"
className="size-full object-contain p-2"
/>
) : (
<SetPlaceholder setNumber={set.setNumber} manufacturerName={set.manufacturerName} />
)}
<div className="absolute top-2 left-2 flex flex-col items-start gap-1">
{owned ? (
<Badge className="gap-1 bg-owned text-owned-foreground">
<Check className="size-3" aria-hidden />
{set.ownedCopies > 1 ? `${set.ownedCopies}× vorhanden` : 'Vorhanden'}
</Badge>
) : null}
{set.wishlistCount > 0 ? (
<Badge className="gap-1">
<Gift className="size-3" aria-hidden />
Auf Wunschliste
</Badge>
) : null}
<div className="flex h-full flex-col overflow-hidden rounded-xl border border-border bg-card transition-colors">
<div className="relative aspect-square bg-muted">
{image ? (
// Plain img: images are either local files or a URL the user entered,
// and the optimizer must never fetch arbitrary remote hosts.
// eslint-disable-next-line @next/next/no-img-element
<img
src={image}
alt=""
loading="lazy"
decoding="async"
className="size-full object-contain p-2"
/>
) : (
<div className="flex size-full items-center justify-center text-muted-foreground">
<ImageOff className="size-8" aria-hidden />
</div>
</div>
)}
<div className="flex flex-1 flex-col gap-1 p-3">
<div className="flex items-center gap-2 text-xs text-muted-foreground">
<Badge variant="outline" className="font-mono">
{set.setNumber}
<div className="absolute top-2 left-2 flex flex-col items-start gap-1">
{owned ? (
<Badge className="gap-1 bg-emerald-600 text-white hover:bg-emerald-600">
<Check className="size-3" aria-hidden />
{set.ownedCopies > 1 ? `${set.ownedCopies}× vorhanden` : 'Vorhanden'}
</Badge>
<span className="truncate">{set.manufacturerName}</span>
</div>
<p className="line-clamp-2 text-sm leading-snug font-medium">{set.name}</p>
<div className="mt-auto flex items-center justify-between gap-2 pt-1 text-xs text-muted-foreground">
<span className="truncate">
{[set.themeName, set.year].filter(Boolean).join(' · ')}
) : null}
{set.wishlistCount > 0 ? (
<Badge variant="secondary" className="gap-1">
<Gift className="size-3" aria-hidden />
Auf Wunschliste
</Badge>
) : null}
</div>
</div>
<div className="flex flex-1 flex-col gap-1 p-3">
<div className="flex items-center gap-2 text-xs text-muted-foreground">
<Badge variant="outline" className="font-mono">
{set.setNumber}
</Badge>
<span className="truncate">{set.manufacturerName}</span>
</div>
<p className="line-clamp-2 text-sm leading-snug font-medium">{set.name}</p>
<div className="mt-auto flex items-center justify-between gap-2 pt-1 text-xs text-muted-foreground">
<span className="truncate">{[set.themeName, set.year].filter(Boolean).join(' · ')}</span>
{set.retailPriceCents !== null ? (
<span className="shrink-0 font-medium text-foreground">
{formatEuro(set.retailPriceCents)}
</span>
{set.retailPriceCents !== null ? (
<span className="shrink-0 font-medium text-foreground">
{formatEuro(set.retailPriceCents)}
</span>
) : null}
</div>
) : null}
</div>
</div>
</div>
@@ -83,7 +78,7 @@ export function SetCard({ set, className }: { set: CatalogRow; className?: strin
<Link
href={`/katalog/${set.id}`}
className={cn(
'rounded-xl outline-none focus-visible:ring-3 focus-visible:ring-ring/50',
'rounded-xl outline-none focus-visible:ring-3 focus-visible:ring-ring/50 [&>div]:hover:border-primary/40',
className,
)}
>
-88
View File
@@ -1,88 +0,0 @@
'use client';
import { useRouter } from 'next/navigation';
import { useState, useTransition } from 'react';
import { Check } from 'lucide-react';
import { toast } from 'sonner';
import { cn } from 'cn';
import { setDesignAction } from '@/app/(app)/konto/actions';
import { DESIGN_INFO, DESIGNS, type Design } from '@/lib/design';
/** Switches the look right away and stores it in the cookie in the background. */
function applyDesign(design: Design) {
const root = document.documentElement;
root.dataset.design = design;
root.classList.toggle('dark', DESIGN_INFO[design].dark);
}
export function DesignPicker({ current }: { current: Design }) {
const router = useRouter();
const [selected, setSelected] = useState<Design>(current);
const [, startTransition] = useTransition();
function choose(design: Design) {
const previous = selected;
setSelected(design);
applyDesign(design);
startTransition(async () => {
const result = await setDesignAction({ design });
if (!result.ok) {
setSelected(previous);
applyDesign(previous);
toast.error(result.error);
return;
}
router.refresh();
});
}
return (
<fieldset>
<legend className="sr-only">Design</legend>
<div className="grid gap-3 sm:grid-cols-2">
{DESIGNS.map((design) => {
const info = DESIGN_INFO[design];
const active = design === selected;
return (
<label
key={design}
className={cn(
'relative flex cursor-pointer items-center gap-3 rounded-lg border-[length:max(1px,var(--edge-w))] p-3 transition-colors',
'has-focus-visible:ring-3 has-focus-visible:ring-ring/50',
active ? 'border-primary bg-accent' : 'border-border hover:bg-muted/60',
)}
>
<input
type="radio"
name="design"
value={design}
checked={active}
onChange={() => choose(design)}
className="sr-only"
/>
<span
aria-hidden
className="grid size-12 shrink-0 grid-cols-2 overflow-hidden rounded-md border border-black/15"
>
{info.swatch.map((color, index) => (
<span key={index} style={{ backgroundColor: color }} />
))}
</span>
<span className="min-w-0 flex-1">
<span className="block text-sm font-semibold">
{info.label}
{design === 'klemmbaustein' ? (
<span className="font-normal text-muted-foreground"> · Standard</span>
) : null}
</span>
<span className="block text-xs text-muted-foreground">{info.description}</span>
</span>
{active ? <Check className="size-5 shrink-0 text-primary" aria-hidden /> : null}
</label>
);
})}
</div>
</fieldset>
);
}
+3 -6
View File
@@ -1,5 +1,5 @@
import Link from 'next/link';
import { BrickLogo } from '@/components/brick/logo';
import { Blocks } from 'lucide-react';
import { DesktopNav } from './bottom-nav';
import { UserMenu } from './user-menu';
import type { SessionUser } from '@/lib/session';
@@ -8,11 +8,8 @@ export function AppHeader({ user }: { user: SessionUser }) {
return (
<header className="sticky top-0 z-40 border-b border-border bg-background/95 backdrop-blur">
<div className="mx-auto flex h-14 max-w-5xl items-center gap-3 px-4">
<Link
href="/"
className="flex items-center gap-2 text-lg font-bold tracking-tight [font-family:var(--font-display)]"
>
<BrickLogo className="h-6 w-7" />
<Link href="/" className="flex items-center gap-2 font-semibold tracking-tight">
<Blocks className="size-5 text-primary" aria-hidden />
<span>Bricktrack</span>
</Link>
<div className="flex-1" />
+4 -16
View File
@@ -18,7 +18,7 @@ export function BottomNav() {
return (
<nav
aria-label="Hauptnavigation"
className="fixed inset-x-0 bottom-0 z-40 border-t-[length:max(1px,var(--edge-w))] border-border bg-card/95 pb-[env(safe-area-inset-bottom)] backdrop-blur md:hidden"
className="fixed inset-x-0 bottom-0 z-40 border-t border-border bg-background/95 pb-[env(safe-area-inset-bottom)] backdrop-blur md:hidden"
>
<ul className="mx-auto flex max-w-lg">
{items.map((item) => {
@@ -30,22 +30,10 @@ export function BottomNav() {
aria-current={active ? 'page' : undefined}
className={cn(
'flex h-16 flex-col items-center justify-center gap-1 text-xs transition-colors',
active
? 'font-bold text-foreground'
: 'font-medium text-muted-foreground hover:text-foreground',
active ? 'text-primary' : 'text-muted-foreground hover:text-foreground',
)}
>
{/* The active tab sits on a small plate, like a tile on a baseplate. */}
<span
className={cn(
'flex h-7 w-12 items-center justify-center rounded-[calc(var(--radius)*0.6)] border-[length:var(--edge-w)]',
active
? 'border-edge bg-secondary text-secondary-foreground'
: 'border-transparent',
)}
>
<item.icon className="size-5" aria-hidden />
</span>
<item.icon className="size-5" aria-hidden />
{item.label}
</Link>
</li>
@@ -71,7 +59,7 @@ export function DesktopNav() {
className={cn(
'flex h-10 items-center gap-2 rounded-lg px-3 text-sm font-medium transition-colors',
active
? 'border-[length:var(--edge-w)] border-edge bg-secondary text-secondary-foreground'
? 'bg-muted text-foreground'
: 'text-muted-foreground hover:bg-muted/60 hover:text-foreground',
)}
>
+75 -79
View File
@@ -1,12 +1,10 @@
'use client';
import { useEffect, useState, useTransition } from 'react';
import { Check, ExternalLink, Gift, Loader2, Undo2 } from 'lucide-react';
import { Check, ExternalLink, Gift, ImageOff, Loader2, Undo2 } from 'lucide-react';
import { toast } from 'sonner';
import { cancelReservation, reserveItem } from '@/app/w/actions';
import { setImageSrc } from '@/lib/images';
import { SetPlaceholder } from '@/components/brick/set-placeholder';
import { Studs } from '@/components/brick/studs';
import { formatEuro } from '@/lib/money';
import { priorityLabel } from '@/lib/wishlist-logic';
import { Badge } from '@/components/ui/badge';
@@ -127,92 +125,90 @@ export function PublicWishlist({
}
return (
<div className="space-y-5 pt-2">
<div className="space-y-3">
{items.map((item) => {
const image = setImageSrc(item);
const mine = Boolean(tokens[item.id]);
return (
<article key={item.id} className="relative">
{/* Studs turn green once someone has taken the wish. */}
<Studs count={3} studClassName={mine || item.isReserved ? 'bg-owned' : undefined} />
<div className="brick flex gap-3 rounded-xl bg-card p-3">
<div className="size-20 shrink-0 overflow-hidden rounded-lg border-[length:max(1px,var(--edge-w))] border-edge bg-muted sm:size-28">
{image ? (
// eslint-disable-next-line @next/next/no-img-element
<img src={image} alt="" loading="lazy" className="size-full object-contain" />
) : (
<SetPlaceholder
setNumber={item.setNumber}
manufacturerName={item.manufacturerName}
/>
)}
<article
key={item.id}
className="flex gap-3 rounded-xl border border-border bg-card p-3"
>
<div className="size-20 shrink-0 overflow-hidden rounded-lg border border-border bg-muted sm:size-28">
{image ? (
// eslint-disable-next-line @next/next/no-img-element
<img src={image} alt="" loading="lazy" className="size-full object-contain" />
) : (
<div className="flex size-full items-center justify-center text-muted-foreground">
<ImageOff className="size-6" aria-hidden />
</div>
)}
</div>
<div className="min-w-0 flex-1 space-y-2">
<div>
<div className="flex flex-wrap items-center gap-1.5">
<Badge variant="outline" className="font-mono text-xs">
{item.setNumber}
</Badge>
<Badge variant="secondary">{item.manufacturerName}</Badge>
{item.priority === 1 ? <Badge>{priorityLabel(1)}</Badge> : null}
</div>
<h2 className="mt-1 font-medium">{item.setName}</h2>
<p className="text-xs text-muted-foreground">
{[
item.themeName,
item.year,
item.pieceCount ? `${item.pieceCount} Teile` : null,
item.retailPriceCents !== null ? formatEuro(item.retailPriceCents) : null,
]
.filter(Boolean)
.join(' · ')}
</p>
{item.note ? <p className="mt-1 text-sm">{item.note}</p> : null}
</div>
<div className="min-w-0 flex-1 space-y-2">
<div>
<div className="flex flex-wrap items-center gap-1.5">
<Badge variant="outline" className="font-mono text-xs">
{item.setNumber}
<div className="flex flex-wrap items-center gap-2">
{mine ? (
<>
<Badge className="gap-1 bg-emerald-600 text-white hover:bg-emerald-600">
<Check className="size-3" aria-hidden />
Das schenkst du
</Badge>
<Badge variant="secondary">{item.manufacturerName}</Badge>
{item.priority === 1 ? <Badge>{priorityLabel(1)}</Badge> : null}
</div>
<h2 className="mt-1 font-medium">{item.setName}</h2>
<p className="text-xs text-muted-foreground">
{[
item.themeName,
item.year,
item.pieceCount ? `${item.pieceCount} Teile` : null,
item.retailPriceCents !== null ? formatEuro(item.retailPriceCents) : null,
]
.filter(Boolean)
.join(' · ')}
</p>
{item.note ? <p className="mt-1 text-sm">{item.note}</p> : null}
</div>
<div className="flex flex-wrap items-center gap-2">
{mine ? (
<>
<Badge className="gap-1 bg-owned text-owned-foreground">
<Check className="size-3" aria-hidden />
Das schenkst du
</Badge>
<Button variant="ghost" size="sm" onClick={() => undo(item)} disabled={pending}>
<Undo2 />
Doch nicht
</Button>
</>
) : item.isReserved ? (
<Badge variant="secondary">
{item.reservedByName
? `Übernimmt ${item.reservedByName}`
: 'Schon reserviert'}
</Badge>
) : (
<Button
size="sm"
onClick={() => {
setReserving(item);
setCancelLink(null);
}}
disabled={pending}
>
<Gift />
Das schenke ich
<Button variant="ghost" size="sm" onClick={() => undo(item)} disabled={pending}>
<Undo2 />
Doch nicht
</Button>
)}
</>
) : item.isReserved ? (
<Badge variant="secondary">
{item.reservedByName
? `Übernimmt ${item.reservedByName}`
: 'Schon reserviert'}
</Badge>
) : (
<Button
size="sm"
onClick={() => {
setReserving(item);
setCancelLink(null);
}}
disabled={pending}
>
<Gift />
Das schenke ich
</Button>
)}
{item.manufacturerWebsite ? (
<Button asChild variant="link" size="sm" className="px-0">
<a href={item.manufacturerWebsite} target="_blank" rel="noreferrer noopener">
Zum Shop
<ExternalLink />
</a>
</Button>
) : null}
</div>
{item.manufacturerWebsite ? (
<Button asChild variant="link" size="sm" className="px-0">
<a href={item.manufacturerWebsite} target="_blank" rel="noreferrer noopener">
Zum Shop
<ExternalLink />
</a>
</Button>
) : null}
</div>
</div>
</article>
@@ -3,8 +3,7 @@
import Link from 'next/link';
import { useRouter } from 'next/navigation';
import { useState, useTransition } from 'react';
import { ArrowDown, ArrowUp, Check, Loader2, Trash2 } from 'lucide-react';
import { SetPlaceholder } from '@/components/brick/set-placeholder';
import { ArrowDown, ArrowUp, Check, ImageOff, Loader2, Trash2 } from 'lucide-react';
import { toast } from 'sonner';
import {
removeWishlistItem,
@@ -123,17 +122,15 @@ export function WishlistItems({
<Link
href={`/katalog/${item.setId}`}
className="size-16 shrink-0 overflow-hidden rounded-lg border-[length:max(1px,var(--edge-w))] border-edge bg-muted"
className="size-16 shrink-0 overflow-hidden rounded-lg border border-border bg-muted"
>
{image ? (
// eslint-disable-next-line @next/next/no-img-element
<img src={image} alt="" loading="lazy" className="size-full object-contain" />
) : (
<SetPlaceholder
setNumber={item.setNumber}
manufacturerName={item.manufacturerName}
size="sm"
/>
<div className="flex size-full items-center justify-center text-muted-foreground">
<ImageOff className="size-5" aria-hidden />
</div>
)}
</Link>
-48
View File
@@ -1,48 +0,0 @@
/**
* The progress row on the dashboard: a fixed number of slots, filled with one
* brick per share of the catalog that is already in the collection. Each
* brick takes the colour of a collector, in proportion to what they own.
*/
export type BrickShare = { key: string; count: number };
/**
* Returns `slots` entries: a collector key for a filled slot, `null` for an
* empty one. Filled slots come first, grouped by collector in input order.
*/
export function brickRow(
ownedSets: number,
totalSets: number,
shares: BrickShare[],
slots = 10,
): Array<string | null> {
const empty = Array<string | null>(slots).fill(null);
if (totalSets <= 0 || ownedSets <= 0) return empty;
// Never round a non-empty collection down to an empty row, and only show a
// full row when everything is really there.
const ratio = Math.min(ownedSets, totalSets) / totalSets;
let filled = Math.round(ratio * slots);
filled = Math.max(1, filled);
if (ratio < 1) filled = Math.min(filled, slots - 1);
const positive = shares.filter((share) => share.count > 0);
const shareTotal = positive.reduce((sum, share) => sum + share.count, 0);
if (shareTotal === 0) return [...Array<string | null>(filled).fill(''), ...empty].slice(0, slots);
// Largest remainder: floor first, then hand out the rest by biggest fraction.
const exact = positive.map((share) => (share.count / shareTotal) * filled);
const counts = exact.map(Math.floor);
let rest = filled - counts.reduce((sum, value) => sum + value, 0);
const order = exact
.map((value, index) => ({ index, fraction: value - Math.floor(value) }))
.sort((a, b) => b.fraction - a.fraction || a.index - b.index);
for (const { index } of order) {
if (rest === 0) break;
counts[index]! += 1;
rest -= 1;
}
const row = positive.flatMap((share, index) => Array<string>(counts[index]!).fill(share.key));
return [...row, ...empty].slice(0, slots);
}
-110
View File
@@ -1,110 +0,0 @@
/**
* The selectable looks of the app.
*
* A design is nothing but a set of CSS tokens under `[data-design=...]` in
* `src/app/designs.css`; this module only knows the names. The choice lives in
* a cookie, so it is per device and also applies to pages without a session
* (login, public wishlist).
*/
export const DESIGNS = ['klemmbaustein', 'warm', 'nacht', 'bonbon', 'bauklotz', 'schlicht'] as const;
export type Design = (typeof DESIGNS)[number];
export const DEFAULT_DESIGN: Design = 'klemmbaustein';
export const DESIGN_COOKIE = 'bricktrack-design';
export type DesignInfo = {
label: string;
description: string;
/** Dark designs also set the `.dark` class so `dark:` variants apply. */
dark: boolean;
/** Browser chrome colour (address bar, PWA title bar). */
themeColor: string;
/** Four colours for the preview swatch on the account page. */
swatch: [string, string, string, string];
};
export const DESIGN_INFO: Record<Design, DesignInfo> = {
klemmbaustein: {
label: 'Klemmbaustein',
description: 'Noppen, Konturen und kräftige Steinfarben.',
dark: false,
themeColor: '#fff6e5',
swatch: ['#fff6e5', '#d63a30', '#ffc93c', '#2f6bea'],
},
warm: {
label: 'Warm',
description: 'Ruhiger Sandton mit Ziegelrot.',
dark: false,
themeColor: '#f6f3ec',
swatch: ['#f6f3ec', '#c8381f', '#fbe3a6', '#1d1b17'],
},
nacht: {
label: 'Nachtblau',
description: 'Dunkel mit gelbem Akzent, schont abends die Augen.',
dark: true,
themeColor: '#0e1422',
swatch: ['#0e1422', '#ffc93c', '#182136', '#60a5fa'],
},
bonbon: {
label: 'Bonbon',
description: 'Weiches Lila mit Pastellfarben.',
dark: false,
themeColor: '#f4f0ff',
swatch: ['#f4f0ff', '#6d4aff', '#d3f5e7', '#ffe1d1'],
},
bauklotz: {
label: 'Bauklotz',
description: 'Primärfarben und dicke schwarze Konturen.',
dark: false,
themeColor: '#ffd500',
swatch: ['#fffbef', '#1e5eff', '#ffd500', '#e63b2e'],
},
schlicht: {
label: 'Schlicht',
description: 'Neutrales Grau, wie bis Version 0.3.',
dark: false,
themeColor: '#ffffff',
swatch: ['#ffffff', '#171717', '#f5f5f5', '#a3a3a3'],
},
};
export function isDesign(value: unknown): value is Design {
return typeof value === 'string' && (DESIGNS as readonly string[]).includes(value);
}
/** Cookie value to design; anything unknown falls back to the default. */
export function resolveDesign(value: string | null | undefined): Design {
return isDesign(value) ? value : DEFAULT_DESIGN;
}
/** Number of placeholder tones every design defines (`--tone-1` ...). */
export const TONE_COUNT = 5;
/** The manufacturers named in the brief get a fixed, recognisable tone. */
const KNOWN_TONES: Record<string, number> = {
lego: 1,
playmobil: 2,
cobi: 3,
bluebrixx: 4,
megabloks: 5,
};
/**
* Stable tone for a set without an image, derived from its manufacturer, so
* all Lego placeholders share a colour and Playmobil gets another one.
* Returns 1 ... TONE_COUNT.
*/
export function toneIndex(manufacturerName: string): number {
const key = manufacturerName.toLowerCase().replace(/[^a-z0-9]/g, '');
const known = KNOWN_TONES[key];
if (known) return known;
let hash = 0;
for (const char of key) {
hash = (hash * 31 + char.codePointAt(0)!) >>> 0;
}
return (hash % TONE_COUNT) + 1;
}
-80
View File
@@ -1,80 +0,0 @@
import { describe, expect, it } from 'vitest';
import { brickRow } from '@/lib/brick-row';
import { DEFAULT_DESIGN, DESIGNS, DESIGN_INFO, resolveDesign, TONE_COUNT, toneIndex } from '@/lib/design';
describe('Design aus dem Cookie', () => {
it('nimmt ein bekanntes Design', () => {
expect(resolveDesign('nacht')).toBe('nacht');
expect(resolveDesign('schlicht')).toBe('schlicht');
});
it('faellt bei Unbekanntem auf Klemmbaustein zurueck', () => {
expect(DEFAULT_DESIGN).toBe('klemmbaustein');
expect(resolveDesign(undefined)).toBe('klemmbaustein');
expect(resolveDesign('')).toBe('klemmbaustein');
expect(resolveDesign('"><script>')).toBe('klemmbaustein');
});
it('beschreibt jedes Design', () => {
for (const design of DESIGNS) {
expect(DESIGN_INFO[design].label.length).toBeGreaterThan(0);
expect(DESIGN_INFO[design].themeColor).toMatch(/^#[0-9a-f]{6}$/);
}
expect(DESIGNS.filter((design) => DESIGN_INFO[design].dark)).toEqual(['nacht']);
});
});
describe('Farbton fuer Sets ohne Bild', () => {
it('gibt den bekannten Herstellern feste, verschiedene Toene', () => {
const tones = ['Lego', 'Playmobil', 'Cobi', 'BlueBrixx', 'Mega Bloks'].map(toneIndex);
expect(new Set(tones).size).toBe(5);
expect(toneIndex('Lego')).toBe(1);
expect(toneIndex('LEGO')).toBe(1);
});
it('bleibt fuer andere Hersteller stabil und im Bereich', () => {
expect(toneIndex('Sluban')).toBe(toneIndex('Sluban'));
for (const name of ['Sluban', 'Qman', 'Wange', '', 'Ölfabrik']) {
const tone = toneIndex(name);
expect(tone).toBeGreaterThanOrEqual(1);
expect(tone).toBeLessThanOrEqual(TONE_COUNT);
}
});
});
describe('Steinreihe auf der Startseite', () => {
it('ist leer ohne Katalog oder ohne Sammlung', () => {
expect(brickRow(0, 10, [])).toEqual(Array(10).fill(null));
expect(brickRow(3, 0, [])).toEqual(Array(10).fill(null));
});
it('verteilt die Steine nach Anteil auf die Sammler', () => {
const row = brickRow(4, 10, [
{ key: 'max', count: 2 },
{ key: 'mia', count: 2 },
]);
expect(row).toEqual(['max', 'max', 'mia', 'mia', null, null, null, null, null, null]);
});
it('zeigt mindestens einen Stein, aber nie eine volle Reihe vor dem Ziel', () => {
expect(brickRow(1, 500, [{ key: 'max', count: 1 }]).filter(Boolean)).toHaveLength(1);
expect(brickRow(499, 500, [{ key: 'max', count: 499 }]).filter(Boolean)).toHaveLength(9);
expect(brickRow(500, 500, [{ key: 'max', count: 500 }]).filter(Boolean)).toHaveLength(10);
});
it('vergibt Reststeine nach dem groessten Bruchteil', () => {
const row = brickRow(10, 20, [
{ key: 'a', count: 1 },
{ key: 'b', count: 1 },
{ key: 'c', count: 1 },
]);
// 5 Steine auf drei gleiche Anteile: 2, 2, 1 - die vorderen zuerst.
expect(row.filter((key) => key === 'a')).toHaveLength(2);
expect(row.filter((key) => key === 'b')).toHaveLength(2);
expect(row.filter((key) => key === 'c')).toHaveLength(1);
});
it('fuellt ohne Sammler-Zuordnung neutral', () => {
expect(brickRow(5, 10, []).slice(0, 5)).toEqual(['', '', '', '', '']);
});
});
Regular → Executable
View File