From 19617b8bad8be9db4e6cb2e5152fe4745ae4f81b Mon Sep 17 00:00:00 2001
From: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Date: Tue, 10 Aug 2021 17:08:29 -0400
Subject: [PATCH 1/4] Add news archive page

---
 pages/news/archive.module.css | 12 +++++++++
 pages/news/archive.tsx        | 49 +++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 pages/news/archive.module.css
 create mode 100644 pages/news/archive.tsx

diff --git a/pages/news/archive.module.css b/pages/news/archive.module.css
new file mode 100644
index 00000000..a05f7b45
--- /dev/null
+++ b/pages/news/archive.module.css
@@ -0,0 +1,12 @@
+.page {
+  margin-bottom: calc(40rem / 16);
+}
+
+.list {
+  list-style: none;
+  padding: 0;
+}
+
+.list > li {
+  line-height: 3;
+}
diff --git a/pages/news/archive.tsx b/pages/news/archive.tsx
new file mode 100644
index 00000000..0ae61722
--- /dev/null
+++ b/pages/news/archive.tsx
@@ -0,0 +1,49 @@
+import { getNewsTermsByYear, getNewsYears } from "lib/news";
+import { GetStaticProps } from "next";
+import React from "react";
+
+import { Link } from "@/components/Link";
+
+import styles from "./archive.module.css";
+
+interface Props {
+  items: {
+    year: string;
+    terms: string[];
+  }[];
+}
+
+export default function NewsArchive({ items }: Props) {
+  return (
+    <div className={styles.page}>
+      <h1>News Archive</h1>
+      <ul className={styles.list}>
+        {items.map(({ year, terms }) =>
+          terms.map((term) => (
+            <li key={`${year}-${term}`}>
+              <Link href={`/news/${year}/${term}`}>
+                {capitalize(term)} {year}
+              </Link>
+            </li>
+          ))
+        )}
+      </ul>
+    </div>
+  );
+}
+
+export const getStaticProps: GetStaticProps<Props> = async () => {
+  const years = (await getNewsYears()).reverse();
+  const yearsWithTerms = await Promise.all(
+    years.map(async (year) => ({
+      year,
+      terms: (await getNewsTermsByYear(year)).reverse(),
+    }))
+  );
+
+  return { props: { items: yearsWithTerms } };
+};
+
+function capitalize(str: string) {
+  return str.slice(0, 1).toUpperCase() + str.slice(1);
+}
-- 
2.39.2


From d7b2d9cf343b0c913fd228bf0a99dcb1c6d334e3 Mon Sep 17 00:00:00 2001
From: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Date: Fri, 13 Aug 2021 04:23:32 -0400
Subject: [PATCH 2/4] Add fit prop to NewsCard

---
 components/NewsCard.module.css | 6 ++++++
 components/NewsCard.tsx        | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/components/NewsCard.module.css b/components/NewsCard.module.css
index b2ff0b13..fd83dd67 100644
--- a/components/NewsCard.module.css
+++ b/components/NewsCard.module.css
@@ -5,6 +5,12 @@
   border-radius: calc(20rem / 16);
 }
 
+.fit.card {
+  max-width: unset;
+  padding: unset;
+  border-radius: unset;
+}
+
 .date {
   font-size: calc(18rem / 16);
   margin: 0;
diff --git a/components/NewsCard.tsx b/components/NewsCard.tsx
index 7b364fc7..16a31be3 100644
--- a/components/NewsCard.tsx
+++ b/components/NewsCard.tsx
@@ -6,15 +6,19 @@ interface NewsCardProps {
   date: Date;
   author: string;
   children: ReactNode;
+  fit?: boolean;
 }
 
 export const NewsCard: React.FC<NewsCardProps> = ({
   date,
   author,
   children,
+  fit = false,
 }) => {
+  const classes = fit ? [styles.card, styles.fit] : [styles.card];
+
   return (
-    <article className={styles.card}>
+    <article className={classes.join(" ")}>
       <h1 className={styles.date}>
         <time dateTime={date.toISOString()}>
           {date.toLocaleDateString("en-US", {
-- 
2.39.2


From 60ec87ac7f2ddf15864be1fb7499e5f7562c8801 Mon Sep 17 00:00:00 2001
From: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Date: Fri, 13 Aug 2021 04:24:52 -0400
Subject: [PATCH 3/4] Add /news/[year]/[term] page

---
 pages/news/[year]/[term].module.css |  7 +++
 pages/news/[year]/[term].tsx        | 84 +++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+)
 create mode 100644 pages/news/[year]/[term].module.css
 create mode 100644 pages/news/[year]/[term].tsx

diff --git a/pages/news/[year]/[term].module.css b/pages/news/[year]/[term].module.css
new file mode 100644
index 00000000..ba5488c7
--- /dev/null
+++ b/pages/news/[year]/[term].module.css
@@ -0,0 +1,7 @@
+.page {
+  padding-bottom: calc(30rem / 16);
+}
+
+.term {
+  color: var(--primary-accent);
+}
diff --git a/pages/news/[year]/[term].tsx b/pages/news/[year]/[term].tsx
new file mode 100644
index 00000000..f6e33f36
--- /dev/null
+++ b/pages/news/[year]/[term].tsx
@@ -0,0 +1,84 @@
+import { ParsedUrlQuery } from "querystring";
+
+import { GetStaticPaths, GetStaticProps } from "next";
+import { MDXRemote } from "next-mdx-remote";
+import React from "react";
+
+import { NewsCard } from "@/components/NewsCard";
+import {
+  getNewsBySlug,
+  getNewsByTerm,
+  getNewsTermsByYear,
+  getNewsYears,
+  News,
+} from "@/lib/news";
+
+import styles from "./[term].module.css";
+
+interface Props {
+  year: string;
+  term: string;
+  news: News[];
+}
+
+export default function TermNews({ year, term, news }: Props) {
+  return (
+    <div className={styles.page}>
+      <h1>
+        News Archive:{" "}
+        <span className={styles.term}>
+          {capitalize(term)} {year}
+        </span>
+      </h1>
+      {news.map(({ content, metadata }, idx) => (
+        <NewsCard
+          key={idx}
+          {...metadata}
+          date={new Date(metadata.date)}
+          fit={true}
+        >
+          <MDXRemote {...content} />
+        </NewsCard>
+      ))}
+    </div>
+  );
+}
+
+export const getStaticProps: GetStaticProps<Props, Params> = async (
+  context
+) => {
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  const { year, term } = context.params!;
+  const slugs = await getNewsByTerm(year, term);
+  const news = await Promise.all(
+    slugs.map((slug) => getNewsBySlug(year, term, slug))
+  );
+
+  // Reverse so that we are displaying the most recent news
+  // of term first
+  return { props: { year, term, news: news.reverse() } };
+};
+
+interface Params extends ParsedUrlQuery {
+  year: string;
+  term: string;
+}
+
+export const getStaticPaths: GetStaticPaths<Params> = async () => {
+  const years = await getNewsYears();
+  const terms = await Promise.all(
+    years.map(async (year) => {
+      const termsInYear = await getNewsTermsByYear(year);
+      return termsInYear.map((term) => ({ year, term }));
+    })
+  );
+
+  return {
+    paths: terms.flat().map((params) => ({ params })),
+    fallback: false,
+  };
+};
+
+function capitalize(str: string) {
+  return str.slice(0, 1).toUpperCase() + str.slice(1);
+}
-- 
2.39.2


From 4d9b4276f7cc2c18afa2a214d383262a2a223f1e Mon Sep 17 00:00:00 2001
From: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Date: Fri, 13 Aug 2021 04:38:08 -0400
Subject: [PATCH 4/4] Remove <br> tags

---
 content/news/2003/spring/2003-07-09-ja2morri.news.md | 2 +-
 content/news/2008/spring/2008-05-04-dtbartle.news.md | 6 +++---
 content/news/2018/fall/2018-09-01-ztseguin.news.md   | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/content/news/2003/spring/2003-07-09-ja2morri.news.md b/content/news/2003/spring/2003-07-09-ja2morri.news.md
index 3fac4640..bc70b88b 100644
--- a/content/news/2003/spring/2003-07-09-ja2morri.news.md
+++ b/content/news/2003/spring/2003-07-09-ja2morri.news.md
@@ -3,6 +3,6 @@ author: "ja2morri"
 date: "2003-07-09"
 ---
 
-Jim Elliott gave a great talk for the CSC yesterday and has put his slides online. <br>
+Jim Elliott gave a great talk for the CSC yesterday and has put his slides online. 
 
 [ http://www.vm.ibm.com/devpages/jelliott/events](<http://www.vm.ibm.com/devpages/jelliott/events>)
\ No newline at end of file
diff --git a/content/news/2008/spring/2008-05-04-dtbartle.news.md b/content/news/2008/spring/2008-05-04-dtbartle.news.md
index 580a77f0..d38c0c81 100644
--- a/content/news/2008/spring/2008-05-04-dtbartle.news.md
+++ b/content/news/2008/spring/2008-05-04-dtbartle.news.md
@@ -3,10 +3,10 @@ author: "dtbartle"
 date: "2008-05-04"
 ---
 
-Spring 2008 elections will be held on Tuesday May 13th at 4:30pm in the Comfy Lounge.<br>
+Spring 2008 elections will be held on Tuesday May 13th at 4:30pm in the Comfy Lounge.
 
- Get your nominations in as soon as possible on the CSC whiteboard!<br>
+ Get your nominations in as soon as possible on the CSC whiteboard!
 
- Nominations close 24 hours before the polls open.<br>
+ Nominations close 24 hours before the polls open.
 
  You can email your nominations to cro@csclub.uwaterloo.ca
\ No newline at end of file
diff --git a/content/news/2018/fall/2018-09-01-ztseguin.news.md b/content/news/2018/fall/2018-09-01-ztseguin.news.md
index e9485ad5..60092de5 100644
--- a/content/news/2018/fall/2018-09-01-ztseguin.news.md
+++ b/content/news/2018/fall/2018-09-01-ztseguin.news.md
@@ -5,12 +5,12 @@ date: "2018-09-01"
 
 Power has now been restored to the machine room and most CSC systems and services are now available, with the exception of:
 
-- **sucrose and taurine**<br>
+- **sucrose and taurine**
 
- We are currently unable to access to servers remotely. To restore these servers, we need a visit to the machine room to identify and resolve boot issues. <br>
+ We are currently unable to access to servers remotely. To restore these servers, we need a visit to the machine room to identify and resolve boot issues. 
 
 *As of Sept. 5, taurine is available again with reduced RAM.*
-- **[test-ipv6](<http://test-ipv6.csclub.uwaterloo.ca>) (restored as of Sept. 2)**<br>
+- **[test-ipv6](<http://test-ipv6.csclub.uwaterloo.ca>) (restored as of Sept. 2)**
 
  Currently available from within the UW network only. Investigation is still ongoing and may require assistance from IST's security team. 
 
-- 
2.39.2