Skip to content

Commit 6382940

Browse files
committed
chore: overview changes
1 parent e44e963 commit 6382940

3 files changed

Lines changed: 40 additions & 25 deletions

File tree

client/src/Components/Calendar/Overview.tsx

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ import { useCourseOverviewQuery } from '../../generated/graphql';
44
//package for date format
55
import moment from 'moment';
66

7+
const overviewStyle = "flex flex-col m-auto bg-white w-11/12 md:w-10/12 lg:w-9/12 xl:w-7/12 shadow-xl mt-8";
8+
const headerStyle = "flex bg-green shadow-md p-4 justify-center text-white text-md sm:text-lg md:text-xl";
9+
const historyStyle = "flex flex-row flex-wrap justify-start w-full";
10+
711
const Overview: React.FC = () => {
812
const courseId = Number(useParams().courseId);
913
const [{ fetching, data, error }] = useCourseOverviewQuery({
@@ -22,26 +26,33 @@ const Overview: React.FC = () => {
2226
console.log('history: ', history);
2327
return (
2428
<div>
25-
<h3>Students assigned to this course: {total}</h3>
26-
<section className="flex flex-row flex-wrap justify-evenly w-5/6">
27-
{!!sessions &&
28-
sessions.map((session) => {
29-
if (session) {
30-
const date = new Date(Number(session.createdAt));
31-
const UTCdate = date.toUTCString();
32-
return (
33-
<div className="w-1/3 p-2 text-center">
34-
<Link to={`/homepage/classes/${courseId}/${session.id}`}>
35-
<div>
36-
<h5 className="text-lg">{session.attendance}</h5>
37-
<p>{moment(UTCdate).format('L')}</p>
29+
<div className={overviewStyle}>
30+
<header>
31+
<h3 className={headerStyle}>Students assigned to this course: {total}</h3>
32+
</header>
33+
<article className="flex flex-col justify-center">
34+
<p className="m-auto text-xl">Attendance</p>
35+
<section className={historyStyle}>
36+
{!!sessions &&
37+
sessions.map((session) => {
38+
if (session) {
39+
const date = new Date(Number(session.createdAt));
40+
const UTCdate = date.toUTCString();
41+
return (
42+
<div className="w-26 p-2 md:w-32 text-center border-2 border-black m-1 hover:bg-green-xlight">
43+
<Link to={`/homepage/classes/${courseId}/${session.id}`}>
44+
<div>
45+
<h5 className="text-lg sm:text-xl">{session.attendance}</h5>
46+
<p className="text-sm sm:text-md">{moment(UTCdate).format('L')}</p>
47+
</div>
48+
</Link>
3849
</div>
39-
</Link>
40-
</div>
41-
);
42-
}
43-
})}
44-
</section>
50+
);
51+
}
52+
})}
53+
</section>
54+
</article>
55+
</div>
4556
</div>
4657
);
4758
};

client/src/Components/Calendar/SessionHistory.tsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import { useParams } from 'react-router';
33
import { Link } from 'react-router-dom';
44
import { useSessionAttendanceQuery } from '../../generated/graphql';
55

6+
const btnStyle = "bg-green text-white p-4 shadow-md";
7+
68
const SessionHistory: React.FC = () => {
79
const courseId = Number(useParams().courseId);
810
const sessionId = Number(useParams().sessionId);
@@ -21,9 +23,11 @@ const SessionHistory: React.FC = () => {
2123
return (
2224
<div>
2325
{/* button back to overview */}
24-
<Link to={`/homepage/classes/${courseId}/history`}>
25-
<button>Back to history overview</button>
26-
</Link>
26+
<footer className="flex justify-center">
27+
<Link to={`/homepage/classes/${courseId}/history`}>
28+
<button className={btnStyle}>Back to history overview</button>
29+
</Link>
30+
</footer>
2731
{/* student list for this session */}
2832
{/* each student is clickable to get individual attendance */}
2933
</div>

client/src/Components/ClassView/ClassView.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import Overview from '../Calendar/Overview';
99

1010
const headerStyle =
1111
'bg-black text-white flex flex-row justify-between items-center content-center p-8 h-20 mb-4 text-3xl';
12-
const attendanceStyle = 'flex justify-center bg-black hover:bg-green-light py-4 rounded-sm font-bold text-lg mb-4 w-1/3 m-auto text-white';
12+
const attendanceStyle = 'flex justify-center bg-black hover:bg-green-light py-4 rounded-sm font-bold text-lg mb-4 w-1/3 text-white ';
1313

1414
const ClassView: React.FC = () => {
1515
const dispatch = useDispatch();
@@ -34,8 +34,7 @@ const ClassView: React.FC = () => {
3434
</button>
3535
</Link>
3636
</div>
37-
<article className="">
38-
{history ? <Outlet /> : <ClassDashboard courseId={courseId} />}
37+
<article className="flex self-end">
3938
<Link to={link} className={attendanceStyle}>
4039
<h3
4140
className="text-lg"
@@ -45,6 +44,7 @@ const ClassView: React.FC = () => {
4544
</h3>
4645
</Link>
4746
</article>
47+
{history ? <Outlet /> : <ClassDashboard courseId={courseId} />}
4848
</section>
4949
);
5050
}

0 commit comments

Comments
 (0)