tighten views
This commit is contained in:
JCEEE
@@ -1,8 +1,9 @@
|
||||
<script lang="ts">
|
||||
import { page } from '$app/state';
|
||||
import { famStore } from '$lib/stores/fam.svelte';
|
||||
import { onMount, onDestroy } from 'svelte';
|
||||
import { Chart, registerables } from 'chart.js';
|
||||
import { ViewHeader, CardGrid, Card } from '$lib/components';
|
||||
import { formatDDMMYY } from '$lib/format';
|
||||
|
||||
Chart.register(...registerables);
|
||||
|
||||
@@ -10,6 +11,10 @@
|
||||
let famSlug = $derived(page.params.fam);
|
||||
|
||||
let summary = $state(data.summary);
|
||||
let members = $state(data.members || []);
|
||||
let templates = $state(data.templates || []);
|
||||
let assigned = $state(data.assigned || []);
|
||||
|
||||
let donutCanvases = $state<Record<string, HTMLCanvasElement | undefined>>({});
|
||||
let donutCharts: Record<string, Chart> = {};
|
||||
let choresCanvas: HTMLCanvasElement | undefined;
|
||||
@@ -17,22 +22,24 @@
|
||||
|
||||
function captureCanvas(node: HTMLCanvasElement, memberId: string) {
|
||||
donutCanvases[memberId] = node;
|
||||
return {
|
||||
destroy() { delete donutCanvases[memberId]; }
|
||||
};
|
||||
return { destroy() { delete donutCanvases[memberId]; } };
|
||||
}
|
||||
|
||||
let members = $state(data.members);
|
||||
let templates = $state(data.templates);
|
||||
// ─── Derived tile stats ───
|
||||
let tileMembers = $derived(members.length);
|
||||
let tilePts = $derived(
|
||||
summary?.summaries?.reduce((s: number, m: any) => s + (m.pointsEarned || 0), 0) ?? 0
|
||||
);
|
||||
let tileMoney = $derived(
|
||||
summary?.summaries?.reduce((s: number, m: any) => s + (Number(m.moneyEarned) || 0), 0) ?? 0
|
||||
);
|
||||
let tileChores = $derived(
|
||||
summary?.summaries?.reduce((s: number, m: any) => s + (m.choresCompleted || 0), 0) ?? 0
|
||||
);
|
||||
|
||||
$effect(() => {
|
||||
if (data.members?.length) members = data.members;
|
||||
if (data.templates?.length) templates = data.templates;
|
||||
if (famStore.initialized) {
|
||||
if (famStore.members.length) members = famStore.members;
|
||||
if (famStore.templates.length) templates = famStore.templates;
|
||||
}
|
||||
})
|
||||
function totalChoresFor(memberId: string) {
|
||||
return assigned.filter((a: any) => a.memberId === memberId).length;
|
||||
}
|
||||
|
||||
onMount(() => {
|
||||
if (!summary?.summaries?.length) return;
|
||||
@@ -53,7 +60,9 @@
|
||||
data: { labels, datasets },
|
||||
options: {
|
||||
responsive: true,
|
||||
plugins: { legend: { display: true }, title: { display: true, text: 'Chores per day' } },
|
||||
plugins: {
|
||||
legend: { display: summary.summaries.length > 1, position: 'bottom' },
|
||||
},
|
||||
scales: { y: { beginAtZero: true, ticks: { stepSize: 1 } } },
|
||||
},
|
||||
});
|
||||
@@ -75,18 +84,7 @@
|
||||
borderWidth: 0,
|
||||
}],
|
||||
},
|
||||
options: {
|
||||
responsive: true,
|
||||
cutout: '70%',
|
||||
plugins: {
|
||||
legend: { display: false },
|
||||
tooltip: {
|
||||
callbacks: {
|
||||
label: (ctx) => `${ctx.label}: ${ctx.parsed} chores`,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
options: { responsive: true, cutout: '70%', plugins: { legend: { display: false } } },
|
||||
});
|
||||
}
|
||||
});
|
||||
@@ -94,82 +92,277 @@
|
||||
onDestroy(() => {
|
||||
choresChart?.destroy();
|
||||
for (const c of Object.values(donutCharts)) c?.destroy();
|
||||
famStore.cleanup();
|
||||
});
|
||||
</script>
|
||||
|
||||
<h1>🏠 {famSlug}</h1>
|
||||
<ViewHeader
|
||||
title={famSlug}
|
||||
subtitle={summary?.weekStart ? `Week of ${formatDDMMYY(summary.weekStart)}` : 'Dashboard'}
|
||||
hero
|
||||
/>
|
||||
|
||||
{#if summary?.summaries?.length}
|
||||
<h2>This week</h2>
|
||||
<table>
|
||||
<thead><tr><th>Member</th><th>Points</th><th>Done</th></tr></thead>
|
||||
<tbody>
|
||||
{#each summary.summaries as s}
|
||||
<tr>
|
||||
<td><span style="color:{s.memberColor}">■</span> {s.memberName}</td>
|
||||
<td>{s.pointsEarned}</td>
|
||||
<td>{s.choresCompleted}/{s.totalChores}</td>
|
||||
</tr>
|
||||
{/each}
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div class="card">
|
||||
<h2>Chores per day</h2>
|
||||
<canvas bind:this={choresCanvas} height="200"></canvas>
|
||||
<!-- STAT TILES -->
|
||||
<div class="tiles">
|
||||
<div class="tile tile-members">
|
||||
<span class="tile-val">{tileMembers}</span>
|
||||
<span class="tile-lbl">members</span>
|
||||
</div>
|
||||
|
||||
<div class="donut-grid">
|
||||
{#each summary.summaries as s}
|
||||
<div class="donut-card">
|
||||
<canvas use:captureCanvas={s.memberId} height="150" width="150"></canvas>
|
||||
<div class="donut-label" style="color:{s.memberColor}">{s.memberName}</div>
|
||||
<div class="donut-points">{s.pointsEarned} pts</div>
|
||||
<div class="donut-hint">{s.choresCompleted}/{s.totalChores} chores</div>
|
||||
</div>
|
||||
{/each}
|
||||
<div class="tile tile-pts">
|
||||
<span class="tile-val">{tilePts}</span>
|
||||
<span class="tile-lbl">points this week</span>
|
||||
</div>
|
||||
<div class="tile tile-cash">
|
||||
<span class="tile-val">£{tileMoney.toFixed(2)}</span>
|
||||
<span class="tile-lbl">cash this week</span>
|
||||
</div>
|
||||
<div class="tile tile-chores">
|
||||
<span class="tile-val">{tileChores}</span>
|
||||
<span class="tile-lbl">chores done</span>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<h2>Members ({members?.length || 0})</h2>
|
||||
<div class="member-grid">
|
||||
{#each members || [] as m}
|
||||
<a href="/{famSlug}/{m.name}" class="member-card" style="border-left: 4px solid {m.color}">
|
||||
<strong>{m.name}</strong>
|
||||
<span class="hint">{m.deviceTokenHint || '—'}</span>
|
||||
</a>
|
||||
{/each}
|
||||
</div>
|
||||
|
||||
{#if templates?.length}
|
||||
<h2>Templates ({templates.length})</h2>
|
||||
<ul>
|
||||
{#each templates as t}
|
||||
<li>{t.name} — {t.defaultFrequency} — {t.defaultValue} {t.defaultType}</li>
|
||||
{/each}
|
||||
</ul>
|
||||
{/if}
|
||||
<CardGrid>
|
||||
<!-- MEMBERS KANBAN -->
|
||||
<Card cols={3} scrollX title="Members">
|
||||
{#if !summary?.summaries?.length}
|
||||
<p class="empty">No data yet this week</p>
|
||||
{:else}
|
||||
<div class="kanban">
|
||||
{#each summary.summaries as s}
|
||||
{@const m = members.find((m2: any) => m2.id === s.memberId)}
|
||||
{@const total = totalChoresFor(s.memberId)}
|
||||
{@const pct = total > 0 ? Math.round((s.choresCompleted / total) * 100) : 0}
|
||||
<div class="column col-member">
|
||||
<div class="member-hero">
|
||||
<div class="member-head">
|
||||
<span class="dot" style="background:{s.memberColor}"></span>
|
||||
<span class="member-name">{s.memberName}</span>
|
||||
{#if m}
|
||||
<a href="/{famSlug}/{m.name}" class="kanban-link">Kanban →</a>
|
||||
{/if}
|
||||
</div>
|
||||
<div class="donut-wrap">
|
||||
<canvas use:captureCanvas={s.memberId} height="100" width="100"></canvas>
|
||||
<div class="donut-center" style="color:{s.memberColor}">{pct}%</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="member-stats">
|
||||
<div class="stat-row">
|
||||
<span class="stat-lbl">Points</span>
|
||||
<span class="stat-val pts">{s.pointsEarned}</span>
|
||||
</div>
|
||||
<div class="stat-row">
|
||||
<span class="stat-lbl">Cash</span>
|
||||
<span class="stat-val cash">£{Number(s.moneyEarned || 0).toFixed(2)}</span>
|
||||
</div>
|
||||
<div class="stat-row">
|
||||
<span class="stat-lbl">Done</span>
|
||||
<span class="stat-val">{s.choresCompleted}/{total}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="progress-row">
|
||||
<div class="bar-wrap">
|
||||
<div class="bar-fill" style="width:{pct}%"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{/each}
|
||||
</div>
|
||||
{/if}
|
||||
</Card>
|
||||
|
||||
<!-- CHORES PER DAY CHART -->
|
||||
<Card cols={2} title="Chores per day">
|
||||
{#if summary?.summaries?.length}
|
||||
<div class="chart-wrap">
|
||||
<canvas bind:this={choresCanvas} height="200"></canvas>
|
||||
</div>
|
||||
{:else}
|
||||
<p class="empty">No data yet</p>
|
||||
{/if}
|
||||
</Card>
|
||||
|
||||
<!-- TEMPLATES -->
|
||||
<Card cols={1} title="Templates ({templates.length})">
|
||||
{#if templates.length === 0}
|
||||
<p class="empty">No templates created</p>
|
||||
{:else}
|
||||
<div class="template-list">
|
||||
{#each templates as t}
|
||||
<div class="template-chip">
|
||||
<span class="tpl-name">{t.name}</span>
|
||||
<span class="tpl-meta">{t.defaultFrequency} · {t.defaultValue} {t.defaultType}</span>
|
||||
</div>
|
||||
{/each}
|
||||
</div>
|
||||
{/if}
|
||||
</Card>
|
||||
</CardGrid>
|
||||
|
||||
<style>
|
||||
nav { display: flex; gap: 0.5rem; margin: 1rem 0; }
|
||||
nav a { padding: 0.4rem 0.8rem; background: #6366f1; color: white; border-radius: 4px; text-decoration: none; font-size: 0.9rem; }
|
||||
table { width: 100%; border-collapse: collapse; margin: 1rem 0; }
|
||||
th, td { padding: 0.4rem; border: 1px solid #e5e7eb; text-align: left; }
|
||||
th { background: #f9fafb; font-weight: 600; }
|
||||
.card { margin: 1rem 0; padding: 1rem; border: 1px solid #e5e7eb; border-radius: 8px; background: #f9fafb; }
|
||||
.card h2 { margin: 0 0 0.75rem; font-size: 1rem; }
|
||||
.card canvas { max-height: 50vh; }
|
||||
.donut-grid { display: flex; gap: 1rem; flex-wrap: wrap; margin: 1rem 0; justify-content: center; }
|
||||
.donut-card { display: flex; flex-direction: column; align-items: center; padding: 1rem; background: #f9fafb; border: 1px solid #e5e7eb; border-radius: 8px; min-width: 160px; }
|
||||
.donut-card canvas { max-height: 150px; max-width: 150px; }
|
||||
.donut-label { font-weight: 600; font-size: 0.9rem; margin-top: 0.5rem; }
|
||||
.donut-points { font-size: 1.1rem; font-weight: 700; }
|
||||
.donut-hint { font-size: 0.75rem; color: #9ca3af; }
|
||||
.member-grid { display: flex; gap: 0.5rem; flex-wrap: wrap; }
|
||||
.member-card { flex: 1; min-width: 160px; padding: 0.8rem; background: #f9fafb; border: 1px solid #e5e7eb; border-radius: 6px; text-decoration: none; color: inherit; display: block; }
|
||||
.member-card strong { display: block; }
|
||||
.hint { font-size: 0.8rem; color: #9ca3af; }
|
||||
ul { list-style: none; padding: 0; }
|
||||
li { padding: 0.25rem 0; }
|
||||
/* ── Tiles (matching child dashboard) ── */
|
||||
.tiles {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(4, 1fr);
|
||||
gap: 0.75rem;
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
@media (max-width: 640px) {
|
||||
.tiles { grid-template-columns: repeat(2, 1fr); }
|
||||
}
|
||||
.tile {
|
||||
border-radius: 14px;
|
||||
padding: 0.9rem 1.1rem;
|
||||
color: #fff;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.15rem;
|
||||
box-shadow: 0 6px 16px rgba(0, 0, 0, 0.12);
|
||||
}
|
||||
.tile-members { background: linear-gradient(135deg, #6366f1, #8b5cf6); }
|
||||
.tile-pts { background: linear-gradient(135deg, #7c3aed, #a855f7); }
|
||||
.tile-cash { background: linear-gradient(135deg, #059669, #10b981); }
|
||||
.tile-chores { background: linear-gradient(135deg, #0284c7, #38bdf8); }
|
||||
.tile-val { font-size: 1.6rem; font-weight: 800; }
|
||||
.tile-lbl {
|
||||
font-size: 0.75rem;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.06em;
|
||||
opacity: 0.9;
|
||||
}
|
||||
|
||||
/* ── Kanban columns ── */
|
||||
.kanban {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(3, 1fr);
|
||||
gap: 0.75rem;
|
||||
min-width: 450px;
|
||||
}
|
||||
.column {
|
||||
border: 1px solid #e5e7eb;
|
||||
border-top: 4px solid #6366f1;
|
||||
border-radius: 12px;
|
||||
padding: 0.75rem;
|
||||
background: #fafbff;
|
||||
}
|
||||
.col-member { border-top-color: #6366f1; background: #eef2ff; }
|
||||
|
||||
.member-hero {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.75rem;
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
.member-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.4rem;
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
.dot {
|
||||
display: inline-block;
|
||||
width: 10px; height: 10px;
|
||||
border-radius: 50%;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
.member-name {
|
||||
font-weight: 600;
|
||||
font-size: 0.9rem;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
.kanban-link {
|
||||
font-size: 0.75rem;
|
||||
color: #6366f1;
|
||||
text-decoration: none;
|
||||
font-weight: 600;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
.kanban-link:hover { text-decoration: underline; }
|
||||
|
||||
.donut-wrap {
|
||||
position: relative;
|
||||
width: 70px; height: 70px;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
.donut-wrap canvas {
|
||||
max-width: 70px; max-height: 70px;
|
||||
}
|
||||
.donut-center {
|
||||
position: absolute;
|
||||
inset: 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: 0.85rem;
|
||||
font-weight: 800;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.member-stats {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.3rem;
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
.stat-row {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
font-size: 0.8rem;
|
||||
}
|
||||
.stat-lbl { color: #6b7280; font-weight: 500; }
|
||||
.stat-val { font-weight: 700; }
|
||||
.stat-val.pts { color: #7c3aed; }
|
||||
.stat-val.cash { color: #059669; }
|
||||
|
||||
.progress-row {
|
||||
margin-top: 0.2rem;
|
||||
}
|
||||
.bar-wrap {
|
||||
height: 8px;
|
||||
background: #e5e7eb;
|
||||
border-radius: 4px;
|
||||
overflow: hidden;
|
||||
}
|
||||
.bar-fill {
|
||||
height: 100%;
|
||||
background: linear-gradient(90deg, #6366f1, #8b5cf6);
|
||||
border-radius: 4px;
|
||||
transition: width 0.3s ease;
|
||||
}
|
||||
|
||||
/* ── Chart ── */
|
||||
.chart-wrap { min-height: 200px; }
|
||||
.chart-wrap canvas { max-height: 300px; }
|
||||
|
||||
/* ── Templates ── */
|
||||
.template-list {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.4rem;
|
||||
}
|
||||
.template-chip {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 0.5rem 0.75rem;
|
||||
border: 1px solid #e5e7eb;
|
||||
border-left: 4px solid #6366f1;
|
||||
border-radius: 8px;
|
||||
background: #fafbff;
|
||||
gap: 0.5rem;
|
||||
}
|
||||
.tpl-name { font-weight: 600; font-size: 0.85rem; }
|
||||
.tpl-meta { font-size: 0.75rem; color: #6b7280; white-space: nowrap; }
|
||||
|
||||
/* ── Shared ── */
|
||||
.empty {
|
||||
color: #9ca3af;
|
||||
font-size: 0.85rem;
|
||||
text-align: center;
|
||||
padding: 1.5rem;
|
||||
}
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user