update to run with pnpm

remove Harmony update About with Team 2023's information
senior-knights · Oct 19, 2023 · e23fa6e · e23fa6e
1 parent b2526fc
commit e23fa6e
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 12 deletions.
diff --git a/client-course-schedulizer/src/components/App/App.tsx b/client-course-schedulizer/src/components/App/App.tsx
@@ -28,9 +28,9 @@ export const App = () => {
               <Route path="/help">
                 <HelpPage />
               </Route>
-              <Route path="/harmony">
+              {/* <Route path="/harmony">
                 <HarmonyPage />
-              </Route>
+              </Route> */}
               <Route path="/">
                 <SchedulizerPage />
               </Route>

diff --git a/client-course-schedulizer/src/components/Header/Header.tsx b/client-course-schedulizer/src/components/Header/Header.tsx
@@ -18,9 +18,9 @@ export const Header = () => {
           <Link component={RouterLink} to="/">
             Schedulizer
           </Link>
-          <Link component={RouterLink} to="/harmony">
+          {/* <Link component={RouterLink} to="/harmony">
             Harmony
-          </Link>
+          </Link> */}
           <Link component={RouterLink} to="/about">
             About
           </Link>

diff --git a/client-course-schedulizer/src/components/pages/AboutPage/AboutPage.tsx b/client-course-schedulizer/src/components/pages/AboutPage/AboutPage.tsx
@@ -1,7 +1,7 @@
 import { Grid } from "@material-ui/core";
 import { NewTabLink, Page } from "components/reuseables";
 import React from "react";
-import { team2020, team2021, team2022, teamAdvisors, TeamMember } from "utilities";
+import { team2020, team2021, team2022, team2023, teamAdvisors, TeamMember } from "utilities";
 import { TeamMemberProfile, TextSection } from ".";
 import "./AboutPage.scss";
 
@@ -11,6 +11,7 @@ export const AboutPage = () => {
   return (
     <Page>
       <AboutVision />
+      <AboutTeam2023 />
       <AboutTeam2022 />
       <AboutTeam2021 />
       <AboutTeam2020 />
@@ -75,6 +76,7 @@ const AboutVision = () => {
     />
   );
 };
+
 const AboutTeam2020 = () => {
   return (
     <TextSection
@@ -120,6 +122,21 @@ const AboutTeam2022 = () => {
   );
 };
 
+const AboutTeam2023 = () => {
+  return (
+    <TextSection
+      body={
+        <Grid container direction="column" justify="flex-start" spacing={2}>
+          {team2023.map((member: TeamMember) => {
+            return <TeamMemberProfile key={member.name} member={member} />;
+          })}
+        </Grid>
+      }
+      title="Team of 2023"
+    />
+  );
+};
+
 const AboutTeamAdvisors = () => {
   return (
     <TextSection
@@ -166,14 +183,21 @@ const AboutReport = () => {
     <TextSection
       body={
         <ul>
+          <li>
+            <NewTabLink href="https://docs.google.com/document/d/16FBgWv1JVa3SDyDcNtiC_EZ3NYhkU7Y5tBEmhjGQftM/edit?usp=sharing">
+              2023 Project Proposal
+            </NewTabLink>{" "}
+            - 10.01.2023
+          </li>
+          <hr />
           <li>
             <NewTabLink href="https://docs.google.com/document/d/1MjXN3lbgYXInZyUk1V_sh4wVVs2ITd6rloYKjJW8W6c/edit?usp=sharing">
               2022 Project Proposal
             </NewTabLink>{" "}
             - 10.01.2022
           </li>
-          <hr/>
-	        <li>
+          <hr />
+          <li>
             <NewTabLink href="https://docs.google.com/document/d/e/2PACX-1vSL0Ezm-2XOCQWPv4R7J3MRZAn5PW46cayuKNxxElyVdl9W48ns2cRcd6xquoBc054_w2K_vsx2si7P/pub">
               Final Report
             </NewTabLink>{" "}
@@ -185,7 +209,7 @@ const AboutReport = () => {
             </NewTabLink>{" "}
             - 10.01.2021
           </li>
-          <hr/>
+          <hr />
           <li>
             <NewTabLink href="https://docs.google.com/document/d/e/2PACX-1vQcSDE6VMNl-wMHhECt3RbeA3WD-tiXersevVAMDXfgImq9HMFS5yQnLx8mZ4qZ4Q/pub">
               Final Report
@@ -221,7 +245,7 @@ const AboutResources = () => {
               Computing@Calvin Department Website
             </NewTabLink>
           </li>
-          <hr/>
+          <hr />
           <li>
             <NewTabLink href="https://docs.google.com/presentation/d/e/2PACX-1vSGBkk_3fRIeLrlMBCgLnHLxSdt4hOVz5QovjrUs3qXfVDnx12xO7hYLEuhQx4CtW_VOJ-tBIZaoHZ9/pub?start=false&loop=false&delayms=3000">
               Final Presentation Slides
@@ -231,10 +255,10 @@ const AboutResources = () => {
           <li>
             <NewTabLink href="https://docs.google.com/presentation/d/e/2PACX-1vRRNLIukj6g61oBkb41JiwW0hZFUMOGzL_m-Um_Ha9vcksYJRzmd7oUlyEs0rqz5fqgFVmncarYzbMP/pub?start=false&loop=false&delayms=3000">
               Status Report Slides
-              </NewTabLink> -
+            </NewTabLink> -
             12.07.2021
           </li>
-          <hr/>
+          <hr />
           <li>
             <NewTabLink href="https://youtu.be/ckn0oPxvlIE">Final Presentation Video</NewTabLink> -
             4.25.2021

diff --git a/client-course-schedulizer/src/components/pages/HelpPage/HelpPage.tsx b/client-course-schedulizer/src/components/pages/HelpPage/HelpPage.tsx
@@ -1,5 +1,5 @@
 import React from "react";
 
 export const HelpPage = () => {
-  return <>Help</>;
+  return <>This is a Help page that team 2023 is planning to update.</>;
 };
diff --git a/...dulizer/src/components/reuseables/AddNonTeachingLoadPopover/AddNonTeachingLoadPopover.tsx b/...dulizer/src/components/reuseables/AddNonTeachingLoadPopover/AddNonTeachingLoadPopover.tsx
@@ -19,6 +19,8 @@ import {
 import { AppContext } from "utilities/contexts";
 import "./AddNonTeachingLoadPopover.scss";
 
+// Schedulizer -> Teaching loads -> Add/update non-teaching activity
+
 const SPACING = 2;
 
 export const AddNonTeachingLoadPopover = ({ values }: PopoverValueProps) => {

diff --git a/client-course-schedulizer/src/components/reuseables/AddSectionPopover/AddSectionPopover.tsx b/client-course-schedulizer/src/components/reuseables/AddSectionPopover/AddSectionPopover.tsx
@@ -39,6 +39,9 @@ import {
 } from "utilities/interfaces";
 import "./AddSectionPopover.scss";
 
+// Schedulizer -> add section
+// Conflict message: after adding a section, click on it, and the conflict message will show up in the conflict box
+
 const SPACING = 2;
 
 const transformDataToTrueSectionInput = (data: SectionInput): SectionInput => {

diff --git a/client-course-schedulizer/src/components/reuseables/Calendar/Calendar.tsx b/client-course-schedulizer/src/components/reuseables/Calendar/Calendar.tsx
@@ -6,6 +6,8 @@ import timeGridPlugin from "@fullcalendar/timegrid";
 import { INITIAL_DATE } from "utilities/constants";
 import "./Calendar.scss";
 
+// Schedulizer, calender view, basic settings
+
 export const Calendar = (props: CalendarOptions) => {
   return (
     <>

diff --git a/client-course-schedulizer/src/utilities/helpers/teamMembers.ts b/client-course-schedulizer/src/utilities/helpers/teamMembers.ts
@@ -82,6 +82,24 @@ export const team2022: TeamMember[] = [
   },
 ];
 
+export const team2023: TeamMember[] = [
+  {
+    bio:
+      "Computer Science Student at Calvin University.",
+    name: "ZeAi Sun",
+    photo: "https://avatars.githubusercontent.com/u/112643038?s=400&v=4",
+    website: "https://github.com/SophiaSun18",
+  },
+  {
+    bio:
+      "Computer Science Student at Calvin University.",
+    name: "Faeren Madza",
+    photo:
+      "https://avatars.githubusercontent.com/u/112643038?s=400&v=4",
+    website: "https://github.com/senior-knights/course-schedulizer",
+  },
+];
+
 export const teamAdvisors: TeamMember[] = [
   {
     bio: