From faee3062fe7f06774cb5f5ee4884dd02fb6aef87 Mon Sep 17 00:00:00 2001 From: bicochan Date: Wed, 30 Apr 2025 15:40:31 +0900 Subject: [PATCH] =?UTF-8?q?chore:=20components=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=20=EC=B0=B8=EC=A1=B0=20=EA=B2=BD=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/cs/app/(with-base-layout)/layout.tsx | 4 ++-- apps/cs/package.json | 1 + apps/cs/src/app/providers/app-provider.tsx | 4 ++++ .../menu-authority/model/menu-authority-table-columns.tsx | 2 +- .../menu-authority/ui/management-authority-dialog.tsx | 2 +- apps/cs/src/entities/menu/index.ts | 1 + apps/cs/src/entities/posting/ui/posting-dialog.tsx | 4 ++-- apps/cs/src/pages/banner/model/banner-table-columns.tsx | 2 +- apps/cs/src/pages/banner/model/posting-table-columns.tsx | 2 +- apps/cs/src/pages/banner/ui/modify-page.tsx | 2 +- apps/cs/src/pages/bbs/model/table-columns.tsx | 2 +- apps/cs/src/pages/contents/ui/modify-page.tsx | 2 +- apps/cs/src/pages/image/model/image-table-columns.tsx | 2 +- apps/cs/src/pages/image/model/posting-table-columns.tsx | 2 +- apps/cs/src/pages/image/ui/modify-page.tsx | 2 +- apps/cs/src/pages/menu/model/board-table-columns.tsx | 2 +- apps/cs/src/pages/menu/model/contents-table-colums.tsx | 2 +- apps/cs/src/pages/menu/ui/board-search-dialog.tsx | 2 +- apps/cs/src/pages/menu/ui/content-search-dialog.tsx | 2 +- apps/cs/src/pages/menu/ui/editable-node.tsx | 2 +- apps/cs/src/pages/menu/ui/menu-node.tsx | 3 +-- apps/cs/src/pages/menu/ui/menu-page.tsx | 2 +- apps/cs/src/pages/menu/ui/menu-tree.tsx | 2 +- apps/cs/src/pages/menu/ui/organization-search-dialog.tsx | 4 ++-- .../pages/module/model/role-authorizations-table-columns.tsx | 2 +- apps/cs/src/pages/module/ui/management-authority-dialog.tsx | 2 +- .../organization/model/additional-user-table-columns.tsx | 2 +- apps/cs/src/pages/organization/ui/additional-user-dialog.tsx | 2 +- .../src/pages/organization/ui/move-organization-dialog.tsx | 2 +- apps/cs/src/pages/organization/ui/organization-page.tsx | 2 +- .../src/pages/organization/ui/user-organization-section.tsx | 4 +--- apps/cs/src/shared/store/menu-store.ts | 2 +- apps/cs/src/shared/ui/alert-dialog.tsx | 2 +- apps/cs/src/shared/ui/confirm-dialog.tsx | 2 +- apps/cs/src/shared/ui/skeleton-page.tsx | 4 +++- apps/cs/src/widgets/dnd-tree/ui/custom-node.tsx | 3 +-- apps/cs/src/widgets/dnd-tree/ui/dnd-tree.tsx | 3 +-- apps/cs/src/widgets/dnd-tree/ui/editable-node.tsx | 2 +- apps/cs/src/widgets/form-wrapper/ui/form-wrapper.tsx | 2 +- apps/cs/tsconfig.json | 5 ++--- 40 files changed, 49 insertions(+), 47 deletions(-) diff --git a/apps/cs/app/(with-base-layout)/layout.tsx b/apps/cs/app/(with-base-layout)/layout.tsx index c3254a935..8af048390 100644 --- a/apps/cs/app/(with-base-layout)/layout.tsx +++ b/apps/cs/app/(with-base-layout)/layout.tsx @@ -2,8 +2,8 @@ import { usePathname, useRouter } from "next/navigation"; import { useQueryClient } from "@tanstack/react-query"; -import type { MenuItem } from "@common/components/api"; -import { BaseLayout } from "@common/components/ui"; +import { BaseLayout } from "@common/components"; +import type { MenuItem } from "@/entities/menu"; import { useMenuStore } from "@/shared/lib"; import { PageLayout } from "@/shared/ui/page-layout"; diff --git a/apps/cs/package.json b/apps/cs/package.json index 9691a2a41..6e5f62b96 100644 --- a/apps/cs/package.json +++ b/apps/cs/package.json @@ -11,6 +11,7 @@ "dependencies": { "@common/assets": "workspace:*", "@common/components": "workspace:*", + "@common/config": "workspace:*", "@frontend-opensource/use-react-hooks": "^1.1.4", "@hookform/resolvers": "^4.1.3", "@minoru/react-dnd-treeview": "3.5.1-alpha.1", diff --git a/apps/cs/src/app/providers/app-provider.tsx b/apps/cs/src/app/providers/app-provider.tsx index 5973279a3..713bc172c 100644 --- a/apps/cs/src/app/providers/app-provider.tsx +++ b/apps/cs/src/app/providers/app-provider.tsx @@ -9,9 +9,13 @@ import { MenuWrapper } from "@/entities/menu"; import { StoreProvider } from "@/shared/providers"; import { AlertDialog } from "@/shared/ui/alert-dialog"; import { ConfirmDialog } from "@/shared/ui/confirm-dialog"; +import { initializeNextClientConfig } from "@common/config"; const AppProvider = ({ children }: Readonly<{ children: React.ReactNode }>) => { const queryClient = new QueryClient(); + + initializeNextClientConfig(); + return ( diff --git a/apps/cs/src/entities/menu-authority/model/menu-authority-table-columns.tsx b/apps/cs/src/entities/menu-authority/model/menu-authority-table-columns.tsx index b70731542..6969a85e9 100644 --- a/apps/cs/src/entities/menu-authority/model/menu-authority-table-columns.tsx +++ b/apps/cs/src/entities/menu-authority/model/menu-authority-table-columns.tsx @@ -1,6 +1,6 @@ import type { ColumnDef } from "@tanstack/react-table"; import type { UseFormReturn } from "react-hook-form"; -import { Checkbox } from "@common/components/ui"; +import { Checkbox } from "@common/components"; import type { MenuAuthority, MenuAuthorityFormData, diff --git a/apps/cs/src/entities/menu-authority/ui/management-authority-dialog.tsx b/apps/cs/src/entities/menu-authority/ui/management-authority-dialog.tsx index ea5bbb788..a6d4d2128 100644 --- a/apps/cs/src/entities/menu-authority/ui/management-authority-dialog.tsx +++ b/apps/cs/src/entities/menu-authority/ui/management-authority-dialog.tsx @@ -13,7 +13,7 @@ import { DialogHeader, DialogTitle, DialogTrigger, -} from "@common/components/ui"; +} from "@common/components"; import { ENDPOINT } from "@/shared/config"; import { useAlertStore } from "@/shared/lib/use-alert-store"; import { diff --git a/apps/cs/src/entities/menu/index.ts b/apps/cs/src/entities/menu/index.ts index 1fa9dd218..04f63e38b 100644 --- a/apps/cs/src/entities/menu/index.ts +++ b/apps/cs/src/entities/menu/index.ts @@ -1 +1,2 @@ export { MenuWrapper } from "./lib/menu-wrapper"; +export type { MenuItem } from "./model/menu-interface"; diff --git a/apps/cs/src/entities/posting/ui/posting-dialog.tsx b/apps/cs/src/entities/posting/ui/posting-dialog.tsx index c461bcda9..bbddf9778 100644 --- a/apps/cs/src/entities/posting/ui/posting-dialog.tsx +++ b/apps/cs/src/entities/posting/ui/posting-dialog.tsx @@ -23,8 +23,8 @@ import { DateRangePicker, DialogClose, DialogFooter, -} from "@common/components/ui"; -import { cn } from "@common/components/lib"; + cn, +} from "@common/components"; import { CodeSelect } from "@/entities/code/@x/posting"; import { SiteApi, type Site } from "@/entities/site/@x/posting"; import type { PageableList } from "@/shared/model"; diff --git a/apps/cs/src/pages/banner/model/banner-table-columns.tsx b/apps/cs/src/pages/banner/model/banner-table-columns.tsx index 74da7c31c..22c654a5a 100644 --- a/apps/cs/src/pages/banner/model/banner-table-columns.tsx +++ b/apps/cs/src/pages/banner/model/banner-table-columns.tsx @@ -4,7 +4,7 @@ import dayjs from "dayjs"; import Image from "next/image"; import { useQuery } from "@tanstack/react-query"; import type { ColumnDef } from "@tanstack/react-table"; -import { Checkbox, Skeleton } from "@common/components/ui"; +import { Checkbox, Skeleton } from "@common/components"; import { AttachmentApi } from "@/entities/attachment"; import { ENDPOINT } from "@/shared/config"; import type { Banner } from "./banner-interface"; diff --git a/apps/cs/src/pages/banner/model/posting-table-columns.tsx b/apps/cs/src/pages/banner/model/posting-table-columns.tsx index a43cf8693..3daee86f8 100644 --- a/apps/cs/src/pages/banner/model/posting-table-columns.tsx +++ b/apps/cs/src/pages/banner/model/posting-table-columns.tsx @@ -2,7 +2,7 @@ import dayjs from "dayjs"; import type { ColumnDef } from "@tanstack/react-table"; -import { Checkbox } from "@common/components/ui"; +import { Checkbox } from "@common/components"; import type { Post } from "@/entities/posting"; export const columns: ColumnDef[] = [ diff --git a/apps/cs/src/pages/banner/ui/modify-page.tsx b/apps/cs/src/pages/banner/ui/modify-page.tsx index f0f679529..c8a53c423 100644 --- a/apps/cs/src/pages/banner/ui/modify-page.tsx +++ b/apps/cs/src/pages/banner/ui/modify-page.tsx @@ -11,7 +11,7 @@ import { type RowSelectionState, } from "@tanstack/react-table"; import { useConfirm } from "@frontend-opensource/use-react-hooks"; -import { Button, DataTable } from "@common/components/ui"; +import { Button, DataTable } from "@common/components"; import { PostingApi, type PostPayload } from "@/entities/posting"; import { useAlertStore } from "@/shared/lib/use-alert-store"; import { ENDPOINT } from "@/shared/config"; diff --git a/apps/cs/src/pages/bbs/model/table-columns.tsx b/apps/cs/src/pages/bbs/model/table-columns.tsx index 27d026a7d..6ae60fe73 100644 --- a/apps/cs/src/pages/bbs/model/table-columns.tsx +++ b/apps/cs/src/pages/bbs/model/table-columns.tsx @@ -3,7 +3,7 @@ import { useRouter } from "next/navigation"; import type { ColumnDef, Row } from "@tanstack/react-table"; import { useLocalStorage } from "@frontend-opensource/use-react-hooks"; import type { Board } from "@/entities/board/model/board-interface"; -import { Button } from "@common/components/ui"; +import { Button } from "@common/components"; export const columns: ColumnDef[] = [ { diff --git a/apps/cs/src/pages/contents/ui/modify-page.tsx b/apps/cs/src/pages/contents/ui/modify-page.tsx index e4b765f24..8986648c7 100644 --- a/apps/cs/src/pages/contents/ui/modify-page.tsx +++ b/apps/cs/src/pages/contents/ui/modify-page.tsx @@ -21,7 +21,7 @@ import { SelectContent, SelectItem, Button, -} from "@common/components/ui"; +} from "@common/components"; function ModifyPage({ sequential }: { sequential: string }) { const { confirm } = useConfirm(); diff --git a/apps/cs/src/pages/image/model/image-table-columns.tsx b/apps/cs/src/pages/image/model/image-table-columns.tsx index dd80ad9c7..535ed16f2 100644 --- a/apps/cs/src/pages/image/model/image-table-columns.tsx +++ b/apps/cs/src/pages/image/model/image-table-columns.tsx @@ -2,7 +2,7 @@ import dayjs from "dayjs"; import { type ColumnDef } from "@tanstack/react-table"; -import { Checkbox } from "@common/components/ui"; +import { Checkbox } from "@common/components"; import { type Image } from "./image-interface"; import { IMAGE_TYPE } from "./image-interface"; diff --git a/apps/cs/src/pages/image/model/posting-table-columns.tsx b/apps/cs/src/pages/image/model/posting-table-columns.tsx index a43cf8693..3daee86f8 100644 --- a/apps/cs/src/pages/image/model/posting-table-columns.tsx +++ b/apps/cs/src/pages/image/model/posting-table-columns.tsx @@ -2,7 +2,7 @@ import dayjs from "dayjs"; import type { ColumnDef } from "@tanstack/react-table"; -import { Checkbox } from "@common/components/ui"; +import { Checkbox } from "@common/components"; import type { Post } from "@/entities/posting"; export const columns: ColumnDef[] = [ diff --git a/apps/cs/src/pages/image/ui/modify-page.tsx b/apps/cs/src/pages/image/ui/modify-page.tsx index ec6030531..16163688e 100644 --- a/apps/cs/src/pages/image/ui/modify-page.tsx +++ b/apps/cs/src/pages/image/ui/modify-page.tsx @@ -11,7 +11,7 @@ import { type RowSelectionState, } from "@tanstack/react-table"; import { useConfirm } from "@frontend-opensource/use-react-hooks"; -import { Button, DataTable } from "@common/components/ui"; +import { Button, DataTable } from "@common/components"; import { PostingApi, type PostPayload } from "@/entities/posting"; import { useAlertStore } from "@/shared/lib/use-alert-store"; import { ENDPOINT } from "@/shared/config"; diff --git a/apps/cs/src/pages/menu/model/board-table-columns.tsx b/apps/cs/src/pages/menu/model/board-table-columns.tsx index 4cdf29498..ba78b06c7 100644 --- a/apps/cs/src/pages/menu/model/board-table-columns.tsx +++ b/apps/cs/src/pages/menu/model/board-table-columns.tsx @@ -1,5 +1,5 @@ import type { ColumnDef } from "@tanstack/react-table"; -import { Checkbox } from "@common/components/ui"; +import { Checkbox } from "@common/components"; import type { BoardPopup } from "@/entities/board"; export const columns: ColumnDef[] = [ diff --git a/apps/cs/src/pages/menu/model/contents-table-colums.tsx b/apps/cs/src/pages/menu/model/contents-table-colums.tsx index a96434c39..0f274210b 100644 --- a/apps/cs/src/pages/menu/model/contents-table-colums.tsx +++ b/apps/cs/src/pages/menu/model/contents-table-colums.tsx @@ -1,6 +1,6 @@ import dayjs from "dayjs"; import type { ColumnDef } from "@tanstack/react-table"; -import { Checkbox } from "@common/components/ui"; +import { Checkbox } from "@common/components"; import type { Contents } from "@/entities/content"; export const columns: ColumnDef[] = [ diff --git a/apps/cs/src/pages/menu/ui/board-search-dialog.tsx b/apps/cs/src/pages/menu/ui/board-search-dialog.tsx index 531e17c86..0afb6b1bd 100644 --- a/apps/cs/src/pages/menu/ui/board-search-dialog.tsx +++ b/apps/cs/src/pages/menu/ui/board-search-dialog.tsx @@ -14,7 +14,7 @@ import { DialogHeader, DialogTitle, Input, -} from "@common/components/ui"; +} from "@common/components"; import { ENDPOINT } from "@/shared/config"; import { BoardApi, type BoardPopup } from "@/entities/board"; import { columns } from "../model/board-table-columns"; diff --git a/apps/cs/src/pages/menu/ui/content-search-dialog.tsx b/apps/cs/src/pages/menu/ui/content-search-dialog.tsx index 73e9b7263..d877e1b83 100644 --- a/apps/cs/src/pages/menu/ui/content-search-dialog.tsx +++ b/apps/cs/src/pages/menu/ui/content-search-dialog.tsx @@ -14,7 +14,7 @@ import { DialogHeader, DialogTitle, Input, -} from "@common/components/ui"; +} from "@common/components"; import { ENDPOINT } from "@/shared/config"; import { ContentsApi, type Contents } from "@/entities/content"; import { columns } from "../model/contents-table-colums"; diff --git a/apps/cs/src/pages/menu/ui/editable-node.tsx b/apps/cs/src/pages/menu/ui/editable-node.tsx index 9ada835e2..f2274f4d8 100644 --- a/apps/cs/src/pages/menu/ui/editable-node.tsx +++ b/apps/cs/src/pages/menu/ui/editable-node.tsx @@ -1,5 +1,5 @@ import type { ComponentProps } from "react"; -import { Button, Input } from "@common/components/ui"; +import { Button, Input } from "@common/components"; type EditableNodeProps = { depth?: number; diff --git a/apps/cs/src/pages/menu/ui/menu-node.tsx b/apps/cs/src/pages/menu/ui/menu-node.tsx index 1cde10b99..f6bb7ee6e 100644 --- a/apps/cs/src/pages/menu/ui/menu-node.tsx +++ b/apps/cs/src/pages/menu/ui/menu-node.tsx @@ -1,8 +1,7 @@ import { useEffect, useState } from "react"; import { useMutation, useQueryClient } from "@tanstack/react-query"; import type { NodeModel, TreeMethods } from "@minoru/react-dnd-treeview"; -import { Button } from "@common/components/ui"; -import { cn } from "@common/components/lib"; +import { Button, cn } from "@common/components"; import { ENDPOINT } from "@/shared/config"; import { MenuApi } from "../api/menu-service"; import type { TreeMenu } from "../model/menu-interface"; diff --git a/apps/cs/src/pages/menu/ui/menu-page.tsx b/apps/cs/src/pages/menu/ui/menu-page.tsx index a54a42563..19ee1478b 100644 --- a/apps/cs/src/pages/menu/ui/menu-page.tsx +++ b/apps/cs/src/pages/menu/ui/menu-page.tsx @@ -13,7 +13,7 @@ import { SelectItem, SelectTrigger, SelectValue, -} from "@common/components/ui"; +} from "@common/components"; import { SiteApi } from "@/entities/site"; import { ENDPOINT } from "@/shared/config"; import { useAlertStore } from "@/shared/lib/use-alert-store"; diff --git a/apps/cs/src/pages/menu/ui/menu-tree.tsx b/apps/cs/src/pages/menu/ui/menu-tree.tsx index 07c15c7ae..0a926a27b 100644 --- a/apps/cs/src/pages/menu/ui/menu-tree.tsx +++ b/apps/cs/src/pages/menu/ui/menu-tree.tsx @@ -8,7 +8,7 @@ import { type NodeModel, type TreeMethods, } from "@minoru/react-dnd-treeview"; -import { Button } from "@common/components/ui"; +import { Button } from "@common/components"; import { ENDPOINT } from "@/shared/config"; import { MenuApi } from "../api/menu-service"; import type { MenuFormData, TreeMenu, TreeNode } from "../model/menu-interface"; diff --git a/apps/cs/src/pages/menu/ui/organization-search-dialog.tsx b/apps/cs/src/pages/menu/ui/organization-search-dialog.tsx index 14eccbf98..19e3fcf87 100644 --- a/apps/cs/src/pages/menu/ui/organization-search-dialog.tsx +++ b/apps/cs/src/pages/menu/ui/organization-search-dialog.tsx @@ -17,8 +17,8 @@ import { DialogTitle, DialogTrigger, Input, -} from "@common/components/ui"; -import { cn } from "@common/components/lib"; + cn, +} from "@common/components"; import { UserOrganizationApi, type TreeUserOrganization, diff --git a/apps/cs/src/pages/module/model/role-authorizations-table-columns.tsx b/apps/cs/src/pages/module/model/role-authorizations-table-columns.tsx index c5517824b..052bd02db 100644 --- a/apps/cs/src/pages/module/model/role-authorizations-table-columns.tsx +++ b/apps/cs/src/pages/module/model/role-authorizations-table-columns.tsx @@ -1,6 +1,6 @@ import type { ColumnDef } from "@tanstack/react-table"; import type { UseFormReturn } from "react-hook-form"; -import { Checkbox } from "@common/components/ui"; +import { Checkbox } from "@common/components"; import type { RoleAuthorizations } from "./role-authorizations-interface"; import type { RoleAuthorizationsFormData } from "./role-authorizations-interface"; diff --git a/apps/cs/src/pages/module/ui/management-authority-dialog.tsx b/apps/cs/src/pages/module/ui/management-authority-dialog.tsx index 66384f79a..b736421df 100644 --- a/apps/cs/src/pages/module/ui/management-authority-dialog.tsx +++ b/apps/cs/src/pages/module/ui/management-authority-dialog.tsx @@ -24,7 +24,7 @@ import { TableHead, TableHeader, TableRow, -} from "@common/components/ui"; +} from "@common/components"; import { ENDPOINT } from "@/shared/config"; import { useAlertStore } from "@/shared/lib/use-alert-store"; import { diff --git a/apps/cs/src/pages/organization/model/additional-user-table-columns.tsx b/apps/cs/src/pages/organization/model/additional-user-table-columns.tsx index 0b6e1e1e3..02e772ab5 100644 --- a/apps/cs/src/pages/organization/model/additional-user-table-columns.tsx +++ b/apps/cs/src/pages/organization/model/additional-user-table-columns.tsx @@ -1,6 +1,6 @@ import dayjs from "dayjs"; import type { ColumnDef } from "@tanstack/react-table"; -import { Checkbox } from "@common/components/ui"; +import { Checkbox } from "@common/components"; import type { SearchUser } from "@/entities/user-organization"; export const columns: ColumnDef[] = [ diff --git a/apps/cs/src/pages/organization/ui/additional-user-dialog.tsx b/apps/cs/src/pages/organization/ui/additional-user-dialog.tsx index 9350b0897..32b8d0a1b 100644 --- a/apps/cs/src/pages/organization/ui/additional-user-dialog.tsx +++ b/apps/cs/src/pages/organization/ui/additional-user-dialog.tsx @@ -16,7 +16,7 @@ import { Input, DialogFooter, DialogClose, -} from "@common/components/ui"; +} from "@common/components"; import { UserOrganizationApi, type SearchUser, diff --git a/apps/cs/src/pages/organization/ui/move-organization-dialog.tsx b/apps/cs/src/pages/organization/ui/move-organization-dialog.tsx index 7951aa302..4f4a5f22e 100644 --- a/apps/cs/src/pages/organization/ui/move-organization-dialog.tsx +++ b/apps/cs/src/pages/organization/ui/move-organization-dialog.tsx @@ -11,7 +11,7 @@ import { DialogHeader, DialogTitle, DialogTrigger, -} from "@common/components/ui"; +} from "@common/components"; import { DndTree } from "@/widgets/dnd-tree"; import { generateOrganizationTreeData, diff --git a/apps/cs/src/pages/organization/ui/organization-page.tsx b/apps/cs/src/pages/organization/ui/organization-page.tsx index 545488305..d481137e8 100644 --- a/apps/cs/src/pages/organization/ui/organization-page.tsx +++ b/apps/cs/src/pages/organization/ui/organization-page.tsx @@ -6,7 +6,7 @@ import { zodResolver } from "@hookform/resolvers/zod"; import type { NodeModel } from "@minoru/react-dnd-treeview"; import { useConfirm } from "@frontend-opensource/use-react-hooks"; import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"; -import { Button } from "@common/components/ui"; +import { Button } from "@common/components"; import { DndTree, EditableNode } from "@/widgets/dnd-tree"; import { OrganizationApi, diff --git a/apps/cs/src/pages/organization/ui/user-organization-section.tsx b/apps/cs/src/pages/organization/ui/user-organization-section.tsx index 74a367750..a3e4c5f68 100644 --- a/apps/cs/src/pages/organization/ui/user-organization-section.tsx +++ b/apps/cs/src/pages/organization/ui/user-organization-section.tsx @@ -19,14 +19,12 @@ import { TableHead, TableHeader, TableRow, -} from "@common/components/ui"; -import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue, -} from "@common/components/ui"; +} from "@common/components"; import { UserOrganizationApi, userOrganizationFormSchema, diff --git a/apps/cs/src/shared/store/menu-store.ts b/apps/cs/src/shared/store/menu-store.ts index f0c6340c9..9aec06603 100644 --- a/apps/cs/src/shared/store/menu-store.ts +++ b/apps/cs/src/shared/store/menu-store.ts @@ -1,5 +1,5 @@ import { createStore } from "zustand/vanilla"; -import type { MenuItem } from "@common/components/api"; +import type { MenuItem } from "@/entities/menu"; export type MenuState = { currentMenuInfo: MenuItem | null; diff --git a/apps/cs/src/shared/ui/alert-dialog.tsx b/apps/cs/src/shared/ui/alert-dialog.tsx index 728276713..012d4ab86 100644 --- a/apps/cs/src/shared/ui/alert-dialog.tsx +++ b/apps/cs/src/shared/ui/alert-dialog.tsx @@ -4,7 +4,7 @@ import { DialogFooter, DialogClose, Button, -} from "@common/components/ui"; +} from "@common/components"; import { useAlertStore } from "../lib/use-alert-store"; function AlertDialog() { diff --git a/apps/cs/src/shared/ui/confirm-dialog.tsx b/apps/cs/src/shared/ui/confirm-dialog.tsx index b4e25be1a..6a4996bfb 100644 --- a/apps/cs/src/shared/ui/confirm-dialog.tsx +++ b/apps/cs/src/shared/ui/confirm-dialog.tsx @@ -6,7 +6,7 @@ import { DialogClose, Button, type ButtonProps, -} from "@common/components/ui"; +} from "@common/components"; type ConfirmDialogProps = { isOpen?: boolean; diff --git a/apps/cs/src/shared/ui/skeleton-page.tsx b/apps/cs/src/shared/ui/skeleton-page.tsx index fca5c8e76..cf788aca2 100644 --- a/apps/cs/src/shared/ui/skeleton-page.tsx +++ b/apps/cs/src/shared/ui/skeleton-page.tsx @@ -1,4 +1,6 @@ -import { Skeleton } from "@common/components/ui/skeleton"; +"use client"; + +import { Skeleton } from "@common/components"; function SkeletonPage() { return ( diff --git a/apps/cs/src/widgets/dnd-tree/ui/custom-node.tsx b/apps/cs/src/widgets/dnd-tree/ui/custom-node.tsx index 4c1d04d04..11defd25f 100644 --- a/apps/cs/src/widgets/dnd-tree/ui/custom-node.tsx +++ b/apps/cs/src/widgets/dnd-tree/ui/custom-node.tsx @@ -1,7 +1,6 @@ import { useEffect, useState } from "react"; import type { NodeModel, TreeMethods } from "@minoru/react-dnd-treeview"; -import { Button } from "@common/components/ui"; -import { cn } from "@common/components/lib"; +import { Button, cn } from "@common/components"; import { EditableNode } from "./editable-node"; interface TreeData extends Record { diff --git a/apps/cs/src/widgets/dnd-tree/ui/dnd-tree.tsx b/apps/cs/src/widgets/dnd-tree/ui/dnd-tree.tsx index 32e4c32a7..b1509006e 100644 --- a/apps/cs/src/widgets/dnd-tree/ui/dnd-tree.tsx +++ b/apps/cs/src/widgets/dnd-tree/ui/dnd-tree.tsx @@ -11,8 +11,7 @@ import { type DropOptions, type Classes, } from "@minoru/react-dnd-treeview"; -import { Button } from "@common/components/ui"; -import { cn } from "@common/components/lib"; +import { Button, cn } from "@common/components"; import { CustomNode } from "./custom-node"; interface TreeData extends Record { diff --git a/apps/cs/src/widgets/dnd-tree/ui/editable-node.tsx b/apps/cs/src/widgets/dnd-tree/ui/editable-node.tsx index 9ada835e2..f2274f4d8 100644 --- a/apps/cs/src/widgets/dnd-tree/ui/editable-node.tsx +++ b/apps/cs/src/widgets/dnd-tree/ui/editable-node.tsx @@ -1,5 +1,5 @@ import type { ComponentProps } from "react"; -import { Button, Input } from "@common/components/ui"; +import { Button, Input } from "@common/components"; type EditableNodeProps = { depth?: number; diff --git a/apps/cs/src/widgets/form-wrapper/ui/form-wrapper.tsx b/apps/cs/src/widgets/form-wrapper/ui/form-wrapper.tsx index 071b299ee..caba0b595 100644 --- a/apps/cs/src/widgets/form-wrapper/ui/form-wrapper.tsx +++ b/apps/cs/src/widgets/form-wrapper/ui/form-wrapper.tsx @@ -1,7 +1,7 @@ import { useRouter } from "next/navigation"; import { useConfirm } from "@frontend-opensource/use-react-hooks"; import { type FieldValues, type UseFormReturn } from "react-hook-form"; -import { Button } from "@common/components/ui"; +import { Button } from "@common/components"; import { Form } from "@/shared/ui/form"; type FormWrapperProps = { diff --git a/apps/cs/tsconfig.json b/apps/cs/tsconfig.json index 9e77e1146..17db758c4 100644 --- a/apps/cs/tsconfig.json +++ b/apps/cs/tsconfig.json @@ -25,9 +25,8 @@ "baseUrl": "./src", "paths": { "@/*": ["./*"], - "@common/components/*": ["../../../packages/common/components/src/*"], - "@common/components": ["../../../packages/common/components/src"], - "@common/network/*": ["../../../packages/common/network/*"], + "@common/components": ["../../../packages/common/components/dist/"], + "@common/config": ["../../../packages/common/config/dist/"], "@common/network": ["../../../packages/common/network/"] } },