- , 'getRangerElement'>;
-type StepProps = { stepSize: number } | { steps: number[] };
-
-type Props = BaseProps & StepProps;
-const RangeField = (props: Props) => {
- const rangerRef = useRef(null);
- const {
- handles,
- options: { min, max },
- getPercentageForValue: percentage,
- } = useRanger({
- ...props,
- getRangerElement: () => rangerRef.current,
- });
-
- return (
- = Children & {
@@ -15,7 +15,7 @@ type Props = Children & {
next: string;
submit: string;
};
- onSubmit: (e: React.FormEvent) => void;
+ onSubmit: (e: React.SubmitEvent) => void;
};
// eslint-disable-next-line func-style
function MultiStepForm({ children, steps, move, text, onSubmit }: Props) {
diff --git a/src/app/components/form/multi-step/indicator.tsx b/src/app/components/form/multi-step/indicator.tsx
index 83740e7..94bae05 100644
--- a/src/app/components/form/multi-step/indicator.tsx
+++ b/src/app/components/form/multi-step/indicator.tsx
@@ -1,4 +1,4 @@
-import { cn } from '@/lib/utils/tailwindcss';
+import { cn } from '@/lib/utils';
type Props = { label: string; index: number; currentStep: number };
const Indicator = ({ label, index, currentStep }: Props) => {
diff --git a/src/app/components/icon/index.tsx b/src/app/components/icon/index.tsx
index b808894..21aedf9 100644
--- a/src/app/components/icon/index.tsx
+++ b/src/app/components/icon/index.tsx
@@ -1,6 +1,7 @@
import { Link, LinkProps } from '@tanstack/react-router';
import { type LucideIcon } from 'lucide-react';
-import { cn } from '@/lib/utils/tailwindcss';
+import { ClassName } from '@/types/react';
+import { cn } from '@/lib/utils';
type Props = LinkProps & {
Icon: LucideIcon;
@@ -8,8 +9,7 @@ type Props = LinkProps & {
clickable?: boolean;
onClick?: VoidFunction;
size?: number;
- className?: string;
-};
+} & ClassName;
const CustomIcon = ({
Icon,
text,
diff --git a/src/app/components/layout/footer/heading.tsx b/src/app/components/layout/footer/heading.tsx
index 237dcf1..bad20da 100644
--- a/src/app/components/layout/footer/heading.tsx
+++ b/src/app/components/layout/footer/heading.tsx
@@ -1,13 +1,13 @@
import { Link } from '@tanstack/react-router';
import { TITLE } from '@/app/constants/global';
-import { getYear } from '@/lib/utils/time';
+import { time } from '@/lib/utils';
const FooterHeading = () => (
© {TITLE}
—
- {getYear.customcads_founded_at()}–{getYear.current()}
+ {time.getYear.customcads_founded_at()}–{time.getYear.current()}
);
diff --git a/src/app/components/layout/footer/icon.tsx b/src/app/components/layout/footer/icon.tsx
index 3637da0..990ea39 100644
--- a/src/app/components/layout/footer/icon.tsx
+++ b/src/app/components/layout/footer/icon.tsx
@@ -1,8 +1,8 @@
import { Link } from '@tanstack/react-router';
import { IconType } from '@icons-pack/react-simple-icons';
-type FooterProps = { link: string; Icon: IconType };
-const FooterIcon = ({ link, Icon }: FooterProps) => {
+type Props = { link: string; Icon: IconType };
+const FooterIcon = ({ link, Icon }: Props) => {
return (
{
+const FooterLink = ({ text, ...props }: Props) => {
return (
diff --git a/src/app/components/layout/header/cart/index.tsx b/src/app/components/layout/header/cart/index.tsx
index 662d146..2e0fdea 100644
--- a/src/app/components/layout/header/cart/index.tsx
+++ b/src/app/components/layout/header/cart/index.tsx
@@ -2,7 +2,7 @@ import { ShoppingCart } from 'lucide-react';
import { useCartStore } from '@/app/hooks/stores/useCartStore';
import { useAuthStore } from '@/app/hooks/stores/useAuthStore';
import CustomIcon from '@/app/components/icon';
-import { Button } from '@/app/components/ui/button';
+import { Button } from '@/app/components/ui';
const CartIndicator = ({ text }: { text?: string }) => {
const { is } = useAuthStore();
diff --git a/src/app/components/layout/header/menu/index.tsx b/src/app/components/layout/header/menu/index.tsx
index f03c706..9eae4a5 100644
--- a/src/app/components/layout/header/menu/index.tsx
+++ b/src/app/components/layout/header/menu/index.tsx
@@ -1,15 +1,7 @@
import { Link } from '@tanstack/react-router';
import { MenuIcon } from 'lucide-react';
import { useLayoutTranslations } from '@/app/hooks/locales/translations/components';
-import {
- DropdownMenu,
- DropdownMenuTrigger,
- DropdownMenuContent,
- DropdownMenuGroup,
- DropdownMenuItem,
- DropdownMenuLabel,
- DropdownMenuSeparator,
-} from '@/app/components/ui/dropdown-menu';
+import { navMenu, Separator } from '@/app/components/ui';
import { useItems } from './hooks/useItems';
const Content = () => {
@@ -19,33 +11,37 @@ const Content = () => {
if (!items.length) return null;
return (
-
-
+
+
+
);
};
export default Content;
diff --git a/src/app/components/layout/header/mobile/account/authenticated.tsx b/src/app/components/layout/header/mobile/account/authenticated.tsx
index e010871..f2004ba 100644
--- a/src/app/components/layout/header/mobile/account/authenticated.tsx
+++ b/src/app/components/layout/header/mobile/account/authenticated.tsx
@@ -2,14 +2,14 @@ import { LogOut, UserCircle } from 'lucide-react';
import { useLogout } from '@/app/hooks/features/header/useLogout';
import { useLayoutTranslations } from '@/app/hooks/locales/translations/components';
import CustomIcon from '@/app/components/icon';
-import { SidebarMenuButton } from '@/app/components/ui/sidebar';
+import { MenuButton } from '@/app/components/ui/sidebar';
const Authenticated = () => {
const tHeader = useLayoutTranslations('header');
const { logout } = useLogout();
return [
-
+
{
size={20}
className='text-lg hover:text-header-foreground'
/>
- ,
-
+ ,
+
,
+ ,
];
};
diff --git a/src/app/components/layout/header/mobile/account/unauthenticated.tsx b/src/app/components/layout/header/mobile/account/unauthenticated.tsx
index cdde377..5d0bd37 100644
--- a/src/app/components/layout/header/mobile/account/unauthenticated.tsx
+++ b/src/app/components/layout/header/mobile/account/unauthenticated.tsx
@@ -1,28 +1,28 @@
import { LogIn, UserPen } from 'lucide-react';
import { useLayoutTranslations } from '@/app/hooks/locales/translations/components';
import CustomIcon from '@/app/components/icon';
-import { SidebarMenuButton } from '@/app/components/ui/sidebar';
+import { MenuButton } from '@/app/components/ui/sidebar';
const Unauthenticated = () => {
const tHeader = useLayoutTranslations('header');
return [
-
+
,
-
+ ,
+
,
+ ,
];
};
diff --git a/src/app/components/layout/header/mobile/index.tsx b/src/app/components/layout/header/mobile/index.tsx
index dd192d3..c6ec756 100644
--- a/src/app/components/layout/header/mobile/index.tsx
+++ b/src/app/components/layout/header/mobile/index.tsx
@@ -1,5 +1,5 @@
import { useAuthStore } from '@/app/hooks/stores/useAuthStore';
-import { SidebarProvider } from '@/app/components/ui/sidebar';
+import { Provider } from '@/app/components/ui/sidebar';
import Navbar from './navbar';
import Sidebar from './sidebar';
import navs from './navs';
@@ -8,14 +8,14 @@ const Mobile = () => {
const { is } = useAuthStore();
return (
-
+
+
);
};
diff --git a/src/app/components/layout/header/mobile/navbar.tsx b/src/app/components/layout/header/mobile/navbar.tsx
index 3a12017..33502a7 100644
--- a/src/app/components/layout/header/mobile/navbar.tsx
+++ b/src/app/components/layout/header/mobile/navbar.tsx
@@ -2,15 +2,15 @@ import { Link } from '@tanstack/react-router';
import { TITLE } from '@/app/constants/global';
import NotificationsTab from '@/app/components/layout/header/notifications';
import CartIndicator from '@/app/components/layout/header/cart';
-import { SidebarInset, SidebarTrigger } from '@/app/components/ui/sidebar';
+import { Inset, Trigger } from '@/app/components/ui/sidebar';
import Preferences from '../preferences';
const Header = () => (
-
+
-
+
);
export default Header;
diff --git a/src/app/components/layout/header/mobile/navs.ts b/src/app/components/layout/header/mobile/navs.ts
index 08d8002..b45e2b3 100644
--- a/src/app/components/layout/header/mobile/navs.ts
+++ b/src/app/components/layout/header/mobile/navs.ts
@@ -1,13 +1,13 @@
import { Hammer, Home, Store } from 'lucide-react';
-import * as auth from '@/lib/utils/auth';
-import { SidebarProps } from './sidebar';
+import { auth } from '@/lib/utils';
+import { Props } from './sidebar';
export default {
main: [
{ name: 'home', url: '/', icon: Home },
{ name: 'gallery', url: '/gallery', icon: Store },
],
- getCollections: (is): SidebarProps['collections'] => {
+ getCollections: (is): Props['collections'] => {
if (is.guest)
return [
{
@@ -29,7 +29,7 @@ export default {
return [];
},
- getWorkspaces: (is): SidebarProps['workspaces'] => {
+ getWorkspaces: (is): Props['workspaces'] => {
if (is.customer)
return [
{
@@ -133,7 +133,7 @@ export default {
return [];
},
} satisfies {
- main: SidebarProps['main'];
- getCollections: (is: auth.Returns) => SidebarProps['collections'];
- getWorkspaces: (is: auth.Returns) => SidebarProps['workspaces'];
+ main: Props['main'];
+ getCollections: (is: auth.Returns) => Props['collections'];
+ getWorkspaces: (is: auth.Returns) => Props['workspaces'];
};
diff --git a/src/app/components/layout/header/mobile/sidebar/collections.tsx b/src/app/components/layout/header/mobile/sidebar/collections.tsx
index 4097ff7..f0fde06 100644
--- a/src/app/components/layout/header/mobile/sidebar/collections.tsx
+++ b/src/app/components/layout/header/mobile/sidebar/collections.tsx
@@ -1,37 +1,37 @@
import { Link } from '@tanstack/react-router';
import { useLayoutTranslations } from '@/app/hooks/locales/translations/components';
import {
- SidebarGroup,
- SidebarGroupLabel,
- SidebarMenu,
- SidebarMenuButton,
- SidebarMenuItem,
+ Group,
+ GroupLabel,
+ Menu,
+ MenuItem,
+ MenuButton,
} from '@/app/components/ui/sidebar';
import { Item } from '.';
-type NavCollectionsProps = { items: Item[] };
-const NavCollections = ({ items }: NavCollectionsProps) => {
+type Props = { items: Item[] };
+const NavCollections = ({ items }: Props) => {
const tHeader = useLayoutTranslations('header');
if (!items.length) return;
return (
-
- {tHeader('useful')}
-
+
+ {tHeader('useful')}
+
-
+
+
);
};
diff --git a/src/app/components/layout/header/mobile/sidebar/index.tsx b/src/app/components/layout/header/mobile/sidebar/index.tsx
index 30c16b2..8c76844 100644
--- a/src/app/components/layout/header/mobile/sidebar/index.tsx
+++ b/src/app/components/layout/header/mobile/sidebar/index.tsx
@@ -1,14 +1,8 @@
import { LinkProps } from '@tanstack/react-router';
import { type LucideIcon } from 'lucide-react';
-import { OnlyParam } from '@/lib/utils/typescript';
import { TITLE } from '@/app/constants/global';
-import { Header } from '@/app/locales/types/components/layout';
-import {
- Sidebar as SidebarUI,
- SidebarContent,
- SidebarHeader,
- SidebarRail,
-} from '@/app/components/ui/sidebar';
+import { type Header } from '@/app/locales/types/components/layout';
+import { sidebar } from '@/app/components/ui';
import NavMain from './main';
import NavCollections from './collections';
import NavWorkspaces from './workspaces';
@@ -20,27 +14,27 @@ export type Item = {
icon: LucideIcon;
};
-export type SidebarProps = {
- main: OnlyParam['items'];
- collections: OnlyParam['items'];
- workspaces: OnlyParam['items'];
+export type Props = {
+ main: React.ComponentProps['items'];
+ collections: React.ComponentProps['items'];
+ workspaces: React.ComponentProps['items'];
};
-const Sidebar = ({ main, collections, workspaces }: SidebarProps) => (
-
-
+const Sidebar = ({ main, collections, workspaces }: Props) => (
+
+
{TITLE}
-
+
+
-
+
+ - ;
};
-const NavMain = ({ items }: NavMainProps) => {
+const NavMain = ({ items }: Props) => {
const tHeader = useLayoutTranslations('header');
return (
-
+
-
-
+
+
))}
-
+
);
};
diff --git a/src/app/components/layout/header/mobile/sidebar/secondary.tsx b/src/app/components/layout/header/mobile/sidebar/secondary.tsx
index ce19d26..0be295d 100644
--- a/src/app/components/layout/header/mobile/sidebar/secondary.tsx
+++ b/src/app/components/layout/header/mobile/sidebar/secondary.tsx
@@ -2,45 +2,40 @@ import { Link } from '@tanstack/react-router';
import { useLayoutTranslations } from '@/app/hooks/locales/translations/components';
import Account from '../account';
import {
- SidebarGroup,
- SidebarGroupContent,
- SidebarMenu,
- SidebarMenuBadge,
- SidebarMenuButton,
- SidebarMenuItem,
+ Group,
+ GroupContent,
+ Menu,
+ MenuItem,
+ MenuButton,
+ MenuBadge,
} from '@/app/components/ui/sidebar';
import { Item } from '.';
-type NavSecondaryProps = { items: Array- };
-const NavSecondary = ({
- items,
- ...props
-}: NavSecondaryProps & React.ComponentPropsWithoutRef
) => {
+type Props = React.ComponentPropsWithoutRef & {
+ items: Array- ;
+};
+const NavSecondary = ({ items, ...props }: Props) => {
const tHeader = useLayoutTranslations('header');
return (
-
-
-
+
+
+
-
-
+
+
+
);
};
diff --git a/src/app/components/layout/header/mobile/sidebar/workspaces.tsx b/src/app/components/layout/header/mobile/sidebar/workspaces.tsx
index f1c16c2..fc0d7a4 100644
--- a/src/app/components/layout/header/mobile/sidebar/workspaces.tsx
+++ b/src/app/components/layout/header/mobile/sidebar/workspaces.tsx
@@ -1,62 +1,48 @@
import { Link } from '@tanstack/react-router';
import { ChevronRight } from 'lucide-react';
import { useLayoutTranslations } from '@/app/hooks/locales/translations/components';
-import {
- Collapsible,
- CollapsibleContent,
- CollapsibleTrigger,
-} from '@/app/components/ui/collapsible';
-import {
- SidebarGroup,
- SidebarGroupContent,
- SidebarGroupLabel,
- SidebarMenu,
- SidebarMenuAction,
- SidebarMenuButton,
- SidebarMenuItem,
- SidebarMenuSub,
- SidebarMenuSubButton,
- SidebarMenuSubItem,
-} from '@/app/components/ui/sidebar';
+import { collapsible, sidebar } from '@/app/components/ui';
import { Item } from '.';
-type NavWorkspacesProps = {
+type Props = {
items: Array<{ name: Item['name']; pages: Item[] }>;
};
-const NavWorkspaces = ({ items }: NavWorkspacesProps) => {
+const NavWorkspaces = ({ items }: Props) => {
const tHeader = useLayoutTranslations('header');
if (!items.length) return;
return (
-
-
+
+
{tHeader('collections')}
-
-
-
+
+
+
{items.map((item) => (
-
-
-
-
+
+
+
-
-
-
+
+
+
+
{tHeader(item.name)}
-
-
-
-
+
+
+
+
{item.pages.map((page) => (
-
-
+
+
-
+
+
))}
-
-
-
-
+
+
+
+
))}
-
-
-
+
+
+
);
};
diff --git a/src/app/components/layout/header/notifications/index.tsx b/src/app/components/layout/header/notifications/index.tsx
index ce7d64c..32626bc 100644
--- a/src/app/components/layout/header/notifications/index.tsx
+++ b/src/app/components/layout/header/notifications/index.tsx
@@ -2,11 +2,11 @@ import { Bell } from 'lucide-react';
import { useInfiniteQuery } from '@customcads/react-sdk';
import { useNotificationRealTime } from '@/app/hooks/features/notifications/useNotificationRealTime';
import { useAuthStore } from '@/app/hooks/stores/useAuthStore';
-import { Popover, PopoverTrigger } from '@/app/components/ui/popover';
+import { popover } from '@/app/components/ui';
import CustomIcon from '@/app/components/icon';
-import Content from './content';
+import Scroll from './scroll';
-const ALL_PARAMS = { limit: 10 };
+const ALL_PARAMS = { page: 1, limit: 10 };
const bell =
- {bell}
- items)}
- nextPage={{
- exists: query.hasNextPage,
- isFetching: query.isFetchingNextPage,
- fetch: query.fetchNextPage,
- }}
- />
-
+
+ {bell}
+
+
+
);
};
diff --git a/src/app/components/layout/header/notifications/item.tsx b/src/app/components/layout/header/notifications/item.tsx
index 32fbbd7..b8e13d3 100644
--- a/src/app/components/layout/header/notifications/item.tsx
+++ b/src/app/components/layout/header/notifications/item.tsx
@@ -14,11 +14,11 @@ const NotificationItem = ({ notification }: Props) => {
const Wrapper = !!notification.link ? Link : 'div';
return (
{notification.status === 'Unread' && (
@@ -26,7 +26,7 @@ const NotificationItem = ({ notification }: Props) => {
)}
{notification.description}
-
+
{dateTime.formatRelative({ date: notification.createdAt })}
diff --git a/src/app/components/layout/header/notifications/content.tsx b/src/app/components/layout/header/notifications/scroll.tsx
similarity index 62%
rename from src/app/components/layout/header/notifications/content.tsx
rename to src/app/components/layout/header/notifications/scroll.tsx
index 6d03ffa..d6eb8d2 100644
--- a/src/app/components/layout/header/notifications/content.tsx
+++ b/src/app/components/layout/header/notifications/scroll.tsx
@@ -2,12 +2,10 @@ import { AllNotificationsResponse } from '@customcads/react-sdk';
import { useNotificationVirtualization } from '@/app/hooks/features/notifications/useNotificationVirtualization';
import { useLayoutTranslations } from '@/app/hooks/locales/translations/components';
import Loader from '@/app/components/loading';
-import { PopoverContent } from '@/app/components/ui/popover';
-import { ScrollArea } from '@/app/components/ui/scroll-area';
-import Triangle from './triangle';
+import { scroll } from '@/app/components/ui';
import NotificationItem from './item';
-type ContentProps = {
+type Props = {
notifications: AllNotificationsResponse[];
nextPage: {
exists: boolean;
@@ -15,7 +13,7 @@ type ContentProps = {
fetch: VoidFunction;
};
};
-const Content = ({ notifications, nextPage }: ContentProps) => {
+const Scroll = ({ notifications, nextPage }: Props) => {
const virtualizer = useNotificationVirtualization({
length: nextPage.exists
? notifications.length + 1
@@ -61,31 +59,28 @@ const Content = ({ notifications, nextPage }: ContentProps) => {
));
return (
-
-
-
- {props.trigger}
-
-
-
-
- {props.empty}
-
-
+
+ {props.trigger}
+
+
+
+ {props.empty}
+
{options.map((option) => (
- {
@@ -63,13 +59,13 @@ const LanguageCombobox = ({ current, options, ...props }: Props) => {
- {handles().map((handle, i) => (
-
- ))}
-
- );
-};
-
-export default RangeField;
diff --git a/src/app/components/form/error.tsx b/src/app/components/form/error.tsx
index 98269a7..88c8a42 100644
--- a/src/app/components/form/error.tsx
+++ b/src/app/components/form/error.tsx
@@ -1,4 +1,4 @@
-import { cn } from '@/lib/utils/tailwindcss';
+import { cn } from '@/lib/utils';
type Props = { message: string | undefined };
export const Error = ({ message }: Props) => (
diff --git a/src/app/components/form/multi-step/index.tsx b/src/app/components/form/multi-step/index.tsx
index 2009033..4ba30b3 100644
--- a/src/app/components/form/multi-step/index.tsx
+++ b/src/app/components/form/multi-step/index.tsx
@@ -1,7 +1,7 @@
import { type Step } from '@/types/form';
import { type Children } from '@/types/react';
-import { cn } from '@/lib/utils/tailwindcss';
-import { Button } from '@/app/components/ui/button';
+import { cn } from '@/lib/utils';
+import { Button } from '@/app/components/ui';
import Indicator from './indicator';
type Props
-
+
+
+
-
- {tHeader(titleKey)}
-
+
+
- {group.map(({ link, textKey }) => (
-
-
+
-
-
+ {group.map(({ link, textKey }) => (
+
+
+
{tHeader(textKey)}
-
+
- ))}
-
- {i !== items.length - 1 && (
-
+ ))}
+
))}
- -
-
+ - @@ -22,7 +22,7 @@ const Header = () => (
{TITLE}
+ items)}
+ nextPage={{
+ exists: query.hasNextPage,
+ isFetching: query.isFetchingNextPage,
+ fetch: query.fetchNextPage,
+ }}
+ />
+
+
-
+
);
};
-export default Content;
+export default Scroll;
diff --git a/src/app/components/layout/header/notifications/triangle.tsx b/src/app/components/layout/header/notifications/triangle.tsx
deleted file mode 100644
index bac4f60..0000000
--- a/src/app/components/layout/header/notifications/triangle.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-const d = 'M-150 100 Q00 80 50 0 Q100 80 250 100';
-
-const Triangle = () => (
-
-
+
+
-
+
-
-
+
))}
-
-
-
-
-
+
+
+
+
+
);
};
diff --git a/src/app/components/preferences/language/compobox.tsx b/src/app/components/preferences/language/compobox.tsx
index 46f2942..aa66735 100644
--- a/src/app/components/preferences/language/compobox.tsx
+++ b/src/app/components/preferences/language/compobox.tsx
@@ -1,10 +1,8 @@
-'use client';
import { useState } from 'react';
import { CheckIcon } from 'lucide-react';
import { AllowedLanguage } from '@/types/locale';
-import { cn } from '@/lib/utils/tailwindcss';
-import * as command from '@/app/components/ui/command';
-import * as popover from '@/app/components/ui/popover';
+import { cn } from '@/lib/utils';
+import { command, popover } from '@/app/components/ui';
type Option = { value: AllowedLanguage; label: string; flag: string };
type Props = {
@@ -19,18 +17,16 @@ const LanguageCombobox = ({ current, options, ...props }: Props) => {
const [open, setOpen] = useState(false);
return (
- - {tHeader('notifications')} -
+
+
+ + {tHeader('notifications')} +
-
-
+ -
- {items}
-
+
-
-
+ -
+ {items}
+
-
-
-);
-
-export default Triangle;
diff --git a/src/app/components/layout/header/preferences/index.tsx b/src/app/components/layout/header/preferences/index.tsx
index ab6a9fa..5e472d8 100644
--- a/src/app/components/layout/header/preferences/index.tsx
+++ b/src/app/components/layout/header/preferences/index.tsx
@@ -1,51 +1,43 @@
import { Settings2 } from 'lucide-react';
-import { cn } from '@/lib/utils/tailwindcss';
+import { cn } from '@/lib/utils';
import { useInfoTranslations } from '@/app/hooks/locales/translations/pages/public';
import CustomIcon from '@/app/components/icon';
-import * as dialog from '@/app/components/ui/dialog';
+import { sheet } from '@/app/components/ui';
import * as preferences from '@/app/components/preferences';
const Preferences = ({ text }: { text?: string }) => {
const tPreferences = useInfoTranslations('preferences');
return (
-
-
- {props.trigger}
-
-
-
-
- {props.empty}
-
-
+
+ {props.trigger}
+
+
+
+ {props.empty}
+
{options.map((option) => (
- {
@@ -67,13 +63,13 @@ const CurrencyCombobox = ({ current, options, ...props }: Props) => {
)}
-
+
- {tPreferences('theme')}
-
-
- {tPreferences('language')}
-
-
- {tPreferences('currency')}
-
-
+ {tPreferences('theme')}
+
-
-
+
+ {tPreferences('language')}
+
+
+ {tPreferences('currency')}
+
+
+
);
};
diff --git a/src/app/components/loading/index.tsx b/src/app/components/loading/index.tsx
index c68292b..862730e 100644
--- a/src/app/components/loading/index.tsx
+++ b/src/app/components/loading/index.tsx
@@ -1,10 +1,9 @@
-import { Progress } from '@/app/components/ui/progress';
-import { Spinner } from '@/app/components/ui/spinner';
+import { Progress, Spinner } from '@/app/components/ui';
-type LoaderProps =
+type Props =
| { isCad: true; progress: number }
| { isCad?: undefined | false; size?: number };
-const Loader = (props: LoaderProps) => {
+const Loader = (props: Props) => {
if (!props.isCad) {
return