Merge pull request #86 from sqrl-planner/develop

Clean up dark text code and close issue #84
sqrl-planner · Jun 27, 2022 · 2a3fada · 2a3fada
2 parents 75d46c2 + cfe9e86
commit 2a3fada
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 23 deletions.
diff --git a/components/sidebar/OverviewView.tsx b/components/sidebar/OverviewView.tsx
@@ -195,6 +195,7 @@ const OverviewView = () => {
 
                 {coursesToShow[term].map((identifier: string) => {
                   const course = courses[identifier]
+                  if(!course) return
                   const { department, numeral, suffix } = breakdownCourseCode(
                     course.code
                   )

diff --git a/components/timetable/Timetable.tsx b/components/timetable/Timetable.tsx
@@ -330,27 +330,21 @@ export const Timetable = ({
                 }}
               >
                 {!abstract && (
+                  // Situations where we should show dark text:
+                  // - Light mode conflict:
+                  //   - !highlightConflicts
+                  //   - meeting.identifier === sidebarCourse
+                  //   - emphasizeOnHover AND
+                  //     - hoverCourseKey === meeting.courseKey
+                  // - Dark mode conflict: NEVER
+
                   <MeetingComponent
-                    style={{
-                      color: !dark
-                        ? hoverCourseKey === meeting.courseKey &&
-                          emphasizeOnHover
-                          ? "black"
-                          : meeting.identifier === sidebarCourse
-                          ? "black"
-                          : "white"
-                        : "white",
-                    }}
                     darkText={
-                      !(dark || highlightConflicts) ||
-                      (emphasizeOnHover &&
-                        hoverCourseKey === meeting.courseKey &&
-                        !dark) ||
-                      (meeting.identifier === hoverMeeting.courseIdentifier &&
-                        hoverMeeting.meeting.substring(0, 3) ===
-                          meeting.category.substring(0, 3).toUpperCase() &&
-                        !dark)
-                      //  || meeting.identifier === sidebarCourse
+                      !dark &&
+                      (!highlightConflicts ||
+                        meeting.identifier === sidebarCourse ||
+                        (emphasizeOnHover &&
+                          hoverCourseKey === meeting.courseKey))
                     }
                     meeting={meeting}
                     twentyFour={twentyFour}

diff --git a/src/utils/course.ts b/src/utils/course.ts
@@ -71,13 +71,13 @@ export const getSectionType = (section: string) => {
 }
 
 export const getMeetingTypes = (course: Course) => ({
-  lecture: course.sections.some(
+  lecture: course?.sections.some(
     (section) => section.teachingMethod === "LECTURE"
   ),
-  tutorial: course.sections.some(
+  tutorial: course?.sections.some(
     (section) => section.teachingMethod === "TUTORIAL"
   ),
-  practical: course.sections.some(
+  practical: course?.sections.some(
     (section) => section.teachingMethod === "PRACTICAL"
   ),
 })
@@ -105,6 +105,6 @@ export const meetingsMissing = (
 }
 
 export const courseIsForCredit = (course: Course) => {
-  if (course.description.includes("does not carry credit weight")) return false
+  if (course?.description.includes("does not carry credit weight")) return false
   return true
 }