Skip to content

Commit c61a6f1

Browse files
author
belledw
committed
all task data now fetched from backend
1 parent d26998a commit c61a6f1

1 file changed

Lines changed: 26 additions & 16 deletions

File tree

client/src/components/ui/pet-task-carousel.tsx

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,26 @@ export function TaskCarousel() {
5151

5252
function formatDueDate(id: number, type: "day" | "time") {
5353
const due = getTaskInfo(id, "due") || "";
54-
const newDue = due.slice(0, 10);
55-
const date = new Date(newDue);
56-
const newDate = date.toString();
5754

5855
if (type === "day") {
56+
const newDue = due.slice(0, 10);
57+
const date = new Date(newDue);
58+
const newDate = date.toString();
5959
const finalDate = newDate.slice(0, 16);
6060
return finalDate;
6161
} else if (type === "time") {
62-
const finalTime = newDate.slice(16, 21);
63-
return finalTime;
62+
const time = due.slice(11, -4);
63+
const convertHour = Number(time.slice(0, 2));
64+
if (convertHour > 12) {
65+
const finalTime = (convertHour - 12).toString() + time.slice(2) + " pm";
66+
return finalTime;
67+
} else if (time.startsWith("0")) {
68+
const finalTime = time.slice(1) + " am";
69+
return finalTime;
70+
} else {
71+
const finalTime = time + " am";
72+
return finalTime;
73+
}
6474
}
6575
}
6676

@@ -83,43 +93,43 @@ export function TaskCarousel() {
8393
</CarouselItem>
8494
<CarouselItem key={2} className="basis-sm lg:basis-md -ml-10 mr-5">
8595
<TaskCard
86-
date="Wednesday, July 7th, 2025"
87-
title="Flea Medicine"
96+
date={formatDueDate(2, "day") || ""}
97+
title={getTaskInfo(2, "title") || ""}
8898
usrImg=""
8999
usrAlt="@username"
90100
usrColour="bg-blue-200"
91101
usrInit="IT"
92102
usrName="Someone"
93103
usrAssignee="exampletask1"
94-
time="5:00 pm"
104+
time={formatDueDate(2, "time") || ""}
95105
/>
96106
</CarouselItem>
97107
<CarouselItem key={3} className="basis-sm lg:basis-md -ml-10 mr-5">
98108
<TaskCard
99-
date="Wednesday, September 24th, 2025"
100-
title="Long Title Long Title Long Title Long Title Long Title"
109+
date={formatDueDate(3, "day") || ""}
110+
title={getTaskInfo(3, "title") || ""}
101111
usrImg=""
102112
usrAlt="@username"
103113
usrColour="bg-emerald-200"
104114
usrInit="CS"
105115
usrName="Someone Else Long Name"
106116
usrAssignee="exampletask2"
107-
time="10:00 pm"
108-
descr="50.0 g x Premium Cat Biscuits 50.0 g x Premium Cat Biscuits 50.0 g x Premium Cat Biscuits 50.0 g x Premium Cat Biscuits 50.0 g x Premium Cat Biscuits"
117+
time={formatDueDate(3, "time") || ""}
118+
descr={getTaskInfo(3, "descr") || ""}
109119
/>
110120
</CarouselItem>
111121
<CarouselItem key={4} className="basis-sm lg:basis-md -ml-10 mr-5">
112122
<TaskCard
113-
date="Wednesday, July 7th, 2025"
114-
title="Feed Spaghetti"
123+
date={formatDueDate(4, "day") || ""}
124+
title={getTaskInfo(4, "title") || ""}
115125
usrImg=""
116126
usrAlt="@username"
117127
usrColour="bg-gray-200"
118128
usrInit="CS"
119129
usrName="You"
120130
usrAssignee="exampletask3"
121-
time="5:00 pm"
122-
descr="50.0 g x Premium Cat Biscuits"
131+
time={formatDueDate(4, "time") || ""}
132+
descr={getTaskInfo(4, "descr") || ""}
123133
/>
124134
</CarouselItem>
125135
</CarouselContent>

0 commit comments

Comments
 (0)