update: hide empty claimed wishlists, move local wishlists, cleanup comments

Reviewed-on: #7

.gitignore

@@ -24,3 +24,6 @@ vite.config.ts.timestamp-*
 
 # Claude
 .claude
+
+# Infisical
+.infisical*

COOLIFY_DEPLOYMENT.md

@@ -1,84 +0,0 @@
-# Coolify Deployment
-
-## Prerequisites
-
-- Coolify instance
-- Git repository
-
-## Database Setup
-
-Choose one:
-
-**Option A: Docker Compose (Recommended)**
-- Database included in `docker-compose.coolify.yml`
-- Skip to step 2
-
-**Option B: Separate PostgreSQL Resource**
-1. Create PostgreSQL database in Coolify
-2. Note connection details
-
-## Deploy
-
-### Using Docker Compose (Recommended)
-
-1. Create application in Coolify
-2. Select Git repository
-3. Configure:
-   - Build Pack: Docker Compose
-   - File: `./docker-compose.coolify.yml`
-4. Assign domain to `app` service only (format: `http://yourdomain.com:3000`)
-5. Set environment variables:
-   - `AUTH_SECRET` (generate with `openssl rand -base64 32`)
-   - `AUTH_URL` (your domain with https)
-   - `POSTGRES_DATA_PATH` (optional, for custom database storage location)
-   - `GOOGLE_CLIENT_ID` (optional)
-   - `GOOGLE_CLIENT_SECRET` (optional)
-6. Deploy
-
-### Using Dockerfile
-
-1. Create application in Coolify
-2. Select Git repository
-3. Configure:
-   - Build Pack: Docker
-   - Port: `3000`
-4. Add domain
-5. Set environment variables:
-   - `DATABASE_URL`
-   - `AUTH_SECRET` (generate with `openssl rand -base64 32`)
-   - `AUTH_URL` (your domain with https)
-   - `GOOGLE_CLIENT_ID` (optional)
-   - `GOOGLE_CLIENT_SECRET` (optional)
-6. Deploy
-
-## After Deployment
-
-Run migrations:
-```bash
-# In Coolify terminal or SSH
-docker exec -it <container-name> bun run db:push
-```
-
-## Environment Variables
-
-Required:
-- `DATABASE_URL` - Connection string
-- `AUTH_SECRET` - Random secret
-- `AUTH_URL` - Your app URL
-- `AUTH_TRUST_HOST` - `true`
-
-Optional:
-- `GOOGLE_CLIENT_ID`
-- `GOOGLE_CLIENT_SECRET`
-- `POSTGRES_DATA_PATH` - Custom path for PostgreSQL data (Docker Compose only)
-  - Example: `/mnt/storage/wishlist/postgres`
-  - If not set, uses a Docker named volume
-  - Path must exist with proper permissions before deployment
-
-## Troubleshooting
-
-**Container crashes:** Check logs in Coolify dashboard
-
-**Database connection:** Verify `DATABASE_URL` format
-
-**Auth issues:** Check `AUTH_URL` matches your domain

README.md

@@ -2,6 +2,9 @@
 
 A wishlist application built with SvelteKit, Drizzle ORM, and PostgreSQL.
 
+![Dashboard](readme-assets/dashboard.png)
+![Creating a wishlist](readme-assets/create.png)
+
 ## Prerequisites
 
 - [Bun](https://bun.sh/)

docker-compose.coolify.yml

@@ -1,51 +0,0 @@
-# Coolify-optimized Docker Compose
-# Includes both app and database - database is only exposed internally
-
-services:
-  db:
-    image: postgres:16-alpine
-    environment:
-      POSTGRES_USER: ${POSTGRES_USER:-wishlistuser}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-wishlistpassword}
-      POSTGRES_DB: ${POSTGRES_DB:-wishlist}
-    volumes:
-      - type: bind
-        source: ${POSTGRES_DATA_PATH}
-        target: /var/lib/postgresql/data
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-wishlistuser} -d ${POSTGRES_DB:-wishlist}"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-    restart: unless-stopped
-    # NOTE: No ports exposed - only accessible internally by app service
-
-  app:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    environment:
-      # Coolify will inject these from Environment Variables
-      DATABASE_URL: postgresql://${POSTGRES_USER:-wishlistuser}:${POSTGRES_PASSWORD:-wishlistpassword}@db:5432/${POSTGRES_DB:-wishlist}
-      NODE_ENV: production
-      PORT: 3000
-      AUTH_SECRET: ${AUTH_SECRET}
-      AUTH_URL: ${AUTH_URL:-https://wish.rasmusq.com}
-      AUTH_TRUST_HOST: ${AUTH_TRUST_HOST:-true}
-      GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID:-}
-      GOOGLE_CLIENT_SECRET: ${GOOGLE_CLIENT_SECRET:-}
-    depends_on:
-      db:
-        condition: service_healthy
-    restart: unless-stopped
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.wishlist.rule=Host(`wish.rasmusq.com`)
-      - traefik.http.routers.wishlist.entryPoints=https
-      - traefik.http.routers.wishlist.tls=true
-      - traefik.http.routers.wishlist.tls.certresolver=letsencrypt
-      - traefik.http.services.wishlist.loadbalancer.server.port=3000
-      # Forward headers for Auth.js behind reverse proxy
-      - traefik.http.middlewares.wishlist-headers.headers.customrequestheaders.X-Forwarded-Proto=https
-      - traefik.http.middlewares.wishlist-headers.headers.customrequestheaders.X-Forwarded-Host=wish.rasmusq.com
-      - traefik.http.routers.wishlist.middlewares=wishlist-headers

docker-compose.dev.yml

@@ -0,0 +1,21 @@
+services:
+  database:
+    image: postgres:16-alpine
+    container_name: wishlist-postgres-test
+    restart: unless-stopped
+    ports:
+      - 5432:5432
+    environment:
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_DB: ${POSTGRES_DB}
+    volumes:
+      - db-data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+volumes:
+  db-data:

docker-compose.prod.yml

@@ -0,0 +1,61 @@
+services:
+  database:
+    image: postgres:16-alpine
+    container_name: wishlist-postgres
+    restart: unless-stopped
+    environment:
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_DB: ${POSTGRES_DB}
+    volumes:
+      - /mnt/HC_Volume_102830676/wishlist:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    networks:
+      - wishlist-net
+
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: wishlist-app
+    restart: unless-stopped
+    environment:
+      DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@database:5432/${POSTGRES_DB}
+      NODE_ENV: production
+      PORT: 3000
+      AUTH_SECRET: ${AUTH_SECRET}
+      AUTH_URL: ${AUTH_URL}
+      AUTH_TRUST_HOST: "true"
+      GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID:-}
+      GOOGLE_CLIENT_SECRET: ${GOOGLE_CLIENT_SECRET:-}
+      AUTHENTIK_CLIENT_ID: ${AUTHENTIK_CLIENT_ID:-}
+      AUTHENTIK_CLIENT_SECRET: ${AUTHENTIK_CLIENT_SECRET:-}
+      AUTHENTIK_ISSUER: ${AUTHENTIK_ISSUER:-}
+    depends_on:
+      database:
+        condition: service_healthy
+    networks:
+      - wishlist-net
+      - traefik-net
+    labels:
+      - traefik.enable=true
+      - traefik.docker.network=traefik-net
+      # HTTPS router
+      - traefik.http.routers.wishlist.rule=Host(`wish.rasmusq.com`)
+      - traefik.http.routers.wishlist.entrypoints=websecure
+      - traefik.http.routers.wishlist.tls.certresolver=letsencrypt
+      # Forward headers for Auth.js
+      - traefik.http.routers.wishlist.middlewares=wishlist-headers
+      - traefik.http.middlewares.wishlist-headers.headers.customRequestHeaders.X-Forwarded-Proto=https
+      - traefik.http.middlewares.wishlist-headers.headers.customRequestHeaders.X-Forwarded-Host=wish.rasmusq.com
+      - traefik.http.services.wishlist.loadbalancer.server.port=3000
+
+networks:
+  wishlist-net:
+    name: wishlist-net
+  traefik-net:
+    external: true

docker-compose.yml

@@ -1,41 +0,0 @@
-services:
-  db:
-    image: postgres:16-alpine
-    container_name: wishlist-db
-    environment:
-      POSTGRES_USER: wishlistuser
-      POSTGRES_PASSWORD: wishlistpassword
-      POSTGRES_DB: wishlist
-    ports:
-      - "5432:5432"
-    volumes:
-      - postgres_data:/var/lib/postgresql/data
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U wishlistuser -d wishlist"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-
-  app:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    container_name: wishlist-app
-    environment:
-      DATABASE_URL: postgresql://wishlistuser:wishlistpassword@db:5432/wishlist
-      NODE_ENV: production
-      PORT: 3000
-      AUTH_SECRET: ${AUTH_SECRET:-change-me-in-production}
-      AUTH_URL: ${AUTH_URL:-http://localhost:3000}
-      AUTH_TRUST_HOST: true
-      GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID:-}
-      GOOGLE_CLIENT_SECRET: ${GOOGLE_CLIENT_SECRET:-}
-    ports:
-      - "3000:3000"
-    depends_on:
-      db:
-        condition: service_healthy
-    restart: unless-stopped
-
-volumes:
-  postgres_data:

src/lib/components/dashboard/LocalWishlistsSection.svelte

@@ -21,11 +21,9 @@
 	let localWishlists = $state<LocalWishlist[]>([]);
 	let enrichedWishlists = $state<any[]>([]);
 
-	// Load local wishlists on mount and fetch their data from server
 	onMount(async () => {
 		localWishlists = getLocalWishlists();
 
-		// Fetch full wishlist data for each local wishlist
 		const promises = localWishlists.map(async (local) => {
 			try {
 				const response = await fetch(`/api/wishlist/${local.ownerToken}`);
@@ -39,7 +37,6 @@
 			} catch (error) {
 				console.error('Failed to fetch wishlist data:', error);
 			}
-			// Fallback to local data if fetch fails
 			return {
 				id: local.ownerToken,
 				title: local.title,

src/lib/components/layout/DashboardHeader.svelte

@@ -80,8 +80,8 @@
 	</div>
 	<div class="flex items-center gap-1 sm:gap-2 flex-shrink-0">
 		<ColorPicker bind:color={localColor} onchange={handleColorChange} size="sm" />
-		<ThemePicker value={dashboardTheme} onValueChange={handleThemeChange} />
+		<ThemePicker value={dashboardTheme} onValueChange={handleThemeChange} color={localColor} />
-		<LanguageToggle />
+		<LanguageToggle color={localColor} />
 		<ThemeToggle />
 		{#if isAuthenticated}
 			<Button variant="outline" onclick={() => signOut({ callbackUrl: '/' })}>{t.auth.signOut}</Button>

src/lib/components/layout/Navigation.svelte

@@ -7,10 +7,12 @@
 
 	let {
 		isAuthenticated = false,
-		showDashboardLink = false
+		showDashboardLink = false,
+		color = null
 	}: {
 		isAuthenticated?: boolean;
 		showDashboardLink?: boolean;
+		color?: string | null;
 	} = $props();
 
 	const t = $derived(languageStore.t);
@@ -28,7 +30,7 @@
 		</Button>
 	{/if}
 	<div class="ml-auto flex items-center gap-1 sm:gap-2">
-		<LanguageToggle />
+		<LanguageToggle {color} />
-		<ThemeToggle />
+		<ThemeToggle size="sm" {color} />
 	</div>
 </nav>

src/lib/components/themes/svgs/TopPattern.svelte

@@ -19,7 +19,6 @@
 		class="fixed top-0 right-0 left-0 pointer-events-none z-0"
 		style="
 			mask-image: url({patternPath});
-			-webkit-mask-image: url({patternPath});
 			mask-size: cover;
 			mask-repeat: no-repeat;
 			mask-position: right top;

src/lib/components/ui/ColorPicker.svelte

@@ -1,5 +1,6 @@
 <script lang="ts">
 	import { X, Pencil } from 'lucide-svelte';
+	import IconButton from './IconButton.svelte';
 
 	let {
 		color = $bindable(null),
@@ -39,17 +40,18 @@
 
 <div class="flex items-center gap-2">
 	{#if color}
-		<button
+		<IconButton
-			type="button"
 			onclick={clearColor}
-			class="{buttonSize} flex items-center justify-center rounded-full border border-input hover:bg-accent transition-colors"
+			{color}
+			{size}
 			aria-label="Clear color"
+			rounded="md"
 		>
 			<X class={iconSize} />
-		</button>
+		</IconButton>
 	{/if}
 	<label
-		class="{buttonSize} flex items-center justify-center rounded-full border border-input hover:opacity-90 transition-opacity cursor-pointer relative overflow-hidden"
+		class="{buttonSize} flex items-center justify-center rounded-md border border-input hover:opacity-90 transition-opacity cursor-pointer relative overflow-hidden"
 		style={color ? `background-color: ${color};` : ''}
 	>
 		<Pencil class="{iconSize} relative z-10 pointer-events-none" style={color ? 'color: white; filter: drop-shadow(0 0 2px rgba(0,0,0,0.5));' : ''} />

src/lib/components/ui/Dropdown.svelte

@@ -0,0 +1,133 @@
+<script lang="ts">
+	import { Button } from '$lib/components/ui/button';
+	import { scale } from 'svelte/transition';
+	import { cubicOut } from 'svelte/easing';
+	import type { Snippet } from 'svelte';
+    import IconButton from './IconButton.svelte';
+
+	let {
+		items,
+		selectedValue,
+		onSelect,
+		color,
+		showCheckmark = true,
+		icon,
+		ariaLabel
+	}: {
+		items: Array<{ value: string; label: string }>;
+		selectedValue: string;
+		onSelect: (value: string) => void;
+		color?: string | null;
+		showCheckmark?: boolean;
+		icon: Snippet;
+		ariaLabel: string;
+	} = $props();
+
+	let showMenu = $state(false);
+
+	const menuClasses = $derived(
+		color
+			? 'absolute left-0 sm:right-0 sm:left-auto mt-2 w-40 rounded-md border shadow-lg z-50 backdrop-blur-md'
+			: 'absolute left-0 sm:right-0 sm:left-auto mt-2 w-40 rounded-md border shadow-lg z-50 backdrop-blur-md border-slate-200 dark:border-slate-800 bg-white/90 dark:bg-slate-950/90'
+	);
+
+	const menuStyle = $derived(
+		color
+			? `border-color: ${color}; background-color: ${color}20; backdrop-filter: blur(12px);`
+			: ''
+	);
+
+	function getItemStyle(itemValue: string): string {
+		if (!color) return '';
+		return selectedValue === itemValue ? `background-color: ${color}20;` : '';
+	}
+
+	function toggleMenu() {
+		showMenu = !showMenu;
+	}
+
+	function handleSelect(value: string) {
+		onSelect(value);
+		showMenu = false;
+	}
+
+	function handleClickOutside(event: MouseEvent) {
+		const target = event.target as HTMLElement;
+		if (!target.closest('.dropdown-menu')) {
+			showMenu = false;
+		}
+	}
+
+	function handleMouseEnter(e: MouseEvent) {
+		if (color) {
+			(e.currentTarget as HTMLElement).style.backgroundColor = `${color}15`;
+		}
+	}
+
+	function handleMouseLeave(e: MouseEvent, itemValue: string) {
+		if (color) {
+			(e.currentTarget as HTMLElement).style.backgroundColor =
+				selectedValue === itemValue ? `${color}20` : 'transparent';
+		}
+	}
+
+	$effect(() => {
+		if (showMenu) {
+			document.addEventListener('click', handleClickOutside);
+			return () => document.removeEventListener('click', handleClickOutside);
+		}
+	});
+</script>
+
+<div class="relative dropdown-menu">
+	<IconButton
+		size="sm"
+		rounded="md"
+		onclick={toggleMenu}
+		aria-label={ariaLabel}
+		class={color ? 'hover-themed' : ''}
+		style={color ? `--hover-bg: ${color}20;` : ''}
+	>
+		{@render icon()}
+	</IconButton>
+
+	{#if showMenu}
+		<div
+			class={menuClasses}
+			style={menuStyle}
+			transition:scale={{ duration: 150, start: 0.95, opacity: 0, easing: cubicOut }}
+		>
+			<div class="py-1">
+				{#each items as item}
+					<button
+						type="button"
+						class="w-full text-left px-4 py-2 text-sm transition-colors"
+						class:hover:bg-slate-100={!color}
+						class:dark:hover:bg-slate-900={!color}
+						class:font-bold={selectedValue === item.value}
+						class:bg-slate-100={selectedValue === item.value && !color}
+						class:dark:bg-slate-900={selectedValue === item.value && !color}
+						class:flex={showCheckmark}
+						class:items-center={showCheckmark}
+						class:justify-between={showCheckmark}
+						style={getItemStyle(item.value)}
+						onmouseenter={handleMouseEnter}
+						onmouseleave={(e) => handleMouseLeave(e, item.value)}
+						onclick={() => handleSelect(item.value)}
+					>
+						<span>{item.label}</span>
+						{#if showCheckmark && selectedValue === item.value}
+							<span class="ml-2">✓</span>
+						{/if}
+					</button>
+				{/each}
+			</div>
+		</div>
+	{/if}
+</div>
+
+<style>
+	:global(.hover-themed:hover) {
+		background-color: var(--hover-bg) !important;
+	}
+</style>

src/lib/components/ui/IconButton.svelte

@@ -0,0 +1,52 @@
+<script lang="ts">
+	import type { Snippet } from 'svelte';
+	import type { HTMLButtonAttributes } from 'svelte/elements';
+
+	interface Props extends HTMLButtonAttributes {
+		color?: string | null;
+		rounded?: 'full' | 'md' | 'lg';
+		size?: 'sm' | 'md' | 'lg';
+		children: Snippet;
+	}
+
+	let {
+		color = null,
+		rounded = 'full',
+		size = 'md',
+		class: className = '',
+		children,
+		...restProps
+	}: Props = $props();
+
+	const sizeClasses = {
+		sm: 'w-8 h-8',
+		md: 'w-10 h-10',
+		lg: 'w-12 h-12'
+	};
+
+	const roundedClasses = {
+		full: 'rounded-full',
+		md: 'rounded-md',
+		lg: 'rounded-lg'
+	};
+
+	const baseClasses = 'flex items-center justify-center border border-input transition-colors backdrop-blur';
+	const sizeClass = sizeClasses[size];
+	const roundedClass = roundedClasses[rounded];
+</script>
+
+<button
+	type="button"
+	class="{baseClasses} {sizeClass} {roundedClass} {className} backdrop-blur-sm"
+	class:hover:bg-accent={!color}
+	style={color ? `--hover-bg: ${color}20;` : ''}
+	{...restProps}
+>
+	{@render children()}
+</button>
+
+<style>
+	button[style*='--hover-bg']:hover {
+		background-color: var(--hover-bg);
+	}
+</style>

src/lib/components/ui/language-toggle/LanguageToggle.svelte

@@ -1,58 +1,32 @@
 <script lang="ts">
 	import { languageStore } from '$lib/stores/language.svelte';
 	import { languages } from '$lib/i18n/translations';
-	import { Button } from '$lib/components/ui/button';
+	import Dropdown from '$lib/components/ui/Dropdown.svelte';
 	import { Languages } from 'lucide-svelte';
 
-	let showMenu = $state(false);
+	let { color }: { color?: string | null } = $props();
 
-	function toggleMenu() {
+	const languageItems = $derived(
-		showMenu = !showMenu;
+		languages.map((lang) => ({
+			value: lang.code,
+			label: lang.name
+		}))
+	);
+
+	function setLanguage(code: string) {
+		languageStore.setLanguage(code as 'en' | 'da');
 	}
-
-	function setLanguage(code: 'en' | 'da') {
-		languageStore.setLanguage(code);
-		showMenu = false;
-	}
-
-	function handleClickOutside(event: MouseEvent) {
-		const target = event.target as HTMLElement;
-		if (!target.closest('.language-toggle-menu')) {
-			showMenu = false;
-		}
-	}
-
-	$effect(() => {
-		if (showMenu) {
-			document.addEventListener('click', handleClickOutside);
-			return () => document.removeEventListener('click', handleClickOutside);
-		}
-	});
 </script>
 
-<div class="relative language-toggle-menu">
+<Dropdown
-	<Button variant="outline" size="icon" onclick={toggleMenu} aria-label="Toggle language">
+	items={languageItems}
+	selectedValue={languageStore.current}
+	onSelect={setLanguage}
+	{color}
+	showCheckmark={false}
+	ariaLabel="Toggle language"
+>
+	{#snippet icon()}
 		<Languages class="h-[1.2rem] w-[1.2rem]" />
-	</Button>
+	{/snippet}
-
+</Dropdown>
-	{#if showMenu}
-		<div
-			class="absolute left-0 sm:right-0 sm:left-auto mt-2 w-40 rounded-md border border-slate-200 dark:border-slate-800 bg-white dark:bg-slate-950 shadow-lg z-50"
-		>
-			<div class="py-1">
-				{#each languages as lang}
-					<button
-						type="button"
-						class="w-full text-left px-4 py-2 text-sm hover:bg-slate-100 dark:hover:bg-slate-900 transition-colors"
-						class:font-bold={languageStore.current === lang.code}
-						class:bg-slate-100={languageStore.current === lang.code}
-						class:dark:bg-slate-900={languageStore.current === lang.code}
-						onclick={() => setLanguage(lang.code)}
-					>
-						{lang.name}
-					</button>
-				{/each}
-			</div>
-		</div>
-	{/if}
-</div>

src/lib/components/ui/theme-picker.svelte

@@ -1,68 +1,35 @@
 <script lang="ts">
-	import { Button } from '$lib/components/ui/button';
+	import Dropdown from '$lib/components/ui/Dropdown.svelte';
 	import { Palette } from 'lucide-svelte';
 	import { AVAILABLE_THEMES } from '$lib/utils/themes';
 
 	let {
 		value = 'none',
-		onValueChange
+		onValueChange,
+		color
 	}: {
 		value?: string;
 		onValueChange: (theme: string) => void;
+		color?: string | null;
 	} = $props();
 
-	let showMenu = $state(false);
+	const themeItems = $derived(
-
+		Object.entries(AVAILABLE_THEMES).map(([key, theme]) => ({
-	function toggleMenu() {
+			value: key,
-		showMenu = !showMenu;
+			label: theme.name
-	}
+		}))
-
+	);
-	function handleSelect(themeName: string) {
-		onValueChange(themeName);
-		showMenu = false;
-	}
-
-	function handleClickOutside(event: MouseEvent) {
-		const target = event.target as HTMLElement;
-		if (!target.closest('.theme-picker-menu')) {
-			showMenu = false;
-		}
-	}
-
-	$effect(() => {
-		if (showMenu) {
-			document.addEventListener('click', handleClickOutside);
-			return () => document.removeEventListener('click', handleClickOutside);
-		}
-	});
 </script>
 
-<div class="relative theme-picker-menu">
+<Dropdown
-	<Button variant="outline" size="icon" onclick={toggleMenu} aria-label="Select theme pattern">
+	items={themeItems}
+	selectedValue={value}
+	onSelect={onValueChange}
+	{color}
+	showCheckmark={true}
+	ariaLabel="Select theme pattern"
+>
+	{#snippet icon()}
 		<Palette class="h-[1.2rem] w-[1.2rem]" />
-	</Button>
+	{/snippet}
-
+</Dropdown>
-	{#if showMenu}
-		<div
-			class="absolute left-0 sm:right-0 sm:left-auto mt-2 w-40 rounded-md border border-slate-200 dark:border-slate-800 bg-white dark:bg-slate-950 shadow-lg z-50"
-		>
-			<div class="py-1">
-				{#each Object.entries(AVAILABLE_THEMES) as [key, theme]}
-					<button
-						type="button"
-						class="w-full text-left px-4 py-2 text-sm hover:bg-slate-100 dark:hover:bg-slate-900 transition-colors flex items-center justify-between"
-						class:font-bold={value === key}
-						class:bg-slate-100={value === key}
-						class:dark:bg-slate-900={value === key}
-						onclick={() => handleSelect(key)}
-					>
-						<span>{theme.name}</span>
-						{#if value === key}
-							<span class="ml-2">✓</span>
-						{/if}
-					</button>
-				{/each}
-			</div>
-		</div>
-	{/if}
-</div>

src/lib/components/ui/theme-toggle/ThemeToggle.svelte

@@ -1,14 +1,22 @@
 <script lang="ts">
 	import { themeStore } from '$lib/stores/theme.svelte';
-	import { Button } from '$lib/components/ui/button';
 	import { Sun, Moon, Monitor } from 'lucide-svelte';
+    import IconButton from '../IconButton.svelte';
+
+	let {
+		color = $bindable(null),
+		size = 'sm',
+	}: {
+		color: string | null;
+		size?: 'sm' | 'md' | 'lg';
+	} = $props();
 
 	function toggle() {
 		themeStore.toggle();
 	}
 </script>
 
-<Button onclick={toggle} variant="ghost" size="icon" class="rounded-full">
+<IconButton onclick={toggle} {size} {color} rounded="md">
 	{#if themeStore.current === 'light'}
 		<Sun size={20} />
 		<span class="sr-only">Light mode (click for dark)</span>
@@ -19,4 +27,4 @@
 		<Monitor size={20} />
 		<span class="sr-only">System mode (click for light)</span>
 	{/if}
-</Button>
+</IconButton>

src/lib/components/wishlist/EditableItemsList.svelte

@@ -72,7 +72,7 @@
 		</div>
 	{:else}
 		<Card style={cardStyle} class="relative overflow-hidden">
-			<ThemeCard themeName={theme} color={wishlistColor} />
+			<ThemeCard themeName={theme} color={wishlistColor} showPattern={false} />
 			<CardContent class="p-12 relative z-10">
 				<EmptyState
 					message={t.wishlist.noWishes + ". " + t.wishlist.addFirstWish + "!"}

src/lib/components/wishlist/WishlistHeader.svelte

@@ -6,6 +6,7 @@
 	import { Pencil, Check, X } from "lucide-svelte";
 	import ColorPicker from "$lib/components/ui/ColorPicker.svelte";
 	import ThemePicker from "$lib/components/ui/theme-picker.svelte";
+	import IconButton from "$lib/components/ui/IconButton.svelte";
 	import type { Wishlist } from "$lib/server/schema";
 	import { languageStore } from '$lib/stores/language.svelte';
 	import { getCardStyle } from '$lib/utils/colors';
@@ -80,7 +81,6 @@
 	}
 </script>
 
-<!-- Title Header -->
 <div class="flex items-center justify-between gap-4 mb-6">
 	<div class="flex items-center gap-2 flex-1 min-w-0">
 		{#if editingTitle}
@@ -100,8 +100,7 @@
 		{:else}
 			<h1 class="text-3xl font-bold leading-[2.25rem]">{wishlistTitle}</h1>
 		{/if}
-		<button
+		<IconButton
-			type="button"
 			onclick={() => {
 				if (editingTitle) {
 					saveTitle();
@@ -109,7 +108,9 @@
 					editingTitle = true;
 				}
 			}}
-			class="shrink-0 w-8 h-8 flex items-center justify-center rounded-full border border-input hover:bg-accent transition-colors"
+			color={wishlistColor}
+			size="sm"
+			class="shrink-0"
 			aria-label={editingTitle ? "Save title" : "Edit title"}
 		>
 			{#if editingTitle}
@@ -117,7 +118,7 @@
 			{:else}
 				<Pencil class="w-4 h-4" />
 			{/if}
-		</button>
+		</IconButton>
 	</div>
 	<div class="flex items-center gap-2 shrink-0">
 		<ThemePicker
@@ -128,6 +129,7 @@
 				// Force reactivity by updating the wishlist object
 				wishlist.theme = theme;
 			}}
+			color={wishlistColor}
 		/>
 		<ColorPicker
 			bind:color={wishlistColor}
@@ -137,15 +139,12 @@
 	</div>
 </div>
 
-<!-- Settings Card -->
 <Card style={cardStyle}>
 	<CardContent class="pt-6 space-y-4">
-		<!-- Description -->
 		<div class="space-y-2">
 			<div class="flex items-center justify-between gap-2">
 				<Label for="wishlist-description">{t.form.descriptionOptional}</Label>
-				<button
+				<IconButton
-					type="button"
 					onclick={() => {
 						if (editingDescription) {
 							saveDescription();
@@ -153,7 +152,9 @@
 							editingDescription = true;
 						}
 					}}
-					class="flex-shrink-0 w-8 h-8 flex items-center justify-center rounded-full border border-input hover:bg-accent transition-colors"
+					color={wishlistColor}
+					size="sm"
+					class="flex-shrink-0"
 					aria-label={editingDescription ? "Save description" : "Edit description"}
 				>
 					{#if editingDescription}
@@ -161,7 +162,7 @@
 					{:else}
 						<Pencil class="w-4 h-4" />
 					{/if}
-				</button>
+				</IconButton>
 			</div>
 			{#if editingDescription}
 				<Textarea
@@ -184,19 +185,19 @@
 			{/if}
 		</div>
 
-		<!-- End Date -->
 		<div class="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-2 sm:gap-4">
 			<Label for="wishlist-end-date">{t.form.endDateOptional}</Label>
 			<div class="flex items-center gap-2">
 				{#if wishlistEndDate}
-					<button
+					<IconButton
-						type="button"
 						onclick={clearEndDate}
-						class="flex-shrink-0 w-8 h-8 flex items-center justify-center rounded-full border border-input hover:bg-accent transition-colors"
+						color={wishlistColor}
+						size="sm"
+						class="flex-shrink-0"
 						aria-label="Clear end date"
 					>
 						<X class="w-4 h-4" />
-					</button>
+					</IconButton>
 				{/if}
 				<Input
 					id="wishlist-end-date"

src/lib/components/wishlist/WishlistItem.svelte

@@ -57,7 +57,7 @@
 </script>
 
 <Card style={cardStyle} class="relative overflow-hidden">
-	<ThemeCard themeName={theme} color={item.color} />
+	<ThemeCard themeName={theme} color={item.color} showPattern={false} />
 	<CardContent class="p-6 relative z-10">
 		<div class="flex gap-4">
 			{#if showDragHandle}

src/lib/utils/localWishlists.ts

@@ -36,7 +36,6 @@ export function addLocalWishlist(wishlist: LocalWishlist): void {
 	try {
 		const wishlists = getLocalWishlists();
 
-		// Check if already exists
 		const exists = wishlists.some(w => w.ownerToken === wishlist.ownerToken);
 		if (exists) return;
 

src/routes/dashboard/+page.server.ts

@@ -147,7 +147,6 @@ export const actions: Actions = {
 			return { success: false, error: 'Wishlist ID is required' };
 		}
 
-		// Verify the user owns this wishlist
 		await db.delete(wishlists)
 			.where(and(
 				eq(wishlists.id, wishlistId),

src/routes/dashboard/+page.svelte

@@ -11,12 +11,10 @@
 
 	let { data }: { data: PageData } = $props();
 
-	// For anonymous users, get theme from localStorage
 	function getInitialTheme() {
 		if (data.isAuthenticated) {
 			return data.user?.dashboardTheme || 'none';
 		} else {
-			// Anonymous user - get from localStorage
 			if (typeof window !== 'undefined') {
 				return localStorage.getItem('dashboardTheme') || 'none';
 			}
@@ -24,12 +22,10 @@
 		}
 	}
 
-	// For anonymous users, get color from localStorage
 	function getInitialColor() {
 		if (data.isAuthenticated) {
 			return data.user?.dashboardColor || null;
 		} else {
-			// Anonymous user - get from localStorage
 			if (typeof window !== 'undefined') {
 				return localStorage.getItem('dashboardColor') || null;
 			}
@@ -40,7 +36,6 @@
 	let currentTheme = $state(getInitialTheme());
 	let currentColor = $state(getInitialColor());
 
-	// Save to localStorage when theme changes for anonymous users
 	function handleThemeUpdate(theme: string | null) {
 		currentTheme = theme || 'none';
 
@@ -49,7 +44,6 @@
 		}
 	}
 
-	// Save to localStorage when color changes for anonymous users
 	function handleColorUpdate(color: string | null) {
 		currentColor = color;
 
@@ -64,10 +58,8 @@
 
 	const t = $derived(languageStore.t);
 
-	// Only owned wishlists for "My Wishlists"
 	const myWishlists = $derived(() => data.wishlists || []);
 
-	// Claimed wishlists (those with ownerToken, meaning they were claimed via edit link)
 	const claimedWishlists = $derived(() => {
 		return (data.savedWishlists || [])
 			.filter(saved => saved.wishlist?.ownerToken)
@@ -79,7 +71,6 @@
 			}));
 	});
 
-	// Saved wishlists are those WITHOUT ownerToken (saved from public view only)
 	const savedWishlists = $derived(() => {
 		return (data.savedWishlists || []).filter(saved => !saved.wishlist?.ownerToken);
 	});
@@ -96,15 +87,7 @@
 		onColorUpdate={handleColorUpdate}
 	/>
 
-	<!-- Local Wishlists Section (for anonymous and authenticated users) -->
-	<LocalWishlistsSection
-		isAuthenticated={data.isAuthenticated}
-		fallbackColor={currentColor}
-		fallbackTheme={currentTheme}
-	/>
-
 	{#if data.isAuthenticated}
-		<!-- My Wishlists Section -->
 		<WishlistSection
 		title={t.dashboard.myWishlists}
 		description={t.dashboard.myWishlistsDescription}
@@ -162,7 +145,12 @@
 		{/snippet}
 	</WishlistSection>
 
-	<!-- Claimed Wishlists Section -->
+	<LocalWishlistsSection
+		isAuthenticated={data.isAuthenticated}
+		fallbackColor={currentColor}
+		fallbackTheme={currentTheme}
+	/>
+
 	<WishlistSection
 		title={t.dashboard.claimedWishlists}
 		description={t.dashboard.claimedWishlistsDescription}
@@ -219,7 +207,6 @@
 		{/snippet}
 	</WishlistSection>
 
-	<!-- Saved Wishlists Section -->
 	<WishlistSection
 		title={t.dashboard.savedWishlists}
 		description={t.dashboard.savedWishlistsDescription}
@@ -228,6 +215,7 @@
 		emptyDescription={t.dashboard.emptySavedWishlistsDescription}
 		fallbackColor={currentColor}
 		fallbackTheme={currentTheme}
+		hideIfEmpty={true}
 	>
 		{#snippet actions(saved, unlocked)}
 			<div class="flex gap-2 flex-wrap">

src/routes/wishlist/[token]/+page.svelte

@@ -38,6 +38,7 @@
 	<Navigation
 		isAuthenticated={data.isAuthenticated}
 		showDashboardLink={true}
+		color={data.wishlist.color}
 	/>
 
 	<Card style={headerCardStyle}>
@@ -124,7 +125,7 @@
 			</Card>
 		{:else}
 			<Card style={headerCardStyle} class="relative overflow-hidden">
-				<ThemeCard themeName={data.wishlist.theme} color={data.wishlist.color} />
+				<ThemeCard themeName={data.wishlist.theme} color={data.wishlist.color} showPattern={false} />
 				<CardContent class="p-12 relative z-10">
 					<EmptyState
 						message={t.wishlist.emptyWishes}

src/routes/wishlist/[token]/edit/+page.svelte

@@ -123,6 +123,7 @@
 	<Navigation
 		isAuthenticated={data.isAuthenticated}
 		showDashboardLink={true}
+		color={currentColor}
 	/>
 
 	<WishlistHeader