From b6080eff60825c43bf60ace675ed0f58a2c42821 Mon Sep 17 00:00:00 2001 From: Jesse Wierzbinski Date: Thu, 10 Apr 2025 13:55:56 +0200 Subject: [PATCH 1/4] refactor: :arrow_up: Upgrade to Tailwind v4 --- app.vue | 4 +- bun.lock | 430 +++++------------- components.json | 9 +- components/editor/content.vue | 2 + components/ui/alert-dialog/AlertDialog.vue | 2 +- .../ui/alert-dialog/AlertDialogContent.vue | 6 +- .../alert-dialog/AlertDialogDescription.vue | 3 +- .../ui/alert-dialog/AlertDialogFooter.vue | 3 +- .../ui/alert-dialog/AlertDialogHeader.vue | 3 +- .../ui/alert-dialog/AlertDialogTitle.vue | 1 + .../ui/alert-dialog/AlertDialogTrigger.vue | 2 +- components/ui/alert/Alert.vue | 6 +- components/ui/alert/AlertDescription.vue | 5 +- components/ui/alert/AlertTitle.vue | 7 +- components/ui/alert/index.ts | 8 +- components/ui/avatar/Avatar.vue | 20 +- components/ui/avatar/AvatarFallback.vue | 18 +- components/ui/avatar/AvatarImage.vue | 6 +- components/ui/avatar/index.ts | 21 - components/ui/badge/Badge.vue | 28 +- components/ui/badge/index.ts | 12 +- components/ui/button/Button.vue | 1 + components/ui/button/index.ts | 23 +- components/ui/card/Card.vue | 13 +- components/ui/card/CardAction.vue | 17 + components/ui/card/CardContent.vue | 9 +- components/ui/card/CardDescription.vue | 5 +- components/ui/card/CardFooter.vue | 9 +- components/ui/card/CardHeader.vue | 9 +- components/ui/card/CardTitle.vue | 5 +- components/ui/card/index.ts | 1 + components/ui/checkbox/Checkbox.vue | 10 +- components/ui/collapsible/Collapsible.vue | 6 +- .../ui/collapsible/CollapsibleContent.vue | 5 +- .../ui/collapsible/CollapsibleTrigger.vue | 5 +- components/ui/command/Command.vue | 20 +- components/ui/command/CommandDialog.vue | 29 +- components/ui/command/CommandEmpty.vue | 6 +- components/ui/command/CommandGroup.vue | 31 +- components/ui/command/CommandInput.vue | 10 +- components/ui/command/CommandItem.vue | 32 +- components/ui/command/CommandList.vue | 6 +- components/ui/command/CommandSeparator.vue | 3 +- components/ui/command/CommandShortcut.vue | 5 +- components/ui/dialog/Dialog.vue | 5 +- components/ui/dialog/DialogClose.vue | 5 +- components/ui/dialog/DialogContent.vue | 50 +- components/ui/dialog/DialogDescription.vue | 3 +- components/ui/dialog/DialogFooter.vue | 8 +- components/ui/dialog/DialogHeader.vue | 3 +- components/ui/dialog/DialogOverlay.vue | 25 + components/ui/dialog/DialogScrollContent.vue | 4 +- components/ui/dialog/DialogTitle.vue | 8 +- components/ui/dialog/DialogTrigger.vue | 5 +- components/ui/dialog/index.ts | 1 + components/ui/drawer/Drawer.vue | 5 +- components/ui/drawer/DrawerClose.vue | 15 + components/ui/drawer/DrawerContent.vue | 12 +- components/ui/drawer/DrawerDescription.vue | 6 +- components/ui/drawer/DrawerFooter.vue | 5 +- components/ui/drawer/DrawerHeader.vue | 5 +- components/ui/drawer/DrawerOverlay.vue | 6 +- components/ui/drawer/DrawerTitle.vue | 6 +- components/ui/drawer/DrawerTrigger.vue | 15 + components/ui/drawer/index.ts | 3 +- components/ui/dropdown-menu/DropdownMenu.vue | 5 +- .../DropdownMenuCheckboxItem.vue | 7 +- .../ui/dropdown-menu/DropdownMenuContent.vue | 3 +- .../ui/dropdown-menu/DropdownMenuGroup.vue | 5 +- .../ui/dropdown-menu/DropdownMenuItem.vue | 45 +- .../ui/dropdown-menu/DropdownMenuLabel.vue | 14 +- .../dropdown-menu/DropdownMenuRadioGroup.vue | 5 +- .../dropdown-menu/DropdownMenuRadioItem.vue | 7 +- .../dropdown-menu/DropdownMenuSeparator.vue | 6 +- .../ui/dropdown-menu/DropdownMenuShortcut.vue | 5 +- .../ui/dropdown-menu/DropdownMenuSub.vue | 2 +- .../dropdown-menu/DropdownMenuSubContent.vue | 3 +- .../dropdown-menu/DropdownMenuSubTrigger.vue | 20 +- .../ui/dropdown-menu/DropdownMenuTrigger.vue | 5 +- components/ui/form/FormControl.vue | 1 + components/ui/form/FormDescription.vue | 3 +- components/ui/form/FormItem.vue | 5 +- components/ui/form/FormLabel.vue | 4 +- components/ui/form/FormMessage.vue | 10 +- components/ui/form/index.ts | 6 +- components/ui/hover-card/HoverCard.vue | 5 +- components/ui/hover-card/HoverCardContent.vue | 3 +- components/ui/hover-card/HoverCardTrigger.vue | 5 +- components/ui/input/Input.vue | 11 +- components/ui/label/Label.vue | 3 +- components/ui/popover/Popover.vue | 5 +- components/ui/popover/PopoverAnchor.vue | 15 + components/ui/popover/PopoverContent.vue | 3 +- components/ui/popover/PopoverTrigger.vue | 5 +- components/ui/popover/index.ts | 1 + components/ui/select/Select.vue | 9 +- components/ui/select/SelectContent.vue | 8 +- components/ui/select/SelectGroup.vue | 17 +- components/ui/select/SelectItem.vue | 39 +- components/ui/select/SelectItemText.vue | 5 +- components/ui/select/SelectLabel.vue | 5 +- .../ui/select/SelectScrollDownButton.vue | 8 +- components/ui/select/SelectScrollUpButton.vue | 8 +- components/ui/select/SelectSeparator.vue | 6 +- components/ui/select/SelectTrigger.vue | 55 ++- components/ui/select/SelectValue.vue | 5 +- components/ui/separator/Separator.vue | 32 +- components/ui/sheet/Sheet.vue | 5 +- components/ui/sheet/SheetClose.vue | 5 +- components/ui/sheet/SheetContent.vue | 41 +- components/ui/sheet/SheetDescription.vue | 3 +- components/ui/sheet/SheetFooter.vue | 7 +- components/ui/sheet/SheetHeader.vue | 5 +- components/ui/sheet/SheetOverlay.vue | 25 + components/ui/sheet/SheetTitle.vue | 3 +- components/ui/sheet/SheetTrigger.vue | 5 +- components/ui/sheet/index.ts | 21 - components/ui/sidebar/Sidebar.vue | 142 +++--- components/ui/sidebar/SidebarContent.vue | 1 + components/ui/sidebar/SidebarFooter.vue | 1 + components/ui/sidebar/SidebarGroup.vue | 1 + components/ui/sidebar/SidebarGroupAction.vue | 5 +- components/ui/sidebar/SidebarGroupContent.vue | 1 + components/ui/sidebar/SidebarGroupLabel.vue | 3 +- components/ui/sidebar/SidebarHeader.vue | 1 + components/ui/sidebar/SidebarInput.vue | 3 +- components/ui/sidebar/SidebarInset.vue | 21 +- components/ui/sidebar/SidebarMenu.vue | 1 + components/ui/sidebar/SidebarMenuAction.vue | 7 +- components/ui/sidebar/SidebarMenuBadge.vue | 3 +- .../ui/sidebar/SidebarMenuButtonChild.vue | 1 + components/ui/sidebar/SidebarMenuItem.vue | 1 + components/ui/sidebar/SidebarMenuSkeleton.vue | 5 +- components/ui/sidebar/SidebarMenuSub.vue | 3 +- .../ui/sidebar/SidebarMenuSubButton.vue | 3 +- components/ui/sidebar/SidebarMenuSubItem.vue | 11 +- components/ui/sidebar/SidebarProvider.vue | 3 +- components/ui/sidebar/SidebarRail.vue | 7 +- components/ui/sidebar/SidebarSeparator.vue | 3 +- components/ui/sidebar/SidebarTrigger.vue | 1 + components/ui/sidebar/index.ts | 11 +- components/ui/skeleton/Skeleton.vue | 5 +- components/ui/sonner/Sonner.vue | 14 +- components/ui/switch/Switch.vue | 6 +- components/ui/tabs/Tabs.vue | 16 +- components/ui/tabs/TabsContent.vue | 3 +- components/ui/tabs/TabsList.vue | 3 +- components/ui/tabs/TabsTrigger.vue | 7 +- components/ui/textarea/Textarea.vue | 6 +- components/ui/toggle/Toggle.vue | 23 +- components/ui/toggle/index.ts | 10 +- components/ui/tooltip/Tooltip.vue | 5 +- components/ui/tooltip/TooltipContent.vue | 19 +- components/ui/tooltip/TooltipProvider.vue | 4 +- components/ui/tooltip/TooltipTrigger.vue | 5 +- nuxt.config.ts | 9 +- package.json | 4 +- styles/index.css | 220 +++++---- styles/mcdonalds.css | 50 -- tailwind.config.ts | 132 ------ 160 files changed, 1187 insertions(+), 1178 deletions(-) create mode 100644 components/ui/card/CardAction.vue create mode 100644 components/ui/dialog/DialogOverlay.vue create mode 100644 components/ui/drawer/DrawerClose.vue create mode 100644 components/ui/drawer/DrawerTrigger.vue create mode 100644 components/ui/popover/PopoverAnchor.vue create mode 100644 components/ui/sheet/SheetOverlay.vue delete mode 100644 styles/mcdonalds.css delete mode 100644 tailwind.config.ts diff --git a/app.vue b/app.vue index 9aeb003..70a8e63 100644 --- a/app.vue +++ b/app.vue @@ -14,7 +14,6 @@ diff --git a/components/notes/header.vue b/components/notes/header.vue index 9b017ab..a248d6a 100644 --- a/components/notes/header.vue +++ b/components/notes/header.vue @@ -22,13 +22,13 @@ author.display_name }} - + @{{ username }} {{ instance && "@" }}{{ instance }} - + · {{ timeAgo }} diff --git a/components/notes/note.vue b/components/notes/note.vue index 29ab336..9ad60dd 100644 --- a/components/notes/note.vue +++ b/components/notes/note.vue @@ -1,6 +1,6 @@ + + diff --git a/components/notes/prose.vue b/components/notes/prose.vue new file mode 100644 index 0000000..591b65e --- /dev/null +++ b/components/notes/prose.vue @@ -0,0 +1,12 @@ + + + diff --git a/components/notes/reblog-header.vue b/components/notes/reblog-header.vue index 60013fe..6d4667a 100644 --- a/components/notes/reblog-header.vue +++ b/components/notes/reblog-header.vue @@ -1,9 +1,11 @@ @@ -12,6 +14,7 @@ import type { Emoji } from "@versia/client/types"; import { Repeat } from "lucide-vue-next"; import * as m from "~/paraglide/messages.js"; import Avatar from "../profiles/avatar.vue"; +import { Card } from "../ui/card"; const { url } = defineProps<{ avatar: string; @@ -21,4 +24,4 @@ const { url } = defineProps<{ }>(); const urlAsPath = new URL(url).pathname; - \ No newline at end of file + diff --git a/components/profiles/avatar.vue b/components/profiles/avatar.vue index 6abd495..453a2d8 100644 --- a/components/profiles/avatar.vue +++ b/components/profiles/avatar.vue @@ -1,5 +1,5 @@