Ships `dev` as **v0.11.0**. `main` contains nothing that `dev` does not, so this is a clean sync. ## Headline changes since v0.10.0 - **Journal & Journal Studio** — photo essays at `/journal`, split-screen block editor with live preview, drafts, per-entry passwords, cover images - **First-run setup wizard at `/install`** — configure a fresh deployment from the browser; credentials are verified against Immich before anything is written, and the wizard is gated by a one-time token - **About page editor and toggle** in the admin panel - **Per-album photo order** independent of Immich, with a drag & drop editor - **Custom favicon upload** - **Experimental portfolio features** — justified grid, `cover` hero, unlisted subpages, per-album grid overrides, cover focal points, external nav links - **Security** — asset tokens length-capped before decoding (#423), journal author markdown escaped rather than filtered, journal file paths contained, admin session key derived with scrypt (#432), Next.js 16.3.0 for CVE-2025-13465 - **Fixed** — client proofing honours its own configuration again (#454); journal photo rendering (#432) Full detail in [CHANGELOG.md](CHANGELOG.md#0110--2026-08-15). ## Verified `npx tsc --noEmit` clean · `npx vitest run` 435 tests pass · `npm run build` succeeds · lint 0 errors · `prettier --check` clean · local `docker build` of the release tree. ## After merge Tag `v0.11.0` on `main` and publish the release — that triggers `docker-publish.yml`, which pushes the image and moves `latest`. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: ralksta <ralksta@users.noreply.github.com> Co-authored-by: lancetm714 <108419425+lancetm714@users.noreply.github.com> Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
146 lines
4.0 KiB
TypeScript
146 lines
4.0 KiB
TypeScript
import type { ThemeConfig, SettingsYaml } from './schema';
|
|
|
|
/** The preset used when none is configured. */
|
|
export const DEFAULT_PRESET = 'studio-modern';
|
|
|
|
export const THEME_PRESETS: Record<string, ThemeConfig> = {
|
|
'studio-modern': {
|
|
preset: 'studio-modern',
|
|
accent: '#e60012',
|
|
fonts: { heading: 'Archivo', body: 'Archivo', caption: 'IBM Plex Mono' },
|
|
radius: 0,
|
|
photoFrame: 'none',
|
|
grain: false,
|
|
headerDot: true,
|
|
heroStyle: 'split',
|
|
},
|
|
studio: {
|
|
preset: 'studio',
|
|
accent: '#e60012',
|
|
fonts: { heading: 'Playfair Display', body: 'DM Sans', caption: 'EB Garamond' },
|
|
radius: 0,
|
|
photoFrame: 'passepartout',
|
|
grain: true,
|
|
headerDot: true,
|
|
heroStyle: 'split',
|
|
},
|
|
minimal: {
|
|
preset: 'minimal',
|
|
accent: '#000000',
|
|
fonts: { heading: 'Geist', body: 'Geist', caption: 'IBM Plex Mono' },
|
|
radius: 0,
|
|
photoFrame: 'none',
|
|
grain: false,
|
|
headerDot: false,
|
|
heroStyle: 'fullbleed',
|
|
},
|
|
editorial: {
|
|
preset: 'editorial',
|
|
accent: '#8B2500',
|
|
fonts: { heading: 'Bodoni Moda', body: 'Newsreader', caption: 'Spectral' },
|
|
radius: 0,
|
|
photoFrame: 'shadow',
|
|
grain: false,
|
|
headerDot: false,
|
|
heroStyle: 'split',
|
|
},
|
|
classic: {
|
|
preset: 'classic',
|
|
accent: '#c49a3c',
|
|
fonts: { heading: 'Cinzel', body: 'Crimson Pro', caption: 'Crimson Pro' },
|
|
radius: 12,
|
|
photoFrame: 'passepartout',
|
|
grain: false,
|
|
headerDot: true,
|
|
heroStyle: 'minimal',
|
|
},
|
|
noir: {
|
|
preset: 'noir',
|
|
accent: '#ff6b35',
|
|
fonts: { heading: 'Libre Baskerville', body: 'Source Sans 3', caption: 'Space Mono' },
|
|
radius: 0,
|
|
photoFrame: 'passepartout',
|
|
grain: true,
|
|
headerDot: false,
|
|
heroStyle: 'fullbleed',
|
|
},
|
|
monograph: {
|
|
preset: 'monograph',
|
|
accent: '#333333',
|
|
fonts: { heading: 'Instrument Serif', body: 'Inter', caption: 'IBM Plex Mono' },
|
|
radius: 0,
|
|
photoFrame: 'none',
|
|
grain: false,
|
|
headerDot: false,
|
|
heroStyle: 'typographic',
|
|
},
|
|
};
|
|
|
|
export const VALID_PHOTO_FRAMES = ['none', 'passepartout', 'shadow'];
|
|
export const VALID_HERO_STYLES = [
|
|
'split',
|
|
'fullbleed',
|
|
'minimal',
|
|
'stacked',
|
|
'typographic',
|
|
'mosaic',
|
|
'cover', // EXPERIMENTAL: fullscreen splash with a single "Enter" link
|
|
];
|
|
export const VALID_LAYOUTS = [
|
|
'masonry',
|
|
'uniform',
|
|
'showcase',
|
|
'filmstrip',
|
|
'editorial-flow',
|
|
'essay',
|
|
'justified', // EXPERIMENTAL: row-based layout with equal heights
|
|
];
|
|
|
|
export function resolveTheme(raw?: SettingsYaml['theme']): ThemeConfig {
|
|
if (!raw) return { ...THEME_PRESETS[DEFAULT_PRESET] };
|
|
|
|
if (typeof raw === 'string') {
|
|
const preset = THEME_PRESETS[raw];
|
|
if (!preset) {
|
|
throw new Error(
|
|
`Unknown theme preset "${raw}". Valid presets: ${Object.keys(THEME_PRESETS).join(', ')}`,
|
|
);
|
|
}
|
|
return { ...preset };
|
|
}
|
|
|
|
const baseName = raw.preset ?? DEFAULT_PRESET;
|
|
const base = THEME_PRESETS[baseName];
|
|
if (!base) {
|
|
throw new Error(
|
|
`Unknown theme preset "${baseName}". Valid presets: ${Object.keys(THEME_PRESETS).join(', ')}`,
|
|
);
|
|
}
|
|
|
|
return {
|
|
preset: baseName,
|
|
accent: raw.accent ?? base.accent,
|
|
fonts: {
|
|
heading: raw.fonts?.heading ?? base.fonts.heading,
|
|
body: raw.fonts?.body ?? base.fonts.body,
|
|
caption: raw.fonts?.caption ?? base.fonts.caption,
|
|
},
|
|
radius: raw.radius ?? base.radius,
|
|
photoFrame: VALID_PHOTO_FRAMES.includes(raw.photoFrame ?? '')
|
|
? (raw.photoFrame as ThemeConfig['photoFrame'])
|
|
: base.photoFrame,
|
|
grain: raw.grain ?? base.grain,
|
|
headerDot: raw.headerDot ?? base.headerDot,
|
|
heroStyle: VALID_HERO_STYLES.includes(raw.heroStyle ?? '')
|
|
? (raw.heroStyle as ThemeConfig['heroStyle'])
|
|
: base.heroStyle,
|
|
};
|
|
}
|
|
|
|
export function getGoogleFontsUrl(theme: ThemeConfig): string {
|
|
const weights = '300;400;500;600';
|
|
const families = [...new Set([theme.fonts.heading, theme.fonts.body, theme.fonts.caption])];
|
|
const params = families.map((f) => `family=${f.replace(/ /g, '+')}:wght@${weights}`).join('&');
|
|
return `https://fonts.googleapis.com/css2?${params}&display=swap`;
|
|
}
|