From ad38eca98b92900e6af4fdfbe277549978c36f6f Mon Sep 17 00:00:00 2001
From: Jared He <66887902+jaredjhe@users.noreply.github.com>
Date: Tue, 31 Aug 2021 21:48:17 -0500
Subject: [PATCH 1/5] Negate the flags

---
 pages/events/[year]/[term]/index.tsx | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pages/events/[year]/[term]/index.tsx b/pages/events/[year]/[term]/index.tsx
index da884d3c..f92d6d5f 100644
--- a/pages/events/[year]/[term]/index.tsx
+++ b/pages/events/[year]/[term]/index.tsx
@@ -114,16 +114,18 @@ 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>
+      {!hasPastEvents && !props.isCurrentTerm && (
+        <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>
   );
 }
-- 
2.39.2


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 2/5] 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) {
         </section>
       )}
       {hasPastEvents && !props.isCurrentTerm && (
-        <h1>
-          Events Archive:
-          <span className={styles.blue}>
-            {` ${capitalize(props.term)} ${props.year}`}
-          </span>
-        </h1>
+        <section>
+          <h1>
+            Events Archive:
+            <span className={styles.blue}>
+              {` ${capitalize(props.term)} ${props.year}`}
+            </span>
+          </h1>
+          <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>
+        </section>
       )}
       {!hasFutureEvents && !hasPastEvents && (
         <>
@@ -114,18 +126,6 @@ export default function Term(props: Props) {
           later!
         </>
       )}
-      {!hasPastEvents && !props.isCurrentTerm && (
-        <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>
   );
 }
-- 
2.39.2


From b6b83e3fb22465a20997b20b8d620ab7f8392061 Mon Sep 17 00:00:00 2001
From: Jared He <66887902+jaredjhe@users.noreply.github.com>
Date: Tue, 31 Aug 2021 22:01:20 -0500
Subject: [PATCH 3/5] Revert workaround for testing

---
 lib/events.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/events.ts b/lib/events.ts
index 4b89d167..1b17f02f 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}-09-02 EST`).getTime()
+    date.getTime() <= new Date(`${year}-08-31 EST`).getTime()
   ) {
     term = "spring";
   } else if (
-    new Date(`${year}-09-03 EST`).getTime() <= date.getTime() &&
+    new Date(`${year}-09-01 EST`).getTime() <= date.getTime() &&
     date.getTime() <= new Date(`${year}-12-31 EST`).getTime()
   ) {
     term = "fall";
@@ -209,7 +209,6 @@ function getPastTerm(
   term: string
 ): { year: string; term: string } {
   const index = TERMS.indexOf(term);
-
   if (index === -1) {
     throw new Error("Not a valid term");
   }
-- 
2.39.2


From 5e868803bf14e4dcb2a80d61951d1f67a3041316 Mon Sep 17 00:00:00 2001
From: Jared He <66887902+jaredjhe@users.noreply.github.com>
Date: Tue, 31 Aug 2021 22:01:55 -0500
Subject: [PATCH 4/5] for real this time

---
 lib/events.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/events.ts b/lib/events.ts
index 1b17f02f..2007a89c 100644
--- a/lib/events.ts
+++ b/lib/events.ts
@@ -209,6 +209,7 @@ function getPastTerm(
   term: string
 ): { year: string; term: string } {
   const index = TERMS.indexOf(term);
+
   if (index === -1) {
     throw new Error("Not a valid term");
   }
-- 
2.39.2


From dbf978dec793b2ac2e67474fc6f6f10727610b1e Mon Sep 17 00:00:00 2001
From: Jared He <66887902+jaredjhe@users.noreply.github.com>
Date: Tue, 31 Aug 2021 22:13:06 -0500
Subject: [PATCH 5/5] Simplify

---
 pages/events/[year]/[term]/index.tsx | 33 ++++++++++------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/pages/events/[year]/[term]/index.tsx b/pages/events/[year]/[term]/index.tsx
index 6470045b..7073921f 100644
--- a/pages/events/[year]/[term]/index.tsx
+++ b/pages/events/[year]/[term]/index.tsx
@@ -83,29 +83,18 @@ export default function Term(props: Props) {
           </div>
         </section>
       )}
-      {hasPastEvents && props.isCurrentTerm && (
+      {hasPastEvents && (
         <section>
-          <h1>Past Events</h1>
-          <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>
-        </section>
-      )}
-      {hasPastEvents && !props.isCurrentTerm && (
-        <section>
-          <h1>
-            Events Archive:
-            <span className={styles.blue}>
-              {` ${capitalize(props.term)} ${props.year}`}
-            </span>
-          </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
-- 
2.39.2