From 849394f6475266cd6575964443c99a9a515a4e30 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Mon, 15 Jun 2026 10:00:24 +0900 Subject: [PATCH 01/11] =?UTF-8?q?260615=5F02=5FENH:=20=EC=82=AC=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8=20=ED=83=80=EC=9D=B4=ED=8B=80=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/layout.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/layout.tsx b/src/app/layout.tsx index fe10f0c..9767f30 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -11,8 +11,8 @@ const notoSansKr = Noto_Sans_KR({ }); export const metadata: Metadata = { - title: "화재보험협회 대시보드", - description: "화재보험협회 CX 대시보드", + title: "강원문화재단 모니터링", + description: "강원문화재단 모니터링 시스템", }; export default function RootLayout({ -- 2.49.0.windows.1 From d7c66149a88897f3162037658ffd7bc90c3d5fd8 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Mon, 15 Jun 2026 10:22:16 +0900 Subject: [PATCH 02/11] =?UTF-8?q?260615=5F03=5FENH:=20=ED=8A=B9=EC=A0=95?= =?UTF-8?q?=20api=20KON=EC=9D=84=20=ED=86=B5=ED=95=B4=EC=84=9C=20=EB=93=A4?= =?UTF-8?q?=EC=96=B4=20=EC=98=A8=EA=B2=83=EC=9D=B8=EC=A7=80=20=ED=99=95?= =?UTF-8?q?=EC=9D=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/api/kon/[[...slug]]/route.ts | 59 +++++++++++++++++++ src/types/gwcf.ts | 87 ++++++++++++++++++++++++++++ 2 files changed, 146 insertions(+) create mode 100644 src/app/api/kon/[[...slug]]/route.ts diff --git a/src/app/api/kon/[[...slug]]/route.ts b/src/app/api/kon/[[...slug]]/route.ts new file mode 100644 index 0000000..025c645 --- /dev/null +++ b/src/app/api/kon/[[...slug]]/route.ts @@ -0,0 +1,59 @@ +import {NextRequest, NextResponse} from "next/server"; +import {RouteContext} from "@/types/common"; +import {errorToResponse} from "@/lib/http-util"; +import {createBackApi} from "@/lib/server-api"; +import {PerformanceCompact} from "@/types/gwcf"; + +const ALLOWED_ORIGIN = "https://kon.kric.com"; + +const getRequestOrigin = (req: NextRequest) => { + const origin = req.headers.get("origin"); + if (origin) { + return origin; + } + + const referer = req.headers.get("referer"); + if (!referer) { + return null; + } + + try { + return new URL(referer).origin; + } catch { + return null; + } +}; + +const isAllowedOrigin = (req: NextRequest) => { + return getRequestOrigin(req) === ALLOWED_ORIGIN; +}; + +export const POST = async ( + req: NextRequest, + context: RouteContext +) => { + try { + if (!isAllowedOrigin(req)) { + return NextResponse.json({ message: "Forbidden" }, { status: 403 }); + } + + const {slug = []} = await context.params; + const [action] = slug; + const backApi = await createBackApi(); + + if(action === "assign-confirm" && slug.length === 2) { + const result = await backApi.post(`/assign/confirm/${slug[1]}`) + return NextResponse.json(result, { status: 200 }); + } + + if(action === "performance-list") { + const result = await backApi.get(`/performance/list/compact`) + return NextResponse.json(result, { status: 200 }); + } + + return NextResponse.json({ message: "Not found" }, { status: 404 }); + + } catch (error: unknown) { + return errorToResponse(error); + } +} diff --git a/src/types/gwcf.ts b/src/types/gwcf.ts index e69de29..c75dd9f 100644 --- a/src/types/gwcf.ts +++ b/src/types/gwcf.ts @@ -0,0 +1,87 @@ +export type UserFull = { + userId: string; + userPw: string; + userName: string; + userCmpn: string; + userTeam: string; + userRole: number; + memo: string; + userDetail: Record; +}; + +export type PerformanceAssign = { + id: number; + performanceId: number; + assignType: number; + assignOrder: number; + assignUser: string; + assignConfirm: boolean; +}; + +export type PerformanceBase = { + id: number; + businessType: number; + performanceGenre: number; + performanceArea: number; + artistName: string; + performanceName: string; + performanceStartMonth: number; + performanceDtInfo: string; + performanceTimeInfo: string; + ticketReservationStatus: number; + ticketReservationMemo: string; + performanceMemo: string; +}; + +export type PerformanceCompact = PerformanceBase & { + performanceDetail: Record; + performanceStaff: PerformanceStaff[]; + performanceMonitoringSchedule: PerformanceMonitoringSchedule; +}; + +export type PerformanceFull = PerformanceBase & { + performanceDetail: Record; + performanceStaff: PerformanceStaff[]; + performanceMonitoringSchedule: PerformanceMonitoringSchedule; + performanceAssignList: PerformanceAssign[]; + performanceMonitoringVisitMap: Record; + performanceReviewMap: Record; +}; + +export type PerformanceMonitoringSchedule = { + id: number; + performanceId: number; + monitoringDate: string; + monitoringTimeInfo: string; + monitoringAddress: string; +}; + +export type PerformanceMonitoringVisit = { + id: number; + performanceId: number; + monitoringVisitStatus: number; + evidenceImg: string; + gpsLatitude: number; + gpsLongitude: number; + gpsAccuracyM: number; + gpsRaw: Record; +}; + +export type PerformanceReview = { + performanceId: number; + reviewType: number; + reviewStatus: number; + uploadFileName: string; + pdfConvert: boolean; + pdfFileName: string; +}; + +export type PerformanceStaff = { + id: number; + performanceId: number; + staffType: number; + staffName: string; + staffTel1: string; + staffTel2: string; + staffEmail: string; +}; -- 2.49.0.windows.1 From fcb2c7a270f77baccdf065634cdd8ddd36059b38 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Mon, 15 Jun 2026 10:29:41 +0900 Subject: [PATCH 03/11] =?UTF-8?q?260615=5F04=5FENH:=20kon=EC=9A=A9=20api?= =?UTF-8?q?=EC=97=90=20cors=20=EC=A1=B0=EA=B1=B4=20=EC=99=84=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/api/kon/[[...slug]]/route.ts | 35 ++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/src/app/api/kon/[[...slug]]/route.ts b/src/app/api/kon/[[...slug]]/route.ts index 025c645..627e6e3 100644 --- a/src/app/api/kon/[[...slug]]/route.ts +++ b/src/app/api/kon/[[...slug]]/route.ts @@ -6,6 +6,13 @@ import {PerformanceCompact} from "@/types/gwcf"; const ALLOWED_ORIGIN = "https://kon.kric.com"; +const corsHeaders = { + "Access-Control-Allow-Origin": ALLOWED_ORIGIN, + "Access-Control-Allow-Methods": "POST, OPTIONS", + "Access-Control-Allow-Headers": "Content-Type, Authorization", + "Vary": "Origin", +}; + const getRequestOrigin = (req: NextRequest) => { const origin = req.headers.get("origin"); if (origin) { @@ -28,13 +35,31 @@ const isAllowedOrigin = (req: NextRequest) => { return getRequestOrigin(req) === ALLOWED_ORIGIN; }; +const withCors = (response: NextResponse) => { + Object.entries(corsHeaders).forEach(([key, value]) => { + response.headers.set(key, value); + }); + return response; +}; + +export const OPTIONS = async (req: NextRequest) => { + if (!isAllowedOrigin(req)) { + return withCors(NextResponse.json({ message: "Forbidden" }, { status: 403 })); + } + + return new NextResponse(null, { + status: 204, + headers: corsHeaders, + }); +}; + export const POST = async ( req: NextRequest, context: RouteContext ) => { try { if (!isAllowedOrigin(req)) { - return NextResponse.json({ message: "Forbidden" }, { status: 403 }); + return withCors(NextResponse.json({ message: "Forbidden" }, { status: 403 })); } const {slug = []} = await context.params; @@ -43,17 +68,17 @@ export const POST = async ( if(action === "assign-confirm" && slug.length === 2) { const result = await backApi.post(`/assign/confirm/${slug[1]}`) - return NextResponse.json(result, { status: 200 }); + return withCors(NextResponse.json(result, { status: 200 })); } if(action === "performance-list") { const result = await backApi.get(`/performance/list/compact`) - return NextResponse.json(result, { status: 200 }); + return withCors(NextResponse.json(result, { status: 200 })); } - return NextResponse.json({ message: "Not found" }, { status: 404 }); + return withCors(NextResponse.json({ message: "Not found" }, { status: 404 })); } catch (error: unknown) { - return errorToResponse(error); + return withCors(errorToResponse(error)); } } -- 2.49.0.windows.1 From 28da30b865ce210f16ce04d9eed7eefe3d3ea837 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Wed, 17 Jun 2026 15:56:38 +0900 Subject: [PATCH 04/11] =?UTF-8?q?260617=5F01=5FENH:=20=EB=B0=B0=EC=A0=95?= =?UTF-8?q?=20=ED=85=8C=EC=8A=A4=ED=8A=B8=EB=A5=BC=20=EC=9C=84=ED=95=B4=20?= =?UTF-8?q?=EA=B0=9C=EB=B0=9C=20=EC=A4=91=EB=8F=84=20=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 3 +- .env.local | 3 +- .env.production | 3 +- components.json | 21 + package-lock.json | 591 ++++++++++-------- package.json | 4 +- src/app/(pages)/(main)/assign/page.tsx | 220 +++++++ src/app/(pages)/(main)/layout.tsx | 2 +- src/app/(pages)/(main)/monitoring/page.tsx | 230 ++++++- src/app/(pages)/(main)/page.tsx | 1 - src/app/(pages)/(main)/performance/page.tsx | 487 ++++++++++++++- src/app/(pages)/(main)/user/page.tsx | 310 ++++++++- src/app/api/assign/[[...slug]]/route.ts | 116 ++++ src/app/api/code/[[...slug]]/route.ts | 25 + src/app/api/kon/[[...slug]]/route.ts | 6 +- src/app/api/login/route.ts | 3 +- src/app/api/monitoring/[[...slug]]/route.ts | 100 +++ src/app/api/notification/[[...slug]]/route.ts | 117 ++++ src/app/api/performance/[[...slug]]/route.ts | 124 ++++ src/app/api/review/[[...slug]]/route.ts | 104 +++ src/app/api/user/[[...slug]]/route.ts | 125 ++++ src/app/globals.css | 29 +- src/components/common/DatePicker.tsx | 66 ++ src/components/common/LoadingOverlay.tsx | 2 +- src/components/data-table/DataTable.tsx | 7 +- src/components/data-table/DataTable.type.ts | 60 +- .../dialog/AssignMonitoringDialog.tsx | 218 +++++++ src/components/dialog/ExcelRegisterDialog.tsx | 102 +++ .../dialog/MonitoringVisitDialog.tsx | 81 +++ .../dialog/PerformanceDetailDialog.tsx | 471 ++++++++++++++ src/components/dialog/SmsSendDialog.tsx | 271 ++++++++ src/components/gwcf/EmptyRow.tsx | 11 + src/components/gwcf/FilePendingButton.tsx | 25 + src/components/gwcf/FilterSelect.tsx | 37 ++ src/components/gwcf/MultiFilterSelect.tsx | 34 + src/components/gwcf/PagePanel.tsx | 12 + src/components/gwcf/StatusPill.tsx | 62 ++ src/components/layout/Header.tsx | 15 +- src/components/layout/MainLayout.tsx | 9 +- src/components/ui/calendar.tsx | 220 +++++++ src/components/ui/input.tsx | 1 + src/components/ui/multi-select.tsx | 281 ++++----- src/components/ui/tooltip.tsx | 57 ++ src/config/gwcf.config.ts | 39 +- src/lib/env.server.ts | 1 + src/lib/gwcf/performance-status.ts | 146 +++++ src/lib/gwcf/view.ts | 119 ++++ src/lib/server-api.ts | 7 +- src/lib/utils.ts | 28 + src/query/assign.ts | 122 ++++ src/query/code.ts | 54 ++ src/query/key/keys.ts | 19 + src/query/monitoring.ts | 56 ++ src/query/notification.ts | 35 ++ src/query/performance.ts | 100 +++ src/query/review.ts | 72 +++ src/query/user.ts | 79 +++ src/store/jotai/dialog.ts | 9 + src/types/common.ts | 11 +- src/types/gwcf.ts | 43 ++ src/types/notification.ts | 40 ++ 61 files changed, 5136 insertions(+), 510 deletions(-) create mode 100644 components.json create mode 100644 src/app/(pages)/(main)/assign/page.tsx create mode 100644 src/app/api/assign/[[...slug]]/route.ts create mode 100644 src/app/api/code/[[...slug]]/route.ts create mode 100644 src/app/api/monitoring/[[...slug]]/route.ts create mode 100644 src/app/api/notification/[[...slug]]/route.ts create mode 100644 src/app/api/performance/[[...slug]]/route.ts create mode 100644 src/app/api/review/[[...slug]]/route.ts create mode 100644 src/app/api/user/[[...slug]]/route.ts create mode 100644 src/components/common/DatePicker.tsx create mode 100644 src/components/dialog/AssignMonitoringDialog.tsx create mode 100644 src/components/dialog/ExcelRegisterDialog.tsx create mode 100644 src/components/dialog/MonitoringVisitDialog.tsx create mode 100644 src/components/dialog/PerformanceDetailDialog.tsx create mode 100644 src/components/dialog/SmsSendDialog.tsx create mode 100644 src/components/gwcf/EmptyRow.tsx create mode 100644 src/components/gwcf/FilePendingButton.tsx create mode 100644 src/components/gwcf/FilterSelect.tsx create mode 100644 src/components/gwcf/MultiFilterSelect.tsx create mode 100644 src/components/gwcf/PagePanel.tsx create mode 100644 src/components/gwcf/StatusPill.tsx create mode 100644 src/components/ui/calendar.tsx create mode 100644 src/components/ui/tooltip.tsx create mode 100644 src/lib/gwcf/performance-status.ts create mode 100644 src/lib/gwcf/view.ts create mode 100644 src/query/assign.ts create mode 100644 src/query/code.ts create mode 100644 src/query/key/keys.ts create mode 100644 src/query/monitoring.ts create mode 100644 src/query/notification.ts create mode 100644 src/query/performance.ts create mode 100644 src/query/review.ts create mode 100644 src/query/user.ts create mode 100644 src/types/notification.ts diff --git a/.env.development b/.env.development index 7a67c58..0e4c0c6 100644 --- a/.env.development +++ b/.env.development @@ -2,4 +2,5 @@ NEXT_PUBLIC_ENV=prod NEXT_PUBLIC_API_BASE=https://test-gwcf-review.kric.com/api ENV=prod -API_BACK_SERVER=http://127.0.0.1:6105/api/v1 \ No newline at end of file +API_BACK_SERVER=http://127.0.0.1:6105/api/v1 +NOTI_HUB_SERVER=https://noti-hub.kric.com/api/v1 \ No newline at end of file diff --git a/.env.local b/.env.local index f1761b8..bc738a6 100644 --- a/.env.local +++ b/.env.local @@ -2,4 +2,5 @@ NEXT_PUBLIC_ENV=local NEXT_PUBLIC_API_BASE=http://localhost:6104/api ENV=local -API_BACK_SERVER=http://localhost:6105/api/v1 \ No newline at end of file +API_BACK_SERVER=http://localhost:6105/api/v1 +NOTI_HUB_SERVER=https://noti-hub.kric.com/api/v1 \ No newline at end of file diff --git a/.env.production b/.env.production index 92ce93b..3b4ad1a 100644 --- a/.env.production +++ b/.env.production @@ -2,4 +2,5 @@ NEXT_PUBLIC_ENV=prod NEXT_PUBLIC_API_BASE=https://gwcf-review.kric.com/api ENV=prod -API_BACK_SERVER=http://127.0.0.1:6105/api/v1 \ No newline at end of file +API_BACK_SERVER=http://127.0.0.1:6105/api/v1 +NOTI_HUB_SERVER=https://noti-hub.kric.com/api/v1 \ No newline at end of file diff --git a/components.json b/components.json new file mode 100644 index 0000000..3289f23 --- /dev/null +++ b/components.json @@ -0,0 +1,21 @@ +{ + "$schema": "https://ui.shadcn.com/schema.json", + "style": "new-york", + "rsc": true, + "tsx": true, + "tailwind": { + "config": "", + "css": "src/app/globals.css", + "baseColor": "neutral", + "cssVariables": true, + "prefix": "" + }, + "aliases": { + "components": "@/components", + "utils": "@/lib/utils", + "ui": "@/components/ui", + "lib": "@/lib", + "hooks": "@/hooks" + }, + "iconLibrary": "lucide" +} diff --git a/package-lock.json b/package-lock.json index ca0bd1d..48dd419 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,14 +14,16 @@ "clsx": "^2.1.1", "cmdk": "^1.1.1", "crypto-js": "^4.2.0", + "date-fns": "^4.4.0", "echarts": "^6.0.0", "echarts-for-react": "^3.0.5", "exceljs": "^4.4.0", "jotai": "^2.16.2", "lucide-react": "^0.562.0", "next": "16.2.7", - "radix-ui": "^1.5.0", + "radix-ui": "^1.6.0", "react": "19.2.4", + "react-day-picker": "^10.0.1", "react-dom": "19.2.4", "shadcn": "^4.1.0", "sonner": "^2.0.7", @@ -461,6 +463,12 @@ "node": ">=6.9.0" } }, + "node_modules/@date-fns/tz": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@date-fns/tz/-/tz-1.5.0.tgz", + "integrity": "sha512-lwYN/vDPeNRULcepoE/LO2Pgx+7/RV+S9ARfbc9lr2DtGkOD7pAiruHvbR1RX3Qyf6ja47EWJDMsNK5vK08DJg==", + "license": "MIT" + }, "node_modules/@dotenvx/dotenvx": { "version": "1.71.2", "resolved": "https://registry.npmjs.org/@dotenvx/dotenvx/-/dotenvx-1.71.2.tgz", @@ -1827,12 +1835,12 @@ "license": "MIT" }, "node_modules/@radix-ui/react-accessible-icon": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/@radix-ui/react-accessible-icon/-/react-accessible-icon-1.1.9.tgz", - "integrity": "sha512-5W9KzJz/3DeYbGJHbZv8Q6AkxMOKUmALfc+PRg9dWwJZMk6zD37Sz8sZrF7UD6CBkiJvn7dNeRzn5G7XiCMyig==", + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/@radix-ui/react-accessible-icon/-/react-accessible-icon-1.1.10.tgz", + "integrity": "sha512-TraSwZUqTcVbiDV2/RXzAXC7aeVVXchq0daPFZE7zAxYFaMzjOUggLOfQH9KFLgRizuwVKZO/crveV1eeO3/ZQ==", "license": "MIT", "dependencies": { - "@radix-ui/react-visually-hidden": "1.2.5" + "@radix-ui/react-visually-hidden": "1.2.6" }, "peerDependencies": { "@types/react": "*", @@ -1850,19 +1858,19 @@ } }, "node_modules/@radix-ui/react-accordion": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/@radix-ui/react-accordion/-/react-accordion-1.2.13.tgz", - "integrity": "sha512-xITxBB2p5m5tAe7M0F95kb4uAh7jSIKGlExMEm93HlW+XxZHV2eXFbPWLktd4JhRiwcnXNbO7iekcrbZy6ZCvA==", + "version": "1.2.14", + "resolved": "https://registry.npmjs.org/@radix-ui/react-accordion/-/react-accordion-1.2.14.tgz", + "integrity": "sha512-iE8YB9nmTBH8zd73ofBISZ8JCzgMoMkATJr7qDwa6u5F1+7mTM81V6fa71jgZ65rpjVpecDf1vSnwIFP9Ly1zw==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.4", - "@radix-ui/react-collapsible": "1.1.13", - "@radix-ui/react-collection": "1.1.9", + "@radix-ui/react-collapsible": "1.1.14", + "@radix-ui/react-collection": "1.1.10", "@radix-ui/react-compose-refs": "1.1.3", "@radix-ui/react-context": "1.1.4", "@radix-ui/react-direction": "1.1.2", "@radix-ui/react-id": "1.1.2", - "@radix-ui/react-primitive": "2.1.5", + "@radix-ui/react-primitive": "2.1.6", "@radix-ui/react-use-controllable-state": "1.2.3" }, "peerDependencies": { @@ -1881,17 +1889,16 @@ } }, "node_modules/@radix-ui/react-alert-dialog": { - "version": "1.1.16", - "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.16.tgz", - "integrity": "sha512-vPaIgo0mxYlvcFaM9jB2Uot9TjGXMuAPEvrc6BOLeV+I5U8s1dkIoouYaa6lmSfc5SPMo5x5djOTOTvaigdGMQ==", + "version": "1.1.17", + "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.17.tgz", + "integrity": "sha512-563ygGeyWPrxyVCNp7OV4rE2aIXhFPknpFyo4wbDlcyMMPZ6ySh+zC5WTvY0ZFLgPTg/QB6tA8PyDQyJ2b4cPg==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.4", "@radix-ui/react-compose-refs": "1.1.3", "@radix-ui/react-context": "1.1.4", - "@radix-ui/react-dialog": "1.1.16", - "@radix-ui/react-primitive": "2.1.5", - "@radix-ui/react-slot": "1.2.5" + "@radix-ui/react-dialog": "1.1.17", + "@radix-ui/react-primitive": "2.1.6" }, "peerDependencies": { "@types/react": "*", @@ -1909,12 +1916,12 @@ } }, "node_modules/@radix-ui/react-arrow": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.9.tgz", - "integrity": "sha512-yqHW5WQ/cTpU/un7dqqIKNy2iRU8BC0JB78PEzTfCCYvZu1U6W9KwObAniMk9nhSfyotKPQTYaUD/HB0f5muig==", + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.10.tgz", + "integrity": "sha512-j2VTDz1vgCsmuG0k5lBfOcM8n5JPFqZBcMryasFjHYMhwxYL5SRUV5lMSUpRdNtw3D/Sv8pzJtrlAgkssYSsQQ==", "license": "MIT", "dependencies": { - "@radix-ui/react-primitive": "2.1.5" + "@radix-ui/react-primitive": "2.1.6" }, "peerDependencies": { "@types/react": "*", @@ -1932,12 +1939,12 @@ } }, "node_modules/@radix-ui/react-aspect-ratio": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/@radix-ui/react-aspect-ratio/-/react-aspect-ratio-1.1.9.tgz", - "integrity": "sha512-Xy+Dpxt/5n9rVTdPrNFmf8GwG1NlT1pzCF/z1MgOGZMLZWdWl+km+ZRWGQAPEhbkzSwYEsfYmTca8NhUtVxqnw==", + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/@radix-ui/react-aspect-ratio/-/react-aspect-ratio-1.1.10.tgz", + "integrity": "sha512-kbI7NrqhDeuytYrq7JjAsoXczvL8wgj2tc1MyaYWm+50bMKHCHQtVWCryslx4cCpmCTTkBcwQckE4CmmGV2haQ==", "license": "MIT", "dependencies": { - "@radix-ui/react-primitive": "2.1.5" + "@radix-ui/react-primitive": "2.1.6" }, "peerDependencies": { "@types/react": "*", @@ -1955,13 +1962,13 @@ } }, "node_modules/@radix-ui/react-avatar": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/@radix-ui/react-avatar/-/react-avatar-1.1.12.tgz", - "integrity": "sha512-NQCQyWC7QrDPhjMn8hUqFeU0lUrprIgm1AyMgLbzuQJibNnatdc3SSMo3/UGFu/eUkJUU1cEcKCnyhXTQzq6tA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-avatar/-/react-avatar-1.2.0.tgz", + "integrity": "sha512-am/CwltXtmtdtP+5FbYblYDnMa/zuKcMJP1i3/SJMDXXfj2mG+BTqLH2wucqeyyiQMursUtg/5cK+Nh2pCaSOA==", "license": "MIT", "dependencies": { "@radix-ui/react-context": "1.1.4", - "@radix-ui/react-primitive": "2.1.5", + "@radix-ui/react-primitive": "2.1.6", "@radix-ui/react-use-callback-ref": "1.1.2", "@radix-ui/react-use-is-hydrated": "0.1.1", "@radix-ui/react-use-layout-effect": "1.1.2" @@ -1982,16 +1989,16 @@ } }, "node_modules/@radix-ui/react-checkbox": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.3.4.tgz", - "integrity": "sha512-m3JmIOAX5ZzZ6VPjxEU2dbTOhoHi0nT5riwcDwe8idocsWf4a5DXJLDtZ6LfJwMBx7W+A2b7kp2TgPEKtaiF6A==", + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.3.5.tgz", + "integrity": "sha512-pREzrmNnVwGvYaBoM64huTRK7B3lrTRuwj8A9nwhPiEtMb+yudiWh6zWAqEtP0Dzd5+iBa1Ki7V1pCxV8ExMdA==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.4", "@radix-ui/react-compose-refs": "1.1.3", "@radix-ui/react-context": "1.1.4", "@radix-ui/react-presence": "1.1.6", - "@radix-ui/react-primitive": "2.1.5", + "@radix-ui/react-primitive": "2.1.6", "@radix-ui/react-use-controllable-state": "1.2.3", "@radix-ui/react-use-previous": "1.1.2", "@radix-ui/react-use-size": "1.1.2" @@ -2012,9 +2019,9 @@ } }, "node_modules/@radix-ui/react-collapsible": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/@radix-ui/react-collapsible/-/react-collapsible-1.1.13.tgz", - "integrity": "sha512-F0s8+p2XNpfc3k02zBfB0jPWbkHVG162+p7BdUMyJ2308QMqZ+oaclX+FAzKFovgL5OqRU+Rvy6f/vbdlJVaqA==", + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/@radix-ui/react-collapsible/-/react-collapsible-1.1.14.tgz", + "integrity": "sha512-9bT+FvifX1FK2Mj6UEsTdyu0cN3JaA3KdfhaBao+ONrYFy/pyOy3TU1TNw7iOk1o+0hOEq67RojlUUmoFGwxyA==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.4", @@ -2022,7 +2029,7 @@ "@radix-ui/react-context": "1.1.4", "@radix-ui/react-id": "1.1.2", "@radix-ui/react-presence": "1.1.6", - "@radix-ui/react-primitive": "2.1.5", + "@radix-ui/react-primitive": "2.1.6", "@radix-ui/react-use-controllable-state": "1.2.3", "@radix-ui/react-use-layout-effect": "1.1.2" }, @@ -2042,15 +2049,15 @@ } }, "node_modules/@radix-ui/react-collection": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.9.tgz", - "integrity": "sha512-zuSVi7ziP7uQRqc+yGxsKJfNkdyHv3ZKDaHe0gzg4dRgws96TPKWIiz84tVHP4GEcEl8bC0mdt17NkcxaJHmaQ==", + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.10.tgz", + "integrity": "sha512-IVVz4EvBcKjrzKgof714qDnz/SzQAkLA2Emh5edlHbgcE6fNd3Un6CJLlaYcnm8N4JmAtzQgse4dOKxcD2yc9g==", "license": "MIT", "dependencies": { "@radix-ui/react-compose-refs": "1.1.3", "@radix-ui/react-context": "1.1.4", - "@radix-ui/react-primitive": "2.1.5", - "@radix-ui/react-slot": "1.2.5" + "@radix-ui/react-primitive": "2.1.6", + "@radix-ui/react-slot": "1.3.0" }, "peerDependencies": { "@types/react": "*", @@ -2098,15 +2105,15 @@ } }, "node_modules/@radix-ui/react-context-menu": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-context-menu/-/react-context-menu-2.3.0.tgz", - "integrity": "sha512-d7CouXhAW+CGmFOqmB+IEvd3E9GcaqfgvfjCc3hfulp2pkaUCEVEGa0SN5nNWYA+IvQ6g1Pt+S5dpNn1AoY9hg==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-context-menu/-/react-context-menu-2.3.1.tgz", + "integrity": "sha512-XbrxS68W5dyiE4fAb96yvJwSVU5x66B20A99sD5Mk3xSWK/LqeOnx6TZnim1KieMjXS/CTFq8reOAjWxas2G8Q==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.4", "@radix-ui/react-context": "1.1.4", - "@radix-ui/react-menu": "2.1.17", - "@radix-ui/react-primitive": "2.1.5", + "@radix-ui/react-menu": "2.1.18", + "@radix-ui/react-primitive": "2.1.6", "@radix-ui/react-use-controllable-state": "1.2.3" }, "peerDependencies": { @@ -2125,22 +2132,22 @@ } }, "node_modules/@radix-ui/react-dialog": { - "version": "1.1.16", - "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.16.tgz", - "integrity": "sha512-l9ok83YBclEZhbjgzt76Hw733e6cvRKPNgO6GJ/IETlufXG9p+fRu2wlvpImQvR6xdJ8h7J8J2DBvsPEiEsKMw==", + "version": "1.1.17", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.17.tgz", + "integrity": "sha512-TDTYmpdq8dI2+Xgvgj9AJ8Ghqq+Eph/TRVEdaFQPDItIY+6QSkU7MJMeevw1568Yw/2Ijz8BTphPSP2XejKphw==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.4", "@radix-ui/react-compose-refs": "1.1.3", "@radix-ui/react-context": "1.1.4", - "@radix-ui/react-dismissable-layer": "1.1.12", + "@radix-ui/react-dismissable-layer": "1.1.13", "@radix-ui/react-focus-guards": "1.1.4", - "@radix-ui/react-focus-scope": "1.1.9", + "@radix-ui/react-focus-scope": "1.1.10", "@radix-ui/react-id": "1.1.2", - "@radix-ui/react-portal": "1.1.11", + "@radix-ui/react-portal": "1.1.12", "@radix-ui/react-presence": "1.1.6", - "@radix-ui/react-primitive": "2.1.5", - "@radix-ui/react-slot": "1.2.5", + "@radix-ui/react-primitive": "2.1.6", + "@radix-ui/react-slot": "1.3.0", "@radix-ui/react-use-controllable-state": "1.2.3", "aria-hidden": "^1.2.4", "react-remove-scroll": "^2.7.2" @@ -2176,14 +2183,14 @@ } }, "node_modules/@radix-ui/react-dismissable-layer": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.12.tgz", - "integrity": "sha512-MhoruH6xEzsbvOmo4TNgMfmtvRGyDZw4MDSdf4ybMHfezjqwzv6hyd4lsMzBp8K9Sn6sGzCF62x1I7BYUECXOg==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.13.tgz", + "integrity": "sha512-2v+zNAWWe0ySxgC0D0yeXMPQ23xZVgXZTerTz+JKlmdRj6gfTqmCcR29jb6d290DezXPGgruHWDX/vYUebtErg==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.4", "@radix-ui/react-compose-refs": "1.1.3", - "@radix-ui/react-primitive": "2.1.5", + "@radix-ui/react-primitive": "2.1.6", "@radix-ui/react-use-callback-ref": "1.1.2", "@radix-ui/react-use-escape-keydown": "1.1.2" }, @@ -2203,17 +2210,17 @@ } }, "node_modules/@radix-ui/react-dropdown-menu": { - "version": "2.1.17", - "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.17.tgz", - "integrity": "sha512-S6b3Jm57sY5EdDyOMLkacbB0qMnKhy1RCKZCt795ZkmtUOAvojYIZ5p7dXHIh5Cyr3jCLLI5/g64V3FKLudZmw==", + "version": "2.1.18", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.18.tgz", + "integrity": "sha512-PZGV82gFk0WltDRI//SsG28ZIjlo9ANTmoNYg0jLNzXXiDsAy5PkOOYQaVD1pPxY6t7gxffb1QMD6qaUvsBZdw==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.4", "@radix-ui/react-compose-refs": "1.1.3", "@radix-ui/react-context": "1.1.4", "@radix-ui/react-id": "1.1.2", - "@radix-ui/react-menu": "2.1.17", - "@radix-ui/react-primitive": "2.1.5", + "@radix-ui/react-menu": "2.1.18", + "@radix-ui/react-primitive": "2.1.6", "@radix-ui/react-use-controllable-state": "1.2.3" }, "peerDependencies": { @@ -2247,13 +2254,13 @@ } }, "node_modules/@radix-ui/react-focus-scope": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.9.tgz", - "integrity": "sha512-9Se8t+Zry+1rEOL7Y6l/4ANYU/TOtAtf8O2fKdwLltcaMcm6kOqYGbzO4tMFQ0bvzO920pRAoHpFZ4W85S3keQ==", + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.10.tgz", + "integrity": "sha512-Fas/lXQqhVvqwAb64s5RFeHiHYElZ6SUQbZaNd6EkfhP/Al7wTIQ9WIR4QVX475tlu5yFCEdDcJH6/UwsZjMWw==", "license": "MIT", "dependencies": { "@radix-ui/react-compose-refs": "1.1.3", - "@radix-ui/react-primitive": "2.1.5", + "@radix-ui/react-primitive": "2.1.6", "@radix-ui/react-use-callback-ref": "1.1.2" }, "peerDependencies": { @@ -2272,17 +2279,17 @@ } }, "node_modules/@radix-ui/react-form": { - "version": "0.1.9", - "resolved": "https://registry.npmjs.org/@radix-ui/react-form/-/react-form-0.1.9.tgz", - "integrity": "sha512-eTPyThIKDacJ3mJDvYwf/PSmsEYlOyA2Qcb+aGyWwYv+P5w57VPUkMVA2XJ9z0Du2KBY1HoHQzhPV9iYL/r4hg==", + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/@radix-ui/react-form/-/react-form-0.1.10.tgz", + "integrity": "sha512-1NfuvctVtX4sU3Mmq/IdrR8UunxiCMiVg3A5UENKhFzxUBeOyaQQ+lmaQaV7Tc8cqvBKsJL3/KGBsixK0D8WFg==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.4", "@radix-ui/react-compose-refs": "1.1.3", "@radix-ui/react-context": "1.1.4", "@radix-ui/react-id": "1.1.2", - "@radix-ui/react-label": "2.1.9", - "@radix-ui/react-primitive": "2.1.5" + "@radix-ui/react-label": "2.1.10", + "@radix-ui/react-primitive": "2.1.6" }, "peerDependencies": { "@types/react": "*", @@ -2300,19 +2307,19 @@ } }, "node_modules/@radix-ui/react-hover-card": { - "version": "1.1.16", - "resolved": "https://registry.npmjs.org/@radix-ui/react-hover-card/-/react-hover-card-1.1.16.tgz", - "integrity": "sha512-hAileDBtd6CX7nlZOarOnISQ6PP4q0e16BX51ulzdZ+7IzjL0sDTVpFdmSYrIjw6zVNsfQBao5gG6AWr3qwfvA==", + "version": "1.1.17", + "resolved": "https://registry.npmjs.org/@radix-ui/react-hover-card/-/react-hover-card-1.1.17.tgz", + "integrity": "sha512-GjZQIEANVkuuWeztlKz6QEHe31ZX2iDfHzcTMCQVZXC0JyQrgfKWSC+LOOEw6aVV64zyjzobIzSA4AU4eKWrHA==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.4", "@radix-ui/react-compose-refs": "1.1.3", "@radix-ui/react-context": "1.1.4", - "@radix-ui/react-dismissable-layer": "1.1.12", - "@radix-ui/react-popper": "1.3.0", - "@radix-ui/react-portal": "1.1.11", + "@radix-ui/react-dismissable-layer": "1.1.13", + "@radix-ui/react-popper": "1.3.1", + "@radix-ui/react-portal": "1.1.12", "@radix-ui/react-presence": "1.1.6", - "@radix-ui/react-primitive": "2.1.5", + "@radix-ui/react-primitive": "2.1.6", "@radix-ui/react-use-controllable-state": "1.2.3" }, "peerDependencies": { @@ -2349,12 +2356,12 @@ } }, "node_modules/@radix-ui/react-label": { - "version": "2.1.9", - "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.9.tgz", - "integrity": "sha512-rDoTeMbCwRVcnmo7NGT9IlPo1yXmEI+xc1URP3oeewwZEV4mdTp1dYUhYbQdo4D1q2SjKVvv4N1gNY77QAQtjA==", + "version": "2.1.10", + "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.10.tgz", + "integrity": "sha512-ib0zvq2ZsAqKm5tRnqGJn3vOxSgIts5ToxsXT0q1S/GfLD1Zj7UOEnkw8u2w6sRmn47djpQWuSU1DCL1R29/yw==", "license": "MIT", "dependencies": { - "@radix-ui/react-primitive": "2.1.5" + "@radix-ui/react-primitive": "2.1.6" }, "peerDependencies": { "@types/react": "*", @@ -2372,26 +2379,26 @@ } }, "node_modules/@radix-ui/react-menu": { - "version": "2.1.17", - "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.17.tgz", - "integrity": "sha512-fmbNnFyf+JYCN0DhhWnEdUTDnZD1mXaPQWivdsPIb8oOSbARfD3LIQJbLCG8a8QLCwoMxiJ7GVPIFcC8Dw8v2Q==", + "version": "2.1.18", + "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.18.tgz", + "integrity": "sha512-lj8Rxjtn6zJq1oSbE/uDtAwCbB9BnxgHD+8MwJMuTh6u1dPamYhW9iuELr/Z8d0D/UysFblYYHeBPwi7T4k0YQ==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.4", - "@radix-ui/react-collection": "1.1.9", + "@radix-ui/react-collection": "1.1.10", "@radix-ui/react-compose-refs": "1.1.3", "@radix-ui/react-context": "1.1.4", "@radix-ui/react-direction": "1.1.2", - "@radix-ui/react-dismissable-layer": "1.1.12", + "@radix-ui/react-dismissable-layer": "1.1.13", "@radix-ui/react-focus-guards": "1.1.4", - "@radix-ui/react-focus-scope": "1.1.9", + "@radix-ui/react-focus-scope": "1.1.10", "@radix-ui/react-id": "1.1.2", - "@radix-ui/react-popper": "1.3.0", - "@radix-ui/react-portal": "1.1.11", + "@radix-ui/react-popper": "1.3.1", + "@radix-ui/react-portal": "1.1.12", "@radix-ui/react-presence": "1.1.6", - "@radix-ui/react-primitive": "2.1.5", - "@radix-ui/react-roving-focus": "1.1.12", - "@radix-ui/react-slot": "1.2.5", + "@radix-ui/react-primitive": "2.1.6", + "@radix-ui/react-roving-focus": "1.1.13", + "@radix-ui/react-slot": "1.3.0", "@radix-ui/react-use-callback-ref": "1.1.2", "aria-hidden": "^1.2.4", "react-remove-scroll": "^2.7.2" @@ -2412,20 +2419,20 @@ } }, "node_modules/@radix-ui/react-menubar": { - "version": "1.1.17", - "resolved": "https://registry.npmjs.org/@radix-ui/react-menubar/-/react-menubar-1.1.17.tgz", - "integrity": "sha512-AKtZ4O782yO7qwIyq73WpulYt1IHhQ0htDb6wNcxzxnSDCcSWMVBiU9ycpcA90XzQO4IVIxIErtak6Kg/Vt0rQ==", + "version": "1.1.18", + "resolved": "https://registry.npmjs.org/@radix-ui/react-menubar/-/react-menubar-1.1.18.tgz", + "integrity": "sha512-hX7EGx/oFq6DPY27GQuP/2wP48GHf5LG6r06VgNJlG+znmDS8OfopZcRcGly3L4lsB9FqpmLx6JQSE9P3BUpyw==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.4", - "@radix-ui/react-collection": "1.1.9", + "@radix-ui/react-collection": "1.1.10", "@radix-ui/react-compose-refs": "1.1.3", "@radix-ui/react-context": "1.1.4", "@radix-ui/react-direction": "1.1.2", "@radix-ui/react-id": "1.1.2", - "@radix-ui/react-menu": "2.1.17", - "@radix-ui/react-primitive": "2.1.5", - "@radix-ui/react-roving-focus": "1.1.12", + "@radix-ui/react-menu": "2.1.18", + "@radix-ui/react-primitive": "2.1.6", + "@radix-ui/react-roving-focus": "1.1.13", "@radix-ui/react-use-controllable-state": "1.2.3" }, "peerDependencies": { @@ -2444,25 +2451,25 @@ } }, "node_modules/@radix-ui/react-navigation-menu": { - "version": "1.2.15", - "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.15.tgz", - "integrity": "sha512-/fS8hKCcRt4DwCGa5QIB3juRXmfYSOk4a2AEe/BDIyy7Hm+eje2Y13oUx5zejl+wFt1owrM7E8NWlbaEl5EGpg==", + "version": "1.2.16", + "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.16.tgz", + "integrity": "sha512-nJ0SkrSQgudyYhMiYeHA1ayLVuduEJCFLan1RZZN7c9kqzzCFLaU9kuy81uNtqzweM9YaQPgWzxi9MwQ9jZ04g==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.4", - "@radix-ui/react-collection": "1.1.9", + "@radix-ui/react-collection": "1.1.10", "@radix-ui/react-compose-refs": "1.1.3", "@radix-ui/react-context": "1.1.4", "@radix-ui/react-direction": "1.1.2", - "@radix-ui/react-dismissable-layer": "1.1.12", + "@radix-ui/react-dismissable-layer": "1.1.13", "@radix-ui/react-id": "1.1.2", "@radix-ui/react-presence": "1.1.6", - "@radix-ui/react-primitive": "2.1.5", + "@radix-ui/react-primitive": "2.1.6", "@radix-ui/react-use-callback-ref": "1.1.2", "@radix-ui/react-use-controllable-state": "1.2.3", "@radix-ui/react-use-layout-effect": "1.1.2", "@radix-ui/react-use-previous": "1.1.2", - "@radix-ui/react-visually-hidden": "1.2.5" + "@radix-ui/react-visually-hidden": "1.2.6" }, "peerDependencies": { "@types/react": "*", @@ -2480,19 +2487,19 @@ } }, "node_modules/@radix-ui/react-one-time-password-field": { - "version": "0.1.9", - "resolved": "https://registry.npmjs.org/@radix-ui/react-one-time-password-field/-/react-one-time-password-field-0.1.9.tgz", - "integrity": "sha512-fvCzA9hm7yN5xxTPJIi4VhSmH5gv+76ILsxguBK3cm3icD5BR4vW7POQmu8Zio0yh91uuouG/Kang40IbMkaSQ==", + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/@radix-ui/react-one-time-password-field/-/react-one-time-password-field-0.1.10.tgz", + "integrity": "sha512-GHkcJ+WVj91At+OvUVTD4R3W0/wxw9t/sG5xFUBYXaCbtWiooZX5Md376QjJqgH4VsVyXrbVNHO2O4NYcmjfVg==", "license": "MIT", "dependencies": { "@radix-ui/number": "1.1.2", "@radix-ui/primitive": "1.1.4", - "@radix-ui/react-collection": "1.1.9", + "@radix-ui/react-collection": "1.1.10", "@radix-ui/react-compose-refs": "1.1.3", "@radix-ui/react-context": "1.1.4", "@radix-ui/react-direction": "1.1.2", - "@radix-ui/react-primitive": "2.1.5", - "@radix-ui/react-roving-focus": "1.1.12", + "@radix-ui/react-primitive": "2.1.6", + "@radix-ui/react-roving-focus": "1.1.13", "@radix-ui/react-use-controllable-state": "1.2.3", "@radix-ui/react-use-effect-event": "0.0.3", "@radix-ui/react-use-is-hydrated": "0.1.1", @@ -2514,16 +2521,16 @@ } }, "node_modules/@radix-ui/react-password-toggle-field": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/@radix-ui/react-password-toggle-field/-/react-password-toggle-field-0.1.4.tgz", - "integrity": "sha512-qoDSkObZ9faJlsjlwyBH6ia7kq9vaJ2QwWTowT3nQpzPvUTAKesmWuGJYpd91HIoJqS+5ZPXy5uFPp+HlwdaAg==", + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/@radix-ui/react-password-toggle-field/-/react-password-toggle-field-0.1.5.tgz", + "integrity": "sha512-fVuA82u0b/fClpbEJv8yp1nU9eSvoSEOERsU/hhf3FXGPIvkmE7oEaHEu8poowoXO39/Va7zq2E0TUcYr1dBRg==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.4", "@radix-ui/react-compose-refs": "1.1.3", "@radix-ui/react-context": "1.1.4", "@radix-ui/react-id": "1.1.2", - "@radix-ui/react-primitive": "2.1.5", + "@radix-ui/react-primitive": "2.1.6", "@radix-ui/react-use-controllable-state": "1.2.3", "@radix-ui/react-use-effect-event": "0.0.3", "@radix-ui/react-use-is-hydrated": "0.1.1" @@ -2544,23 +2551,23 @@ } }, "node_modules/@radix-ui/react-popover": { - "version": "1.1.16", - "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.16.tgz", - "integrity": "sha512-8brVpAU5Uq7Bh0c8EFc4ZTf2JJTYn0o+1L+CUJB3UYIOkTjKGMgoHvduylrahdmNlr3DfH0rFq2DrbNZXgaspw==", + "version": "1.1.17", + "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.17.tgz", + "integrity": "sha512-/YSAOdJ7YJvdn7bn5sdSx2egW+SKY+u7O5RyAVs94Ymrg2fg5QTSFPMRkzvhGyFuE4/qsmPBdrwYoZMZh/4f+g==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.4", "@radix-ui/react-compose-refs": "1.1.3", "@radix-ui/react-context": "1.1.4", - "@radix-ui/react-dismissable-layer": "1.1.12", + "@radix-ui/react-dismissable-layer": "1.1.13", "@radix-ui/react-focus-guards": "1.1.4", - "@radix-ui/react-focus-scope": "1.1.9", + "@radix-ui/react-focus-scope": "1.1.10", "@radix-ui/react-id": "1.1.2", - "@radix-ui/react-popper": "1.3.0", - "@radix-ui/react-portal": "1.1.11", + "@radix-ui/react-popper": "1.3.1", + "@radix-ui/react-portal": "1.1.12", "@radix-ui/react-presence": "1.1.6", - "@radix-ui/react-primitive": "2.1.5", - "@radix-ui/react-slot": "1.2.5", + "@radix-ui/react-primitive": "2.1.6", + "@radix-ui/react-slot": "1.3.0", "@radix-ui/react-use-controllable-state": "1.2.3", "aria-hidden": "^1.2.4", "react-remove-scroll": "^2.7.2" @@ -2581,16 +2588,16 @@ } }, "node_modules/@radix-ui/react-popper": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.3.0.tgz", - "integrity": "sha512-9PB589e1aWZbrlFUHdz6WiPCL+xLZHQFX7oibqG/6Q0SwOkxDyQX9W/cyPa+sAPPKuC8cpLCpRczE5a/1DiwVQ==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.3.1.tgz", + "integrity": "sha512-bhnq/0DEPTi2lsOD3J5rTL65qUKHbKbhqHsmN9TMiclSXpipi651ooUKPPp6G5lF/WiHBdn1s0Wuqsn+myVAvw==", "license": "MIT", "dependencies": { "@floating-ui/react-dom": "^2.0.0", - "@radix-ui/react-arrow": "1.1.9", + "@radix-ui/react-arrow": "1.1.10", "@radix-ui/react-compose-refs": "1.1.3", "@radix-ui/react-context": "1.1.4", - "@radix-ui/react-primitive": "2.1.5", + "@radix-ui/react-primitive": "2.1.6", "@radix-ui/react-use-callback-ref": "1.1.2", "@radix-ui/react-use-layout-effect": "1.1.2", "@radix-ui/react-use-rect": "1.1.2", @@ -2613,12 +2620,12 @@ } }, "node_modules/@radix-ui/react-portal": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.11.tgz", - "integrity": "sha512-UEytdjgEh2tJGgD/gZK4FUx6t1rNIlM3U0DENhSrG7I75FGm1DnaDuVUWF1pWAWUwGmn1sCJ1VGHn8LhN1aTOw==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.12.tgz", + "integrity": "sha512-m309havGzsjLHHaIX50G5PlvRs3xkgPCsGk/5PTvYm8D5q33yG0J7w/712PTOhid7NTaFETtnSXjngHQavvhVw==", "license": "MIT", "dependencies": { - "@radix-ui/react-primitive": "2.1.5", + "@radix-ui/react-primitive": "2.1.6", "@radix-ui/react-use-layout-effect": "1.1.2" }, "peerDependencies": { @@ -2660,12 +2667,12 @@ } }, "node_modules/@radix-ui/react-primitive": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.5.tgz", - "integrity": "sha512-zifXeB8Y88qCYx8PLZ5oQb32KwZub+s925mMoZsBBq9KUQqWKkREubTfs6ASjRPPBe7Jt9O8OHH89+95VG+grA==", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.6.tgz", + "integrity": "sha512-wetd0QI77DbvrPpTAvH1SqOxsYF2wZe5TNxqwOd5Ty4XDpV3dpV0s8K/1MGMJBeY5o7lg8ub5VIt1Ub+yVen6g==", "license": "MIT", "dependencies": { - "@radix-ui/react-slot": "1.2.5" + "@radix-ui/react-slot": "1.3.0" }, "peerDependencies": { "@types/react": "*", @@ -2683,13 +2690,13 @@ } }, "node_modules/@radix-ui/react-progress": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/@radix-ui/react-progress/-/react-progress-1.1.9.tgz", - "integrity": "sha512-+EOkvg1Zn1vI1+fRDfRSAiJ7BWfcDAo5ASMmbqrcLZ4s4USk2FGkoHgeb2X+CkUgo2zJMiyObwf1k44CrRWsyw==", + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/@radix-ui/react-progress/-/react-progress-1.1.10.tgz", + "integrity": "sha512-JYzEg60lk79PwKM27WZyKd7PW8O4OM5jOaFfRPfOyeXmMw7tLJh5kSj+CEjVTehszuwml/AdCzPGMXBTGf4BBw==", "license": "MIT", "dependencies": { "@radix-ui/react-context": "1.1.4", - "@radix-ui/react-primitive": "2.1.5" + "@radix-ui/react-primitive": "2.1.6" }, "peerDependencies": { "@types/react": "*", @@ -2707,9 +2714,9 @@ } }, "node_modules/@radix-ui/react-radio-group": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-radio-group/-/react-radio-group-1.4.0.tgz", - "integrity": "sha512-eHdV5bLx9sH+tBnbDjkIBdvQEH/c6MEtQYhTbxkaDK9qsIFFLtmJYEQFVdwhnruWotLfQmIuWEL/J+L3utE8rQ==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-radio-group/-/react-radio-group-1.4.1.tgz", + "integrity": "sha512-/SSxZdKEo2Eo29FFRKd06EfFDYp8HryKg0WYg7QLXaydPzl52YfSvCH2a3QDBRdtcuwACroJT8UVjQVgOJ7P9A==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.4", @@ -2717,8 +2724,8 @@ "@radix-ui/react-context": "1.1.4", "@radix-ui/react-direction": "1.1.2", "@radix-ui/react-presence": "1.1.6", - "@radix-ui/react-primitive": "2.1.5", - "@radix-ui/react-roving-focus": "1.1.12", + "@radix-ui/react-primitive": "2.1.6", + "@radix-ui/react-roving-focus": "1.1.13", "@radix-ui/react-use-controllable-state": "1.2.3", "@radix-ui/react-use-previous": "1.1.2", "@radix-ui/react-use-size": "1.1.2" @@ -2739,18 +2746,18 @@ } }, "node_modules/@radix-ui/react-roving-focus": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.12.tgz", - "integrity": "sha512-FvgPt1bRmg8Xt2QpF7NUZW3dE0ZQHGm41dAdgT2J2GJPoIXz+9Em3NobAxf4fupcxhgHu03E5CRiU2MWvObXyg==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.13.tgz", + "integrity": "sha512-9gkwneI0guf8JDmrFxPjJF6Ozzgioyw+/lonYNCwefS9ZHA05er0BVHiXr+LbWGHxUfczvMY6G1oiZZi1VzjRw==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.4", - "@radix-ui/react-collection": "1.1.9", + "@radix-ui/react-collection": "1.1.10", "@radix-ui/react-compose-refs": "1.1.3", "@radix-ui/react-context": "1.1.4", "@radix-ui/react-direction": "1.1.2", "@radix-ui/react-id": "1.1.2", - "@radix-ui/react-primitive": "2.1.5", + "@radix-ui/react-primitive": "2.1.6", "@radix-ui/react-use-callback-ref": "1.1.2", "@radix-ui/react-use-controllable-state": "1.2.3" }, @@ -2770,9 +2777,9 @@ } }, "node_modules/@radix-ui/react-scroll-area": { - "version": "1.2.11", - "resolved": "https://registry.npmjs.org/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.11.tgz", - "integrity": "sha512-DS39ziOgea75U/TrXKU2/oKp0be2jrDHnzFLvahg/0iNAT1Zq16e4Uw0WXwyXvsK+mG3BRyMb7A3NRZMDuEXtQ==", + "version": "1.2.12", + "resolved": "https://registry.npmjs.org/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.12.tgz", + "integrity": "sha512-xuafVzQiTCLsyEjakowTdG3OgTXsmO7IdCiO77otIa+z44xoLNs9Do5eg7POFumIOCjtG6djfm6RKUKpUa/csA==", "license": "MIT", "dependencies": { "@radix-ui/number": "1.1.2", @@ -2781,7 +2788,7 @@ "@radix-ui/react-context": "1.1.4", "@radix-ui/react-direction": "1.1.2", "@radix-ui/react-presence": "1.1.6", - "@radix-ui/react-primitive": "2.1.5", + "@radix-ui/react-primitive": "2.1.6", "@radix-ui/react-use-callback-ref": "1.1.2", "@radix-ui/react-use-layout-effect": "1.1.2" }, @@ -2801,31 +2808,31 @@ } }, "node_modules/@radix-ui/react-select": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.3.0.tgz", - "integrity": "sha512-mENc7WpJvJcW8hlMpzfFcHcEhTvYS5JMBmi9HVC1Q00uhBwML086MHYUV8QQdQv6lcu0Wg8dzd1RB8AFADcG/g==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.3.1.tgz", + "integrity": "sha512-w6eDvY78LE9ZUiNnXCA1QVK8RYN7k9galFv09kjVydJqBAgHd7Y9A6h0UJ/6DCZNGZMZrB2ohcSW1Bo9d8+wWA==", "license": "MIT", "dependencies": { "@radix-ui/number": "1.1.2", "@radix-ui/primitive": "1.1.4", - "@radix-ui/react-collection": "1.1.9", + "@radix-ui/react-collection": "1.1.10", "@radix-ui/react-compose-refs": "1.1.3", "@radix-ui/react-context": "1.1.4", "@radix-ui/react-direction": "1.1.2", - "@radix-ui/react-dismissable-layer": "1.1.12", + "@radix-ui/react-dismissable-layer": "1.1.13", "@radix-ui/react-focus-guards": "1.1.4", - "@radix-ui/react-focus-scope": "1.1.9", + "@radix-ui/react-focus-scope": "1.1.10", "@radix-ui/react-id": "1.1.2", - "@radix-ui/react-popper": "1.3.0", - "@radix-ui/react-portal": "1.1.11", + "@radix-ui/react-popper": "1.3.1", + "@radix-ui/react-portal": "1.1.12", "@radix-ui/react-presence": "1.1.6", - "@radix-ui/react-primitive": "2.1.5", - "@radix-ui/react-slot": "1.2.5", + "@radix-ui/react-primitive": "2.1.6", + "@radix-ui/react-slot": "1.3.0", "@radix-ui/react-use-callback-ref": "1.1.2", "@radix-ui/react-use-controllable-state": "1.2.3", "@radix-ui/react-use-layout-effect": "1.1.2", "@radix-ui/react-use-previous": "1.1.2", - "@radix-ui/react-visually-hidden": "1.2.5", + "@radix-ui/react-visually-hidden": "1.2.6", "aria-hidden": "^1.2.4", "react-remove-scroll": "^2.7.2" }, @@ -2845,12 +2852,12 @@ } }, "node_modules/@radix-ui/react-separator": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.9.tgz", - "integrity": "sha512-gvgW+JV/Mbjj6darztTetnmElpQEzZrXpJvfj+dOxNAxiyHEAyUvEjjl4zxblvmjmKmi3jfPoy7ZdxzCuUBJSA==", + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.10.tgz", + "integrity": "sha512-Y6K6jLQCVfCnTL2MEtGxDLffkhNfEfHsEg3Wa8JU+IWdn3EWbLXd3OuOfQRN7p/W/cUce1WyTk3QeuAoDBzN9g==", "license": "MIT", "dependencies": { - "@radix-ui/react-primitive": "2.1.5" + "@radix-ui/react-primitive": "2.1.6" }, "peerDependencies": { "@types/react": "*", @@ -2868,18 +2875,18 @@ } }, "node_modules/@radix-ui/react-slider": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slider/-/react-slider-1.4.0.tgz", - "integrity": "sha512-RHcPlLOThRJM51DSIC33ZnpDEBYhyEFroVWkd2P54PGGjkmAt14RboYUU9E1MFst666zFHM0tGtWvMjSOtU1pw==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-slider/-/react-slider-1.4.1.tgz", + "integrity": "sha512-r91WSpQucNGFKAIxT8FT0H0zyjd5tJlqObLp7LOMV4z49KoDCwjy01w3vDOU4e1wxhF9IgjYco7SB6byOW7Buw==", "license": "MIT", "dependencies": { "@radix-ui/number": "1.1.2", "@radix-ui/primitive": "1.1.4", - "@radix-ui/react-collection": "1.1.9", + "@radix-ui/react-collection": "1.1.10", "@radix-ui/react-compose-refs": "1.1.3", "@radix-ui/react-context": "1.1.4", "@radix-ui/react-direction": "1.1.2", - "@radix-ui/react-primitive": "2.1.5", + "@radix-ui/react-primitive": "2.1.6", "@radix-ui/react-use-controllable-state": "1.2.3", "@radix-ui/react-use-layout-effect": "1.1.2", "@radix-ui/react-use-previous": "1.1.2", @@ -2901,9 +2908,9 @@ } }, "node_modules/@radix-ui/react-slot": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.5.tgz", - "integrity": "sha512-rCMO3QsIVKv5JTY5CVbo2MvO77SpEqqYc8AvRE7OWqRDOIqAKjsp+DrmnY9uc8NPdxB5E2z47HTYGeE2+NTptg==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.3.0.tgz", + "integrity": "sha512-MojKku4U/miO8Av4Dkb+ctMAQx7JmY96LmtDQlAarCRtd7rN52QCSzBF+XAvr5S6coSVj9HEPBgHAHKEJVk/WA==", "license": "MIT", "dependencies": { "@radix-ui/react-compose-refs": "1.1.3" @@ -2919,15 +2926,15 @@ } }, "node_modules/@radix-ui/react-switch": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-switch/-/react-switch-1.3.0.tgz", - "integrity": "sha512-GP1EZwhoZO/GGnhM1P5/2Vpm8iN8EnngyU0oezn2l78kN8tj25pyrvjIaT7azBhK615KSt+P2w39y57YV5jVkA==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-switch/-/react-switch-1.3.1.tgz", + "integrity": "sha512-55bQtCnOB0BohomSHi6qvQXpJEEqUGDm6hRrM0Bph5OXwhSegqkd8IqgBAQkM1IlgUlWZIxpxRcpOEfRIgimyw==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.4", "@radix-ui/react-compose-refs": "1.1.3", "@radix-ui/react-context": "1.1.4", - "@radix-ui/react-primitive": "2.1.5", + "@radix-ui/react-primitive": "2.1.6", "@radix-ui/react-use-controllable-state": "1.2.3", "@radix-ui/react-use-previous": "1.1.2", "@radix-ui/react-use-size": "1.1.2" @@ -2948,9 +2955,9 @@ } }, "node_modules/@radix-ui/react-tabs": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.14.tgz", - "integrity": "sha512-D5jwp9JNuwDeCw3CYD2Fz+sSHo0droQjC8u75dJHe4aWr5q6yBiXZU+hurXnKudRgEpUkD5TsI6bjHPo5ThUxA==", + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.15.tgz", + "integrity": "sha512-kxc9gI6/HfcU4nfMMVS3AmQK414kbU1IE6UCJmMmxjhO3cRPXOyYnmvyKD+ODt7q56nRq9l7Wovi6uaGwKgMlg==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.4", @@ -2958,8 +2965,8 @@ "@radix-ui/react-direction": "1.1.2", "@radix-ui/react-id": "1.1.2", "@radix-ui/react-presence": "1.1.6", - "@radix-ui/react-primitive": "2.1.5", - "@radix-ui/react-roving-focus": "1.1.12", + "@radix-ui/react-primitive": "2.1.6", + "@radix-ui/react-roving-focus": "1.1.13", "@radix-ui/react-use-controllable-state": "1.2.3" }, "peerDependencies": { @@ -2978,23 +2985,23 @@ } }, "node_modules/@radix-ui/react-toast": { - "version": "1.2.16", - "resolved": "https://registry.npmjs.org/@radix-ui/react-toast/-/react-toast-1.2.16.tgz", - "integrity": "sha512-WUymDDiN2DpoGudRN1aW4wF5O3BNQjZZO/5nngPoNiEVqjyOzirvZZNO0R6dC1ifucSINVaSv8JX1aq47VGgiA==", + "version": "1.2.17", + "resolved": "https://registry.npmjs.org/@radix-ui/react-toast/-/react-toast-1.2.17.tgz", + "integrity": "sha512-uL4kyyWy000pPL43fGGCV5qT6ZchCWEQZOSlkYiPwPt8Hy1iW38RjeptIvz1/SZesrW6Vn58Ct3sV7tfEfiAbw==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.4", - "@radix-ui/react-collection": "1.1.9", + "@radix-ui/react-collection": "1.1.10", "@radix-ui/react-compose-refs": "1.1.3", "@radix-ui/react-context": "1.1.4", - "@radix-ui/react-dismissable-layer": "1.1.12", - "@radix-ui/react-portal": "1.1.11", + "@radix-ui/react-dismissable-layer": "1.1.13", + "@radix-ui/react-portal": "1.1.12", "@radix-ui/react-presence": "1.1.6", - "@radix-ui/react-primitive": "2.1.5", + "@radix-ui/react-primitive": "2.1.6", "@radix-ui/react-use-callback-ref": "1.1.2", "@radix-ui/react-use-controllable-state": "1.2.3", "@radix-ui/react-use-layout-effect": "1.1.2", - "@radix-ui/react-visually-hidden": "1.2.5" + "@radix-ui/react-visually-hidden": "1.2.6" }, "peerDependencies": { "@types/react": "*", @@ -3012,13 +3019,13 @@ } }, "node_modules/@radix-ui/react-toggle": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/@radix-ui/react-toggle/-/react-toggle-1.1.11.tgz", - "integrity": "sha512-FikrKJemoBGZQ6uRID0HJqSPBP6D7OppdD2OhLl0ZYLlAyPXI7MezoYGmumwNkrAoRm35xXkb4C8JPfJZZzcaw==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/@radix-ui/react-toggle/-/react-toggle-1.1.12.tgz", + "integrity": "sha512-AsAVsYNZIlRBsci7BhE+QyQeKd1h6TffJYt+lF0QQkd5OpQ3klfIByPsCb4G0h/Fq6PJwh1FYNluzBFYzhk4+w==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.4", - "@radix-ui/react-primitive": "2.1.5", + "@radix-ui/react-primitive": "2.1.6", "@radix-ui/react-use-controllable-state": "1.2.3" }, "peerDependencies": { @@ -3037,17 +3044,17 @@ } }, "node_modules/@radix-ui/react-toggle-group": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/@radix-ui/react-toggle-group/-/react-toggle-group-1.1.12.tgz", - "integrity": "sha512-TEgECgJaWGAHJJZGzNNEYTNBdIXqX7LchANycpyP7DkfjmuiSN7ISt1k/ZRGVJgVJonsgP4vwaiKMn5utrcwWQ==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/@radix-ui/react-toggle-group/-/react-toggle-group-1.1.13.tgz", + "integrity": "sha512-Xb9PLtlvU66F36LiKba6dFswu6V2mDkgidO4fNSbQHQwmZ9ObxMIO17MN/LJ4aWJecVuSVLAHPZjyeMzJrgeiA==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.4", "@radix-ui/react-context": "1.1.4", "@radix-ui/react-direction": "1.1.2", - "@radix-ui/react-primitive": "2.1.5", - "@radix-ui/react-roving-focus": "1.1.12", - "@radix-ui/react-toggle": "1.1.11", + "@radix-ui/react-primitive": "2.1.6", + "@radix-ui/react-roving-focus": "1.1.13", + "@radix-ui/react-toggle": "1.1.12", "@radix-ui/react-use-controllable-state": "1.2.3" }, "peerDependencies": { @@ -3066,18 +3073,18 @@ } }, "node_modules/@radix-ui/react-toolbar": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/@radix-ui/react-toolbar/-/react-toolbar-1.1.12.tgz", - "integrity": "sha512-4wHtJVdIgqMmEwUvxA0BYg/2JMRbt0L3+8UD8Ml/nhKkfXtiZcM8u/S15gQ5xj9YEd/0qlrm5bE805LsjQ+J8A==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/@radix-ui/react-toolbar/-/react-toolbar-1.1.13.tgz", + "integrity": "sha512-Za1l4f6fzTkGgz/iynAMN8iaqiKff2wm2/QwiLmHPtDQreWEBrvSimgQFIekxMUdRPhILM7xdIXxuS/o/DGZag==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.4", "@radix-ui/react-context": "1.1.4", "@radix-ui/react-direction": "1.1.2", - "@radix-ui/react-primitive": "2.1.5", - "@radix-ui/react-roving-focus": "1.1.12", - "@radix-ui/react-separator": "1.1.9", - "@radix-ui/react-toggle-group": "1.1.12" + "@radix-ui/react-primitive": "2.1.6", + "@radix-ui/react-roving-focus": "1.1.13", + "@radix-ui/react-separator": "1.1.10", + "@radix-ui/react-toggle-group": "1.1.13" }, "peerDependencies": { "@types/react": "*", @@ -3095,23 +3102,23 @@ } }, "node_modules/@radix-ui/react-tooltip": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/@radix-ui/react-tooltip/-/react-tooltip-1.2.9.tgz", - "integrity": "sha512-u6F9MmTtBSLkiXNVDrtB/yPCZarM9smNswC24YYLV/M+bth6J3Gs3vlJezEoFwKZvPvxhCpUYdUnOsNG/0XOlA==", + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/@radix-ui/react-tooltip/-/react-tooltip-1.2.10.tgz", + "integrity": "sha512-NlNe8D0dWEpVfXFli90IO6X07Josx/b1iu98tDnx9Xv0HT4wLIL+m2VOheMHhK7qbp2HoTBqALEFzGyZs/levw==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.4", "@radix-ui/react-compose-refs": "1.1.3", "@radix-ui/react-context": "1.1.4", - "@radix-ui/react-dismissable-layer": "1.1.12", + "@radix-ui/react-dismissable-layer": "1.1.13", "@radix-ui/react-id": "1.1.2", - "@radix-ui/react-popper": "1.3.0", - "@radix-ui/react-portal": "1.1.11", + "@radix-ui/react-popper": "1.3.1", + "@radix-ui/react-portal": "1.1.12", "@radix-ui/react-presence": "1.1.6", - "@radix-ui/react-primitive": "2.1.5", - "@radix-ui/react-slot": "1.2.5", + "@radix-ui/react-primitive": "2.1.6", + "@radix-ui/react-slot": "1.3.0", "@radix-ui/react-use-controllable-state": "1.2.3", - "@radix-ui/react-visually-hidden": "1.2.5" + "@radix-ui/react-visually-hidden": "1.2.6" }, "peerDependencies": { "@types/react": "*", @@ -3280,12 +3287,12 @@ } }, "node_modules/@radix-ui/react-visually-hidden": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.2.5.tgz", - "integrity": "sha512-tPcHNI3FajdDBFpl/Ez1m2WL0ufJqBKyHxMDBvKitopamK36WwBGOMicuMEZKkM5Wce41QxUyv6BsiqfrWBiGg==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.2.6.tgz", + "integrity": "sha512-jCE0WljWifTI4niIMCll06kGpsJTAPiZVU9H4WR1N6qW7At9ystHbN7dDB+we2xH535roFHj7qKS+RGj0FMDWQ==", "license": "MIT", "dependencies": { - "@radix-ui/react-primitive": "2.1.5" + "@radix-ui/react-primitive": "2.1.6" }, "peerDependencies": { "@types/react": "*", @@ -5640,6 +5647,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/date-fns": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.4.0.tgz", + "integrity": "sha512-+1UMbeh68lH1SegH83CGWwpb6OHHbpSgr3+s5Eww5M4CAgswBpoWS0AjTOfEJ33HiYKz1hdj/KTFprzXHmq/6w==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/kossnocorp" + } + }, "node_modules/dayjs": { "version": "1.11.21", "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.21.tgz", @@ -10000,58 +10017,58 @@ "license": "MIT" }, "node_modules/radix-ui": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/radix-ui/-/radix-ui-1.5.0.tgz", - "integrity": "sha512-Nzh2HNpClgB31FBHRqt2xG8XNUfVfQRpf34hACC5PNrXTd5JdXdqOXwLs3BL+D8CNYiNQiJiT8QGr5Q4vq+00w==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/radix-ui/-/radix-ui-1.6.0.tgz", + "integrity": "sha512-EUEC70O03EgxWMP5aoqfBZ6iLC5bczFagGy7zhSYRt8o5DP7IWNiP3ywetse3L9b8843ExB0OGWZvgbYVJuNeg==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.4", - "@radix-ui/react-accessible-icon": "1.1.9", - "@radix-ui/react-accordion": "1.2.13", - "@radix-ui/react-alert-dialog": "1.1.16", - "@radix-ui/react-arrow": "1.1.9", - "@radix-ui/react-aspect-ratio": "1.1.9", - "@radix-ui/react-avatar": "1.1.12", - "@radix-ui/react-checkbox": "1.3.4", - "@radix-ui/react-collapsible": "1.1.13", - "@radix-ui/react-collection": "1.1.9", + "@radix-ui/react-accessible-icon": "1.1.10", + "@radix-ui/react-accordion": "1.2.14", + "@radix-ui/react-alert-dialog": "1.1.17", + "@radix-ui/react-arrow": "1.1.10", + "@radix-ui/react-aspect-ratio": "1.1.10", + "@radix-ui/react-avatar": "1.2.0", + "@radix-ui/react-checkbox": "1.3.5", + "@radix-ui/react-collapsible": "1.1.14", + "@radix-ui/react-collection": "1.1.10", "@radix-ui/react-compose-refs": "1.1.3", "@radix-ui/react-context": "1.1.4", - "@radix-ui/react-context-menu": "2.3.0", - "@radix-ui/react-dialog": "1.1.16", + "@radix-ui/react-context-menu": "2.3.1", + "@radix-ui/react-dialog": "1.1.17", "@radix-ui/react-direction": "1.1.2", - "@radix-ui/react-dismissable-layer": "1.1.12", - "@radix-ui/react-dropdown-menu": "2.1.17", + "@radix-ui/react-dismissable-layer": "1.1.13", + "@radix-ui/react-dropdown-menu": "2.1.18", "@radix-ui/react-focus-guards": "1.1.4", - "@radix-ui/react-focus-scope": "1.1.9", - "@radix-ui/react-form": "0.1.9", - "@radix-ui/react-hover-card": "1.1.16", - "@radix-ui/react-label": "2.1.9", - "@radix-ui/react-menu": "2.1.17", - "@radix-ui/react-menubar": "1.1.17", - "@radix-ui/react-navigation-menu": "1.2.15", - "@radix-ui/react-one-time-password-field": "0.1.9", - "@radix-ui/react-password-toggle-field": "0.1.4", - "@radix-ui/react-popover": "1.1.16", - "@radix-ui/react-popper": "1.3.0", - "@radix-ui/react-portal": "1.1.11", + "@radix-ui/react-focus-scope": "1.1.10", + "@radix-ui/react-form": "0.1.10", + "@radix-ui/react-hover-card": "1.1.17", + "@radix-ui/react-label": "2.1.10", + "@radix-ui/react-menu": "2.1.18", + "@radix-ui/react-menubar": "1.1.18", + "@radix-ui/react-navigation-menu": "1.2.16", + "@radix-ui/react-one-time-password-field": "0.1.10", + "@radix-ui/react-password-toggle-field": "0.1.5", + "@radix-ui/react-popover": "1.1.17", + "@radix-ui/react-popper": "1.3.1", + "@radix-ui/react-portal": "1.1.12", "@radix-ui/react-presence": "1.1.6", - "@radix-ui/react-primitive": "2.1.5", - "@radix-ui/react-progress": "1.1.9", - "@radix-ui/react-radio-group": "1.4.0", - "@radix-ui/react-roving-focus": "1.1.12", - "@radix-ui/react-scroll-area": "1.2.11", - "@radix-ui/react-select": "2.3.0", - "@radix-ui/react-separator": "1.1.9", - "@radix-ui/react-slider": "1.4.0", - "@radix-ui/react-slot": "1.2.5", - "@radix-ui/react-switch": "1.3.0", - "@radix-ui/react-tabs": "1.1.14", - "@radix-ui/react-toast": "1.2.16", - "@radix-ui/react-toggle": "1.1.11", - "@radix-ui/react-toggle-group": "1.1.12", - "@radix-ui/react-toolbar": "1.1.12", - "@radix-ui/react-tooltip": "1.2.9", + "@radix-ui/react-primitive": "2.1.6", + "@radix-ui/react-progress": "1.1.10", + "@radix-ui/react-radio-group": "1.4.1", + "@radix-ui/react-roving-focus": "1.1.13", + "@radix-ui/react-scroll-area": "1.2.12", + "@radix-ui/react-select": "2.3.1", + "@radix-ui/react-separator": "1.1.10", + "@radix-ui/react-slider": "1.4.1", + "@radix-ui/react-slot": "1.3.0", + "@radix-ui/react-switch": "1.3.1", + "@radix-ui/react-tabs": "1.1.15", + "@radix-ui/react-toast": "1.2.17", + "@radix-ui/react-toggle": "1.1.12", + "@radix-ui/react-toggle-group": "1.1.13", + "@radix-ui/react-toolbar": "1.1.13", + "@radix-ui/react-tooltip": "1.2.10", "@radix-ui/react-use-callback-ref": "1.1.2", "@radix-ui/react-use-controllable-state": "1.2.3", "@radix-ui/react-use-effect-event": "0.0.3", @@ -10059,7 +10076,7 @@ "@radix-ui/react-use-is-hydrated": "0.1.1", "@radix-ui/react-use-layout-effect": "1.1.2", "@radix-ui/react-use-size": "1.1.2", - "@radix-ui/react-visually-hidden": "1.2.5" + "@radix-ui/react-visually-hidden": "1.2.6" }, "peerDependencies": { "@types/react": "*", @@ -10109,6 +10126,32 @@ "node": ">=0.10.0" } }, + "node_modules/react-day-picker": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-10.0.1.tgz", + "integrity": "sha512-eNh6BlwcYInWaJtRv18mXQ06Ys/H6rdTZAnTaSdOYJuTpwP1JMCHNd1FDRadA+gbeinq+psdULN5Xnowy9mV8w==", + "license": "MIT", + "dependencies": { + "@date-fns/tz": "^1.4.1", + "date-fns": "^4.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "type": "individual", + "url": "https://github.com/sponsors/gpbl" + }, + "peerDependencies": { + "@types/react": ">=16.8.0", + "react": ">=16.8.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/react-dom": { "version": "19.2.4", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.4.tgz", diff --git a/package.json b/package.json index ff1f216..afd31f8 100644 --- a/package.json +++ b/package.json @@ -16,14 +16,16 @@ "clsx": "^2.1.1", "cmdk": "^1.1.1", "crypto-js": "^4.2.0", + "date-fns": "^4.4.0", "echarts": "^6.0.0", "echarts-for-react": "^3.0.5", "exceljs": "^4.4.0", "jotai": "^2.16.2", "lucide-react": "^0.562.0", "next": "16.2.7", - "radix-ui": "^1.5.0", + "radix-ui": "^1.6.0", "react": "19.2.4", + "react-day-picker": "^10.0.1", "react-dom": "19.2.4", "shadcn": "^4.1.0", "sonner": "^2.0.7", diff --git a/src/app/(pages)/(main)/assign/page.tsx b/src/app/(pages)/(main)/assign/page.tsx new file mode 100644 index 0000000..53fde98 --- /dev/null +++ b/src/app/(pages)/(main)/assign/page.tsx @@ -0,0 +1,220 @@ +"use client"; + +import {useMemo, useRef, useState} from "react"; +import {Search} from "lucide-react"; +import {Button} from "@/components/ui/button"; +import {Input} from "@/components/ui/input"; +import {MultiFilterSelect} from "@/components/gwcf/MultiFilterSelect"; +import {PagePanel} from "@/components/gwcf/PagePanel"; +import {DataTable} from "@/components/data-table/DataTable"; +import {DataTableColumn} from "@/components/data-table/DataTable.type"; +import {SmsSendDialog} from "@/components/dialog/SmsSendDialog"; +import {AssignMonitoringDialog} from "@/components/dialog/AssignMonitoringDialog"; +import {useCodesQuery} from "@/query/code"; +import {usePerformanceListQuery} from "@/query/performance"; +import { + useMonitoringApplyUserCountsQuery, + useMonitoringApplyUsersQuery, + useSaveMonitoringAssignMutation, +} from "@/query/assign"; +import {filterPerformance, getCodeLabel} from "@/lib/gwcf/view"; +import {MONITORING_ASSIGN_TYPE} from "@/lib/gwcf/performance-status"; +import {PerformanceAssign, PerformanceFull} from "@/types/gwcf"; +import {useDialog} from "@/hooks/useDialog"; +import {useMounted} from "@/hooks/useMounted"; +import {LoadingOverlay} from "@/components/common/LoadingOverlay"; +import {SMS_TEMPLATE_IDS} from "@/query/notification"; + +const toParamValue = (value: unknown) => value == null ? "" : String(value); + +const buildPerformanceSmsParams = (performance: PerformanceFull): Record => ({ + businessType: toParamValue(performance.businessType), + performanceGenre: toParamValue(performance.performanceGenre), + performanceArea: toParamValue(performance.performanceArea), + artistName: toParamValue(performance.artistName), + performanceName: toParamValue(performance.performanceName), + performanceStartMonth: toParamValue(performance.performanceStartMonth), + performanceDtInfo: toParamValue(performance.performanceDtInfo), + performanceTimeInfo: toParamValue(performance.performanceTimeInfo), + ticketReservationStatus: toParamValue(performance.ticketReservationStatus), + ticketReservationMemo: toParamValue(performance.ticketReservationMemo), + performanceMemo: toParamValue(performance.performanceMemo), + ...Object.fromEntries( + Object.entries(performance.performanceDetail ?? {}).map(([key, value]) => [key, toParamValue(value)]) + ), + ...Object.fromEntries( + Object.entries(performance.performanceMonitoringSchedule ?? {}).map(([key, value]) => [key, toParamValue(value)]) + ), + performanceId: toParamValue(performance.id), +}); + +const AssignPage = () => { + const mounted = useMounted(); + const {data: codes} = useCodesQuery(); + const {isDialogOpen, showDialog, hideDialog} = useDialog(); + const {data = [], refetch: refetchPerformanceList} = usePerformanceListQuery(); + const {data: applyCounts = [], refetch: refetchApplyCounts} = useMonitoringApplyUserCountsQuery(); + const saveAssignMutation = useSaveMonitoringAssignMutation(); + const suppressAssignCloseRef = useRef(false); + + const [filters, setFilters] = useState({ + businessType: [] as string[], + area: [] as string[], + monitoringDate: "", + keyword: "", + }); + const [selected, setSelected] = useState(null); + const smsAddParam = useMemo(() => selected ? buildPerformanceSmsParams(selected) : {}, [selected]); + + const [smsTargetIds, setSmsTargetIds] = useState([]); + + const refreshAssignList = () => { + void refetchPerformanceList(); + void refetchApplyCounts(); + }; + + const updateFilters = (updater: (prev: typeof filters) => typeof filters) => { + setFilters(updater); + refreshAssignList(); + }; + + const assignOpen = isDialogOpen("assignMonitoringDialog"); + const smsOpen = isDialogOpen("assignSmsSendDialog"); + const selectedPerformanceId = selected?.id ?? 0; + const {data: applyUsers = []} = useMonitoringApplyUsersQuery(selectedPerformanceId, assignOpen && selectedPerformanceId > 0); + const smsTargetUsers = useMemo( + () => applyUsers + .filter((applyUser) => smsTargetIds.includes(applyUser.userId)) + .map((applyUser) => applyUser.user), + [applyUsers, smsTargetIds] + ); + + const applyCountMap = useMemo(() => { + return new Map(applyCounts.map((item) => [String(item.performanceId), item.applyCnt])); + }, [applyCounts]); + + const filteredData = useMemo(() => { + return data + .filter((item) => filterPerformance(item, filters)) + .sort((a, b) => { + const aDate = a.performanceMonitoringSchedule?.monitoringDate ?? ""; + const bDate = b.performanceMonitoringSchedule?.monitoringDate ?? ""; + return bDate.localeCompare(aDate); + }); + }, [data, filters]); + + const openAssign = (performance: PerformanceFull) => { + suppressAssignCloseRef.current = false; + setSelected(performance); + showDialog("assignMonitoringDialog"); + }; + + const applySavedAssignsToSelected = (performanceId: number, monitoringAssigns: PerformanceAssign[]) => { + setSelected((prev) => { + if (!prev || prev.id !== performanceId) return prev; + + return { + ...prev, + performanceAssignList: [ + ...(prev.performanceAssignList ?? []).filter((assign) => assign.assignType !== MONITORING_ASSIGN_TYPE), + ...monitoringAssigns, + ], + }; + }); + }; + + const getMonitoringAssigns = (performance: PerformanceFull) => { + return (performance.performanceAssignList ?? []).filter((assign) => assign.assignType === MONITORING_ASSIGN_TYPE); + }; + + const columns = useMemo[]>(() => [ + {accessorKey: "id", header: "연번", cell: ({row}) => row.original.id, enableSorting: true}, + {accessorKey: "performanceName", header: "사업명", enableSorting: true}, + {id: "area", header: "지역", cell: ({row}) => getCodeLabel(codes, "area", row.original.performanceArea)}, + {accessorKey: "performanceDtInfo", header: "사업 일정"}, + {accessorKey: "performanceTimeInfo", header: "운영 시간"}, + {id: "monitoringDate", header: "모니터링 일정", cell: ({row}) => row.original.performanceMonitoringSchedule?.monitoringDate ?? "", enableSorting: true}, + {id: "monitoringTime", header: "모니터링 시간", cell: ({row}) => row.original.performanceMonitoringSchedule?.monitoringTimeInfo ?? ""}, + {id: "applyCount", header: "신청자 수", cell: ({row}) => applyCountMap.get(String(row.original.id)) ?? 0, enableSorting: true}, + {id: "requestCount", header: "확정요청 수", cell: ({row}) => getMonitoringAssigns(row.original).length}, + {id: "confirmedCount", header: "확정인원 수", cell: ({row}) => getMonitoringAssigns(row.original).filter((assign) => assign.assignConfirm).length}, + ], [applyCountMap, codes]); + + if(!mounted) return + + return ( +
+ +
+ updateFilters((prev) => ({...prev, businessType: value}))} options={codes.business_type} placeholder="사업 유형" /> + updateFilters((prev) => ({...prev, area: value}))} options={codes.area} placeholder="지역" /> + updateFilters((prev) => ({...prev, monitoringDate: event.target.value}))} /> + updateFilters((prev) => ({...prev, keyword: event.target.value}))} placeholder="연번 or 사업명" /> + +
+
+ + + String(row.id)} selectMode="click-event" onRowClick={openAssign} defaultPageSize={10} /> + + + { + if (open) { + showDialog("assignMonitoringDialog"); + return; + } + + if (suppressAssignCloseRef.current) return; + + hideDialog("assignMonitoringDialog"); + refreshAssignList(); + }} + selected={selected} + codes={codes} + applyUsers={applyUsers} + isSavingAssign={saveAssignMutation.isPending} + onSaveAssign={(performanceId, userIds) => + saveAssignMutation.mutate( + {performanceId, userIds}, + {onSuccess: (monitoringAssigns) => applySavedAssignsToSelected(performanceId, monitoringAssigns)} + ) + } + onOpenSms={(userIds) => { + suppressAssignCloseRef.current = true; + setSmsTargetIds(userIds); + showDialog("assignSmsSendDialog", false); + }} + /> + + { + if (open) { + suppressAssignCloseRef.current = true; + showDialog("assignSmsSendDialog", false); + return; + } + + hideDialog("assignSmsSendDialog"); + refreshAssignList(); + window.setTimeout(() => { + suppressAssignCloseRef.current = false; + }, 0); + }} + title="확정 문자 발송" + templateIdx={SMS_TEMPLATE_IDS.ASSIGN_CONFIRM} + newMessageTemplateIdx={SMS_TEMPLATE_IDS.CUSTOM} + selectedUsers={smsTargetUsers} + addParams={smsAddParam} + onSent={refreshAssignList} + /> +
+ ); +}; + +export default AssignPage; diff --git a/src/app/(pages)/(main)/layout.tsx b/src/app/(pages)/(main)/layout.tsx index d86256f..865b5ca 100644 --- a/src/app/(pages)/(main)/layout.tsx +++ b/src/app/(pages)/(main)/layout.tsx @@ -12,7 +12,7 @@ export default async function MainLayoutWrapper({ const accessToken = cookieStore.get(CookieKeys.AuthToken)?.value; if (!accessToken) { - //redirect("/logout"); + redirect("/logout"); } return ( diff --git a/src/app/(pages)/(main)/monitoring/page.tsx b/src/app/(pages)/(main)/monitoring/page.tsx index eee2001..09ad305 100644 --- a/src/app/(pages)/(main)/monitoring/page.tsx +++ b/src/app/(pages)/(main)/monitoring/page.tsx @@ -1,9 +1,227 @@ -'use client' +"use client"; + +import {useMemo, useState} from "react"; +import {Button} from "@/components/ui/button"; +import {FilterSelect} from "@/components/gwcf/FilterSelect"; +import {MonitoringVisitDialog} from "@/components/dialog/MonitoringVisitDialog"; +import {PerformanceDetailDialog} from "@/components/dialog/PerformanceDetailDialog"; +import {DataTable} from "@/components/data-table/DataTable"; +import {DataTableColumn} from "@/components/data-table/DataTable.type"; +import {usePerformanceDetailQuery, usePerformanceListQuery} from "@/query/performance"; +import {useCodesQuery} from "@/query/code"; +import {useSaveArrivalMutation, useSaveDepartureMutation} from "@/query/monitoring"; +import {MonitoringGpsRequest, PerformanceFull} from "@/types/gwcf"; +import {useAuth} from "@/hooks/useAuth"; +import {useDialog} from "@/hooks/useDialog"; +import {useMounted} from "@/hooks/useMounted"; +import {LoadingOverlay} from "@/components/common/LoadingOverlay"; + +const today = new Date().toISOString().slice(0, 10); const MonitoringPage = () => { - return ( -
MonitoringPage
- ); -} + const mounted = useMounted(); + const {auth} = useAuth(); + const {isDialogOpen, showDialog, hideDialog} = useDialog(); + const departureMutation = useSaveDepartureMutation(); + const arrivalMutation = useSaveArrivalMutation(); + const {data = [], refetch: refetchPerformanceList} = usePerformanceListQuery(); + const {data: codes} = useCodesQuery(); + const userId = auth.user?.userId; -export default MonitoringPage; \ No newline at end of file + const [selectedId, setSelectedId] = useState(null); + const [visitMode, setVisitMode] = useState<"departure" | "arrival">("departure"); + + const refreshMonitoringList = () => { + void refetchPerformanceList(); + }; + + + const assignedItems = useMemo(() => { + if (!userId) return []; + return data.filter((item) => item.performanceAssignList?.some((assign) => assign.assignUser === userId)); + }, [data, userId]); + + const todayItems = useMemo(() => { + const matched = assignedItems + .filter((item) => item.performanceMonitoringSchedule?.monitoringDate === today) + .sort((a, b) => a.performanceName.localeCompare(b.performanceName, "ko")); + + return matched.length > 0 ? matched : assignedItems; + }, [assignedItems]); + + const selected = useMemo(() => { + return todayItems.find((item) => item.id === selectedId) ?? todayItems[0] ?? null; + }, [selectedId, todayItems]); + + const columns = useMemo[]>(() => [ + { + accessorKey: "performanceName", + header: "사업명", + cell: ({row}) => ( +
+ {row.original.performanceName} +
+ ), + }, + { + id: "monitoringDate", + header: "일정", + cell: ({row}) => row.original.performanceMonitoringSchedule?.monitoringDate?.slice(5) || "-", + }, + { + id: "monitoringTime", + header: "시간", + cell: ({row}) => row.original.performanceMonitoringSchedule?.monitoringTimeInfo || "-", + }, + ], []); + + const visitOpen = isDialogOpen("monitoringVisitDialog"); + const detailOpen = isDialogOpen("monitoringDetailDialog"); + const {data: detailData} = usePerformanceDetailQuery(selected?.id ?? 0, Boolean(selected?.id && detailOpen)); + + const openVisit = (mode: "departure" | "arrival") => { + setVisitMode(mode); + showDialog("monitoringVisitDialog"); + }; + + const getGps = (): Promise => { + return new Promise((resolve, reject) => { + if (!navigator.geolocation) { + reject(new Error("GPS를 사용할 수 없습니다.")); + return; + } + + navigator.geolocation.getCurrentPosition( + (position) => { + const {latitude, longitude, accuracy} = position.coords; + resolve({ + gpsLatitude: latitude, + gpsLongitude: longitude, + gpsAccuracyM: accuracy, + gpsRaw: { + latitude, + longitude, + accuracy, + timestamp: position.timestamp, + }, + }); + }, + (error) => reject(error), + {enableHighAccuracy: true, timeout: 10000, maximumAge: 0} + ); + }); + }; + + const saveVisit = async (files?: File[]) => { + if (!selected) return; + + const gps = await getGps(); + if (visitMode === "departure") { + await departureMutation.mutateAsync({performanceId: selected.id, gps}); + } else { + await arrivalMutation.mutateAsync({performanceId: selected.id, gps, files}); + } + hideDialog("monitoringVisitDialog"); + refreshMonitoringList(); + }; + + if(!mounted) return + + return ( +
+
+ { + setSelectedId(Number(value)); + refreshMonitoringList(); + }} + options={todayItems.map((item) => ({ + codeGroup: "performance", + codeValue: item.id, + codeGroupLabel: "사업", + codeLabel: item.performanceName, + memo: "", + }))} + placeholder="모니터링 사업 선택" + className="w-full" + useClear={false} + /> + + {selected && ( +
+
+ {selected.performanceMonitoringSchedule?.monitoringDate} {selected.performanceMonitoringSchedule?.monitoringTimeInfo} +
+
+
사업명
+
{selected.performanceName}
+
+
+
장소
+
{selected.performanceMonitoringSchedule?.monitoringAddress}
+
+
+ )} + +
+ + +
+ +
+
오늘의 모니터링 목록
+ String(row.id)} + selectMode="click-event" + onRowClick={(item) => { + setSelectedId(item.id); + showDialog("monitoringDetailDialog"); + }} + highlightRowIds={selected ? [String(selected.id)] : []} + defaultPageSize={10} + pageSizeOptions={[10, 20, 30]} + paginationItemsToDisplay={3} + /> +
+
+ + { + if (open) { + showDialog("monitoringVisitDialog"); + return; + } + + hideDialog("monitoringVisitDialog"); + refreshMonitoringList(); + }} + performance={selected} + mode={visitMode} + onSubmit={saveVisit} + isSubmitting={departureMutation.isPending || arrivalMutation.isPending} + /> + + { + if (open) { + showDialog("monitoringDetailDialog"); + return; + } + + hideDialog("monitoringDetailDialog"); + refreshMonitoringList(); + }} + performance={detailData ?? selected} + codes={codes} + canEdit={false} + /> +
+ ); +}; + +export default MonitoringPage; diff --git a/src/app/(pages)/(main)/page.tsx b/src/app/(pages)/(main)/page.tsx index e0516b0..18ba596 100644 --- a/src/app/(pages)/(main)/page.tsx +++ b/src/app/(pages)/(main)/page.tsx @@ -4,7 +4,6 @@ import {useAuth} from "@/hooks/useAuth"; import {useEffect} from "react"; import {LoadingOverlay} from "@/components/common/LoadingOverlay"; import {useMounted} from "@/hooks/useMounted"; -import {MONITORING_USER_ROLE} from "@/config/gwcf.config"; import {useRouter} from "next/navigation"; const MainPage = () => { diff --git a/src/app/(pages)/(main)/performance/page.tsx b/src/app/(pages)/(main)/performance/page.tsx index 6941111..d6b738a 100644 --- a/src/app/(pages)/(main)/performance/page.tsx +++ b/src/app/(pages)/(main)/performance/page.tsx @@ -1,9 +1,484 @@ -'use client' +"use client"; + +import {useMemo, useRef, useState} from "react"; +import {Search, Upload} from "lucide-react"; +import {Button} from "@/components/ui/button"; +import {Input} from "@/components/ui/input"; +import {DatePicker} from "@/components/common/DatePicker"; +import {MultiFilterSelect} from "@/components/gwcf/MultiFilterSelect"; +import {PagePanel} from "@/components/gwcf/PagePanel"; +import {StatusPill} from "@/components/gwcf/StatusPill"; +import {ExcelRegisterDialog} from "@/components/dialog/ExcelRegisterDialog"; +import {PerformanceDetailDialog} from "@/components/dialog/PerformanceDetailDialog"; +import {DataTable} from "@/components/data-table/DataTable"; +import {DataTableColumn} from "@/components/data-table/DataTable.type"; +import {useCodesQuery} from "@/query/code"; +import { + useDownloadAssignExcelTemplateMutation, + useDownloadPerformanceExcelTemplateMutation, + usePerformanceDetailQuery, + usePerformanceListQuery, + useUpdatePerformanceMutation, + useUploadPerformanceExcelMutation, +} from "@/query/performance"; +import {useUploadWrittenAssignExcelMutation} from "@/query/assign"; +import {useDownloadReviewPdfMutation} from "@/query/review"; +import {useDownloadEvidenceZipMutation} from "@/query/monitoring"; +import {filterPerformance, getCodeLabel, isInternalRole, isWrittenReviewerRole} from "@/lib/gwcf/view"; +import { + getMonitoringRecordedAt, + getMonitoringRecordedUser, + getMonitoringSlots, + getMonitoringStatusDisplay, + getReviewByType, + getReviewStatusDisplay, + getWrittenReviewRows, + getWrittenReviewerSimpleMonitoringStatusDisplay, + getWrittenReviewerSimpleReviewStatusDisplay, + isReviewComplete, + LOCAL_GOVERNMENT_REVIEW_TYPE, +} from "@/lib/gwcf/performance-status"; +import {buildWrittenReviewLink} from "@/config/gwcf.config"; +import {useAuth} from "@/hooks/useAuth"; +import {Code, PerformanceFull, PerformanceReview} from "@/types/gwcf"; +import {useDialog} from "@/hooks/useDialog"; +import {LoadingOverlay} from "@/components/common/LoadingOverlay"; +import {useMounted} from "@/hooks/useMounted"; +import {downloadFile} from "@/lib/utils"; + +type PerformanceFilters = { + businessType: string[]; + genre: string[]; + area: string[]; + startMonth: string[]; + monitoringDate: string; + localReviewStatus: string[]; + monitoring1Status: string[]; + monitoring2Status: string[]; + writtenReviewStatus: string[]; + keyword: string; +}; + +const monthOptions: Code[] = Array.from({length: 12}, (_, index) => ({ + codeGroup: "month", + codeValue: index + 1, + codeGroupLabel: "사업 수행 월", + codeLabel: `${index + 1}월`, + memo: "", +})); + +const STATUS_FILTER = { + UNASSIGNED: "-1001", + INCOMPLETE: "-1002", + PENDING: "-1003", + IN_PROGRESS: "-1004", + DEPARTED: "-1005", + ARRIVED: "-1006", + DONE: "-1007", +} as const; + +const makeStatusOption = (value: string, label: string): Code => ({ + codeGroup: "status_filter", + codeValue: Number(value), + codeGroupLabel: "상태", + codeLabel: label, + memo: "", +}); + +const normalizeStatusLabel = (label?: string) => label?.replace(/\s/g, "") ?? ""; +const labelHasComplete = (label?: string) => normalizeStatusLabel(label).includes("완료"); +const labelHasInProgress = (label?: string) => normalizeStatusLabel(label).includes("진행"); +const labelHasDeparted = (label?: string) => normalizeStatusLabel(label).includes("출발"); +const labelHasArrived = (label?: string) => normalizeStatusLabel(label).includes("도착"); + +const statusFilterOptions = { + incomplete: makeStatusOption(STATUS_FILTER.INCOMPLETE, "미완료"), + pending: makeStatusOption(STATUS_FILTER.PENDING, "미진행"), + inProgress: makeStatusOption(STATUS_FILTER.IN_PROGRESS, "진행중"), + departed: makeStatusOption(STATUS_FILTER.DEPARTED, "출발"), + arrived: makeStatusOption(STATUS_FILTER.ARRIVED, "도착"), + done: makeStatusOption(STATUS_FILTER.DONE, "완료"), +}; const PerformancePage = () => { - return ( -
PerformancePage
- ); -} + const mounted = useMounted(); + const {auth} = useAuth(); + const userRole = auth.user?.userRole; + const canEdit = isInternalRole(userRole); + const isWrittenReviewer = isWrittenReviewerRole(userRole); + const {isDialogOpen, showDialog, hideDialog} = useDialog(); -export default PerformancePage; \ No newline at end of file + const {data: codes} = useCodesQuery(); + const {data = [], refetch: refetchPerformanceList} = usePerformanceListQuery(); + const updateMutation = useUpdatePerformanceMutation(); + const performanceUploadMutation = useUploadPerformanceExcelMutation(); + const writtenAssignUploadMutation = useUploadWrittenAssignExcelMutation(); + const performanceTemplateMutation = useDownloadPerformanceExcelTemplateMutation(); + const writtenAssignTemplateMutation = useDownloadAssignExcelTemplateMutation(); + const reviewPdfMutation = useDownloadReviewPdfMutation(); + const evidenceZipMutation = useDownloadEvidenceZipMutation(); + + const [filters, setFilters] = useState({ + businessType: [], + genre: [], + area: [], + startMonth: [], + monitoringDate: "", + localReviewStatus: [], + monitoring1Status: [], + monitoring2Status: [], + writtenReviewStatus: [], + keyword: "", + }); + const [selectedId, setSelectedId] = useState(null); + const lastSelectedRef = useRef(null); + + const detailOpen = isDialogOpen("performanceDetailDialog"); + const performanceRegisterOpen = isDialogOpen("performanceExcelRegisterDialog"); + const assignWrittenOpen = isDialogOpen("assignWrittenExcelDialog"); + const {data: detailData} = usePerformanceDetailQuery(selectedId ?? 0, Boolean(selectedId && detailOpen && !isWrittenReviewer)); + + const refreshPerformanceList = () => { + void refetchPerformanceList(); + }; + + const updateFilters = (updater: (prev: PerformanceFilters) => PerformanceFilters) => { + setFilters(updater); + refreshPerformanceList(); + }; + + const handlePerformanceDetailOpenChange = (open: boolean) => { + if (open) { + showDialog("performanceDetailDialog"); + return; + } + + hideDialog("performanceDetailDialog"); + refreshPerformanceList(); + }; + + const handlePerformanceRegisterOpenChange = (open: boolean) => { + if (open) { + showDialog("performanceExcelRegisterDialog"); + return; + } + + hideDialog("performanceExcelRegisterDialog"); + refreshPerformanceList(); + }; + + const handleAssignWrittenOpenChange = (open: boolean) => { + if (open) { + showDialog("assignWrittenExcelDialog"); + return; + } + + hideDialog("assignWrittenExcelDialog"); + refreshPerformanceList(); + }; + const matchesStatus = (filter: string[], value: string) => filter.length === 0 || filter.includes(value); + + const getReviewFilterValue = (review?: PerformanceReview, allowInProgress = false, alwaysAssigned = false) => { + const label = getCodeLabel(codes, "review_status", review?.reviewStatus); + + if (isWrittenReviewer) { + if (isReviewComplete(review) || labelHasComplete(label)) return STATUS_FILTER.DONE; + return STATUS_FILTER.INCOMPLETE; + } + + if (!alwaysAssigned && !review) return STATUS_FILTER.UNASSIGNED; + if (isReviewComplete(review) || labelHasComplete(label)) return STATUS_FILTER.DONE; + if (allowInProgress && labelHasInProgress(label)) return STATUS_FILTER.IN_PROGRESS; + return STATUS_FILTER.PENDING; + }; + + const getMonitoringFilterValue = (performance: PerformanceFull, index: 0 | 1) => { + const slot = getMonitoringSlots(performance)[index]; + const label = getCodeLabel(codes, "monitoring_visit_status", slot.visit?.monitoringVisitStatus); + + if (isWrittenReviewer) { + return slot.visit ? STATUS_FILTER.DONE : STATUS_FILTER.INCOMPLETE; + } + + if (!slot.assign) return STATUS_FILTER.UNASSIGNED; + if (!slot.visit) return STATUS_FILTER.PENDING; + if (labelHasComplete(label)) return STATUS_FILTER.DONE; + if (labelHasDeparted(label)) return STATUS_FILTER.DEPARTED; + if (labelHasArrived(label)) return STATUS_FILTER.ARRIVED; + return STATUS_FILTER.PENDING; + }; + + const localReviewStatusOptions = isWrittenReviewer + ? [statusFilterOptions.incomplete, statusFilterOptions.done] + : [statusFilterOptions.pending, statusFilterOptions.done]; + const monitoringStatusOptions = isWrittenReviewer + ? [statusFilterOptions.incomplete, statusFilterOptions.done] + : [statusFilterOptions.pending, statusFilterOptions.departed, statusFilterOptions.arrived, statusFilterOptions.done]; + const writtenReviewStatusOptions = isWrittenReviewer + ? [statusFilterOptions.incomplete, statusFilterOptions.done] + : [statusFilterOptions.pending, statusFilterOptions.inProgress, statusFilterOptions.done]; + + const filteredData = useMemo(() => { + return data.filter((item) => { + const localReview = getReviewByType(item, LOCAL_GOVERNMENT_REVIEW_TYPE)?.review; + const writtenReviewRow = getWrittenReviewRows(item)[0]; + + return ( + filterPerformance(item, { + businessType: filters.businessType, + genre: filters.genre, + area: filters.area, + monitoringDate: filters.monitoringDate, + keyword: filters.keyword, + }) && + matchesStatus(filters.startMonth, String(item.performanceStartMonth)) && + matchesStatus(filters.localReviewStatus, getReviewFilterValue(localReview, false, true)) && + matchesStatus(filters.monitoring1Status, getMonitoringFilterValue(item, 0)) && + matchesStatus(filters.monitoring2Status, getMonitoringFilterValue(item, 1)) && + matchesStatus(filters.writtenReviewStatus, getReviewFilterValue(writtenReviewRow?.review, true, Boolean(writtenReviewRow?.assign))) + ); + }); + }, [codes, data, filters, isWrittenReviewer]); + + const openDetail = (performance: PerformanceFull) => { + if (isWrittenReviewer) return; + lastSelectedRef.current = performance.id; + setSelectedId(performance.id); + showDialog("performanceDetailDialog"); + }; + + const downloadBlob = (buffer: ArrayBuffer, fileName: string, type = "application/octet-stream") => { + downloadFile(new Blob([buffer], {type}), fileName); + }; + + const downloadReviewPdf = async (performanceId: number, review?: PerformanceReview) => { + if (!review || !isReviewComplete(review)) return; + const buffer = await reviewPdfMutation.mutateAsync({performanceId, reviewType: review.reviewType}); + downloadBlob(buffer, review.pdfFileName || `review-${performanceId}-${review.reviewType}.pdf`, "application/pdf"); + }; + + const downloadEvidenceZip = async (performanceId: number, userId?: string) => { + if (!userId) return; + const buffer = await evidenceZipMutation.mutateAsync({performanceId, userId}); + downloadBlob(buffer, `monitoring-evidence-${performanceId}-${userId}.zip`, "application/zip"); + }; + + const openWrittenReviewLink = (performanceId: number, userId?: string, complete = false) => { + if (!userId) return; + window.open(buildWrittenReviewLink({performanceId, userId, complete}), "_blank", "noopener,noreferrer"); + }; + + const renderReviewStatus = ({ + performance, + review, + userId, + useWrittenLink = false, + alwaysAssigned = false, + noTooltip = false, + }: { + performance: PerformanceFull; + review?: PerformanceReview; + userId?: string; + useWrittenLink?: boolean; + alwaysAssigned?: boolean; + noTooltip?: boolean; + }) => { + const label = getCodeLabel(codes, "review_status", review?.reviewStatus); + const display = isWrittenReviewer + ? getWrittenReviewerSimpleReviewStatusDisplay(review, false, label) + : getReviewStatusDisplay(label, review, alwaysAssigned || Boolean(review)); + const complete = isReviewComplete(review); + const onClick = !useWrittenLink && isReviewComplete(review) + ? () => downloadReviewPdf(performance.id, review) + : useWrittenLink + ? () => openWrittenReviewLink(performance.id, userId, complete) + : undefined; + + return ( +
+ +
사용자: {userId || "-"}
+
기록일시: -
+
+ )} + > + {display.label} + + + ); + }; + + const renderMonitoringStatus = (performance: PerformanceFull, index: 0 | 1) => { + const slot = getMonitoringSlots(performance)[index]; + const label = getCodeLabel(codes, "monitoring_visit_status", slot.visit?.monitoringVisitStatus); + const display = isWrittenReviewer + ? getWrittenReviewerSimpleMonitoringStatusDisplay(slot) + : getMonitoringStatusDisplay(label, slot); + + return ( +
+ downloadEvidenceZip(performance.id, slot.assign?.assignUser) : undefined} + tooltip={isWrittenReviewer ? undefined : ( +
+
사용자: {getMonitoringRecordedUser(slot.visit)}
+
기록일시: {getMonitoringRecordedAt(slot.visit)}
+
+ )} + > + {display.label} +
+
+ ); + }; + + const columns = useMemo[]>(() => [ + {accessorKey: "id", header: "연번", cell: ({row}) => row.original.id, enableSorting: true}, + {id: "businessType", header: "사업 유형", cell: ({row}) => getCodeLabel(codes, "business_type", row.original.businessType)}, + {id: "genre", header: "분야(장르)", cell: ({row}) => getCodeLabel(codes, "genre", row.original.performanceGenre)}, + {id: "area", header: "지역", cell: ({row}) => getCodeLabel(codes, "area", row.original.performanceArea)}, + {accessorKey: "artistName", header: "단체(팀)명", enableSorting: true}, + {accessorKey: "performanceName", header: "사업명", enableSorting: true}, + {id: "startMonth", header: "사업 수행 월", cell: ({row}) => `${row.original.performanceStartMonth}월`, enableSorting: true}, + {accessorKey: "performanceDtInfo", header: "사업 일정"}, + {accessorKey: "performanceTimeInfo", header: "운영 시간"}, + ...(!isWrittenReviewer ? [{ + id: "monitoringDate", + header: "모니터링 일정", + cell: ({row}) => row.original.performanceMonitoringSchedule?.monitoringDate ?? "", + enableSorting: true, + } satisfies DataTableColumn] : []), + { + id: "localReview", + header: "지자체 평가", + cell: ({row}) => { + const found = getReviewByType(row.original, LOCAL_GOVERNMENT_REVIEW_TYPE); + return renderReviewStatus({ + performance: row.original, + review: found?.review, + userId: found?.userId, + alwaysAssigned: true, + noTooltip: isWrittenReviewer, + }); + }, + }, + {id: "monitoring1", header: "모니터링 1", cell: ({row}) => renderMonitoringStatus(row.original, 0)}, + {id: "monitoring2", header: "모니터링 2", cell: ({row}) => renderMonitoringStatus(row.original, 1)}, + { + id: "writtenReview", + header: "서면 평가", + cell: ({row}) => { + const found = getWrittenReviewRows(row.original)[0]; + return renderReviewStatus({ + performance: row.original, + review: found?.review, + userId: found?.userId, + useWrittenLink: isWrittenReviewer, + alwaysAssigned: Boolean(found?.assign), + }); + }, + }, + ], [codes, isWrittenReviewer]); + + const downloadPerformanceTemplate = async () => { + const buffer = await performanceTemplateMutation.mutateAsync(); + const blob = new Blob([buffer], {type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"}); + downloadFile(blob, "사업 등록 template.xlsx"); + }; + + const downloadWrittenAssignTemplate = async () => { + const buffer = await writtenAssignTemplateMutation.mutateAsync(); + const blob = new Blob([buffer], {type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"}); + downloadFile(blob, "서면 평가 배정 template.xlsx"); + }; + + if(!mounted) return + + return ( +
+ +
+
+ updateFilters((prev) => ({...prev, businessType: value}))} options={codes.business_type} placeholder="사업 유형" /> + updateFilters((prev) => ({...prev, genre: value}))} options={codes.genre} placeholder="분야(장르)" /> + updateFilters((prev) => ({...prev, area: value}))} options={codes.area} placeholder="지역" /> + updateFilters((prev) => ({...prev, startMonth: value}))} options={monthOptions} placeholder="사업 수행 월" /> + {!isWrittenReviewer && ( + updateFilters((prev) => ({...prev, monitoringDate: value}))} placeholder="모니터링 일정" /> + )} + updateFilters((prev) => ({...prev, keyword: event.target.value}))} placeholder="연번 or 사업명" /> + +
+
+ updateFilters((prev) => ({...prev, localReviewStatus: value}))} options={localReviewStatusOptions} placeholder="지자체 평가 상태" /> + updateFilters((prev) => ({...prev, monitoring1Status: value}))} options={monitoringStatusOptions} placeholder="모니터링1 상태" /> + updateFilters((prev) => ({...prev, monitoring2Status: value}))} options={monitoringStatusOptions} placeholder="모니터링2 상태" /> + updateFilters((prev) => ({...prev, writtenReviewStatus: value}))} options={writtenReviewStatusOptions} placeholder="서면평가 상태" /> +
+
+
+ + + {canEdit && ( +
+ + +
+ )} + String(row.id)} + selectMode={isWrittenReviewer ? "none" : "click-event"} + onRowClick={isWrittenReviewer ? undefined : openDetail} + defaultPageSize={10} + /> +
+ + {!isWrittenReviewer && ( + item.id === selectedId) ?? null} + codes={codes} + canEdit={canEdit} + isWrittenReviewer={false} + onSave={(draft) => updateMutation.mutate(draft)} + /> + )} + + performanceUploadMutation.mutateAsync(file)} + isUploading={performanceUploadMutation.isPending} + /> + + writtenAssignUploadMutation.mutateAsync(file)} + isUploading={writtenAssignUploadMutation.isPending} + /> +
+ ); +}; + +export default PerformancePage; diff --git a/src/app/(pages)/(main)/user/page.tsx b/src/app/(pages)/(main)/user/page.tsx index 05d5b32..011abc8 100644 --- a/src/app/(pages)/(main)/user/page.tsx +++ b/src/app/(pages)/(main)/user/page.tsx @@ -1,9 +1,307 @@ -'use client' +"use client"; -const UserPage = () => { - return ( -
UserPage
- ); +import {MouseEvent, ReactNode, useEffect, useMemo, useRef, useState} from "react"; +import {Search, Send, Upload} from "lucide-react"; +import {Button} from "@/components/ui/button"; +import {Input} from "@/components/ui/input"; +import {FilterSelect} from "@/components/gwcf/FilterSelect"; +import {MultiFilterSelect} from "@/components/gwcf/MultiFilterSelect"; +import {PagePanel} from "@/components/gwcf/PagePanel"; +import {ExcelRegisterDialog} from "@/components/dialog/ExcelRegisterDialog"; +import {SmsSendDialog} from "@/components/dialog/SmsSendDialog"; +import {DataTable} from "@/components/data-table/DataTable"; +import {DataTableColumn} from "@/components/data-table/DataTable.type"; +import {useCodesQuery} from "@/query/code"; +import {useAssignUserCountsQuery} from "@/query/assign"; +import { + useDeleteUserMutation, + useDownloadUserExcelTemplateMutation, + useUpdateUserMutation, + useUploadUsersExcelMutation, + useUsersQuery, +} from "@/query/user"; +import {filterUser, getDetailValue, ROLE} from "@/lib/gwcf/view"; +import {Code, UserFull} from "@/types/gwcf"; +import {SMS_TEMPLATE_IDS} from "@/query/notification"; +import {useDialog} from "@/hooks/useDialog"; +import {useMounted} from "@/hooks/useMounted"; +import {LoadingOverlay} from "@/components/common/LoadingOverlay"; +import {downloadFile} from "@/lib/utils"; + +type UserTab = "monitoring" | "written"; +type UserFilters = {area: string[]; gender: string[]; genre: string[]; keyword: string}; + +const tabRole: Record = { + monitoring: ROLE.MONITORING, + written: ROLE.WRITTEN_REVIEWER, +}; + +function StopCell({children}: {children: ReactNode}) { + const stop = (event: MouseEvent) => event.stopPropagation(); + return
{children}
; } -export default UserPage; \ No newline at end of file +const getOptionLabel = (options: Code[], value: string) => { + if (!value) return ""; + return options.find((option) => String(option.codeValue) === value)?.codeLabel ?? value; +}; + +const UserPage = () => { + const mounted = useMounted(); + const {data: codes} = useCodesQuery(); + const {data: assignCounts = [], refetch: refetchAssignCounts} = useAssignUserCountsQuery(); + const {isDialogOpen, showDialog, hideDialog} = useDialog(); + const [tab, setTab] = useState("monitoring"); + const [selectedIds, setSelectedIds] = useState([]); + const [editingId, setEditingId] = useState(null); + const [, forceDraftRender] = useState(0); + const draftRef = useRef(null); + const [filters, setFilters] = useState({area: [], gender: [], genre: [], keyword: ""}); + + const userRole = tabRole[tab]; + const {data = [], refetch: refetchUsers} = useUsersQuery(userRole); + const updateMutation = useUpdateUserMutation(); + const deleteMutation = useDeleteUserMutation(); + const uploadMutation = useUploadUsersExcelMutation(userRole); + const templateMutation = useDownloadUserExcelTemplateMutation(userRole); + + const assignCountMap = useMemo(() => new Map(assignCounts.map((item) => [item.assignUser, item.assignCount])), [assignCounts]); + + const refreshUserList = () => { + void refetchUsers(); + void refetchAssignCounts(); + }; + + const updateFilters = (updater: (prev: UserFilters) => UserFilters) => { + setFilters(updater); + refreshUserList(); + }; + + useEffect(() => { + setSelectedIds([]); + setEditingId(null); + draftRef.current = null; + forceDraftRender((prev) => prev + 1); + setFilters({area: [], gender: [], genre: [], keyword: ""}); + }, [tab]); + + const filteredData = useMemo(() => data.filter((user) => filterUser(user, filters)), [data, filters]); + const smsTargetUsers = useMemo( + () => data.filter((user) => selectedIds.includes(user.userId)), + [data, selectedIds] + ); + + const startEdit = (user: UserFull) => { + setEditingId(user.userId); + draftRef.current = {...user, userDetail: {...user.userDetail}}; + forceDraftRender((prev) => prev + 1); + }; + + const updateDraft = (updater: (prev: UserFull) => UserFull) => { + if (!draftRef.current) return; + draftRef.current = updater(draftRef.current); + forceDraftRender((prev) => prev + 1); + }; + + const updateDetail = (key: string, value: string) => { + updateDraft((prev) => ({...prev, userDetail: {...prev.userDetail, [key]: value}})); + }; + + const saveEdit = () => { + if (!draftRef.current) return; + updateMutation.mutate(draftRef.current, { + onSuccess: () => { + alert("사용자 정보가 수정되었습니다."); + setEditingId(null); + draftRef.current = null; + forceDraftRender((prev) => prev + 1); + }, + }); + }; + + const deleteUser = (userId: string) => { + if (!confirm("사용자 정보가 완전히 지워집니다 정말로 삭제 하시겠습니까?")) return; + deleteMutation.mutate(userId, { + onSuccess: () => alert("사용자 정보가 삭제되었습니다."), + }); + }; + + const downloadTemplate = async () => { + const buffer = await templateMutation.mutateAsync(); + const blob = new Blob([buffer], {type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"}); + downloadFile(blob, tab === "monitoring" ? "모니터링 요원 template.xlsx" : "서면 평가위원 template.xlsx"); + }; + + const renderEditableCell = (user: UserFull, key: string, fallbackKeys: string[], type: "text" | "select" = "text", options: Code[] = []) => { + const draft = draftRef.current; + const isEditing = editingId === user.userId && draft; + const source = isEditing ? draft.userDetail : user.userDetail; + const value = getDetailValue(source, [key, ...fallbackKeys]); + + if (!isEditing) return type === "select" ? (getOptionLabel(options, value) || "-") : (value || "-"); + + if (type === "select") { + return ( + + updateDetail(key, next)} options={options} placeholder="선택" className="w-full min-w-28" /> + + ); + } + + return ( + + updateDetail(key, event.target.value)} /> + + ); + }; + + const columns = useMemo[]>(() => { + const commonColumns: DataTableColumn[] = [ + {accessorKey: "userId", header: "ID", enableSorting: true}, + {id: "password", header: "PW", cell: () => "****"}, + ]; + + const monitoringColumns: DataTableColumn[] = [ + {id: "participationCount", header: "참여 횟수", cell: ({row}) => assignCountMap.get(row.original.userId) ?? 0, enableSorting: true}, + {id: "area", header: "지역", cell: ({row}) => renderEditableCell(row.original, "area", ["userArea", "region"], "select", codes.area)}, + {id: "gender", header: "성별", cell: ({row}) => renderEditableCell(row.original, "gender", ["userGender"], "select", codes.gender)}, + {id: "age", header: "연령", cell: ({row}) => renderEditableCell(row.original, "age", ["userAge"])}, + {id: "tel", header: "연락처", cell: ({row}) => renderEditableCell(row.original, "tel", ["phone", "userTel"])}, + {id: "email", header: "이메일", cell: ({row}) => renderEditableCell(row.original, "email", ["userEmail"])}, + {id: "hasCar", header: "자차 여부", cell: ({row}) => renderEditableCell(row.original, "userHasCar", ["has_car", "hasCar"], "select", codes.has_car)}, + ]; + + const writtenColumns: DataTableColumn[] = [ + {id: "genre", header: "장르", cell: ({row}) => renderEditableCell(row.original, "userGenre", ["genre", "reviewGenre"], "select", codes.genre)}, + {id: "tel", header: "연락처", cell: ({row}) => renderEditableCell(row.original, "tel", ["phone", "userTel"])}, + {id: "email", header: "이메일", cell: ({row}) => renderEditableCell(row.original, "email", ["userEmail"])}, + ]; + + const actionColumns: DataTableColumn[] = [ + { + id: "memo", + header: "메모", + cell: ({row}) => { + const draft = draftRef.current; + return editingId === row.original.userId && draft ? ( + + updateDraft((prev) => ({...prev, memo: event.target.value}))} /> + + ) : row.original.memo; + }, + }, + { + id: "edit", + header: "수정", + cell: ({row}) => ( + + {editingId === row.original.userId ? ( + + ) : ( + + )} + + ), + }, + { + id: "delete", + header: "삭제", + cell: ({row}) => ( + + + + ), + }, + ]; + + return [...commonColumns, ...(tab === "monitoring" ? monitoringColumns : writtenColumns), ...actionColumns]; + }, [assignCountMap, codes, editingId, tab]); + + if(!mounted) return + + return ( +
+
+ + +
+ + +
+ {tab === "monitoring" ? ( + <> + updateFilters((prev) => ({...prev, area: value}))} options={codes.area} placeholder="지역" /> + updateFilters((prev) => ({...prev, gender: value}))} options={codes.gender} placeholder="성별" /> + + ) : ( + updateFilters((prev) => ({...prev, genre: value}))} options={codes.genre} placeholder="장르" className="md:col-span-2" /> + )} + updateFilters((prev) => ({...prev, keyword: event.target.value}))} placeholder={tab === "monitoring" ? "ID or 연락처 or 이메일" : "ID or 이름 or 연락처 or 이메일"} /> + +
+
+ + +
+ {tab === "monitoring" && ( + + )} + +
+ row.userId} + selectMode={tab === "monitoring" ? "multi" : "none"} + onRowSelectionChange={(rows) => setSelectedIds(rows.map((row) => row.userId))} + defaultPageSize={10} + /> +
+ + { + if (open) { + showDialog("userExcelRegisterDialog"); + return; + } + + hideDialog("userExcelRegisterDialog"); + refreshUserList(); + }} + title="계정 등록" + onDownloadTemplate={downloadTemplate} + onUpload={(file) => uploadMutation.mutateAsync(file)} + isUploading={uploadMutation.isPending} + /> + + { + if (open) { + showDialog("userSmsSendDialog"); + return; + } + + hideDialog("userSmsSendDialog"); + refreshUserList(); + }} + templateIdx={SMS_TEMPLATE_IDS.ACCOUNT_MONITORING} + newMessageTemplateIdx={SMS_TEMPLATE_IDS.CUSTOM} + selectedUsers={smsTargetUsers} + onSent={refreshUserList} + /> +
+ ); +}; + +export default UserPage; diff --git a/src/app/api/assign/[[...slug]]/route.ts b/src/app/api/assign/[[...slug]]/route.ts new file mode 100644 index 0000000..52f0713 --- /dev/null +++ b/src/app/api/assign/[[...slug]]/route.ts @@ -0,0 +1,116 @@ +import {NextRequest, NextResponse} from "next/server"; +import {RouteContext} from "@/types/common"; +import {errorToResponse} from "@/lib/http-util"; +import {createBackApi} from "@/lib/server-api"; +import {ExcelUploadResult} from "@/types/common"; +import {AssignUserCount, MonitoringApplyUser, PerformanceApplyCount, PerformanceAssign} from "@/types/gwcf"; + +export const GET = async ( + req: NextRequest, + context: RouteContext +) => { + try { + void req; + const {slug = []} = await context.params; + const [action, subAction, performanceId] = slug; + const backApi = await createBackApi(); + + if (action === "monitoring" && subAction === "apply-users" && performanceId === "count" && slug.length === 3) { + const result = await backApi.get("/assign/monitoring/apply-users/count"); + return NextResponse.json(result, { status: 200 }); + } + + if (action === "monitoring" && subAction === "apply-users" && performanceId && slug.length === 3) { + const result = await backApi.get(`/assign/monitoring/apply-users/${encodeURIComponent(performanceId)}`); + return NextResponse.json(result, { status: 200 }); + } + + if (action === "users" && subAction === "count" && slug.length === 2) { + const result = await backApi.get("/assign/users/count"); + return NextResponse.json(result, { status: 200 }); + } + + return NextResponse.json({ message: "Not found" }, { status: 404 }); + } catch (error: unknown) { + return errorToResponse(error); + } +}; + +export const POST = async ( + req: NextRequest, + context: RouteContext +) => { + try { + const {slug = []} = await context.params; + const [action, second, third] = slug; + const backApi = await createBackApi(); + + if (action === "monitoring" && slug.length === 1) { + const body = await req.json(); + const result = await backApi.post("/assign/monitoring", body); + return NextResponse.json(result, { status: 200 }); + } + + if (action === "confirm" && second && third && slug.length === 3) { + const result = await backApi.post( + `/assign/confirm/${encodeURIComponent(second)}/${encodeURIComponent(third)}` + ); + return NextResponse.json(result, { status: 200 }); + } + + if(action === "written" && second === "excel-template"){ + const result = await backApi.post( + "/assign/written/excel/template", + undefined, + { expectBinary: true } + ); + + return new NextResponse(result, { status: 200 }); + } + + if (action === "written" && second === "excel-upload" && slug.length === 2) { + const formData = await req.formData(); + const file = formData.get("file") as File | null; + + if (!file) { + return NextResponse.json({ message: "file field is required." }, { status: 400 }); + } + + const backendForm = new FormData(); + backendForm.append("file", file, file.name); + + const result = await backApi.postForm( + "/assign/written/excel/upload", + backendForm + ); + 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 { + void req; + const {slug = []} = await context.params; + const [action, performanceId, userId] = slug; + const backApi = await createBackApi(); + + if ((action === "confirm" || action === "cancel") && performanceId && userId && slug.length === 3) { + await backApi.patch( + `/assign/${action}/${encodeURIComponent(performanceId)}/${encodeURIComponent(userId)}` + ); + return new NextResponse(null, { status: 204 }); + } + + return NextResponse.json({ message: "Not found" }, { status: 404 }); + } catch (error: unknown) { + return errorToResponse(error); + } +}; diff --git a/src/app/api/code/[[...slug]]/route.ts b/src/app/api/code/[[...slug]]/route.ts new file mode 100644 index 0000000..6246366 --- /dev/null +++ b/src/app/api/code/[[...slug]]/route.ts @@ -0,0 +1,25 @@ +import {NextRequest, NextResponse} from "next/server"; +import {RouteContext} from "@/types/common"; +import {errorToResponse} from "@/lib/http-util"; +import {createBackApi} from "@/lib/server-api"; +import {Code} from "@/types/gwcf"; + +export const GET = async ( + req: NextRequest, + context: RouteContext +) => { + try { + const {slug = []} = await context.params; + const [codeGroup] = slug; + + if (!codeGroup || slug.length !== 1) { + return NextResponse.json({ message: "codeGroup is required." }, { status: 400 }); + } + + const backApi = await createBackApi(); + const result = await backApi.get(`/code/${encodeURIComponent(codeGroup)}`); + return NextResponse.json(result, { status: 200 }); + } catch (error: unknown) { + return errorToResponse(error); + } +}; diff --git a/src/app/api/kon/[[...slug]]/route.ts b/src/app/api/kon/[[...slug]]/route.ts index 627e6e3..1f4b6e0 100644 --- a/src/app/api/kon/[[...slug]]/route.ts +++ b/src/app/api/kon/[[...slug]]/route.ts @@ -66,8 +66,10 @@ export const POST = async ( const [action] = slug; const backApi = await createBackApi(); - if(action === "assign-confirm" && slug.length === 2) { - const result = await backApi.post(`/assign/confirm/${slug[1]}`) + if(action === "assign-confirm" && slug.length === 3) { + const result = await backApi.post( + `/assign/confirm/${encodeURIComponent(slug[1])}/${encodeURIComponent(slug[2])}` + ); return withCors(NextResponse.json(result, { status: 200 })); } diff --git a/src/app/api/login/route.ts b/src/app/api/login/route.ts index 92d28c1..70ffd56 100644 --- a/src/app/api/login/route.ts +++ b/src/app/api/login/route.ts @@ -3,6 +3,7 @@ import {createBackApi} from "@/lib/server-api"; import {LoginRequest, LoginResponse} from "@/types/auth"; import {serverEnv} from "@/lib/env.server"; import {errorToResponse} from "@/lib/http-util"; +import {CookieKeys} from "@/store/cookie/cookie-keys"; export const POST = async (req: NextRequest) => { try { @@ -11,7 +12,7 @@ export const POST = async (req: NextRequest) => { const result = await backApi.post("/auth/login", body); const res = NextResponse.json(result.user, { status: 200 }); - res.cookies.set("access_token", result.accessToken, { + res.cookies.set(CookieKeys.AuthToken, result.accessToken, { httpOnly: true, secure: serverEnv.ENV === "prod", sameSite: "lax", diff --git a/src/app/api/monitoring/[[...slug]]/route.ts b/src/app/api/monitoring/[[...slug]]/route.ts new file mode 100644 index 0000000..a8e889c --- /dev/null +++ b/src/app/api/monitoring/[[...slug]]/route.ts @@ -0,0 +1,100 @@ +import {NextRequest, NextResponse} from "next/server"; +import {RouteContext} from "@/types/common"; +import {errorToResponse} from "@/lib/http-util"; +import {createBackApi} from "@/lib/server-api"; +import {MonitoringGpsRequest, PerformanceMonitoringVisit} from "@/types/gwcf"; + +export const GET = async ( + req: NextRequest, + context: RouteContext +) => { + try { + void req; + const {slug = []} = await context.params; + const [action, subAction, third, fourth, fifth] = slug; + const backApi = await createBackApi(); + + if (action === "visit" && subAction === "evidence" && third && fourth && slug.length === 4) { + const result = await backApi.get( + `/monitoring/visit/evidence/${encodeURIComponent(third)}/${encodeURIComponent(fourth)}` + ); + return NextResponse.json(result, { status: 200 }); + } + + if (action === "visit" && subAction === "evidence" && third === "zip" && fourth && fifth && slug.length === 5) { + const result = await backApi.get( + `/monitoring/visit/evidence/zip/${encodeURIComponent(fourth)}/${encodeURIComponent(fifth)}`, + { expectBinary: true } + ); + + return new NextResponse(result, { + status: 200, + headers: { + "Content-Type": "application/zip", + "Content-Disposition": `attachment; filename="monitoring-evidence-${fourth}-${fifth}.zip"`, + }, + }); + } + + return NextResponse.json({ message: "Not found" }, { status: 404 }); + } catch (error: unknown) { + return errorToResponse(error); + } +}; + +export const POST = async ( + req: NextRequest, + context: RouteContext +) => { + try { + const {slug = []} = await context.params; + const [action, subAction, performanceId] = slug; + const backApi = await createBackApi(); + + if (action === "visit" && subAction === "departure" && performanceId && slug.length === 3) { + const body = await req.json().catch(() => null) as MonitoringGpsRequest | null; + if (!body) { + return NextResponse.json({ message: "Request body is required." }, { status: 400 }); + } + + const result = await backApi.post( + `/monitoring/visit/departure/${encodeURIComponent(performanceId)}`, + body + ); + return NextResponse.json(result, { status: 200 }); + } + + if (action === "visit" && subAction === "arrival" && performanceId && slug.length === 3) { + const formData = await req.formData(); + const gpsPart = formData.get("gps"); + + if (!gpsPart) { + return NextResponse.json({ message: "gps field is required." }, { status: 400 }); + } + + const backendForm = new FormData(); + + if (gpsPart instanceof File) { + backendForm.append("gps", gpsPart, gpsPart.name); + } else { + backendForm.append("gps", new Blob([String(gpsPart)], {type: "application/json"})); + } + + formData.getAll("files").forEach((file) => { + if (file instanceof File) { + backendForm.append("files", file, file.name); + } + }); + + const result = await backApi.postForm( + `/monitoring/visit/arrival/${encodeURIComponent(performanceId)}`, + backendForm + ); + return NextResponse.json(result, { status: 200 }); + } + + return NextResponse.json({ message: "Not found" }, { status: 404 }); + } catch (error: unknown) { + return errorToResponse(error); + } +}; diff --git a/src/app/api/notification/[[...slug]]/route.ts b/src/app/api/notification/[[...slug]]/route.ts new file mode 100644 index 0000000..2ec0891 --- /dev/null +++ b/src/app/api/notification/[[...slug]]/route.ts @@ -0,0 +1,117 @@ +import {NextRequest, NextResponse} from "next/server"; +import {RouteContext} from "@/types/common"; +import {errorToResponse} from "@/lib/http-util"; +import {createNotiHubApi} from "@/lib/server-api"; +import { + BulkSendResponse, + SaveTemplateRequest, + SendSmsBulkRequest, + Template, +} from "@/types/notification"; + +export const GET = async ( + _req: NextRequest, + context: RouteContext +) => { + try { + const {slug = []} = await context.params; + const [action, templateIdx] = slug; + + if (action !== "template" || !templateIdx) { + return NextResponse.json({ message: "Not found" }, { status: 404 }); + } + + const notiHubApi = await createNotiHubApi(); + const template = await notiHubApi.get