Merge branch 'main' into support-multiple-news-homepage

content/team/execs/01-dora-su.md

@@ -1,6 +0,0 @@
----
-name: Dora Su
-role: President
----
-
-Hey everyone, I'm Dora, a 2nd year CS student.

content/team/execs/01-juthika-hoque.md

@@ -0,0 +1,6 @@
+---
+name: Juthika Hoque
+role: President
+---
+
+Hi!! I’m Juthika, a 2B CS student. I joined CSC in Spring 2021, and instantly found the community that I felt had been missing in CS due to an online first year. The visions and the goals of CSC have resonated with me since I joined, and quickly developed into a passion for me. I hope that as President, I can lead CSC while keeping our mission in mind to make the computing community a better place for everyone.

content/team/execs/02-eric-huang.md

@@ -0,0 +1,6 @@
+---
+name: Eric Huang
+role: Vice President
+---
+
+Hi! I'm Eric, a 2B CS student. As VP, I help lead our passionate events team that bring lots of wonderful opportunities to the CSC public! The CSC community has helped me grow in lots of ways, and I hope to provide the same experience for anyone interested in Computer Science. Besides doing the non-stop school grind, you can usually find me playing volleyball or watching anime. Don't be afraid to reach out to me on Discord for a chat, or say hi to me in any way! 😁

content/team/execs/02-jason-sang.md

@@ -1,6 +0,0 @@
----
-name: Jason Sang
-role: Vice President
----
-
-Hi! I’m Jason and I’m a 3B CS student. As VP, I help lead the events and operations team. Joining in Winter 2021, I quickly warmed up to the vision that Kallen and Gordon, our former Presidents, had for CSC. Like them, I saw CSC as a chance to fill the cohort gap that Engineering had and that Computer Science lacked. Other than grinding the Waterloo CS cycle, you’ll find me in my spare time composing and playing acoustic fingerstyle guitar or drowning in bass at a festival 😆.

content/team/execs/03-anjing-li.md

@@ -1,6 +0,0 @@
----
-name: Anjing Li 
-role: Assistant Vice President
----
-
-Hey guys! I'm Anjing, a 2nd year CS student.

content/team/execs/03-dina-orucevic.md

@@ -0,0 +1,6 @@
+---
+name: Dina Orucevic
+role: Assistant Vice President
+---
+
+Hi everyone, I’m Dina, a rising 1B student in Systems Design Engineering! I’m so glad I get the chance to lead a group of interested students to make the CS community even more inclusive, diverse, and engaging! In my free time I love snapping film photos, going to dog parks (even though I don’t own a dog) and reading a good novel.

content/team/execs/04-eden-chan.md

@@ -0,0 +1,11 @@
+---  
+name: Eden Chan
+role: Treasurer
+---
+
+👋 Hello! I’m Eden and I’m a second year CS student. 
+As treasurer, I make sure that CSC has the funds to run all the 🔥🔥🔥 initiatives and events throughout the term.
+I also help lead our amazing events team plan socials and community-focused events. 🚀🚀 🚀
+Joining in Winter 2021, I warmed up to the vision that Kallen, Gordon, and Jason, our former Presidents, had for CSC. 
+Like them, I saw CSC as a chance to fill the cohort gap that Engineering had and that Computer Science lacked. 
+Other than grinding the Waterloo CS cycle, you can find me shamelessly plugging my anime piano covers and blog this term :3

content/team/execs/04-yanni-wang.md

@@ -1,6 +0,0 @@
----  
-name: Yanni Wang
-role: Treasurer
----
-
-Hello! I’m Yanni and I’m a 2A CS student. As treasurer, I make sure that CSC has the funds to run all the amazing initiatives and events throughout the term. In my spare time I enjoy skateboarding, baking bread, and playing video games. If you see me on campus, don’t hesitate to say hi :D

content/team/execs/05-max-erenberg.md

@@ -1,6 +0,0 @@
----
-name: Max Erenberg
-role: Systems Administrator
----
-
-Hi, I'm Max, and I'm in 4A CS. I love GNU/Linux, tiling window managers, and everything in between.

content/team/execs/05-raymond-li.md

@@ -0,0 +1,6 @@
+---
+name: Raymond Li
+role: Systems Administrator
+---
+
+Hey there! I'm [Raymond Li](https://raymond.li). I'm in my 2B CS term. As sysadmin, I lead syscom in maintaining all the club infrastructure, including our [machines](https://wiki.csclub.uwaterloo.ca/Machine_List), [mirror](https://mirror.csclub.uwaterloo.ca/stats), [wiki](https://wiki.csclub.uwaterloo.ca), [email service](https://mail.csclub.uwaterloo.ca), [Gitea instance](https://git.csclub.uwaterloo.ca), [Mattermost instance](https://mattermost.csclub.uwaterloo.ca), [TheLounge instance](https://chat.csclub.uwaterloo.ca), and much much more. I like to code, ski, and play chess and violin.<br />#btwiusearch (at least until [Linux expires in 2038](https://youtu.be/dQw4w9WgXcQ))

content/team/programme-committee.json

@@ -1,20 +1,69 @@
 [
   {
-    "name": "Sam Honoridez",
+    "name": "Jenny Zhang",
     "role": "Head of Design"
   },
   {
-    "name": "Jenny Zhang",
+    "name": "Vivian Guo",
+    "role": "Head of Design"
+  },
+  {
+    "name": "Rachel Ma",
     "role": "Design"
   },
   {
-    "name": "Vivian Guo",
+    "name": "Aaryan Shroff",
     "role": "Design"
   },
   {
-    "name": "Jason Sang",
+    "name": "Andy Wang",
+    "role": "Head of Discord"
+  },
+  {
+    "name": "Alex Zhang",
+    "role": "Discord"
+  },
+  {
+    "name": "Allen Qin Lu",
+    "role": "Discord",
+    "image": "/images/team/AllenLu.png"
+  },
+  {
+    "name": "Chris Xie",
+    "role": "Discord"
+  },
+  {
+    "name": "Edwin Yang",
+    "role": "Discord"
+  },
+  {
+    "name": "Laura Nguyen",
+    "role": "Discord"
+  },
+  {
+    "name": "Marcus Chan",
+    "role": "Discord"
+  },
+  {
+    "name": "Mark Chen",
+    "role": "Discord"
+  },
+  {
+    "name": "Victor Zheng",
+    "role": "Discord"
+  },
+  {
+    "name": "Eden Chan",
+    "role": "Head of Events"
+  },
+  {
+    "name": "Eric Huang",
     "role": "Head of Events"
   },
+  {
+    "name": "Adele Chen",
+    "role": "Events"
+  },
   {
     "name": "Amya Singhal",
     "role": "Events"
@@ -24,107 +73,149 @@
     "role": "Events"
   },
   {
-    "name": "Eric Huang",
+    "name": "Catherine Wan",
     "role": "Events"
   },
   {
-    "name": "Riddhi Bajaj",
+    "name": "Diana Brebeanu",
     "role": "Events"
   },
   {
-    "name": "Stephanie Xu",
+    "name": "Elaine Han",
     "role": "Events"
   },
   {
-    "name": "Yanni Wang",
+    "name": "Jonathan Cui",
     "role": "Events"
   },
   {
-    "name": "Anjing Li",
-    "role": "Head of Marketing"
+    "name": "Kenson Hui",
+    "role": "Events"
   },
   {
-    "name": "Alex Zhang",
-    "role": "Marketing"
+    "name": "Mabel Kwok",
+    "role": "Events"
   },
   {
-    "name": "Catherine Tao",
-    "role": "Marketing"
+    "name": "Mashrur Chowdhury",
+    "role": "Events"
+  },
+  {
+    "name": "Matthew Wang",
+    "role": "Events"
+  },
+  {
+    "name": "Naman Chhawchharia",
+    "role": "Events"
+  },
+  {
+    "name": "Riddhi Bajaj",
+    "role": "Events"
+  },
+  {
+    "name": "Santiago Montemayor Gomez",
+    "role": "Events",
+    "image": "/images/team/SantiagoMontemayor.jpg"
+  },
+  {
+    "name": "Tommy Jiang",
+    "role": "Events"
+  },
+  {
+    "name": "William Tran",
+    "role": "Events"
   },
   {
     "name": "David Chen",
-    "role": "Marketing"
+    "role": "Head of External Affairs"
+  },
+  {
+    "name": "Daniel Kim",
+    "role": "External Affairs"
+  },
+  {
+    "name": "Eric Liu",
+    "role": "External Affairs"
+  },
+  {
+    "name": "Victor Wu",
+    "role": "External Affairs"
+  },
+  {
+    "name": "Wanda Song",
+    "role": "External Affairs"
   },
   {
     "name": "Dina Orucevic",
-    "role": "Marketing"
+    "role": "Head of Marketing"
   },
   {
-    "name": "Helen Dong",
-    "role": "Marketing"
+    "name": "Arjun Amit Athalye",
+    "role": "Marketing",
+    "image": "/images/team/ArjunAthalye.jpeg"
   },
   {
-    "name": "Saikrishna Tadepalli",
+    "name": "Catherine Tao",
     "role": "Marketing"
   },
   {
-    "name": "Sherry Lev",
+    "name": "Ethan Hong",
     "role": "Marketing"
   },
   {
-    "name": "Andrew Wang",
-    "role": "Head of Discord"
+    "name": "Gurnika Kaur",
+    "role": "Marketing"
   },
   {
-    "name": "Charles Zhang",
-    "role": "Discord Mod"
+    "name": "Haley Song",
+    "role": "Marketing"
   },
   {
-    "name": "Chris Xie",
-    "role": "Discord Mod"
+    "name": "Kshama Patel",
+    "role": "Marketing"
   },
   {
-    "name": "Elaine Han",
-    "role": "Discord Mod"
+    "name": "Bonnie Peng",
+    "role": "Head of Photography"
   },
   {
-    "name": "Edwin Yang",
-    "role": "Discord Mod"
+    "name": "Annie Zhang",
+    "role": "Photographer"
   },
   {
-    "name": "Kallen Tu",
-    "role": "Discord Mod"
+    "name": "Calvin Zhong",
+    "role": "Photographer"
   },
   {
-    "name": "Laura Nguyen",
-    "role": "Discord Mod"
+    "name": "Jesse Liu",
+    "role": "Photographer"
   },
   {
-    "name": "Mark Chen",
-    "role": "Discord Mod"
+    "name": "Amy Luo",
+    "role": "Head of Reps"
   },
   {
-    "name": "Juthika Hoque",
-    "role": "Head of Reps"
+    "name": "Govind Varma",
+    "role": "Representative"
   },
   {
-    "name": "Aaron Choo",
+    "name": "Guneet Bola",
     "role": "Representative"
   },
   {
-    "name": "Amy Luo",
+    "name": "Ivy Lei",
     "role": "Representative"
   },
   {
-    "name": "Eden Chan",
+    "name": "Jasmine Bal",
     "role": "Representative"
   },
   {
-    "name": "Felix Yang",
+    "name": "Mayank Mehra",
     "role": "Representative"
   },
   {
-    "name": "Guneet Bola",
+    "name": "Olivia Liu",
     "role": "Representative"
   },
   {

content/team/systems-committee.json

@@ -1,25 +1,41 @@
 [
   {
-    "name": "Max Erenberg",
+    "name": "Raymond Li",
     "role": "Sysadmin"
   },
+  {
+    "name": "Amin Bandali",
+    "role": "Alumni"
+  },
   {
     "name": "Andrew Wang",
     "role": "",
     "image": "/images/team/AndrewWang-Syscom.jpg"
   },
   {
-    "name": "Raymond Li",
-    "role": ""
+    "name": "Anthony Brennan",
+    "role": "Alumni"
   },
   {
-    "name": "Rio Liu",
-    "role": ""
+    "name": "Edwin Zhang",
+    "role": "Alumni"
   },
   {
-    "name": "Amin Bandali",
+    "name": "Elana Hashman",
+    "role": "Alumni"
+  },
+  {
+    "name": "Jennifer Zhou",
     "role": "Alumni"
   },
+  {
+    "name": "Max Erenberg",
+    "role": ""
+  },
+  {
+    "name": "Rio Liu",
+    "role": ""
+  },
   {
     "name": "Zachary Seguin",
     "role": "Alumni"

content/team/terminal-committee.json

@@ -0,0 +1,22 @@
+[
+  {
+    "name": "Daniel Liu",
+    "role": ""
+  },
+  {
+    "name": "David Hui",
+    "role": ""
+  },
+  {
+    "name": "Devin Lin",
+    "role": ""
+  },
+  {
+    "name": "Joseph Wang",
+    "role": ""
+  },
+  {
+    "name": "Seshan Ravikumar",
+    "role": ""
+  }
+]

content/team/web-committee.json

@@ -1,32 +1,16 @@
 [
   {
-    "name": "Aditya Thakral",
+    "name": "Amy Wang",
     "role": "Team Lead"
   },
   {
     "name": "Neil Parikh",
     "role": "Team Lead"
   },
-  {
-    "name": "Amy Wang",
-    "role": "Developer"
-  },
   {
     "name": "Beihao Zhou",
     "role": "Developer"
   },
-  {
-    "name": "Bonnie Peng",
-    "role": "Developer"
-  },
-  {
-    "name": "Catherine Wan",
-    "role": "Developer"
-  },
-  {
-    "name": "Dora Su",
-    "role": "Developer"
-  },
   {
     "name": "Emily Chiu",
     "role": "Developer"
@@ -38,9 +22,5 @@
   {
     "name": "Shahan NedaDahandeh",
     "role": "Developer"
-  },
-  {
-    "name": "William Tran",
-    "role": "Developer"
   }
 ]

pages/about/team.tsx

@@ -18,6 +18,7 @@ import {
 
 import programmeData from "../../content/team/programme-committee.json";
 import systemsData from "../../content/team/systems-committee.json";
+import terminalData from "../../content/team/terminal-committee.json";
 import webData from "../../content/team/web-committee.json";
 
 import styles from "./team.module.css";
@@ -32,9 +33,16 @@ interface Props {
   programme: Metadata[];
   website: Metadata[];
   systems: Metadata[];
+  terminal: Metadata[];
 }
 
-export default function Team({ execs, programme, website, systems }: Props) {
+export default function Team({
+  execs,
+  programme,
+  website,
+  systems,
+  terminal,
+}: Props) {
   return (
     <>
       <Title>Team</Title>
@@ -47,6 +55,7 @@ export default function Team({ execs, programme, website, systems }: Props) {
               <Link href="#programme">Programme Committee</Link>
               <Link href="#website">Website Committee</Link>
               <Link href="#system">Systems Committee</Link>
+              <Link href="#terminal">Terminal Committee</Link>
             </div>
             <h2
               className={styles.subheading}
@@ -80,6 +89,10 @@ export default function Team({ execs, programme, website, systems }: Props) {
           <h2 className={styles.subheading}>Systems Committee</h2>
           <MembersList team={systems} />
         </div>
+        <div id="terminal">
+          <h2 className={styles.subheading}>Terminal Committee</h2>
+          <MembersList team={terminal} />
+        </div>
       </DefaultLayout>
       <div className={styles.elections}>
         <Bubble>
@@ -131,13 +144,14 @@ export const getStaticProps: GetStaticProps<Props> = async () => {
   const execs = (await Promise.all(
     execNames.map((name) => getExec(name))
   )) as SerializedExec[];
-  const [programme, website, systems] = await Promise.all([
+  const [programme, website, systems, terminal] = await Promise.all([
     getTeamWithImages(programmeData),
     getTeamWithImages(webData),
     getTeamWithImages(systemsData),
+    getTeamWithImages(terminalData),
   ]);
 
   return {
-    props: { execs, programme, website, systems },
+    props: { execs, programme, website, systems, terminal },
   };
 };