Squash

Author: ChinemeremChigbo

hooks/useAbsences.ts

@@ -31,10 +31,6 @@ const convertAbsenceToEvent = (absenceData: AbsenceAPI): EventInput => ({
   reasonOfAbsence: absenceData.reasonOfAbsence,
   notes: absenceData.notes,
   absenceId: absenceData.id,
-  subject: {
-    id: absenceData.subject.id,
-    name: absenceData.subject.name,
-  },
 });
 
 export const useAbsences = () => {

hooks/useUserData.ts

@@ -59,6 +59,5 @@ export const useUserData = (): UseUserDataReturn => {
     usedAbsences: fetchedUserData?.usedAbsences ?? 0,
     isAuthenticated: status === 'authenticated',
     isLoading,
-    numOfAbsences: 0,
   };
 };

src/components/AbsenceDetails.tsx

@@ -116,7 +116,13 @@ const AbsenceDetails: React.FC<AbsenceDetailsProps> = ({
   };
   return (
     <>
-      <Modal isOpen={isOpen} onClose={onClose} size="lg" isCentered>
+      <Modal
+        isOpen={isOpen}
+        onClose={onClose}
+        size="lg"
+        isCentered
+        blockScrollOnMount={false}
+      >
         <ModalContent
           width="362px"
           borderRadius="15px"

src/pages/calendar.tsx

@@ -108,9 +108,15 @@ const Calendar: React.FC = () => {
         lessonPlan,
       } = eventInfo.event.extendedProps;
 
-      const eventDate = new Date(eventInfo.event.startStr);
-      const isPastEvent = eventDate < new Date();
-      const opacity = isPastEvent ? 0.7 : 1;
+      const eventDate = new Date(eventInfo.event.start!!);
+      const now = new Date();
+      const isSameDay =
+        eventDate.getFullYear() === now.getFullYear() &&
+        eventDate.getMonth() === now.getMonth() &&
+        eventDate.getDate() === now.getDate();
+      const isPastEvent = eventDate < now && !isSameDay;
+
+      const opacity = isPastEvent ? 0.6 : 1;
       const createdByUser = absentTeacher.id === userData?.id;
 
       const highlightText = createdByUser

utils/types.ts

@@ -9,7 +9,6 @@ export interface Absence {
   substituteTeacherId?: number;
   locationId: number;
   subjectId: number;
-  lessonPlan?: string | null;
 }
 
 export interface LessonPlanFile {
@@ -34,7 +33,6 @@ export interface EventDetails {
   reasonOfAbsence: string;
   notes: string;
   absenceId: number;
-  subject: { id: number; name: string } | null;
 }
 
 export interface AbsenceAPI {
@@ -193,37 +191,3 @@ export interface FilterOptions {
   absencesValue: number | null;
   disabledTags?: string[] | null;
 }
-
-export interface AbsenceUpdate {
-  lessonDate?: Date | string;
-  lessonPlan?: string | null;
-  reasonOfAbsence?: string;
-  notes?: string | null;
-  roomNumber?: string | null;
-  substituteTeacher?: {
-    firstName: string;
-    lastName: string;
-    id: number;
-  } | null;
-  absentTeacher?: {
-    firstName: string;
-    lastName: string;
-    id: number;
-  } | null;
-  location?: {
-    id: number;
-    name: string;
-  } | null;
-  subject?: {
-    id: number;
-    name: string;
-    abbreviation: string;
-    colorGroup: {
-      colorCodes: string[];
-    };
-  } | null;
-  absentTeacherId?: number;
-  substituteTeacherId?: number;
-  locationId?: number;
-  subjectId?: number;
-}