diff --git a/src/App.tsx b/src/App.tsx index 39b170f..b9d8e24 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -45,6 +45,7 @@ function App() { ) } + diff --git a/src/data/dates.json b/src/data/dates.json index b53764a..d1ee0de 100644 --- a/src/data/dates.json +++ b/src/data/dates.json @@ -1,5 +1,7 @@ { "applicationSemester": "Fall 2023", "applicationsOpen": "2023-07-27T08:00:00.000Z", - "applicationsClose": "2023-08-23T06:59:00.000Z" + "applicationsClose": "2023-08-23T06:59:00.000Z", + "interestFormOpen": "2023-07-27T08:00:00.000Z", + "interestFormClose": "2023-09-04T06:59:00.000Z" } diff --git a/src/data/urls.json b/src/data/urls.json index bbca98a..365e7d5 100644 --- a/src/data/urls.json +++ b/src/data/urls.json @@ -1,5 +1,6 @@ { "applicationForm": "https://tinyurl.com/csm-fa23-app", + "interestForm": "https://tinyurl.com/csm-fa23-student-interest", "scheduler": "https://scheduler.csmentors.org", "facebook": "https://www.facebook.com/BerkeleyCSM/", "github": "https://github.com/csmberkeley", diff --git a/src/labels/StudentLabels.tsx b/src/labels/StudentLabels.tsx index 12abb6c..70f21c2 100644 --- a/src/labels/StudentLabels.tsx +++ b/src/labels/StudentLabels.tsx @@ -12,12 +12,13 @@ export const SECTIONS = { SUPPORT: { LABEL: "Support", BODY: - "CSM offers group tutoring to all students in these four classes. Students are " + - "sorted into one of the timeslots of their preference. Session are held weekly, in " + - "the same room typically in Soda or Cory, for 1 hour to 90 minutes during times " + - "ranging from 9:00 AM to 7:00 PM. Mentors will go over a worksheet in section with " + - "extra problems to be worked on in groups. Homework, lab, and project help will not " + - "be provided during these sessions.", + "CSM offers group tutoring to all students in these seven classes. " + + "Students can sign up for time slots on a first-come, first-serve basis. " + + "Sessions are held once or twice a week, in Soda, Cory, or library rooms, " + + "for 1 hour to 90 minutes during times ranging from 9:00 AM to 9:00 PM. " + + "Mentors will go over a worksheet in section with extra problems to be worked " + + "on in groups. Homework, lab, and project help will not be provided during these " + + "sessions.", }, EXPECTATIONS: { LABEL: "Expectations", @@ -43,7 +44,20 @@ export const SECTIONS = { ), }, - APPLICATION: { + APPLICATIONS_OPEN: { + LABEL: "Application Process", + BODY_JSX: ( +

+ Applications are currently closed for the semester and will open + around 2 weeks into the semester. In the meantime, fill out{" "} + + this interest form + {" "} + if you plan on signing up for a section. +

+ ), + }, + APPLICATIONS_CLOSE: { LABEL: "Application Process", BODY_JSX: (

diff --git a/src/pages/Students.tsx b/src/pages/Students.tsx index 80667a2..20fd86c 100644 --- a/src/pages/Students.tsx +++ b/src/pages/Students.tsx @@ -1,8 +1,16 @@ import React from "react"; - import * as Labels from "../labels/StudentLabels"; +import dates from "../data/dates.json"; export default class Students extends React.Component { + isApplicationOpen() { + const now = new Date(); + return ( + now > new Date(dates.interestFormOpen) && + now < new Date(dates.interestFormClose) + ); + } + render() { return (

@@ -31,10 +39,21 @@ export default class Students extends React.Component {
-
- {Labels.SECTIONS.APPLICATION.LABEL} -
- {Labels.SECTIONS.APPLICATION.BODY_JSX} + {this.isApplicationOpen() ? ( +
+
+ {Labels.SECTIONS.APPLICATIONS_OPEN.LABEL} +
+ {Labels.SECTIONS.APPLICATIONS_OPEN.BODY_JSX} +
+ ) : ( +
+
+ {Labels.SECTIONS.APPLICATIONS_CLOSE.LABEL} +
+ {Labels.SECTIONS.APPLICATIONS_CLOSE.BODY_JSX} +
+ )}