{#if toast.title}
{toast.title}
{/if}
@@ -49,7 +49,7 @@
on:click={() => {
toasts.update((toasts) => toasts.filter((t) => t.id != toast.id))
}}
- class="rounded-lg transition-colors hover:bg-slate-200 hover:dark:bg-zinc-800 p-2 m-2"
+ class="rounded-lg ml-auto w-max transition-colors hover:bg-slate-200 hover:dark:bg-zinc-800 p-2 m-2"
>
diff --git a/src/lib/components/ui/toasts/toasts.ts b/src/lib/components/ui/toasts/toasts.ts
index da4b578a..f453116f 100644
--- a/src/lib/components/ui/toasts/toasts.ts
+++ b/src/lib/components/ui/toasts/toasts.ts
@@ -1,7 +1,7 @@
import { writable } from 'svelte/store'
export enum ToastType {
- 'error' = 'bg-red-500 text-black border border-red-600',
+ 'error' = 'bg-red-500 text-white border border-red-600',
'warning' = 'bg-yellow-400 text-black border border-yellow-500',
'success' = 'bg-green-400 text-black border border-green-500',
'info' = 'dark:bg-zinc-900 bg-white border border-slate-200 dark:border-zinc-800 shadow-lg',
diff --git a/src/lib/lemmy.ts b/src/lib/lemmy.ts
index 314d24d2..a751506b 100644
--- a/src/lib/lemmy.ts
+++ b/src/lib/lemmy.ts
@@ -47,7 +47,9 @@ export interface UserData {
}
export const authData = writable
()
-export const user = writable<(PersonView & UserData) | undefined>()
+export const user = writable<(PersonView & UserData) | undefined | null>(
+ undefined
+)
setInterval(async () => {
// check for unread messages
@@ -77,13 +79,18 @@ authData.subscribe(async (data) => {
instance.set(
data?.instance ?? get(userSettings).instance ?? DEFAULT_INSTANCE_URL
)
- if (!data?.token) return
-
+ if (!data?.token) {
+ user.set(null)
+ return
+ }
try {
const site = await getClient().getSite({
auth: data.token,
})
- if (!site?.my_user) throw Error('Missing user')
+ if (!site?.my_user) {
+ user.set(null)
+ throw Error('Missing user')
+ }
user.set({ ...site.my_user.local_user_view, unreads: 0 })
if (typeof localStorage != 'undefined') {
localStorage.setItem('user', JSON.stringify(data))
@@ -95,6 +102,7 @@ authData.subscribe(async (data) => {
})
console.error(error)
authData.set(undefined)
+ user.set(null)
}
})
diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte
index 09286cf4..b641e7ae 100644
--- a/src/routes/login/+page.svelte
+++ b/src/routes/login/+page.svelte
@@ -12,6 +12,7 @@
DEFAULT_INSTANCE_URL,
authData,
getClient,
+ user,
validateInstance,
} from '$lib/lemmy.js'
import { Color } from '$lib/ui/colors.js'
@@ -38,6 +39,7 @@
})
if (response?.jwt) {
+ user.set(undefined)
authData.set({
instance: data.instance,
token: response.jwt,
@@ -54,6 +56,7 @@
content: error as any,
type: ToastType.error,
})
+ user.set(null)
}
data.loading = false
}
diff --git a/src/style/app.css b/src/style/app.css
index ad134520..57b4b259 100644
--- a/src/style/app.css
+++ b/src/style/app.css
@@ -13,6 +13,11 @@
}
}
+html,
+body {
+ text-rendering: optimizeLegibility;
+}
+
.wait * {
cursor: wait !important;
}