diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.orders._index/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.orders._index/route.tsx index e8990df..05c1a2b 100644 --- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.orders._index/route.tsx +++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.orders._index/route.tsx @@ -7,7 +7,6 @@ import { MeiliSearchFilterBuilder } from 'meilisearch-helper' import { DataTable } from '@repo/ui/components/data-table' import { Skeleton } from '@repo/ui/components/skeleton' import { createSearch } from '@repo/util/meili' - import { columns, type Order } from '@repo/ui/routes/orders/columns' export function meta({}: Route.MetaArgs) { diff --git a/apps/studio.saladeaula.digital/package.json b/apps/studio.saladeaula.digital/package.json index 683c81d..55136dd 100644 --- a/apps/studio.saladeaula.digital/package.json +++ b/apps/studio.saladeaula.digital/package.json @@ -12,6 +12,7 @@ "typecheck": "npm run cf-typegen && react-router typegen && tsc --noEmit" }, "dependencies": { + "@repo/util": "*", "@repo/auth": "*", "@repo/ui": "*", "fuse.js": "^7.1.0", diff --git a/package-lock.json b/package-lock.json index b98ec08..5f2ba6a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -217,6 +217,7 @@ "dependencies": { "@repo/auth": "*", "@repo/ui": "*", + "@repo/util": "*", "fuse.js": "^7.1.0", "isbot": "^5.1.31", "jose": "^6.1.0", diff --git a/packages/ui/src/components/export-menu.tsx b/packages/ui/src/components/export-menu.tsx index 3d8c8c7..ea67567 100644 --- a/packages/ui/src/components/export-menu.tsx +++ b/packages/ui/src/components/export-menu.tsx @@ -14,8 +14,8 @@ import { DropdownMenuGroup, DropdownMenuItem, DropdownMenuTrigger -} from '@repo/ui/components/ui/dropdown-menu' -import { Button } from '@repo/ui/components/ui/button' +} from './ui/dropdown-menu' +import { Button } from './ui/button' export function ExportMenu({ name, diff --git a/packages/ui/src/components/faceted-filter.tsx b/packages/ui/src/components/faceted-filter.tsx index 01fc307..07ad3e1 100644 --- a/packages/ui/src/components/faceted-filter.tsx +++ b/packages/ui/src/components/faceted-filter.tsx @@ -1,8 +1,8 @@ import { CheckIcon } from 'lucide-react' import { useState } from 'react' -import { Badge } from '@repo/ui/components/ui/badge' -import { Button } from '@repo/ui/components/ui/button' +import { Badge } from './ui/badge' +import { Button } from './ui/button' import { Command, CommandEmpty, @@ -11,16 +11,12 @@ import { CommandItem, CommandList, CommandSeparator -} from '@repo/ui/components/ui/command' -import { - Popover, - PopoverContent, - PopoverTrigger -} from '@repo/ui/components/ui/popover' -import { Separator } from '@repo/ui/components/ui/separator' +} from './ui/command' +import { Popover, PopoverContent, PopoverTrigger } from './ui/popover' +import { Separator } from './ui/separator' import { cn } from '@repo/ui/lib/utils' -interface FacetedFilterProps { +interface FacetedFilterProps { title?: string value?: string[] icon: React.ComponentType @@ -33,14 +29,14 @@ interface FacetedFilterProps { onChange?: (values: string[]) => void } -export function FacetedFilter({ +export function FacetedFilter({ value = [], icon: Icon, title, options, onChange, className -}: FacetedFilterProps) { +}: FacetedFilterProps) { const [selectedValues, setSelectedValues] = useState(new Set(value)) return ( diff --git a/packages/ui/src/components/nav-user.tsx b/packages/ui/src/components/nav-user.tsx index 04df52b..1df9ce3 100644 --- a/packages/ui/src/components/nav-user.tsx +++ b/packages/ui/src/components/nav-user.tsx @@ -108,7 +108,7 @@ export function NavUser({