From 7ceffc3ba061404586faa3ccd9d3ceed813234f6 Mon Sep 17 00:00:00 2001
From: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Date: Fri, 27 Aug 2021 18:13:51 -0400
Subject: [PATCH] PR feedback

---
 lib/events.ts                        |  8 +++++++-
 pages/events/[year]/[term]/index.tsx | 16 +++++++++++-----
 pages/events/index.tsx               |  5 ++---
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/lib/events.ts b/lib/events.ts
index a909434d..db6f5cb0 100644
--- a/lib/events.ts
+++ b/lib/events.ts
@@ -104,7 +104,13 @@ export async function getUpcomingEvents(): Promise<Event[]> {
     });
 }
 
-export async function getProps(year: string, term: string): Promise<Props> {
+export async function getEventsPageProps({
+  year,
+  term,
+}: {
+  year: string;
+  term: string;
+}): Promise<Props> {
   const eventNames = await getEventsByTerm(year, term);
 
   const events: Event[] = (
diff --git a/pages/events/[year]/[term]/index.tsx b/pages/events/[year]/[term]/index.tsx
index 34a8c8e4..f8b9f1fd 100644
--- a/pages/events/[year]/[term]/index.tsx
+++ b/pages/events/[year]/[term]/index.tsx
@@ -9,7 +9,7 @@ import { Link } from "@/components/Link";
 import { MiniEventCard } from "@/components/MiniEventCard";
 import {
   Event,
-  getProps,
+  getEventsPageProps,
   getEventYears,
   getEventTermsByYear,
 } from "@/lib/events";
@@ -61,7 +61,7 @@ export default function Term(props: Props) {
             key={link.year + link.term}
           />
         ))}
-        <Link href="/events/archives">Archives</Link>
+        <Link href="/events/archive">Archive</Link>
       </div>
       {hasFutureEvents && (
         <>
@@ -88,6 +88,14 @@ export default function Term(props: Props) {
           </span>
         </h2>
       )}
+      {!hasFutureEvents && !hasPastEvents && (
+        <>
+          <h2>Events</h2>
+          There are no upcoming or past events for the{" "}
+          {`${capitalize(props.term)} ${props.year}`} term. Please check back
+          later!
+        </>
+      )}
       <div className={styles.miniEventCards}>
         {props.pastEvents.map(({ content, metadata }) => (
           <MiniEventCard
@@ -125,9 +133,7 @@ export const getStaticProps: GetStaticProps<Props, Params> = async (
   context
 ) => {
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  const { year, term } = context.params!;
-
-  return { props: await getProps(year, term) };
+  return { props: await getEventsPageProps(context.params!) };
 };
 
 export const getStaticPaths: GetStaticPaths<Params> = async () => {
diff --git a/pages/events/index.tsx b/pages/events/index.tsx
index 60198e05..5f016465 100644
--- a/pages/events/index.tsx
+++ b/pages/events/index.tsx
@@ -1,12 +1,11 @@
 import { GetStaticProps } from "next";
 
-import { getCurrentTerm, getProps } from "@/lib/events";
+import { getCurrentTerm, getEventsPageProps } from "@/lib/events";
 
 import Term, { Props } from "./[year]/[term]/index";
 
 export default Term;
 
 export const getStaticProps: GetStaticProps<Props> = async () => {
-  const curTerm = getCurrentTerm();
-  return { props: await getProps(curTerm.year, curTerm.term) };
+  return { props: await getEventsPageProps(getCurrentTerm()) };
 };