From c213ad88580f6788d5aa1908b5945f27556e2b9b Mon Sep 17 00:00:00 2001 From: Musix Date: Wed, 29 Nov 2023 18:50:13 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=92=84=20Style(#294):=20=EB=82=B4=20?= =?UTF-8?q?=EC=8B=A0=EC=B2=AD=EC=84=9C=20=EB=B0=98=EC=9D=91=ED=98=95=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../(user-menu)/mypage/application/page.tsx | 34 ++++++------ src/app/(user-menu)/mypage/layout.tsx | 4 +- src/components/_common/SideBar/index.tsx | 4 +- src/components/_common/TabBar/index.tsx | 54 +++++++++++++++++++ 4 files changed, 76 insertions(+), 20 deletions(-) create mode 100644 src/components/_common/TabBar/index.tsx diff --git a/src/app/(user-menu)/mypage/application/page.tsx b/src/app/(user-menu)/mypage/application/page.tsx index 4359b65a..24360fbc 100644 --- a/src/app/(user-menu)/mypage/application/page.tsx +++ b/src/app/(user-menu)/mypage/application/page.tsx @@ -38,19 +38,19 @@ const MyApplicationPage = () => { return (
-
+
내 신청서 관리 -
-
-
+
+
+
승인
-
-
+
+
거절
-
-
+
+
대기
@@ -76,24 +76,24 @@ const MyApplicationPage = () => { >
{application.status === "ACCEPTED" ? ( -
+
{application.steadyName} -
+
) : application.status === "REJECTED" ? ( -
+
{application.steadyName} -
+
) : ( -
+
{application.steadyName} -
+
)}
-
+
제출일 {application.createdAt.slice(0, 10)}
{ >
diff --git a/src/app/(user-menu)/mypage/layout.tsx b/src/app/(user-menu)/mypage/layout.tsx index c9e9b4e9..f991b1b0 100644 --- a/src/app/(user-menu)/mypage/layout.tsx +++ b/src/app/(user-menu)/mypage/layout.tsx @@ -1,4 +1,5 @@ import SideBar from "@/components/_common/SideBar"; +import TabBar from "@/components/_common/TabBar"; const myPageList = [ { @@ -21,11 +22,12 @@ const myPageList = [ const MyPageLayout = ({ children }: { children: React.ReactNode }) => { return ( -
+
+ {children}
); diff --git a/src/components/_common/SideBar/index.tsx b/src/components/_common/SideBar/index.tsx index 172dfbd2..f4d081e1 100644 --- a/src/components/_common/SideBar/index.tsx +++ b/src/components/_common/SideBar/index.tsx @@ -46,8 +46,8 @@ const SideBar = ({ >
{ + const path = usePathname(); + + return ( +
+ +
+ 내 프로필 +
+ + +
+ 내 템플릿 +
+ + +
+ 내 신청서 관리 +
+ + +
+ 내가 받은 리뷰 +
+ +
+ ); +}; + +export default TabBar; From f8c023d9bb35e5cbff23e55d3e2df7686c3dc250 Mon Sep 17 00:00:00 2001 From: Musix Date: Thu, 30 Nov 2023 16:24:20 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=93=9D=20Chore(#291):=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EB=A6=AC=EB=B7=B0=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(user-menu)/mypage/layout.tsx | 2 +- src/components/{_common => }/TabBar/index.tsx | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/components/{_common => }/TabBar/index.tsx (100%) diff --git a/src/app/(user-menu)/mypage/layout.tsx b/src/app/(user-menu)/mypage/layout.tsx index f991b1b0..3424a18f 100644 --- a/src/app/(user-menu)/mypage/layout.tsx +++ b/src/app/(user-menu)/mypage/layout.tsx @@ -1,5 +1,5 @@ +import TabBar from "@/components/TabBar"; import SideBar from "@/components/_common/SideBar"; -import TabBar from "@/components/_common/TabBar"; const myPageList = [ { diff --git a/src/components/_common/TabBar/index.tsx b/src/components/TabBar/index.tsx similarity index 100% rename from src/components/_common/TabBar/index.tsx rename to src/components/TabBar/index.tsx