From 6283bcecad6a41fc66a397407c6d10c71cad2d20 Mon Sep 17 00:00:00 2001 From: Xylight Date: Wed, 19 Nov 2025 20:20:55 -0800 Subject: [PATCH] design: update error pages --- src/lib/app/i18n/en.json | 3 +- src/routes/+error.svelte | 45 +++++++++---------- src/routes/error/+page.ts | 5 +++ .../password_change/[token]/+error.svelte | 17 ------- src/routes/verify_email/[token]/+error.svelte | 18 -------- src/routes/verify_email/[token]/+page.svelte | 22 ++++----- 6 files changed, 36 insertions(+), 74 deletions(-) create mode 100644 src/routes/error/+page.ts delete mode 100644 src/routes/password_change/[token]/+error.svelte delete mode 100644 src/routes/verify_email/[token]/+error.svelte diff --git a/src/lib/app/i18n/en.json b/src/lib/app/i18n/en.json index a98b15b5..d72598f3 100644 --- a/src/lib/app/i18n/en.json +++ b/src/lib/app/i18n/en.json @@ -956,7 +956,8 @@ "rate_limit_error": "You are performing that action too fast.", "unimplemented": "That function of your account's server software is not yet supported by Photon.", "unsupported": "That function is not supported by your account's server software.", - "not_live_supported": "That server is not running supported software, or is offline." + "not_live_supported": "That server is not running supported software, or is offline.", + "token_not_found": "That email verification link expired, or never existed." }, "aria": { "pagination": { diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte index f14c525f..a73fc1ed 100644 --- a/src/routes/+error.svelte +++ b/src/routes/+error.svelte @@ -3,7 +3,7 @@ import { page } from '$app/state' import { errorMessage } from '$lib/app/error' import { t } from '$lib/app/i18n' - import { Button } from 'mono-svelte' + import { Button, Material } from 'mono-svelte' function getError(message: string): { string: string; code: boolean } { try { @@ -15,33 +15,30 @@
-

- {page.status} -

- {#if page?.error?.message} - {@const error = getError(page?.error?.message)} - {#if error.code} - - {error.string} - - {:else} -

- {error.string} -

+ +

+ {page.status} +

+ {#if page?.error?.message} + {@const error = getError(page?.error?.message)} + {#if error.code} + + {error.string} + + {:else} +

+ {error.string} +

+ {/if} {/if} - {/if} -
- -
diff --git a/src/routes/error/+page.ts b/src/routes/error/+page.ts new file mode 100644 index 00000000..8118a07e --- /dev/null +++ b/src/routes/error/+page.ts @@ -0,0 +1,5 @@ +import { error } from '@sveltejs/kit' + +export function load() { + error(500, 'You asked for it.') +} diff --git a/src/routes/password_change/[token]/+error.svelte b/src/routes/password_change/[token]/+error.svelte deleted file mode 100644 index 5aac5229..00000000 --- a/src/routes/password_change/[token]/+error.svelte +++ /dev/null @@ -1,17 +0,0 @@ - - -
-
- -
-

- {$t('message.error')} -

- {page.error?.message} -
diff --git a/src/routes/verify_email/[token]/+error.svelte b/src/routes/verify_email/[token]/+error.svelte deleted file mode 100644 index 4720c14a..00000000 --- a/src/routes/verify_email/[token]/+error.svelte +++ /dev/null @@ -1,18 +0,0 @@ - - -
-
- -
-

- {$t('message.error')} -

-

{$t('routes.verifyEmail.error')}

- {page.error?.message} -
diff --git a/src/routes/verify_email/[token]/+page.svelte b/src/routes/verify_email/[token]/+page.svelte index a161863b..154d0e36 100644 --- a/src/routes/verify_email/[token]/+page.svelte +++ b/src/routes/verify_email/[token]/+page.svelte @@ -1,23 +1,17 @@
-
- -
-

- {$t('message.success')} -

-

- {$t('routes.verifyEmail.message')} -

+ +
+ {$t('message.success')} +
+

{$t('routes.verifyEmail.message')}

+
{#if !LINKED_INSTANCE_URL}

You somehow got to this menu despite not being linked here by the email.