From e23fa6ec1fea4dd9b9e734aa4b0bfac1ea295c6f Mon Sep 17 00:00:00 2001 From: SophiaSun18 Date: Thu, 19 Oct 2023 16:40:38 -0400 Subject: [PATCH] update to run with pnpm remove Harmony update About with Team 2023's information --- .../src/components/App/App.tsx | 4 +- .../src/components/Header/Header.tsx | 4 +- .../components/pages/AboutPage/AboutPage.tsx | 38 +++++++++++++++---- .../components/pages/HelpPage/HelpPage.tsx | 2 +- .../AddNonTeachingLoadPopover.tsx | 2 + .../AddSectionPopover/AddSectionPopover.tsx | 3 ++ .../reuseables/Calendar/Calendar.tsx | 2 + .../src/utilities/helpers/teamMembers.ts | 18 +++++++++ 8 files changed, 61 insertions(+), 12 deletions(-) diff --git a/client-course-schedulizer/src/components/App/App.tsx b/client-course-schedulizer/src/components/App/App.tsx index 349ab6e2..466cbee5 100644 --- 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 = () => { - + {/* - + */} diff --git a/client-course-schedulizer/src/components/Header/Header.tsx b/client-course-schedulizer/src/components/Header/Header.tsx index 70f50c7c..f7bcd94a 100644 --- 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 = () => { Schedulizer - + {/* Harmony - + */} About diff --git a/client-course-schedulizer/src/components/pages/AboutPage/AboutPage.tsx b/client-course-schedulizer/src/components/pages/AboutPage/AboutPage.tsx index 5c4ba3c9..ca9dc875 100644 --- 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 ( + @@ -75,6 +76,7 @@ const AboutVision = () => { /> ); }; + const AboutTeam2020 = () => { return ( { ); }; +const AboutTeam2023 = () => { + return ( + + {team2023.map((member: TeamMember) => { + return ; + })} + + } + title="Team of 2023" + /> + ); +}; + const AboutTeamAdvisors = () => { return ( { +
  • + + 2023 Project Proposal + {" "} + - 10.01.2023 +
    • +
  • 2022 Project Proposal {" "} - 10.01.2022
    • -
    -
  • +
    +
  • Final Report {" "} @@ -185,7 +209,7 @@ const AboutReport = () => { {" "} - 10.01.2021
    • -
    +
  • Final Report @@ -221,7 +245,7 @@ const AboutResources = () => { Computing@Calvin Department Website
    • -
    +
  • Final Presentation Slides @@ -231,10 +255,10 @@ const AboutResources = () => {
  • Status Report Slides - - + - 12.07.2021
    • -
    +
  • Final Presentation Video - 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 index dc615ab0..9d8ac79a 100644 --- 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/client-course-schedulizer/src/components/reuseables/AddNonTeachingLoadPopover/AddNonTeachingLoadPopover.tsx b/client-course-schedulizer/src/components/reuseables/AddNonTeachingLoadPopover/AddNonTeachingLoadPopover.tsx index 7938df7d..6b69dab0 100644 --- a/client-course-schedulizer/src/components/reuseables/AddNonTeachingLoadPopover/AddNonTeachingLoadPopover.tsx +++ b/client-course-schedulizer/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 index 7c9a04bf..fba9b151 100644 --- 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 index 2f66ef31..bd7ec7ee 100644 --- 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 index 5c141e30..75f5b28e 100644 --- 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: