From 7cfda04bc083948202d6188192709701af847c1a Mon Sep 17 00:00:00 2001 From: bicochan Date: Thu, 8 May 2025 10:16:08 +0900 Subject: [PATCH] =?UTF-8?q?chore:=20steiger=20lint=20=EC=A0=81=EC=9A=A9(FS?= =?UTF-8?q?D)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pst/bbsnormal/[bbsId]/page.tsx | 0 .../bbsnotice/[bbsId]/[pstNo]/modify/page.tsx | 2 +- .../pst/bbsnotice/[bbsId]/[pstNo]/page.tsx | 2 +- .../pst/bbsnotice/[bbsId]/page.tsx | 2 +- .../pst/bbsnotice/[bbsId]/register/page.tsx | 2 +- .../src/entities/menu-authority/@x/menu.ts | 1 + .../src/entities/menu/lib/menu-wrapper.tsx | 4 +- .../src/entities/post/model/post-interface.ts | 5 +-- .../src/pages/{ => (bbs)}/notice/index.ts | 0 .../notice/model/notice-table-columns.tsx | 0 .../{ => (bbs)}/notice/ui/create-page.tsx | 0 .../{ => (bbs)}/notice/ui/modify-page.tsx | 0 .../{ => (bbs)}/notice/ui/notice-layout.tsx | 0 .../{ => (bbs)}/notice/ui/notice-page.tsx | 0 .../{ => (bbs)}/notice/ui/notice-post.tsx | 0 .../features/src/shared/store/menu-store.ts | 42 +++++++++++++++---- .../ui/form-wrapper.tsx | 2 +- .../src/widgets/form-wrapper/index.ts | 1 - .../src/widgets/post/ui/post-form.tsx | 2 +- 19 files changed, 44 insertions(+), 21 deletions(-) create mode 100644 apps/common/features/app/(with-base-layout)/pst/bbsnormal/[bbsId]/page.tsx create mode 100644 apps/common/features/src/entities/menu-authority/@x/menu.ts rename apps/common/features/src/pages/{ => (bbs)}/notice/index.ts (100%) rename apps/common/features/src/pages/{ => (bbs)}/notice/model/notice-table-columns.tsx (100%) rename apps/common/features/src/pages/{ => (bbs)}/notice/ui/create-page.tsx (100%) rename apps/common/features/src/pages/{ => (bbs)}/notice/ui/modify-page.tsx (100%) rename apps/common/features/src/pages/{ => (bbs)}/notice/ui/notice-layout.tsx (100%) rename apps/common/features/src/pages/{ => (bbs)}/notice/ui/notice-page.tsx (100%) rename apps/common/features/src/pages/{ => (bbs)}/notice/ui/notice-post.tsx (100%) rename apps/common/features/src/{widgets/form-wrapper => shared}/ui/form-wrapper.tsx (97%) delete mode 100644 apps/common/features/src/widgets/form-wrapper/index.ts diff --git a/apps/common/features/app/(with-base-layout)/pst/bbsnormal/[bbsId]/page.tsx b/apps/common/features/app/(with-base-layout)/pst/bbsnormal/[bbsId]/page.tsx new file mode 100644 index 000000000..e69de29bb diff --git a/apps/common/features/app/(with-base-layout)/pst/bbsnotice/[bbsId]/[pstNo]/modify/page.tsx b/apps/common/features/app/(with-base-layout)/pst/bbsnotice/[bbsId]/[pstNo]/modify/page.tsx index 86f0ca871..c40eb93d4 100644 --- a/apps/common/features/app/(with-base-layout)/pst/bbsnotice/[bbsId]/[pstNo]/modify/page.tsx +++ b/apps/common/features/app/(with-base-layout)/pst/bbsnotice/[bbsId]/[pstNo]/modify/page.tsx @@ -1,4 +1,4 @@ -import { ModifyPage } from "@/pages/notice"; +import { ModifyPage } from "@/pages/(bbs)/notice"; export default async function PstBbsNoticePostModifyPage({ params, diff --git a/apps/common/features/app/(with-base-layout)/pst/bbsnotice/[bbsId]/[pstNo]/page.tsx b/apps/common/features/app/(with-base-layout)/pst/bbsnotice/[bbsId]/[pstNo]/page.tsx index 0f59903d4..bc0380808 100644 --- a/apps/common/features/app/(with-base-layout)/pst/bbsnotice/[bbsId]/[pstNo]/page.tsx +++ b/apps/common/features/app/(with-base-layout)/pst/bbsnotice/[bbsId]/[pstNo]/page.tsx @@ -1,4 +1,4 @@ -import { NoticePost } from "@/pages/notice"; +import { NoticePost } from "@/pages/(bbs)/notice"; export default async function PstBbsNoticePostPage({ params, diff --git a/apps/common/features/app/(with-base-layout)/pst/bbsnotice/[bbsId]/page.tsx b/apps/common/features/app/(with-base-layout)/pst/bbsnotice/[bbsId]/page.tsx index df9ae763f..0f3176325 100644 --- a/apps/common/features/app/(with-base-layout)/pst/bbsnotice/[bbsId]/page.tsx +++ b/apps/common/features/app/(with-base-layout)/pst/bbsnotice/[bbsId]/page.tsx @@ -1,4 +1,4 @@ -import { NoticePage } from "@/pages/notice"; +import { NoticePage } from "@/pages/(bbs)/notice"; export default async function PstBbsNoticePage({ params, diff --git a/apps/common/features/app/(with-base-layout)/pst/bbsnotice/[bbsId]/register/page.tsx b/apps/common/features/app/(with-base-layout)/pst/bbsnotice/[bbsId]/register/page.tsx index f4357d80d..4e4b4c78e 100644 --- a/apps/common/features/app/(with-base-layout)/pst/bbsnotice/[bbsId]/register/page.tsx +++ b/apps/common/features/app/(with-base-layout)/pst/bbsnotice/[bbsId]/register/page.tsx @@ -1,4 +1,4 @@ -import { CreatePage } from "@/pages/notice"; +import { CreatePage } from "@/pages/(bbs)/notice"; export default async function PstBbsNoticeRegisterPage({ params, diff --git a/apps/common/features/src/entities/menu-authority/@x/menu.ts b/apps/common/features/src/entities/menu-authority/@x/menu.ts new file mode 100644 index 000000000..86479f859 --- /dev/null +++ b/apps/common/features/src/entities/menu-authority/@x/menu.ts @@ -0,0 +1 @@ +export { MenuAuthorityApi } from "../api/menu-authority-service"; diff --git a/apps/common/features/src/entities/menu/lib/menu-wrapper.tsx b/apps/common/features/src/entities/menu/lib/menu-wrapper.tsx index 1cdf99f8d..48fe5e6ed 100644 --- a/apps/common/features/src/entities/menu/lib/menu-wrapper.tsx +++ b/apps/common/features/src/entities/menu/lib/menu-wrapper.tsx @@ -2,9 +2,9 @@ import { useEffect } from "react"; import { usePathname, useRouter } from "next/navigation"; -import { MenuAuthorityApi } from "@/entities/menu-authority"; -import { SITE_ID } from "@/shared/config"; +import { MenuAuthorityApi } from "@/entities/menu-authority/@x/menu"; import { getCookie, useAlertStore, useMenuStore } from "@/shared/lib"; +import { SITE_ID } from "@/shared/config"; import { MenuApi } from "../api/menu-service"; import { getCurrentMenu } from "./utils"; diff --git a/apps/common/features/src/entities/post/model/post-interface.ts b/apps/common/features/src/entities/post/model/post-interface.ts index 338cb2b3f..a988c51e2 100644 --- a/apps/common/features/src/entities/post/model/post-interface.ts +++ b/apps/common/features/src/entities/post/model/post-interface.ts @@ -1,8 +1,5 @@ import { z } from "zod"; -import { - type PageableList, - type PageableParams, -} from "@/shared/model/api-interface"; +import { type PageableList, type PageableParams } from "@/shared/model"; export interface PostParams extends PageableParams { keywordType?: string; diff --git a/apps/common/features/src/pages/notice/index.ts b/apps/common/features/src/pages/(bbs)/notice/index.ts similarity index 100% rename from apps/common/features/src/pages/notice/index.ts rename to apps/common/features/src/pages/(bbs)/notice/index.ts diff --git a/apps/common/features/src/pages/notice/model/notice-table-columns.tsx b/apps/common/features/src/pages/(bbs)/notice/model/notice-table-columns.tsx similarity index 100% rename from apps/common/features/src/pages/notice/model/notice-table-columns.tsx rename to apps/common/features/src/pages/(bbs)/notice/model/notice-table-columns.tsx diff --git a/apps/common/features/src/pages/notice/ui/create-page.tsx b/apps/common/features/src/pages/(bbs)/notice/ui/create-page.tsx similarity index 100% rename from apps/common/features/src/pages/notice/ui/create-page.tsx rename to apps/common/features/src/pages/(bbs)/notice/ui/create-page.tsx diff --git a/apps/common/features/src/pages/notice/ui/modify-page.tsx b/apps/common/features/src/pages/(bbs)/notice/ui/modify-page.tsx similarity index 100% rename from apps/common/features/src/pages/notice/ui/modify-page.tsx rename to apps/common/features/src/pages/(bbs)/notice/ui/modify-page.tsx diff --git a/apps/common/features/src/pages/notice/ui/notice-layout.tsx b/apps/common/features/src/pages/(bbs)/notice/ui/notice-layout.tsx similarity index 100% rename from apps/common/features/src/pages/notice/ui/notice-layout.tsx rename to apps/common/features/src/pages/(bbs)/notice/ui/notice-layout.tsx diff --git a/apps/common/features/src/pages/notice/ui/notice-page.tsx b/apps/common/features/src/pages/(bbs)/notice/ui/notice-page.tsx similarity index 100% rename from apps/common/features/src/pages/notice/ui/notice-page.tsx rename to apps/common/features/src/pages/(bbs)/notice/ui/notice-page.tsx diff --git a/apps/common/features/src/pages/notice/ui/notice-post.tsx b/apps/common/features/src/pages/(bbs)/notice/ui/notice-post.tsx similarity index 100% rename from apps/common/features/src/pages/notice/ui/notice-post.tsx rename to apps/common/features/src/pages/(bbs)/notice/ui/notice-post.tsx diff --git a/apps/common/features/src/shared/store/menu-store.ts b/apps/common/features/src/shared/store/menu-store.ts index cc35e2d3a..139c37890 100644 --- a/apps/common/features/src/shared/store/menu-store.ts +++ b/apps/common/features/src/shared/store/menu-store.ts @@ -1,15 +1,41 @@ import { createStore } from "zustand/vanilla"; -import type { MenuItem } from "@/entities/menu"; -import type { PageMenuAuthority } from "@/entities/menu-authority"; + +interface IMenu { + menuCd: number; + menuKornNm: string; + menuEngNm: string; + parentId: number | null; + sortSeq: number; + iconNm?: string; + children: IMenu[] | null; + levelNo: number; + urlPath: string; + menuLnkgTypeCd: string; + menuLnkgSn: number; + menuPath: string; + qrcd: string; + useYn: string; + otptYn: string; + newWndwYn: string; + requiredUrlPath: boolean; +} + +interface IAuthority { + mngAuthrtYn: string; + inqAuthrtYn: string; + regAuthrtYn: string; + mdfcnAuthrtYn: string; + delAuthrtYn: string; +} export type MenuState = { - currentMenuInfo: MenuItem | null; - pageMenuAuthority: PageMenuAuthority | null; + currentMenuInfo: IMenu | null; + pageMenuAuthority: IAuthority | null; }; export type MenuActions = { - setCurrentMenuInfo: (menu: MenuItem) => void; - setPageMenuAuthority: (authority: PageMenuAuthority) => void; + setCurrentMenuInfo: (menu: IMenu) => void; + setPageMenuAuthority: (authority: IAuthority) => void; }; export type MenuStore = MenuState & MenuActions; @@ -22,8 +48,8 @@ export const defaultInitState: MenuState = { export const createMenuStore = (initState: MenuState = defaultInitState) => { return createStore()((set) => ({ ...initState, - setCurrentMenuInfo: (menu: MenuItem) => set({ currentMenuInfo: menu }), - setPageMenuAuthority: (authority: PageMenuAuthority) => + setCurrentMenuInfo: (menu: IMenu) => set({ currentMenuInfo: menu }), + setPageMenuAuthority: (authority: IAuthority) => set({ pageMenuAuthority: authority }), })); }; diff --git a/apps/common/features/src/widgets/form-wrapper/ui/form-wrapper.tsx b/apps/common/features/src/shared/ui/form-wrapper.tsx similarity index 97% rename from apps/common/features/src/widgets/form-wrapper/ui/form-wrapper.tsx rename to apps/common/features/src/shared/ui/form-wrapper.tsx index caba0b595..2ad859f44 100644 --- a/apps/common/features/src/widgets/form-wrapper/ui/form-wrapper.tsx +++ b/apps/common/features/src/shared/ui/form-wrapper.tsx @@ -2,7 +2,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"; -import { Form } from "@/shared/ui/form"; +import { Form } from "./form"; type FormWrapperProps = { form: UseFormReturn; diff --git a/apps/common/features/src/widgets/form-wrapper/index.ts b/apps/common/features/src/widgets/form-wrapper/index.ts deleted file mode 100644 index aa5addaf9..000000000 --- a/apps/common/features/src/widgets/form-wrapper/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { FormWrapper } from "./ui/form-wrapper"; diff --git a/apps/common/features/src/widgets/post/ui/post-form.tsx b/apps/common/features/src/widgets/post/ui/post-form.tsx index 5c17a3cd3..19963f41c 100644 --- a/apps/common/features/src/widgets/post/ui/post-form.tsx +++ b/apps/common/features/src/widgets/post/ui/post-form.tsx @@ -19,13 +19,13 @@ import { FileUploader, Button, } from "@common/components"; -import { FormWrapper } from "@/widgets/form-wrapper"; import { CodeSelect } from "@/entities/code"; import type { Board } from "@/entities/board"; import { handleTusUpload } from "@/entities/tus"; import { AttachmentApi, type Attachment } from "@/entities/attachment"; import type { Post, PostFormData, PostUpdateFormData } from "@/entities/post"; import { FormControl, FormField, FormItem } from "@/shared/ui/form"; +import { FormWrapper } from "@/shared/ui/form-wrapper"; import { useUserStore } from "@/shared/lib"; import { ENDPOINT } from "@/shared/config";