From 090224fc70010c3415ed8915f72db05aa4c5da1d Mon Sep 17 00:00:00 2001 From: OllyNicholass Date: Tue, 22 Oct 2024 20:15:02 +0100 Subject: [PATCH] refactor(#35): move nav into component --- src/lib/components/Nav.svelte | 130 ++++++++++++++++++++++++++++++++++ src/routes/+layout.svelte | 121 ++----------------------------- 2 files changed, 135 insertions(+), 116 deletions(-) create mode 100644 src/lib/components/Nav.svelte diff --git a/src/lib/components/Nav.svelte b/src/lib/components/Nav.svelte new file mode 100644 index 0000000..1fcf0b3 --- /dev/null +++ b/src/lib/components/Nav.svelte @@ -0,0 +1,130 @@ + + + \ No newline at end of file diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 9e50d24..e9471e0 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -2,22 +2,16 @@ import '../app.postcss'; import { onDestroy, onMount } from 'svelte'; import { isBrowser } from '@supabase/ssr'; - import { basket, type Basket, type Item } from '$lib/stores/basket.js'; import { general } from '$lib/stores/generalStore.js'; import { invalidate } from '$app/navigation'; - import SignOut from '$lib/components/SignOut.svelte'; import CookieConsent from '$lib/components/CookieConsent.svelte'; - import NavLinks from '$lib/components/NavLinks.svelte'; - import MagicLink from '$lib/components/MagicLink.svelte'; + import Nav from '$lib/components/Nav.svelte'; export let data; let { supabase, session } = data; $: ({ supabase, session } = data); - let localBasket: Basket; - const unsubscribeToBasket = basket.subscribe((value) => { - localBasket = value; - }); + let localGeneral: any; const unsubscribeToGeneralStore = general.subscribe((value) => { @@ -25,7 +19,6 @@ }); onDestroy(() => { - unsubscribeToBasket(); unsubscribeToGeneralStore(); }); @@ -48,11 +41,9 @@ return () => data.subscription.unsubscribe(); }); - let isMobileMenuOpen = false; + - function toggleMobileMenu() { - isMobileMenuOpen = !isMobileMenuOpen; - } + @@ -69,109 +60,7 @@
- +