From a4f13ca2b743a32b183c99cddeb3535ae362e141 Mon Sep 17 00:00:00 2001 From: Sumanth Chinthagunta Date: Mon, 1 Jul 2024 22:55:41 -0700 Subject: [PATCH 1/4] fix: convert store into context store --- .../src/lib/components/layout/header.svelte | 3 +- .../components/layout/wait-for-auth.svelte | 4 +- .../magic-spell-textarea.svelte | 1 + apps/console/src/lib/graphql/client.ts | 5 +- apps/console/src/lib/nhost.ts | 10 +- apps/console/src/lib/stores/loading.ts | 1 - apps/console/src/lib/stores/nhost.ts | 146 +++++++ apps/console/src/routes/(app)/+layout.svelte | 3 +- .../console/src/routes/(app)/profile/+page.ts | 3 +- .../(app)/profile/components/elevate.svelte | 3 +- .../components/security-key-form.svelte | 4 +- .../profile/components/security-key.svelte | 3 +- .../src/routes/(auth)/reset/+page.server.ts | 19 + .../src/routes/(auth)/reset/+page.svelte | 171 ++++---- apps/console/src/routes/(auth)/reset/+page.ts | 13 - .../src/routes/(auth)/signin/+page.server.ts | 3 - .../src/routes/(auth)/signin/+page.svelte | 377 +---------------- .../console/src/routes/(auth)/signin/+page.ts | 14 - .../(auth)/signin/components/divider.svelte | 6 + .../(auth)/signin/components/password.svelte | 139 +++++++ .../signin/components/passwordless.svelte | 145 +++++++ .../(auth)/signin/components/social.svelte | 43 ++ .../src/routes/(auth)/signup/+page.server.ts | 2 - .../src/routes/(auth)/signup/+page.svelte | 385 +++++++++--------- .../console/src/routes/(auth)/signup/+page.ts | 13 - .../src/routes/(home)/about/+page.svelte | 4 +- .../src/routes/(home)/contact/+page.svelte | 4 +- apps/console/src/routes/+layout.svelte | 11 +- 28 files changed, 816 insertions(+), 719 deletions(-) create mode 100644 apps/console/src/lib/stores/nhost.ts delete mode 100644 apps/console/src/routes/(auth)/reset/+page.ts delete mode 100644 apps/console/src/routes/(auth)/signin/+page.ts create mode 100644 apps/console/src/routes/(auth)/signin/components/divider.svelte create mode 100644 apps/console/src/routes/(auth)/signin/components/password.svelte create mode 100644 apps/console/src/routes/(auth)/signin/components/passwordless.svelte create mode 100644 apps/console/src/routes/(auth)/signin/components/social.svelte delete mode 100644 apps/console/src/routes/(auth)/signup/+page.ts diff --git a/apps/console/src/lib/components/layout/header.svelte b/apps/console/src/lib/components/layout/header.svelte index 0cdef412..dd96c044 100644 --- a/apps/console/src/lib/components/layout/header.svelte +++ b/apps/console/src/lib/components/layout/header.svelte @@ -6,7 +6,7 @@ import LangSwitch from '$lib/components/layout/lang-switch.svelte'; // import LoadingIndicatorSpinner from '$lib/components/layout/loading-indicator-spinner.svelte'; import LoadingIndicatorBar from '$lib/components/layout/loading-indicator-bar.svelte'; import { storeTheme } from '$lib/stores'; -import { elevated, isAuthenticated, user } from '$lib/stores/user'; +import { getNhostClient } from '$lib/stores/nhost'; import type { DrawerSettings, ModalSettings } from '@skeletonlabs/skeleton'; import { AppBar, LightSwitch, getDrawerStore, getModalStore, popup } from '@skeletonlabs/skeleton'; import { LogoIcon } from '@spectacular/skeleton/components/logos'; @@ -29,6 +29,7 @@ const drawerStore = getDrawerStore(); // Local let isOsMac = false; const modalStore = getModalStore(); +const { elevated, isAuthenticated, user } = getNhostClient(); // Set Search Keyboard Shortcut if (browser) { diff --git a/apps/console/src/lib/components/layout/wait-for-auth.svelte b/apps/console/src/lib/components/layout/wait-for-auth.svelte index bda94a71..7a4bc4d5 100644 --- a/apps/console/src/lib/components/layout/wait-for-auth.svelte +++ b/apps/console/src/lib/components/layout/wait-for-auth.svelte @@ -3,7 +3,9 @@ * Ensure that Auth is initialized before rendering the app. * Otherwise all authorized graphql queries will get errors. */ -import { isAuthenticated } from '$lib/stores/user'; +import { getNhostClient } from '$lib/stores/nhost'; + +const { isAuthenticated } = getNhostClient(); {#if $isAuthenticated} diff --git a/apps/console/src/lib/components/magic-spell-textarea/magic-spell-textarea.svelte b/apps/console/src/lib/components/magic-spell-textarea/magic-spell-textarea.svelte index c691d48b..110e81cc 100644 --- a/apps/console/src/lib/components/magic-spell-textarea/magic-spell-textarea.svelte +++ b/apps/console/src/lib/components/magic-spell-textarea/magic-spell-textarea.svelte @@ -60,6 +60,7 @@ onMount(() => { >