From 966129adf82ef1cffebd32e2719346e3e9308b86 Mon Sep 17 00:00:00 2001 From: j285he Date: Tue, 31 Aug 2021 23:19:33 -0400 Subject: [PATCH] Fix past events rendered twice (#245) Closes #238 Co-authored-by: Jared He <66887902+jaredjhe@users.noreply.github.com> Reviewed-on: https://git.csclub.uwaterloo.ca/www/www-new/pulls/245 Reviewed-by: Aditya Thakral Co-authored-by: j285he Co-committed-by: j285he --- pages/events/[year]/[term]/index.tsx | 31 ++++++++++------------------ 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/pages/events/[year]/[term]/index.tsx b/pages/events/[year]/[term]/index.tsx index da884d3c..7073921f 100644 --- a/pages/events/[year]/[term]/index.tsx +++ b/pages/events/[year]/[term]/index.tsx @@ -83,9 +83,18 @@ export default function Term(props: Props) { )} - {hasPastEvents && props.isCurrentTerm && ( + {hasPastEvents && (
-

Past Events

+ {props.isCurrentTerm ? ( +

Past Events

+ ) : ( +

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

+ )}
{props.pastEvents.map(({ content, metadata }) => (
)} - {hasPastEvents && !props.isCurrentTerm && ( -

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

- )} {!hasFutureEvents && !hasPastEvents && ( <>

Events

@@ -114,16 +115,6 @@ export default function Term(props: Props) { later! )} -
- {props.pastEvents.map(({ content, metadata }) => ( - } - key={metadata.name + metadata.date.toString()} - /> - ))} -
); }