Skip to content

Commit b935543

Browse files
authored
Merge pull request #192 from HackHPI/develop
Release
2 parents 85aad83 + f6651ea commit b935543

5 files changed

Lines changed: 68 additions & 9 deletions

File tree

src/components/Faq/Faq.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ export function Faq() {
127127
questions</Typography>
128128
<Typography variant={"body1"} sx={{marginBottom: "4rem"}}>Can't find the answer you're looking for? You
129129
can
130-
always <Link href={"mailto:team@hackhpi.org"} color={"inherit"}>send us an email</Link> with your
130+
always <Link href={"mailto:support@hackhpi.org"} color={"inherit"}>send us an email</Link> with your
131131
inquiry!</Typography>
132132
<Grid container spacing={7}>
133133
<Grid item xs={12} md={4}>
@@ -161,7 +161,7 @@ export function Faq() {
161161
ask!</Typography>
162162
</CardContent>
163163
<CardActions>
164-
<Button sx={{ ml: 1, mb: 1 }} variant="contained" size="small" color="primary" href={"mailto:team@hackhpi.org"} startIcon={<MailOutline />}>Contact us</Button>
164+
<Button sx={{ ml: 1, mb: 1 }} variant="contained" size="small" color="primary" href={"mailto:support@hackhpi.org"} startIcon={<MailOutline />}>Contact us</Button>
165165
</CardActions>
166166
</Card>
167167
</Stack>

src/components/Footer/Footer.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const socials = [
3030
},
3131
{
3232
icon: <Mail/>,
33-
link: "mailto:team@hackhpi.org",
33+
link: "mailto:support@hackhpi.org",
3434
},
3535
]
3636

@@ -128,4 +128,4 @@ function Footer() {
128128
)
129129
}
130130

131-
export default Footer
131+
export default Footer

src/components/Imprint/Imprint.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function Imprint() {
2323
E-Mail: <Link href="mailto:team@hackhpi.org" color={"inherit"}>team@hackhpi.org</Link>
2424
</Typography>
2525
<Typography variant="body1">Inhaltlich verantwortlich gemäß § 5 TMG, § 55 RStV: Klubsprecher Jeanne
26-
Aue, Mathilda Heise und Cedric Rische</Typography>
26+
Aue, Daniel Kiss und Cedric Rische</Typography>
2727
</Box>
2828
<Box>
2929
<Typography variant="h2" gutterBottom>Haftungsausschluss</Typography>

src/components/Registration/Registration.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ function Registration() {
507507
})
508508
.catch((error) => {
509509
alert(
510-
"Could not save Registration. Please try again. If problem persists, please contact team@hackhpi.org. Error: " +
510+
"Could not save Registration. Please try again. If problem persists, please contact support@hackhpi.org. Error: " +
511511
JSON.stringify(error.data),
512512
);
513513
setIsSending(false);

src/components/Team/Team.jsx

Lines changed: 62 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,65 @@ const teamMembers25 = [
151151
},
152152
]
153153

154+
const teamMembers26 = [
155+
{
156+
name: "Cedric Rische",
157+
position: "Team Member",
158+
linkedIn: "cedric-rische",
159+
profilePicture: CedricRischeProfile2025,
160+
},
161+
{
162+
name: "Grit Manssen",
163+
position: "Team Member",
164+
linkedIn: "grit-manssen-0270b023a",
165+
profilePicture: GritManssenProfile2025,
166+
},
167+
{
168+
name: "Tanja Lehmann",
169+
position: "Team Member",
170+
linkedIn: "tanja-lehmann-36713a265",
171+
profilePicture: TanjaLehmannProfile2025,
172+
},
173+
{
174+
name: "Daniel Kiss",
175+
position: "Team Member",
176+
linkedIn: "kdaniel21",
177+
profilePicture: DanielKissProfile2025,
178+
},
179+
{
180+
name: "Jeanne Aue",
181+
position: "Team Member",
182+
linkedIn: "jeanne-aue",
183+
profilePicture: JeanneAueProfile2025,
184+
},
185+
{
186+
name: "Constantin Sachse",
187+
position: "Team Member",
188+
linkedIn: "",
189+
profilePicture: ConstantinSachseProfile2025,
190+
},
191+
{
192+
name: "Alyssa Hilgendorf",
193+
position: "Team Member",
194+
linkedIn: "alyssa-hilgendorf-835a45346",
195+
},
196+
{
197+
name: "Henri Becker",
198+
position: "Team Member",
199+
linkedIn: "henri-aldo-becker-06a265297",
200+
},
201+
{
202+
name: "Jolanda Bolt",
203+
position: "Team Member",
204+
linkedIn: "jolanda-bolt-6480a5222",
205+
},
206+
{
207+
name: "Klara Prigge",
208+
position: "Team Member",
209+
linkedIn: "klara-luise-prigge-8b73a830a",
210+
},
211+
];
212+
154213

155214
function stringToColor(string) {
156215
let hash = 0;
@@ -194,7 +253,7 @@ function Team() {
194253
<Container sx={{paddingTop: 10, paddingBottom: 10}}>
195254
<Typography variant={"h2"} component={"h1"} gutterBottom>Meet the team</Typography>
196255
<Grid container spacing={3}>
197-
{teamMembers25.sort((a, b) => {
256+
{teamMembers26.sort((a, b) => {
198257
const nameA = a.name.toUpperCase(); // ignore upper and lowercase
199258
const nameB = b.name.toUpperCase(); // ignore upper and lowercase
200259
if (nameA < nameB) {
@@ -223,7 +282,7 @@ function Team() {
223282
justifyContent: "center",
224283
}}
225284
>
226-
<Avatar src={teamMember.profilePicture.src} sx={{
285+
<Avatar src={teamMember.profilePicture?.src} sx={{
227286
height: imageSize,
228287
width: imageSize,
229288
boxShadow: 7,
@@ -265,4 +324,4 @@ function Team() {
265324

266325
}
267326

268-
export default Team
327+
export default Team

0 commit comments

Comments
 (0)