8 files changed, 183 insertions, 687 deletions

diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
index 0a8a3f4..9675ad8 100644
--- a/src/routes/+page.server.ts
+++ b/src/routes/+page.server.ts
@@ -1,127 +1,62 @@
-import { fail, redirect } from '@sveltejs/kit';
-import { db } from '$lib/server/db';
-import { groceries, categories, references } from '$lib/server/db/schema';
-import { eq, desc } from 'drizzle-orm';
+import { fail, redirect, error } from '@sveltejs/kit';
+import {
+	loadUnchecked,
+	toggle,
+	addOrUncheck,
+} from '$lib/server/services/groceries';
+import {
+	numericId,
+	parseFormString,
+	parseOptionalNumber,
+} from '$lib/server/services/validation';
+import type { EnrichedGrocery } from '$lib/server/services/groceries';
+import type { Category } from '$lib/server/services/types';
 import type { Actions, PageServerLoad } from './$types';
 
-export const load: PageServerLoad = async () => {
-	const [items, cats, refs] = await Promise.all([
-		db
-			.select()
-			.from(groceries)
-			.where(eq(groceries.checked, false))
-			.orderBy(desc(groceries.createdAt)),
-		db.select().from(categories).orderBy(desc(categories.name)),
-		db.select().from(references).orderBy(desc(references.qualityScore)),
-	]);
-
-	const catMap = new Map(cats.map((c) => [c.id, c.name]));
-	const bestRef = new Map<number, (typeof refs)[number]>();
-	for (const ref of refs) {
-		if (!bestRef.has(ref.groceryId)) {
-			bestRef.set(ref.groceryId, ref);
-		}
-	}
+export interface HomeOutput {
+	items: EnrichedGrocery[];
+	categories: Category[];
+}
 
-	return {
-		items: items.map((i) => ({
-			...i,
-			categoryName: i.categoryId ? (catMap.get(i.categoryId) ?? null) : null,
-			bestRef: bestRef.get(i.id) ?? null,
-		})),
-		categories: cats,
-	};
+export const load: PageServerLoad = async () => {
+	return loadUnchecked();
 };
 
 export const actions: Actions = {
 	add: async ({ request }) => {
 		const data = await request.formData();
-		const name = data.get('name')?.toString().trim();
-		const categoryId = data.get('category_id')?.toString() || null;
+		const name = parseFormString(data.get('name'));
+		const categoryId = parseOptionalNumber(data.get('category_id'));
 
 		if (!name) {
 			return fail(400, { error: 'Le nom est requis' });
 		}
 
-		const [existing] = await db
-			.select()
-			.from(groceries)
-			.where(eq(groceries.name, name))
-			.limit(1);
-
-		if (existing) {
-			await db
-				.update(groceries)
-				.set({
-					checked: false,
-					categoryId: categoryId ? Number(categoryId) : existing.categoryId,
-				})
-				.where(eq(groceries.id, existing.id));
-		} else {
-			await db.insert(groceries).values({
-				name,
-				categoryId: categoryId ? Number(categoryId) : null,
-				createdAt: new Date().toISOString(),
-			});
-		}
-
+		await addOrUncheck(name, categoryId);
 		return { success: true };
 	},
 
 	toggle: async ({ request }) => {
 		const data = await request.formData();
-		const id = Number(data.get('id'));
-
-		const [item] = await db
-			.select()
-			.from(groceries)
-			.where(eq(groceries.id, id));
-		if (!item) {
-			return fail(404, { error: 'Article introuvable' });
+		try {
+			const id = numericId(data.get('id'));
+			await toggle(id);
+		} catch {
+			return fail(400, { error: 'ID invalide' });
 		}
-
-		await db
-			.update(groceries)
-			.set({ checked: !item.checked })
-			.where(eq(groceries.id, id));
-
 		return { success: true };
 	},
 
 	addAndEdit: async ({ request }) => {
 		const data = await request.formData();
-		const name = data.get('name')?.toString().trim();
-		const categoryId = data.get('category_id')?.toString() || null;
+		const name = parseFormString(data.get('name'));
+		const categoryId = parseOptionalNumber(data.get('category_id'));
 
 		if (!name) {
 			return fail(400, { error: 'Le nom est requis' });
 		}
 
-		const [existing] = await db
-			.select()
-			.from(groceries)
-			.where(eq(groceries.name, name))
-			.limit(1);
-
-		if (existing) {
-			await db
-				.update(groceries)
-				.set({
-					checked: false,
-					categoryId: categoryId ? Number(categoryId) : existing.categoryId,
-				})
-				.where(eq(groceries.id, existing.id));
-			throw redirect(303, `/grocery/${existing.id}`);
-		} else {
-			const [inserted] = await db
-				.insert(groceries)
-				.values({
-					name,
-					categoryId: categoryId ? Number(categoryId) : null,
-					createdAt: new Date().toISOString(),
-				})
-				.returning();
-			throw redirect(303, `/grocery/${inserted.id}`);
-		}
+		const { item, created } = await addOrUncheck(name, categoryId);
+		throw redirect(303, `/grocery/${item.id}`);
 	},
 };
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 3dcd3bc..2392790 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-	import '../app.css';
 	import { enhance } from '$app/forms';
 
 	let { data, form } = $props();
@@ -19,6 +18,7 @@
 
 <form class="add-bar" method="POST" action="?/add" use:enhance>
 	<input
+		class="form-input"
 		type="text"
 		name="name"
 		bind:value={name}
@@ -26,7 +26,9 @@
 		autocomplete="off"
 	/>
 	<button type="submit" aria-label="Ajouter">+</button>
-	<button type="submit" formaction="?/addAndEdit" aria-label="Modifier">→</button>
+	<button type="submit" formaction="?/addAndEdit" aria-label="Modifier"
+		>→</button
+	>
 </form>
 
 {#if form?.error}
@@ -41,20 +43,26 @@
 			<h3 class="category-name">{cat}</h3>
 			<ul class="item-list">
 				{#each items as item (item.id)}
-					<li class="catalog-item">
-						<button name="id" value={item.id} type="submit">
+					<li class="item-row item-row--fixed">
+						<button
+							class="item-btn item-btn--grow"
+							name="id"
+							value={item.id}
+							type="submit"
+							aria-pressed={item.checked}
+						>
 							<span class="item-text">
 								{item.name}
 								{#if item.bestRef}
-											<span class="best-ref"
-												>{item.bestRef.reference}
-												{#if item.bestRef.price && item.bestRef.unit}
-													&nbsp;{item.bestRef.price.toFixed(2)} {item.bestRef.unit}
-												{/if}
-												{#if item.bestRef.qualityScore != null}
-													&nbsp;({item.bestRef.qualityScore}/100)
-												{/if}
-											</span>
+									<span class="best-ref"
+										>{item.bestRef.reference}
+										{#if item.bestRef.price && item.bestRef.unit}
+											&nbsp;{item.bestRef.price.toFixed(2)} {item.bestRef.unit}
+										{/if}
+										{#if item.bestRef.qualityScore != null}
+											&nbsp;({item.bestRef.qualityScore}/100)
+										{/if}
+									</span>
 								{/if}
 							</span>
 						</button>
@@ -77,22 +85,9 @@
 		z-index: 10;
 	}
 
-	input {
+	.add-bar input {
 		flex: 1;
-		padding: 0.75rem 1rem;
-		border: 1.5px solid var(--border);
-		border-radius: 0.75rem;
-		font-size: 1rem;
-		font-family: inherit;
 		background: var(--surface);
-		min-width: 0;
-		transition: border-color 0.2s, box-shadow 0.2s;
-	}
-
-	input:focus {
-		outline: none;
-		border-color: var(--accent);
-		box-shadow: 0 0 0 3px rgba(217, 119, 87, 0.15);
 	}
 
 	.add-bar button {
@@ -136,116 +131,11 @@
 	}
 
 	.error {
-		color: var(--danger);
-		font-size: 0.875rem;
 		margin-bottom: 1rem;
-		padding: 0.5rem 0.75rem;
-		background: rgba(217, 83, 79, 0.08);
-		border-radius: 0.5rem;
-	}
-
-	.item-list {
-		list-style: none;
-		display: flex;
-		flex-direction: column;
-		gap: 0.375rem;
-	}
-
-	.item-list li button {
-		width: 100%;
-		text-align: left;
-		padding: 0 0.875rem;
-		height: 100%;
-		border: none;
-		border-radius: 0.75rem;
-		background: var(--surface);
-		font-size: 1rem;
-		font-weight: 500;
-		display: flex;
-		align-items: center;
-		transition: all 0.2s ease;
-		box-shadow: 0 1px 2px var(--shadow);
-	}
-
-	.item-list li button:hover {
-		background: #fff8f5;
-		box-shadow: 0 2px 6px rgba(217, 119, 87, 0.1);
-		transform: translateY(-1px);
-	}
-
-	.catalog-item {
-		display: flex;
-		gap: 0.5rem;
-		align-items: center;
-		height: 2.75rem;
-	}
-
-	.catalog-item button:first-child {
-		flex-grow: 1;
-		width: auto;
-		display: flex;
-		align-items: center;
-		height: 100%;
-	}
-
-	.item-text {
-		display: flex;
-		flex-direction: column;
-		text-align: left;
-		line-height: 1.2;
-		gap: 0.0625rem;
-		overflow: hidden;
-	}
-
-	.best-ref {
-		font-size: 0.75rem;
-		color: var(--text-secondary);
-		font-weight: 400;
-	}
-
-	.ref-link {
-		width: 2.75rem;
-		flex-shrink: 0;
-		height: 2.75rem;
-		aspect-ratio: 1;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		border-radius: 0.75rem;
-		background: var(--surface);
-		color: var(--text-secondary);
-		text-decoration: none;
-		font-size: 1rem;
-		transition: all 0.2s ease;
-		box-shadow: 0 1px 2px var(--shadow);
-	}
-
-	.ref-link:hover {
-		background: #fff8f5;
-		color: var(--accent);
-		box-shadow: 0 2px 6px rgba(217, 119, 87, 0.1);
-		transform: translateY(-1px);
 	}
 
 	.empty {
-		color: var(--text-secondary);
-		font-size: 0.9375rem;
 		margin-top: 1rem;
-		text-align: center;
 		padding: 2rem;
-		background: var(--surface);
-		border-radius: 0.75rem;
-		box-shadow: 0 1px 2px var(--shadow);
-	}
-
-	.category-name {
-		font-size: 0.75rem;
-		font-weight: 700;
-		text-transform: uppercase;
-		letter-spacing: 0.08em;
-		color: var(--accent);
-		margin: 1.25rem 0 0.5rem;
-		padding-left: 0.5rem;
-		border-left: 3px solid var(--accent);
 	}
 </style>
diff --git a/src/routes/catalog/+page.server.ts b/src/routes/catalog/+page.server.ts
index a3a611e..69a775a 100644
--- a/src/routes/catalog/+page.server.ts
+++ b/src/routes/catalog/+page.server.ts
@@ -1,52 +1,28 @@
 import { fail } from '@sveltejs/kit';
-import { db } from '$lib/server/db';
-import { groceries, categories, references } from '$lib/server/db/schema';
-import { eq, desc } from 'drizzle-orm';
+import { loadAll, toggle } from '$lib/server/services/groceries';
+import { numericId } from '$lib/server/services/validation';
+import type { EnrichedGrocery } from '$lib/server/services/groceries';
+import type { Category } from '$lib/server/services/types';
 import type { Actions, PageServerLoad } from './$types';
 
-export const load: PageServerLoad = async () => {
-	const [items, cats, refs] = await Promise.all([
-		db.select().from(groceries).orderBy(desc(groceries.createdAt)),
-		db.select().from(categories).orderBy(desc(categories.name)),
-		db.select().from(references).orderBy(desc(references.qualityScore)),
-	]);
-
-	const catMap = new Map(cats.map((c) => [c.id, c.name]));
-	const bestRef = new Map<number, (typeof refs)[number]>();
-	for (const ref of refs) {
-		if (!bestRef.has(ref.groceryId)) {
-			bestRef.set(ref.groceryId, ref);
-		}
-	}
+export interface CatalogOutput {
+	items: EnrichedGrocery[];
+	categories: Category[];
+}
 
-	return {
-		items: items.map((i) => ({
-			...i,
-			categoryName: i.categoryId ? (catMap.get(i.categoryId) ?? null) : null,
-			bestRef: bestRef.get(i.id) ?? null,
-		})),
-		categories: cats,
-	};
+export const load: PageServerLoad = async () => {
+	return loadAll();
 };
 
 export const actions: Actions = {
 	toggle: async ({ request }) => {
 		const data = await request.formData();
-		const id = Number(data.get('id'));
-
-		const [item] = await db
-			.select()
-			.from(groceries)
-			.where(eq(groceries.id, id));
-		if (!item) {
-			return fail(404, { error: 'Article introuvable' });
+		try {
+			const id = numericId(data.get('id'));
+			await toggle(id);
+		} catch {
+			return fail(400, { error: 'ID invalide' });
 		}
-
-		await db
-			.update(groceries)
-			.set({ checked: !item.checked })
-			.where(eq(groceries.id, id));
-
 		return { success: true };
 	},
 };
diff --git a/src/routes/catalog/+page.svelte b/src/routes/catalog/+page.svelte
index 0fda271..4b43c02 100644
--- a/src/routes/catalog/+page.svelte
+++ b/src/routes/catalog/+page.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-	import '../../app.css';
 	import { enhance } from '$app/forms';
 
 	let { data, form } = $props();
@@ -24,20 +23,26 @@
 			<h3 class="category-name">{cat}</h3>
 			<ul class="item-list">
 				{#each items as item (item.id)}
-					<li class="catalog-item">
-						<button name="id" value={item.id} type="submit">
+					<li class="item-row item-row--fixed">
+						<button
+							class="item-btn item-btn--grow"
+							name="id"
+							value={item.id}
+							type="submit"
+							aria-pressed={item.checked}
+						>
 							<span class="item-text">
 								<span class:checked={item.checked}>{item.name}</span>
 								{#if item.bestRef}
-											<span class="best-ref"
-												>{item.bestRef.reference}
-												{#if item.bestRef.price && item.bestRef.unit}
-													&nbsp;{item.bestRef.price.toFixed(2)} {item.bestRef.unit}
-												{/if}
-												{#if item.bestRef.qualityScore != null}
-													&nbsp;({item.bestRef.qualityScore}/100)
-												{/if}
-											</span>
+									<span class="best-ref"
+										>{item.bestRef.reference}
+										{#if item.bestRef.price && item.bestRef.unit}
+											&nbsp;{item.bestRef.price.toFixed(2)} {item.bestRef.unit}
+										{/if}
+										{#if item.bestRef.qualityScore != null}
+											&nbsp;({item.bestRef.qualityScore}/100)
+										{/if}
+									</span>
 								{/if}
 							</span>
 						</button>
@@ -50,114 +55,14 @@
 {/if}
 
 <style>
-	.item-list {
-		list-style: none;
-		display: flex;
-		flex-direction: column;
-		gap: 0.375rem;
-	}
-
-	.item-list li button {
-		width: 100%;
-		text-align: left;
-		padding: 0 0.875rem;
-		height: 100%;
-		border: none;
-		border-radius: 0.75rem;
-		background: var(--surface);
-		font-size: 1rem;
-		font-weight: 500;
-		display: flex;
-		align-items: center;
-		transition: all 0.2s ease;
-		box-shadow: 0 1px 2px var(--shadow);
-	}
-
-	.item-list li button:hover {
-		background: #fff8f5;
-		box-shadow: 0 2px 6px rgba(217, 119, 87, 0.1);
-		transform: translateY(-1px);
-	}
-
-	.catalog-item {
-		display: flex;
-		gap: 0.5rem;
-		align-items: center;
-		height: 2.75rem;
-	}
-
-	.catalog-item button:first-child {
-		flex-grow: 1;
-		width: auto;
-		display: flex;
-		align-items: center;
-		height: 100%;
-	}
-
-	.item-text {
-		display: flex;
-		flex-direction: column;
-		text-align: left;
-		line-height: 1.2;
-		gap: 0.0625rem;
-		overflow: hidden;
-	}
-
 	.checked {
 		text-decoration: line-through;
 		color: var(--text-secondary);
 		font-weight: 400;
 	}
 
-	.best-ref {
-		font-size: 0.75rem;
-		color: var(--text-secondary);
-		font-weight: 400;
-	}
-
-	.ref-link {
-		width: 2.75rem;
-		flex-shrink: 0;
-		height: 2.75rem;
-		aspect-ratio: 1;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		border-radius: 0.75rem;
-		background: var(--surface);
-		color: var(--text-secondary);
-		text-decoration: none;
-		font-size: 1rem;
-		transition: all 0.2s ease;
-		box-shadow: 0 1px 2px var(--shadow);
-	}
-
-	.ref-link:hover {
-		background: #fff8f5;
-		color: var(--accent);
-		box-shadow: 0 2px 6px rgba(217, 119, 87, 0.1);
-		transform: translateY(-1px);
-	}
-
 	.empty {
-		color: var(--text-secondary);
-		font-size: 0.9375rem;
 		margin-top: 1rem;
-		text-align: center;
 		padding: 2rem;
-		background: var(--surface);
-		border-radius: 0.75rem;
-		box-shadow: 0 1px 2px var(--shadow);
-	}
-
-	.category-name {
-		font-size: 0.75rem;
-		font-weight: 700;
-		text-transform: uppercase;
-		letter-spacing: 0.08em;
-		color: var(--accent);
-		margin: 1.25rem 0 0.5rem;
-		padding-left: 0.5rem;
-		border-left: 3px solid var(--accent);
 	}
 </style>
diff --git a/src/routes/categories/+page.server.ts b/src/routes/categories/+page.server.ts
index 7cedd98..ac53ca8 100644
--- a/src/routes/categories/+page.server.ts
+++ b/src/routes/categories/+page.server.ts
@@ -1,38 +1,38 @@
 import { fail } from '@sveltejs/kit';
-import { db } from '$lib/server/db';
-import { categories } from '$lib/server/db/schema';
-import { eq, asc } from 'drizzle-orm';
+import { loadAll, add, deleteCategory } from '$lib/server/services/categories';
+import { numericId, parseFormString } from '$lib/server/services/validation';
+import type { Category } from '$lib/server/services/types';
 import type { Actions, PageServerLoad } from './$types';
 
-export const load: PageServerLoad = async () => {
-	const items = await db
-		.select()
-		.from(categories)
-		.orderBy(asc(categories.name));
+export interface CategoriesOutput {
+	categories: Category[];
+}
 
-	return { categories: items };
+export const load: PageServerLoad = async () => {
+	return { categories: await loadAll() };
 };
 
 export const actions: Actions = {
 	add: async ({ request }) => {
 		const data = await request.formData();
-		const name = data.get('name')?.toString().trim();
+		const name = parseFormString(data.get('name'));
 
 		if (!name) {
 			return fail(400, { error: 'Le nom est requis' });
 		}
 
-		await db.insert(categories).values({ name });
-
+		await add(name);
 		return { success: true };
 	},
 
 	delete: async ({ request }) => {
 		const data = await request.formData();
-		const id = Number(data.get('id'));
-
-		await db.delete(categories).where(eq(categories.id, id));
-
+		try {
+			const id = numericId(data.get('id'));
+			await deleteCategory(id);
+		} catch {
+			return fail(400, { error: 'ID invalide' });
+		}
 		return { success: true };
 	},
 };
diff --git a/src/routes/categories/+page.svelte b/src/routes/categories/+page.svelte
index eab0219..41b40c5 100644
--- a/src/routes/categories/+page.svelte
+++ b/src/routes/categories/+page.svelte
@@ -1,15 +1,20 @@
 <script lang="ts">
-	import '../../app.css';
 	import { enhance } from '$app/forms';
 
 	let { data, form } = $props();
 	let name = $state('');
 </script>
 
-<form class="add-form" method="POST" action="?/add" use:enhance>
+<form
+	class="form-card form-card--compact"
+	method="POST"
+	action="?/add"
+	use:enhance
+>
 	<label>
-		<span class="label">Nouvelle catégorie</span>
+		<span class="form-label">Nouvelle catégorie</span>
 		<input
+			class="form-input"
 			type="text"
 			name="name"
 			bind:value={name}
@@ -17,7 +22,7 @@
 			autocomplete="off"
 		/>
 	</label>
-	<button type="submit">Ajouter</button>
+	<button class="btn-primary" type="submit">Ajouter</button>
 </form>
 
 {#if form?.error}
@@ -27,9 +32,15 @@
 <form method="POST" action="?/delete" use:enhance>
 	<ul class="item-list">
 		{#each data?.categories ?? [] as cat (cat.id)}
-			<li class="catalog-item">
+			<li class="item-row item-row--card">
 				<span class="cat-name">{cat.name}</span>
-				<button class="delete-btn" name="id" value={cat.id} type="submit">
+				<button
+					class="btn-ghost"
+					name="id"
+					value={cat.id}
+					type="submit"
+					aria-label="Supprimer"
+				>
 					&times;
 				</button>
 			</li>
@@ -42,136 +53,19 @@
 {/if}
 
 <style>
-	.add-form {
-		display: flex;
-		flex-direction: column;
-		gap: 0.5rem;
-		margin-bottom: 1.5rem;
-		padding: 1rem;
-		background: var(--surface);
-		border-radius: 0.75rem;
-		box-shadow: 0 1px 2px var(--shadow);
-	}
-
-	.add-form label {
-		display: flex;
-		flex-direction: column;
-		gap: 0.375rem;
-	}
-
-	.label {
-		font-size: 0.75rem;
-		font-weight: 700;
-		text-transform: uppercase;
-		letter-spacing: 0.06em;
-		color: var(--text-secondary);
-	}
-
-	input {
-		padding: 0.75rem 1rem;
-		border: 1.5px solid var(--border);
-		border-radius: 0.75rem;
-		font-size: 1rem;
-		font-family: inherit;
-		background: var(--bg);
-		transition: border-color 0.2s, box-shadow 0.2s;
-	}
-
-	input:focus {
-		outline: none;
-		border-color: var(--accent);
-		box-shadow: 0 0 0 3px rgba(217, 119, 87, 0.15);
-	}
-
-	.add-form button[type='submit'] {
-		padding: 0.75rem 1.5rem;
-		border: none;
-		border-radius: 0.75rem;
-		background: var(--accent);
-		color: #fff;
-		font-size: 0.9375rem;
-		font-weight: 500;
-		align-self: flex-start;
-		cursor: pointer;
-		transition: all 0.2s ease;
-		box-shadow: 0 1px 2px var(--shadow);
-	}
-
-	.add-form button[type='submit']:hover {
-		background: var(--accent-hover);
-		transform: translateY(-1px);
-		box-shadow: 0 4px 8px rgba(217, 119, 87, 0.2);
-	}
-
-	.error {
-		color: var(--danger);
-		font-size: 0.875rem;
-		margin-top: -0.25rem;
-		margin-bottom: 0.5rem;
-		padding: 0.5rem 0.75rem;
-		background: rgba(217, 83, 79, 0.08);
-		border-radius: 0.5rem;
-	}
-
-	.item-list {
-		list-style: none;
-		display: flex;
-		flex-direction: column;
-		gap: 0.375rem;
-	}
-
-	.catalog-item {
-		display: flex;
-		gap: 0.5rem;
-		align-items: center;
-		padding: 0.5rem 0.75rem;
-		background: var(--surface);
-		border-radius: 0.75rem;
-		box-shadow: 0 1px 2px var(--shadow);
-		transition: all 0.2s ease;
-	}
-
-	.catalog-item:hover {
-		box-shadow: 0 2px 6px var(--shadow);
-		transform: translateY(-1px);
-	}
-
 	.cat-name {
 		flex-grow: 1;
 		font-weight: 500;
 		color: var(--text);
 	}
 
-	.delete-btn {
-		border: none;
-		border-radius: 0.625rem;
-		background: transparent;
-		color: var(--text-secondary);
-		transition: all 0.2s ease;
-		width: 2rem;
-		aspect-ratio: 1;
-		padding: 0;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 1.25rem;
-		cursor: pointer;
-		flex-shrink: 0;
-	}
-
-	.delete-btn:hover {
-		background: rgba(217, 83, 79, 0.1);
-		color: var(--danger);
+	.error {
+		margin-top: -0.25rem;
+		margin-bottom: 0.5rem;
 	}
 
 	.empty {
-		color: var(--text-secondary);
-		font-size: 0.9375rem;
 		margin-top: 1rem;
-		text-align: center;
 		padding: 2rem;
-		background: var(--surface);
-		border-radius: 0.75rem;
-		box-shadow: 0 1px 2px var(--shadow);
 	}
 </style>
diff --git a/src/routes/grocery/[id]/+page.server.ts b/src/routes/grocery/[id]/+page.server.ts
index b19825a..3c3967a 100644
--- a/src/routes/grocery/[id]/+page.server.ts
+++ b/src/routes/grocery/[id]/+page.server.ts
@@ -1,11 +1,28 @@
 import { error, fail, redirect } from '@sveltejs/kit';
 import { db } from '$lib/server/db';
-import { groceries, categories, references } from '$lib/server/db/schema';
+import { groceries, categories } from '$lib/server/db/schema';
 import { eq } from 'drizzle-orm';
+import {
+	loadForGrocery,
+	add as addRef,
+	deleteReference,
+} from '$lib/server/services/references';
+import { deleteGrocery } from '$lib/server/services/groceries';
+import {
+	numericId,
+	parseFormString,
+	parseOptionalNumber,
+} from '$lib/server/services/validation';
+import type { Grocery, Reference } from '$lib/server/services/types';
 import type { Actions, PageServerLoad } from './$types';
 
+export interface GroceryDetailOutput {
+	item: Grocery & { categoryName: string | null };
+	references: Reference[];
+}
+
 export const load: PageServerLoad = async ({ params }) => {
-	const id = Number(params.id);
+	const id = numericId(params.id);
 
 	const [item] = await db.select().from(groceries).where(eq(groceries.id, id));
 	if (!item) throw error(404, 'Article introuvable');
@@ -17,10 +34,7 @@ export const load: PageServerLoad = async ({ params }) => {
 				.where(eq(categories.id, item.categoryId))
 		: [null];
 
-	const refs = await db
-		.select()
-		.from(references)
-		.where(eq(references.groceryId, id));
+	const refs = await loadForGrocery(id);
 
 	return {
 		item: {
@@ -34,38 +48,34 @@ export const load: PageServerLoad = async ({ params }) => {
 export const actions: Actions = {
 	add: async ({ request, params }) => {
 		const data = await request.formData();
-		const reference = data.get('reference')?.toString().trim();
-		const price = data.get('price')?.toString().trim();
-		const unit = data.get('unit')?.toString().trim();
-		const qualityScore = data.get('quality_score')?.toString().trim();
+		const groceryId = numericId(params.id);
+		const reference = parseFormString(data.get('reference'));
+		const price = parseOptionalNumber(data.get('price'));
+		const unit = parseFormString(data.get('unit'));
+		const qualityScore = parseOptionalNumber(data.get('quality_score'));
 
 		if (!reference) {
 			return fail(400, { error: 'La référence est requise' });
 		}
 
-		await db.insert(references).values({
-			groceryId: Number(params.id),
-			reference,
-			price: price ? Number(price) : null,
-			unit: unit || null,
-			qualityScore: qualityScore ? Number(qualityScore) : null,
-		});
-
+		await addRef(groceryId, reference, price, unit, qualityScore);
 		return { success: true };
 	},
 
 	delete: async ({ request }) => {
 		const data = await request.formData();
-		const id = Number(data.get('id'));
-
-		await db.delete(references).where(eq(references.id, id));
-
+		try {
+			const id = numericId(data.get('id'));
+			await deleteReference(id);
+		} catch {
+			return fail(400, { error: 'ID invalide' });
+		}
 		return { success: true };
 	},
 
 	deleteItem: async ({ params }) => {
-		await db.delete(groceries).where(eq(groceries.id, Number(params.id)));
-
+		const groceryId = numericId(params.id);
+		await deleteGrocery(groceryId);
 		throw redirect(303, '/');
 	},
 };
diff --git a/src/routes/grocery/[id]/+page.svelte b/src/routes/grocery/[id]/+page.svelte
index c3c3706..a49d037 100644
--- a/src/routes/grocery/[id]/+page.svelte
+++ b/src/routes/grocery/[id]/+page.svelte
@@ -1,7 +1,5 @@
 <script lang="ts">
-	import '../../../app.css';
 	import { enhance } from '$app/forms';
-	import { page } from '$app/stores';
 
 	let { data, form } = $props();
 	let reference = $state('');
@@ -20,10 +18,11 @@
 
 <h2>Références</h2>
 
-<form class="add-form" method="POST" action="?/add" use:enhance>
+<form class="form-card" method="POST" action="?/add" use:enhance>
 	<label>
-		<span class="label">Référence</span>
+		<span class="form-label">Référence</span>
 		<input
+			class="form-input"
 			type="text"
 			name="reference"
 			bind:value={reference}
@@ -33,8 +32,9 @@
 	</label>
 	<div class="ref-row">
 		<label>
-			<span class="label">Prix</span>
+			<span class="form-label">Prix</span>
 			<input
+				class="form-input"
 				type="number"
 				name="price"
 				bind:value={price}
@@ -43,16 +43,17 @@
 			/>
 		</label>
 		<label>
-			<span class="label">Unité</span>
-			<select name="unit" bind:value={unit}>
+			<span class="form-label">Unité</span>
+			<select class="form-select" name="unit" bind:value={unit}>
 				<option value="€/kg">€/kg</option>
 				<option value="€/L">€/L</option>
 				<option value="€/u">€/u</option>
 			</select>
 		</label>
 		<label>
-			<span class="label">Note</span>
+			<span class="form-label">Note</span>
 			<input
+				class="form-input"
 				type="number"
 				name="quality_score"
 				bind:value={qualityScore}
@@ -62,7 +63,7 @@
 			/>
 		</label>
 	</div>
-	<button type="submit">Ajouter une référence</button>
+	<button class="btn-primary" type="submit">Ajouter une référence</button>
 </form>
 
 {#if form?.error}
@@ -70,9 +71,9 @@
 {/if}
 
 <form method="POST" action="?/delete" use:enhance>
-	<ul class="item-list">
+	<ul class="item-list item-list--wide">
 		{#each data?.references ?? [] as ref (ref.id)}
-			<li class="ref-item">
+			<li class="item-row item-row--ref">
 				<div class="ref-info">
 					<strong>{ref.reference}</strong>
 					{#if ref.price}
@@ -84,7 +85,13 @@
 						<span class="ref-detail">Note : {ref.qualityScore}/100</span>
 					{/if}
 				</div>
-				<button class="delete-btn" name="id" value={ref.id} type="submit">
+				<button
+					class="btn-ghost"
+					name="id"
+					value={ref.id}
+					type="submit"
+					aria-label="Supprimer"
+				>
 					&times;
 				</button>
 			</li>
@@ -110,51 +117,6 @@
 		margin-top: 0.25rem;
 	}
 
-	.add-form {
-		display: flex;
-		flex-direction: column;
-		gap: 0.75rem;
-		margin-bottom: 1.5rem;
-		margin-top: 0.75rem;
-		padding: 1rem;
-		background: var(--surface);
-		border-radius: 0.75rem;
-		box-shadow: 0 1px 2px var(--shadow);
-	}
-
-	.add-form label {
-		display: flex;
-		flex-direction: column;
-		gap: 0.375rem;
-	}
-
-	.label {
-		font-size: 0.75rem;
-		font-weight: 700;
-		text-transform: uppercase;
-		letter-spacing: 0.06em;
-		color: var(--text-secondary);
-	}
-
-	input,
-	select {
-		padding: 0.75rem 1rem;
-		border: 1.5px solid var(--border);
-		border-radius: 0.75rem;
-		font-size: 1rem;
-		font-family: inherit;
-		background: var(--bg);
-		transition: border-color 0.2s, box-shadow 0.2s;
-		min-width: 0;
-	}
-
-	input:focus,
-	select:focus {
-		outline: none;
-		border-color: var(--accent);
-		box-shadow: 0 0 0 3px rgba(217, 119, 87, 0.15);
-	}
-
 	.ref-row {
 		display: flex;
 		gap: 0.75rem;
@@ -166,65 +128,6 @@
 		min-width: 6rem;
 	}
 
-	.add-form button[type='submit'] {
-		padding: 0.75rem 1.5rem;
-		border: none;
-		border-radius: 0.75rem;
-		background: var(--accent);
-		color: #fff;
-		font-size: 0.9375rem;
-		font-weight: 500;
-		align-self: flex-start;
-		cursor: pointer;
-		transition: all 0.2s ease;
-		box-shadow: 0 1px 2px var(--shadow);
-	}
-
-	.add-form button[type='submit']:hover {
-		background: var(--accent-hover);
-		transform: translateY(-1px);
-		box-shadow: 0 4px 8px rgba(217, 119, 87, 0.2);
-	}
-
-	.error {
-		color: var(--danger);
-		font-size: 0.875rem;
-		margin-top: -0.25rem;
-		margin-bottom: 0.5rem;
-		padding: 0.5rem 0.75rem;
-		background: rgba(217, 83, 79, 0.08);
-		border-radius: 0.5rem;
-	}
-
-	hr {
-		border: none;
-		border-top: 1.5px solid var(--border);
-		margin: 1.5rem 0;
-	}
-
-	.item-list {
-		list-style: none;
-		display: flex;
-		flex-direction: column;
-		gap: 0.5rem;
-	}
-
-	.ref-item {
-		display: flex;
-		align-items: center;
-		gap: 0.75rem;
-		padding: 0.875rem 1rem;
-		border-radius: 0.75rem;
-		background: var(--surface);
-		box-shadow: 0 1px 2px var(--shadow);
-		transition: all 0.2s ease;
-	}
-
-	.ref-item:hover {
-		box-shadow: 0 2px 6px var(--shadow);
-		transform: translateY(-1px);
-	}
-
 	.ref-info {
 		flex-grow: 1;
 		display: flex;
@@ -242,37 +145,20 @@
 		border-radius: 0.375rem;
 	}
 
-	.delete-btn {
-		flex-shrink: 0;
-		width: 2rem;
-		aspect-ratio: 1;
-		padding: 0;
-		border: none;
-		border-radius: 0.625rem;
-		background: transparent;
-		color: var(--text-secondary);
-		font-size: 1.25rem;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		cursor: pointer;
-		transition: all 0.2s ease;
-	}
-
-	.delete-btn:hover {
-		background: rgba(217, 83, 79, 0.1);
-		color: var(--danger);
+	.error {
+		margin-top: -0.25rem;
+		margin-bottom: 0.5rem;
 	}
 
 	.empty {
-		color: var(--text-secondary);
-		font-size: 0.9375rem;
 		margin-top: 0.75rem;
-		text-align: center;
 		padding: 1.5rem;
-		background: var(--surface);
-		border-radius: 0.75rem;
-		box-shadow: 0 1px 2px var(--shadow);
+	}
+
+	hr {
+		border: none;
+		border-top: 1.5px solid var(--border);
+		margin: 1.5rem 0;
 	}
 
 	.back-link {