Skip to content

Commit 15a2c9a

Browse files
authored
Merge pull request #134 from billilge/refactor/#132-change-dashboard-rental-time
2 parents f65ce32 + 037c46c commit 15a2c9a

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

src/app/mobile/admin/dashboard/_components/DashboardItem.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export default function DashboardItem({
99
renterName,
1010
studentId,
1111
status,
12-
applicatedAt,
12+
rentAt,
1313
rentedCount,
1414
handleApproveBtnClick,
1515
handleCancelBtnClick,
@@ -29,7 +29,7 @@ export default function DashboardItem({
2929
handleCancelBtnClick();
3030
};
3131

32-
const applicatedTime = convertTime(applicatedAt);
32+
const applicatedTime = convertTime(rentAt);
3333

3434
return (
3535
<section className="flex w-full items-center justify-between px-5 py-4">
@@ -59,9 +59,10 @@ export default function DashboardItem({
5959
</section>
6060

6161
<section className="flex gap-1">
62-
<div className="flex w-10">신청 시간</div>
62+
<div className="flex w-10">대여 시간</div>
6363
<div className="">
64-
{applicatedTime.formattedDate} {applicatedTime.formattedTime}
64+
{applicatedTime.formattedDate}{' '}
65+
{applicatedTime.formattedTime.split(':').slice(0, 2).join(':')}
6566
</div>
6667
</section>
6768
</section>

src/app/mobile/admin/dashboard/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ export default function Dashboard() {
139139
renterName={item.renterName}
140140
studentId={item.studentId}
141141
status={item.status}
142-
applicatedAt={item.applicatedAt}
142+
rentAt={item.rentAt}
143143
rentedCount={item.rentedCount}
144144
handleApproveBtnClick={() => {
145145
if (item.rentalHistoryId !== undefined) {

src/types/dashboardType.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export interface DashboardProps {
55
renterName: string;
66
studentId: string;
77
status: string;
8-
applicatedAt: string;
8+
rentAt: string;
99
rentedCount: number;
1010
handleApproveBtnClick: () => void;
1111
handleCancelBtnClick: () => void;

0 commit comments

Comments
 (0)