From f2d6f8368c2470b9b1b6b3abc8e7e95261cafa5d Mon Sep 17 00:00:00 2001 From: JCEEE <0xjceee@proton.me> Date: Mon, 7 Sep 2026 19:02:43 +0100 Subject: [PATCH] small fixes --- frontend/src/lib/components/Sidebar.svelte | 7 ++++--- frontend/src/lib/server/migrate.ts | 15 ++++++++------- .../[fam]/[username]/rewards/+page.svelte | 18 ++++++++++++++---- 3 files changed, 26 insertions(+), 14 deletions(-) diff --git a/frontend/src/lib/components/Sidebar.svelte b/frontend/src/lib/components/Sidebar.svelte index e15a134..4b8fff5 100644 --- a/frontend/src/lib/components/Sidebar.svelte +++ b/frontend/src/lib/components/Sidebar.svelte @@ -96,9 +96,10 @@ display: flex; align-items: center; gap: 0.5rem; - padding: 1rem 0.75rem; + padding: 0 0.75rem; border-bottom: 1px solid #3730a3; - min-height: 52px; + height: 52px; + box-sizing: border-box; } .app-icon { font-size: 1.3rem; @@ -155,7 +156,7 @@ } .sidebar-header { justify-content: center; - padding: 1rem 0; + padding: 0; } .app-name { display: none; diff --git a/frontend/src/lib/server/migrate.ts b/frontend/src/lib/server/migrate.ts index a192188..ee4b2df 100644 --- a/frontend/src/lib/server/migrate.ts +++ b/frontend/src/lib/server/migrate.ts @@ -64,12 +64,10 @@ async function createRecord(collection: string, data: any): Promise { } } -// Seed a default season (Holidays) per family so the family-admin season -// picker always has at least one option. "Term time" is intentionally NOT -// auto-seeded — it's a UK-school-specific term that not every family wants, -// and force-seeding it meant a deleted "Term time" kept coming back on every -// boot. Families that want it can add it themselves. -// Only seeds when a family has zero seasons, so user deletions stick. +// Seed two default seasons (Term + Holidays) per family so the family-admin +// season picker always has options from day one and they can tick either on/off. +// Only seeds when a family has zero seasons, so user deletions stick (a deleted +// default never comes back on boot as long as at least one season remains). async function ensureDefaultSeasons(): Promise { const famsCol = await getCollection('fams'); if (!famsCol) return; @@ -78,7 +76,10 @@ async function ensureDefaultSeasons(): Promise { headers: { Authorization: `Bearer ${t}` } }); const fams = (await famsRes.json()).items || []; - const defaults = [{ name: 'Holidays', color: '#f59e0b', active: true }]; + const defaults = [ + { name: 'Term', color: '#6366f1', active: true }, + { name: 'Holidays', color: '#f59e0b', active: true } + ]; for (const fam of fams) { const sRes = await fetch( `${PB_ENDPOINT}/api/collections/seasons/records?filter=(famId='${fam.id}')&fields=name&perPage=200`, diff --git a/frontend/src/routes/[fam]/[username]/rewards/+page.svelte b/frontend/src/routes/[fam]/[username]/rewards/+page.svelte index 5d40337..a45fe4a 100644 --- a/frontend/src/routes/[fam]/[username]/rewards/+page.svelte +++ b/frontend/src/routes/[fam]/[username]/rewards/+page.svelte @@ -269,6 +269,10 @@ let doneConfigs = $derived( configs.filter((c: BonusConfig) => c.status === 'completed') as BonusConfig[] ); + + let isPocketMoney = $derived( + !!editingConfig?.isPocketMoney || !!creatingFromTemplate?.isPocketMoney + ); @@ -598,11 +602,13 @@ {@html stepIcon(1)} Name + {#if !isPocketMoney} -