From df23ba490a3993c9464b8038ad131ac2a7f8837b Mon Sep 17 00:00:00 2001
From: Mohamad Mortada <mmortada685@gmail.com>
Date: Fri, 14 Nov 2025 21:03:39 -0800
Subject: [PATCH] Improve Team Page Spacing (#1712)

---
 pages/team.tsx   | 36 ++++++++++++++++++------------------
 public/team.json | 46 +++++++++++-----------------------------------
 2 files changed, 29 insertions(+), 53 deletions(-)

diff --git a/pages/team.tsx b/pages/team.tsx
index c4b86400..e1eb15bc 100644
--- a/pages/team.tsx
+++ b/pages/team.tsx
@@ -262,6 +262,24 @@ export default function Team({ team }) {
                       ))}
                   </Grid>
                 </CommunityTeamBox>
+                <CommunityTeamBox title="Welcomers">
+                  <Grid columns={[1, null, 2]} gap={2} m={10}>
+                    {team.current
+                      ?.filter(member => member.department === 'Welcoming')
+                      .map(member => (
+                        <Bio
+                          img={member.avatar}
+                          name={member.name}
+                          teamRole={member.role}
+                          text={member.bio}
+                          pronouns={member.pronouns}
+                          email={member.email}
+                          href={member.website}
+                          key={member.name}
+                        />
+                      ))}
+                  </Grid>
+                </CommunityTeamBox>
                 <CommunityTeamBox title="Virtual Events">
                   <Grid columns={[1, null, 2]} gap={2} m={10}>
                     {team.current
@@ -298,24 +316,6 @@ export default function Team({ team }) {
                       ))}
                   </Grid>
                 </CommunityTeamBox>
-                <CommunityTeamBox title="Welcomers">
-                  <Grid columns={[1, null, 2]} gap={2} m={10}>
-                    {team.current
-                      ?.filter(member => member.department === 'Welcoming')
-                      .map(member => (
-                        <Bio
-                          img={member.avatar}
-                          name={member.name}
-                          teamRole={member.role}
-                          text={member.bio}
-                          pronouns={member.pronouns}
-                          email={member.email}
-                          href={member.website}
-                          key={member.name}
-                        />
-                      ))}
-                  </Grid>
-                </CommunityTeamBox>
               </Grid>
             </Box>
             <br />
diff --git a/public/team.json b/public/team.json
index 2b795986..9bcd6c3c 100644
--- a/public/team.json
+++ b/public/team.json
@@ -449,17 +449,6 @@
     "website": "",
     "avatar": "https://cachet.dunkirk.sh/users/U08B2HD1JNA/r"
   },
-  {
-    "name": "Mohamad Mortada",
-    "department": "HQ",
-    "role": "Engineering",
-    "acknowledged": false,
-    "bio": "Mohamad is a Hack Clubber from the San Francisco Bay Area. After being encouraged to join by a friend, he ran a couple YSWS and automated a few internal processes within HQ. He loves web & app development in addition to scripting. He is now continuing to contribute to various projects and events!",
-    "slackId": "U05UQ2RTJ6T",
-    "email": "mohamad",
-    "website": "",
-    "avatar": "https://hc-cdn.hel1.your-objectstorage.com/s/v3/63a2643b5d7fa7ead71eb93ef06f628f0080e9ee_image_1558.png"
-  },
   {
     "name": "Charlie Nicholson",
     "department": "HQ",
@@ -775,6 +764,17 @@
     "website": "https://lukeoldenburg.com/",
     "avatar": "https://cachet.dunkirk.sh/users/U06MYDS2LHX/r"
   },
+  {
+    "name": "Mohamad Mortada",
+    "department": "HCB",
+    "role": "Engineering Contributor",
+    "acknowledged": false,
+    "bio": "Mohamad is a Hack Clubber from the San Francisco Bay Area. After being encouraged to join by a friend, he ran a couple YSWS and automated a few internal processes within HQ. He loves web & app development in addition to scripting. He is now working on HCB and its brand new mobile app!",
+    "slackId": "U05UQ2RTJ6T",
+    "email": "mohamad",
+    "website": "",
+    "avatar": "https://hc-cdn.hel1.your-objectstorage.com/s/v3/63a2643b5d7fa7ead71eb93ef06f628f0080e9ee_image_1558.png"
+  },
   {
     "name": "Sean Outram",
     "department": "HCB",
@@ -1228,18 +1228,6 @@
     "website": "",
     "avatar": "https://cachet.dunkirk.sh/users/U0779CJQLM8/r"
   },
-  {
-    "name": "Darlene Wu",
-    "department": "Welcoming",
-    "role": "Past Welcomer",
-    "acknowledged": true,
-    "bio": "Darlene is a 16 year old Hack Clubber from Indonesia who runs virtual events for the Hack Club community. She also helps welcome members into the Slack",
-    "bioHackFoundation": "",
-    "slackId": "U07SX29CECA",
-    "email": "",
-    "website": "",
-    "avatar": "https://cachet.dunkirk.sh/users/U07SX29CECA/r"
-  },
   {
     "name": "Samvid",
     "department": "Welcoming",
@@ -1921,18 +1909,6 @@
     "website": "https://youthacks.org",
     "avatar": "https://hc-cdn.hel1.your-objectstorage.com/s/v3/4926a04e4aa9a101e4919d8b8071991a74c20b08_compressjpeg.online_img_512x512_.jpg"
   },
-  {
-    "name": "David Cornu",
-    "department": "HCB",
-    "role": "Engineering",
-    "acknowledged": false,
-    "bio": "",
-    "bioHackFoundation": "",
-    "slackId": "U092BUBS28G",
-    "email": "davidc",
-    "website": "",
-    "avatar": "https://cachet.dunkirk.sh/users/U092BUBS28G/r"
-  },
   {
     "name": "Bartosz Budnik",
     "department": "HCB",