Initial ui redo progress #1

Merged
breadone merged 23 commits from ui-redo into main 2026-02-17 18:29:59 +13:00
4 changed files with 33 additions and 33 deletions
Showing only changes of commit 0b038f4dea - Show all commits

View File

@@ -2,7 +2,11 @@
import "./layout.css"; import "./layout.css";
import favicon from "$lib/assets/favicon.svg"; import favicon from "$lib/assets/favicon.svg";
import { ModeWatcher } from "mode-watcher"; import { ModeWatcher } from "mode-watcher";
import { CalendarDate, today, getLocalTimeZone } from "@internationalized/date"; import {
CalendarDate,
today,
getLocalTimeZone,
} from "@internationalized/date";
import Header from "$lib/components/header.svelte"; import Header from "$lib/components/header.svelte";
import Calendar from "$lib/components/calendar.svelte"; import Calendar from "$lib/components/calendar.svelte";
@@ -11,27 +15,17 @@
let { children, data } = $props(); let { children, data } = $props();
let dateValue = $derived(data.date); let dateValue = $derived(data.date);
let entries = $derived(data.entries) let entries = $derived(data.entries);
// async function fetchForMonth(d: CalendarDate) {
// const res = await fetch(
// `/api/entry?month=${d.year}-${dateValue.month}`,
// );
// return await res.json()
// }
// onMount(async () => {
// const res = await fetch(
// `/api/entry?month=${dateValue.year}-${dateValue.month}`,
// );
// entries = await res.json()
// });
$effect(() => { $effect(() => {
goto(`/${dateValue}`) // Navigate when dateValue changes
}) goto(`/${dateValue}`);
});
$effect(() => {
// Sync dateValue with data.date when it changes
dateValue = data.date;
});
</script> </script>
<svelte:head><link rel="icon" href={favicon} /></svelte:head> <svelte:head><link rel="icon" href={favicon} /></svelte:head>
@@ -52,11 +46,8 @@
<Calendar bind:value={dateValue} /> <Calendar bind:value={dateValue} />
<ul class="space-y-4"> <ul class="space-y-4">
{#each entries as entry} {#each entries as entry}
<EntrySummaryView <EntrySummaryView {entry} bind:value={dateValue} />
{entry}
bind:value={dateValue}
/>
{/each} {/each}
</ul> </ul>
</div> </div>
</div> </div>

View File

@@ -1,13 +1,22 @@
import { today, getLocalTimeZone } from "@internationalized/date"; import { today, getLocalTimeZone, CalendarDate } from "@internationalized/date";
export async function load({ params, fetch }) { export async function load({ params, fetch }) {
const dateValue = today(getLocalTimeZone()); let dateValue;
const res = await fetch(`/api/entry?month=${dateValue.year}-${dateValue.month}`) if (params.date) {
const entries = await res.json() const [year, month, day] = params.date.split("-").map(Number);
dateValue = new CalendarDate(year, month, day);
} else {
dateValue = today(getLocalTimeZone());
}
const res = await fetch(
`/api/entry?month=${dateValue.year}-${dateValue.month}`,
);
const entries = await res.json();
return { return {
entries: entries, entries: entries,
date: dateValue date: dateValue,
}; };
} }

View File

@@ -8,7 +8,7 @@
</script> </script>
{#if data.entry.id} {#if data.entry}
<Editor dateValue={data.date} /> <Editor dateValue={data.date} />
{:else} {:else}
No entry exists for {data.date} No entry exists for {data.date}

View File

@@ -2,5 +2,5 @@
export async function load({ params, fetch }) { export async function load({ params, fetch }) {
const res = await fetch(`/api/entry?date=${params.date}`); const res = await fetch(`/api/entry?date=${params.date}`);
const entries = await res.json(); const entries = await res.json();
return { entry: entries }; return { entry: entries[0] };
} }