From 0588bf0d7f15a286693983079b8c0c5f976de533 Mon Sep 17 00:00:00 2001 From: bicochan Date: Wed, 12 Mar 2025 16:56:47 +0900 Subject: [PATCH 01/10] =?UTF-8?q?feat:=20=EC=82=AC=EC=9D=B4=ED=8A=B8=20?= =?UTF-8?q?=EC=83=81=EC=84=B8(=EC=88=98=EC=A0=95)=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=B0=94=EC=9D=B8?= =?UTF-8?q?=EB=94=A9=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/cs/app/site/register/[id]/page.tsx | 10 ++ apps/cs/app/site/register/page.tsx | 2 - apps/cs/package.json | 1 + apps/cs/src/entities/code/api/code-service.ts | 14 ++ apps/cs/src/entities/code/index.ts | 1 + .../src/entities/code/model/code-interface.ts | 9 + apps/cs/src/entities/code/ui/code-select.tsx | 45 +++++ apps/cs/src/entities/site/api/site-service.ts | 7 + .../src/entities/site/model/site-interface.ts | 26 +++ .../{__mocks__.tsx => table-columns.tsx} | 17 +- .../pages/site/ui/ip-management-dialog.tsx | 8 +- apps/cs/src/pages/site/ui/register-page.tsx | 100 ++++++----- apps/cs/src/pages/site/ui/site-page.tsx | 31 ++-- apps/cs/src/shared/config/api.ts | 1 + packages/common/assets/src/styles/base.css | 2 + packages/common/components/package.json | 1 + .../src/ui/bar-chart/chart.stories.tsx | 2 +- .../src/ui/data-table/data-table.stories.tsx | 2 +- .../components/src/ui/data-table/index.tsx | 13 +- packages/common/components/src/ui/index.ts | 1 + .../common/components/src/ui/input/index.tsx | 2 +- .../src/ui/line-chart/chart.stories.tsx | 31 ++-- .../src/ui/pie-chart/chart.stories.tsx | 53 ++---- .../common/components/src/ui/select/index.tsx | 159 ++++++++++++++++++ .../src/ui/select/select.stories.tsx | 41 +++++ .../common/components/src/ui/table/index.tsx | 2 +- .../common/components/src/ui/table/table.css | 2 +- .../components/src/ui/tree/tree.stories.tsx | 2 +- pnpm-lock.yaml | 70 ++++++++ tailwind.config.preset.ts | 1 + 30 files changed, 529 insertions(+), 127 deletions(-) create mode 100644 apps/cs/app/site/register/[id]/page.tsx delete mode 100644 apps/cs/app/site/register/page.tsx create mode 100644 apps/cs/src/entities/code/api/code-service.ts create mode 100644 apps/cs/src/entities/code/index.ts create mode 100644 apps/cs/src/entities/code/model/code-interface.ts create mode 100644 apps/cs/src/entities/code/ui/code-select.tsx rename apps/cs/src/pages/site/model/{__mocks__.tsx => table-columns.tsx} (74%) create mode 100644 packages/common/components/src/ui/select/index.tsx create mode 100644 packages/common/components/src/ui/select/select.stories.tsx diff --git a/apps/cs/app/site/register/[id]/page.tsx b/apps/cs/app/site/register/[id]/page.tsx new file mode 100644 index 000000000..b1f4d3a16 --- /dev/null +++ b/apps/cs/app/site/register/[id]/page.tsx @@ -0,0 +1,10 @@ +import { RegisterPage as ViewRegisterPage } from "@/pages/site"; + +export default async function RegisterPage({ + params, +}: { + params: Promise<{ id: string }>; +}) { + const { id } = await params; + return ; +} diff --git a/apps/cs/app/site/register/page.tsx b/apps/cs/app/site/register/page.tsx deleted file mode 100644 index a11d0b60c..000000000 --- a/apps/cs/app/site/register/page.tsx +++ /dev/null @@ -1,2 +0,0 @@ -import { RegisterPage } from "@/pages/site"; -export default RegisterPage; diff --git a/apps/cs/package.json b/apps/cs/package.json index 1797b4828..c9c024291 100644 --- a/apps/cs/package.json +++ b/apps/cs/package.json @@ -15,6 +15,7 @@ "@tanstack/react-table": "^8.21.2", "axios": "^1.8.1", "chart.js": "^4.4.8", + "dayjs": "^1.11.13", "js-cookie": "^3.0.5", "next": "15.1.7", "react-chartjs-2": "^5.3.0", diff --git a/apps/cs/src/entities/code/api/code-service.ts b/apps/cs/src/entities/code/api/code-service.ts new file mode 100644 index 000000000..3a789f2aa --- /dev/null +++ b/apps/cs/src/entities/code/api/code-service.ts @@ -0,0 +1,14 @@ +import { client } from "@/shared/api/client"; +import { ENDPOINT } from "@/shared/config/api"; +import type { CodeService, ICode } from "../model/code-interface"; + +export class CodeApiService implements CodeService { + public async getCode(upCd: string): Promise { + const response = await client.get( + `${ENDPOINT.CMS_SERVICE.CODE}/${upCd}`, + ); + return response.data; + } +} + +export const CodeApi = new CodeApiService(); diff --git a/apps/cs/src/entities/code/index.ts b/apps/cs/src/entities/code/index.ts new file mode 100644 index 000000000..0b6633f4b --- /dev/null +++ b/apps/cs/src/entities/code/index.ts @@ -0,0 +1 @@ +export { CodeSelect } from "./ui/code-select"; diff --git a/apps/cs/src/entities/code/model/code-interface.ts b/apps/cs/src/entities/code/model/code-interface.ts new file mode 100644 index 000000000..0d066e6da --- /dev/null +++ b/apps/cs/src/entities/code/model/code-interface.ts @@ -0,0 +1,9 @@ +export interface ICode { + lwpoCd: string; + upCd: string; + lwpoCdNm: string; +} + +export interface CodeService { + getCode(upCd: string): Promise; +} diff --git a/apps/cs/src/entities/code/ui/code-select.tsx b/apps/cs/src/entities/code/ui/code-select.tsx new file mode 100644 index 000000000..88c8a1368 --- /dev/null +++ b/apps/cs/src/entities/code/ui/code-select.tsx @@ -0,0 +1,45 @@ +import { useQuery } from "@tanstack/react-query"; +import { + Select, + SelectContent, + SelectItem, + SelectTrigger, + SelectValue, +} from "@common/components"; +import { ENDPOINT } from "@/shared/config/api"; +import { CodeApi } from "../api/code-service"; + +type CodeSelectProps = { + upCd: string; + value?: string; + defaultValue?: string; + onValueChange?: (value: string) => void; +}; + +function CodeSelect({ upCd, defaultValue, ...props }: CodeSelectProps) { + const { data: code } = useQuery({ + queryKey: [ENDPOINT.CMS_SERVICE.CODE, upCd], + queryFn: () => CodeApi.getCode(upCd), + enabled: !!upCd, + }); + + const defaultValueText = + code?.find((item) => item.lwpoCd === defaultValue)?.lwpoCdNm ?? "선택"; + + return ( + + ); +} + +export { CodeSelect }; diff --git a/apps/cs/src/entities/site/api/site-service.ts b/apps/cs/src/entities/site/api/site-service.ts index 89ba82350..ee2910e18 100644 --- a/apps/cs/src/entities/site/api/site-service.ts +++ b/apps/cs/src/entities/site/api/site-service.ts @@ -4,6 +4,7 @@ import type { ISiteQuery, ISiteInfo, SiteService, + ISiteDetail, } from "../model/site-interface"; export class SiteApiService implements SiteService { @@ -12,7 +13,13 @@ export class SiteApiService implements SiteService { `${ENDPOINT.CMS_SERVICE.SITES}`, { params: query }, ); + return response.data; + } + public async siteDetail(siteId: string): Promise { + const response = await client.get( + `${ENDPOINT.CMS_SERVICE.SITES}/${siteId}`, + ); return response.data; } } diff --git a/apps/cs/src/entities/site/model/site-interface.ts b/apps/cs/src/entities/site/model/site-interface.ts index 8ba2da298..005652b1a 100644 --- a/apps/cs/src/entities/site/model/site-interface.ts +++ b/apps/cs/src/entities/site/model/site-interface.ts @@ -12,7 +12,10 @@ export interface ISite { siteNm: string; siteKindCode: string; bscSiteYn: string; + siteAddr: string; useYn: string; + regDt: string; + rgTrNm: string; } export interface ISiteInfo { @@ -44,6 +47,29 @@ export interface ISiteInfo { empty: boolean; } +export interface ISiteDetail { + siteId: string; + siteNm: string; + siteExpln: string; + siteKndCd: string; + siteKindNm: string; + siteAddr: string; + faxNumber: string; + telNo: string; + lwndCn: string; + basicSiteYn: string; + bkmkIcon: string; + useYn: string; + siteSkn: string; + regDt: string; + rgTr: string; + mdfcnDt: string; + mdFr: string; + rgTrNm: string; + mdFrNm: string; +} + export interface SiteService { siteInfo(query: ISiteQuery): Promise; + siteDetail(siteId: string): Promise; } diff --git a/apps/cs/src/pages/site/model/__mocks__.tsx b/apps/cs/src/pages/site/model/table-columns.tsx similarity index 74% rename from apps/cs/src/pages/site/model/__mocks__.tsx rename to apps/cs/src/pages/site/model/table-columns.tsx index 2b55da7d8..ddf211aea 100644 --- a/apps/cs/src/pages/site/model/__mocks__.tsx +++ b/apps/cs/src/pages/site/model/table-columns.tsx @@ -1,3 +1,4 @@ +import dayjs from "dayjs"; import { createColumnHelper } from "@tanstack/react-table"; import type { ISite } from "@/entities/site/model/site-interface"; @@ -16,8 +17,8 @@ const columns = [ id: "siteNm", header: "사이트명", }), - columnHelper.accessor("siteKindCode", { - id: "unknown1", + columnHelper.accessor("siteAddr", { + id: "siteAddr", header: "대표 URL", }), columnHelper.accessor("bscSiteYn", { @@ -30,13 +31,17 @@ const columns = [ header: "사용 여부", cell: (info) => (info.getValue() ? "Y" : "N"), }), - columnHelper.accessor("siteId", { - id: "unknown2", + columnHelper.accessor("rgTrNm", { + id: "rgTrNm", header: "등록자", }), - columnHelper.accessor("siteId", { - id: "ununknown3", + columnHelper.accessor("regDt", { + id: "regDt", header: "등록일", + cell: (info) => { + const date = dayjs(info.getValue()); + return date.format("YYYY-MM-DD"); + }, }), ]; diff --git a/apps/cs/src/pages/site/ui/ip-management-dialog.tsx b/apps/cs/src/pages/site/ui/ip-management-dialog.tsx index 04b71afc7..9f637e3be 100644 --- a/apps/cs/src/pages/site/ui/ip-management-dialog.tsx +++ b/apps/cs/src/pages/site/ui/ip-management-dialog.tsx @@ -26,7 +26,11 @@ type IP = { allowed: boolean; }; -function IPManagementDialog() { +type IPManagementDialogProps = { + triggerDisabled?: boolean; +}; + +function IPManagementDialog({ triggerDisabled }: IPManagementDialogProps) { const [rows, setRows] = useState([]); const [rowSelection, setRowSelection] = useState([]); @@ -72,7 +76,7 @@ function IPManagementDialog() { return ( - + diff --git a/apps/cs/src/pages/site/ui/register-page.tsx b/apps/cs/src/pages/site/ui/register-page.tsx index 3c35ae8e0..0257176ab 100644 --- a/apps/cs/src/pages/site/ui/register-page.tsx +++ b/apps/cs/src/pages/site/ui/register-page.tsx @@ -1,11 +1,10 @@ "use client"; +import { useState } from "react"; +import { SiteApi } from "@/entities/site"; +import { ENDPOINT } from "@/shared/config/api"; import { Button, - DropdownMenu, - DropdownMenuContent, - DropdownMenuItem, - DropdownMenuTrigger, Input, Label, RadioGroup, @@ -16,10 +15,24 @@ import { TableHead, TableRow, } from "@common/components"; +import { useQuery } from "@tanstack/react-query"; +import { CodeSelect } from "@/entities/code"; import { SitePageLayout } from "./layout"; import { IPManagementDialog } from "./ip-management-dialog"; -function RegisterPage() { +function RegisterPage({ siteId }: { siteId: string }) { + const { data: siteDetail } = useQuery({ + queryKey: [ENDPOINT.CMS_SERVICE.SITES, siteId], + queryFn: () => SiteApi.siteDetail(siteId), + select: (data) => { + setSiteKndCd(data.siteKndCd); + return data; + }, + enabled: !!siteId, + }); + const [siteKndCd, setSiteKndCd] = useState(""); + const [, setSiteSkinCd] = useState(""); + return (
@@ -36,54 +49,38 @@ function RegisterPage() { 사이트 코드 - + 사이트 구분
- - - - - - - 내부 - 외부 - - - - + { + setSiteKndCd(value); + }} + /> +
사이트 디자인 - - - - - - - 라이트 - 다크 - - - + { + setSiteSkinCd(value); + }} + /> @@ -92,6 +89,7 @@ function RegisterPage() { @@ -101,6 +99,7 @@ function RegisterPage() { @@ -110,6 +109,7 @@ function RegisterPage() { @@ -119,6 +119,7 @@ function RegisterPage() { @@ -128,6 +129,7 @@ function RegisterPage() { @@ -137,6 +139,7 @@ function RegisterPage() { @@ -146,13 +149,19 @@ function RegisterPage() { 기본 사이트 여부 - + { + console.log(value); + }} + >
@@ -167,7 +176,12 @@ function RegisterPage() { 사용 여부 - + { + console.log(value); + }} + >
diff --git a/apps/cs/src/pages/site/ui/site-page.tsx b/apps/cs/src/pages/site/ui/site-page.tsx index c13284ce8..46e957985 100644 --- a/apps/cs/src/pages/site/ui/site-page.tsx +++ b/apps/cs/src/pages/site/ui/site-page.tsx @@ -8,12 +8,19 @@ import { useQuery } from "@tanstack/react-query"; import { getCoreRowModel, useReactTable } from "@tanstack/react-table"; import { Button, Input, DataTable } from "@common/components"; import { SiteApi } from "@/entities/site/api/site-service"; +import type { ISite, ISiteQuery } from "@/entities/site/model/site-interface"; import { ENDPOINT } from "@/shared/config/api"; -import { columns } from "../model/__mocks__"; +import { columns } from "../model/table-columns"; import { SitePageLayout } from "./layout"; -import type { ISiteQuery } from "@/entities/site/model/site-interface"; function SitePage() { + const router = useRouter(); + const { data: siteInfo, refetch } = useQuery({ + queryKey: [ENDPOINT.CMS_SERVICE.SITES], + queryFn: () => SiteApi.siteInfo(siteQuery), + enabled: false, + }); + const [siteQuery, setSiteQuery] = useState({ siteNm: "", siteKndCd: "", @@ -23,10 +30,10 @@ function SitePage() { sort: [], }); - const { data: siteInfo, refetch } = useQuery({ - queryKey: [ENDPOINT.CMS_SERVICE.SITES], - queryFn: () => SiteApi.siteInfo(siteQuery), - enabled: false, + const table = useReactTable({ + data: siteInfo?.content ?? [], + columns, + getCoreRowModel: getCoreRowModel(), }); const handleSubmit = (e: React.FormEvent) => { @@ -34,15 +41,13 @@ function SitePage() { refetch(); }; - const router = useRouter(); - const table = useReactTable({ - data: siteInfo?.content ?? [], - columns, - getCoreRowModel: getCoreRowModel(), - }); + const handleRowClick = (row: ISite) => { + router.push(`/site/register/${row.siteId}`); + }; useEffect(() => { refetch(); + // eslint-disable-next-line react-hooks/exhaustive-deps }, []); return ( @@ -71,7 +76,7 @@ function SitePage() {
- +
diff --git a/apps/cs/src/shared/config/api.ts b/apps/cs/src/shared/config/api.ts index 052eea56a..bab8cac7b 100644 --- a/apps/cs/src/shared/config/api.ts +++ b/apps/cs/src/shared/config/api.ts @@ -10,6 +10,7 @@ export const ENDPOINT = { }, CMS_SERVICE: { SITES: "/cms-service/api/v1/sites", + CODE: "/cms-service/api/v1/code/cache", }, }; diff --git a/packages/common/assets/src/styles/base.css b/packages/common/assets/src/styles/base.css index bd9accda9..2d73b09df 100644 --- a/packages/common/assets/src/styles/base.css +++ b/packages/common/assets/src/styles/base.css @@ -23,6 +23,7 @@ --border: #e5e5e5; --input: #e5e5e5; --label: #666666; + --placeholder: #a2a2a2; --ring: #0a0a0a; --chart-1: #2094fa; --chart-2: #00dfe5; @@ -52,6 +53,7 @@ --border: #262626; --input: #262626; --label: #f1f1f1; + --placeholder: #737373; --ring: #d4d4d4; --chart-1: #66b3ff; --chart-2: #66f0f2; diff --git a/packages/common/components/package.json b/packages/common/components/package.json index b9b9f4f40..2bfdb6ba6 100644 --- a/packages/common/components/package.json +++ b/packages/common/components/package.json @@ -34,6 +34,7 @@ "@radix-ui/react-label": "^2.1.2", "@radix-ui/react-popover": "^1.1.6", "@radix-ui/react-radio-group": "^1.2.2", + "@radix-ui/react-select": "^2.1.6", "@radix-ui/react-slider": "^1.2.3", "@radix-ui/react-slot": "^1.1.2", "@radix-ui/react-switch": "^1.1.3", diff --git a/packages/common/components/src/ui/bar-chart/chart.stories.tsx b/packages/common/components/src/ui/bar-chart/chart.stories.tsx index 60bd0906f..97fa3be49 100644 --- a/packages/common/components/src/ui/bar-chart/chart.stories.tsx +++ b/packages/common/components/src/ui/bar-chart/chart.stories.tsx @@ -22,7 +22,7 @@ const meta: Meta = { description: { component: ` - [Docs](https://react-chartjs-2.js.org/) - `, +`, }, source: { code: ` diff --git a/packages/common/components/src/ui/data-table/data-table.stories.tsx b/packages/common/components/src/ui/data-table/data-table.stories.tsx index d1a4c2142..62237cc07 100644 --- a/packages/common/components/src/ui/data-table/data-table.stories.tsx +++ b/packages/common/components/src/ui/data-table/data-table.stories.tsx @@ -14,7 +14,7 @@ const meta: Meta = { description: { component: ` - [Docs](https://tanstack.com/table/v8/docs/introduction) - `, +`, }, source: { code: ` diff --git a/packages/common/components/src/ui/data-table/index.tsx b/packages/common/components/src/ui/data-table/index.tsx index 4b0ba901b..8dc30c701 100644 --- a/packages/common/components/src/ui/data-table/index.tsx +++ b/packages/common/components/src/ui/data-table/index.tsx @@ -36,15 +36,22 @@ function THead({ table }: { table: TableType }) { ); } -type TableProps = { table: TableType }; +type TableProps = { + table: TableType; + onRowClick?: (row: T) => void; +}; -function DataTable({ table }: TableProps) { +function DataTable({ table, onRowClick }: TableProps) { return ( {table.getRowModel().rows.map((row) => ( - + onRowClick?.(row.original)} + className={onRowClick ? "cursor-pointer hover:bg-muted" : ""} + > {row.getVisibleCells().map((cell) => { const { meta } = cell.column.columnDef; return ( diff --git a/packages/common/components/src/ui/index.ts b/packages/common/components/src/ui/index.ts index cdc88e163..438c18dbd 100644 --- a/packages/common/components/src/ui/index.ts +++ b/packages/common/components/src/ui/index.ts @@ -15,6 +15,7 @@ export * from "./layout"; export * from "./loading"; export * from "./popover"; export * from "./radio-group"; +export * from "./select"; export * from "./slider"; export * from "./switch"; export * from "./table"; diff --git a/packages/common/components/src/ui/input/index.tsx b/packages/common/components/src/ui/input/index.tsx index bcb03d621..70bb9827c 100644 --- a/packages/common/components/src/ui/input/index.tsx +++ b/packages/common/components/src/ui/input/index.tsx @@ -8,7 +8,7 @@ const Input = React.forwardRef>( = { title: "Chart/Line", @@ -23,7 +22,7 @@ const meta: Meta = { description: { component: ` - [Docs](https://react-chartjs-2.js.org/) - `, +`, }, source: { code: ` @@ -107,7 +106,7 @@ export const Default: Story = { LineElement, Title, Tooltip, - Legend + Legend, ); const options: ChartOptions<"line"> = { @@ -124,29 +123,29 @@ export const Default: Story = { }; const labels = [ - 'January', - 'February', - 'March', - 'April', - 'May', - 'June', - 'July' + "January", + "February", + "March", + "April", + "May", + "June", + "July", ]; const data = { labels, datasets: [ { - label: 'Dataset 1', + label: "Dataset 1", data: labels.map(() => faker.number.int({ min: -1000, max: 1000 })), - borderColor: 'rgb(255, 99, 132)', - backgroundColor: 'rgba(255, 99, 132, 0.5)', + borderColor: "rgb(255, 99, 132)", + backgroundColor: "rgba(255, 99, 132, 0.5)", }, { - label: 'Dataset 2', + label: "Dataset 2", data: labels.map(() => faker.number.int({ min: -1000, max: 1000 })), - borderColor: 'rgb(53, 162, 235)', - backgroundColor: 'rgba(53, 162, 235, 0.5)', + borderColor: "rgb(53, 162, 235)", + backgroundColor: "rgba(53, 162, 235, 0.5)", }, ], }; diff --git a/packages/common/components/src/ui/pie-chart/chart.stories.tsx b/packages/common/components/src/ui/pie-chart/chart.stories.tsx index 199878356..0e50d2e22 100644 --- a/packages/common/components/src/ui/pie-chart/chart.stories.tsx +++ b/packages/common/components/src/ui/pie-chart/chart.stories.tsx @@ -1,15 +1,7 @@ import type { Meta, StoryObj } from "@storybook/react"; -import { - Chart as ChartJS, - ArcElement, - Tooltip, - Legend, - type ChartOptions, -} from "chart.js"; +import { Chart as ChartJS, ArcElement, Tooltip, Legend } from "chart.js"; import { Pie } from "react-chartjs-2"; -import { fakerKO as faker } from "@faker-js/faker"; -import { getCssVariableValue } from "../../lib/utils"; const meta: Meta = { title: "Chart/Pie", @@ -19,7 +11,7 @@ const meta: Meta = { description: { component: ` - [Docs](https://react-chartjs-2.js.org/) - `, +`, }, source: { code: ` @@ -83,42 +75,31 @@ type Story = StoryObj; export const Default: Story = { render: () => { - ChartJS.register( - ArcElement, - Tooltip, - Legend, - ); + ChartJS.register(ArcElement, Tooltip, Legend); - const labels = [ - 'Red', - 'Blue', - 'Yellow', - 'Green', - 'Purple', - 'Orange' - ]; + const labels = ["Red", "Blue", "Yellow", "Green", "Purple", "Orange"]; const data = { labels, datasets: [ { - label: '# of Votes', + label: "# of Votes", data: [12, 19, 3, 5, 2, 3], backgroundColor: [ - 'rgba(255, 99, 132, 0.2)', - 'rgba(54, 162, 235, 0.2)', - 'rgba(255, 206, 86, 0.2)', - 'rgba(75, 192, 192, 0.2)', - 'rgba(153, 102, 255, 0.2)', - 'rgba(255, 159, 64, 0.2)', + "rgba(255, 99, 132, 0.2)", + "rgba(54, 162, 235, 0.2)", + "rgba(255, 206, 86, 0.2)", + "rgba(75, 192, 192, 0.2)", + "rgba(153, 102, 255, 0.2)", + "rgba(255, 159, 64, 0.2)", ], borderColor: [ - 'rgba(255, 99, 132, 1)', - 'rgba(54, 162, 235, 1)', - 'rgba(255, 206, 86, 1)', - 'rgba(75, 192, 192, 1)', - 'rgba(153, 102, 255, 1)', - 'rgba(255, 159, 64, 1)', + "rgba(255, 99, 132, 1)", + "rgba(54, 162, 235, 1)", + "rgba(255, 206, 86, 1)", + "rgba(75, 192, 192, 1)", + "rgba(153, 102, 255, 1)", + "rgba(255, 159, 64, 1)", ], borderWidth: 1, }, diff --git a/packages/common/components/src/ui/select/index.tsx b/packages/common/components/src/ui/select/index.tsx new file mode 100644 index 000000000..ffd63bb9a --- /dev/null +++ b/packages/common/components/src/ui/select/index.tsx @@ -0,0 +1,159 @@ +"use client"; + +import * as React from "react"; +import * as SelectPrimitive from "@radix-ui/react-select"; +import { Check, ChevronDown, ChevronUp } from "lucide-react"; + +import { cn } from "../../lib/utils"; + +const Select = SelectPrimitive.Root; + +const SelectGroup = SelectPrimitive.Group; + +const SelectValue = SelectPrimitive.Value; + +const SelectTrigger = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, children, ...props }, ref) => ( + span]:line-clamp-1", + className, + )} + {...props} + > + {children} + + + + +)); +SelectTrigger.displayName = SelectPrimitive.Trigger.displayName; + +const SelectScrollUpButton = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, ...props }, ref) => ( + + + +)); +SelectScrollUpButton.displayName = SelectPrimitive.ScrollUpButton.displayName; + +const SelectScrollDownButton = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, ...props }, ref) => ( + + + +)); +SelectScrollDownButton.displayName = + SelectPrimitive.ScrollDownButton.displayName; + +const SelectContent = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, children, position = "popper", ...props }, ref) => ( + + + + + {children} + + + + +)); +SelectContent.displayName = SelectPrimitive.Content.displayName; + +const SelectLabel = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, ...props }, ref) => ( + +)); +SelectLabel.displayName = SelectPrimitive.Label.displayName; + +const SelectItem = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, children, ...props }, ref) => ( + + + + + + + {children} + +)); +SelectItem.displayName = SelectPrimitive.Item.displayName; + +const SelectSeparator = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, ...props }, ref) => ( + +)); +SelectSeparator.displayName = SelectPrimitive.Separator.displayName; + +export { + Select, + SelectGroup, + SelectValue, + SelectTrigger, + SelectContent, + SelectLabel, + SelectItem, + SelectSeparator, + SelectScrollUpButton, + SelectScrollDownButton, +}; diff --git a/packages/common/components/src/ui/select/select.stories.tsx b/packages/common/components/src/ui/select/select.stories.tsx new file mode 100644 index 000000000..41846d17d --- /dev/null +++ b/packages/common/components/src/ui/select/select.stories.tsx @@ -0,0 +1,41 @@ +import type { Meta, StoryObj } from "@storybook/react"; +import { + Select, + SelectContent, + SelectItem, + SelectTrigger, + SelectValue, +} from "."; + +const meta: Meta = { + title: "Elements/Select", + component: Select, + parameters: { + docs: { + description: { + component: ` +- [Docs](https://ui.shadcn.com/docs/components/select) +- [API Reference](https://www.radix-ui.com/primitives/docs/components/select#api-reference) +`, + }, + }, + }, +}; + +export default meta; +type Story = StoryObj; + +export const Default: Story = { + render: () => ( + + ), +}; diff --git a/packages/common/components/src/ui/table/index.tsx b/packages/common/components/src/ui/table/index.tsx index 425fdba0c..e96ea7e4d 100644 --- a/packages/common/components/src/ui/table/index.tsx +++ b/packages/common/components/src/ui/table/index.tsx @@ -63,7 +63,7 @@ const TableRow = React.forwardRef< = { description: { component: ` - [Docs](https://github.com/minop1205/react-dnd-treeview/blob/next/README.md) - `, +`, }, }, }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e1c113792..e99e6c0c7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -54,6 +54,9 @@ importers: chart.js: specifier: ^4.4.8 version: 4.4.8 + dayjs: + specifier: ^1.11.13 + version: 1.11.13 js-cookie: specifier: ^3.0.5 version: 3.0.5 @@ -148,6 +151,9 @@ importers: '@radix-ui/react-radio-group': specifier: ^1.2.2 version: 1.2.3(@types/react-dom@18.3.5)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1) + '@radix-ui/react-select': + specifier: ^2.1.6 + version: 2.1.6(@types/react-dom@18.3.5)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1) '@radix-ui/react-slider': specifier: ^1.2.3 version: 1.2.3(@types/react-dom@18.3.5)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1) @@ -2077,6 +2083,46 @@ packages: react-dom: 18.3.1(react@18.3.1) dev: false + /@radix-ui/react-select@2.1.6(@types/react-dom@18.3.5)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1): + resolution: {integrity: sha512-T6ajELxRvTuAMWH0YmRJ1qez+x4/7Nq7QIx7zJ0VK3qaEWdnWpNbEDnmWldG1zBDwqrLy5aLMUWcoGirVj5kMg==} + peerDependencies: + '@types/react': ^18.3.18 + '@types/react-dom': ^18.3.5 + react: ^18.3.1 + react-dom: ^18.3.1 + peerDependenciesMeta: + '@types/react': + optional: true + '@types/react-dom': + optional: true + dependencies: + '@radix-ui/number': 1.1.0 + '@radix-ui/primitive': 1.1.1 + '@radix-ui/react-collection': 1.1.2(@types/react-dom@18.3.5)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1) + '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.3.18)(react@18.3.1) + '@radix-ui/react-context': 1.1.1(@types/react@18.3.18)(react@18.3.1) + '@radix-ui/react-direction': 1.1.0(@types/react@18.3.18)(react@18.3.1) + '@radix-ui/react-dismissable-layer': 1.1.5(@types/react-dom@18.3.5)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1) + '@radix-ui/react-focus-guards': 1.1.1(@types/react@18.3.18)(react@18.3.1) + '@radix-ui/react-focus-scope': 1.1.2(@types/react-dom@18.3.5)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1) + '@radix-ui/react-id': 1.1.0(@types/react@18.3.18)(react@18.3.1) + '@radix-ui/react-popper': 1.2.2(@types/react-dom@18.3.5)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1) + '@radix-ui/react-portal': 1.1.4(@types/react-dom@18.3.5)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1) + '@radix-ui/react-primitive': 2.0.2(@types/react-dom@18.3.5)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1) + '@radix-ui/react-slot': 1.1.2(@types/react@18.3.18)(react@18.3.1) + '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.18)(react@18.3.1) + '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.18)(react@18.3.1) + '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.18)(react@18.3.1) + '@radix-ui/react-use-previous': 1.1.0(@types/react@18.3.18)(react@18.3.1) + '@radix-ui/react-visually-hidden': 1.1.2(@types/react-dom@18.3.5)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1) + '@types/react': 18.3.18 + '@types/react-dom': 18.3.5(@types/react@18.3.18) + aria-hidden: 1.2.4 + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) + react-remove-scroll: 2.6.3(@types/react@18.3.18)(react@18.3.1) + dev: false + /@radix-ui/react-slider@1.2.3(@types/react-dom@18.3.5)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-nNrLAWLjGESnhqBqcCNW4w2nn7LxudyMzeB6VgdyAnFLC6kfQgnAjSL2v6UkQTnDctJBlxrmxfplWS4iYjdUTw==} peerDependencies: @@ -2269,6 +2315,26 @@ packages: react: 18.3.1 dev: false + /@radix-ui/react-visually-hidden@1.1.2(@types/react-dom@18.3.5)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1): + resolution: {integrity: sha512-1SzA4ns2M1aRlvxErqhLHsBHoS5eI5UUcI2awAMgGUp4LoaoWOKYmvqDY2s/tltuPkh3Yk77YF/r3IRj+Amx4Q==} + peerDependencies: + '@types/react': ^18.3.18 + '@types/react-dom': ^18.3.5 + react: ^18.3.1 + react-dom: ^18.3.1 + peerDependenciesMeta: + '@types/react': + optional: true + '@types/react-dom': + optional: true + dependencies: + '@radix-ui/react-primitive': 2.0.2(@types/react-dom@18.3.5)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1) + '@types/react': 18.3.18 + '@types/react-dom': 18.3.5(@types/react@18.3.18) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) + dev: false + /@radix-ui/rect@1.1.0: resolution: {integrity: sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg==} dev: false @@ -3984,6 +4050,10 @@ packages: resolution: {integrity: sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==} dev: false + /dayjs@1.11.13: + resolution: {integrity: sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==} + dev: false + /debug@3.2.7: resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==} peerDependencies: diff --git a/tailwind.config.preset.ts b/tailwind.config.preset.ts index dc8cf1743..ee341683e 100644 --- a/tailwind.config.preset.ts +++ b/tailwind.config.preset.ts @@ -41,6 +41,7 @@ export default { border: "var(--border)", input: "var(--input)", label: "var(--label)", + placeholder: "var(--placeholder)", ring: "var(--ring)", chart: { 1: "var(--chart-1)", -- 2.47.1.windows.1 From b64ff7c081d4b634039c0b19f53717d95d951b94 Mon Sep 17 00:00:00 2001 From: bicochan Date: Thu, 13 Mar 2025 13:25:51 +0900 Subject: [PATCH 02/10] =?UTF-8?q?design:=20=EA=B3=B5=ED=86=B5=20=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EB=8B=A4=ED=81=AC=20=ED=85=8C?= =?UTF-8?q?=EB=A7=88=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/common/assets/src/styles/base.css | 8 +++ .../common/components/src/ui/dialog/index.tsx | 8 +-- .../common/components/src/ui/header/index.tsx | 6 ++- .../common/components/src/ui/input/index.tsx | 2 +- .../components/src/ui/layout/footer.tsx | 6 ++- .../common/components/src/ui/layout/lnb.tsx | 2 +- .../common/components/src/ui/select/index.tsx | 2 +- .../common/components/src/ui/table/index.tsx | 7 ++- .../common/components/src/ui/table/table.css | 50 ++++++++++++------- tailwind.config.preset.ts | 4 ++ 10 files changed, 65 insertions(+), 30 deletions(-) diff --git a/packages/common/assets/src/styles/base.css b/packages/common/assets/src/styles/base.css index 2d73b09df..8a33518bc 100644 --- a/packages/common/assets/src/styles/base.css +++ b/packages/common/assets/src/styles/base.css @@ -32,6 +32,10 @@ --chart-5: #ff7865; --chart-6: #e65db5; --radius: 1rem; + --field: #fff; + --form: #fff; + --container: #f1f6f9; + --title: #4c5e6f; } [data-mode="dark"] { --background: #0a0a0a; @@ -62,5 +66,9 @@ --chart-5: #ffbcad; --chart-6: #f4a0d3; --radius: 1rem; + --field: #5b6269; + --form: #1a1a1a; + --container: #0a0a0a; + --title: #fff; } } diff --git a/packages/common/components/src/ui/dialog/index.tsx b/packages/common/components/src/ui/dialog/index.tsx index 1186ce636..b2ba92d05 100644 --- a/packages/common/components/src/ui/dialog/index.tsx +++ b/packages/common/components/src/ui/dialog/index.tsx @@ -36,14 +36,14 @@ const DialogContent = React.forwardRef< {children} - + Close @@ -71,7 +71,7 @@ const DialogFooter = ({ }: React.HTMLAttributes) => (
+

logo - 통합플랫폼관리 + + 통합플랫폼관리 +

diff --git a/packages/common/components/src/ui/input/index.tsx b/packages/common/components/src/ui/input/index.tsx index 70bb9827c..963ef1947 100644 --- a/packages/common/components/src/ui/input/index.tsx +++ b/packages/common/components/src/ui/input/index.tsx @@ -8,7 +8,7 @@ const Input = React.forwardRef>( -

© 2025 Ona And All. All Rights Reserved.

+
+

+ © 2025 Ona And All. All Rights Reserved. +

); } diff --git a/packages/common/components/src/ui/layout/lnb.tsx b/packages/common/components/src/ui/layout/lnb.tsx index 761633414..f7d3a9be8 100644 --- a/packages/common/components/src/ui/layout/lnb.tsx +++ b/packages/common/components/src/ui/layout/lnb.tsx @@ -2,7 +2,7 @@ export function LNB() { return (
  • diff --git a/packages/common/components/src/ui/select/index.tsx b/packages/common/components/src/ui/select/index.tsx index ffd63bb9a..77e8ec11a 100644 --- a/packages/common/components/src/ui/select/index.tsx +++ b/packages/common/components/src/ui/select/index.tsx @@ -19,7 +19,7 @@ const SelectTrigger = React.forwardRef< span]:line-clamp-1", + "bg-form flex h-[3.2rem] w-full items-center justify-between whitespace-nowrap rounded-sm border border-input px-4 py-2 text-[1.3rem] text-label ring-offset-background focus:outline-none focus:ring-1 focus:ring-ring disabled:cursor-not-allowed disabled:opacity-50 data-[placeholder]:text-muted-foreground [&>span]:line-clamp-1", className, )} {...props} diff --git a/packages/common/components/src/ui/table/index.tsx b/packages/common/components/src/ui/table/index.tsx index e96ea7e4d..34505c898 100644 --- a/packages/common/components/src/ui/table/index.tsx +++ b/packages/common/components/src/ui/table/index.tsx @@ -63,7 +63,7 @@ const TableRow = React.forwardRef<
(({ className, ...props }, ref) => (
)); diff --git a/packages/common/components/src/ui/table/table.css b/packages/common/components/src/ui/table/table.css index 7736b04f0..53e7ea616 100644 --- a/packages/common/components/src/ui/table/table.css +++ b/packages/common/components/src/ui/table/table.css @@ -1,22 +1,38 @@ -th { - @apply bg-[#5987bf] px-4 py-[1.2rem] text-[1.3rem] font-medium leading-[1.2] text-[#fff]; -} -td { - @apply border-b border-b-[#e0e6ea] px-2 py-[1.2rem] text-[1.3rem] font-normal leading-[1.2] text-[#666]; -} +@tailwind components; -.secondary th { - @apply border border-[#e0e6ea] bg-[#eaf3fb] text-[#647784]; -} +@layer components { + th { + @apply bg-[#5987bf] px-4 py-[1.2rem] text-[1.3rem] font-medium leading-[1.2] text-[#fff]; + } + td { + @apply border-b border-b-border px-2 py-[1.2rem] text-[1.3rem] font-normal leading-[1.2] text-[#666]; + } -.secondary td { - @apply border border-[#e0e6ea]; -} + .secondary th { + @apply border border-border bg-[#eaf3fb] text-[#647784]; + } -.line th { - @apply border-0 border-b-2 border-t border-b-[#d4e0ea] border-t-[#d4e0ea] bg-[#fff] text-[#555]; -} + .secondary td { + @apply border border-border; + } -.line td { - @apply border-b border-b-[#e0e6ea]; + .line th { + @apply border-0 border-b-2 border-t border-b-[#d4e0ea] border-t-[#d4e0ea] bg-[#fff] text-[#555]; + } + + .line td { + @apply border-b border-b-border; + } + + [data-mode="dark"] { + th { + @apply bg-[#5e7b9c] text-[#fff]; + } + .secondary th { + @apply bg-[#1a1c1d]; + } + .line th { + @apply bg-[#0a0a0a]; + } + } } diff --git a/tailwind.config.preset.ts b/tailwind.config.preset.ts index ee341683e..9eb83e4d7 100644 --- a/tailwind.config.preset.ts +++ b/tailwind.config.preset.ts @@ -50,6 +50,10 @@ export default { 4: "var(--chart-4)", 5: "var(--chart-5)", }, + field: "var(--field)", + form: "var(--form)", + container: "var(--container)", + title: "var(--title)", }, keyframes: { "accordion-down": { -- 2.47.1.windows.1 From 64a615258da071b85b1a50f59dc4d3d662302ffa Mon Sep 17 00:00:00 2001 From: bicochan Date: Thu, 13 Mar 2025 13:28:33 +0900 Subject: [PATCH 03/10] =?UTF-8?q?feat:=20=EC=82=AC=EC=9D=B4=ED=8A=B8=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D/=EC=88=98=EC=A0=95=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EC=9E=91?= =?UTF-8?q?=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/cs/app/site/register/page.tsx | 2 + apps/cs/src/app/styles/components.css | 11 +- apps/cs/src/entities/code/ui/code-select.tsx | 2 +- .../site/ui/domain-management-dialog.tsx | 212 ++++++++++++++++++ .../pages/site/ui/ip-management-dialog.tsx | 21 +- apps/cs/src/pages/site/ui/layout.tsx | 4 +- apps/cs/src/pages/site/ui/register-page.tsx | 106 ++++++--- 7 files changed, 323 insertions(+), 35 deletions(-) create mode 100644 apps/cs/app/site/register/page.tsx create mode 100644 apps/cs/src/pages/site/ui/domain-management-dialog.tsx diff --git a/apps/cs/app/site/register/page.tsx b/apps/cs/app/site/register/page.tsx new file mode 100644 index 000000000..a11d0b60c --- /dev/null +++ b/apps/cs/app/site/register/page.tsx @@ -0,0 +1,2 @@ +import { RegisterPage } from "@/pages/site"; +export default RegisterPage; diff --git a/apps/cs/src/app/styles/components.css b/apps/cs/src/app/styles/components.css index 4d5caaf96..ec137cf25 100644 --- a/apps/cs/src/app/styles/components.css +++ b/apps/cs/src/app/styles/components.css @@ -5,7 +5,7 @@ @apply relative m-[0.6rem] box-border min-h-[2rem] rounded-[0.5rem] p-[0.6rem] text-[1.3rem] text-[#666]; } .card-border { - @apply shadow-blur border border-[#dbe2e6] bg-[rgba(255,255,255,0.6)]; + @apply border border-[#dbe2e6] bg-[rgba(255,255,255,0.6)] shadow-blur; } .card-header { @apply -mx-[0.6rem] flex items-center justify-between border-b border-b-[#e1e7eb] p-4; @@ -13,4 +13,13 @@ .card-footer { @apply -mx-[0.6rem] mt-2 flex items-center justify-center border-t border-t-[#e1e7eb] py-4; } + + [data-mode="dark"] { + .card-border { + @apply border-[#3f4042] bg-[rgba(255,255,255,0.065)]; + } + .card-header { + @apply border-b-[#3f4042]; + } + } } diff --git a/apps/cs/src/entities/code/ui/code-select.tsx b/apps/cs/src/entities/code/ui/code-select.tsx index 88c8a1368..5d73ee1d3 100644 --- a/apps/cs/src/entities/code/ui/code-select.tsx +++ b/apps/cs/src/entities/code/ui/code-select.tsx @@ -28,7 +28,7 @@ function CodeSelect({ upCd, defaultValue, ...props }: CodeSelectProps) { return ( + + + + + + + + + + NO + 선택 + 도메인URL + 대표URL + 사용여부 + + + + {rows.map((row, idx) => ( + + {idx + 1} + + toggleRowSelection(row.id)} + className="cursor-pointer" + /> + + + + handleDomainUrlChange(row.id, e.target.value) + } + className="!text-[1.3rem]" + /> + + + handleRepresentativeChange(row.id)} + className="cursor-pointer" + /> + + + + + + ))} + +
+ + + + + + + + + + + + ); +} + +export { DomainManagementDialog }; diff --git a/apps/cs/src/pages/site/ui/ip-management-dialog.tsx b/apps/cs/src/pages/site/ui/ip-management-dialog.tsx index 9f637e3be..1390efd45 100644 --- a/apps/cs/src/pages/site/ui/ip-management-dialog.tsx +++ b/apps/cs/src/pages/site/ui/ip-management-dialog.tsx @@ -18,6 +18,8 @@ import { RadioGroup, RadioGroupItem, Checkbox, + DialogFooter, + DialogClose, } from "@common/components"; type IP = { @@ -34,7 +36,7 @@ function IPManagementDialog({ triggerDisabled }: IPManagementDialogProps) { const [rows, setRows] = useState([]); const [rowSelection, setRowSelection] = useState([]); - const handleSave = () => {}; + const onSave = () => {}; const handleAddIP = () => { const newIP: IP = { @@ -86,9 +88,6 @@ function IPManagementDialog({ triggerDisabled }: IPManagementDialogProps) { - @@ -102,7 +101,7 @@ function IPManagementDialog({ triggerDisabled }: IPManagementDialogProps) {
- +
@@ -160,6 +159,18 @@ function IPManagementDialog({ triggerDisabled }: IPManagementDialogProps) {
+ + + + + + + + ); diff --git a/apps/cs/src/pages/site/ui/layout.tsx b/apps/cs/src/pages/site/ui/layout.tsx index a5d85dee3..c9b12a1f1 100644 --- a/apps/cs/src/pages/site/ui/layout.tsx +++ b/apps/cs/src/pages/site/ui/layout.tsx @@ -3,8 +3,8 @@ import { BaseLayout } from "@common/components"; function SitePageLayout({ children }: { children: React.ReactNode }) { return ( -
-

+
+

사이트 관리

{children} diff --git a/apps/cs/src/pages/site/ui/register-page.tsx b/apps/cs/src/pages/site/ui/register-page.tsx index 0257176ab..48347e823 100644 --- a/apps/cs/src/pages/site/ui/register-page.tsx +++ b/apps/cs/src/pages/site/ui/register-page.tsx @@ -1,6 +1,7 @@ "use client"; import { useState } from "react"; +import { useRouter } from "next/navigation"; import { SiteApi } from "@/entities/site"; import { ENDPOINT } from "@/shared/config/api"; import { @@ -19,25 +20,45 @@ import { useQuery } from "@tanstack/react-query"; import { CodeSelect } from "@/entities/code"; import { SitePageLayout } from "./layout"; import { IPManagementDialog } from "./ip-management-dialog"; +import { + DomainManagementDialog, + type Domain, +} from "./domain-management-dialog"; +import type { ISiteDetail } from "@/entities/site/model/site-interface"; + +type ViewState = Partial; function RegisterPage({ siteId }: { siteId: string }) { + const router = useRouter(); const { data: siteDetail } = useQuery({ queryKey: [ENDPOINT.CMS_SERVICE.SITES, siteId], queryFn: () => SiteApi.siteDetail(siteId), select: (data) => { - setSiteKndCd(data.siteKndCd); + handleViewStateChange("siteKndCd")(data.siteKndCd); + handleViewStateChange("siteSkn")(data.siteSkn); return data; }, enabled: !!siteId, }); - const [siteKndCd, setSiteKndCd] = useState(""); - const [, setSiteSkinCd] = useState(""); + + const [viewState, setViewState] = useState({}); + const [representativeDomain, setRepresentativeDomain] = useState(""); + + const handleViewStateChange = (key: keyof ISiteDetail) => (value: string) => { + setViewState({ ...viewState, [key]: value }); + }; + + const handleDomainSave = (rows: Domain[]) => { + setRepresentativeDomain( + rows.find((row) => row.isRepresentative)?.domainUrl || "", + ); + }; return (
-

사이트 등록/수정

+

사이트 등록/수정

@@ -53,6 +74,9 @@ function RegisterPage({ siteId }: { siteId: string }) { className="w-[12rem] !text-[1.3rem]" defaultValue={siteDetail?.siteId} disabled={!!siteId} + onChange={(e) => + handleViewStateChange("siteId")(e.target.value) + } /> @@ -63,11 +87,13 @@ function RegisterPage({ siteId }: { siteId: string }) { { - setSiteKndCd(value); - }} + onValueChange={handleViewStateChange("siteKndCd")} /> - + {siteId && ( + + )} @@ -77,9 +103,7 @@ function RegisterPage({ siteId }: { siteId: string }) { { - setSiteSkinCd(value); - }} + onValueChange={handleViewStateChange("siteSkn")} /> @@ -90,6 +114,9 @@ function RegisterPage({ siteId }: { siteId: string }) { className="!text-[1.3rem]" placeholder="사이트명을 입력하십시오." defaultValue={siteDetail?.siteNm} + onChange={(e) => + handleViewStateChange("siteNm")(e.target.value) + } /> @@ -100,9 +127,23 @@ function RegisterPage({ siteId }: { siteId: string }) { className="!text-[1.3rem]" placeholder="사이트 설명을 입력하십시오." defaultValue={siteDetail?.siteExpln} + onChange={(e) => + handleViewStateChange("siteExpln")(e.target.value) + } /> + + 사이트 도메인 + +
+
+ {representativeDomain} +
+ +
+ + 사이트 하단 표기 주소 @@ -110,6 +151,9 @@ function RegisterPage({ siteId }: { siteId: string }) { className="!text-[1.3rem]" placeholder="사이트 하단 주소를 입력하십시오." defaultValue={siteDetail?.siteAddr} + onChange={(e) => + handleViewStateChange("siteAddr")(e.target.value) + } /> @@ -120,6 +164,9 @@ function RegisterPage({ siteId }: { siteId: string }) { className="!text-[1.3rem]" placeholder="사이트 하단 전화번호를 입력하십시오." defaultValue={siteDetail?.telNo} + onChange={(e) => + handleViewStateChange("telNo")(e.target.value) + } /> @@ -130,6 +177,9 @@ function RegisterPage({ siteId }: { siteId: string }) { className="!text-[1.3rem]" placeholder="사이트 하단 팩스번호를 입력하십시오." defaultValue={siteDetail?.faxNumber} + onChange={(e) => + handleViewStateChange("faxNumber")(e.target.value) + } /> @@ -140,6 +190,9 @@ function RegisterPage({ siteId }: { siteId: string }) { className="!text-[1.3rem]" placeholder="사이트 표기 내용을 입력하십시오. (ex. COPYRIGHT c 2013 KECO. ALL RIGHTS RESERVED.)" defaultValue={siteDetail?.lwndCn} + onChange={(e) => + handleViewStateChange("lwndCn")(e.target.value) + } /> @@ -150,6 +203,9 @@ function RegisterPage({ siteId }: { siteId: string }) { className="!text-[1.3rem]" placeholder="아이콘 파일 경로 및 파일명을 입력하여 주십시오." defaultValue={siteDetail?.bkmkIcon} + onChange={(e) => + handleViewStateChange("bkmkIcon")(e.target.value) + } /> @@ -157,18 +213,17 @@ function RegisterPage({ siteId }: { siteId: string }) { 기본 사이트 여부 { - console.log(value); - }} + onValueChange={handleViewStateChange("basicSiteYn")} >
- - + +
- - + +
@@ -177,18 +232,17 @@ function RegisterPage({ siteId }: { siteId: string }) { 사용 여부 { - console.log(value); - }} + onValueChange={handleViewStateChange("useYn")} >
- - + +
- - + +
@@ -199,7 +253,7 @@ function RegisterPage({ siteId }: { siteId: string }) {
-
- - - - - - - 사이트 코드 - - - handleViewStateChange("siteId")(e.target.value) - } - /> - - - - 사이트 구분 - -
- - {siteId && ( - + +
+
+
+

+ 사이트 등록/수정 +

+
+
+
+ + + + + + + 사이트 코드 + + ( + + + + + + )} /> - )} - - - - - 사이트 디자인 - - - - - - 사이트명 - - - handleViewStateChange("siteNm")(e.target.value) - } - /> - - - - 사이트 설명 - - - handleViewStateChange("siteExpln")(e.target.value) - } - /> - - - - 사이트 도메인 - -
-
- {representativeDomain} -
- -
- - - - 사이트 하단 표기 주소 - - - handleViewStateChange("siteAddr")(e.target.value) - } - /> - - - - 사이트 하단 표기 전화번호 - - - handleViewStateChange("telNo")(e.target.value) - } - /> - - - - 사이트 하단 표기 팩스번호 - - - handleViewStateChange("faxNumber")(e.target.value) - } - /> - - - - 사이트 하단 표기 내용 - - - handleViewStateChange("lwndCn")(e.target.value) - } - /> - - - - 북마크 아이콘 - - - handleViewStateChange("bkmkIcon")(e.target.value) - } - /> - - - - 기본 사이트 여부 - - -
- - -
-
- - -
- - - - - 사용 여부 - - -
- - -
-
- - -
- - - - -
-
-
-
- - - -
- + + + + 사이트 구분 + +
+ ( + + + { + handleViewStateChange("siteKndCd")(value); + field.onChange(value); + }} + /> + + + )} + /> + {isModifyMode && ( + + )} +
+ + + + 사이트 디자인 + + ( + + + + + + )} + /> + + + + 사이트명 + + ( + + + + + + )} + /> + + + + 사이트 설명 + + ( + + + + + + )} + /> + + + + 사이트 도메인 + +
+
+ {representativeDomain} +
+ +
+ + + + 사이트 하단 표기 주소 + + ( + + + + + + )} + /> + + + + 사이트 하단 표기 전화번호 + + ( + + + + + + )} + /> + + + + 사이트 하단 표기 팩스번호 + + ( + + + + + + )} + /> + + + + 사이트 하단 표기 내용 + + ( + + + + + + )} + /> + + + + 북마크 아이콘 + + ( + + + + + + )} + /> + + + + 기본 사이트 여부 + + ( + + + +
+ + +
+
+ + +
+ + + + )} + /> + + + + 사용 여부 + + ( + + + +
+ + +
+
+ + +
+ + + + )} + /> + + + +

+ + +
+ + + +
+ + + ); } diff --git a/apps/cs/src/pages/site/ui/site-page.tsx b/apps/cs/src/pages/site/ui/site-page.tsx index 46e957985..4b095caff 100644 --- a/apps/cs/src/pages/site/ui/site-page.tsx +++ b/apps/cs/src/pages/site/ui/site-page.tsx @@ -7,8 +7,7 @@ import { useEffect, useState } from "react"; import { useQuery } from "@tanstack/react-query"; import { getCoreRowModel, useReactTable } from "@tanstack/react-table"; import { Button, Input, DataTable } from "@common/components"; -import { SiteApi } from "@/entities/site/api/site-service"; -import type { ISite, ISiteQuery } from "@/entities/site/model/site-interface"; +import { SiteApi, type ISite, type ISiteParams } from "@/entities/site"; import { ENDPOINT } from "@/shared/config/api"; import { columns } from "../model/table-columns"; import { SitePageLayout } from "./layout"; @@ -21,7 +20,7 @@ function SitePage() { enabled: false, }); - const [siteQuery, setSiteQuery] = useState({ + const [siteQuery, setSiteQuery] = useState({ siteNm: "", siteKndCd: "", useYn: "", diff --git a/apps/cs/src/shared/ui/form.tsx b/apps/cs/src/shared/ui/form.tsx new file mode 100644 index 000000000..73830edd1 --- /dev/null +++ b/apps/cs/src/shared/ui/form.tsx @@ -0,0 +1,177 @@ +"use client"; + +import * as React from "react"; +import * as LabelPrimitive from "@radix-ui/react-label"; +import { Slot } from "@radix-ui/react-slot"; +import { + Controller, + FormProvider, + useFormContext, + type ControllerProps, + type FieldPath, + type FieldValues, +} from "react-hook-form"; +import { cn, Label } from "@common/components"; + +const Form = FormProvider; + +type FormFieldContextValue< + TFieldValues extends FieldValues = FieldValues, + TName extends FieldPath = FieldPath, +> = { + name: TName; +}; + +const FormFieldContext = React.createContext( + {} as FormFieldContextValue, +); + +const FormField = < + TFieldValues extends FieldValues = FieldValues, + TName extends FieldPath = FieldPath, +>({ + ...props +}: ControllerProps) => { + return ( + + + + ); +}; + +const useFormField = () => { + const fieldContext = React.useContext(FormFieldContext); + const itemContext = React.useContext(FormItemContext); + const { getFieldState, formState } = useFormContext(); + + const fieldState = getFieldState(fieldContext.name, formState); + + if (!fieldContext) { + throw new Error("useFormField should be used within "); + } + + const { id } = itemContext; + + return { + id, + name: fieldContext.name, + formItemId: `${id}-form-item`, + formDescriptionId: `${id}-form-item-description`, + formMessageId: `${id}-form-item-message`, + ...fieldState, + }; +}; + +type FormItemContextValue = { + id: string; +}; + +const FormItemContext = React.createContext( + {} as FormItemContextValue, +); + +const FormItem = React.forwardRef< + HTMLDivElement, + React.HTMLAttributes +>(({ className, ...props }, ref) => { + const id = React.useId(); + + return ( + +
+ + ); +}); +FormItem.displayName = "FormItem"; + +const FormLabel = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, ...props }, ref) => { + const { error, formItemId } = useFormField(); + + return ( +
-
- - - -
- - - - ); -} - -export { RegisterPage }; diff --git a/apps/cs/src/pages/site/ui/site-form.tsx b/apps/cs/src/pages/site/ui/site-form.tsx new file mode 100644 index 000000000..8bbeee156 --- /dev/null +++ b/apps/cs/src/pages/site/ui/site-form.tsx @@ -0,0 +1,386 @@ +import { useState } from "react"; +import { useRouter } from "next/navigation"; +import { type UseFormReturn } from "react-hook-form"; +import { + Button, + Input, + Label, + RadioGroup, + RadioGroupItem, + Table, + TableBody, + TableCell, + TableHead, + TableRow, +} from "@common/components"; +import { CodeSelect } from "@/entities/code"; +import { type ISiteDetail, type SiteFormData } from "@/entities/site"; +import { + FormItem, + FormControl, + FormField, + Form, + FormMessage, +} from "@/shared/ui/form"; +import { IPManagementDialog } from "./ip-management-dialog"; +import { + DomainManagementDialog, + type Domain, +} from "./domain-management-dialog"; + +type SiteFormProps = { + form: UseFormReturn; + siteId?: string; + handleSave: (data: SiteFormData) => void; +}; + +function SiteForm({ form, siteId, handleSave }: SiteFormProps) { + const router = useRouter(); + + const [viewState, setViewState] = useState>({}); + const [representativeDomain, setRepresentativeDomain] = useState(""); + + const isModifyMode = !!siteId; + + const handleViewStateChange = (key: keyof ISiteDetail) => (value: string) => { + setViewState({ ...viewState, [key]: value }); + }; + + const handleDomainSave = (rows: Domain[]) => { + setRepresentativeDomain( + rows.find((row) => row.isRepresentative)?.domainUrl || "", + ); + }; + + const onSubmit = (data: SiteFormData) => { + handleSave(data); + }; + + return ( +
+ +
+
+

+ 사이트 등록/수정 +

+
+
+ + + + + + + + 사이트 코드 + + ( + + + + + + + )} + /> + + + + 사이트 구분 + +
+ ( + + + { + handleViewStateChange("siteKndCd")(value); + field.onChange(value); + }} + /> + + + + )} + /> + {isModifyMode && ( + + )} +
+ + + + 사이트 디자인 + + ( + + + + + + + )} + /> + + + + 사이트명 + + ( + + + + + + + )} + /> + + + + 사이트 설명 + + ( + + + + + + + )} + /> + + + + 사이트 도메인 + +
+
+ {representativeDomain} +
+ +
+ + + + 사이트 하단 표기 주소 + + ( + + + + + + + )} + /> + + + + 사이트 하단 표기 전화번호 + + ( + + + + + + + )} + /> + + + + 사이트 하단 표기 팩스번호 + + ( + + + + + + + )} + /> + + + + 사이트 하단 표기 내용 + + ( + + + + + + + )} + /> + + + + 북마크 아이콘 + + ( + + + + + + + )} + /> + + + + 기본 사이트 여부 + + ( + + + +
+ + +
+
+ + +
+ + + + + )} + /> + + + + 사용 여부 + + ( + + + +
+ + +
+
+ + +
+ + + + + )} + /> + + + +
+
+
+
+ + + +
+
+ + ); +} + +export { SiteForm }; diff --git a/apps/cs/src/shared/ui/form.tsx b/apps/cs/src/shared/ui/form.tsx index 6d379038f..bd579d263 100644 --- a/apps/cs/src/shared/ui/form.tsx +++ b/apps/cs/src/shared/ui/form.tsx @@ -154,7 +154,7 @@ const FormMessage = React.forwardRef<

{body} -- 2.47.1.windows.1 From 5505838bc58c84daebf961426e8dc6b64ddad9df Mon Sep 17 00:00:00 2001 From: bicochan Date: Fri, 14 Mar 2025 18:13:25 +0900 Subject: [PATCH 09/10] =?UTF-8?q?design:=20=EC=BB=B4=ED=8F=AC=EB=84=8C?= =?UTF-8?q?=ED=8A=B8=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/cs/src/pages/site/ui/domain-management-dialog.tsx | 4 ++-- apps/cs/src/pages/site/ui/ip-management-dialog.tsx | 2 +- packages/common/components/package.json | 1 + packages/common/components/src/ui/dialog/dialog.stories.tsx | 2 +- packages/common/components/src/ui/dialog/index.tsx | 4 ++++ packages/common/components/src/ui/layout/layout.stories.tsx | 2 +- .../common/components/src/ui/radio-group/radio-group.css | 2 +- packages/common/components/src/ui/select/select.stories.tsx | 2 +- packages/common/components/src/ui/tabs/tabs.stories.tsx | 6 +++--- pnpm-lock.yaml | 3 +++ 10 files changed, 18 insertions(+), 10 deletions(-) diff --git a/apps/cs/src/pages/site/ui/domain-management-dialog.tsx b/apps/cs/src/pages/site/ui/domain-management-dialog.tsx index 1faee4c0c..c675f92d9 100644 --- a/apps/cs/src/pages/site/ui/domain-management-dialog.tsx +++ b/apps/cs/src/pages/site/ui/domain-management-dialog.tsx @@ -107,7 +107,7 @@ function DomainManagementDialog({ - + 도메인 관리 @@ -176,7 +176,7 @@ function DomainManagementDialog({ handleActiveChange(row.id, value) } > - + diff --git a/apps/cs/src/pages/site/ui/ip-management-dialog.tsx b/apps/cs/src/pages/site/ui/ip-management-dialog.tsx index f4b29c648..06d9638b3 100644 --- a/apps/cs/src/pages/site/ui/ip-management-dialog.tsx +++ b/apps/cs/src/pages/site/ui/ip-management-dialog.tsx @@ -78,7 +78,7 @@ function IPManagementDialog({ triggerDisabled }: IPManagementDialogProps) { - + IP 관리 diff --git a/packages/common/components/package.json b/packages/common/components/package.json index 2bfdb6ba6..7c04950f7 100644 --- a/packages/common/components/package.json +++ b/packages/common/components/package.json @@ -39,6 +39,7 @@ "@radix-ui/react-slot": "^1.1.2", "@radix-ui/react-switch": "^1.1.3", "@radix-ui/react-tabs": "^1.1.3", + "@radix-ui/react-visually-hidden": "^1.1.2", "@tanstack/react-query": "^5.67.1", "@tanstack/react-table": "^8.21.2", "@types/js-cookie": "^3.0.6", diff --git a/packages/common/components/src/ui/dialog/dialog.stories.tsx b/packages/common/components/src/ui/dialog/dialog.stories.tsx index 24c0cdbda..80d14cff2 100644 --- a/packages/common/components/src/ui/dialog/dialog.stories.tsx +++ b/packages/common/components/src/ui/dialog/dialog.stories.tsx @@ -26,7 +26,7 @@ export const Default: Story = { - + 다이얼로그 제목 diff --git a/packages/common/components/src/ui/dialog/index.tsx b/packages/common/components/src/ui/dialog/index.tsx index b2ba92d05..1b6ff30f9 100644 --- a/packages/common/components/src/ui/dialog/index.tsx +++ b/packages/common/components/src/ui/dialog/index.tsx @@ -1,5 +1,6 @@ import * as React from "react"; import * as DialogPrimitive from "@radix-ui/react-dialog"; +import { VisuallyHidden } from "@radix-ui/react-visually-hidden"; import { X } from "lucide-react"; import { cn } from "../../lib/utils"; @@ -41,6 +42,9 @@ const DialogContent = React.forwardRef< )} {...props} > + + Dialog + {children} diff --git a/packages/common/components/src/ui/layout/layout.stories.tsx b/packages/common/components/src/ui/layout/layout.stories.tsx index f8a1e999d..bd73f98d9 100644 --- a/packages/common/components/src/ui/layout/layout.stories.tsx +++ b/packages/common/components/src/ui/layout/layout.stories.tsx @@ -348,7 +348,7 @@ function IPManagementDialog() { - + IP 관리 diff --git a/packages/common/components/src/ui/radio-group/radio-group.css b/packages/common/components/src/ui/radio-group/radio-group.css index 2becbf2cf..b055b281a 100644 --- a/packages/common/components/src/ui/radio-group/radio-group.css +++ b/packages/common/components/src/ui/radio-group/radio-group.css @@ -5,7 +5,7 @@ @apply flex flex-row gap-4 data-[orientation="vertical"]:flex-col data-[orientation="vertical"]:gap-2; } button[role="radio"] { - @apply aspect-square size-[18px] rounded-full bg-[url(../../../public/assets/images/checkbox_off.png)] bg-contain text-primary ring-offset-background focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-[url(../../../public/assets/images/checkbox_on.png)]; + @apply aspect-square size-[1.8rem] rounded-full bg-[url(../../../public/assets/images/checkbox_off.png)] bg-contain text-primary ring-offset-background focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-[url(../../../public/assets/images/checkbox_on.png)]; } button[role="radio"] + label { @apply text-[1.3rem] font-medium text-label; diff --git a/packages/common/components/src/ui/select/select.stories.tsx b/packages/common/components/src/ui/select/select.stories.tsx index 41846d17d..bbcf03cfd 100644 --- a/packages/common/components/src/ui/select/select.stories.tsx +++ b/packages/common/components/src/ui/select/select.stories.tsx @@ -28,7 +28,7 @@ type Story = StoryObj; export const Default: Story = { render: () => (