From 04a8bf18bfafdf3db7d993727df00bb9f65903fa Mon Sep 17 00:00:00 2001 From: Sinji Date: Wed, 21 May 2025 16:53:21 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=EB=8C=80=EC=8B=9C=EB=B3=B4?= =?UTF-8?q?=EB=93=9C=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=82=B4=20=EC=8B=A0?= =?UTF-8?q?=EC=B2=AD=20=EC=8B=9C=EA=B0=84=20->=20=EB=8C=80=EC=97=AC=20?= =?UTF-8?q?=EC=8B=9C=EA=B0=84=EC=9C=BC=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 --- .../mobile/admin/dashboard/_components/DashboardItem.tsx | 6 +++--- src/app/mobile/admin/dashboard/page.tsx | 2 +- src/types/dashboardType.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/mobile/admin/dashboard/_components/DashboardItem.tsx b/src/app/mobile/admin/dashboard/_components/DashboardItem.tsx index ef74f0f..4a9c8cf 100644 --- a/src/app/mobile/admin/dashboard/_components/DashboardItem.tsx +++ b/src/app/mobile/admin/dashboard/_components/DashboardItem.tsx @@ -9,7 +9,7 @@ export default function DashboardItem({ renterName, studentId, status, - applicatedAt, + rentAt, rentedCount, handleApproveBtnClick, handleCancelBtnClick, @@ -29,7 +29,7 @@ export default function DashboardItem({ handleCancelBtnClick(); }; - const applicatedTime = convertTime(applicatedAt); + const applicatedTime = convertTime(rentAt); return (
@@ -59,7 +59,7 @@ export default function DashboardItem({
-
신청 시간
+
대여 시간
{applicatedTime.formattedDate} {applicatedTime.formattedTime}
diff --git a/src/app/mobile/admin/dashboard/page.tsx b/src/app/mobile/admin/dashboard/page.tsx index 69fc4cc..8afcfe7 100644 --- a/src/app/mobile/admin/dashboard/page.tsx +++ b/src/app/mobile/admin/dashboard/page.tsx @@ -139,7 +139,7 @@ export default function Dashboard() { renterName={item.renterName} studentId={item.studentId} status={item.status} - applicatedAt={item.applicatedAt} + rentAt={item.rentAt} rentedCount={item.rentedCount} handleApproveBtnClick={() => { if (item.rentalHistoryId !== undefined) { diff --git a/src/types/dashboardType.ts b/src/types/dashboardType.ts index 8598a26..5afa7f5 100644 --- a/src/types/dashboardType.ts +++ b/src/types/dashboardType.ts @@ -5,7 +5,7 @@ export interface DashboardProps { renterName: string; studentId: string; status: string; - applicatedAt: string; + rentAt: string; rentedCount: number; handleApproveBtnClick: () => void; handleCancelBtnClick: () => void; From 037c46c643ac6649d6a7f79088a6695592496c6b Mon Sep 17 00:00:00 2001 From: Sinji Date: Sun, 25 May 2025 22:56:07 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=EB=8C=80=EC=8B=9C=EB=B3=B4=EB=93=9C?= =?UTF-8?q?=20=EC=8B=9C=EA=B0=84=20=EC=B4=88=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/mobile/admin/dashboard/_components/DashboardItem.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/mobile/admin/dashboard/_components/DashboardItem.tsx b/src/app/mobile/admin/dashboard/_components/DashboardItem.tsx index 4a9c8cf..a80f549 100644 --- a/src/app/mobile/admin/dashboard/_components/DashboardItem.tsx +++ b/src/app/mobile/admin/dashboard/_components/DashboardItem.tsx @@ -61,7 +61,8 @@ export default function DashboardItem({
대여 시간
- {applicatedTime.formattedDate} {applicatedTime.formattedTime} + {applicatedTime.formattedDate}{' '} + {applicatedTime.formattedTime.split(':').slice(0, 2).join(':')}