release: sync main with dev (about editor, journal template, icon cleanup) (#449)
Brings `main` up to `dev` after #448 realigned the two branches. `main` had #431 (portfolio features) but was missing everything that landed on `dev` since: - #443 — journal sample story ships as a template, not a live entry - #445 — last emojis in the public frontend replaced with SVG icons - #446 — About page toggle + content editor in the admin (@lancetm714's work, rebased) - #448 — the merge of `main` into `dev`, resolving the `Icons.tsx` split and porting `IconEyeOff` into the shared icon file After this merge both branches carry the same tree. CI on #448 (type-check + tests) passed on the merged state. --------- Co-authored-by: ralksta <ralksta@users.noreply.github.com> Co-authored-by: lancetm714 <108419425+lancetm714@users.noreply.github.com>
This commit is contained in:
@@ -367,6 +367,7 @@ export function getConfig(): AppConfig {
|
||||
scrollToTop: false,
|
||||
analytics: true,
|
||||
proofing: { enabled: false, allowMailto: false },
|
||||
aboutEnabled: true,
|
||||
albumOverrides: {},
|
||||
albumDescriptions: {},
|
||||
albumPasswords: {},
|
||||
@@ -468,6 +469,7 @@ export function getConfig(): AppConfig {
|
||||
},
|
||||
protection: settings.protection,
|
||||
watermark: settings.watermark,
|
||||
aboutEnabled: settings.about?.enabled !== false,
|
||||
albumOverrides,
|
||||
albumDescriptions,
|
||||
albumPasswords,
|
||||
|
||||
@@ -128,6 +128,7 @@ export interface AppConfig {
|
||||
enabled: boolean;
|
||||
allowMailto: boolean;
|
||||
};
|
||||
aboutEnabled: boolean;
|
||||
albumOverrides: Record<string, string>;
|
||||
albumDescriptions: Record<string, string>;
|
||||
albumPasswords: Record<string, string>;
|
||||
@@ -263,6 +264,7 @@ export interface SettingsYaml {
|
||||
opacity?: number;
|
||||
position?: 'bottom-right' | 'bottom-left' | 'center';
|
||||
};
|
||||
about?: { enabled?: boolean };
|
||||
}
|
||||
|
||||
export function slugify(name: string): string {
|
||||
|
||||
Reference in New Issue
Block a user