Redirect now directly to the event

Reviewed-on: #16

.github/copilot-instructions.md

@@ -1,11 +1,16 @@
 GitHub Copilot Instructions for This Repository
 
-Basics:
+Basics: These you need to really follow!
 - If you have any questions, always ask me first!
 - Use Svelte 5 runes exclusively
 - Declare reactive state with $state(); derive values with $derived(); run side-effect logic with $effect() etc. 
 - When doing client-side loading, always implement placeholders and loaders, so the UI remains responsive and layout shifts are minimized.
   - Don't use placeholders and loaders for static data like heading etc.
+- Never use supabse-js. I am using supabse-ssr and supabase client is located in:
+  - client: $props.data.supabse
+  - server: $locals.supabase
+- Avoid unnceessary iterations. Once the problem is solved, ask me if i want to to continue and only then continue iterating.
+- Avoid sweeping changes throught the project. If you want to change something globally, ask me first.
 
 Do not fall back to the legacy $: label syntax or Svelte 3/4 stores! This is important!
 

package-lock.json

@@ -11,6 +11,7 @@
 				"@supabase/ssr": "^0.6.1",
 				"@supabase/supabase-js": "^2.50.0",
 				"@sveltejs/adapter-node": "^5.2.12",
+				"@tanstack/svelte-query": "^5.83.0",
 				"googleapis": "^150.0.1",
 				"papaparse": "^5.5.3",
 				"qrcode": "^1.5.4",
@@ -1382,6 +1383,32 @@
 				"vite": "^5.2.0 || ^6"
 			}
 		},
+		"node_modules/@tanstack/query-core": {
+			"version": "5.83.0",
+			"resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.83.0.tgz",
+			"integrity": "sha512-0M8dA+amXUkyz5cVUm/B+zSk3xkQAcuXuz5/Q/LveT4ots2rBpPTZOzd7yJa2Utsf8D2Upl5KyjhHRY+9lB/XA==",
+			"license": "MIT",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/tannerlinsley"
+			}
+		},
+		"node_modules/@tanstack/svelte-query": {
+			"version": "5.83.0",
+			"resolved": "https://registry.npmjs.org/@tanstack/svelte-query/-/svelte-query-5.83.0.tgz",
+			"integrity": "sha512-8tNXhuoizntZXnAzo4yqUWgZZnklQkXGUNpb3YreW68DyCBhhrGbErnrODQs3fVc2ABcMvAHIki5uErbdzXH1A==",
+			"license": "MIT",
+			"dependencies": {
+				"@tanstack/query-core": "5.83.0"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/tannerlinsley"
+			},
+			"peerDependencies": {
+				"svelte": "^3.54.0 || ^4.0.0 || ^5.0.0"
+			}
+		},
 		"node_modules/@types/cookie": {
 			"version": "0.6.0",
 			"resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",

package.json

@@ -33,6 +33,7 @@
 		"@supabase/ssr": "^0.6.1",
 		"@supabase/supabase-js": "^2.50.0",
 		"@sveltejs/adapter-node": "^5.2.12",
+		"@tanstack/svelte-query": "^5.83.0",
 		"googleapis": "^150.0.1",
 		"papaparse": "^5.5.3",
 		"qrcode": "^1.5.4",

src/lib/components/ToastContainer.svelte

@@ -0,0 +1,25 @@
+<script lang="ts">
+  import { toast } from '$lib/stores/toast';
+  import ToastNotification from './ToastNotification.svelte';
+
+  // Subscribe to the toast store using Svelte 5 reactivity
+  let toasts = $derived($toast);
+
+  function handleDismiss(id: string) {
+    toast.remove(id);
+  }
+</script>
+
+<!-- Toast container positioned in top-left corner -->
+<div class="fixed top-4 p-2 space-y-3 pointer-events-none max-w-2xl">
+  {#each toasts as toastItem (toastItem.id)}
+    <div class="pointer-events-auto">
+      <ToastNotification
+        message={toastItem.message}
+        type={toastItem.type}
+        duration={toastItem.duration}
+        onDismiss={() => handleDismiss(toastItem.id)}
+      />
+    </div>
+  {/each}
+</div>

src/lib/components/ToastNotification.svelte

@@ -0,0 +1,115 @@
+<script lang="ts">
+  import { onMount } from 'svelte';
+
+  let { 
+    message, 
+    type = 'error',
+    duration = 5000,
+    onDismiss 
+  } = $props<{
+    message: string;
+    type?: 'error' | 'success' | 'warning' | 'info';
+    duration?: number;
+    onDismiss?: () => void;
+  }>();
+
+  let visible = $state(true);
+  let timeoutId: ReturnType<typeof setTimeout>;
+
+  // Auto-dismiss after specified duration
+  onMount(() => {
+    if (duration > 0) {
+      timeoutId = setTimeout(() => {
+        dismiss();
+      }, duration);
+    }
+
+    // Cleanup timeout on component destroy
+    return () => {
+      if (timeoutId) {
+        clearTimeout(timeoutId);
+      }
+    };
+  });
+
+  function dismiss() {
+    visible = false;
+    if (onDismiss) {
+      onDismiss();
+    }
+  }
+
+  // Get styles based on toast type
+  const getToastStyles = (type: string) => {
+    switch (type) {
+      case 'success':
+        return 'border-green-200 bg-green-50 text-green-800';
+      case 'warning':
+        return 'border-yellow-200 bg-yellow-50 text-yellow-800';
+      case 'info':
+        return 'border-blue-200 bg-blue-50 text-blue-800';
+      case 'error':
+      default:
+        return 'border-red-200 bg-red-50 text-red-800';
+    }
+  };
+
+  // Get icon SVG path based on toast type
+  const getIconSvg = (type: string) => {
+    switch (type) {
+      case 'success':
+        return `<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7" />`;
+      case 'warning':
+        return `<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-2.5L13.732 4c-.77-.833-2.694-.833-3.464 0L3.268 16c-.77.833.192 2.5 1.732 2.5z" />`;
+      case 'info':
+        return `<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />`;
+      case 'error':
+      default:
+        return `<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />`;
+    }
+  };
+</script>
+
+{#if visible && message}
+  <div 
+    class="rounded-lg border p-4 shadow-lg w-full {getToastStyles(type)}"
+    role="alert"
+    aria-live="polite"
+  >
+    <div class="flex items-start gap-3">
+      <!-- Icon -->
+      <div class="flex-shrink-0">
+        <svg 
+          class="h-5 w-5" 
+          xmlns="http://www.w3.org/2000/svg" 
+          fill="none" 
+          viewBox="0 0 24 24" 
+          stroke="currentColor"
+          aria-hidden="true"
+        >
+          {@html getIconSvg(type)}
+        </svg>
+      </div>
+      
+      <!-- Message -->
+      <div class="flex-1">
+        <p class="text-sm font-medium">
+          {message}
+        </p>
+      </div>
+      
+      <!-- Close button -->
+      <button
+        onclick={dismiss}
+        class="flex-shrink-0 ml-2 text-current opacity-70 hover:opacity-100 transition-opacity"
+        aria-label="Dismiss notification"
+      >
+        <svg class="h-4 w-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+        </svg>
+      </button>
+    </div>
+    
+    <!-- Toast has no progress bar as requested -->
+  </div>
+{/if}

src/lib/helpers.ts

@@ -0,0 +1,9 @@
+
+
+export const reactiveQueryArgs = <T>(cb: () => T) => {
+	const store = writable<T>();
+	$effect.pre(() => {
+		store.set(cb());
+	});
+	return store;
+};

src/lib/stores/toast.ts

@@ -0,0 +1,63 @@
+import { writable } from 'svelte/store';
+
+export interface Toast {
+  id: string;
+  message: string;
+  type: 'error' | 'success' | 'warning' | 'info';
+  duration?: number;
+}
+
+function createToastStore() {
+  const { subscribe, update } = writable<Toast[]>([]);
+
+  const store = {
+    subscribe,
+    
+    // Add a new toast
+    add: (toast: Omit<Toast, 'id'>) => {
+      const id = crypto.randomUUID();
+      const newToast: Toast = {
+        id,
+        duration: 5000, // Default 5 seconds
+        ...toast
+      };
+      
+      update(toasts => [...toasts, newToast]);
+      return id;
+    },
+    
+    // Remove a toast by ID
+    remove: (id: string) => {
+      update(toasts => toasts.filter(toast => toast.id !== id));
+    },
+    
+    // Clear all toasts
+    clear: () => {
+      update(() => []);
+    }
+  };
+
+  // Add convenience methods that reference the same store instance
+  return {
+    ...store,
+    
+    // Convenience methods for different toast types
+    success: (message: string, duration?: number) => {
+      return store.add({ message, type: 'success', duration });
+    },
+    
+    error: (message: string, duration?: number) => {
+      return store.add({ message, type: 'error', duration });
+    },
+    
+    warning: (message: string, duration?: number) => {
+      return store.add({ message, type: 'warning', duration });
+    },
+    
+    info: (message: string, duration?: number) => {
+      return store.add({ message, type: 'info', duration });
+    }
+  };
+}
+
+export const toast = createToastStore();

src/routes/private/+layout.svelte

@@ -1,21 +1,41 @@
 <script lang="ts">
-// Add any navbar logic here if needed
+	import { browser } from '$app/environment';
+	import { QueryClient, QueryClientProvider } from '@tanstack/svelte-query';
+	import ToastContainer from '$lib/components/ToastContainer.svelte';
+
+	const queryClient = new QueryClient({
+		defaultOptions: {
+			queries: {
+				enabled: browser,
+				staleTime: 5 * 60_000, // 5 min cache
+				refetchOnWindowFocus: false
+			}
+		}
+	});
 </script>
 
-<nav class="bg-gray-50 border-b border-gray-300 text-gray-900 p-2">
-    <div class="container max-w-2xl mx-auto p-2">
-        <div class="flex items-center justify-between">
-            <div class="font-bold text-lg">ScanWave</div>
+<nav class="border-b border-gray-300 bg-gray-50 p-2 text-gray-900">
+	<div class="container mx-auto max-w-2xl p-2">
+		<div class="flex items-center justify-between">
+			<div class="text-lg font-bold">ScanWave</div>
 
-            <ul class="flex space-x-4">
-                <li><a href="/private/home" class="hover:underline">Home</a></li>
-                <li><a href="/private/scanner" class="hover:underline">Scanner</a></li>
-                <li><a href="/private/events" class="hover:underline">Events</a></li>
-            </ul>
-        </div>
-    </div>
+			<ul class="flex space-x-4">
+				<li><a href="/private/home">Home</a></li>
+				<li><a href="/private/scanner">Scanner</a></li>
+				<li><a href="/private/events">Events</a></li>
+			</ul>
+		</div>
+	</div>
 </nav>
 
-<div class="container max-w-2xl mx-auto p-2 bg-white">
-    <slot />
+
+<div class="container mx-auto max-w-2xl bg-white p-2">
+	<QueryClientProvider client={queryClient}>
+		<slot />
+	</QueryClientProvider>
 </div>
+
+<ToastContainer />
+
+	
+

src/routes/private/api/google/gmail/+server.ts

@@ -16,6 +16,16 @@ interface EmailResult {
 	error?: string;
 }
 
+/**
+ * Replaces template variables in a string with participant data
+ * Currently supports {name} and {surname} placeholders
+ */
+function replaceTemplateVariables(template: string, participant: Participant): string {
+	return template
+		.replace(/{name}/gi, participant.name || '')
+		.replace(/{surname}/gi, participant.surname || '');
+}
+
 async function generateQRCode(participantId: string): Promise<string> {
 	const qrCodeBase64 = await QRCode.toDataURL(participantId, {
 		type: 'image/png',
@@ -38,11 +48,15 @@ async function sendEmailToParticipant(
 	try {
 		const qrCodeBase64Data = await generateQRCode(participant.id);
 
+		// Replace template variables in subject and body
+		const personalizedSubject = replaceTemplateVariables(subject, participant);
+		const personalizedText = replaceTemplateVariables(text, participant);
+
 		// Send email with QR code
 		await sendGmail(refreshToken, {
 			to: participant.email,
-			subject: subject,
-			text: text,
+			subject: personalizedSubject,
+			text: personalizedText,
 			qr_code: qrCodeBase64Data
 		});
 

src/routes/private/events/+page.svelte

@@ -1,150 +1,64 @@
 <script lang="ts">
-	import { onMount } from 'svelte';
 	import SingleEvent from './SingleEvent.svelte';
+	import { createQuery } from '@tanstack/svelte-query';
+	import { getEvents } from './queries';
+	import { writable } from 'svelte/store';
 
+	// Get Supabase client from props
 	let { data } = $props();
 
-	// Types
-	interface Event {
-		id: string;
-		name: string;
-		date: string;
-		archived: boolean; // Whether the event is from events_archived table
-	}
+	// Reactive state for search input and debounced search term
+	let searchInput = $state('');
+	let debouncedSearch = writable('');
+	let searchTimeout: ReturnType<typeof setTimeout>;
 
-	// State
-	let allEvents = $state<Event[]>([]); // All events from both tables
-	let displayEvents = $state<Event[]>([]); // Events to display (filtered by search)
-	let loading = $state(true);
-	let error = $state('');
-	let searchTerm = $state('');
-	let isSearching = $state(false);
-	let searchTimeout: ReturnType<typeof setTimeout> | null = null;
-
-	onMount(async () => {
-		await loadEvents();
-	});
-
-	async function loadEvents() {
-		loading = true;
-		error = '';
-		try {
-			// Fetch regular events
-			const { data: eventsData, error: eventsError } = await data.supabase
-				.from('events')
-				.select('id, name, date')
-				.order('date', { ascending: false });
-
-			if (eventsError) throw eventsError;
-
-			// Fetch archived events (limited to 20)
-			const { data: archivedEventsData, error: archivedError } = await data.supabase
-				.from('events_archived')
-				.select('id, name, date')
-				.order('date', { ascending: false })
-				.limit(20);
-
-			if (archivedError) throw archivedError;
-
-			// Merge both arrays, marking archived events
-			const regularEvents = (eventsData || []).map(event => ({ ...event, archived: false }));
-			const archivedEvents = (archivedEventsData || []).map(event => ({ ...event, archived: true }));
-			
-			// Sort all events by date (newest first)
-			const combined = [...regularEvents, ...archivedEvents];
-			
-			allEvents = combined;
-			displayEvents = allEvents;
-
-		} catch (err) {
-			console.error('Error loading events:', err);
-			error = 'Failed to load events';
-		} finally {
-			loading = false;
-		}
-	}
-
-	function formatDate(dateString: string) {
-		return new Date(dateString).toLocaleDateString('en-GB', {
-			day: '2-digit',
-			month: '2-digit',
-			year: 'numeric'
-		});
-	}
-
-	async function searchEvents(term: string) {
-		if (!term.trim()) {
-			displayEvents = allEvents;
-			return;
-		}
-
-		isSearching = true;
-		error = '';
-		
-		try {
-			// Search regular events
-			const { data: regularResults, error: regularError } = await data.supabase
-				.from('events')
-				.select('id, name, date')
-				.ilike('name', `%${term}%`)
-				.order('date', { ascending: false });
-
-			if (regularError) {
-				console.error('Regular events search error:', regularError);
-				throw regularError;
-			}
-
-			// Search archived events
-			const { data: archivedResults, error: archivedError } = await data.supabase
-				.from('events_archived')
-				.select('id, name, date')
-				.ilike('name', `%${term}%`)
-				.order('date', { ascending: false })
-				.limit(50);
-
-			if (archivedError) {
-				console.error('Archived events search error:', archivedError);
-				throw archivedError;
-			}
-
-			// Merge search results
-			const regularEvents = (regularResults || []).map(event => ({ ...event, archived: false }));
-			const archivedEvents = (archivedResults || []).map(event => ({ ...event, archived: true }));
-			
-			// Sort merged results by date (newest first)
-			const combined = [...regularEvents, ...archivedEvents];
-			combined.sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime());
-			
-			displayEvents = combined;
-
-		} catch (err) {
-			console.error('Error searching events:', err);
-		} finally {
-			isSearching = false;
-		}
-	}
-
-	// Handle search term changes
+	// Debounce the search input
 	function handleSearchInput() {
 		if (searchTimeout) {
 			clearTimeout(searchTimeout);
 		}
 		
 		searchTimeout = setTimeout(() => {
-			searchEvents(searchTerm);
+			debouncedSearch.set(searchInput);
 		}, 300);
 	}
 
+	const eventsQuery = $derived(
+		createQuery({
+			queryKey: ['refetch', $debouncedSearch],
+			queryFn: async () => getEvents(data.supabase, $debouncedSearch)
+		})
+	);
+
+	// Derived values for UI state
+	let isLoading = $derived($eventsQuery.isLoading || $eventsQuery.isFetching);
+	let displayEvents = $derived($eventsQuery.data || []);
+	let hasError = $derived(!!$eventsQuery.error);
+	let errorMessage = $derived($eventsQuery.error?.message);
+
+	// Format date helper function
+	function formatDate(dateString: string) {
+		const date = new Date(dateString);
+		return date.toLocaleDateString('en-GB', {
+			day: '2-digit',
+			month: '2-digit',
+			year: 'numeric'
+		});
+	}
+
+	// Clear search function
 	function clearSearch() {
-		searchTerm = '';
-		displayEvents = allEvents;
+		searchInput = '';
+		debouncedSearch.set('');
 	}
 </script>
 
-<h1 class="text-2xl font-bold mb-4 mt-2 text-center">All Events</h1>
+<h1 class="mt-2 mb-4 text-center text-2xl font-bold">
+	{$debouncedSearch ? `Search Results: "${$debouncedSearch}"` : 'All Events'}
+</h1>
 
-<div class="grid grid-cols-1 md:grid-cols-2 gap-4 max-w-2xl mx-auto">
-	{#if loading}
+<div class="grid grid-cols-1 md:grid-cols-2 gap-4 max-w-2xl mx-auto mb-10">
+	{#if isLoading}
 		<!-- Loading placeholders -->
 		{#each Array(4) as _}
 			<div class="block border border-gray-300 rounded bg-white p-4 min-h-[72px]">
@@ -154,15 +68,9 @@
 				</div>
 			</div>
 		{/each}
-	{:else if error}
+	{:else if hasError}
 		<div class="col-span-full text-center py-8">
-			<p class="text-red-600">{error}</p>
-			<button
-				onclick={loadEvents}
-				class="mt-2 px-4 py-2 bg-blue-600 text-white rounded hover:bg-blue-700"
-			>
-				Try Again
-			</button>
+			<p class="text-red-600">{errorMessage}</p>
 		</div>
 	{:else if displayEvents.length === 0}
 		<div class="col-span-full text-center py-8">
@@ -181,38 +89,70 @@
 </div>
 
 <!-- Bottom actions - Mobile optimized -->
-<div class="fixed bottom-0 left-0 right-0 z-50 bg-white border-t border-gray-300 shadow-lg pb-safe">
+<div class="pb-safe fixed right-0 bottom-0 left-0 z-50 border-t border-gray-300 bg-white">
 	<!-- Search bar and New Event button layout -->
-	<div class="max-w-2xl mx-auto px-4 py-3 flex flex-col sm:flex-row gap-3 sm:items-center">
+	<div class="mx-auto flex max-w-2xl flex-col gap-3 px-4 py-3 sm:flex-row sm:items-center">
 		<!-- Search bar - Full width on mobile, adaptive on desktop -->
 		<div class="relative flex-grow">
 			<input
 				type="text"
-				bind:value={searchTerm}
+				bind:value={searchInput}
 				oninput={handleSearchInput}
 				placeholder="Search events..."
-				class="w-full pl-10 pr-10 py-2.5 rounded-lg border border-gray-300 text-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
+				class="w-full rounded-lg border border-gray-300 py-2.5 pr-10 pl-10 text-sm focus:border-transparent focus:ring-2 focus:ring-blue-500 focus:outline-none"
 			/>
-			<div class="absolute left-3 top-1/2 -translate-y-1/2">
-				{#if isSearching}
-					<svg class="animate-spin h-4 w-4 text-gray-400" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
-						<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
-						<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+			<div class="absolute top-1/2 left-3 -translate-y-1/2">
+				{#if isLoading}
+					<svg
+						class="h-4 w-4 animate-spin text-gray-400"
+						xmlns="http://www.w3.org/2000/svg"
+						fill="none"
+						viewBox="0 0 24 24"
+					>
+						<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"
+						></circle>
+						<path
+							class="opacity-75"
+							fill="currentColor"
+							d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
+						></path>
 					</svg>
 				{:else}
-					<svg class="h-4 w-4 text-gray-400" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-						<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
+					<svg
+						class="h-4 w-4 text-gray-400"
+						xmlns="http://www.w3.org/2000/svg"
+						fill="none"
+						viewBox="0 0 24 24"
+						stroke="currentColor"
+					>
+						<path
+							stroke-linecap="round"
+							stroke-linejoin="round"
+							stroke-width="2"
+							d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"
+						/>
 					</svg>
 				{/if}
 			</div>
-			{#if searchTerm}
+			{#if searchInput}
 				<button
 					onclick={clearSearch}
-					class="absolute right-3 top-1/2 -translate-y-1/2 text-gray-400 hover:text-gray-600"
+					class="absolute top-1/2 right-3 -translate-y-1/2 text-gray-400 hover:text-gray-600"
 					aria-label="Clear search"
 				>
-					<svg class="h-4 w-4" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-						<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+					<svg
+						class="h-4 w-4"
+						xmlns="http://www.w3.org/2000/svg"
+						fill="none"
+						viewBox="0 0 24 24"
+						stroke="currentColor"
+					>
+						<path
+							stroke-linecap="round"
+							stroke-linejoin="round"
+							stroke-width="2"
+							d="M6 18L18 6M6 6l12 12"
+						/>
 					</svg>
 				</button>
 			{/if}
@@ -221,11 +161,22 @@
 		<!-- New Event button - Adaptive width -->
 		<a
 			href="/private/events/event/new"
-			class="bg-blue-600 hover:bg-blue-700 text-white font-bold py-2.5 px-6 rounded-lg transition text-center whitespace-nowrap sm:flex-shrink-0"
+			class="rounded-lg bg-blue-600 px-6 py-2.5 text-center font-bold whitespace-nowrap text-white transition hover:bg-blue-700 sm:flex-shrink-0"
 		>
 			<span class="flex items-center justify-center gap-2">
-				<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-					<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4v16m8-8H4" />
+				<svg
+					xmlns="http://www.w3.org/2000/svg"
+					class="h-5 w-5"
+					fill="none"
+					viewBox="0 0 24 24"
+					stroke="currentColor"
+				>
+					<path
+						stroke-linecap="round"
+						stroke-linejoin="round"
+						stroke-width="2"
+						d="M12 4v16m8-8H4"
+					/>
 				</svg>
 				New Event
 			</span>

src/routes/private/events/event/new/+page.svelte

@@ -3,6 +3,7 @@
 	import { isTokenValid, getUserInfo, revokeToken } from '$lib/google/auth/client.js';
 	import type { GoogleSheet } from '$lib/google/sheets/types.ts';
 	import { goto } from '$app/navigation';
+	import { toast } from '$lib/stores/toast.js';
 
 	// Import Components
 	import GoogleAuthStep from './components/GoogleAuthStep.svelte';
@@ -41,7 +42,7 @@
 		selectedSheet: null as GoogleSheet | null,
 		sheetData: [] as string[][],
 		columnMapping: {
-			name: 0,  // Initialize to 0 (no column selected)
+			name: 0, // Initialize to 0 (no column selected)
 			surname: 0,
 			email: 0,
 			confirmation: 0
@@ -110,8 +111,9 @@
 				'/auth/google',
 				'google-auth',
 				'width=500,height=600,scrollbars=yes,resizable=yes,left=' +
-				Math.round(window.screen.width / 2 - 250) + ',top=' + 
-				Math.round(window.screen.height / 2 - 300)
+					Math.round(window.screen.width / 2 - 250) +
+					',top=' +
+					Math.round(window.screen.height / 2 - 300)
 			);
 
 			if (!popup) {
@@ -189,7 +191,6 @@
 					cleanUp();
 				}
 			}, 60 * 1000); // Reduced from 3min to 1min
-
 		} catch (error) {
 			console.error('Error connecting to Google:', error);
 			authData.error = 'Failed to connect to Google';
@@ -259,23 +260,32 @@
 	}
 
 	function validateCurrentStep(): boolean {
+		// Clear previous errors
 		errors = {};
+		let isValid = true;
 
 		if (currentStep === 0) {
 			if (!authData.isConnected) {
+				toast.error('Please connect your Google account to continue');
 				errors.auth = 'Please connect your Google account to continue';
 				return false;
 			}
 		} else if (currentStep === 1) {
 			if (!eventData.name.trim()) {
+				toast.error('Event name is required');
 				errors.name = 'Event name is required';
+				isValid = false;
 			}
 			if (!eventData.date) {
+				toast.error('Event date is required');
 				errors.date = 'Event date is required';
+				isValid = false;
 			}
 		} else if (currentStep === 2) {
 			if (!sheetsData.selectedSheet) {
+				toast.error('Please select a Google Sheet');
 				errors.sheet = 'Please select a Google Sheet';
+				isValid = false;
 			}
 
 			if (sheetsData.selectedSheet) {
@@ -289,19 +299,26 @@
 				if (!confirmation) missingColumns.push('Confirmation');
 
 				if (missingColumns.length > 0) {
-					errors.sheetData = `Please map the following columns: ${missingColumns.join(', ')}`;
+					const errorMsg = `Please map the following columns: ${missingColumns.join(', ')}`;
+					toast.error(errorMsg);
+					errors.sheetData = errorMsg;
+					isValid = false;
 				}
 			}
 		} else if (currentStep === 3) {
 			if (!emailData.subject.trim()) {
+				toast.error('Email subject is required');
 				errors.subject = 'Email subject is required';
+				isValid = false;
 			}
 			if (!emailData.body.trim()) {
+				toast.error('Email body is required');
 				errors.body = 'Email body is required';
+				isValid = false;
 			}
 		}
 
-		return Object.keys(errors).length === 0;
+		return isValid;
 	}
 
 	// Google Sheets functions
@@ -315,7 +332,7 @@
 			const response = await fetch('/private/api/google/sheets/recent', {
 				method: 'GET',
 				headers: {
-					'Authorization': `Bearer ${localStorage.getItem('google_refresh_token')}`
+					Authorization: `Bearer ${localStorage.getItem('google_refresh_token')}`
 				}
 			});
 
@@ -346,7 +363,7 @@
 			const response = await fetch(`/private/api/google/sheets/${sheet.id}/data`, {
 				method: 'GET',
 				headers: {
-					'Authorization': `Bearer ${localStorage.getItem('google_refresh_token')}`
+					Authorization: `Bearer ${localStorage.getItem('google_refresh_token')}`
 				}
 			});
 
@@ -367,13 +384,26 @@
 		sheetsData.expandedSheetList = !sheetsData.expandedSheetList;
 	}
 
+	// Reset sheet selection and show sheet list
+	function resetSheetSelection() {
+		sheetsData.selectedSheet = null;
+		sheetsData.sheetData = [];
+		sheetsData.columnMapping = {
+			name: 0,
+			surname: 0,
+			email: 0,
+			confirmation: 0
+		};
+		sheetsData.expandedSheetList = true;
+	}
+
 	// Final submission
 	async function createEvent() {
 		if (!validateCurrentStep()) return;
 
 		loading = true;
 		try {
-			const { error } = await data.supabase.rpc('create_event', {
+			const { data: newEvent, error } = await data.supabase.rpc('create_event', {
 				p_name: eventData.name,
 				p_date: eventData.date,
 				p_email_subject: emailData.subject,
@@ -387,11 +417,19 @@
 
 			if (error) throw error;
 
-			// Redirect to events list or show success message
-			goto('/private/events');
+			// Display success message
+			toast.success(`Event "${eventData.name}" was created successfully`);
+
+			// Redirect to the event view page using the returned event ID
+			if (newEvent) {
+				goto(`/private/events/event/view?id=${newEvent.id}`);
+			} else {
+				// Fallback to events list if for some reason the event ID wasn't returned
+				goto('/private/events');
+			}
 		} catch (error) {
 			console.error('Error creating event:', error);
-			errors.submit = 'Failed to create event. Please try again.';
+			toast.error('Failed to create event. Please try again.');
 		} finally {
 			loading = false;
 		}
@@ -410,49 +448,46 @@
 	});
 </script>
 
-<div class="max-w-4xl mx-auto p-6">
-	<!-- Header -->
-	<StepNavigator {currentStep} {totalSteps} />
+<!-- Header -->
+<StepNavigator {currentStep} {totalSteps} />
 
-	<!-- Step Content -->
-	<div class="rounded-lg border border-gray-300 bg-white p-6 mb-4">
-		{#if currentStep === 0}
-			<GoogleAuthStep 
-				bind:errors
-				onSuccess={(token) => {
-					authData.error = null;
-					authData.token = token;
-					authData.isConnected = true;
-					setTimeout(checkGoogleAuth, 100);
-				}}
-				onError={(error) => {
-					authData.error = error;
-					authData.isConnected = false;
-				}}
-			/>
-		{:else if currentStep === 1}
-			<EventDetailsStep bind:eventData bind:errors />
-		{:else if currentStep === 2}
-			<GoogleSheetsStep bind:sheetsData bind:errors {loadRecentSheets} {selectSheet} {toggleSheetList} />
-		{:else if currentStep === 3}
-			<EmailSettingsStep bind:emailData bind:errors />
-		{/if}
-
-		{#if errors.submit}
-			<div class="mt-4 p-3 bg-red-50 border border-red-200 rounded">
-				<p class="text-sm text-red-600">{errors.submit}</p>
-			</div>
-		{/if}
-	</div>
-
-	<!-- Navigation -->
-	<StepNavigation 
-		{currentStep} 
-		{totalSteps} 
-		{canProceed} 
-		{loading} 
-		{prevStep} 
-		{nextStep} 
-		{createEvent} 
-	/>
+<!-- Step Content -->
+<div class="mb-4 rounded border border-gray-300 bg-white p-6">
+	{#if currentStep === 0}
+		<GoogleAuthStep
+			onSuccess={(token) => {
+				authData.error = null;
+				authData.token = token;
+				authData.isConnected = true;
+				setTimeout(checkGoogleAuth, 100);
+			}}
+			onError={(error) => {
+				authData.error = error;
+				authData.isConnected = false;
+			}}
+		/>
+	{:else if currentStep === 1}
+		<EventDetailsStep bind:eventData />
+	{:else if currentStep === 2}
+		<GoogleSheetsStep
+			bind:sheetsData
+			{loadRecentSheets}
+			{selectSheet}
+			{toggleSheetList}
+			{resetSheetSelection}
+		/>
+	{:else if currentStep === 3}
+		<EmailSettingsStep bind:emailData />
+	{/if}
 </div>
+
+<!-- Navigation -->
+<StepNavigation
+	{currentStep}
+	{totalSteps}
+	{canProceed}
+	{loading}
+	{prevStep}
+	{nextStep}
+	{createEvent}
+/>

src/routes/private/events/event/new/components/EmailSettingsStep.svelte

@@ -1,43 +1,67 @@
 <script lang="ts">
-	let { emailData = $bindable(), errors = $bindable() } = $props<{
+	let { emailData = $bindable() } = $props<{
 		emailData: {
 			subject: string;
 			body: string;
 		};
-		errors: Record<string, string>;
 	}>();
+
+	const templateVariables = [
+		{ name: '{name}', description: "Participant's first name" },
+		{ name: '{surname}', description: "Participant's last name" }
+	];
+
+	const subjectTemplatesDetected = $derived(
+		templateVariables.filter((v) => emailData.subject && emailData.subject.includes(v.name))
+	);
+	const bodyTemplatesDetected = $derived(
+		templateVariables.filter((v) => emailData.body && emailData.body.includes(v.name))
+	);
 </script>
 
 <div class="space-y-6">
 	<div>
-		<label for="emailSubject" class="block text-sm font-medium text-gray-700 mb-2">
+		<label for="emailSubject" class="mb-2 block text-sm font-medium text-gray-700">
 			Email Subject *
 		</label>
 		<input
 			id="emailSubject"
 			type="text"
 			bind:value={emailData.subject}
-			class="w-full px-3 py-2 border border-gray-300 rounded focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
+			class="w-full rounded border border-gray-300 px-3 py-2 focus:border-transparent focus:ring-2 focus:ring-blue-500 focus:outline-none"
 			placeholder="Event invitation subject"
 		/>
-		{#if errors.subject}
-			<p class="mt-1 text-sm text-red-600">{errors.subject}</p>
+		{#if subjectTemplatesDetected.length > 0}
+			<p class="mt-1 text-xs text-gray-500">
+				Detected templates: {subjectTemplatesDetected.map((v) => v.name).join(', ')}
+			</p>
 		{/if}
 	</div>
 
 	<div>
-		<label for="emailBody" class="block text-sm font-medium text-gray-700 mb-2">
+		<label for="emailBody" class="mb-2 block text-sm font-medium text-gray-700">
 			Email Body *
 		</label>
 		<textarea
 			id="emailBody"
 			bind:value={emailData.body}
 			rows="8"
-			class="w-full px-3 py-2 border border-gray-300 rounded focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
+			class="w-full rounded border border-gray-300 px-3 py-2 focus:border-transparent focus:ring-2 focus:ring-blue-500 focus:outline-none"
 			placeholder="Email message content..."
 		></textarea>
-		{#if errors.body}
-			<p class="mt-1 text-sm text-red-600">{errors.body}</p>
+		{#if bodyTemplatesDetected.length > 0}
+			<p class="text-xs text-gray-500">
+				Detected templates: {bodyTemplatesDetected.map((v) => v.name).join(', ')}
+			</p>
 		{/if}
 	</div>
+
+	<div>
+		<p class="mt-2 mb-2 block text-sm font-medium text-gray-700">Tip:</p>
+		<p class="text-xs text-gray-500">
+			Use <code class="rounded bg-gray-100 px-1 py-0.5 text-xs">&#123;name&#125;</code> and
+			<code class="rounded bg-gray-100 px-1 py-0.5 text-xs">&#123;surname&#125;</code> to personalize
+			your message. Works for both subject and body. (e.g., "Hello &#123;name&#125;, welcome to our event!")
+		</p>
+	</div>
 </div>

src/routes/private/events/event/new/components/EventDetailsStep.svelte

@@ -1,10 +1,9 @@
 <script lang="ts">
-	let { eventData = $bindable(), errors = $bindable() } = $props<{
+	let { eventData = $bindable() } = $props<{
 		eventData: {
 			name: string;
 			date: string;
 		};
-		errors: Record<string, string>;
 	}>();
 </script>
 
@@ -22,9 +21,6 @@
 			class="w-full px-3 py-2 border border-gray-300 rounded focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
 			placeholder="Enter event name"
 		/>
-		{#if errors.name}
-			<p class="mt-1 text-sm text-red-600">{errors.name}</p>
-		{/if}
 	</div>
 
 	<div>
@@ -37,8 +33,5 @@
 			bind:value={eventData.date}
 			class="w-full px-3 py-2 border border-gray-300 rounded focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
 		/>
-		{#if errors.date}
-			<p class="mt-1 text-sm text-red-600">{errors.date}</p>
-		{/if}
 	</div>
 </div>

src/routes/private/events/event/new/components/GoogleAuthStep.svelte

@@ -2,8 +2,7 @@
 	import GoogleAuthButton from '$lib/components/GoogleAuthButton.svelte';
 
 	// Props
-	let { errors, onSuccess, onError } = $props<{
-		errors: Record<string, string>;
+	let { onSuccess, onError } = $props<{
 		onSuccess?: (token: string) => void;
 		onError?: (error: string) => void;
 	}>();
@@ -22,11 +21,5 @@
 				onSuccess={onSuccess}
 				onError={onError}
 			/>
-
-		{#if errors.google}
-			<div class="mt-4 text-sm text-red-600">
-				{errors.google}
-			</div>
-		{/if}
 	</div>
 </div>

src/routes/private/events/event/new/components/GoogleSheetsStep.svelte

@@ -2,7 +2,7 @@
 	import type { GoogleSheet } from '$lib/google/sheets/types.ts';
 	
 	// Props
-	let { sheetsData = $bindable(), errors = $bindable(), loadRecentSheets, selectSheet, toggleSheetList } = $props<{
+	let { sheetsData = $bindable(), loadRecentSheets, selectSheet, toggleSheetList, resetSheetSelection } = $props<{
 		sheetsData: {
 			availableSheets: GoogleSheet[];
 			selectedSheet: GoogleSheet | null;
@@ -16,10 +16,10 @@
 			loading: boolean;
 			expandedSheetList: boolean;
 		};
-		errors: Record<string, string>;
 		loadRecentSheets: () => Promise<void>;
 		selectSheet: (sheet: GoogleSheet) => Promise<void>;
 		toggleSheetList: () => void;
+		resetSheetSelection: () => void;
 	}>();
 	
 	// Search functionality
@@ -124,13 +124,13 @@
 							</div>
 						</div>
 						<button
-							onclick={toggleSheetList}
+							onclick={resetSheetSelection}
 							class="text-blue-600 hover:text-blue-800 flex items-center"
-							aria-label="Show all sheets"
+							aria-label="Reset selection and show all sheets"
 						>
 							<span class="text-sm mr-1">Change</span>
 							<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" viewBox="0 0 20 20" fill="currentColor">
-								<path fill-rule="evenodd" d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z" clip-rule="evenodd" />
+								<path fill-rule="evenodd" d="M4 2a1 1 0 011 1v2.101a7.002 7.002 0 0111.601 2.566 1 1 0 11-1.885.666A5.002 5.002 0 005.999 7H9a1 1 0 010 2H4a1 1 0 01-1-1V3a1 1 0 011-1zm.008 9.057a1 1 0 011.276.61A5.002 5.002 0 0014.001 13H11a1 1 0 110-2h5a1 1 0 011 1v5a1 1 0 11-2 0v-2.101a7.002 7.002 0 01-11.601-2.566 1 1 0 01.61-1.276z" clip-rule="evenodd"/>
 							</svg>
 						</button>
 					</div>
@@ -256,10 +256,6 @@
 				{/if}
 			</div>
 		{/if}
-
-		{#if errors.sheet}
-			<p class="mt-2 text-sm text-red-600">{errors.sheet}</p>
-		{/if}
 	</div>
 
 	{#if sheetsData.selectedSheet && sheetsData.sheetData.length > 0}
@@ -373,10 +369,6 @@
 			<div class="text-gray-600">Loading sheet data...</div>
 		</div>
 	{/if}
-
-	{#if errors.sheetData}
-		<p class="text-sm text-red-600">{errors.sheetData}</p>
-	{/if}
 </div>
 
 

src/routes/private/events/event/new/components/StepNavigator.svelte

@@ -6,7 +6,7 @@
 	}>();
 </script>
 
-<div class="mb-8">
+<div class="mb-8 mt-6">
     <div class="flex items-center justify-center gap-4 w-full">
 		{#each Array(totalSteps) as _, index}
 			<div class="flex items-center gap-2">

src/routes/private/events/event/view/+page.svelte

@@ -9,8 +9,9 @@
 	import ParticipantsTable from './components/ParticipantsTable.svelte';
 	import EmailSending from './components/EmailSending.svelte';
 	import EmailResults from './components/EmailResults.svelte';
-	import ErrorMessage from './components/ErrorMessage.svelte';
 	import Statistics from './components/Statistics.svelte';
+	import ToastContainer from '$lib/components/ToastContainer.svelte';
+	import { toast } from '$lib/stores/toast.js';
 
 	let { data } = $props();
 
@@ -49,7 +50,6 @@
 	let sendingEmails = $state(false);
 	let emailProgress = $state({ sent: 0, total: 0 });
 	let emailResults = $state<{success: boolean, results: any[], summary: any} | null>(null);
-	let error = $state('');
 
 	// Get event ID from URL params
 	let eventId = $derived(page.url.searchParams.get('id'));
@@ -74,7 +74,10 @@
 			event = eventData;
 		} catch (err) {
 			console.error('Error loading event:', err);
-			error = 'Failed to load event';
+			toast.add({
+				message: 'Failed to load event',
+				type: 'error'
+			});
 		} finally {
 			loading = false;
 		}
@@ -95,7 +98,10 @@
 			participants = participantsData || [];
 		} catch (err) {
 			console.error('Error loading participants:', err);
-			error = 'Failed to load participants';
+			toast.add({
+				message: 'Failed to load participants',
+				type: 'error'
+			});
 		} finally {
 			participantsLoading = false;
 		}
@@ -107,12 +113,14 @@
 		// Check if user has Google authentication
 		const refreshToken = localStorage.getItem('google_refresh_token');
 		if (!refreshToken) {
-			error = 'Please connect your Google account first to sync participants';
+			toast.add({
+				message: 'Please connect your Google account first to sync participants',
+				type: 'error'
+			});
 			return;
 		}
 
 		syncingParticipants = true;
-		error = '';
 		try {
 			// Fetch sheet data
 			const response = await fetch(`/private/api/google/sheets/${event.sheet_id}/data`, {
@@ -177,7 +185,10 @@
 			await loadParticipants();
 		} catch (err) {
 			console.error('Error syncing participants:', err);
-			error = 'Failed to sync participants';
+			toast.add({
+				message: 'Failed to sync participants',
+				type: 'error'
+			});
 		} finally {
 			syncingParticipants = false;
 		}
@@ -189,20 +200,25 @@
 		// Check if user has Google authentication
 		const refreshToken = localStorage.getItem('google_refresh_token');
 		if (!refreshToken) {
-			error = 'Please connect your Google account first to send emails';
+			toast.add({
+				message: 'Please connect your Google account first to send emails',
+				type: 'error'
+			});
 			return;
 		}
 
 		const uncontactedParticipants = participants.filter(p => !p.email_sent);
 		if (uncontactedParticipants.length === 0) {
-			error = 'No uncontacted participants found';
+			toast.add({
+				message: 'No uncontacted participants found',
+				type: 'warning'
+			});
 			return;
 		}
 
 		sendingEmails = true;
 		emailProgress = { sent: 0, total: uncontactedParticipants.length };
 		emailResults = null;
-		error = '';
 
 		try {
 			// Send all emails in batch
@@ -235,33 +251,40 @@
 				});
 			} else {
 				const errorData = await response.json();
-				error = errorData.error || 'Failed to send emails';
+				toast.add({
+					message: errorData.error || 'Failed to send emails',
+					type: 'error'
+				});
 				console.error('Email sending failed:', errorData);
 			}
 		} catch (err) {
 			console.error('Error sending emails:', err);
-			error = 'Failed to send emails to participants';
+			toast.add({
+				message: 'Failed to send emails to participants',
+				type: 'error'
+			});
 		} finally {
 			sendingEmails = false;
 		}
 	}
 
 	function handleGoogleAuthSuccess() {
-		error = '';
+		// Success handled by toast in the component
 	}
 	
 	function handleGoogleAuthError(errorMsg: string) {
-		error = errorMsg;
+		toast.add({
+			message: errorMsg,
+			type: 'error'
+		});
 	}
 </script>
 
-<!-- Header -->
 <div class="mt-2 mb-4">
 	<h1 class="text-center text-2xl font-bold">Event Overview</h1>
 </div>
 
-<!-- Composable components -->
-<EventInformation {event} {loading} {error} />
+<EventInformation {event} {loading} />
 
 <GoogleAuthentication 
 	{loading} 
@@ -303,7 +326,3 @@ onSyncParticipants={syncParticipants}
 {#if emailResults}
 	<EmailResults {emailResults} />
 {/if}
-
-{#if error}
-	<ErrorMessage {error} />
-{/if}

src/routes/private/events/event/view/components/ErrorMessage.svelte

@@ -1,11 +1,127 @@
 <script lang="ts">
-  let { error } = $props<{
-    error: string;
+  import { onMount } from 'svelte';
+
+  let { 
+    message, 
+    type = 'error',
+    duration = 50000,
+    onDismiss 
+  } = $props<{
+    message: string;
+    type?: 'error' | 'success' | 'warning' | 'info';
+    duration?: number;
+    onDismiss?: () => void;
   }>();
+
+  let visible = $state(true);
+  let timeoutId: ReturnType<typeof setTimeout>;
+
+  // Auto-dismiss after specified duration
+  onMount(() => {
+    if (duration > 0) {
+      timeoutId = setTimeout(() => {
+        dismiss();
+      }, duration);
+    }
+
+    // Cleanup timeout on component destroy
+    return () => {
+      if (timeoutId) {
+        clearTimeout(timeoutId);
+      }
+    };
+  });
+
+  function dismiss() {
+    visible = false;
+    if (onDismiss) {
+      onDismiss();
+    }
+  }
+
+  // Get styles based on toast type
+  const getToastStyles = (type: string) => {
+    switch (type) {
+      case 'success':
+        return 'border-green-200 bg-green-50 text-green-800';
+      case 'warning':
+        return 'border-yellow-200 bg-yellow-50 text-yellow-800';
+      case 'info':
+        return 'border-blue-200 bg-blue-50 text-blue-800';
+      case 'error':
+      default:
+        return 'border-red-200 bg-red-50 text-red-800';
+    }
+  };
+
+  // Get icon based on toast type
+  const getIcon = (type: string) => {
+    switch (type) {
+      case 'success':
+        return '✓';
+      case 'warning':
+        return '⚠';
+      case 'info':
+        return 'ℹ';
+      case 'error':
+      default:
+        return '✕';
+    }
+  };
 </script>
 
-{#if error}
-  <div class="mt-4 rounded border border-red-200 bg-red-50 p-3">
-    <p class="text-sm text-red-600">{error}</p>
+{#if visible && message}
+  <div 
+    class="fixed top-4 left-4 z-50 max-w-sm rounded-lg border p-4 shadow-lg transition-all duration-300 ease-in-out {getToastStyles(type)}"
+    role="alert"
+    aria-live="polite"
+  >
+    <div class="flex items-start gap-3">
+      <!-- Icon -->
+      <div class="flex-shrink-0">
+        <span class="text-lg font-semibold" aria-hidden="true">
+          {getIcon(type)}
+        </span>
+      </div>
+      
+      <!-- Message -->
+      <div class="flex-1">
+        <p class="text-sm font-medium">
+          {message}
+        </p>
+      </div>
+      
+      <!-- Close button -->
+      <button
+        onclick={dismiss}
+        class="flex-shrink-0 ml-2 text-current opacity-70 hover:opacity-100 transition-opacity"
+        aria-label="Dismiss notification"
+      >
+        <svg class="h-4 w-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+        </svg>
+      </button>
+    </div>
+    
+    <!-- Progress bar for auto-dismiss -->
+    {#if duration > 0}
+      <div class="mt-2 h-1 w-full bg-black bg-opacity-10 rounded-full overflow-hidden">
+        <div 
+          class="h-full bg-current opacity-30 transition-all ease-linear"
+          style="animation: progress {duration}ms linear forwards;"
+        ></div>
+      </div>
+    {/if}
   </div>
 {/if}
+
+<style>
+  @keyframes progress {
+    from {
+      width: 100%;
+    }
+    to {
+      width: 0%;
+    }
+  }
+</style>

src/routes/private/events/event/view/components/EventInformation.svelte

@@ -6,10 +6,9 @@
     sheet_id: string;
   }
 
-  let { event, loading, error } = $props<{
+  let { event, loading } = $props<{
     event: Event | null;
     loading: boolean;
-    error: string;
   }>();
 
   function formatDate(dateString: string) {
@@ -80,9 +79,9 @@
         </div>
       </div>
     </div>
-  {:else if error}
+  {:else}
     <div class="py-8 text-center">
-      <p class="text-red-600">{error}</p>
+      <p class="text-gray-600">No event information available</p>
     </div>
   {/if}
 </div>

src/routes/private/events/event/view/components/ToastNotification.svelte

@@ -0,0 +1,105 @@
+<script lang="ts">
+  import { onMount } from 'svelte';
+
+  let { 
+    message, 
+    type = 'error',
+    duration = 5000,
+    onDismiss 
+  } = $props<{
+    message: string;
+    type?: 'error' | 'success' | 'warning' | 'info';
+    duration?: number;
+    onDismiss?: () => void;
+  }>();
+
+  let visible = $state(true);
+  let timeoutId: ReturnType<typeof setTimeout>;
+
+  // Auto-dismiss after specified duration
+  onMount(() => {
+    if (duration > 0) {
+      timeoutId = setTimeout(() => {
+        dismiss();
+      }, duration);
+    }
+
+    // Cleanup timeout on component destroy
+    return () => {
+      if (timeoutId) {
+        clearTimeout(timeoutId);
+      }
+    };
+  });
+
+  function dismiss() {
+    visible = false;
+    if (onDismiss) {
+      onDismiss();
+    }
+  }
+
+  // Get styles based on toast type
+  const getToastStyles = (type: string) => {
+    const baseStyles = "fixed top-4 left-4 z-50 p-4 rounded-lg shadow-lg border max-w-sm";
+    
+    switch (type) {
+      case 'success':
+        return `${baseStyles} bg-green-50 border-green-200 text-green-800`;
+      case 'warning':
+        return `${baseStyles} bg-yellow-50 border-yellow-200 text-yellow-800`;
+      case 'info':
+        return `${baseStyles} bg-blue-50 border-blue-200 text-blue-800`;
+      case 'error':
+      default:
+        return `${baseStyles} bg-red-50 border-red-200 text-red-800`;
+    }
+  };
+
+  const getIconSvg = (type: string) => {
+    switch (type) {
+      case 'success':
+        return `<path stroke-linecap="round" stroke-linejoin="round" d="M5 13l4 4L19 7" />`;
+      case 'warning':
+        return `<path stroke-linecap="round" stroke-linejoin="round" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-2.5L13.732 4c-.77-.833-1.964-.833-2.732 0L3.732 16c-.77.833.192 2.5 1.732 2.5z" />`;
+      case 'info':
+        return `<path stroke-linecap="round" stroke-linejoin="round" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />`;
+      case 'error':
+      default:
+        return `<path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />`;
+    }
+  };
+</script>
+
+{#if visible}
+  <div class={getToastStyles(type)} role="alert">
+    <div class="flex items-start gap-3">
+      <!-- Icon -->
+      <svg 
+        class="h-5 w-5 flex-shrink-0 mt-0.5" 
+        fill="none" 
+        stroke="currentColor" 
+        stroke-width="2" 
+        viewBox="0 0 24 24"
+      >
+        {@html getIconSvg(type)}
+      </svg>
+      
+      <!-- Message -->
+      <div class="flex-1">
+        <p class="text-sm font-medium">{message}</p>
+      </div>
+      
+      <!-- Close button -->
+      <button
+        onclick={dismiss}
+        class="flex-shrink-0 text-gray-400 hover:text-gray-600 transition-colors"
+        aria-label="Dismiss notification"
+      >
+        <svg class="h-4 w-4" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">
+          <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
+        </svg>
+      </button>
+    </div>
+  </div>
+{/if}

src/routes/private/events/queries.ts

@@ -0,0 +1,71 @@
+import type { SupabaseClient } from '@supabase/supabase-js';
+
+export interface Event {
+    id: string;
+    name: string;
+    date: string;
+    archived: boolean;
+}
+
+/**
+ * Unified function to get events or search events based on a search term
+ * @param supabase The Supabase client
+ * @param searchTerm Optional search term - if provided, will filter by name
+ * @returns Combined array of regular and archived events
+ */
+export async function getEvents(supabase: SupabaseClient, searchTerm: string = '') {
+    try {
+        const searchPattern = searchTerm.trim() ? `%${searchTerm}%` : null;
+        
+        // Build regular events query
+        let regularQuery = supabase
+            .from('events')
+            .select('id, name, date')
+            .order('date', { ascending: false });
+            
+        // Apply search filter if needed
+        if (searchPattern) {
+            regularQuery = regularQuery.ilike('name', searchPattern);
+        }
+            
+        // Fetch regular events
+        const { data: regularEvents, error: regularError } = await regularQuery;
+
+        if (regularError) throw regularError;
+
+        // Build archived events query
+        let archivedQuery = supabase
+            .from('events_archived')
+            .select('id, name, date')
+            .order('date', { ascending: false })
+            .limit(searchPattern ? 50 : 20); // Fetch more when searching
+            
+        // Apply search filter if needed
+        if (searchPattern) {
+            archivedQuery = archivedQuery.ilike('name', searchPattern);
+        }
+        
+        // Fetch archived events
+        const { data: archivedEvents, error: archivedError } = await archivedQuery;
+            
+        if (archivedError) throw archivedError;
+
+        // Merge both arrays, marking archived events
+        const regularMapped = (regularEvents || []).map((event) => ({ ...event, archived: false }));
+        const archivedMapped = (archivedEvents || []).map((event) => ({
+            ...event,
+            archived: true
+        }));
+
+        // Sort all events by date (newest first)
+        const combined = [...regularMapped, ...archivedMapped];
+        combined.sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime());
+
+        return combined;
+    } catch (error) {
+        console.error('Error fetching events:', error);
+        throw new Error(searchTerm.trim() 
+            ? `Failed to search events for "${searchTerm}"` 
+            : 'Failed to load events');
+    }
+}

src/routes/private/scanner/TicketDisplay.svelte

@@ -15,7 +15,7 @@
 	}
 </script>
 
-<div class="border border-gray-300 rounded-lg overflow-hidden h-[200px]">
+<div class="border border-gray-300 rounded-lg overflow-hidden h-[200px] mb-4">
 	<div class="h-full flex flex-col">
 		{#if scan_state === ScanState.scanning}
 			<div class="bg-gray-50 p-4 flex-1 flex flex-col justify-center items-center">

src/routes/setup/+page.svelte

@@ -1 +0,0 @@
-<p>setup</p>