Skip to content

Commit 24e2fc6

Browse files
PrecipiceePrecipicee
authored
Merge pull request #11 from codersforcauses/issue-4-Create_Focus_Page
Issue 4 create focus page
2 parents 6560fe2 + cb17af6 commit 24e2fc6

10 files changed

Lines changed: 459 additions & 1 deletion

File tree

‎client/src/components/ui/focus/currentTaskTitle.tsx‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import React from "react";
2+
3+
export default function CurrentTaskTitle(task_name: string) {
4+
return (
5+
<div className="m-3 flex flex-col items-center justify-center rounded-3xl bg-slate-900 p-10 shadow-xl shadow-black/40">
6+
<h1 className="mb-2 font-inter text-4xl font-semibold">Current Focus</h1>
7+
<div className="rounded-full bg-indigo-400 p-3 px-8 font-inter text-xl font-semibold">
8+
{task_name}
9+
</div>
10+
</div>
11+
);
12+
}

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
interface Task {
2+
id: number;
3+
name: string;
4+
description: string;
5+
}
6+
7+
interface Time {
8+
id: number;
9+
day: number;
10+
start_time: string;
11+
end_time: string;
12+
repeating: boolean;
13+
task: number;
14+
}
15+
16+
export default function TaskDisplay({
17+
task,
18+
time,
19+
}: {
20+
task: Task;
21+
time: Time;
22+
}) {
23+
return (
24+
<div className="px-auto m-3 flex flex-auto flex-col rounded-3xl bg-indigo-400 p-4 shadow-md shadow-black/40">
25+
<div className="flex flex-auto flex-row gap-4 px-3">
26+
<div>{task.name}:</div>
27+
<div>
28+
{time.start_time} - {time.end_time}
29+
</div>
30+
</div>
31+
<div className="px-3 italic">{task.description}</div>
32+
</div>
33+
);
34+
}

‎client/src/components/ui/focus/timeDisplay.tsx‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
import React, { useEffect, useState } from "react";
2+
3+
import Timer from "./timer";
4+
5+
interface TimeDisplayProps {
6+
statusSignal: (data: string) => void;
7+
time: string;
8+
current: boolean;
9+
}
10+
11+
export default function TimeDisplay({
12+
statusSignal,
13+
time,
14+
current,
15+
}: TimeDisplayProps) {
16+
const [timeRemaining, setTimeRemaining] = useState(0);
17+
18+
useEffect(() => {
19+
const getTimeRemaining = setInterval(() => {
20+
const [Hours, Mins, Sec] = time.split(":").map(Number);
21+
22+
const d = new Date();
23+
const time_serial = Hours * 60 * 60 + Mins * 60 + Sec;
24+
const cur_time =
25+
d.getHours() * 60 * 60 + d.getMinutes() * 60 + d.getSeconds();
26+
27+
let remaining_time = 0;
28+
29+
remaining_time = time_serial - cur_time;
30+
if (remaining_time <= 1) {
31+
clearInterval(getTimeRemaining);
32+
}
33+
34+
setTimeRemaining(remaining_time);
35+
}, 1000);
36+
37+
return () => clearInterval(getTimeRemaining);
38+
}, [time, timeRemaining]);
39+
40+
useEffect(() => {
41+
if (timeRemaining <= 1) {
42+
statusSignal("finished");
43+
}
44+
}, [timeRemaining, statusSignal]);
45+
46+
return (
47+
<div className="m-3 flex flex-col items-center justify-center rounded-3xl bg-slate-900 p-10 shadow-xl shadow-black/40">
48+
{current ? (
49+
<>
50+
<h1 className="mb-2 font-inter text-4xl font-semibold">Timer</h1>
51+
</>
52+
) : (
53+
<>
54+
<h1 className="mb-2 font-inter text-4xl font-semibold">Next Task</h1>
55+
</>
56+
)}
57+
<div className="time_left">{Timer(timeRemaining)}</div>
58+
<div></div>
59+
</div>
60+
);
61+
}

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
const Timer = (timeRemaining: number) => {
2+
const formatTime = (time: number) => {
3+
const seconds = Math.floor(time % 60);
4+
const minutes = Math.floor((time / 60) % 60);
5+
const hours = Math.floor((time / (60 * 60)) % 24);
6+
7+
return (
8+
<div className="countdown-display">
9+
<div className="countdown-value">
10+
{hours > 0 ? (
11+
<>
12+
{hours.toString()}
13+
<span>:</span>
14+
</>
15+
) : (
16+
<></>
17+
)}
18+
{minutes.toString().padStart(2, "0")}
19+
<span>:</span>
20+
{seconds.toString().padStart(2, "0")}
21+
</div>
22+
</div>
23+
);
24+
};
25+
26+
return (
27+
<div className="rounded-full bg-indigo-400 p-3 px-8 font-inter text-xl font-semibold">
28+
{formatTime(timeRemaining)}
29+
</div>
30+
);
31+
};
32+
33+
export default Timer;

‎client/src/components/ui/focus/upcomingTasks.tsx‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
import { useEffect, useState } from "react";
2+
3+
import TaskDisplay from "./taskDisplay";
4+
5+
interface Task {
6+
id: number;
7+
name: string;
8+
description: string;
9+
}
10+
11+
interface Time {
12+
id: number;
13+
day: number;
14+
start_time: string;
15+
end_time: string;
16+
repeating: boolean;
17+
task: number;
18+
}
19+
20+
interface Tasks {
21+
tasks: Task[];
22+
times: Time[];
23+
}
24+
25+
function serializeTime(time: string) {
26+
const [Hours, Mins, Sec] = time.split(":").map(Number);
27+
return Hours * 60 * 60 + Mins * 60 + Sec;
28+
}
29+
30+
export default function UpcomingTasks({ tasks, times }: Tasks) {
31+
const [upcomingTimes, setUpcomingTimes] = useState<Time[]>([]);
32+
33+
useEffect(() => {
34+
function sortTimes() {
35+
const d = new Date();
36+
const cur_time =
37+
d.getHours() * 60 * 60 + d.getMinutes() * 60 + d.getSeconds();
38+
const cur_d = d.getDay();
39+
let ut = times.filter(
40+
(time) =>
41+
!(cur_d == time.day && serializeTime(time.end_time) <= cur_time),
42+
);
43+
44+
ut = ut.sort((a, b) => {
45+
return (
46+
serializeTime(a.start_time) +
47+
((a.day + 8 - cur_d) % 8) * 24 * 60 * 60 -
48+
(serializeTime(b.start_time) +
49+
((b.day + 8 - cur_d) % 8) * 24 * 60 * 60)
50+
);
51+
});
52+
setUpcomingTimes(ut);
53+
}
54+
55+
sortTimes();
56+
}, [times, tasks]);
57+
58+
return (
59+
<div className="rounded-2xl bg-slate-900 p-2 py-3 shadow-xl shadow-black/40">
60+
<div className="scrollbar h-[285px] w-96 overflow-y-auto overflow-x-hidden">
61+
{upcomingTimes.map((time: Time) => (
62+
<TaskDisplay
63+
task={tasks.filter((task) => task.id === time.task)[0]}
64+
time={time}
65+
key={time.id}
66+
/>
67+
))}
68+
</div>
69+
</div>
70+
);
71+
}

‎client/src/components/ui/refresh.tsx‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
interface requi {
2+
loading: boolean;
3+
update: () => void;
4+
}
5+
6+
export default function Refresh({ loading, update }: requi) {
7+
return (
8+
<div>
9+
{loading ? (
10+
<div>
11+
<button
12+
disabled
13+
type="button"
14+
className="focus:ring-brand-medium shadow-xs rounded-base box-border inline-flex items-center rounded-full border border-transparent bg-indigo-500 px-4 py-2.5 text-sm font-medium leading-5 hover:bg-indigo-600 focus:outline-none focus:ring-4"
15+
>
16+
<svg
17+
aria-hidden="true"
18+
role="status"
19+
className="me-2 h-4 w-4 animate-spin text-white"
20+
viewBox="0 0 100 101"
21+
fill="none"
22+
xmlns="http://www.w3.org/2000/svg"
23+
>
24+
<path
25+
d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
26+
fill="#E5E7EB"
27+
/>
28+
<path
29+
d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
30+
fill="currentColor"
31+
/>
32+
</svg>
33+
Loading...
34+
</button>
35+
</div>
36+
) : (
37+
<button
38+
onClick={update}
39+
className="rounded-full bg-indigo-400 p-3 px-8 hover:bg-indigo-500"
40+
>
41+
refresh
42+
</button>
43+
)}
44+
</div>
45+
);
46+
}

0 commit comments

Comments
 (0)