From fcb19c6645b97f441d5018a5c99d7236510dbd20 Mon Sep 17 00:00:00 2001
From: Cedric Rische <cedric.rische@cedsoft.de>
Date: Sat, 24 Jan 2026 02:02:21 +0100
Subject: [PATCH 1/2] Updated contact email to support@hackhpi.org and adjusted
 imprint owner information

---
 src/components/Faq/Faq.jsx                   | 4 ++--
 src/components/Footer/Footer.jsx             | 4 ++--
 src/components/Imprint/Imprint.jsx           | 2 +-
 src/components/Registration/Registration.jsx | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/Faq/Faq.jsx b/src/components/Faq/Faq.jsx
index 210da1a..8415d35 100644
--- a/src/components/Faq/Faq.jsx
+++ b/src/components/Faq/Faq.jsx
@@ -126,7 +126,7 @@ export function Faq() {
                     questions</Typography>
                 <Typography variant={"body1"} sx={{marginBottom: "4rem"}}>Can't find the answer you're looking for? You
                     can
-                    always <Link href={"mailto:team@hackhpi.org"} color={"inherit"}>send us an email</Link> with your
+                    always <Link href={"mailto:support@hackhpi.org"} color={"inherit"}>send us an email</Link> with your
                     inquiry!</Typography>
                 <Grid container spacing={7}>
                     <Grid item xs={12} md={4}>
@@ -160,7 +160,7 @@ export function Faq() {
                                         ask!</Typography>
                                 </CardContent>
                                 <CardActions>
-                                    <Button sx={{ ml: 1, mb: 1 }} variant="contained" size="small" color="primary" href={"mailto:team@hackhpi.org"} startIcon={<MailOutline />}>Contact us</Button>
+                                    <Button sx={{ ml: 1, mb: 1 }} variant="contained" size="small" color="primary" href={"mailto:support@hackhpi.org"} startIcon={<MailOutline />}>Contact us</Button>
                                 </CardActions>
                             </Card>
                         </Stack>
diff --git a/src/components/Footer/Footer.jsx b/src/components/Footer/Footer.jsx
index 41ef6f2..2ac7a5f 100644
--- a/src/components/Footer/Footer.jsx
+++ b/src/components/Footer/Footer.jsx
@@ -30,7 +30,7 @@ const socials = [
     },
     {
         icon: <Mail/>,
-        link: "mailto:team@hackhpi.org",
+        link: "mailto:support@hackhpi.org",
     },
 ]
 
@@ -128,4 +128,4 @@ function Footer() {
     )
 }
 
-export default Footer
\ No newline at end of file
+export default Footer
diff --git a/src/components/Imprint/Imprint.jsx b/src/components/Imprint/Imprint.jsx
index d87c524..cf7e85c 100644
--- a/src/components/Imprint/Imprint.jsx
+++ b/src/components/Imprint/Imprint.jsx
@@ -23,7 +23,7 @@ function Imprint() {
                         E-Mail: <Link href="mailto:team@hackhpi.org" color={"inherit"}>team@hackhpi.org</Link>
                     </Typography>
                     <Typography variant="body1">Inhaltlich verantwortlich gemäß § 5 TMG, § 55 RStV: Klubsprecher Jeanne
-                        Aue, Mathilda Heise und Cedric Rische</Typography>
+                        Aue, Daniel Kiss und Cedric Rische</Typography>
                 </Box>
                 <Box>
                     <Typography variant="h2" gutterBottom>Haftungsausschluss</Typography>
diff --git a/src/components/Registration/Registration.jsx b/src/components/Registration/Registration.jsx
index e09f0a3..aaa9a48 100644
--- a/src/components/Registration/Registration.jsx
+++ b/src/components/Registration/Registration.jsx
@@ -472,7 +472,7 @@ function Registration() {
       })
       .catch((error) => {
         alert(
-          "Could not save Registration. Please try again. If problem persists, please contact team@hackhpi.org. Error: " +
+          "Could not save Registration. Please try again. If problem persists, please contact support@hackhpi.org. Error: " +
             JSON.stringify(error.data),
         );
         setIsSending(false);

From f6651ea1eff351cb8576a1e507629bab36a040b7 Mon Sep 17 00:00:00 2001
From: Cedric Rische <cedric.rische@cedsoft.de>
Date: Sat, 24 Jan 2026 02:08:34 +0100
Subject: [PATCH 2/2] Updated team member details for 2026, replaced
 `teamMembers25` with `teamMembers26`, and added new entries

---
 src/components/Team/Team.jsx | 65 ++++++++++++++++++++++++++++++++++--
 1 file changed, 62 insertions(+), 3 deletions(-)

diff --git a/src/components/Team/Team.jsx b/src/components/Team/Team.jsx
index aca52a4..c5bf405 100644
--- a/src/components/Team/Team.jsx
+++ b/src/components/Team/Team.jsx
@@ -151,6 +151,65 @@ const teamMembers25 = [
     },
 ]
 
+const teamMembers26 = [
+  {
+    name: "Cedric Rische",
+    position: "Team Member",
+    linkedIn: "cedric-rische",
+    profilePicture: CedricRischeProfile2025,
+  },
+  {
+    name: "Grit Manssen",
+    position: "Team Member",
+    linkedIn: "grit-manssen-0270b023a",
+    profilePicture: GritManssenProfile2025,
+  },
+  {
+    name: "Tanja Lehmann",
+    position: "Team Member",
+    linkedIn: "tanja-lehmann-36713a265",
+    profilePicture: TanjaLehmannProfile2025,
+  },
+  {
+    name: "Daniel Kiss",
+    position: "Team Member",
+    linkedIn: "kdaniel21",
+    profilePicture: DanielKissProfile2025,
+  },
+  {
+    name: "Jeanne Aue",
+    position: "Team Member",
+    linkedIn: "jeanne-aue",
+    profilePicture: JeanneAueProfile2025,
+  },
+  {
+    name: "Constantin Sachse",
+    position: "Team Member",
+    linkedIn: "",
+    profilePicture: ConstantinSachseProfile2025,
+  },
+  {
+    name: "Alyssa Hilgendorf",
+    position: "Team Member",
+    linkedIn: "alyssa-hilgendorf-835a45346",
+  },
+  {
+    name: "Henri Becker",
+    position: "Team Member",
+    linkedIn: "henri-aldo-becker-06a265297",
+  },
+  {
+    name: "Jolanda Bolt",
+    position: "Team Member",
+    linkedIn: "jolanda-bolt-6480a5222",
+  },
+  {
+    name: "Klara Prigge",
+    position: "Team Member",
+    linkedIn: "klara-luise-prigge-8b73a830a",
+  },
+];
+
 
 function stringToColor(string) {
     let hash = 0;
@@ -194,7 +253,7 @@ function Team() {
         <Container sx={{paddingTop: 10, paddingBottom: 10}}>
             <Typography variant={"h2"} component={"h1"} gutterBottom>Meet the team</Typography>
             <Grid container spacing={3}>
-                {teamMembers25.sort((a, b) => {
+                {teamMembers26.sort((a, b) => {
                     const nameA = a.name.toUpperCase(); // ignore upper and lowercase
                     const nameB = b.name.toUpperCase(); // ignore upper and lowercase
                     if (nameA < nameB) {
@@ -223,7 +282,7 @@ function Team() {
                                         justifyContent: "center",
                                     }}
                                     >
-                                        <Avatar src={teamMember.profilePicture.src} sx={{
+                                        <Avatar src={teamMember.profilePicture?.src} sx={{
                                             height: imageSize,
                                             width: imageSize,
                                             boxShadow: 7,
@@ -265,4 +324,4 @@ function Team() {
 
 }
 
-export default Team
\ No newline at end of file
+export default Team