From a051ec84083762c0efc1456613436e78f639d5f6 Mon Sep 17 00:00:00 2001 From: axel Date: Sat, 19 Apr 2025 19:52:26 +0200 Subject: [PATCH] refactor: change global store from stores to states --- src/lib/v2/globalStore.svelte.ts | 7 +++++++ src/lib/v2/globalStores.ts | 3 --- src/routes/dash/+layout.svelte | 6 +++--- src/routes/dash/account/+page.svelte | 4 ++-- src/routes/dash/account/sessions/+page.svelte | 4 ++-- src/routes/dash/devices/+page.svelte | 4 ++-- src/routes/dash/devices/[id]/+page.svelte | 4 ++-- src/routes/dash/groups/+page.svelte | 4 ++-- src/routes/dash/groups/[id]/+page.svelte | 4 ++-- src/routes/dash/users/+page.svelte | 4 ++-- src/routes/dash/users/[id]/+page.svelte | 4 ++-- 11 files changed, 26 insertions(+), 22 deletions(-) create mode 100644 src/lib/v2/globalStore.svelte.ts delete mode 100644 src/lib/v2/globalStores.ts diff --git a/src/lib/v2/globalStore.svelte.ts b/src/lib/v2/globalStore.svelte.ts new file mode 100644 index 0000000..51d2430 --- /dev/null +++ b/src/lib/v2/globalStore.svelte.ts @@ -0,0 +1,7 @@ +import { env } from '$env/dynamic/public'; + +export const store = $state<{ + pageTitle: string; +}>({ + pageTitle: env.PUBLIC_SITE_NAME ?? '', +}); diff --git a/src/lib/v2/globalStores.ts b/src/lib/v2/globalStores.ts deleted file mode 100644 index 8bf91e9..0000000 --- a/src/lib/v2/globalStores.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { writable } from 'svelte/store'; - -export const pageTitle = writable(''); diff --git a/src/routes/dash/+layout.svelte b/src/routes/dash/+layout.svelte index 6e53896..b749212 100644 --- a/src/routes/dash/+layout.svelte +++ b/src/routes/dash/+layout.svelte @@ -1,7 +1,7 @@ - {env.PUBLIC_SITE_NAME} - {$pageTitle} + {env.PUBLIC_SITE_NAME} - {store.pageTitle}
-

{$pageTitle}

+

{store.pageTitle}

diff --git a/src/routes/dash/account/+page.svelte b/src/routes/dash/account/+page.svelte index dd7e371..c9054c9 100644 --- a/src/routes/dash/account/+page.svelte +++ b/src/routes/dash/account/+page.svelte @@ -1,11 +1,11 @@

{form?.error}

diff --git a/src/routes/dash/account/sessions/+page.svelte b/src/routes/dash/account/sessions/+page.svelte index 6a8142d..a3e0b36 100644 --- a/src/routes/dash/account/sessions/+page.svelte +++ b/src/routes/dash/account/sessions/+page.svelte @@ -1,13 +1,13 @@ diff --git a/src/routes/dash/devices/[id]/+page.svelte b/src/routes/dash/devices/[id]/+page.svelte index c4eac6e..f59369a 100644 --- a/src/routes/dash/devices/[id]/+page.svelte +++ b/src/routes/dash/devices/[id]/+page.svelte @@ -1,13 +1,13 @@ diff --git a/src/routes/dash/groups/[id]/+page.svelte b/src/routes/dash/groups/[id]/+page.svelte index f46ebd6..0153c4a 100644 --- a/src/routes/dash/groups/[id]/+page.svelte +++ b/src/routes/dash/groups/[id]/+page.svelte @@ -2,12 +2,12 @@ import { browser } from '$app/environment'; import InputCombobox from '$lib/v2/forms/InputCombobox.svelte'; import InputText from '$lib/v2/forms/InputText.svelte'; - import { pageTitle } from '$lib/v2/globalStores'; + import { store } from '$lib/v2/globalStore.svelte.js'; import EditPage from '$lib/v2/snippets/EditPage.svelte'; let { data, form } = $props(); - $pageTitle = data.group ? 'Editing group: ' + data.group.name : 'Adding new group'; + store.pageTitle = data.group ? 'Editing group: ' + data.group.name : 'Adding new group'; $effect(() => { if (form?.success && browser) { diff --git a/src/routes/dash/users/+page.svelte b/src/routes/dash/users/+page.svelte index 703cdd0..127fe1d 100644 --- a/src/routes/dash/users/+page.svelte +++ b/src/routes/dash/users/+page.svelte @@ -1,11 +1,11 @@ diff --git a/src/routes/dash/users/[id]/+page.svelte b/src/routes/dash/users/[id]/+page.svelte index 4fa0350..9f5cf59 100644 --- a/src/routes/dash/users/[id]/+page.svelte +++ b/src/routes/dash/users/[id]/+page.svelte @@ -3,12 +3,12 @@ import InputCheckbox from '$lib/v2/forms/InputCheckbox.svelte'; import InputCombobox from '$lib/v2/forms/InputCombobox.svelte'; import InputText from '$lib/v2/forms/InputText.svelte'; - import { pageTitle } from '$lib/v2/globalStores'; + import { store } from '$lib/v2/globalStore.svelte.js'; import EditPage from '$lib/v2/snippets/EditPage.svelte'; let { data, form } = $props(); - $pageTitle = data.user ? 'Editing user: ' + data.user.name : 'Adding new user'; + store.pageTitle = data.user ? 'Editing user: ' + data.user.name : 'Adding new user'; $effect(() => { if (form?.success && browser) {