260115_02_ENH : 로그인 오류 수정 및 템플릿 생성 연동 완료

This commit is contained in:
2026-01-15 11:36:01 +09:00
parent 7e7b494389
commit 431513c195
34 changed files with 823 additions and 103 deletions

View File

@@ -1,53 +0,0 @@
import {ProjectInfo} from "@/types/project";
import {ColumnDef} from "@tanstack/react-table";
import {Badge} from "@/components/ui/badge";
import {cn, formatKst} from "@/lib/utils";
import {PROJECT_STATUS_CLASS, PROJECT_STATUS_LABEL} from "@/const/projectConst";
import {ItrntUserInfo} from "@/types/user";
export const getProjectColumns = (users:ItrntUserInfo[]): ColumnDef<ProjectInfo>[] => [
{
accessorKey: "prjctIdx",
header: "No",
enableSorting: true,
},
{
accessorKey: "prjctCd",
header: "프로젝트 코드",
enableSorting: true,
},
{
accessorKey: "prjctName",
header: "프로젝트 명",
enableSorting: true,
},
{
accessorKey: "prjctStatus",
header: "진행 상태",
cell: ({row}) => (
<Badge className={cn("w-15 h-7 my-1.5", PROJECT_STATUS_CLASS[row.original.prjctStatus])}>
{PROJECT_STATUS_LABEL[row.original.prjctStatus]}
</Badge>
) ,
enableSorting: true,
},
{
accessorKey: "ownerDept",
header: "담당 그룹",
enableSorting: true,
},
{
accessorKey: "ownerFw",
header: "담당 실사",
enableSorting: true,
cell: ({row}) => (
users.find(u => u.userId === row.original.ownerFw)?.userNm ?? ""
) ,
},
{
accessorKey: "regDt",
header: "등록일",
cell: ({row}) => (formatKst(row.original.regDt ?? "", "date")),
enableSorting: true,
}
];

View File

@@ -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");

View File

@@ -1,80 +0,0 @@
import {ColumnDef} from "@tanstack/react-table";
import {Button} from "@/components/ui/button";
import {Pencil, Trash2} from "lucide-react";
import {UserInfo} from "@/types/user";
import {formatKst} from "@/lib/utils";
import {MultiSelectOption} from "@/components/ui/multi-select";
export type UserColumnsActions = {
onEdit: (userId: string) => void
onDelete: (userId: string) => void
}
export const getUserColumns = (actions: UserColumnsActions, userRoleArray:MultiSelectOption[]): ColumnDef<UserInfo>[] => [
{
accessorKey: "userId",
header: "아이디",
enableSorting: true,
},
{
accessorKey: "userCmpn",
header: "소속",
enableSorting: true,
},
{
accessorKey: "userName",
header: "이름",
enableSorting: true,
},
{
accessorKey: "userRole",
header: "권한",
cell: ({row}) => {
const role = userRoleArray.filter((r) => r.value === String(row.original.userRole));
return role.length > 0 ? role[0].label : String(row.original.userRole);
},
enableSorting: true,
},
{
accessorKey: "regDt",
header: "등록일",
cell: ({row}) => (formatKst(row.original.regDt ?? "", "date")),
enableSorting: true,
},
{
accessorKey: "memo",
header: "메모",
enableSorting: false,
},
{
id: "actions",
header: "관리",
cell: ({ row }) => (
<div
className="flex items-center justify-center gap-2"
onClick={(e) => e.stopPropagation()}
onPointerDown={(e) => e.stopPropagation()}
>
<Button
variant="ghost"
size="icon"
onClick={() => actions.onEdit(row.original.userId)}
aria-label="수정"
>
<Pencil className="w-4 h-4" />
</Button>
<Button
variant="ghost"
size="icon"
onClick={() => actions.onDelete(row.original.userId)}
aria-label="삭제"
>
<Trash2 className="w-4 h-4 text-destructive" />
</Button>
</div>
),
enableSorting: false,
},
];

View File

@@ -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";

View File

@@ -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 (<div>This is Email Template Page</div>)
const EmailTemplatePage = () => {
const defaultEmailTemplate : TemplateEmail = {
tmplatIdx: undefined,
itrntPrjctCd: '',
tmplatTy: MessageType.EMAIL,
tmplatNm: '',
tmplatTitle: '',
tmplatBody: '',
sendEml: '',
sendNm: ''
}
return (
<div className="space-y-6 content-text-sm">
<MessageTemplate pageTitle={"이메일 템플릿 관리"} defaultTemplate={defaultEmailTemplate}/>
</div>
)
}
export default EmailTemplatePage;

View File

@@ -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 (
<div className="space-y-6 content-text-sm">
<MessageTemplate pageTitle="문자 템플릿 관리" defaultTemplate={defaultSmsTemplate}/>
</div>
)
}
export default SmsTemplatePage;

View File

@@ -1,9 +0,0 @@
const TextTemplatePage = () => {
//파라미터 받기
//const url = buildUrlWithParams("/login", searchParams, { ref: "root" });
//redirect(url);
return (<div>This is Text Message Template Page</div>)
}
export default TextTemplatePage;

View File

@@ -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(() =>

View File

@@ -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<ProjectInfo>(`/project/info/${selectedProject.prjctIdx}`)
.then((res) => setProjectInfo(res));
nextApi.get<ResultCode[]>(`/project/result-code/${selectedProject.prjctIdx}`)
nextApi.get<ResultCode[]>(`/result-code/${selectedProject.prjctIdx}`)
.then((res) => {setResultCodeArray(res)});
nextApi.get<UserInfo[]>(`/user/outsource`)

View File

@@ -52,15 +52,15 @@ const LoginPage = () => {
nextApi.post<LoginUser>(
"/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(() => {

View File

@@ -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<Template>(
`/template/${slug[0]}`,
);
return NextResponse.json(result, { status: 200 });
}
if(action === "list" && slug.length === 3){
const result = await notihubApi.get<TemplateSummary[]>(
`/template/list/${slug[1]}/${slug[2]}`,
);
return NextResponse.json(result, { status: 200 });
}
return NextResponse.json({ message: "Not found" }, { status: 404 });
} catch (error: unknown) {
return errorToResponse(error);
}
}
export const PUT = 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(action === "body-image" && slug.length === 2){
const itrntPrjctCd = slug[1];
const formData = await req.formData();
const file = formData.get("file") as File | null;
if (!file) {
return NextResponse.json(
{ message: "file 필드가 없습니다." },
{ status: 400 }
);
}
const result = await notihubApi.putForm<string>(
`/template/body-image/${itrntPrjctCd}`,
formData
);
return NextResponse.json(result, { status: 200 });
}
if(!action){
const body = await req.json().catch(() => null);
if (!body) {
return NextResponse.json(
{ message: "요청 바디가 없습니다." },
{ status: 400 }
);
}
const result = await notihubApi.put<Template>(`/template`, body);
return NextResponse.json(result, { status: 200 });
}
return NextResponse.json({ message: "Not found" }, { status: 404 });
} catch (error: unknown) {
return errorToResponse(error);
}
}
export const PATCH = 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(!action){
const body = await req.json().catch(() => null);
if (!body) {
return NextResponse.json(
{ message: "요청 바디가 없습니다." },
{ status: 400 }
);
}
const result = await notihubApi.patch<Template>(`/template`, body);
return NextResponse.json(result, { status: 200 });
}
return NextResponse.json({ message: "Not found" }, { status: 404 });
} catch (error: unknown) {
return errorToResponse(error);
}
}

View File

@@ -32,12 +32,12 @@ export const GET = async (req: NextRequest, context: RouteContext) => {
return NextResponse.json(result, { status: 200 });
}
if(action === "result-code" && slug.length === 2){
const result = await contactApi.get<ResultCode[]>(`/result-code/${slug[1]}`);
return NextResponse.json(result, { status: 200 });
if(action === "main-template" && slug.length === 3){
const result = await contactApi.get<number | null | "">(`/project/main-template/${slug[1]}/${slug[2]}`);
const returValue = result === null || result === "" ? null : Number(result);
return NextResponse.json(returValue, { status: 200 });
}
return NextResponse.json({ message: "Not found" }, { status: 404 });
} catch (error: unknown) {
return errorToResponse(error);
@@ -133,6 +133,20 @@ export const PATCH = async (req: NextRequest, context: RouteContext) => {
const [action] = slug;
const contactApi = await createContactApi();
if(action === "main-template"){
const body = await req.json().catch(() => null);
if (!body) {
return NextResponse.json(
{ message: "요청 바디가 없습니다." },
{ status: 400 }
);
}
await contactApi.patch(`/project/main-template`, body);
return new NextResponse(null, { status: 204 });
}
if(slug.length === 1){
const body = await req.json().catch(() => null);

View File

@@ -0,0 +1,23 @@
import {NextRequest, NextResponse} from "next/server";
import {RouteContext} from "@/types/common";
import {createContactApi} from "@/lib/server-api";
import {ProjectInfo, ProjectOwnerResponse, ResultCode} from "@/types/project";
import {errorToResponse} from "@/lib/http-util";
export const GET = async (req: NextRequest, context: RouteContext) => {
try {
const { searchParams } = new URL(req.url);
const {slug = []} = await context.params;
const [action] = slug;
const contactApi = await createContactApi();
if(slug.length === 1){
const result = await contactApi.get<ResultCode[]>(`/result-code/${slug[0]}`);
return NextResponse.json(result, { status: 200 });
}
return NextResponse.json({ message: "Not found" }, { status: 404 });
} catch (error: unknown) {
return errorToResponse(error);
}
};