+
+
+
+
+
+
+
+ {/if}
+
+ {#if data.totalPages > 1}
+
+ {/if}
+
+ {#snippet desktopActions(r: LabResultItem)}
+
+
+
+
+
+ {#if r.flag}
+
{r.flag}
+ {/if}
+
+
{r.collected_at.slice(0, 10)}
+
+
+ {formatValue(r)}
+
+ {#if r.lab}
+
{r.lab}
+ {/if}
+ {@render mobileActions(r)}
+
+
@@ -134,72 +659,47 @@
{m["labResults_colValue"]()}
{m["labResults_colFlag"]()}
{m["labResults_colLab"]()}
+ {m["labResults_colActions"]()}
- {#each data.results as r (r.record_id)}
+ {#each displayGroups as group (group.key)}
+ {#if group.label}
+
+
+
+ {group.label}
+
+
+
+ {/if}
+ {#each group.items as r (r.record_id)}
+ {@render desktopRow(r)}
+ {/each}
+ {/each}
+ {#if data.resultPage.items.length === 0}
- {r.collected_at.slice(0, 10)}
- {r.test_name_original ?? r.test_code}
- {r.test_code}
-
- {#if r.value_num != null}
- {r.value_num} {r.unit_original ?? ''}
- {:else if r.value_text}
- {r.value_text}
- {:else}
- —
- {/if}
-
-
- {#if r.flag}
-
- {r.flag}
-
- {:else}
- —
- {/if}
-
- {r.lab ?? '—'}
-
- {:else}
-
-
+
{m["labResults_noResults"]()}
- {/each}
+ {/if}
-
- {#each data.results as r (r.record_id)}
-
-
- {r.test_name_original ?? r.test_code}
- {#if r.flag}
-
- {r.flag}
-
- {/if}
-
-
{r.collected_at.slice(0, 10)}
-
- {r.test_code}
- {#if r.value_num != null}
- {r.value_num} {r.unit_original ?? ''}
- {:else if r.value_text}
- {r.value_text}
- {/if}
-
- {#if r.lab}
-
{r.lab}
- {/if}
-
- {:else}
-
{m["labResults_noResults"]()}
+
+ {#each displayGroups as group (group.key)}
+ {#if group.label}
+
{group.label}
+ {/if}
+ {#each group.items as r (r.record_id)}
+ {@render mobileCard(r)}
+ {/each}
{/each}
+ {#if data.resultPage.items.length === 0}
+
{m["labResults_noResults"]()}
+ {/if}
diff --git a/frontend/src/routes/health/medications/+page.svelte b/frontend/src/routes/health/medications/+page.svelte
index 1b791f1..f34be71 100644
--- a/frontend/src/routes/health/medications/+page.svelte
+++ b/frontend/src/routes/health/medications/+page.svelte
@@ -1,6 +1,5 @@
+
+
{m.profile_title()} — innercontext
+
+
+
+ {m["nav_appSubtitle"]()}
+ {m.profile_title()}
+ {m.profile_subtitle()}
+
+
+ {#if form?.error}
+
{form.error}
+ {/if}
+ {#if form?.saved}
+
{m.profile_saved()}
+ {/if}
+
+
+
diff --git a/frontend/src/routes/routines/+page.svelte b/frontend/src/routes/routines/+page.svelte
index b72c3bc..730f1f8 100644
--- a/frontend/src/routes/routines/+page.svelte
+++ b/frontend/src/routes/routines/+page.svelte
@@ -4,6 +4,7 @@
import { m } from '$lib/paraglide/messages.js';
import { Badge } from '$lib/components/ui/badge';
import { Button } from '$lib/components/ui/button';
+ import { Sparkles } from 'lucide-svelte';
let { data }: { data: PageData } = $props();
@@ -28,7 +29,7 @@
{m.routines_title()}
{m.routines_count({ count: data.routines.length })}
-
+
diff --git a/frontend/src/routes/routines/[id]/+page.server.ts b/frontend/src/routes/routines/[id]/+page.server.ts
index 73dcbdf..426a4b4 100644
--- a/frontend/src/routes/routines/[id]/+page.server.ts
+++ b/frontend/src/routes/routines/[id]/+page.server.ts
@@ -1,10 +1,10 @@
-import { addRoutineStep, deleteRoutine, deleteRoutineStep, getProducts, getRoutine } from '$lib/api';
+import { addRoutineStep, deleteRoutine, deleteRoutineStep, getProductSummaries, getRoutine } from '$lib/api';
import { error, fail, redirect } from '@sveltejs/kit';
import type { Actions, PageServerLoad } from './$types';
export const load: PageServerLoad = async ({ params }) => {
try {
- const [routine, products] = await Promise.all([getRoutine(params.id), getProducts()]);
+ const [routine, products] = await Promise.all([getRoutine(params.id), getProductSummaries()]);
return { routine, products };
} catch {
error(404, 'Routine not found');
diff --git a/frontend/src/routes/routines/[id]/+page.svelte b/frontend/src/routes/routines/[id]/+page.svelte
index ee8e846..a80c9d7 100644
--- a/frontend/src/routes/routines/[id]/+page.svelte
+++ b/frontend/src/routes/routines/[id]/+page.svelte
@@ -149,7 +149,7 @@
Routine {routine.routine_date} {routine.part_of_day.toUpperCase()} — innercontext
-
+
{m["routines_backToList"]()}
{m["nav_appSubtitle"]()}
diff --git a/frontend/src/routes/routines/grooming-schedule/+page.svelte b/frontend/src/routes/routines/grooming-schedule/+page.svelte
index 869bceb..2050166 100644
--- a/frontend/src/routes/routines/grooming-schedule/+page.svelte
+++ b/frontend/src/routes/routines/grooming-schedule/+page.svelte
@@ -48,17 +48,15 @@
{m.grooming_title()} — innercontext
-
-
-
-
{m["grooming_backToRoutines"]()}
-
{m["nav_appSubtitle"]()}
-
{m.grooming_title()}
+
+ {m["grooming_backToRoutines"]()}
+ {m["nav_appSubtitle"]()}
+ {m.grooming_title()}
+
+
-
-
{#if form?.error}
diff --git a/frontend/src/routes/routines/new/+page.svelte b/frontend/src/routes/routines/new/+page.svelte
index 2246fd2..f4996e4 100644
--- a/frontend/src/routes/routines/new/+page.svelte
+++ b/frontend/src/routes/routines/new/+page.svelte
@@ -22,7 +22,7 @@
{m["routines_newTitle"]()} — innercontext
-
+
{m["routines_backToList"]()}
{m["nav_appSubtitle"]()}
{m["routines_newTitle"]()}
diff --git a/frontend/src/routes/routines/suggest/+page.server.ts b/frontend/src/routes/routines/suggest/+page.server.ts
index 99fd7ac..49d645c 100644
--- a/frontend/src/routes/routines/suggest/+page.server.ts
+++ b/frontend/src/routes/routines/suggest/+page.server.ts
@@ -1,9 +1,9 @@
-import { addRoutineStep, createRoutine, getProducts, suggestBatch, suggestRoutine } from '$lib/api';
+import { addRoutineStep, createRoutine, getProductSummaries, suggestBatch, suggestRoutine } from '$lib/api';
import { fail, redirect } from '@sveltejs/kit';
import type { Actions, PageServerLoad } from './$types';
export const load: PageServerLoad = async () => {
- const products = await getProducts();
+ const products = await getProductSummaries();
const today = new Date().toISOString().slice(0, 10);
return { products, today };
};
@@ -76,7 +76,6 @@ export const actions: Actions = {
product_id?: string;
action_type?: string;
action_notes?: string;
- dose?: string;
region?: string;
}>;
try {
@@ -96,7 +95,6 @@ export const actions: Actions = {
product_id: s.product_id || undefined,
action_type: s.action_type || undefined,
action_notes: s.action_notes || undefined,
- dose: s.dose || undefined,
region: s.region || undefined
});
}
@@ -120,14 +118,12 @@ export const actions: Actions = {
product_id?: string;
action_type?: string;
action_notes?: string;
- dose?: string;
region?: string;
}>;
pm_steps: Array<{
product_id?: string;
action_type?: string;
action_notes?: string;
- dose?: string;
region?: string;
}>;
}>;
@@ -150,7 +146,6 @@ export const actions: Actions = {
product_id: s.product_id || undefined,
action_type: s.action_type || undefined,
action_notes: s.action_notes || undefined,
- dose: s.dose || undefined,
region: s.region || undefined
});
}
diff --git a/frontend/src/routes/routines/suggest/+page.svelte b/frontend/src/routes/routines/suggest/+page.svelte
index ad1f741..e9ec526 100644
--- a/frontend/src/routes/routines/suggest/+page.svelte
+++ b/frontend/src/routes/routines/suggest/+page.svelte
@@ -15,7 +15,12 @@
import HintCheckbox from '$lib/components/forms/HintCheckbox.svelte';
import SimpleSelect from '$lib/components/forms/SimpleSelect.svelte';
import { Tabs, TabsContent, TabsList, TabsTrigger } from '$lib/components/ui/tabs';
- import { ChevronUp, ChevronDown, ArrowLeft } from 'lucide-svelte';
+ import { ChevronUp, ChevronDown, ArrowLeft, Sparkles } from 'lucide-svelte';
+ import ValidationWarningsAlert from '$lib/components/ValidationWarningsAlert.svelte';
+ import StructuredErrorDisplay from '$lib/components/StructuredErrorDisplay.svelte';
+ import AutoFixBadge from '$lib/components/AutoFixBadge.svelte';
+ import ReasoningChainViewer from '$lib/components/ReasoningChainViewer.svelte';
+ import MetadataDebugPanel from '$lib/components/MetadataDebugPanel.svelte';
let { data }: { data: PageData } = $props();
@@ -55,7 +60,6 @@
function stepMeta(step: SuggestedStep): string {
const parts: string[] = [];
- if (step.dose) parts.push(step.dose);
if (step.region && step.region.toLowerCase() !== 'face') parts.push(step.region);
if (step.action_notes && !step.action_type) parts.push(step.action_notes);
return parts.join(' · ');
@@ -115,14 +119,14 @@
{m.suggest_title()} — innercontext
-
+
{#if errorMsg}
- {errorMsg}
+
{/if}
@@ -179,7 +183,7 @@
{m.suggest_generating()}
{:else}
- {m["suggest_generateBtn"]()}
+ {m["suggest_generateBtn"]()}
{/if}
@@ -216,6 +220,20 @@
{/if}
+
+ {#if suggestion.auto_fixes_applied}
+
+ {/if}
+ {#if suggestion.validation_warnings}
+
+ {/if}
+ {#if suggestion.response_metadata?.reasoning_chain}
+
+ {/if}
+ {#if suggestion.response_metadata}
+
+ {/if}
+
{#each suggestion.steps as step, i (i)}
@@ -255,7 +273,7 @@
{/if}
@@ -305,7 +323,7 @@
{m["suggest_generatingPlan"]()}
{:else}
- {m["suggest_generatePlan"]()}
+ {m["suggest_generatePlan"]()}
{/if}
@@ -324,6 +342,20 @@
{/if}
+
+ {#if batch.auto_fixes_applied}
+
+ {/if}
+ {#if batch.validation_warnings}
+
+ {/if}
+ {#if batch.response_metadata?.reasoning_chain}
+
+ {/if}
+ {#if batch.response_metadata}
+
+ {/if}
+
{#each batch.days as day (day.date)}
@@ -420,7 +452,7 @@
{/if}
diff --git a/frontend/src/routes/skin/+page.server.ts b/frontend/src/routes/skin/+page.server.ts
index 90a1401..504e76f 100644
--- a/frontend/src/routes/skin/+page.server.ts
+++ b/frontend/src/routes/skin/+page.server.ts
@@ -18,17 +18,17 @@ export const actions: Actions = {
const hydration_level = form.get('hydration_level') as string;
const sensitivity_level = form.get('sensitivity_level') as string;
const barrier_state = form.get('barrier_state') as string;
- const active_concerns_raw = form.get('active_concerns') as string;
+ const active_concerns_values = form
+ .getAll('active_concerns')
+ .map((value) => String(value).trim())
+ .filter(Boolean);
const priorities_raw = form.get('priorities') as string;
if (!snapshot_date) {
return fail(400, { error: 'Date is required' });
}
- const active_concerns = active_concerns_raw
- ?.split(',')
- .map((c) => c.trim())
- .filter(Boolean) ?? [];
+ const active_concerns = active_concerns_values;
const priorities = priorities_raw
?.split(',')
@@ -68,7 +68,10 @@ export const actions: Actions = {
const hydration_level = form.get('hydration_level') as string;
const sensitivity_level = form.get('sensitivity_level') as string;
const barrier_state = form.get('barrier_state') as string;
- const active_concerns_raw = form.get('active_concerns') as string;
+ const active_concerns_values = form
+ .getAll('active_concerns')
+ .map((value) => String(value).trim())
+ .filter(Boolean);
const priorities_raw = form.get('priorities') as string;
const skin_type = form.get('skin_type') as string;
const sebum_tzone = form.get('sebum_tzone') as string;
@@ -76,10 +79,7 @@ export const actions: Actions = {
if (!id) return fail(400, { error: 'Missing id' });
- const active_concerns = active_concerns_raw
- ?.split(',')
- .map((c) => c.trim())
- .filter(Boolean) ?? [];
+ const active_concerns = active_concerns_values;
const priorities = priorities_raw
?.split(',')
diff --git a/frontend/src/routes/skin/+page.svelte b/frontend/src/routes/skin/+page.svelte
index 5a386bb..2922c56 100644
--- a/frontend/src/routes/skin/+page.svelte
+++ b/frontend/src/routes/skin/+page.svelte
@@ -16,6 +16,18 @@
const skinTextures = ['smooth', 'rough', 'flaky', 'bumpy'];
const barrierStates = ['intact', 'mildly_compromised', 'compromised'];
const skinTypes = ['dry', 'oily', 'combination', 'sensitive', 'normal', 'acne_prone'];
+ const activeConcernValues = [
+ 'acne',
+ 'rosacea',
+ 'hyperpigmentation',
+ 'aging',
+ 'dehydration',
+ 'redness',
+ 'damaged_barrier',
+ 'pore_visibility',
+ 'uneven_texture',
+ 'sebum_excess'
+ ];
const statePills: Record = {
excellent: 'state-pill state-pill--excellent',
@@ -53,6 +65,20 @@
acne_prone: m["skin_typeAcneProne"]
};
+ const concernLabels: Record string> = {
+ acne: m["productForm_concernAcne"],
+ rosacea: m["productForm_concernRosacea"],
+ hyperpigmentation: m["productForm_concernHyperpigmentation"],
+ aging: m["productForm_concernAging"],
+ dehydration: m["productForm_concernDehydration"],
+ redness: m["productForm_concernRedness"],
+ damaged_barrier: m["productForm_concernDamagedBarrier"],
+ pore_visibility: m["productForm_concernPoreVisibility"],
+ uneven_texture: m["productForm_concernUnevenTexture"],
+ hair_growth: m["productForm_concernHairGrowth"],
+ sebum_excess: m["productForm_concernSebumExcess"]
+ };
+
let showForm = $state(false);
// Create form state (bound to inputs so AI can pre-fill)
@@ -65,7 +91,7 @@
let sensitivityLevel = $state('');
let sebumTzone = $state('');
let sebumCheeks = $state('');
- let activeConcernsRaw = $state('');
+ let activeConcerns = $state([]);
let prioritiesRaw = $state('');
let notes = $state('');
@@ -80,7 +106,7 @@
let editSensitivityLevel = $state('');
let editSebumTzone = $state('');
let editSebumCheeks = $state('');
- let editActiveConcernsRaw = $state('');
+ let editActiveConcerns = $state([]);
let editPrioritiesRaw = $state('');
let editNotes = $state('');
@@ -95,7 +121,7 @@
editSensitivityLevel = snap.sensitivity_level != null ? String(snap.sensitivity_level) : '';
editSebumTzone = snap.sebum_tzone != null ? String(snap.sebum_tzone) : '';
editSebumCheeks = snap.sebum_cheeks != null ? String(snap.sebum_cheeks) : '';
- editActiveConcernsRaw = snap.active_concerns?.join(', ') ?? '';
+ editActiveConcerns = [...(snap.active_concerns ?? [])];
editPrioritiesRaw = snap.priorities?.join(', ') ?? '';
editNotes = snap.notes ?? '';
showForm = false;
@@ -112,6 +138,12 @@
const textureOptions = $derived(skinTextures.map((t) => ({ value: t, label: textureLabels[t]?.() ?? t })));
const skinTypeOptions = $derived(skinTypes.map((st) => ({ value: st, label: skinTypeLabels[st]?.() ?? st })));
const barrierOptions = $derived(barrierStates.map((b) => ({ value: b, label: barrierLabels[b]?.() ?? b })));
+ const activeConcernOptions = $derived(
+ activeConcernValues.map((value) => ({
+ value,
+ label: concernLabels[value]?.() ?? value.replace(/_/g, ' ')
+ }))
+ );
const sortedSnapshots = $derived(
[...data.snapshots].sort((a, b) => b.snapshot_date.localeCompare(a.snapshot_date))
@@ -139,7 +171,7 @@
if (r.sensitivity_level != null) sensitivityLevel = String(r.sensitivity_level);
if (r.sebum_tzone != null) sebumTzone = String(r.sebum_tzone);
if (r.sebum_cheeks != null) sebumCheeks = String(r.sebum_cheeks);
- if (r.active_concerns?.length) activeConcernsRaw = r.active_concerns.join(', ');
+ if (r.active_concerns?.length) activeConcerns = [...r.active_concerns];
if (r.priorities?.length) prioritiesRaw = r.priorities.join(', ');
if (r.notes) notes = r.notes;
aiModalOpen = false;
@@ -332,14 +364,30 @@
max="5"
bind:value={sebumCheeks}
/>
-
+
+
{m["skin_activeConcerns"]()}
+
+ {#each activeConcernOptions as option (option.value)}
+
+ {/each}
+
+
+
{m["skin_activeConcerns"]()}
+
+ {#each activeConcernOptions as option (option.value)}
+
+ {/each}
+
+