From c23de036c76c0f8ed094906379888bcd7d3abd5e Mon Sep 17 00:00:00 2001
From: Josh Creek <8179928+jcreek@users.noreply.github.com>
Date: Wed, 30 Oct 2024 18:48:11 +0000
Subject: [PATCH 1/8] feat(#60): Clear basket on sign out

---
 src/lib/components/SignOut.svelte | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/lib/components/SignOut.svelte b/src/lib/components/SignOut.svelte
index a4cc2bf..a78de4e 100644
--- a/src/lib/components/SignOut.svelte
+++ b/src/lib/components/SignOut.svelte
@@ -1,5 +1,7 @@
 <script lang="ts">
 	import { createEventDispatcher } from 'svelte';
+	import { basket, type Basket, type Item } from '$lib/stores/basket.js';
+
 	const dispatch = createEventDispatcher();
 
 	function emitSignedOutEvent() {
@@ -9,10 +11,23 @@
 	// Access the supabase client from the layout data
 	export let supabase: any;
 
+	let localBasket: Basket;
+	const unsubscribe = basket.subscribe((value) => {
+		localBasket = value;
+	});
+
 	async function signOut() {
 		// TODO use the error from the response
 		const { error } = await supabase.auth.signOut().then(() => {
 			emitSignedOutEvent();
+
+			// Clear the basket
+			localBasket = { items: [], subtotal: 0 };
+			basket.set(localBasket);
+			unsubscribe();
+			if (typeof localStorage !== 'undefined') {
+				localStorage.removeItem('basket');
+			}
 		});
 	}
 </script>

From 67b748b88e6cdabde67c206398565a679c96dbfa Mon Sep 17 00:00:00 2001
From: Josh Creek <8179928+jcreek@users.noreply.github.com>
Date: Wed, 30 Oct 2024 18:48:27 +0000
Subject: [PATCH 2/8] chore(*): Remove redundant sign out button

---
 src/routes/account/+page.server.ts | 20 ++++++++------------
 src/routes/account/+page.svelte    | 14 --------------
 2 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/src/routes/account/+page.server.ts b/src/routes/account/+page.server.ts
index d839775..3585154 100644
--- a/src/routes/account/+page.server.ts
+++ b/src/routes/account/+page.server.ts
@@ -27,27 +27,23 @@ export const actions: Actions = {
 		if (!session) {
 			return fail(401, { name });
 		}
-		const { error } = await supabase.from('users').update({
-			name: name,
-		}).eq('id', session?.user.id);
+		const { error } = await supabase
+			.from('users')
+			.update({
+				name: name
+			})
+			.eq('id', session?.user.id);
 
 		console.error(error);
 
 		if (error) {
 			return fail(500, {
-				name,
+				name
 			});
 		}
 
 		return {
-			name,
+			name
 		};
-	},
-	signout: async ({ locals: { supabase, safeGetSession } }) => {
-		const { session } = await safeGetSession();
-		if (session) {
-			await supabase.auth.signOut();
-			redirect(303, '/');
-		}
 	}
 };
diff --git a/src/routes/account/+page.svelte b/src/routes/account/+page.svelte
index d133724..ce63282 100644
--- a/src/routes/account/+page.svelte
+++ b/src/routes/account/+page.svelte
@@ -18,14 +18,6 @@
 			loading = false;
 		};
 	};
-
-	const handleSignOut: SubmitFunction = () => {
-		loading = true;
-		return async ({ update }) => {
-			loading = false;
-			update();
-		};
-	};
 </script>
 
 <div class="form-widget">
@@ -50,10 +42,4 @@
 			/>
 		</div>
 	</form>
-
-	<form method="post" action="?/signout" use:enhance={handleSignOut}>
-		<div>
-			<button class="button block" disabled={loading}>Sign Out</button>
-		</div>
-	</form>
 </div>

From 39701b21552d6cbe21566cb5a75b4e10aa5caa28 Mon Sep 17 00:00:00 2001
From: Josh Creek <8179928+jcreek@users.noreply.github.com>
Date: Wed, 6 Nov 2024 17:43:29 +0000
Subject: [PATCH 3/8] fix(#60): Unsubscribe to basket store after logging out

---
 src/lib/components/SignOut.svelte | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lib/components/SignOut.svelte b/src/lib/components/SignOut.svelte
index a78de4e..9917635 100644
--- a/src/lib/components/SignOut.svelte
+++ b/src/lib/components/SignOut.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { createEventDispatcher } from 'svelte';
+	import { createEventDispatcher, onDestroy } from 'svelte';
 	import { basket, type Basket, type Item } from '$lib/stores/basket.js';
 
 	const dispatch = createEventDispatcher();
@@ -16,6 +16,8 @@
 		localBasket = value;
 	});
 
+	onDestroy(unsubscribe);
+
 	async function signOut() {
 		// TODO use the error from the response
 		const { error } = await supabase.auth.signOut().then(() => {

From 0be329ff06b42c70e8504a08a2fc4f2b432995e6 Mon Sep 17 00:00:00 2001
From: Josh Creek <8179928+jcreek@users.noreply.github.com>
Date: Wed, 6 Nov 2024 17:49:52 +0000
Subject: [PATCH 4/8] refactor(#60): Utilise errors when signing out

---
 src/lib/components/SignOut.svelte | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/lib/components/SignOut.svelte b/src/lib/components/SignOut.svelte
index 9917635..1a9e5d2 100644
--- a/src/lib/components/SignOut.svelte
+++ b/src/lib/components/SignOut.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { createEventDispatcher, onDestroy } from 'svelte';
 	import { basket, type Basket, type Item } from '$lib/stores/basket.js';
+	import { logger } from '$lib/utils/logger.js';
 
 	const dispatch = createEventDispatcher();
 
@@ -19,8 +20,15 @@
 	onDestroy(unsubscribe);
 
 	async function signOut() {
-		// TODO use the error from the response
-		const { error } = await supabase.auth.signOut().then(() => {
+		const { error } = await supabase.auth.signOut();
+
+		if (error) {
+			logger.error('Error signing out:', error.message);
+			alert('Error signing out');
+			return;
+		}
+
+		try {
 			emitSignedOutEvent();
 
 			// Clear the basket
@@ -30,7 +38,10 @@
 			if (typeof localStorage !== 'undefined') {
 				localStorage.removeItem('basket');
 			}
-		});
+		} catch (err) {
+			logger.error('Error clearing basket:', err);
+			alert('Error clearing basket');
+		}
 	}
 </script>
 

From dc7f6ba18e6adf1d668679c0c21ac3cd24c501e8 Mon Sep 17 00:00:00 2001
From: Josh Creek <8179928+jcreek@users.noreply.github.com>
Date: Wed, 6 Nov 2024 17:50:31 +0000
Subject: [PATCH 5/8] chore(#60): Remove unused type

---
 src/lib/components/SignOut.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/components/SignOut.svelte b/src/lib/components/SignOut.svelte
index 1a9e5d2..7e274dd 100644
--- a/src/lib/components/SignOut.svelte
+++ b/src/lib/components/SignOut.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { createEventDispatcher, onDestroy } from 'svelte';
-	import { basket, type Basket, type Item } from '$lib/stores/basket.js';
+	import { basket, type Basket } from '$lib/stores/basket.js';
 	import { logger } from '$lib/utils/logger.js';
 
 	const dispatch = createEventDispatcher();

From 4f4f1227026e2198ff047dedf324bd9309cf5acc Mon Sep 17 00:00:00 2001
From: Josh Creek <8179928+jcreek@users.noreply.github.com>
Date: Wed, 6 Nov 2024 21:02:39 +0000
Subject: [PATCH 6/8] fix(#60): Fix logger import

---
 src/lib/components/SignOut.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/components/SignOut.svelte b/src/lib/components/SignOut.svelte
index 7e274dd..7f755b0 100644
--- a/src/lib/components/SignOut.svelte
+++ b/src/lib/components/SignOut.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { createEventDispatcher, onDestroy } from 'svelte';
 	import { basket, type Basket } from '$lib/stores/basket.js';
-	import { logger } from '$lib/utils/logger.js';
+	import logger from '$lib/utils/logger/logger.js';
 
 	const dispatch = createEventDispatcher();
 

From 7ec5c5bb381d0b08f19e3a5125cf7f0980fda14c Mon Sep 17 00:00:00 2001
From: Josh Creek <8179928+jcreek@users.noreply.github.com>
Date: Wed, 6 Nov 2024 21:09:29 +0000
Subject: [PATCH 7/8] chore(#60): Remove logger from client side code

---
 src/lib/components/SignOut.svelte | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/lib/components/SignOut.svelte b/src/lib/components/SignOut.svelte
index 7f755b0..43b49dc 100644
--- a/src/lib/components/SignOut.svelte
+++ b/src/lib/components/SignOut.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
 	import { createEventDispatcher, onDestroy } from 'svelte';
 	import { basket, type Basket } from '$lib/stores/basket.js';
-	import logger from '$lib/utils/logger/logger.js';
 
 	const dispatch = createEventDispatcher();
 
@@ -23,7 +22,7 @@
 		const { error } = await supabase.auth.signOut();
 
 		if (error) {
-			logger.error('Error signing out:', error.message);
+			console.error('Error signing out:', error.message);
 			alert('Error signing out');
 			return;
 		}
@@ -39,7 +38,7 @@
 				localStorage.removeItem('basket');
 			}
 		} catch (err) {
-			logger.error('Error clearing basket:', err);
+			console.error('Error clearing basket:', err);
 			alert('Error clearing basket');
 		}
 	}

From 6a10ab59836448720fcacf6341dc360c4fbcfbbb Mon Sep 17 00:00:00 2001
From: Josh Creek <8179928+jcreek@users.noreply.github.com>
Date: Sun, 10 Nov 2024 18:10:56 +0000
Subject: [PATCH 8/8] refactor(#60): Strongly type supabase client

---
 src/lib/components/SignOut.svelte | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/components/SignOut.svelte b/src/lib/components/SignOut.svelte
index 43b49dc..5d355ae 100644
--- a/src/lib/components/SignOut.svelte
+++ b/src/lib/components/SignOut.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import { createEventDispatcher, onDestroy } from 'svelte';
+	import type { SupabaseClient } from '@supabase/supabase-js';
 	import { basket, type Basket } from '$lib/stores/basket.js';
 
 	const dispatch = createEventDispatcher();
@@ -9,7 +10,7 @@
 	}
 
 	// Access the supabase client from the layout data
-	export let supabase: any;
+	export let supabase: SupabaseClient;
 
 	let localBasket: Basket;
 	const unsubscribe = basket.subscribe((value) => {