Redesign lunch screen
This commit is contained in:
1 parent
59be6b6ecf
commit
a336379354
1 file changed
+127
-77
@@ -1,7 +1,18 @@
|
||||
<script lang="ts">
|
||||
import CalendarX from '@lucide/svelte/icons/calendar-x';
|
||||
import Check from '@lucide/svelte/icons/check';
|
||||
import ChevronLeft from '@lucide/svelte/icons/chevron-left';
|
||||
import ChevronRight from '@lucide/svelte/icons/chevron-right';
|
||||
import CircleAlert from '@lucide/svelte/icons/circle-alert';
|
||||
import Sandwich from '@lucide/svelte/icons/sandwich';
|
||||
import TriangleAlert from '@lucide/svelte/icons/triangle-alert';
|
||||
import Users from '@lucide/svelte/icons/users';
|
||||
import Utensils from '@lucide/svelte/icons/utensils';
|
||||
import { api, type LunchDay } from '../lib/api';
|
||||
import { app, toast } from '../lib/state.svelte';
|
||||
import { dayLabel, monthLabel, shiftMonth, thisMonth } from '../lib/dates';
|
||||
import { monthLabel, parse, shiftMonth, thisMonth } from '../lib/dates';
|
||||
import PageHeader from '../lib/ui/PageHeader.svelte';
|
||||
import EmptyState from '../lib/ui/EmptyState.svelte';
|
||||
|
||||
const kids = $derived(app.household!.children);
|
||||
let childId = $state<number | null>(null);
|
||||
@@ -20,24 +31,10 @@
|
||||
const allPicked = $derived(open.length > 0 && open.every((d) => d.picked));
|
||||
let bulkBusy = $state(false);
|
||||
|
||||
async function pickAll() {
|
||||
// Select all picks every open day; when they're all picked already, it clears every pick instead.
|
||||
const dates = allPicked ? days!.filter((d) => d.picked).map((d) => d.date) : open.filter((d) => !d.picked).map((d) => d.date);
|
||||
if (!dates.length) return;
|
||||
bulkBusy = true;
|
||||
try {
|
||||
days = await api<LunchDay[]>('/lunch/bulk', { method: 'POST', json: { child_id: childId, dates, picked: !allPicked } });
|
||||
toast(allPicked ? `Cleared ${dates.length} days` : `Picked ${dates.length} days`);
|
||||
} catch (e: any) {
|
||||
toast(e.message);
|
||||
} finally {
|
||||
bulkBusy = false;
|
||||
}
|
||||
}
|
||||
|
||||
async function load() {
|
||||
if (childId === null) return;
|
||||
error = '';
|
||||
days = null;
|
||||
try {
|
||||
days = await api<LunchDay[]>(`/lunch?child_id=${childId}&month=${month}`);
|
||||
} catch (e: any) {
|
||||
@@ -60,74 +57,127 @@
|
||||
pending = null;
|
||||
}
|
||||
}
|
||||
|
||||
async function pickAll() {
|
||||
// Select all picks every open day; when they're all picked already, it clears every pick instead.
|
||||
const dates = allPicked ? days!.filter((d) => d.picked).map((d) => d.date) : open.filter((d) => !d.picked).map((d) => d.date);
|
||||
if (!dates.length) return;
|
||||
bulkBusy = true;
|
||||
try {
|
||||
days = await api<LunchDay[]>('/lunch/bulk', { method: 'POST', json: { child_id: childId, dates, picked: !allPicked } });
|
||||
toast(allPicked ? `Cleared ${dates.length} days` : `Picked ${dates.length} days`);
|
||||
} catch (e: any) {
|
||||
toast(e.message);
|
||||
} finally {
|
||||
bulkBusy = false;
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<h1>Lunch</h1>
|
||||
<PageHeader title="Lunch" subtitle="Pick the days to pack lunch. Each pick lands on the calendar." />
|
||||
|
||||
{#if !kids.length}
|
||||
<p class="card">Add your children in <a href="#/settings">Settings</a> first.</p>
|
||||
<EmptyState icon={Users} title="Add your children first">
|
||||
<a class="btn primary" href="#/settings">Open settings</a>
|
||||
</EmptyState>
|
||||
{:else}
|
||||
<div class="row kids" role="tablist" aria-label="Child">
|
||||
{#each kids as c (c.id)}
|
||||
<button role="tab" aria-selected={c.id === childId} onclick={() => (childId = c.id)} style:--c={c.color}>
|
||||
<span class="dot" style:background={c.color}></span>{c.display_name}
|
||||
</button>
|
||||
{/each}
|
||||
</div>
|
||||
|
||||
<div class="row spread month">
|
||||
<button aria-label="Previous month" onclick={() => (month = shiftMonth(month, -1))}>‹</button>
|
||||
<strong>{monthLabel(month)}</strong>
|
||||
<button aria-label="Next month" onclick={() => (month = shiftMonth(month, 1))}>›</button>
|
||||
</div>
|
||||
|
||||
{#if !hasMenu}
|
||||
<p class="card">No lunch menu is set up for {child?.display_name}. Add a source with the “Lunch menu” layout in <a href="#/settings">Settings</a>, then scan the menu.</p>
|
||||
{:else if error}
|
||||
<p class="error">{error}</p>
|
||||
{:else if days === null}
|
||||
<p class="muted">Loading…</p>
|
||||
{:else if !days.length}
|
||||
<p class="empty">No published menu for {monthLabel(month)} yet. Scan it from the Scans tab.</p>
|
||||
{:else}
|
||||
<div class="row spread">
|
||||
<p class="muted grow">{child?.display_name}: tap the days to pack lunch. {picked} picked. Each pick goes on the calendar as “Pack lunch”.</p>
|
||||
<button onclick={pickAll} disabled={bulkBusy || !open.length}>{allPicked ? 'Clear all' : 'Select all'}</button>
|
||||
</div>
|
||||
<ul class="days">
|
||||
{#each days as d (d.date)}
|
||||
<li class="card day" class:greyed={d.greyed} class:picked={d.picked}>
|
||||
<div class="row spread">
|
||||
<strong>{dayLabel(d.date)}</strong>
|
||||
{#if d.warning}<span class="badge warn"><span aria-hidden="true">⚠</span> {d.warning}</span>{/if}
|
||||
</div>
|
||||
{#if d.greyed}
|
||||
<p class="muted">{d.closed ?? 'No lunch this day'}</p>
|
||||
{:else}
|
||||
{#each d.menus as m}
|
||||
{#if d.menus.length > 1}<p class="muted small">{m.source_name}</p>{/if}
|
||||
<p class="food">{m.items.join(' · ')}</p>
|
||||
{/each}
|
||||
{/if}
|
||||
{#if !d.greyed || d.picked}
|
||||
<button class:primary={d.picked} aria-pressed={d.picked} disabled={pending === d.date} onclick={() => toggle(d)}>
|
||||
{d.picked ? '✓ Packing lunch' : 'Pack lunch this day'}
|
||||
</button>
|
||||
{/if}
|
||||
</li>
|
||||
<div class="stack-lg">
|
||||
<div class="kids" role="tablist" aria-label="Child">
|
||||
{#each kids as c (c.id)}
|
||||
<button role="tab" aria-selected={c.id === childId} onclick={() => (childId = c.id)} style:--c={c.color}>
|
||||
<span class="dot" style:background={c.color} aria-hidden="true"></span>{c.display_name}
|
||||
</button>
|
||||
{/each}
|
||||
</ul>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<div class="month-bar">
|
||||
<button class="icon" aria-label="Previous month" onclick={() => (month = shiftMonth(month, -1))}><ChevronLeft size={22} aria-hidden="true" /></button>
|
||||
<h2 class="month-name" aria-live="polite">{monthLabel(month)}</h2>
|
||||
<button class="icon" aria-label="Next month" onclick={() => (month = shiftMonth(month, 1))}><ChevronRight size={22} aria-hidden="true" /></button>
|
||||
</div>
|
||||
|
||||
{#if !hasMenu}
|
||||
<EmptyState icon={Utensils} title={`No lunch menu for ${child?.display_name}`}>
|
||||
<p>Add a source with the “Lunch menu” layout for {child?.display_name} in Settings, then scan the menu.</p>
|
||||
<a class="btn" href="#/settings">Open settings</a>
|
||||
</EmptyState>
|
||||
{:else if error}
|
||||
<div class="alert error" role="alert"><CircleAlert size={18} aria-hidden="true" /><span>{error}</span></div>
|
||||
{:else if days === null}
|
||||
<div class="days" aria-busy="true" aria-label="Loading menu">
|
||||
{#each [1, 2, 3, 4, 5, 6] as _}<div class="skeleton" style="height:160px"></div>{/each}
|
||||
</div>
|
||||
{:else if !days.length}
|
||||
<EmptyState icon={Utensils} title={`No menu for ${monthLabel(month)} yet`}>
|
||||
<p>Scan and publish the menu from the Scans tab, then come back to pick days.</p>
|
||||
<a class="btn" href="#/new">Scan a menu</a>
|
||||
</EmptyState>
|
||||
{:else}
|
||||
<div class="summary card">
|
||||
<div class="grow">
|
||||
<p class="strong tabular">{picked} of {open.length} school days picked</p>
|
||||
<div class="meter" role="progressbar" aria-valuemin="0" aria-valuemax={open.length} aria-valuenow={picked} aria-label="Days picked">
|
||||
<span style:width="{open.length ? (picked / open.length) * 100 : 0}%"></span>
|
||||
</div>
|
||||
</div>
|
||||
<button onclick={pickAll} disabled={bulkBusy || !open.length}>{allPicked ? 'Clear all' : 'Select all'}</button>
|
||||
</div>
|
||||
|
||||
<ul class="days">
|
||||
{#each days as d (d.date)}
|
||||
{@const date = parse(d.date)}
|
||||
<li class="day card" class:closed={d.greyed} class:picked={d.picked}>
|
||||
<div class="day-head">
|
||||
<span class="date-tile" aria-hidden="true">
|
||||
<span class="dow">{date.toLocaleDateString(undefined, { weekday: 'short' })}</span>
|
||||
<span class="dnum tabular">{date.getDate()}</span>
|
||||
</span>
|
||||
<span class="visually-hidden">{date.toLocaleDateString(undefined, { weekday: 'long', month: 'long', day: 'numeric' })}</span>
|
||||
{#if d.warning}<span class="badge warn"><TriangleAlert size={12} aria-hidden="true" />{d.warning}</span>{/if}
|
||||
</div>
|
||||
{#if d.greyed}
|
||||
<p class="closed-note"><CalendarX size={18} aria-hidden="true" />{d.closed ?? 'No lunch this day'}</p>
|
||||
{:else}
|
||||
{#each d.menus as m}
|
||||
{#if d.menus.length > 1}<p class="hint">{m.source_name}</p>{/if}
|
||||
<ul class="food">{#each m.items as item}<li>{item}</li>{/each}</ul>
|
||||
{/each}
|
||||
{/if}
|
||||
{#if !d.greyed || d.picked}
|
||||
<button class="pack" class:primary={d.picked} aria-pressed={d.picked} disabled={pending === d.date} onclick={() => toggle(d)}>
|
||||
{#if d.picked}<Check size={18} aria-hidden="true" />Packing lunch{:else}<Sandwich size={18} aria-hidden="true" />Pack lunch{/if}
|
||||
</button>
|
||||
{/if}
|
||||
</li>
|
||||
{/each}
|
||||
</ul>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<style>
|
||||
.kids button[aria-selected='true'] { border-color: var(--c); box-shadow: inset 0 0 0 2px var(--c); font-weight: 600; }
|
||||
.month { margin: 12px 0; }
|
||||
.month button { min-width: 44px; font-size: 1.25rem; }
|
||||
.days { list-style: none; margin: 0; padding: 0; display: grid; gap: 8px; grid-template-columns: repeat(auto-fill, minmax(260px, 1fr)); }
|
||||
.day { display: flex; flex-direction: column; gap: 6px; }
|
||||
.day button { margin-top: auto; }
|
||||
.greyed { background: var(--grey-day); }
|
||||
.picked { border-color: var(--accent); }
|
||||
.food { margin: 0; }
|
||||
.kids { display: flex; flex-wrap: wrap; gap: var(--s2); }
|
||||
.kids button { border-radius: var(--r-full); padding: 0 var(--s4); }
|
||||
.kids button[aria-selected='true'] { border-color: var(--c); background: color-mix(in srgb, var(--c) 14%, var(--surface)); box-shadow: inset 0 0 0 1px var(--c); }
|
||||
.kids .dot { width: 12px; height: 12px; }
|
||||
|
||||
.month-bar { display: flex; align-items: center; gap: var(--s1); }
|
||||
.month-name { font-size: var(--fs-xl); min-width: 10ch; text-align: center; }
|
||||
|
||||
.summary { display: flex; align-items: center; gap: var(--s4); }
|
||||
.meter { height: 8px; border-radius: var(--r-full); background: var(--surface-3); overflow: hidden; margin-top: var(--s2); }
|
||||
.meter span { display: block; height: 100%; background: var(--primary); border-radius: inherit; transition: width var(--dur) var(--ease); }
|
||||
|
||||
.days { display: grid; gap: var(--s3); grid-template-columns: repeat(auto-fill, minmax(250px, 1fr)); }
|
||||
.day { display: flex; flex-direction: column; gap: var(--s3); transition: border-color var(--dur) var(--ease), box-shadow var(--dur) var(--ease); }
|
||||
.day.picked { border-color: var(--primary); box-shadow: 0 0 0 1px var(--primary), var(--shadow-1); }
|
||||
.day.closed { background: var(--day-closed); box-shadow: none; }
|
||||
.day-head { display: flex; align-items: center; justify-content: space-between; gap: var(--s2); }
|
||||
.date-tile { display: flex; align-items: baseline; gap: 6px; }
|
||||
.dow { font-size: var(--fs-sm); font-weight: 700; text-transform: uppercase; letter-spacing: 0.05em; color: var(--text-2); }
|
||||
.dnum { font-size: var(--fs-xl); font-weight: 750; }
|
||||
.food { display: flex; flex-direction: column; gap: 2px; font-size: var(--fs-sm); color: var(--text); }
|
||||
.food li::before { content: '•'; color: var(--text-3); margin-right: var(--s2); }
|
||||
.closed-note { display: flex; align-items: center; gap: var(--s2); color: var(--text-2); font-weight: 600; }
|
||||
.pack { margin-top: auto; width: 100%; }
|
||||
</style>
|
||||
Reference in new issue
Block a user