Skip to content

Commit 024d35a

Browse files
committed
added days to upcoming tasks
1 parent 958c6a7 commit 024d35a

2 files changed

Lines changed: 29 additions & 10 deletions

File tree

client/src/components/ui/focus/taskDisplay.tsx

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,40 @@ interface Time {
1616
export default function TaskDisplay({
1717
task,
1818
time,
19-
current
19+
current,
2020
}: {
2121
task: Task;
2222
time: Time;
23-
current: Boolean;
23+
current: boolean;
2424
}) {
2525
return (
26-
<div className={current ? "px-auto m-3 flex flex-auto flex-col rounded-3xl bg-indigo-500 p-4 shadow-md shadow-black/40 outline-3 outline outline-slate-50" : "px-auto m-3 flex flex-auto flex-col rounded-3xl bg-indigo-400 p-4 shadow-md shadow-black/40"}>
27-
<div className="flex flex-auto flex-row gap-4 px-3">
28-
<div>{task.name}:</div>
29-
<div>
30-
{time.start_time} - {time.end_time}
31-
</div>
26+
<div
27+
className={
28+
current
29+
? "px-auto outline-3 m-3 flex flex-auto flex-col rounded-3xl bg-indigo-500 p-4 shadow-md shadow-black/40 outline outline-slate-50"
30+
: "px-auto m-3 flex flex-auto flex-col rounded-3xl bg-indigo-400 p-4 shadow-md shadow-black/40"
31+
}
32+
>
33+
<div className="font-bold">{task.name}</div>
34+
<div>
35+
{time.day === 1
36+
? "Mon"
37+
: time.day === 2
38+
? "Tue"
39+
: time.day === 3
40+
? "Wed"
41+
: time.day === 4
42+
? "Thu"
43+
: time.day === 5
44+
? "Fri"
45+
: time.day === 6
46+
? "Sat"
47+
: time.day === 7
48+
? "Sun"
49+
: ""}{" "}
50+
- {time.start_time} - {time.end_time}
3251
</div>
33-
<div className="px-3 italic">{task.description}</div>
52+
<div className="italic">{task.description}</div>
3453
</div>
3554
);
3655
}

client/src/components/ui/focus/timer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const Timer = (timeRemaining: number) => {
2424
};
2525

2626
return (
27-
<div className="rounded-full bg-indigo-400 p-3 px-8 font-inter text-xl font-semibold">
27+
<div className="w-32 rounded-full bg-indigo-400 p-3 px-8 font-inter text-xl font-semibold">
2828
{formatTime(timeRemaining)}
2929
</div>
3030
);

0 commit comments

Comments
 (0)