Fix past events rendered twice (#245)

Closes #238

Co-authored-by: Jared He <66887902+jaredjhe@users.noreply.github.com>
Reviewed-on: #245
Reviewed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Co-authored-by: j285he <j285he@localhost>
Co-committed-by: j285he <j285he@localhost>
pull/263/head
Jared He 1 year ago
parent a0d0b8e843
commit 966129adf8
  1. 31
      pages/events/[year]/[term]/index.tsx

@ -83,9 +83,18 @@ export default function Term(props: Props) {
</div>
</section>
)}
{hasPastEvents && props.isCurrentTerm && (
{hasPastEvents && (
<section>
<h1>Past Events</h1>
{props.isCurrentTerm ? (
<h1>Past Events</h1>
) : (
<h1>
Events Archive:
<span className={styles.blue}>
{` ${capitalize(props.term)} ${props.year}`}
</span>
</h1>
)}
<div className={styles.miniEventCards}>
{props.pastEvents.map(({ content, metadata }) => (
<MiniEventCard
@ -98,14 +107,6 @@ export default function Term(props: Props) {
</div>
</section>
)}
{hasPastEvents && !props.isCurrentTerm && (
<h1>
Events Archive:
<span className={styles.blue}>
{` ${capitalize(props.term)} ${props.year}`}
</span>
</h1>
)}
{!hasFutureEvents && !hasPastEvents && (
<>
<h1>Events</h1>
@ -114,16 +115,6 @@ export default function Term(props: Props) {
later!
</>
)}
<div className={styles.miniEventCards}>
{props.pastEvents.map(({ content, metadata }) => (
<MiniEventCard
{...metadata}
date={new Date(metadata.date)}
description={<MDXRemote {...content} />}
key={metadata.name + metadata.date.toString()}
/>
))}
</div>
</div>
);
}

Loading…
Cancel
Save