From 431513c19554fbb3fca27735491d4e71d81e938d Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Thu, 15 Jan 2026 11:36:01 +0900 Subject: [PATCH] =?UTF-8?q?260115=5F02=5FENH=20:=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20=EB=B0=8F?= =?UTF-8?q?=20=ED=85=9C=ED=94=8C=EB=A6=BF=20=EC=83=9D=EC=84=B1=20=EC=97=B0?= =?UTF-8?q?=EB=8F=99=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 1 + .env.local | 1 + .env.production | 1 + src/app/(pages)/(main)/layout.tsx | 4 +- src/app/(pages)/(main)/manage/user/page.tsx | 2 +- .../(main)/message/template/email/page.tsx | 26 +- .../(main)/message/template/sms/page.tsx | 27 ++ .../(main)/message/template/text/page.tsx | 9 - src/app/(pages)/(main)/page.tsx | 20 +- src/app/(pages)/(main)/project/info/page.tsx | 9 +- src/app/(pages)/login/page.tsx | 20 +- .../api/message-template/[[...slug]]/route.ts | 105 +++++ src/app/api/project/[[...slug]]/route.ts | 22 +- src/app/api/result-code/[[...slug]]/route.ts | 23 + src/components/dialog/ResultCodeDialog.tsx | 10 +- src/components/layout/Header.tsx | 2 +- src/components/layout/Sidebar.tsx | 2 - .../message-template/MessageTemplate.tsx | 424 ++++++++++++++++++ .../table-column}/ProjectTableColumn.tsx | 0 .../table-column}/UserTableColumn.tsx | 0 src/components/ui/multi-select.tsx | 3 + src/config/menu.data.ts | 2 +- src/const/listConst.ts | 28 ++ src/const/messageTemplateConst.ts | 16 + src/const/projectConst.ts | 32 +- src/hooks/useAuth.ts | 9 - src/lib/env.server.ts | 1 + src/lib/server-api.ts | 4 + src/store/jotai/project.ts | 3 +- src/store/jotai/utils.ts | 12 +- src/types/common.ts | 7 + src/types/list.ts | 27 ++ src/types/messageTemplate.ts | 40 ++ src/types/project.ts | 34 +- 34 files changed, 823 insertions(+), 103 deletions(-) create mode 100644 src/app/(pages)/(main)/message/template/sms/page.tsx delete mode 100644 src/app/(pages)/(main)/message/template/text/page.tsx create mode 100644 src/app/api/message-template/[[...slug]]/route.ts create mode 100644 src/app/api/result-code/[[...slug]]/route.ts create mode 100644 src/components/message-template/MessageTemplate.tsx rename src/{app/(pages)/(main) => components/table-column}/ProjectTableColumn.tsx (100%) rename src/{app/(pages)/(main)/manage/user => components/table-column}/UserTableColumn.tsx (100%) create mode 100644 src/const/listConst.ts create mode 100644 src/const/messageTemplateConst.ts create mode 100644 src/types/list.ts create mode 100644 src/types/messageTemplate.ts diff --git a/.env.development b/.env.development index 1d5d633..b47c859 100644 --- a/.env.development +++ b/.env.development @@ -4,6 +4,7 @@ NEXT_PUBLIC_API_BASE=http://localhost:3000/api ENV=dev CONTACT_SERVER=http://localhost:4001 API_CONTACT_SERVER=http://localhost:4001/api/v1 +API_NOTIHUB_SERVER=http://localhost:4011/api/v1 API_INTRANET_SERVER=http://localhost:3031/api/v1 API_KART_SERVER=https://rapi.kric.com/api/v1 KART_API_KEY=4B726963-436F6E74616374-46726F6E74-402531213230 \ No newline at end of file diff --git a/.env.local b/.env.local index fc8580d..25bde02 100644 --- a/.env.local +++ b/.env.local @@ -4,6 +4,7 @@ NEXT_PUBLIC_API_BASE=http://localhost:3000/api ENV=local CONTACT_SERVER=http://localhost:4001 API_CONTACT_SERVER=http://localhost:4001/api/v1 +API_NOTIHUB_SERVER=http://localhost:4011/api/v1 API_INTRANET_SERVER=http://localhost:3031/api/v1 API_KART_SERVER=https://rapi.kric.com/api/v1 KART_API_KEY=4B726963-436F6E74616374-46726F6E74-402531213230 \ No newline at end of file diff --git a/.env.production b/.env.production index 92036b2..4466434 100644 --- a/.env.production +++ b/.env.production @@ -4,6 +4,7 @@ NEXT_PUBLIC_API_BASE=http://localhost:3000/api ENV=prod CONTACT_SERVER=http://localhost:4001 API_CONTACT_SERVER=http://localhost:4001/api/v1 +API_NOTIHUB_SERVER=http://localhost:4011/api/v1 API_INTRANET_SERVER=http://localhost:3031/api/v1 API_KART_SERVER=https://rapi.kric.com/api/v1 KART_API_KEY=4B726963-436F6E74616374-46726F6E74-402531213230 \ No newline at end of file diff --git a/src/app/(pages)/(main)/layout.tsx b/src/app/(pages)/(main)/layout.tsx index 5b0cd18..6b1db33 100644 --- a/src/app/(pages)/(main)/layout.tsx +++ b/src/app/(pages)/(main)/layout.tsx @@ -22,9 +22,9 @@ export default async function MainLayoutWrapper({ children: React.ReactNode; }) { const cookieStore = await cookies(); - const cookie = cookieStore.get(CookieKeys.FontSize); + const fontSize = cookieStore.get(CookieKeys.FontSize); const accessToken = cookieStore.get("access_token")?.value; - const initialFontSize = parseFontSize(cookie?.value); + const initialFontSize = parseFontSize(fontSize?.value); if (!accessToken) { redirect("/logout"); diff --git a/src/app/(pages)/(main)/manage/user/page.tsx b/src/app/(pages)/(main)/manage/user/page.tsx index 338863f..6aa163a 100644 --- a/src/app/(pages)/(main)/manage/user/page.tsx +++ b/src/app/(pages)/(main)/manage/user/page.tsx @@ -5,7 +5,7 @@ import {Button} from "@/components/ui/button"; import {Input} from "@/components/ui/input"; import BodyTitle from "@/components/layout/BodyTitle"; import { DataTable } from "@/components/data-table/DataTable"; -import { getUserColumns } from "./UserTableColumn"; +import { getUserColumns } from "../../../../../components/table-column/UserTableColumn"; import _ from "lodash"; import UserUpsertDialog from "@/components/dialog/UserUpsertDialog"; import {UserInfo, UserInfoSaveRequest, UserUploadResponse} from "@/types/user"; diff --git a/src/app/(pages)/(main)/message/template/email/page.tsx b/src/app/(pages)/(main)/message/template/email/page.tsx index 70bacdc..84b2100 100644 --- a/src/app/(pages)/(main)/message/template/email/page.tsx +++ b/src/app/(pages)/(main)/message/template/email/page.tsx @@ -1,9 +1,25 @@ -const EmailTemplatePage = () => { - //파라미터 받기 - //const url = buildUrlWithParams("/login", searchParams, { ref: "root" }); - //redirect(url); +import {MessageType, TemplateEmail} from "@/types/messageTemplate"; +import MessageTemplate from "@/components/message-template/MessageTemplate"; +import BodyTitle from "@/components/layout/BodyTitle"; - return (
This is Email Template Page
) +const EmailTemplatePage = () => { + + const defaultEmailTemplate : TemplateEmail = { + tmplatIdx: undefined, + itrntPrjctCd: '', + tmplatTy: MessageType.EMAIL, + tmplatNm: '', + tmplatTitle: '', + tmplatBody: '', + sendEml: '', + sendNm: '' + } + + return ( +
+ +
+ ) } export default EmailTemplatePage; \ No newline at end of file diff --git a/src/app/(pages)/(main)/message/template/sms/page.tsx b/src/app/(pages)/(main)/message/template/sms/page.tsx new file mode 100644 index 0000000..d1aea99 --- /dev/null +++ b/src/app/(pages)/(main)/message/template/sms/page.tsx @@ -0,0 +1,27 @@ +'use client' + +import {MessageType, TemplateSms} from "@/types/messageTemplate"; +import MessageTemplate from "@/components/message-template/MessageTemplate"; +import BodyTitle from "@/components/layout/BodyTitle"; + +const SmsTemplatePage = () => { + + const defaultSmsTemplate : TemplateSms = { + tmplatIdx: undefined, + itrntPrjctCd: '', + tmplatTy: MessageType.SMS, + tmplatNm: '', + tmplatTitle: undefined, + tmplatBody: '', + sendTel: '', + sendNm: '' + } + + return ( +
+ +
+ ) +} + +export default SmsTemplatePage; \ No newline at end of file diff --git a/src/app/(pages)/(main)/message/template/text/page.tsx b/src/app/(pages)/(main)/message/template/text/page.tsx deleted file mode 100644 index 61b3c94..0000000 --- a/src/app/(pages)/(main)/message/template/text/page.tsx +++ /dev/null @@ -1,9 +0,0 @@ -const TextTemplatePage = () => { - //파라미터 받기 - //const url = buildUrlWithParams("/login", searchParams, { ref: "root" }); - //redirect(url); - - return (
This is Text Message Template Page
) -} - -export default TextTemplatePage; \ No newline at end of file diff --git a/src/app/(pages)/(main)/page.tsx b/src/app/(pages)/(main)/page.tsx index 3896b90..efad0a0 100644 --- a/src/app/(pages)/(main)/page.tsx +++ b/src/app/(pages)/(main)/page.tsx @@ -3,18 +3,19 @@ import {useEffect, useRef, useState} from "react"; import BodyTitle from "@/components/layout/BodyTitle"; import {Button} from "@/components/ui/button"; import {DataTable} from "@/components/data-table/DataTable"; -import {getProjectColumns} from "./ProjectTableColumn"; +import {getProjectColumns} from "../../../components/table-column/ProjectTableColumn"; import { ProjectCreateRequest, ProjectInfo, ProjectListQuery, ProjectListRequest, ProjectOwnerResponse, + ProjectStatus } from "@/types/project"; import {Input} from "@/components/ui/input"; import {KriMultiSelect} from "@/components/common/KriAutoComplete"; import {MultiSelectOption} from "@/components/ui/multi-select"; import {PaginationState, SortingState} from "@tanstack/react-table"; -import {PageResponse} from "@/types/common"; +import {PageRequest, PageResponse} from "@/types/common"; import ProjectCreateDialog from "@/components/dialog/ProjectCreateDialog"; import {useDialog} from "@/hooks/useDialog"; import {useLoading} from "@/hooks/useLoading"; @@ -25,7 +26,6 @@ import {SelectedProject} from "@/store/jotai/project"; import {useMounted} from "@/hooks/useMounted"; import {LoadingOverlay} from "@/components/common/LoadingOverlay"; import {FW_USER_ROLE} from "@/const/userConst"; -import {ProjectStatus} from "@/const/projectConst"; import {useItrntUserList} from "@/hooks/useItrntUserList"; const MainPage = () => { @@ -82,6 +82,7 @@ const MainPage = () => { prjctIdx: projectInfo.prjctIdx, prjctCd: projectInfo.prjctCd, prjctName: projectInfo.prjctName, + itrntPrjctCd: projectInfo.itrntPrjctCd, ownerDept: projectInfo.ownerDept, ownerFw: projectInfo.ownerFw, } as SelectedProject); @@ -94,6 +95,7 @@ const MainPage = () => { prjctIdx: projectInfo.prjctIdx, prjctCd: projectInfo.prjctCd, prjctName: projectInfo.prjctName, + itrntPrjctCd: projectInfo.itrntPrjctCd, ownerDept: projectInfo.ownerDept, ownerFw: projectInfo.ownerFw, } as SelectedProject); @@ -110,15 +112,19 @@ const MainPage = () => { lastReqKeyRef.current = reqKey; const sort = sorting?.[0] ?? {id: "prjctIdx", desc: true}; + const pageReq: PageRequest = { + pageIndex: pagination.pageIndex, + pageSize: pagination.pageSize, + sortBy: sort.id, + sortDir: sort.desc ? "desc" : "asc" + }; + const searchBody: ProjectListRequest = { prjctText: query?.prjctText || "", prjctStatusList: query?.prjctStatusList || [], ownerDeptList: query?.ownerDeptList || [], ownerFwList: query?.ownerFwList || [], - pageIndex: pagination.pageIndex, - pageSize: pagination.pageSize, - sortBy: sort.id, - sortDir: sort.desc ? "desc" : "asc" + pageRequest: pageReq, } withLoadingAsync(() => diff --git a/src/app/(pages)/(main)/project/info/page.tsx b/src/app/(pages)/(main)/project/info/page.tsx index bef9771..04ae8db 100644 --- a/src/app/(pages)/(main)/project/info/page.tsx +++ b/src/app/(pages)/(main)/project/info/page.tsx @@ -13,14 +13,15 @@ import {useDialog} from '@/hooks/useDialog' import ResultCodeDialog from '@/components/dialog/ResultCodeDialog' import {useMounted} from '@/hooks/useMounted' import {LoadingOverlay} from '@/components/common/LoadingOverlay' -import {KonKiwiProjectInfo, ProjectInfo, ProjectUpdateRequest, ResultCode} from "@/types/project"; +import { + KonKiwiProjectInfo, ProjectInfo, ProjectUpdateRequest, ResultCode, + ProjectStatus, ResultCodeType, SurveyType +} from "@/types/project"; import { PROJECT_STATUS_LABEL, PROJECT_STATUS_ORDER, - ProjectStatus, ResultCodeType, SURVEY_TYPE_LABEL, SURVEY_TYPE_ORDER, - SurveyType } from "@/const/projectConst"; import {MultiSelectOption} from "@/components/ui/multi-select"; import {FW_TEAM} from "@/const/userConst"; @@ -171,7 +172,7 @@ const ProjectInfoPage = () => { nextApi.get(`/project/info/${selectedProject.prjctIdx}`) .then((res) => setProjectInfo(res)); - nextApi.get(`/project/result-code/${selectedProject.prjctIdx}`) + nextApi.get(`/result-code/${selectedProject.prjctIdx}`) .then((res) => {setResultCodeArray(res)}); nextApi.get(`/user/outsource`) diff --git a/src/app/(pages)/login/page.tsx b/src/app/(pages)/login/page.tsx index e6c2ebb..c9b5b09 100644 --- a/src/app/(pages)/login/page.tsx +++ b/src/app/(pages)/login/page.tsx @@ -52,15 +52,15 @@ const LoginPage = () => { nextApi.post( "/login", loginRequestBody, loginRequestOptions ).then(async (data) => { // Jotai 기반 전역 인증 상태 갱신 - setFromLoginResponse(data, seatNum); - // 요구사항: 페이지 이동 전에 SeatNumber를 secure-local-storage에 저장 - try { - setSeatNumberStorage(seatNum); - setLoginTypeStorage(loginType); - } catch (e) { - // 저장 실패는 치명적이지 않으므로 콘솔 로깅만 - console.warn("Failed to persist SeatNumber to secure storage:", e); - } + try { + setSeatNumberStorage(seatNum); + setLoginTypeStorage(loginType); + } catch (e) { + // 저장 실패는 치명적이지 않으므로 콘솔 로깅만 + console.warn("Failed to persist SeatNumber to secure storage:", e); + } + + setFromLoginResponse(data, seatNum); }).catch((e) => { const err = apiError(e); console.error(err.status, err.code, err.message); @@ -82,7 +82,7 @@ const LoginPage = () => { if(auth.user){ window.location.replace("/"); } - }, [auth]); + }, [auth.user]); // URL 쿼리 파라미터에서 type 수신 useEffect(() => { diff --git a/src/app/api/message-template/[[...slug]]/route.ts b/src/app/api/message-template/[[...slug]]/route.ts new file mode 100644 index 0000000..aa18ef7 --- /dev/null +++ b/src/app/api/message-template/[[...slug]]/route.ts @@ -0,0 +1,105 @@ +import {NextRequest, NextResponse} from "next/server"; +import {RouteContext} from "@/types/common"; +import {createNotihubApi} from "@/lib/server-api"; +import {errorToResponse} from "@/lib/http-util"; +import {Template, TemplateSummary} from "@/types/messageTemplate"; + +export const GET = async (req: NextRequest, context: RouteContext) => { + try{ + const { searchParams } = new URL(req.url); + const {slug = []} = await context.params; + const [action] = slug; + const notihubApi = await createNotihubApi(); + + if(slug.length === 1){ + const result = await notihubApi.get