refactor: deslop — remove dead botanica preset, extract shared helpers
- Remove dead theme preset (no CSS, not in DevToolbar) - Extract from closure → module-level export in lib/config/index.ts - Extract helper in app/[...path]/page.tsx to deduplicate password gate check - Extract inner component in app/page.tsx (was 4× inline in minimal/fullbleed/mosaic/split) - Add 8 unit tests for buildSubpageGrid covering undefined, subset fields, layout fallback, and all fields
This commit is contained in:
@@ -12,7 +12,7 @@ vi.mock('@/lib/env', () => ({
|
||||
},
|
||||
}));
|
||||
|
||||
import { slugify } from '@/lib/config';
|
||||
import { slugify, buildSubpageGrid } from '@/lib/config';
|
||||
|
||||
describe('slugify', () => {
|
||||
it('converts a simple name to lowercase with hyphens', () => {
|
||||
@@ -51,3 +51,50 @@ describe('slugify', () => {
|
||||
expect(slugify('Album 2024')).toBe('album-2024');
|
||||
});
|
||||
});
|
||||
|
||||
describe('buildSubpageGrid', () => {
|
||||
it('returns empty object when called without arguments', () => {
|
||||
expect(buildSubpageGrid()).toEqual({});
|
||||
});
|
||||
|
||||
it('returns empty object when called with undefined', () => {
|
||||
expect(buildSubpageGrid(undefined)).toEqual({});
|
||||
});
|
||||
|
||||
it('maps columns and gap correctly', () => {
|
||||
expect(buildSubpageGrid({ columns: 4, gap: 8 })).toEqual({
|
||||
grid: { columns: 4, gap: 8 },
|
||||
});
|
||||
});
|
||||
|
||||
it('maps aspectRatio correctly', () => {
|
||||
expect(buildSubpageGrid({ aspectRatio: '16/9' })).toEqual({
|
||||
grid: { aspectRatio: '16/9' },
|
||||
});
|
||||
});
|
||||
|
||||
it('preserves a valid layout value', () => {
|
||||
expect(buildSubpageGrid({ layout: 'uniform' })).toEqual({
|
||||
grid: { layout: 'uniform' },
|
||||
});
|
||||
});
|
||||
|
||||
it('falls back to masonry for an unknown layout', () => {
|
||||
expect(buildSubpageGrid({ layout: 'unknown-layout' })).toEqual({
|
||||
grid: { layout: 'masonry' },
|
||||
});
|
||||
});
|
||||
|
||||
it('omits fields that are not supplied', () => {
|
||||
const result = buildSubpageGrid({ columns: 2 });
|
||||
expect(result).toEqual({ grid: { columns: 2 } });
|
||||
expect((result as { grid: object }).grid).not.toHaveProperty('gap');
|
||||
expect((result as { grid: object }).grid).not.toHaveProperty('layout');
|
||||
});
|
||||
|
||||
it('handles all fields together', () => {
|
||||
expect(
|
||||
buildSubpageGrid({ columns: 3, gap: 16, aspectRatio: '1', layout: 'masonry' }),
|
||||
).toEqual({ grid: { columns: 3, gap: 16, aspectRatio: '1', layout: 'masonry' } });
|
||||
});
|
||||
});
|
||||
|
||||
@@ -15,6 +15,28 @@ export * from './schema';
|
||||
export * from './theme';
|
||||
|
||||
let _config: AppConfig | null = null;
|
||||
|
||||
/** Converts raw YAML grid overrides into a typed partial GridConfig. */
|
||||
export function buildSubpageGrid(
|
||||
raw?: { columns?: number; gap?: number; aspectRatio?: string; layout?: string },
|
||||
): { grid: Partial<GridConfig> } | Record<string, never> {
|
||||
if (!raw) return {};
|
||||
return {
|
||||
grid: {
|
||||
...(raw.columns != null ? { columns: raw.columns } : {}),
|
||||
...(raw.gap != null ? { gap: raw.gap } : {}),
|
||||
...(raw.aspectRatio != null ? { aspectRatio: raw.aspectRatio } : {}),
|
||||
...(raw.layout != null
|
||||
? {
|
||||
layout: (VALID_LAYOUTS.includes(raw.layout)
|
||||
? raw.layout
|
||||
: 'masonry') as GridConfig['layout'],
|
||||
}
|
||||
: {}),
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
export function getConfig(): AppConfig {
|
||||
const isDev = process.env.NODE_ENV !== 'production';
|
||||
if (_config && !isDev) return _config;
|
||||
@@ -135,22 +157,7 @@ export function getConfig(): AppConfig {
|
||||
albumIds,
|
||||
sections,
|
||||
password: sp.password,
|
||||
...(sp.grid
|
||||
? {
|
||||
grid: {
|
||||
...(sp.grid.columns != null ? { columns: sp.grid.columns } : {}),
|
||||
...(sp.grid.gap != null ? { gap: sp.grid.gap } : {}),
|
||||
...(sp.grid.aspectRatio != null ? { aspectRatio: sp.grid.aspectRatio } : {}),
|
||||
...(sp.grid.layout != null
|
||||
? {
|
||||
layout: (VALID_LAYOUTS.includes(sp.grid.layout)
|
||||
? sp.grid.layout
|
||||
: 'masonry') as GridConfig['layout'],
|
||||
}
|
||||
: {}),
|
||||
},
|
||||
}
|
||||
: {}),
|
||||
...buildSubpageGrid(sp.grid),
|
||||
};
|
||||
});
|
||||
} else if (gallery.subpages) {
|
||||
@@ -178,22 +185,7 @@ export function getConfig(): AppConfig {
|
||||
subtitle: sp.subtitle,
|
||||
albumIds: albumEntries.map((entry) => processAlbumEntry(entry, `subpage "${name}"`)),
|
||||
password: sp.password,
|
||||
...(sp.grid
|
||||
? {
|
||||
grid: {
|
||||
...(sp.grid.columns != null ? { columns: sp.grid.columns } : {}),
|
||||
...(sp.grid.gap != null ? { gap: sp.grid.gap } : {}),
|
||||
...(sp.grid.aspectRatio != null ? { aspectRatio: sp.grid.aspectRatio } : {}),
|
||||
...(sp.grid.layout != null
|
||||
? {
|
||||
layout: (VALID_LAYOUTS.includes(sp.grid.layout)
|
||||
? sp.grid.layout
|
||||
: 'masonry') as GridConfig['layout'],
|
||||
}
|
||||
: {}),
|
||||
},
|
||||
}
|
||||
: {}),
|
||||
...buildSubpageGrid(sp.grid),
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
@@ -61,16 +61,6 @@ export const THEME_PRESETS: Record<string, ThemeConfig> = {
|
||||
headerDot: false,
|
||||
heroStyle: 'typographic',
|
||||
},
|
||||
botanica: {
|
||||
preset: 'botanica',
|
||||
accent: '#4a7c59',
|
||||
fonts: { heading: 'Cormorant Garamond', body: 'Nunito Sans', caption: 'Inconsolata' },
|
||||
radius: 8,
|
||||
photoFrame: 'none',
|
||||
grain: false,
|
||||
headerDot: true,
|
||||
heroStyle: 'split',
|
||||
},
|
||||
};
|
||||
|
||||
export const VALID_PHOTO_FRAMES = ['none', 'passepartout', 'shadow'];
|
||||
|
||||
Reference in New Issue
Block a user