From 7c7df02e3d4f6a23e8c36fdc7131c4fa9ef52bbb Mon Sep 17 00:00:00 2001 From: Xylight Date: Sun, 22 Sep 2024 14:47:04 -0700 Subject: [PATCH] misc: add ref to /accounts for login buttons --- src/routes/accounts/+page.svelte | 17 +++++++++++------ src/routes/accounts/login/+page.svelte | 18 ++++++++++++++++++ src/routes/accounts/login/guest/+page.svelte | 18 ++++++++++++++++++ src/routes/login/+page.svelte | 5 ++++- src/routes/login/guest/+page.svelte | 5 ++++- 5 files changed, 55 insertions(+), 8 deletions(-) create mode 100644 src/routes/accounts/login/+page.svelte create mode 100644 src/routes/accounts/login/guest/+page.svelte diff --git a/src/routes/accounts/+page.svelte b/src/routes/accounts/+page.svelte index 722e6860..4ea04c30 100644 --- a/src/routes/accounts/+page.svelte +++ b/src/routes/accounts/+page.svelte @@ -114,12 +114,12 @@

No accounts

-
@@ -131,13 +131,18 @@ {$t('routes.accounts')}
- {#if !LINKED_INSTANCE_URL} - {/if} diff --git a/src/routes/accounts/login/+page.svelte b/src/routes/accounts/login/+page.svelte new file mode 100644 index 00000000..5cd24711 --- /dev/null +++ b/src/routes/accounts/login/+page.svelte @@ -0,0 +1,18 @@ + + + + + diff --git a/src/routes/accounts/login/guest/+page.svelte b/src/routes/accounts/login/guest/+page.svelte new file mode 100644 index 00000000..225d913a --- /dev/null +++ b/src/routes/accounts/login/guest/+page.svelte @@ -0,0 +1,18 @@ + + + + + diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte index baf9014e..b06f391a 100644 --- a/src/routes/login/+page.svelte +++ b/src/routes/login/+page.svelte @@ -27,6 +27,8 @@ } from '$lib/components/error/ErrorContainer.svelte' import { page } from '$app/stores' + export let ref: string = '/' + let data = { instance: DEFAULT_INSTANCE_URL, username: '', @@ -57,7 +59,7 @@ if (result) { toast({ content: $t('toast.logIn'), type: 'success' }) - goto('/') + goto(ref) } } else { throw new Error('Invalid credentials') @@ -89,6 +91,7 @@
+
{$t('account.login')}
{#if $site && mayBeIncompatible(MINIMUM_VERSION, $site.version.replace('v', ''))} diff --git a/src/routes/login/guest/+page.svelte b/src/routes/login/guest/+page.svelte index a41b1373..318e7808 100644 --- a/src/routes/login/guest/+page.svelte +++ b/src/routes/login/guest/+page.svelte @@ -10,6 +10,8 @@ import { t } from '$lib/translations' import Header from '$lib/components/ui/layout/pages/Header.svelte' + export let ref: string = '/' + let form = { instance: '', username: `${$t('account.guest')} ${$profileData.profiles.filter((p) => p.jwt == undefined).length + 1}`, @@ -42,7 +44,7 @@ toast({ content: $t('toast.addAccount'), type: 'success' }) - goto('/') + goto(ref) form.loading = false } @@ -51,6 +53,7 @@
+
{$t('account.addGuest')}
{#if $site && mayBeIncompatible(MINIMUM_VERSION, $site.version.replace('v', ''))}