diff --git a/materialious/src/routes/(app)/setup/+page.svelte b/materialious/src/routes/(app)/setup/+page.svelte index 11edb624..d82da6f2 100644 --- a/materialious/src/routes/(app)/setup/+page.svelte +++ b/materialious/src/routes/(app)/setup/+page.svelte @@ -7,22 +7,26 @@ import { isOwnBackend } from '$lib/shared'; import { backendInUseStore, invidiousInstanceStore, playerYouTubeJsFallback } from '$lib/store'; - let usingInvidious: boolean = $state(false); - let invidiousInstanceValid: boolean = $state(false); - let invidiousInstance: string = $state( - !isOwnBackend() ? 'https://invidious.materialio.us' : ($invidiousInstanceStore ?? '') - ); + const defaultInstance = !isOwnBackend() + ? 'https://invidious.materialio.us' + : $invidiousInstanceStore; + + let usingInvidious: boolean = $state(false); + let invidiousInstanceValid: boolean = $state(true); + let invidiousInstance: string = $state(defaultInstance ?? ''); + + async function setupCompleted() { + invidiousInstanceValid = await setInvidiousInstance(invidiousInstance); + + if (!invidiousInstanceValid) { + return; + } - function setupCompleted() { clearCaches(); goto(resolve('/', {}), { replaceState: true }); location.reload(); } - async function setInvidiousBackend() { - invidiousInstanceValid = await setInvidiousInstance(invidiousInstance); - } - function setYTBackend() { usingInvidious = false; backendInUseStore.set('yt'); @@ -30,100 +34,95 @@ } -
- {#if !isUnrestrictedPlatform()} -

- VITE_DEFAULT_INVIDIOUS_INSTANCE has not been provided. -

-

- Please read our - Docker guide - - for configuring Materialious as a Invidious frontend. -

-

- You will be required to reverse proxy Invidious & configure CORS too for Materialious to work. -

- {:else} -

{$_('initalSetup.required')}

-
-
-
- - { - usingInvidious = true; - } - }, - { - text: $_('initalSetup.no'), - action: setYTBackend - }, - { - text: $_('initalSetup.unsure'), - action: setYTBackend - } - ]} - info={$_('initalSetup.invidiousInfo')} - /> - - {#if usingInvidious} +
+ + +