From 6256fe0dcd70da1b87bab712dd39a06066a9364e Mon Sep 17 00:00:00 2001 From: Jared He <66887902+jaredjhe@users.noreply.github.com> Date: Tue, 31 Aug 2021 21:59:24 -0500 Subject: [PATCH] Fix logic, add section --- lib/events.ts | 4 ++-- pages/events/[year]/[term]/index.tsx | 36 ++++++++++++++-------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lib/events.ts b/lib/events.ts index 2007a89c..4b89d167 100644 --- a/lib/events.ts +++ b/lib/events.ts @@ -191,11 +191,11 @@ export function getCurrentTerm(): { year: string; term: string } { term = "winter"; } else if ( new Date(`${year}-05-01 EST`).getTime() <= date.getTime() && - date.getTime() <= new Date(`${year}-08-31 EST`).getTime() + date.getTime() <= new Date(`${year}-09-02 EST`).getTime() ) { term = "spring"; } else if ( - new Date(`${year}-09-01 EST`).getTime() <= date.getTime() && + new Date(`${year}-09-03 EST`).getTime() <= date.getTime() && date.getTime() <= new Date(`${year}-12-31 EST`).getTime() ) { term = "fall"; diff --git a/pages/events/[year]/[term]/index.tsx b/pages/events/[year]/[term]/index.tsx index f92d6d5f..6470045b 100644 --- a/pages/events/[year]/[term]/index.tsx +++ b/pages/events/[year]/[term]/index.tsx @@ -99,12 +99,24 @@ export default function Term(props: Props) { )} {hasPastEvents && !props.isCurrentTerm && ( -

- Events Archive: - - {` ${capitalize(props.term)} ${props.year}`} - -

+
+

+ Events Archive: + + {` ${capitalize(props.term)} ${props.year}`} + +

+
+ {props.pastEvents.map(({ content, metadata }) => ( + } + key={metadata.name + metadata.date.toString()} + /> + ))} +
+
)} {!hasFutureEvents && !hasPastEvents && ( <> @@ -114,18 +126,6 @@ export default function Term(props: Props) { later! )} - {!hasPastEvents && !props.isCurrentTerm && ( -
- {props.pastEvents.map(({ content, metadata }) => ( - } - key={metadata.name + metadata.date.toString()} - /> - ))} -
- )} ); }