From 07c57555815488435a301b2cbd3adfcf2062f791 Mon Sep 17 00:00:00 2001
From: ericcui <ericcui2005@gmail.com>
Date: Sat, 9 Nov 2024 02:25:36 -0800
Subject: [PATCH 1/7] Officer updating (without years) and added new BigTitle
 component

---
 components/section.tsx | 11 ++++++++
 pages/officers.tsx     | 58 ++++++++++++++++++++++++++++--------------
 2 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/components/section.tsx b/components/section.tsx
index eac08ae..b4d2a95 100644
--- a/components/section.tsx
+++ b/components/section.tsx
@@ -17,6 +17,17 @@ export const Title = styled.h1`
   }
 `;
 
+export const BigTitle = styled.h1`
+  text-align: center;
+  font: 36px/1 ${({ theme }) => theme.fonts.mono};
+  font-weight: bold;
+  margin-bottom: 40px;
+
+  @media (max-width: ${({ theme }) => theme.screen.desktop}) {
+    margin-bottom: 20px;
+  }
+`;
+
 export const Red = styled.span`
   color: ${({ theme }) => theme.colors.red};
 `;
diff --git a/pages/officers.tsx b/pages/officers.tsx
index 71fa4b0..a769e84 100644
--- a/pages/officers.tsx
+++ b/pages/officers.tsx
@@ -13,36 +13,56 @@ export default function Contact() {
     <Layout title="Officers" pageName="officers">
       <Container>
         <Title>Meet the ACM Officers!</Title>
+
+        {/* Active officers */}
         <People title="2023-2024" startShown={true}>
-          <Person name="Scott Hickmann" year={2025} position="Co-President" />
-          <Person name="Nathan Chi" year={2026} position="Co-President" />
-          <Person name="Kevin Li" year={2025} position="Vice-President" />
-          <Person name="Sydney Yan" year={2025} position="Financial Officer" />
-          <Person name="Hannah Kim" year={2024} position="Financial Officer" />
+          <Person name="Justin Gu" year={2027} position="Co-President" />
+          <Person name="Sydney Yan" year={2025} position="Co-President" />
           <Person
-            name="Kenan Hasanaliyev"
-            year={2025}
-            position="MLab Co-Director"
+            name="Suze van Adrichem"
+            year={0}
+            position="Financial Officer"
           />
+          <Person name="Elijah Song" year={0} position="Financial Officer" />
+          <Person name="Alden Eberts" year={2027} position="MLab Co-Director" />
           <Person
-            name="Conner Takehana"
-            year={2026}
+            name="Christopher Sun"
+            year={2027}
             position="MLab Co-Director"
           />
-          <Person name="Tanmay Garg" year={2026} position="ProCo Director" />
+          <Person name="Ethan Boneh" year={0} position="DevLab Co-Director" />
+          <Person name="Emily Han" year={0} position="DevLab Co-Director" />
+          <Person name="Nathan Chi" year={0} position="Quant Gym Co-Director" />
+          <Person name="Ryan Chi" year={0} position="Quant Gym Co-Director" />
+          <Person name="Brian Xu" year={0} position="Quant Gym Co-Director" />
+          <Person name="Tony Wang" year={0} position="ProCo Director" />
           <Person
-            name="Ian Ng"
-            year={2024}
-            position="Puzzle Hunt Co-Director"
+            name="Kristie Park"
+            year={0}
+            position="PuzzleHunt Co-Director"
           />
           <Person
-            name="Bradley Moon"
-            year={2025}
-            position="Puzzle Hunt Co-Director"
+            name="Daniel Sun"
+            year={0}
+            position="PuzzleHunt Co-Director"
           />
-          <Person name="Ishan Khare" year={2025} position="Reading Group" />
-          <Person name="William Li" position="Social Chair" />
+          <Person name="Tesvara Jiang" year={0} position="Social Co-Chair" />
+          <Person name="Annie Lee" year={0} position="Social Co-Chair" />
+          <Person name="Nathan Chi" year={0} position="GeoGuessr Co-Director" />
+          <Person name="Ryan Chi" year={0} position="GeoGuessr Co-Director" />
+          <Person
+            name="Daniel Zamoshchin"
+            year={0}
+            position="GeoGuessr Co-Director"
+          />
+          <Person name="Eric Cui" year={2027} position="Webmaster" />
+          <Person name="Sabrina Yen-Ko" year={2028} position="Webmaster" />
+          <Person name="Nathan Chi" year={0} position="Advisor" />
+          <Person name="Ryan Chi" year={0} position="Advisor" />
+          <Person name="Scott Hickman" year={0} position="Advisor" />
         </People>
+
+        {/* Alumni */}
         <People title="Alumni" startShown={false}>
           <Person name="Jeremy Kim" year={2024} position="Co-President" />
           <Person name="Ian Ng" year={2024} position="Co-President" />

From 1d5310efd9b65bb6d564991ec87d17dffe28f1b6 Mon Sep 17 00:00:00 2001
From: ericcui <ericcui2005@gmail.com>
Date: Sat, 9 Nov 2024 02:26:59 -0800
Subject: [PATCH 2/7] Removed BigTitle component

---
 components/section.tsx | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/components/section.tsx b/components/section.tsx
index b4d2a95..eac08ae 100644
--- a/components/section.tsx
+++ b/components/section.tsx
@@ -17,17 +17,6 @@ export const Title = styled.h1`
   }
 `;
 
-export const BigTitle = styled.h1`
-  text-align: center;
-  font: 36px/1 ${({ theme }) => theme.fonts.mono};
-  font-weight: bold;
-  margin-bottom: 40px;
-
-  @media (max-width: ${({ theme }) => theme.screen.desktop}) {
-    margin-bottom: 20px;
-  }
-`;
-
 export const Red = styled.span`
   color: ${({ theme }) => theme.colors.red};
 `;

From 74301b2f9cbb0b15ab7e5ce7302373ae0f04182e Mon Sep 17 00:00:00 2001
From: ericcui <ericcui2005@gmail.com>
Date: Tue, 12 Nov 2024 14:02:42 -0800
Subject: [PATCH 3/7] Added some years

---
 pages/officers.tsx | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pages/officers.tsx b/pages/officers.tsx
index a769e84..cc5e256 100644
--- a/pages/officers.tsx
+++ b/pages/officers.tsx
@@ -23,7 +23,7 @@ export default function Contact() {
             year={0}
             position="Financial Officer"
           />
-          <Person name="Elijah Song" year={0} position="Financial Officer" />
+          <Person name="Elijah Song" year={2026} position="Financial Officer" />
           <Person name="Alden Eberts" year={2027} position="MLab Co-Director" />
           <Person
             name="Christopher Sun"
@@ -32,7 +32,11 @@ export default function Contact() {
           />
           <Person name="Ethan Boneh" year={0} position="DevLab Co-Director" />
           <Person name="Emily Han" year={0} position="DevLab Co-Director" />
-          <Person name="Nathan Chi" year={0} position="Quant Gym Co-Director" />
+          <Person
+            name="Nathan Chi"
+            year={2026}
+            position="Quant Gym Co-Director"
+          />
           <Person name="Ryan Chi" year={0} position="Quant Gym Co-Director" />
           <Person name="Brian Xu" year={0} position="Quant Gym Co-Director" />
           <Person name="Tony Wang" year={0} position="ProCo Director" />
@@ -48,7 +52,11 @@ export default function Contact() {
           />
           <Person name="Tesvara Jiang" year={0} position="Social Co-Chair" />
           <Person name="Annie Lee" year={0} position="Social Co-Chair" />
-          <Person name="Nathan Chi" year={0} position="GeoGuessr Co-Director" />
+          <Person
+            name="Nathan Chi"
+            year={2026}
+            position="GeoGuessr Co-Director"
+          />
           <Person name="Ryan Chi" year={0} position="GeoGuessr Co-Director" />
           <Person
             name="Daniel Zamoshchin"
@@ -57,7 +65,7 @@ export default function Contact() {
           />
           <Person name="Eric Cui" year={2027} position="Webmaster" />
           <Person name="Sabrina Yen-Ko" year={2028} position="Webmaster" />
-          <Person name="Nathan Chi" year={0} position="Advisor" />
+          <Person name="Nathan Chi" year={2026} position="Advisor" />
           <Person name="Ryan Chi" year={0} position="Advisor" />
           <Person name="Scott Hickman" year={0} position="Advisor" />
         </People>

From 5d981265c0a9b700e16a910b57c7994bd18e4bd0 Mon Sep 17 00:00:00 2001
From: ericcui <ericcui2005@gmail.com>
Date: Tue, 12 Nov 2024 14:10:12 -0800
Subject: [PATCH 4/7] Added more years

---
 pages/officers.tsx | 40 ++++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/pages/officers.tsx b/pages/officers.tsx
index cc5e256..33ef6f1 100644
--- a/pages/officers.tsx
+++ b/pages/officers.tsx
@@ -30,44 +30,60 @@ export default function Contact() {
             year={2027}
             position="MLab Co-Director"
           />
-          <Person name="Ethan Boneh" year={0} position="DevLab Co-Director" />
-          <Person name="Emily Han" year={0} position="DevLab Co-Director" />
+          <Person
+            name="Ethan Boneh"
+            year={2027}
+            position="DevLab Co-Director"
+          />
+          <Person name="Emily Han" year={2027} position="DevLab Co-Director" />
           <Person
             name="Nathan Chi"
             year={2026}
             position="Quant Gym Co-Director"
           />
-          <Person name="Ryan Chi" year={0} position="Quant Gym Co-Director" />
-          <Person name="Brian Xu" year={0} position="Quant Gym Co-Director" />
+          <Person
+            name="Ryan Chi"
+            year={2025}
+            position="Quant Gym Co-Director"
+          />
+          <Person
+            name="Brian Xu"
+            year={2026}
+            position="Quant Gym Co-Director"
+          />
           <Person name="Tony Wang" year={0} position="ProCo Director" />
           <Person
             name="Kristie Park"
-            year={0}
+            year={2026}
             position="PuzzleHunt Co-Director"
           />
           <Person
             name="Daniel Sun"
-            year={0}
+            year={2025}
             position="PuzzleHunt Co-Director"
           />
-          <Person name="Tesvara Jiang" year={0} position="Social Co-Chair" />
-          <Person name="Annie Lee" year={0} position="Social Co-Chair" />
+          <Person name="Tesvara Jiang" year={2027} position="Social Co-Chair" />
+          <Person name="Annie Lee" year={2027} position="Social Co-Chair" />
           <Person
             name="Nathan Chi"
             year={2026}
             position="GeoGuessr Co-Director"
           />
-          <Person name="Ryan Chi" year={0} position="GeoGuessr Co-Director" />
+          <Person
+            name="Ryan Chi"
+            year={2025}
+            position="GeoGuessr Co-Director"
+          />
           <Person
             name="Daniel Zamoshchin"
-            year={0}
+            year={2024}
             position="GeoGuessr Co-Director"
           />
           <Person name="Eric Cui" year={2027} position="Webmaster" />
           <Person name="Sabrina Yen-Ko" year={2028} position="Webmaster" />
           <Person name="Nathan Chi" year={2026} position="Advisor" />
-          <Person name="Ryan Chi" year={0} position="Advisor" />
-          <Person name="Scott Hickman" year={0} position="Advisor" />
+          <Person name="Ryan Chi" year={2025} position="Advisor" />
+          <Person name="Scott Hickman" year={2025} position="Advisor" />
         </People>
 
         {/* Alumni */}

From d57b6bfc5f5a9d8d4529bd30827c35fcbeb602a1 Mon Sep 17 00:00:00 2001
From: ericcui <ericcui2005@gmail.com>
Date: Tue, 12 Nov 2024 14:56:09 -0800
Subject: [PATCH 5/7] Added final years

---
 pages/officers.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/officers.tsx b/pages/officers.tsx
index 33ef6f1..0eca3de 100644
--- a/pages/officers.tsx
+++ b/pages/officers.tsx
@@ -20,7 +20,7 @@ export default function Contact() {
           <Person name="Sydney Yan" year={2025} position="Co-President" />
           <Person
             name="Suze van Adrichem"
-            year={0}
+            year={2027}
             position="Financial Officer"
           />
           <Person name="Elijah Song" year={2026} position="Financial Officer" />
@@ -51,7 +51,7 @@ export default function Contact() {
             year={2026}
             position="Quant Gym Co-Director"
           />
-          <Person name="Tony Wang" year={0} position="ProCo Director" />
+          <Person name="Tony Wang" year={2027} position="ProCo Director" />
           <Person
             name="Kristie Park"
             year={2026}

From debe5cd3158f6b5837b6d66ae1e199e8c1f544b4 Mon Sep 17 00:00:00 2001
From: ericcui <ericcui2005@gmail.com>
Date: Tue, 12 Nov 2024 15:09:57 -0800
Subject: [PATCH 6/7] Added new type hinting to Person component and modified
 officer titles

---
 components/people.tsx |  4 ++--
 pages/officers.tsx    | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/components/people.tsx b/components/people.tsx
index a444c35..63a3878 100644
--- a/components/people.tsx
+++ b/components/people.tsx
@@ -1,5 +1,5 @@
 import { math } from 'polished';
-import { useState } from 'react';
+import { ReactNode, useState } from 'react';
 import styled from 'styled-components';
 
 import { LinkComponent, Title } from '../components/section';
@@ -88,7 +88,7 @@ export function Person({
 }: {
   name: string;
   year?: number;
-  position?: string;
+  position?: ReactNode;
 }) {
   return (
     <PersonContainer>
diff --git a/pages/officers.tsx b/pages/officers.tsx
index 0eca3de..0bc95f1 100644
--- a/pages/officers.tsx
+++ b/pages/officers.tsx
@@ -39,12 +39,22 @@ export default function Contact() {
           <Person
             name="Nathan Chi"
             year={2026}
-            position="Quant Gym Co-Director"
+            position={
+              <>
+                Quant Gym Co-Director <br />
+                Geoguessr Co-Director
+              </>
+            }
           />
           <Person
             name="Ryan Chi"
             year={2025}
-            position="Quant Gym Co-Director"
+            position={
+              <>
+                Quant Gym Co-Director <br />
+                Geoguessr Co-Director
+              </>
+            }
           />
           <Person
             name="Brian Xu"
@@ -64,16 +74,6 @@ export default function Contact() {
           />
           <Person name="Tesvara Jiang" year={2027} position="Social Co-Chair" />
           <Person name="Annie Lee" year={2027} position="Social Co-Chair" />
-          <Person
-            name="Nathan Chi"
-            year={2026}
-            position="GeoGuessr Co-Director"
-          />
-          <Person
-            name="Ryan Chi"
-            year={2025}
-            position="GeoGuessr Co-Director"
-          />
           <Person
             name="Daniel Zamoshchin"
             year={2024}

From fe8fe4b44c0ab2dbb9607a7537cb1a6931996d6e Mon Sep 17 00:00:00 2001
From: ericcui <ericcui2005@gmail.com>
Date: Tue, 12 Nov 2024 15:16:49 -0800
Subject: [PATCH 7/7] Combined Ryan and Nathin Chi roles

---
 pages/officers.tsx | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pages/officers.tsx b/pages/officers.tsx
index 0bc95f1..00a3d64 100644
--- a/pages/officers.tsx
+++ b/pages/officers.tsx
@@ -15,7 +15,7 @@ export default function Contact() {
         <Title>Meet the ACM Officers!</Title>
 
         {/* Active officers */}
-        <People title="2023-2024" startShown={true}>
+        <People title="2024-2025" startShown={true}>
           <Person name="Justin Gu" year={2027} position="Co-President" />
           <Person name="Sydney Yan" year={2025} position="Co-President" />
           <Person
@@ -41,8 +41,8 @@ export default function Contact() {
             year={2026}
             position={
               <>
-                Quant Gym Co-Director <br />
-                Geoguessr Co-Director
+                Advisor <br />
+                Quant Gym/GeoGuessr Co-Director
               </>
             }
           />
@@ -51,8 +51,8 @@ export default function Contact() {
             year={2025}
             position={
               <>
-                Quant Gym Co-Director <br />
-                Geoguessr Co-Director
+                Advisor <br />
+                Quant Gym/GeoGuessr Co-Director
               </>
             }
           />
@@ -81,8 +81,6 @@ export default function Contact() {
           />
           <Person name="Eric Cui" year={2027} position="Webmaster" />
           <Person name="Sabrina Yen-Ko" year={2028} position="Webmaster" />
-          <Person name="Nathan Chi" year={2026} position="Advisor" />
-          <Person name="Ryan Chi" year={2025} position="Advisor" />
           <Person name="Scott Hickman" year={2025} position="Advisor" />
         </People>