From ebe9523041412d830a940a2fddebe9dc35aa36d6 Mon Sep 17 00:00:00 2001 From: Ushie Date: Thu, 3 Jul 2025 02:45:00 +0300 Subject: [PATCH 1/3] fix: Prevent FOUC and repetitive setting of about info --- src/app.html | 2 +- src/app.scss | 1 - src/data/api/settings.ts | 6 ++---- src/layout/Footer/FooterHost.svelte | 1 - src/routes/+layout.svelte | 2 ++ 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/app.html b/src/app.html index 52668865..1288b4b7 100644 --- a/src/app.html +++ b/src/app.html @@ -21,7 +21,7 @@ %sveltekit.head% - +
%sveltekit.body%
diff --git a/src/app.scss b/src/app.scss index bb3da8d0..b9045e64 100644 --- a/src/app.scss +++ b/src/app.scss @@ -23,7 +23,6 @@ html { body { margin: 0; padding: 0; - background-color: var(--background-one); } html, diff --git a/src/data/api/settings.ts b/src/data/api/settings.ts index b509d573..bce554c3 100644 --- a/src/data/api/settings.ts +++ b/src/data/api/settings.ts @@ -16,8 +16,6 @@ export function api_base_url(): string { if (browser) { const apiUrl = localStorage.getItem(URL_KEY) || default_api_url; - set_about_info(apiUrl); - return apiUrl; } @@ -46,11 +44,11 @@ export function set_api_base_url(url?: string) { localStorage.removeItem(URL_KEY); } else { localStorage.setItem(URL_KEY, url); - set_about_info(url); } + set_about_info(api_base_url()); } -function set_about_info(apiUrl: string) { +export function set_about_info(apiUrl: string) { if (!localStorage.getItem(STATUS_KEY) || !localStorage.getItem(EMAIL_KEY)) { fetch(`${apiUrl}/v4/about`) .then((response) => (response.ok ? response.json() : null)) diff --git a/src/layout/Footer/FooterHost.svelte b/src/layout/Footer/FooterHost.svelte index f49cbaed..ed70de5b 100644 --- a/src/layout/Footer/FooterHost.svelte +++ b/src/layout/Footer/FooterHost.svelte @@ -78,7 +78,6 @@ diff --git a/src/layout/Footer/FooterHost.svelte b/src/layout/Footer/FooterHost.svelte index ed70de5b..09e2d18e 100644 --- a/src/layout/Footer/FooterHost.svelte +++ b/src/layout/Footer/FooterHost.svelte @@ -10,18 +10,23 @@ import { RV_DMCA_GUID } from '$env/static/public'; import { onMount } from 'svelte'; import Divider from '$lib/components/Divider.svelte'; - import { email } from '$data/api/settings'; + import Button from '$lib/components/Button.svelte'; + import EmailDialog from '$layout/Dialogs/EmailDialog.svelte'; const aboutQuery = createQuery(queries.about()); let location: string; + let showEmailDialog = false; + onMount(() => { // DMCA Protection Badge location = document.location.href; }); + +