diff --git a/package.json b/package.json index a80e023..9c6606d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "homepage", - "version": "1.23.0", + "version": "1.23.1", "private": true, "type": "module", "scripts": { diff --git a/src/routes/fitness/[nutrition=fitnessNutrition]/+page.server.ts b/src/routes/fitness/[nutrition=fitnessNutrition]/+page.server.ts index e334ef5..059d913 100644 --- a/src/routes/fitness/[nutrition=fitnessNutrition]/+page.server.ts +++ b/src/routes/fitness/[nutrition=fitnessNutrition]/+page.server.ts @@ -107,9 +107,9 @@ export const load: PageServerLoad = async ({ fetch, url, locals }) => { // Compute initial showRoundOff server-side to avoid flicker const today = new Date().toISOString().slice(0, 10); - const isToday = dateParam === today; + const isTodayOrFuture = dateParam >= today; let initialShowRoundOff = false; - if (isToday && goal.dailyCalories) { + if (isTodayOrFuture && goal.dailyCalories) { const totalCal = (foodLog.entries ?? []).reduce( (sum: number, e: any) => sum + ((e.per100g?.calories ?? 0) * e.amountGrams / 100), 0 ); diff --git a/src/routes/fitness/[nutrition=fitnessNutrition]/+page.svelte b/src/routes/fitness/[nutrition=fitnessNutrition]/+page.svelte index 5e876f4..8b6e40c 100644 --- a/src/routes/fitness/[nutrition=fitnessNutrition]/+page.svelte +++ b/src/routes/fitness/[nutrition=fitnessNutrition]/+page.svelte @@ -479,9 +479,10 @@ // Server computes initial value to avoid flicker; $derived keeps it reactive let hasHydrated = $state(false); $effect(() => { hasHydrated = true; }); + const isTodayOrFuture = $derived(currentDate >= todayStr); const showRoundOff = $derived( hasHydrated - ? !!(isToday && goalCalories && calorieBalance > 50 && calorieBalance <= goalCalories * 0.5) + ? !!(isTodayOrFuture && goalCalories && calorieBalance > 50 && calorieBalance <= goalCalories * 0.5) : data.initialShowRoundOff );