From a4d42e308640a0685974215a6b340b8fc3bcdc5c Mon Sep 17 00:00:00 2001
From: Jesse Wierzbinski <contact@cpluspatch.com>
Date: Thu, 10 Apr 2025 18:44:53 +0200
Subject: [PATCH] refactor: :recycle: Fix more broken UIs, rewrite account
 switcher

---
 components/editor/content.vue                 |  2 +-
 components/errors/AuthRequired.vue            |  9 +-
 components/graphics/spinner.vue               |  4 +-
 components/notes/attachment.vue               |  2 +-
 components/notifications/notification.vue     |  4 +-
 components/preferences/code.vue               |  2 +-
 components/preferences/emojis/category.vue    |  4 +-
 components/preferences/emojis/emoji.vue       |  4 +-
 components/preferences/emojis/uploader.vue    |  2 +-
 components/preferences/profile/editor.vue     |  8 +-
 components/preferences/select.vue             |  2 +-
 components/preferences/string.vue             |  2 +-
 components/preferences/switch.vue             |  2 +-
 components/profiles/avatar.vue                |  5 +-
 components/profiles/tiny-card.vue             | 10 +-
 .../sidebars/account/account-manager.vue      | 92 +++++++++++++++++++
 .../sidebars/account/account-switcher.vue     | 92 -------------------
 components/sidebars/footer/footer-actions.vue | 40 +++-----
 components/timelines/timeline.vue             | 14 +--
 components/ui/alert/index.ts                  |  2 +-
 components/ui/avatar/AvatarFallback.vue       |  2 +-
 components/ui/card/Card.vue                   |  2 +-
 components/ui/card/CardContent.vue            |  2 +-
 components/ui/card/CardFooter.vue             |  2 +-
 components/ui/card/CardHeader.vue             |  2 +-
 components/ui/dialog/DialogOverlay.vue        |  2 +-
 components/ui/input/url.vue                   | 10 +-
 components/ui/sidebar/Sidebar.vue             |  2 +-
 layouts/app.vue                               |  8 +-
 pages/preferences/account.vue                 |  7 +-
 pages/preferences/emojis.vue                  |  2 +-
 31 files changed, 167 insertions(+), 176 deletions(-)
 create mode 100644 components/sidebars/account/account-manager.vue
 delete mode 100644 components/sidebars/account/account-switcher.vue

diff --git a/components/editor/content.vue b/components/editor/content.vue
index 6d0ffc9..a23c6d9 100644
--- a/components/editor/content.vue
+++ b/components/editor/content.vue
@@ -1,6 +1,6 @@
 <template>
     <EditorContent :editor="editor"
-        :class="[$style.content, 'prose prose-sm dark:prose-invert break-words prose-a:no-underline prose-a:hover:underline prose-p:*:first-of-type:mt-0']" />
+        :class="[$style.content, 'prose prose-sm dark:prose-invert break-words prose-a:no-underline prose-a:hover:underline prose-p:first-of-type:mt-0']" />
 </template>
 
 <script lang="ts" setup>
diff --git a/components/errors/AuthRequired.vue b/components/errors/AuthRequired.vue
index 401f9bb..ba1266c 100644
--- a/components/errors/AuthRequired.vue
+++ b/components/errors/AuthRequired.vue
@@ -1,14 +1,13 @@
 <template>
-    <Alert class="grid grid-cols-[1fr_auto]">
-        <LogIn class="size-4" />
+    <Alert layout="button" class="grid">
+        <LogIn />
         <AlertTitle>{{ m.sunny_quick_lionfish_flip() }}</AlertTitle>
-        <AlertDescription class="col-start-1">
+        <AlertDescription>
             {{ m.brave_known_pelican_drip() }}
         </AlertDescription>
-        <!-- Add pl-4 because Alert is adding additional padding, which we don't want -->
         <Button
             variant="secondary"
-            class="w-full col-start-2 row-start-1 row-span-2 !pl-4"
+            class="w-full"
             @click="signInAction"
         >
             {{ m.fuzzy_sea_moth_absorb() }}
diff --git a/components/graphics/spinner.vue b/components/graphics/spinner.vue
index 98aedf2..c7bfa27 100644
--- a/components/graphics/spinner.vue
+++ b/components/graphics/spinner.vue
@@ -1,6 +1,6 @@
 <template>
-    <Card class="size-16">
-        <Loader class="size-full animate-spin" />
+    <Card class="flex items-center justify-center">
+        <Loader class="size-6 animate-spin" />
     </Card>
 </template>
 
diff --git a/components/notes/attachment.vue b/components/notes/attachment.vue
index 92bc53c..40a0b16 100644
--- a/components/notes/attachment.vue
+++ b/components/notes/attachment.vue
@@ -30,7 +30,7 @@
             </Popover>
         </Card>
         <DialogContent :hide-close="true"
-            class="fixed inset-0 z-50 w-screen h-screen p-6 duration-200 bg-transparent border-none grid grid-rows-[auto,1fr,auto] overflow-hidden translate-x-0 translate-y-0 max-w-full !animate-none gap-6">
+            class="fixed inset-0 z-50 w-screen h-screen p-6 duration-200 bg-transparent border-none grid grid-rows-[auto_1fr_auto] overflow-hidden translate-x-0 translate-y-0 max-w-full !animate-none gap-6">
             <div class="flex flex-row gap-2 w-full">
                 <DialogTitle class="sr-only">{{ attachment.type }}</DialogTitle>
                 <Button as="a" :href="attachment?.url" target="_blank" :download="true" variant="ghost" size="icon"
diff --git a/components/notifications/notification.vue b/components/notifications/notification.vue
index d2ea5fa..c6a1fe5 100644
--- a/components/notifications/notification.vue
+++ b/components/notifications/notification.vue
@@ -1,11 +1,11 @@
 <template>
     <Card class="*:w-full p-2">
-        <Collapsible :default-open="true" v-slot="{ open }">
+        <Collapsible :default-open="true" v-slot="{ open }" class="space-y-1">
             <Tooltip>
                 <TooltipTrigger :as-child="true">
                     <CardHeader
                         v-if="notification.account"
-                        class="flex-row items-center gap-2 px-2"
+                        class="flex flex-row items-center gap-2 px-2"
                     >
                         <component :is="icon" class="size-5 shrink-0" />
                         <Avatar
diff --git a/components/preferences/code.vue b/components/preferences/code.vue
index f9d33d6..5b142ab 100644
--- a/components/preferences/code.vue
+++ b/components/preferences/code.vue
@@ -4,7 +4,7 @@
         class="grid justify-normal items-center px-6 py-4 gap-4"
         v-slot="{ open }"
     >
-        <div class="grid grid-cols-[1fr,auto] items-center gap-4">
+        <div class="grid grid-cols-[1fr_auto] items-center gap-4">
             <CardHeader class="space-y-0.5 p-0">
                 <CardTitle class="text-base">
                     {{ setting.title() }}
diff --git a/components/preferences/emojis/category.vue b/components/preferences/emojis/category.vue
index fb27089..7c3be20 100644
--- a/components/preferences/emojis/category.vue
+++ b/components/preferences/emojis/category.vue
@@ -1,6 +1,6 @@
 <template>
     <Collapsible :default-open="true">
-        <div class="grid grid-cols-[1fr,auto] gap-4 items-baseline">
+        <div class="grid grid-cols-[1fr_auto] gap-4 items-baseline">
             <h2 class="text-2xl font-semibold tracking-tight">
                 {{ name }}
             </h2>
@@ -31,4 +31,4 @@ defineProps<{
     emojis: EmojiType[];
     name: string;
 }>();
-</script>
\ No newline at end of file
+</script>
diff --git a/components/preferences/emojis/emoji.vue b/components/preferences/emojis/emoji.vue
index b506249..51271ed 100644
--- a/components/preferences/emojis/emoji.vue
+++ b/components/preferences/emojis/emoji.vue
@@ -5,8 +5,8 @@
                 cn(
                     'grid hover:cursor-pointer gap-4 items-center p-4',
                     canEdit
-                        ? 'grid-cols-[auto,1fr,auto]'
-                        : 'grid-cols-[auto,1fr]'
+                        ? 'grid-cols-[auto_1fr_auto]'
+                        : 'grid-cols-[auto_1fr]'
                 )
             "
         >
diff --git a/components/preferences/emojis/uploader.vue b/components/preferences/emojis/uploader.vue
index d037755..f2eb68d 100644
--- a/components/preferences/emojis/uploader.vue
+++ b/components/preferences/emojis/uploader.vue
@@ -131,7 +131,7 @@
                     :as="Card"
                 >
                     <FormItem
-                        class="grid grid-cols-[1fr,auto] items-center p-6 gap-2"
+                        class="grid grid-cols-[1fr_auto] items-center gap-2"
                     >
                         <CardHeader class="space-y-0.5 p-0">
                             <FormLabel :as="CardTitle">
diff --git a/components/preferences/profile/editor.vue b/components/preferences/profile/editor.vue
index 0f3cd77..83b2e16 100644
--- a/components/preferences/profile/editor.vue
+++ b/components/preferences/profile/editor.vue
@@ -92,7 +92,7 @@
                             <div
                                 v-for="(field, index) in value"
                                 :key="index"
-                                class="grid items-center grid-cols-[auto,repeat(3,minmax(0,1fr))] gap-2"
+                                class="grid items-center grid-cols-[auto_repeat(3,minmax(0,1fr))] gap-2"
                             >
                                 <Button
                                     variant="destructive"
@@ -159,7 +159,7 @@
                 class="block"
             >
                 <FormItem
-                    class="grid grid-cols-[1fr,auto] items-center p-6 gap-2"
+                    class="grid grid-cols-[1fr_auto] items-center gap-2"
                 >
                     <CardHeader class="space-y-0.5 p-0">
                         <FormLabel :as="CardTitle">
@@ -187,7 +187,7 @@
                 class="block"
             >
                 <FormItem
-                    class="grid grid-cols-[1fr,auto] items-center p-6 gap-2"
+                    class="grid grid-cols-[1fr_auto] items-center gap-2"
                 >
                     <CardHeader class="space-y-0.5 p-0">
                         <FormLabel :as="CardTitle">
@@ -215,7 +215,7 @@
                 class="block"
             >
                 <FormItem
-                    class="grid grid-cols-[1fr,auto] items-center p-6 gap-2"
+                    class="grid grid-cols-[1fr_auto] items-center gap-2"
                 >
                     <CardHeader class="space-y-0.5 p-0">
                         <FormLabel :as="CardTitle">
diff --git a/components/preferences/select.vue b/components/preferences/select.vue
index 5a5e611..9eef4a2 100644
--- a/components/preferences/select.vue
+++ b/components/preferences/select.vue
@@ -1,5 +1,5 @@
 <template>
-    <Card class="grid grid-cols-[1fr,auto] items-center px-6 py-4 gap-2">
+    <Card class="grid grid-cols-[1fr_auto] items-center px-6 py-4 gap-2">
         <CardHeader class="space-y-0.5 p-0">
             <CardTitle class="text-base">
                 {{ setting.title() }}
diff --git a/components/preferences/string.vue b/components/preferences/string.vue
index 3f3a116..30c34f8 100644
--- a/components/preferences/string.vue
+++ b/components/preferences/string.vue
@@ -1,5 +1,5 @@
 <template>
-    <Card class="grid grid-rows-[1fr,auto] xl:grid-rows-none xl:grid-cols-[1fr,auto] items-center px-6 py-4 gap-4">
+    <Card class="grid grid-rows-[1fr_auto] xl:grid-rows-none xl:grid-cols-[1fr_auto] items-center px-6 py-4 gap-4">
         <CardHeader class="space-y-0.5 p-0">
             <CardTitle class="text-base">
                 {{ setting.title() }}
diff --git a/components/preferences/switch.vue b/components/preferences/switch.vue
index f26cc7a..1c8da35 100644
--- a/components/preferences/switch.vue
+++ b/components/preferences/switch.vue
@@ -1,5 +1,5 @@
 <template>
-    <Card class="grid grid-cols-[1fr,auto] items-center px-6 py-4 gap-2">
+    <Card class="grid grid-cols-[1fr_auto] items-center px-6 py-4 gap-2">
         <CardHeader class="space-y-0.5 p-0">
             <CardTitle class="text-base">
                 {{ setting.title() }}
diff --git a/components/profiles/avatar.vue b/components/profiles/avatar.vue
index 453a2d8..39dd789 100644
--- a/components/profiles/avatar.vue
+++ b/components/profiles/avatar.vue
@@ -1,5 +1,5 @@
 <template>
-    <Avatar :class="shape.value === 'square' && 'rounded-md'" :size="size">
+    <Avatar :class="shape.value === 'square' && 'rounded-md'">
         <AvatarFallback v-if="name">
             {{ getInitials(name) }}
         </AvatarFallback>
@@ -11,10 +11,9 @@
 import { SettingIds } from "~/settings";
 import { Avatar, AvatarFallback, AvatarImage } from "../ui/avatar";
 
-const { name, size = "base" } = defineProps<{
+const { name } = defineProps<{
     src?: string;
     name?: string;
-    size?: "base" | "sm" | "lg";
 }>();
 
 /**
diff --git a/components/profiles/tiny-card.vue b/components/profiles/tiny-card.vue
index f8c3d1a..b1d186f 100644
--- a/components/profiles/tiny-card.vue
+++ b/components/profiles/tiny-card.vue
@@ -1,16 +1,16 @@
 <template>
     <Card
-        class="flex-row gap-4 p-2"
+        class="flex-row gap-2 p-2 truncate items-center"
         :class="naked ? 'p-0 bg-transparent ring-0 border-none' : ''"
     >
-        <Avatar :src="account.avatar" :name="account.display_name" size="sm" />
-        <CardContent class="gap-1">
+        <Avatar :src="account.avatar" :name="account.display_name" class="size-10" />
+        <CardContent class="leading-tight">
             <span
-                class="truncate font-semibold"
+                class="font-semibold"
                 v-render-emojis="account.emojis"
                 >{{ account.display_name }}</span
             >
-            <span class="truncate text-xs">
+            <span class="text-xs">
                 @{{ account.username }}@{{ domain }}
             </span>
         </CardContent>
diff --git a/components/sidebars/account/account-manager.vue b/components/sidebars/account/account-manager.vue
new file mode 100644
index 0000000..4de1c6f
--- /dev/null
+++ b/components/sidebars/account/account-manager.vue
@@ -0,0 +1,92 @@
+<template>
+    <Dialog>
+        <DialogTrigger as-child>
+            <slot />
+        </DialogTrigger>
+        <DialogContent>
+            <DialogHeader>
+                <DialogTitle>Accounts</DialogTitle>
+                <DialogDescription class="sr-only">
+                    Manage your accounts and settings.
+                </DialogDescription>
+            </DialogHeader>
+            <div v-if="identities.length > 0" class="grid gap-4 py-2">
+                <div v-for="identity of identities" :key="identity.account.id"
+                    class="grid grid-cols-[1fr_auto] has-[>[data-switch]]:grid-cols-[1fr_auto_auto] gap-2">
+                    <TinyCard :account="identity.account" :domain="identity.instance.domain" naked />
+                    <Button data-switch v-if="currentIdentity?.id !== identity.id"
+                        @click="switchAccount(identity.account.id)" variant="outline">
+                        Switch
+                    </Button>
+                    <Button @click="signOut(appData, identity)" variant="outline" size="icon"
+                        :title="m.sharp_big_mallard_reap()">
+                        <LogOut />
+                    </Button>
+                </div>
+            </div>
+            <div v-else>
+                <p class="text-sm text-muted-foreground">
+                    Log in to or register an account on your favourite instance.
+                </p>
+            </div>
+            <DialogFooter>
+                <Button :as="NuxtLink" href="/register" variant="outline">
+                    <UserPlus />
+                    {{ m.honest_few_baboon_pop() }}
+                </Button>
+                <Button @click="signInAction">
+                    <LogIn />
+                    {{ m.sunny_pink_hyena_walk() }}
+                </Button>
+            </DialogFooter>
+        </DialogContent>
+    </Dialog>
+</template>
+
+<script lang="ts" setup>
+import type { Account } from "@versia/client/types";
+import { ChevronsUpDown, LogIn, LogOut, UserPlus } from "lucide-vue-next";
+import { toast } from "vue-sonner";
+import TinyCard from "~/components/profiles/tiny-card.vue";
+import { Button } from "~/components/ui/button";
+import {
+    Dialog,
+    DialogContent,
+    DialogDescription,
+    DialogFooter,
+    DialogHeader,
+    DialogTitle,
+    DialogTrigger,
+} from "~/components/ui/dialog";
+import * as m from "~/paraglide/messages.js";
+import { NuxtLink } from "#components";
+import { identity as currentIdentity } from "#imports";
+
+const appData = useAppData();
+
+const signInAction = async () => signIn(appData, await askForInstance());
+
+const switchAccount = async (userId: string) => {
+    if (userId === currentIdentity.value?.account.id) {
+        return await navigateTo(`/@${currentIdentity.value.account.username}`);
+    }
+
+    const id = toast.loading("Switching account...");
+
+    const identityToSwitch = identities.value.find(
+        (i) => i.account.id === userId,
+    );
+
+    if (!identityToSwitch) {
+        toast.dismiss(id);
+        toast.error("No identity to switch to");
+        return;
+    }
+
+    currentIdentity.value = identityToSwitch;
+    toast.dismiss(id);
+    toast.success("Switched account");
+
+    window.location.href = "/";
+};
+</script>
diff --git a/components/sidebars/account/account-switcher.vue b/components/sidebars/account/account-switcher.vue
deleted file mode 100644
index 09e2625..0000000
--- a/components/sidebars/account/account-switcher.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-<script setup lang="ts">
-import { BadgeCheck, LogIn, LogOut, UserPlus } from "lucide-vue-next";
-import { toast } from "vue-sonner";
-import TinyCard from "~/components/profiles/tiny-card.vue";
-import {
-    DropdownMenu,
-    DropdownMenuContent,
-    DropdownMenuGroup,
-    DropdownMenuItem,
-    DropdownMenuLabel,
-    DropdownMenuSeparator,
-    DropdownMenuTrigger,
-} from "~/components/ui/dropdown-menu";
-import * as m from "~/paraglide/messages.js";
-import { NuxtLink } from "#components";
-
-const appData = useAppData();
-
-const signInAction = async () => signIn(appData, await askForInstance());
-
-const switchAccount = async (userId: string) => {
-    if (userId === identity.value?.account.id) {
-        return await navigateTo(`/@${identity.value.account.username}`);
-    }
-
-    const id = toast.loading("Switching account...");
-
-    const identityToSwitch = identities.value.find(
-        (i) => i.account.id === userId,
-    );
-
-    if (!identityToSwitch) {
-        toast.dismiss(id);
-        toast.error("No identity to switch to");
-        return;
-    }
-
-    identity.value = identityToSwitch;
-    toast.dismiss(id);
-    toast.success("Switched account");
-
-    window.location.href = "/";
-};
-</script>
-
-<template>
-    <DropdownMenu>
-        <DropdownMenuTrigger :as-child="true">
-            <slot />
-        </DropdownMenuTrigger>
-        <DropdownMenuContent>
-            <DropdownMenuLabel> Your accounts </DropdownMenuLabel>
-            <DropdownMenuSeparator />
-            <DropdownMenuGroup>
-                <DropdownMenuItem
-                    v-for="identity of identities"
-                    :key="identity.account.id"
-                    @click="switchAccount(identity.account.id)"
-                    :href="`/@${identity.account.username}`"
-                >
-                    <TinyCard
-                        :account="identity.account"
-                        :domain="identity.instance.domain"
-                        naked
-                    />
-                </DropdownMenuItem>
-                <DropdownMenuItem @click="signInAction">
-                    <UserPlus />
-                    {{ m.sunny_pink_hyena_walk() }}
-                </DropdownMenuItem>
-            </DropdownMenuGroup>
-            <DropdownMenuSeparator v-if="identity" />
-            <DropdownMenuGroup v-if="identity">
-                <DropdownMenuItem
-                    :as="NuxtLink"
-                    :href="`/@${identity.account.username}`"
-                >
-                    <BadgeCheck />
-                    {{ m.factual_arable_jurgen_endure() }}
-                </DropdownMenuItem>
-                <DropdownMenuItem @click="signOut(appData, identity)">
-                    <LogOut />
-                    {{ m.sharp_big_mallard_reap() }}
-                </DropdownMenuItem>
-            </DropdownMenuGroup>
-            <DropdownMenuItem v-else :as="NuxtLink" href="/register">
-                <LogIn />
-                {{ m.honest_few_baboon_pop() }}
-            </DropdownMenuItem>
-        </DropdownMenuContent>
-    </DropdownMenu>
-</template>
diff --git a/components/sidebars/footer/footer-actions.vue b/components/sidebars/footer/footer-actions.vue
index 83f1547..52408d5 100644
--- a/components/sidebars/footer/footer-actions.vue
+++ b/components/sidebars/footer/footer-actions.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ChevronsUpDown, DownloadCloud, Pen } from "lucide-vue-next";
+import { ChevronsUpDown, DownloadCloud, Pen, UserPlus } from "lucide-vue-next";
 import TinyCard from "~/components/profiles/tiny-card.vue";
 import { Button } from "~/components/ui/button";
 import {
@@ -9,7 +9,7 @@ import {
     SidebarMenuItem,
 } from "~/components/ui/sidebar";
 import * as m from "~/paraglide/messages.js";
-import AccountSwitcher from "../account/account-switcher.vue";
+import AccountManager from "../account/account-manager.vue";
 const { $pwa } = useNuxtApp();
 </script>
 
@@ -17,38 +17,28 @@ const { $pwa } = useNuxtApp();
     <SidebarFooter>
         <SidebarMenu class="gap-3">
             <SidebarMenuItem>
-                <AccountSwitcher>
-                    <SidebarMenuButton size="lg">
-                        <TinyCard
-                            v-if="identity"
-                            :account="identity.account"
-                            :domain="identity.instance.domain"
-                            naked
-                        />
+                <AccountManager>
+                    <SidebarMenuButton v-if="identity" size="lg">
+                        <TinyCard :account="identity.account" :domain="identity.instance.domain" naked />
                         <ChevronsUpDown class="ml-auto size-4" />
                     </SidebarMenuButton>
-                </AccountSwitcher>
+                    <SidebarMenuButton v-else>
+                        <UserPlus />
+                        {{ m.sunny_pink_hyena_walk() }}
+                        <ChevronsUpDown class="ml-auto size-4" />
+                    </SidebarMenuButton>
+                </AccountManager>
             </SidebarMenuItem>
             <SidebarMenuItem class="flex flex-col gap-2">
-                <Button
-                    v-if="identity"
-                    variant="default"
-                    size="lg"
-                    class="w-full group-data-[collapsible=icon]:px-4"
-                    @click="useEvent('composer:open')"
-                >
+                <Button v-if="identity" variant="default" size="lg" class="w-full group-data-[collapsible=icon]:px-4"
+                    @click="useEvent('composer:open')">
                     <Pen />
                     <span class="group-data-[collapsible=icon]:hidden">
                         {{ m.salty_aloof_turkey_nudge() }}
                     </span>
                 </Button>
-                <Button
-                    v-if="$pwa?.needRefresh"
-                    variant="destructive"
-                    size="lg"
-                    class="w-full group-data-[collapsible=icon]:px-4"
-                    @click="$pwa?.updateServiceWorker(true)"
-                >
+                <Button v-if="$pwa?.needRefresh" variant="destructive" size="lg"
+                    class="w-full group-data-[collapsible=icon]:px-4" @click="$pwa?.updateServiceWorker(true)">
                     <DownloadCloud />
                     <span class="group-data-[collapsible=icon]:hidden">
                         {{ m.quaint_low_felix_pave() }}
diff --git a/components/timelines/timeline.vue b/components/timelines/timeline.vue
index 6f488db..de87478 100644
--- a/components/timelines/timeline.vue
+++ b/components/timelines/timeline.vue
@@ -2,14 +2,14 @@
     <div
         role="status"
         class="flex flex-col gap-4 items-center *:max-w-2xl *:w-full p-4"
-    >
+        >
         <TimelineItem
-            :type="type"
-            v-for="item in items"
-            :key="item.id"
-            :item="item"
-            @update="updateItem"
-            @delete="removeItem"
+        :type="type"
+        v-for="item in items"
+        :key="item.id"
+        :item="item"
+        @update="updateItem"
+        @delete="removeItem"
         />
 
         <Spinner v-if="isLoading" />
diff --git a/components/ui/alert/index.ts b/components/ui/alert/index.ts
index 89bbf74..d6dda88 100644
--- a/components/ui/alert/index.ts
+++ b/components/ui/alert/index.ts
@@ -16,7 +16,7 @@ export const alertVariants = cva(
             layout: {
                 default:
                     "has-[>svg]:grid-cols-[1fr_auto] grid-rows-2 gap-x-3 gap-y-1 items-start",
-                button: "grid-cols-[auto_1fr_auto] items-center gap-x-3 gap-y-0.5",
+                button: "grid-cols-[auto_1fr_auto] items-center gap-x-3 gap-y-0.5 *:data-[slot=alert-description]:col-start-2 *:data-[slot=alert-description]:row-start-2 has-[>[data-slot=alert-description]]:[&>button]:row-span-2",
             },
         },
         defaultVariants: {
diff --git a/components/ui/avatar/AvatarFallback.vue b/components/ui/avatar/AvatarFallback.vue
index 663b219..1ad05d4 100644
--- a/components/ui/avatar/AvatarFallback.vue
+++ b/components/ui/avatar/AvatarFallback.vue
@@ -18,7 +18,7 @@ const delegatedProps = computed(() => {
   <AvatarFallback
     data-slot="avatar-fallback"
     v-bind="delegatedProps"
-    :class="cn('bg-muted flex size-full items-center justify-center rounded-full', props.class)"
+    :class="cn('bg-muted flex size-full items-center justify-center', props.class)"
   >
     <slot />
   </AvatarFallback>
diff --git a/components/ui/card/Card.vue b/components/ui/card/Card.vue
index 060f6dd..1b01ffd 100644
--- a/components/ui/card/Card.vue
+++ b/components/ui/card/Card.vue
@@ -9,7 +9,7 @@ const props = defineProps<{
 
 <template>
     <div data-slot="card" :class="cn(
-        'bg-card text-card-foreground flex flex-col gap-6 rounded-md border py-6 shadow-sm',
+        'bg-card text-card-foreground flex flex-col gap-6 rounded-md border p-6 shadow-sm',
         props.class,
     )
         ">
diff --git a/components/ui/card/CardContent.vue b/components/ui/card/CardContent.vue
index 1987c7e..c52b119 100644
--- a/components/ui/card/CardContent.vue
+++ b/components/ui/card/CardContent.vue
@@ -10,7 +10,7 @@ const props = defineProps<{
 <template>
   <div
     data-slot="card-content"
-    :class="cn('px-6', props.class)"
+    :class="cn('flex flex-col', props.class)"
   >
     <slot />
   </div>
diff --git a/components/ui/card/CardFooter.vue b/components/ui/card/CardFooter.vue
index b0374c8..944924a 100644
--- a/components/ui/card/CardFooter.vue
+++ b/components/ui/card/CardFooter.vue
@@ -10,7 +10,7 @@ const props = defineProps<{
 <template>
   <div
     data-slot="card-footer"
-    :class="cn('flex items-center px-6 [.border-t]:pt-6', props.class)"
+    :class="cn('flex items-center [.border-t]:pt-6', props.class)"
   >
     <slot />
   </div>
diff --git a/components/ui/card/CardHeader.vue b/components/ui/card/CardHeader.vue
index 245e72c..fad9021 100644
--- a/components/ui/card/CardHeader.vue
+++ b/components/ui/card/CardHeader.vue
@@ -10,7 +10,7 @@ const props = defineProps<{
 <template>
   <div
     data-slot="card-header"
-    :class="cn('@container/card-header grid auto-rows-min grid-rows-[auto_auto] items-start gap-1.5 px-6 has-data-[slot=card-action]:grid-cols-[1fr_auto] [.border-b]:pb-6', props.class)"
+    :class="cn('@container/card-header grid auto-rows-min grid-rows-[auto_auto] items-start gap-1.5 has-data-[slot=card-action]:grid-cols-[1fr_auto] [.border-b]:pb-6', props.class)"
   >
     <slot />
   </div>
diff --git a/components/ui/dialog/DialogOverlay.vue b/components/ui/dialog/DialogOverlay.vue
index 1784889..030fbfe 100644
--- a/components/ui/dialog/DialogOverlay.vue
+++ b/components/ui/dialog/DialogOverlay.vue
@@ -18,7 +18,7 @@ const delegatedProps = computed(() => {
   <DialogOverlay
     data-slot="dialog-overlay"
     v-bind="delegatedProps"
-    :class="cn('data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/80', props.class)"
+    :class="cn('data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/80 backdrop-blur-md', props.class)"
   >
     <slot />
   </DialogOverlay>
diff --git a/components/ui/input/url.vue b/components/ui/input/url.vue
index 0fc8d5b..e93e0b8 100644
--- a/components/ui/input/url.vue
+++ b/components/ui/input/url.vue
@@ -45,9 +45,13 @@ watch(isValidUrl, (value) => {
 </script>
 
 <template>
-    <div class="space-y-3">
+    <div class="space-y-2">
         <Input v-model="modelValue" v-bind="$attrs" />
-        <p v-if="isValidUrl" class="text-green-600 text-sm"><Check class="inline size-4" /> {{ m.sunny_small_warbler_express() }}</p>
-        <p v-else-if="(modelValue?.toString().length ?? 0) > 0" class="text-destructive text-sm"><X class="inline size-4" /> {{ m.teal_late_grebe_blend() }}</p>
+        <p v-if="isValidUrl" class="text-green-600 text-xs">
+            {{ m.sunny_small_warbler_express() }}
+        </p>
+        <p v-else-if="(modelValue?.toString().length ?? 0) > 0" class="text-destructive text-xs">
+            {{ m.teal_late_grebe_blend() }}
+        </p>
     </div>
 </template>
diff --git a/components/ui/sidebar/Sidebar.vue b/components/ui/sidebar/Sidebar.vue
index d5d3de1..e26cde0 100644
--- a/components/ui/sidebar/Sidebar.vue
+++ b/components/ui/sidebar/Sidebar.vue
@@ -24,7 +24,7 @@ const { isMobile, state, openMobile, setOpenMobile } = useSidebar();
   <div
     v-if="collapsible === 'none'"
     data-slot="sidebar"
-    :class="cn('bg-sidebar text-sidebar-foreground flex h-full w-(--sidebar-width) flex-col', props.class)"
+    :class="cn('bg-sidebar text-sidebar-foreground flex h-dvh w-(--sidebar-width) flex-col', props.class)"
     v-bind="$attrs"
   >
     <slot />
diff --git a/layouts/app.vue b/layouts/app.vue
index c72339d..405cad3 100644
--- a/layouts/app.vue
+++ b/layouts/app.vue
@@ -2,7 +2,9 @@
     <SidebarProvider>
         <AppSidebar>
             <slot v-if="!route.meta.requiresAuth || identity" />
-            <AuthRequired v-else />
+            <div class="mx-auto max-w-4xl p-4" v-else>
+                <AuthRequired />
+            </div>
         </AppSidebar>
     </SidebarProvider>
     <MobileNavbar v-if="identity" />
@@ -27,10 +29,6 @@ const notUsingInput = computed(
         activeElement.value?.tagName !== "TEXTAREA" &&
         activeElement.value?.contentEditable !== "true",
 );
-
-const backgroundImage = useSetting(SettingIds.BackgroundURL);
-const canParseUrl = URL.canParse;
-
 const route = useRoute();
 
 watch([n, notUsingInput, d], async () => {
diff --git a/pages/preferences/account.vue b/pages/preferences/account.vue
index 07f8ef1..f22212d 100644
--- a/pages/preferences/account.vue
+++ b/pages/preferences/account.vue
@@ -5,18 +5,19 @@
         <Transition name="slide-down">
             <Alert
                 v-if="profileEditor?.dirty"
-                class="grid grid-cols-[1fr_auto] mb-4 absolute top-4 inset-x-4 w-[calc(100%-2rem)]"
+                layout="button"
+                class="mb-4 absolute top-4 inset-x-4 w-[calc(100%-2rem)]"
             >
                 <Check class="size-4" />
                 <AlertTitle>Unsaved changes</AlertTitle>
-                <AlertDescription class="col-start-1">
+                <AlertDescription >
                     Click "apply" to save your changes.
                 </AlertDescription>
                 <!-- Add pl-4 because Alert is adding additional padding, which we don't want -->
                 <Button
                     variant="secondary"
                     @click="profileEditor?.submitForm"
-                    class="w-full col-start-2 row-start-1 row-span-2 !pl-4"
+                    class="w-full !pl-4"
                     >Apply</Button
                 >
             </Alert>
diff --git a/pages/preferences/emojis.vue b/pages/preferences/emojis.vue
index 48accd7..c8cb113 100644
--- a/pages/preferences/emojis.vue
+++ b/pages/preferences/emojis.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="md:px-8 px-4 py-2 max-w-7xl mx-auto w-full space-y-6">
-        <div :class="cn('grid gap-2', canUpload && 'grid-cols-[1fr,auto]')">
+        <div :class="cn('grid gap-2', canUpload && 'grid-cols-[1fr_auto]')">
             <h1
                 class="scroll-m-20 text-3xl font-extrabold tracking-tight lg:text-4xl capitalize"
             >