From adabe92f720f4af3df709804e9413325853cf40b Mon Sep 17 00:00:00 2001 From: Pujit Mehrotra Date: Fri, 18 Oct 2024 10:59:03 -0400 Subject: [PATCH] refactor(web): move cn utility inside shadcn for modularization --- web/components.json | 2 +- web/components/shadcn/button/Button.vue | 2 +- .../shadcn/dropdown-menu/DropdownMenuCheckboxItem.vue | 2 +- web/components/shadcn/dropdown-menu/DropdownMenuContent.vue | 2 +- web/components/shadcn/dropdown-menu/DropdownMenuItem.vue | 2 +- web/components/shadcn/dropdown-menu/DropdownMenuLabel.vue | 2 +- web/components/shadcn/dropdown-menu/DropdownMenuRadioItem.vue | 2 +- web/components/shadcn/dropdown-menu/DropdownMenuSeparator.vue | 2 +- web/components/shadcn/dropdown-menu/DropdownMenuShortcut.vue | 2 +- web/components/shadcn/dropdown-menu/DropdownMenuSubContent.vue | 2 +- web/components/shadcn/dropdown-menu/DropdownMenuSubTrigger.vue | 2 +- web/components/shadcn/input/Input.vue | 2 +- web/components/shadcn/label/Label.vue | 2 +- web/components/shadcn/scroll-area/ScrollArea.vue | 2 +- web/components/shadcn/scroll-area/ScrollBar.vue | 2 +- web/components/shadcn/select/SelectContent.vue | 2 +- web/components/shadcn/select/SelectGroup.vue | 2 +- web/components/shadcn/select/SelectItem.vue | 2 +- web/components/shadcn/select/SelectLabel.vue | 2 +- web/components/shadcn/select/SelectScrollDownButton.vue | 2 +- web/components/shadcn/select/SelectScrollUpButton.vue | 2 +- web/components/shadcn/select/SelectSeparator.vue | 2 +- web/components/shadcn/select/SelectTrigger.vue | 2 +- web/components/shadcn/sheet/SheetContent.vue | 2 +- web/components/shadcn/sheet/SheetDescription.vue | 2 +- web/components/shadcn/sheet/SheetFooter.vue | 2 +- web/components/shadcn/sheet/SheetHeader.vue | 2 +- web/components/shadcn/sheet/SheetTitle.vue | 2 +- web/components/shadcn/switch/Switch.vue | 2 +- web/components/shadcn/tabs/TabsContent.vue | 2 +- web/components/shadcn/tabs/TabsList.vue | 2 +- web/components/shadcn/tabs/TabsTrigger.vue | 2 +- web/components/shadcn/tooltip/TooltipContent.vue | 2 +- web/{helpers => components/shadcn}/utils.ts | 0 34 files changed, 33 insertions(+), 33 deletions(-) rename web/{helpers => components/shadcn}/utils.ts (100%) diff --git a/web/components.json b/web/components.json index 1513bc9d3..d716eace1 100644 --- a/web/components.json +++ b/web/components.json @@ -12,6 +12,6 @@ "framework": "nuxt", "aliases": { "components": "@/components", - "utils": "@/helpers/utils" + "utils": "@/components/shadcn/utils" } } \ No newline at end of file diff --git a/web/components/shadcn/button/Button.vue b/web/components/shadcn/button/Button.vue index 7e3f61d58..c74696ef7 100644 --- a/web/components/shadcn/button/Button.vue +++ b/web/components/shadcn/button/Button.vue @@ -2,7 +2,7 @@ import type { HTMLAttributes } from 'vue' import { Primitive, type PrimitiveProps } from 'radix-vue' import { type ButtonVariants, buttonVariants } from '.' -import { cn } from '@/helpers/utils' +import { cn } from '~/components/shadcn/utils' interface Props extends PrimitiveProps { variant?: ButtonVariants['variant'] diff --git a/web/components/shadcn/dropdown-menu/DropdownMenuCheckboxItem.vue b/web/components/shadcn/dropdown-menu/DropdownMenuCheckboxItem.vue index 77ce01fa6..8ba90e3b9 100644 --- a/web/components/shadcn/dropdown-menu/DropdownMenuCheckboxItem.vue +++ b/web/components/shadcn/dropdown-menu/DropdownMenuCheckboxItem.vue @@ -8,7 +8,7 @@ import { useForwardPropsEmits, } from 'radix-vue' import { Check } from 'lucide-vue-next' -import { cn } from '@/helpers/utils' +import { cn } from '~/components/shadcn/utils' const props = defineProps() const emits = defineEmits() diff --git a/web/components/shadcn/dropdown-menu/DropdownMenuContent.vue b/web/components/shadcn/dropdown-menu/DropdownMenuContent.vue index a182b9ed6..de3e566e3 100644 --- a/web/components/shadcn/dropdown-menu/DropdownMenuContent.vue +++ b/web/components/shadcn/dropdown-menu/DropdownMenuContent.vue @@ -7,7 +7,7 @@ import { DropdownMenuPortal, useForwardPropsEmits, } from 'radix-vue' -import { cn } from '@/helpers/utils' +import { cn } from '~/components/shadcn/utils' const props = withDefaults( defineProps(), diff --git a/web/components/shadcn/dropdown-menu/DropdownMenuItem.vue b/web/components/shadcn/dropdown-menu/DropdownMenuItem.vue index cee795469..9a939874e 100644 --- a/web/components/shadcn/dropdown-menu/DropdownMenuItem.vue +++ b/web/components/shadcn/dropdown-menu/DropdownMenuItem.vue @@ -1,7 +1,7 @@ diff --git a/web/components/shadcn/select/SelectScrollDownButton.vue b/web/components/shadcn/select/SelectScrollDownButton.vue index fb82fcaa1..5ad25b8fb 100644 --- a/web/components/shadcn/select/SelectScrollDownButton.vue +++ b/web/components/shadcn/select/SelectScrollDownButton.vue @@ -2,7 +2,7 @@ import { type HTMLAttributes, computed } from 'vue' import { SelectScrollDownButton, type SelectScrollDownButtonProps, useForwardProps } from 'radix-vue' import { ChevronDown } from 'lucide-vue-next' -import { cn } from '@/helpers/utils' +import { cn } from '~/components/shadcn/utils' const props = defineProps() diff --git a/web/components/shadcn/select/SelectScrollUpButton.vue b/web/components/shadcn/select/SelectScrollUpButton.vue index ee4040b1f..69d2c97c1 100644 --- a/web/components/shadcn/select/SelectScrollUpButton.vue +++ b/web/components/shadcn/select/SelectScrollUpButton.vue @@ -2,7 +2,7 @@ import { type HTMLAttributes, computed } from 'vue' import { SelectScrollUpButton, type SelectScrollUpButtonProps, useForwardProps } from 'radix-vue' import { ChevronUp } from 'lucide-vue-next' -import { cn } from '@/helpers/utils' +import { cn } from '~/components/shadcn/utils' const props = defineProps() diff --git a/web/components/shadcn/select/SelectSeparator.vue b/web/components/shadcn/select/SelectSeparator.vue index 395876fc2..41f3a6963 100644 --- a/web/components/shadcn/select/SelectSeparator.vue +++ b/web/components/shadcn/select/SelectSeparator.vue @@ -1,7 +1,7 @@ diff --git a/web/components/shadcn/sheet/SheetHeader.vue b/web/components/shadcn/sheet/SheetHeader.vue index 9c9ea3628..a2a1994b8 100644 --- a/web/components/shadcn/sheet/SheetHeader.vue +++ b/web/components/shadcn/sheet/SheetHeader.vue @@ -1,6 +1,6 @@ diff --git a/web/components/shadcn/sheet/SheetTitle.vue b/web/components/shadcn/sheet/SheetTitle.vue index 3cae23cba..764ecafba 100644 --- a/web/components/shadcn/sheet/SheetTitle.vue +++ b/web/components/shadcn/sheet/SheetTitle.vue @@ -1,7 +1,7 @@