From 8de707f8d178ae66a416f1fa4c6c3ca21cd2f3f3 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Thu, 5 Feb 2026 12:22:18 +0900 Subject: [PATCH] =?UTF-8?q?260205=5F03=5FENH:=20layout=20color=20gray=20+?= =?UTF-8?q?=20black=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD,=20excel?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=95=84=EC=9D=B4=EC=BD=98=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../(pages)/(main)/total/penetration/page.tsx | 24 ++++++--- src/app/(pages)/login/page.tsx | 2 +- src/app/globals.css | 50 ++++++++++++++++--- src/components/layout/ExcelDownloadButton.tsx | 20 +++++--- src/components/layout/Header.tsx | 22 +++----- 5 files changed, 82 insertions(+), 36 deletions(-) diff --git a/src/app/(pages)/(main)/total/penetration/page.tsx b/src/app/(pages)/(main)/total/penetration/page.tsx index 301093e..14a6181 100644 --- a/src/app/(pages)/(main)/total/penetration/page.tsx +++ b/src/app/(pages)/(main)/total/penetration/page.tsx @@ -11,7 +11,7 @@ import { type GroupedStackBarData, } from "@/components/lge-dashboard"; import { useLayoutFilter } from "@/components/layout/LayoutFilterContext"; -import { apiBrandByYearCategories, apiTrendCategories } from "@/config/sample.data"; +import {apiBrandByYearCategories, apiOwnShareOfTotalPenetration, apiTrendCategories} from "@/config/sample.data"; import { Button } from "@/components/ui/button"; import { BRAND_LIST, @@ -22,7 +22,7 @@ import { GRID_X_NOT_PADDING, PRODUCT_KEY_MAP, LAST_YEAR, } from "@/const/lgConst"; import { formatRowLabel } from "@/lib/lg-dashboard"; -import {buildHeader_ProductKeyMap, exportDashboardExcel} from "@/lib/lg-export-excel"; +import {buildHeader_ProductKeyMap, exportDashboardExcel, Section} from "@/lib/lg-export-excel"; const PenetrationPage = () => { const { filterValue, registerExcelExporter } = useLayoutFilter(); @@ -63,8 +63,7 @@ const PenetrationPage = () => { BRAND_LIST.forEach((brand, bi) => { PRODUCT_KEYS.forEach((k, ci) => { const row = rowMap.get(`${year}__${brand}`); - const v = (row as any)?.[k]; - values[yi][bi][ci] = typeof v === "number" ? v : 0; + values[yi][bi][ci] = (row as any)?.[k]; }); }); }); @@ -75,13 +74,24 @@ const PenetrationPage = () => { useEffect(() => { registerExcelExporter(async () => { const excelHeader = buildHeader_ProductKeyMap(PRODUCT_KEY_MAP); + type AnyRow = Record; + + const sections: Section[] = [ + { title: "전체 보급률", header: excelHeader, rows: apiTrendCategories, rowGap: 1 }, + ...YEARS.map((year) => ( + { + title: `브랜드 별 점유율_${year}년`, + header: excelHeader, + rows: apiBrandByYearCategories.filter((row) => row.year === year) as AnyRow[], + rowGap: 1, + } + )) + ]; await exportDashboardExcel({ fileName: `20${LAST_YEAR}년도 가전 보급률 Dashboard(보급률).xlsx`, sheetName: "전체 보급률", - sections: [ - { title: "전체 보급률", header: excelHeader, rows: apiTrendCategories, rowGap: 1 }, - ], + sections: sections, }); }); return () => registerExcelExporter(null); diff --git a/src/app/(pages)/login/page.tsx b/src/app/(pages)/login/page.tsx index 0c4b197..2fbd074 100644 --- a/src/app/(pages)/login/page.tsx +++ b/src/app/(pages)/login/page.tsx @@ -89,7 +89,7 @@ const LoginPage = () => { }; return ( -
+
diff --git a/src/app/globals.css b/src/app/globals.css index 0144867..df27143 100644 --- a/src/app/globals.css +++ b/src/app/globals.css @@ -309,6 +309,8 @@ .border-border { border-color: var(--border); } /* LG gray scale (Tailwind gray override 의도 유지) */ +.bg-black { background-color: #111111 !important; } + .bg-gray-900 { background-color: hsl(var(--lg-gray-900)) !important; } .bg-gray-800 { background-color: hsl(var(--lg-gray-800)) !important; } .bg-gray-700 { background-color: hsl(var(--lg-gray-700)) !important; } @@ -391,23 +393,57 @@ .placeholder-content-text-3xl::placeholder { font-size: calc(var(--content-font-size) * 1.875); } .placeholder-content-text-4xl::placeholder { font-size: calc(var(--content-font-size) * 2.25); } - .bg-lg-login { + .bg-lg-login-body { background-color: hsl(var(--background)); background-image: linear-gradient( 135deg, - hsl(var(--lg-red-600) / 0.16) 0%, - var(--background) 50%, - hsl(var(--lg-pink-600) / 0.14) 100% + hsl(var(--lg-gray-900) / 0.5) 0%, + var(--background) 30%, + var(--background) 70%, + hsl(var(--lg-gray-900) / 0.5) 100% ); } + .text-header-color { color: #FFFFFF; } + + .text-header-primary { + color: #FFFFFF; + font-weight: 600; + position: relative; + padding-bottom: 4px; + } + + .text-header-primary::after { + content: ''; + position: absolute; + bottom: 0; + left: 0; + width: 100%; + height: 3px; + background: linear-gradient(90deg, #A50034 0%, #E6004C 100%); + border-radius: 2px 2px 0 0; + } + + /* 비활성 메뉴 스타일 */ + .text-header-secondary-hover { + color: #C0C0C0; + transition: all 0.3s ease; + cursor: pointer; + } + + /* 호버 효과 */ + .text-header-secondary-hover:hover { + color: rgba(255, 255, 255, 0.9) !important; + } + .bg-lg-main-body { background-color: hsl(var(--background)); background-image: linear-gradient( 135deg, - hsl(var(--lg-red-500) / 0.12) 0%, - var(--background) 50%, - hsl(var(--lg-pink-500) / 0.10) 100% + hsl(var(--lg-gray-900) / 0.2) 0%, + var(--background) 30%, + var(--background) 70%, + hsl(var(--lg-gray-900) / 0.2) 100% ); } } diff --git a/src/components/layout/ExcelDownloadButton.tsx b/src/components/layout/ExcelDownloadButton.tsx index bb31dc7..ca708c7 100644 --- a/src/components/layout/ExcelDownloadButton.tsx +++ b/src/components/layout/ExcelDownloadButton.tsx @@ -2,18 +2,24 @@ import { Button } from "@/components/ui/button"; import { useLayoutFilter } from "./LayoutFilterContext"; +import Image from "next/image"; const ExcelDownloadButton = () => { const { requestExcelExport } = useLayoutFilter(); return ( - +
+ excel export +
+ ); }; diff --git a/src/components/layout/Header.tsx b/src/components/layout/Header.tsx index 9720101..c783fd0 100644 --- a/src/components/layout/Header.tsx +++ b/src/components/layout/Header.tsx @@ -30,13 +30,13 @@ const Header = ({ }, [auth.user]) return ( -
+
{/* 로고 */}
브랜드 로고 onNavigate(m.path)} className={cn( - "relative h-10 inline-flex items-center font-semibold transition-colors cursor-pointer", - "content-text-base bg-transparent px-1", + "relative h-8 inline-flex items-center font-bold transition-colors cursor-pointer", + "content-text-lg bg-transparent px-1", active - ? "text-primary" - : "text-secondary-hover" + ? "text-header-primary" + : "text-header-secondary-hover" )} > {m.label} - - {/* 선택 표시(밑줄) */} - {active && ( - - )} ); })}
-

{DASHBOARD_YEAR}년도 가전보급률 Dashboard

+

{DASHBOARD_YEAR}년도 가전보급률 Dashboard

{/* 우측 컨트롤 */}
- {userInfo?.userName || ""} + {userInfo?.userName || ""}