From 0d2e79963921154bfe28e9e8d802c00f017f6082 Mon Sep 17 00:00:00 2001
From: Neil Parikh <n3parikh@csclub.uwaterloo.ca>
Date: Sun, 12 Sep 2021 00:13:40 -0400
Subject: [PATCH 01/10] test

---
 components/EventDescriptionCard.tsx | 4 +++-
 content/events/2021/fall/BOT.md     | 1 +
 types.d.ts                          | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/components/EventDescriptionCard.tsx b/components/EventDescriptionCard.tsx
index 86c9b3db..deb6a558 100644
--- a/components/EventDescriptionCard.tsx
+++ b/components/EventDescriptionCard.tsx
@@ -15,6 +15,7 @@ interface Props {
   date: Date;
   poster?: string;
   registerLink?: string;
+  permaLink?: string;
 }
 
 /**
@@ -35,6 +36,7 @@ export function EventDescriptionCard({
   date,
   online,
   registerLink,
+  permaLink,
 }: Props) {
   const Icon = getIcon(location);
 
@@ -43,7 +45,7 @@ export function EventDescriptionCard({
       {poster && <Image className={styles.poster} src={poster} alt={name} />}
 
       <div className={styles.details}>
-        <h1 className={styles.name}>{name}</h1>
+        <h1 className={styles.name}>{permaLink ? <Link href={permaLink}>name</Link> : name}</h1>
         <h2 className={styles.setting}>
           <EventSetting date={date} online={online} location={location} />
         </h2>
diff --git a/content/events/2021/fall/BOT.md b/content/events/2021/fall/BOT.md
index 469b0d4f..67a142cc 100644
--- a/content/events/2021/fall/BOT.md
+++ b/content/events/2021/fall/BOT.md
@@ -6,6 +6,7 @@ online: true
 location: 'Twitch'
 poster: 'images/events/2021/fall/BOT.png'
 registerLink: https://bit.ly/csc-bot-event-signup-form
+permaLink: /events/2021/fall/BOT/
 ---
 
 Kick off the fall term with CS Club’s BOT event! 🍂 Interested in attending upcoming CSC events? Want to meet others in the CS community?
diff --git a/types.d.ts b/types.d.ts
index 9868d525..4a905069 100644
--- a/types.d.ts
+++ b/types.d.ts
@@ -12,6 +12,7 @@ declare module "*.event.mdx" {
     location: string;
     poster?: string;
     registerLink?: string;
+    permaLink?: string;
   }
 
   const ReactComponent: ComponentType;
-- 
2.39.2


From 2570745789a070a1c62be5fc4e6b9fdab5fd56e1 Mon Sep 17 00:00:00 2001
From: Neil Parikh <n3parikh@csclub.uwaterloo.ca>
Date: Sun, 12 Sep 2021 00:16:00 -0400
Subject: [PATCH 02/10] fix

---
 components/EventDescriptionCard.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/EventDescriptionCard.tsx b/components/EventDescriptionCard.tsx
index deb6a558..16f9e3b5 100644
--- a/components/EventDescriptionCard.tsx
+++ b/components/EventDescriptionCard.tsx
@@ -4,6 +4,7 @@ import { Button } from "./Button";
 import { EventSetting } from "./EventSetting";
 import { Image } from "./Image";
 import { Discord, Twitch, Instagram, Facebook } from "./SocialLinks";
+import { Link } from "./Link";
 
 import styles from "./EventDescriptionCard.module.css";
 
-- 
2.39.2


From 1695ec2fb46f730c57fa2decd4a18b84234917ea Mon Sep 17 00:00:00 2001
From: Neil Parikh <n3parikh@csclub.uwaterloo.ca>
Date: Sun, 12 Sep 2021 00:24:29 -0400
Subject: [PATCH 03/10] lint

---
 components/EventDescriptionCard.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/EventDescriptionCard.tsx b/components/EventDescriptionCard.tsx
index 16f9e3b5..89e76ed0 100644
--- a/components/EventDescriptionCard.tsx
+++ b/components/EventDescriptionCard.tsx
@@ -3,8 +3,8 @@ import React from "react";
 import { Button } from "./Button";
 import { EventSetting } from "./EventSetting";
 import { Image } from "./Image";
-import { Discord, Twitch, Instagram, Facebook } from "./SocialLinks";
 import { Link } from "./Link";
+import { Discord, Twitch, Instagram, Facebook } from "./SocialLinks";
 
 import styles from "./EventDescriptionCard.module.css";
 
@@ -46,7 +46,9 @@ export function EventDescriptionCard({
       {poster && <Image className={styles.poster} src={poster} alt={name} />}
 
       <div className={styles.details}>
-        <h1 className={styles.name}>{permaLink ? <Link href={permaLink}>name</Link> : name}</h1>
+        <h1 className={styles.name}>
+          {permaLink ? <Link href={permaLink}>name</Link> : name}
+        </h1>
         <h2 className={styles.setting}>
           <EventSetting date={date} online={online} location={location} />
         </h2>
-- 
2.39.2


From f58a6407f28f1b299879bee2fadd7f908fdb5784 Mon Sep 17 00:00:00 2001
From: Neil Parikh <n3parikh@csclub.uwaterloo.ca>
Date: Sun, 12 Sep 2021 00:36:16 -0400
Subject: [PATCH 04/10] use name prop, not literal

---
 components/EventDescriptionCard.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/EventDescriptionCard.tsx b/components/EventDescriptionCard.tsx
index 89e76ed0..2a902b5e 100644
--- a/components/EventDescriptionCard.tsx
+++ b/components/EventDescriptionCard.tsx
@@ -47,7 +47,7 @@ export function EventDescriptionCard({
 
       <div className={styles.details}>
         <h1 className={styles.name}>
-          {permaLink ? <Link href={permaLink}>name</Link> : name}
+          {permaLink ? <Link href={permaLink}>{name}</Link> : name}
         </h1>
         <h2 className={styles.setting}>
           <EventSetting date={date} online={online} location={location} />
-- 
2.39.2


From 097669994a34173d6ebd0355aae72b94d06fdf50 Mon Sep 17 00:00:00 2001
From: Neil Parikh <n3parikh@csclub.uwaterloo.ca>
Date: Sun, 12 Sep 2021 01:01:49 -0400
Subject: [PATCH 05/10] move permalink

---
 components/EventDescriptionCard.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/components/EventDescriptionCard.tsx b/components/EventDescriptionCard.tsx
index 2a902b5e..e659f89b 100644
--- a/components/EventDescriptionCard.tsx
+++ b/components/EventDescriptionCard.tsx
@@ -46,15 +46,14 @@ export function EventDescriptionCard({
       {poster && <Image className={styles.poster} src={poster} alt={name} />}
 
       <div className={styles.details}>
-        <h1 className={styles.name}>
-          {permaLink ? <Link href={permaLink}>{name}</Link> : name}
-        </h1>
+        <h1 className={styles.name}>{name}</h1>
         <h2 className={styles.setting}>
           <EventSetting date={date} online={online} location={location} />
         </h2>
         <p className={styles.desc}>{short}</p>
 
         <footer>
+          {permaLink && <Link href={permaLink}>More details</Link>}
           {registerLink && (
             <div className={styles.button}>
               <Button isLink={true} href={registerLink} size="small">
-- 
2.39.2


From 135bed2892233f7d84d48068527e4ed9b6864072 Mon Sep 17 00:00:00 2001
From: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Date: Sun, 12 Sep 2021 01:36:14 -0400
Subject: [PATCH 06/10] Move the permalink outside the footer

---
 components/EventDescriptionCard.module.css | 3 +++
 components/EventDescriptionCard.tsx        | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/components/EventDescriptionCard.module.css b/components/EventDescriptionCard.module.css
index baab9b78..69e8d679 100644
--- a/components/EventDescriptionCard.module.css
+++ b/components/EventDescriptionCard.module.css
@@ -29,6 +29,9 @@
 }
 
 .logo {
+  display: flex;
+  justify-content: center;
+  align-items: center;
   width: calc(32rem / 16);
   margin-left: auto;
 }
diff --git a/components/EventDescriptionCard.tsx b/components/EventDescriptionCard.tsx
index e659f89b..e2b45927 100644
--- a/components/EventDescriptionCard.tsx
+++ b/components/EventDescriptionCard.tsx
@@ -51,9 +51,9 @@ export function EventDescriptionCard({
           <EventSetting date={date} online={online} location={location} />
         </h2>
         <p className={styles.desc}>{short}</p>
+        {permaLink && <Link href={permaLink}>More details</Link>}
 
         <footer>
-          {permaLink && <Link href={permaLink}>More details</Link>}
           {registerLink && (
             <div className={styles.button}>
               <Button isLink={true} href={registerLink} size="small">
-- 
2.39.2


From bed40fe10e0fca76020fc981b61a1dd44f698a2c Mon Sep 17 00:00:00 2001
From: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Date: Sun, 12 Sep 2021 01:41:38 -0400
Subject: [PATCH 07/10] View details -> Learn more

---
 components/EventDescriptionCard.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/EventDescriptionCard.tsx b/components/EventDescriptionCard.tsx
index e2b45927..67fc754a 100644
--- a/components/EventDescriptionCard.tsx
+++ b/components/EventDescriptionCard.tsx
@@ -51,7 +51,7 @@ export function EventDescriptionCard({
           <EventSetting date={date} online={online} location={location} />
         </h2>
         <p className={styles.desc}>{short}</p>
-        {permaLink && <Link href={permaLink}>More details</Link>}
+        {permaLink && <Link href={permaLink}>Learn more</Link>}
 
         <footer>
           {registerLink && (
-- 
2.39.2


From f2df7541c08b1a006a381e3ed4c9c4f0f06bd0c9 Mon Sep 17 00:00:00 2001
From: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Date: Sun, 12 Sep 2021 01:59:10 -0400
Subject: [PATCH 08/10] Dynamic permalinks

---
 components/EventCard.tsx             | 14 ++++++--------
 components/EventDescriptionCard.tsx  |  4 ++--
 content/events/2021/fall/BOT.md      |  1 -
 lib/events.ts                        | 10 ++++++++--
 pages/events/[year]/[term]/index.tsx |  1 -
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/components/EventCard.tsx b/components/EventCard.tsx
index e9e5eaec..40120970 100644
--- a/components/EventCard.tsx
+++ b/components/EventCard.tsx
@@ -7,7 +7,7 @@ import { Link } from "./Link";
 
 import styles from "./EventCard.module.css";
 
-interface BaseProps {
+interface EventCardProps {
   name: string;
   short: string;
   date: Date;
@@ -15,15 +15,13 @@ interface BaseProps {
   location: string;
   poster?: string;
   registerLink?: string;
+  permaLink: string;
+  showDescription?: boolean;
   children: ReactNode;
 }
 
-type EventCardProps =
-  | (BaseProps & { showDescription?: false; link: string })
-  | (BaseProps & { showDescription: true; link?: string });
-
 export function EventCard({
-  link,
+  permaLink,
   name,
   date,
   online,
@@ -60,8 +58,8 @@ export function EventCard({
         <h2>
           <EventSetting date={date} online={online} location={location} />
         </h2>
-        {!showDescription && link && (
-          <Link href={link}>
+        {!showDescription && (
+          <Link href={permaLink}>
             <span className={styles.mobileLearnMore}>Learn more</span>
           </Link>
         )}
diff --git a/components/EventDescriptionCard.tsx b/components/EventDescriptionCard.tsx
index 67fc754a..67dde493 100644
--- a/components/EventDescriptionCard.tsx
+++ b/components/EventDescriptionCard.tsx
@@ -16,7 +16,7 @@ interface Props {
   date: Date;
   poster?: string;
   registerLink?: string;
-  permaLink?: string;
+  permaLink: string;
 }
 
 /**
@@ -51,7 +51,7 @@ export function EventDescriptionCard({
           <EventSetting date={date} online={online} location={location} />
         </h2>
         <p className={styles.desc}>{short}</p>
-        {permaLink && <Link href={permaLink}>Learn more</Link>}
+        <Link href={permaLink}>Learn more</Link>
 
         <footer>
           {registerLink && (
diff --git a/content/events/2021/fall/BOT.md b/content/events/2021/fall/BOT.md
index 67a142cc..469b0d4f 100644
--- a/content/events/2021/fall/BOT.md
+++ b/content/events/2021/fall/BOT.md
@@ -6,7 +6,6 @@ online: true
 location: 'Twitch'
 poster: 'images/events/2021/fall/BOT.png'
 registerLink: https://bit.ly/csc-bot-event-signup-form
-permaLink: /events/2021/fall/BOT/
 ---
 
 Kick off the fall term with CS Club’s BOT event! 🍂 Interested in attending upcoming CSC events? Want to meet others in the CS community?
diff --git a/lib/events.ts b/lib/events.ts
index f4f1d8f4..bac0ae7a 100644
--- a/lib/events.ts
+++ b/lib/events.ts
@@ -27,13 +27,14 @@ export async function getEventTermsByYear(year: string): Promise<string[]> {
 }
 
 interface Metadata {
-  slug: string;
+  // slug: string;
   name: string;
   poster?: string;
   short: string;
   date: string;
   online: boolean;
   location: string;
+  permaLink: string;
   registerLink?: string;
 }
 
@@ -55,7 +56,12 @@ export async function getEventBySlug(
 
   return {
     content: await serialize(content),
-    metadata: { ...metadata, slug } as Metadata,
+    metadata: {
+      ...metadata,
+      // slug,
+      // permaLink is based on the directory structure in /pages
+      permaLink: `/events/${year}/${term}/${slug}`,
+    } as Metadata,
   };
 }
 
diff --git a/pages/events/[year]/[term]/index.tsx b/pages/events/[year]/[term]/index.tsx
index 7073921f..bb7cc93f 100644
--- a/pages/events/[year]/[term]/index.tsx
+++ b/pages/events/[year]/[term]/index.tsx
@@ -75,7 +75,6 @@ export default function Term(props: Props) {
                 {...metadata}
                 date={new Date(metadata.date)}
                 key={metadata.name + metadata.date.toString()}
-                link={`/events/${props.year}/${props.term}/${metadata.slug}`}
               >
                 <MDXRemote {...content} />
               </EventCard>
-- 
2.39.2


From 832de609527a641d7a6a5a23ccb99d8c59accfd5 Mon Sep 17 00:00:00 2001
From: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Date: Sun, 12 Sep 2021 02:00:36 -0400
Subject: [PATCH 09/10] Remove unneeded comment

---
 lib/events.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/events.ts b/lib/events.ts
index bac0ae7a..a3bb6f3c 100644
--- a/lib/events.ts
+++ b/lib/events.ts
@@ -27,7 +27,6 @@ export async function getEventTermsByYear(year: string): Promise<string[]> {
 }
 
 interface Metadata {
-  // slug: string;
   name: string;
   poster?: string;
   short: string;
@@ -58,7 +57,6 @@ export async function getEventBySlug(
     content: await serialize(content),
     metadata: {
       ...metadata,
-      // slug,
       // permaLink is based on the directory structure in /pages
       permaLink: `/events/${year}/${term}/${slug}`,
     } as Metadata,
-- 
2.39.2


From 89af3e5df8672e109c8126d3ff59061e0f5e25e5 Mon Sep 17 00:00:00 2001
From: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Date: Sun, 12 Sep 2021 02:02:41 -0400
Subject: [PATCH 10/10] Remove unneeded type declarations

---
 types.d.ts | 79 ------------------------------------------------------
 1 file changed, 79 deletions(-)

diff --git a/types.d.ts b/types.d.ts
index 4a905069..1a8e2879 100644
--- a/types.d.ts
+++ b/types.d.ts
@@ -1,85 +1,6 @@
 /* eslint-disable import/order */
 /* eslint-disable import/no-duplicates */
 
-declare module "*.event.mdx" {
-  import { ComponentType } from "react";
-
-  interface EventMetadata {
-    name: string;
-    short: string;
-    date: Date;
-    online: boolean;
-    location: string;
-    poster?: string;
-    registerLink?: string;
-    permaLink?: string;
-  }
-
-  const ReactComponent: ComponentType;
-
-  export const metadata: EventMetadata;
-  export default ReactComponent;
-}
-
-declare module "*.news.mdx" {
-  import { ComponentType } from "react";
-
-  interface NewsMetadata {
-    author: string;
-    date: Date;
-  }
-
-  const ReactComponent: ComponentType;
-
-  export const metadata: NewsMetadata;
-  export default ReactComponent;
-}
-
-declare module "*.team-member.mdx" {
-  import { ComponentType } from "react";
-
-  interface TeamMemberMetadata {
-    name: string;
-    role: string;
-  }
-
-  const ReactComponent: ComponentType;
-
-  export const metadata: TeamMemberMetadata;
-  export default ReactComponent;
-}
-
-declare module "*.section.mdx" {
-  import { ComponentType } from "react";
-
-  interface SectionMetadata {
-    title: string;
-    id: string;
-  }
-
-  const ReactComponent: ComponentType;
-
-  export const metadata: SectionMetadata;
-  export default ReactComponent;
-}
-
-declare module "*.talk.mdx" {
-  import { ComponentType } from "react";
-
-  interface TalkMetadata {
-    slug: string;
-    title: string;
-    presentors: string[];
-    thumbnails: { small: string; large?: string };
-    links: { file: string; type: string; size?: string }[];
-  }
-
-  const ReactComponent: ComponentType;
-
-  export const metadata: TalkMetadata;
-  export default ReactComponent;
-}
-
 declare module "*.mdx" {
   import { ComponentType } from "react";
 
-- 
2.39.2