Merge branch 'main' into richardshuai/karaoke

content/team/discord-team.json

@@ -3,28 +3,29 @@
     "name": "Marcus Chan",
     "role": "Team Lead"
   },
-  {
-    "name": "Laura Nguyen",
-    "role": "Team Lead"
-  },
-  {
-    "name": "Victor Zheng"
-  },
   {
     "name": "Ashish Selvaraj"
   },
-  {
-    "name": "Saad Ali"
-  },
   {
     "name": "Martin Zhao"
   },
   {
-    "name": "Mark Chen",
-    "role": "Advisor"
+    "name": "Justin Young"
   },
   {
-    "name": "Alex Zhang",
+    "name": "Prabhav Khera"
+  },
+  {
+    "name": "Fan Yang"
+  },
+  {
+    "name": "Richard Fan"
+  },
+  {
+    "name": "Jainah Chen"
+  },
+  {
+    "name": "Laura Nguyen",
     "role": "Advisor"
   }
 ]

pages/about/team.tsx

@@ -175,11 +175,11 @@ export const getStaticProps: GetStaticProps<Props> = async () => {
       name: "Discord Bot (CodeyBot) Developers",
       members: discordData,
     },
-    {
-      id: "discord",
-      name: "Discord Moderators",
-      members: discordModsData,
-    },
+    // {
+    //   id: "discord",
+    //   name: "Discord Moderators",
+    //   members: discordModsData,
+    // },
     {
       id: "events",
       name: "Events",