From 7348a412018e5feef43b485f33ce79ef97c2ff52 Mon Sep 17 00:00:00 2001 From: MinJi Cho Date: Fri, 4 Apr 2025 15:58:07 +0900 Subject: [PATCH 001/144] =?UTF-8?q?[Style]=20mydashboard:=20=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=EC=95=84=EC=9B=83=20=EC=97=AC=EB=B0=B1=20=EC=A1=B0?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/button/CardButton.tsx | 2 +- src/components/button/DashboardAddButton.tsx | 2 +- src/pages/mydashboard.tsx | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/button/CardButton.tsx b/src/components/button/CardButton.tsx index a60009b6..8724e45f 100644 --- a/src/components/button/CardButton.tsx +++ b/src/components/button/CardButton.tsx @@ -64,7 +64,7 @@ const CardButton: React.FC = ({ "border border-[var(--color-gray3)]", "min-w-0 w-full max-w-[260px] md:max-w-[247px] lg:max-w-[332px]", "h-[58px] md:h-[68px] lg:h-[70px]", - "mt-[10px] md:mt-[16px] lg:mt-[20px]", + "mt-[2px]", // 카드 세로 간격 "text-lg md:text-2lg lg:text-2lg", isEditMode ? "cursor-default hover:border-gray-300" diff --git a/src/components/button/DashboardAddButton.tsx b/src/components/button/DashboardAddButton.tsx index c0683c95..3b699e1b 100644 --- a/src/components/button/DashboardAddButton.tsx +++ b/src/components/button/DashboardAddButton.tsx @@ -13,7 +13,7 @@ const DashboardAddButton: React.FC< "border border-gray-300 hover:border-purple-500", "min-w-0 w-full max-w-[260px] md:max-w-[247px] lg:max-w-[332px]", // 반응형 너비 "h-[58px] md:h-[68px] lg:h-[70px]", // 반응형 높이 - "mt-[10px] md:mt-[16px] lg:mt-[20px]", // 여백 + "mt-[2px]", // 여백 "text-lg md:text-2lg lg:text-2lg", "cursor-pointer", className diff --git a/src/pages/mydashboard.tsx b/src/pages/mydashboard.tsx index 62666162..cd35e221 100644 --- a/src/pages/mydashboard.tsx +++ b/src/pages/mydashboard.tsx @@ -144,10 +144,10 @@ export default function MyDashboardPage() { onToggleEditMode={() => setIsEditMode((prev) => !prev)} /> -
+
{/* 검색 입력창 */}
-
+
-
+
{currentItems.map((item, index) => (
{item}
))}
{totalPages > 1 && ( -
+
{`${totalPages} 페이지 중 ${currentPage}`} @@ -196,7 +196,7 @@ export default function MyDashboardPage() { {/* 초대받은 대시보드 */}
-
+
From 38bedfef2068425415274e7e1b43bf1abbaad436 Mon Sep 17 00:00:00 2001 From: MinJi Cho Date: Fri, 4 Apr 2025 16:01:52 +0900 Subject: [PATCH 002/144] =?UTF-8?q?[Style]=20mydashboard:=20=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=EC=95=84=EC=9B=83=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/mydashboard.tsx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/pages/mydashboard.tsx b/src/pages/mydashboard.tsx index cd35e221..eefd4242 100644 --- a/src/pages/mydashboard.tsx +++ b/src/pages/mydashboard.tsx @@ -168,8 +168,8 @@ export default function MyDashboardPage() {
- {/* 카드 영역 */}
+ {/* 카드 영역 */}
{currentItems.map((item, index) => (
{item}
@@ -192,10 +192,7 @@ export default function MyDashboardPage() { />
)} -
- - {/* 초대받은 대시보드 */} -
+ {/* 초대받은 대시보드 */}
From 9ab012c10510e58bdc7171516651b246707de3db Mon Sep 17 00:00:00 2001 From: MinJi Cho Date: Fri, 4 Apr 2025 16:17:22 +0900 Subject: [PATCH 003/144] =?UTF-8?q?[Style]=20mydashboard:=20=EB=AA=A8?= =?UTF-8?q?=EB=B0=94=EC=9D=BC=20=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=20?= =?UTF-8?q?=EC=83=81=ED=95=98=EB=8B=A8=20=EC=97=AC=EB=B0=B1=20=EA=B0=90?= =?UTF-8?q?=EC=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/mydashboard.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/mydashboard.tsx b/src/pages/mydashboard.tsx index eefd4242..d4af3bf0 100644 --- a/src/pages/mydashboard.tsx +++ b/src/pages/mydashboard.tsx @@ -144,7 +144,7 @@ export default function MyDashboardPage() { onToggleEditMode={() => setIsEditMode((prev) => !prev)} /> -
+
{/* 검색 입력창 */}
From 9e93adb2810c196efbcf24f0ae4acb42c61373d2 Mon Sep 17 00:00:00 2001 From: MinJi Cho Date: Fri, 4 Apr 2025 16:35:31 +0900 Subject: [PATCH 004/144] =?UTF-8?q?[Style]=20mydashboard:=20=ED=85=8D?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8,=20=EC=95=84=EC=9D=B4=EC=BD=98=20=EB=B0=98?= =?UTF-8?q?=EC=9D=91=ED=98=95=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/button/CardButton.tsx | 23 ++++++++++--------- src/components/button/DashboardAddButton.tsx | 6 ++--- src/components/gnb/HeaderDashboard.tsx | 4 ++-- .../table/invited/InvitedDashBoard.tsx | 2 +- src/pages/mydashboard.tsx | 2 +- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/components/button/CardButton.tsx b/src/components/button/CardButton.tsx index 8724e45f..a9c4c0f9 100644 --- a/src/components/button/CardButton.tsx +++ b/src/components/button/CardButton.tsx @@ -73,27 +73,28 @@ const CardButton: React.FC = ({ )} > {/* 왼쪽: 색상 도트 + 제목 + 왕관 */} -
+
{/* 색상 원 */} {/* 제목 */} - + {title} {/* 왕관 */} - {showCrown && ( - crown Icon - )} +
+ {showCrown && ( + crown Icon + )} +
{/* 오른쪽: 화살표 아이콘 or 수정/삭제 버튼 */} diff --git a/src/components/button/DashboardAddButton.tsx b/src/components/button/DashboardAddButton.tsx index 3b699e1b..38fb5358 100644 --- a/src/components/button/DashboardAddButton.tsx +++ b/src/components/button/DashboardAddButton.tsx @@ -9,12 +9,12 @@ const DashboardAddButton: React.FC< ); diff --git a/src/components/gnb/HeaderDashboard.tsx b/src/components/gnb/HeaderDashboard.tsx index 9944a903..284ac19e 100644 --- a/src/components/gnb/HeaderDashboard.tsx +++ b/src/components/gnb/HeaderDashboard.tsx @@ -135,10 +135,10 @@ const HeaderDashboard: React.FC = ({ )} {/*헤더 제목*/} -
+

-

+

초대받은 대시보드

diff --git a/src/pages/mydashboard.tsx b/src/pages/mydashboard.tsx index d4af3bf0..1a456d17 100644 --- a/src/pages/mydashboard.tsx +++ b/src/pages/mydashboard.tsx @@ -177,7 +177,7 @@ export default function MyDashboardPage() {
{totalPages > 1 && (
- + {`${totalPages} 페이지 중 ${currentPage}`} Date: Mon, 7 Apr 2025 18:22:11 +0900 Subject: [PATCH 005/144] =?UTF-8?q?[Style,=20Refactor]=20SideMenu=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=9D=B4=EB=8F=99=20=EC=8B=9C=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=EB=84=A4=EC=9D=B4=EC=85=98=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=9D=B4=EB=8F=99=20=ED=98=84=EC=83=81=20?= =?UTF-8?q?=EC=88=98=EC=A0=95,=20=EC=A0=84=EC=B2=B4=20=EB=B0=B0=EA=B2=BD?= =?UTF-8?q?=EC=83=89=20=EC=97=B0=EB=B3=B4=EB=9D=BC=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/columnCard/Column.tsx | 2 +- src/components/gnb/HeaderDashboard.tsx | 3 ++- src/components/sideMenu/SideMenu.tsx | 18 +++++++++--------- src/pages/dashboard/[dashboardId]/edit.tsx | 2 +- src/pages/dashboard/[dashboardId]/index.tsx | 4 ++-- src/pages/mydashboard.tsx | 2 +- src/pages/mypage.tsx | 2 +- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/components/columnCard/Column.tsx b/src/components/columnCard/Column.tsx index 3150e957..2cffee93 100644 --- a/src/components/columnCard/Column.tsx +++ b/src/components/columnCard/Column.tsx @@ -100,7 +100,7 @@ export default function Column({ return (
= ({

-