From a240bce68c7d4923f15368b5633ae72807b20e7c Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Wed, 21 Feb 2024 09:58:21 +0100 Subject: [PATCH] feat: debugForms configuration to vite.config.ts --- src/lib/config/site.ts | 2 ++ src/routes/(auth)/auth/(components)/login-form.svelte | 5 +++-- src/routes/(auth)/auth/(components)/register-form.svelte | 5 +++-- src/routes/(auth)/auth/(components)/sso-form.svelte | 4 ++-- src/routes/(user)/settings/account/email-form.svelte | 6 +++--- src/routes/(user)/settings/account/password-form.svelte | 1 - src/routes/(user)/settings/account/username-form.svelte | 4 ++-- .../(user)/settings/appearance/appearance-form.svelte | 4 ++-- src/routes/(user)/settings/profile-form.svelte | 4 ++-- 9 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/lib/config/site.ts b/src/lib/config/site.ts index 3f4385a..3878212 100644 --- a/src/lib/config/site.ts +++ b/src/lib/config/site.ts @@ -1,6 +1,8 @@ const SITE_URL = import.meta.env.VERCEL_ENV === 'preview' ? import.meta.env.VERCEL_URL : 'omnidash.io'; +export const debugForms = import.meta.env.DEBUG_FORMS === 'true' || false; + export const siteConfig = { name: 'Omnidash', author: 'Bart van der Braak', diff --git a/src/routes/(auth)/auth/(components)/login-form.svelte b/src/routes/(auth)/auth/(components)/login-form.svelte index b5cb157..b244264 100644 --- a/src/routes/(auth)/auth/(components)/login-form.svelte +++ b/src/routes/(auth)/auth/(components)/login-form.svelte @@ -14,10 +14,11 @@ import SuperDebug from 'sveltekit-superforms'; import { zodClient } from 'sveltekit-superforms/adapters'; import { browser, dev } from '$app/environment'; - import { PUBLIC_DEBUG_FORMS } from '$env/static/public'; + // import { PUBLIC_DEBUG_FORMS } from '$env/static/public'; import { toast } from 'svelte-sonner'; import { Icons } from '$lib/components/site'; import { cn } from '$lib/utils'; + import { debugForms } from '$lib/config/site'; export let data: SuperValidated>; let isLoading = false; @@ -72,7 +73,7 @@ -{#if dev && PUBLIC_DEBUG_FORMS == 'true' && browser} +{#if dev && debugForms && browser}
diff --git a/src/routes/(auth)/auth/(components)/register-form.svelte b/src/routes/(auth)/auth/(components)/register-form.svelte index fc7dff1..965915b 100644 --- a/src/routes/(auth)/auth/(components)/register-form.svelte +++ b/src/routes/(auth)/auth/(components)/register-form.svelte @@ -16,10 +16,11 @@ import SuperDebug from 'sveltekit-superforms'; import { zodClient } from 'sveltekit-superforms/adapters'; import { browser, dev } from '$app/environment'; - import { PUBLIC_DEBUG_FORMS } from '$env/static/public'; + // import { PUBLIC_DEBUG_FORMS } from '$env/static/public'; import { toast } from 'svelte-sonner'; import { Icons } from '$lib/components/site'; import { cn } from '$lib/utils'; + import { debugForms } from '$lib/config/site'; export let data: SuperValidated>; let isLoading = false; @@ -86,7 +87,7 @@ -{#if dev && PUBLIC_DEBUG_FORMS == 'true' && browser} +{#if dev && debugForms && browser}
diff --git a/src/routes/(auth)/auth/(components)/sso-form.svelte b/src/routes/(auth)/auth/(components)/sso-form.svelte index 7b9286a..14962dd 100644 --- a/src/routes/(auth)/auth/(components)/sso-form.svelte +++ b/src/routes/(auth)/auth/(components)/sso-form.svelte @@ -13,7 +13,6 @@ import SuperDebug from 'sveltekit-superforms'; import { zodClient } from 'sveltekit-superforms/adapters'; import { browser, dev } from '$app/environment'; - import { PUBLIC_DEBUG_FORMS } from '$env/static/public'; import { toast } from 'svelte-sonner'; import { Icons } from '$lib/components/site'; import PocketBase from 'pocketbase'; @@ -22,6 +21,7 @@ import { Separator } from '$lib/components/ui/separator'; import * as DropdownMenu from '$lib/components/ui/dropdown-menu'; import { ChevronDown } from 'radix-icons-svelte'; + import { debugForms } from '$lib/config/site'; export let data: SuperValidated>; let isLoading = false; @@ -138,7 +138,7 @@ -{#if dev && PUBLIC_DEBUG_FORMS == 'true' && browser} +{#if dev && debugForms && browser}
diff --git a/src/routes/(user)/settings/account/email-form.svelte b/src/routes/(user)/settings/account/email-form.svelte index 91d6618..89a203a 100644 --- a/src/routes/(user)/settings/account/email-form.svelte +++ b/src/routes/(user)/settings/account/email-form.svelte @@ -19,11 +19,11 @@ import SuperDebug from 'sveltekit-superforms'; import { zodClient } from 'sveltekit-superforms/adapters'; import { browser, dev } from '$app/environment'; - import { PUBLIC_DEBUG_FORMS } from '$env/static/public'; import type { LayoutData } from '../$types'; import { toast } from 'svelte-sonner'; import { Separator } from '$lib/components/ui/separator'; import { Icons } from '$lib/components/site'; + import { debugForms } from '$lib/config/site'; export let user: LayoutData['user']; export let requestData: SuperValidated>; @@ -91,7 +91,7 @@ - {#if dev && PUBLIC_DEBUG_FORMS == 'true' && browser} + {#if dev && debugForms && browser}
@@ -130,7 +130,7 @@ - {#if dev && PUBLIC_DEBUG_FORMS == 'true' && browser} + {#if dev && debugForms && browser}
diff --git a/src/routes/(user)/settings/account/password-form.svelte b/src/routes/(user)/settings/account/password-form.svelte index a14e412..0693919 100644 --- a/src/routes/(user)/settings/account/password-form.svelte +++ b/src/routes/(user)/settings/account/password-form.svelte @@ -16,7 +16,6 @@ import SuperDebug from 'sveltekit-superforms'; import { zodClient } from 'sveltekit-superforms/adapters'; import { browser, dev } from '$app/environment'; - import { PUBLIC_DEBUG_FORMS } from '$env/static/public'; import { toast } from 'svelte-sonner'; import { Icons } from '$lib/components/site'; diff --git a/src/routes/(user)/settings/account/username-form.svelte b/src/routes/(user)/settings/account/username-form.svelte index 405d4b3..b0870c7 100644 --- a/src/routes/(user)/settings/account/username-form.svelte +++ b/src/routes/(user)/settings/account/username-form.svelte @@ -14,10 +14,10 @@ import SuperDebug from 'sveltekit-superforms'; import { zodClient } from 'sveltekit-superforms/adapters'; import { browser, dev } from '$app/environment'; - import { PUBLIC_DEBUG_FORMS } from '$env/static/public'; import type { LayoutData } from '../$types'; import { toast } from 'svelte-sonner'; import { Icons } from '$lib/components/site'; + import { debugForms } from '$lib/config/site'; export let user: LayoutData['user']; export let data: SuperValidated>; @@ -67,7 +67,7 @@ - {#if dev && PUBLIC_DEBUG_FORMS == 'true' && browser} + {#if dev && debugForms && browser}
diff --git a/src/routes/(user)/settings/appearance/appearance-form.svelte b/src/routes/(user)/settings/appearance/appearance-form.svelte index f1b10c8..8e5c6e7 100644 --- a/src/routes/(user)/settings/appearance/appearance-form.svelte +++ b/src/routes/(user)/settings/appearance/appearance-form.svelte @@ -12,7 +12,6 @@