misc: improve error page

This commit is contained in:
Xylight committed 2024-09-11 20:49:31 -07:00
1 parent dbb6f16fde
commit e88b19ac0b
3 files changed
+44 -14

No files matched your search

+3 -1
View File
@@ -854,7 +854,9 @@
"captcha_failed": "Incorrect CAPTCHA answer.", "captcha_failed": "Incorrect CAPTCHA answer.",
"cant_block_local_instance": "You can't block the instance you are actively using.", "cant_block_local_instance": "You can't block the instance you are actively using.",
"invalid_vote_value": "You can't commit voter fraud on Lemmy posts, sorry.", "invalid_vote_value": "You can't commit voter fraud on Lemmy posts, sorry.",
"language_not_allowed": "That language isn't allowed in this community. Unset it to use the community's default." "language_not_allowed": "That language isn't allowed in this community. Unset it to use the community's default.",
"couldnt_find_person": "That user doesn't exist.",
"couldnt_find_community": "That community doesn't exist."
}, },
"aria": { "aria": {
"pagination": { "pagination": {
+2
View File
@@ -6,6 +6,8 @@ export function errorMessage(error: any, instance?: string): string {
error = JSON.parse(error?.body?.message).error error = JSON.parse(error?.body?.message).error
} else if (error?.message) { } else if (error?.message) {
error = error?.message error = error?.message
} else if (error?.error && typeof error?.error === 'string') {
error = error.error
} }
if (!error) throw error if (!error) throw error
+39 -13
View File
@@ -1,24 +1,50 @@
<script lang="ts"> <script lang="ts">
import { goto } from '$app/navigation' import { goto } from '$app/navigation'
import { page } from '$app/stores' import { page } from '$app/stores'
import { errorMessage } from '$lib/lemmy/error'
import { t } from '$lib/translations' import { t } from '$lib/translations'
import { Button } from 'mono-svelte' import { Button } from 'mono-svelte'
import { Icon, XMark } from 'svelte-hero-icons' import { Icon, XMark } from 'svelte-hero-icons'
function getError(message: string): { string: string; code: boolean } {
try {
return { string: errorMessage(JSON.parse(message)), code: false }
} catch (e) {
return { string: message, code: true }
}
}
</script> </script>
<div class="flex flex-col gap-4 mx-auto my-auto h-full justify-center"> <div
<h1 class="text-red-500 text-4xl font-black flex items-center flex-row gap-2"> class="flex flex-col gap-4 my-auto h-full justify-center max-w-md w-full mx-auto"
<div >
class="rounded-full bg-red-500 text-red-100 dark:text-red-900 p-1 w-max" <h1
> class="text-primary-900 dark:text-primary-100 text-6xl font-black flex items-center flex-row gap-2
<Icon src={XMark} mini size="24" /> font-display border-b pb-4 border-slate-200 dark:border-zinc-800"
</div> >
{$page.status} {$page.status}
</h1> </h1>
<code class="rounded-md dark:!bg-zinc-950 px-2 py-1 min-w-48"> {#if $page?.error?.message}
{$page.error?.message} {@const error = getError($page?.error?.message)}
</code> {#if error.code}
<Button size="sm" class="w-max" on:click={() => goto($page.url)}> <code class="rounded-md dark:!bg-zinc-950 px-2 py-1 min-w-48">
{$t('message.retry')} {error.string}
</Button> </code>
{:else}
<p class="text-lg">
{error.string}
</p>
{/if}
{/if}
<div class="flex items-center gap-2">
<Button
rounding="xl"
on:click={() => goto($page.url, { invalidateAll: true })}
>
{$t('message.retry')}
</Button>
<Button rounding="xl" href="/">
{$t('nav.home')}
</Button>
</div>
</div> </div>