Skip to content

Commit 7a62ec9

Browse files
authored
Merge pull request #170 from HackHPI/develop
release
2 parents e7c09f7 + 2d22179 commit 7a62ec9

File tree

6 files changed

+10
-116
lines changed

6 files changed

+10
-116
lines changed

public/HackHPI24_white.svg

Lines changed: 0 additions & 84 deletions
This file was deleted.

public/manifest.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name": "HackHPI 24",
3-
"short_name": "HackHPI 2024",
4-
"description": "Explore the future of urban living at HPI in Potsdam. Join motivated students for two days of innovation, workshops, and collaboration with top-notch sponsors offering support and expertise. Tackle a challenge and dive into the world of smart cities.",
2+
"name": "HackHPI 25",
3+
"short_name": "HackHPI 2025",
4+
"description": "Explore the future of health at HPI in Potsdam. Join motivated students for two days of innovation, workshops, and collaboration with top-notch sponsors offering support and expertise. Tackle a challenge and dive into the world of health.",
55
"start_url": "/",
66
"display": "standalone",
77
"background_color": "#13101B",

src/components/Faq/Faq.jsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ import {
1616
useMediaQuery,
1717
useTheme
1818
} from "@mui/material";
19+
import MailIcon from "@mui/icons-material/mail";
1920
import React from "react";
20-
import {KeyboardArrowRight} from "@mui/icons-material";
21+
import {KeyboardArrowRight, MailOutline} from "@mui/icons-material";
2122
import {WindowCard} from "../WindowCard/WindowCard.jsx";
2223
import {Masonry} from "@mui/lab";
2324
import HackHPIWrapper from "../Theme/HackHPIWrapper.jsx";
@@ -34,8 +35,8 @@ let faqs = [
3435
title: "What's so special about HackHPI?",
3536
text: "There are very few hackathons focusing on social issues; we want to fix that and give you the chance to change the world for the better by building applications that truly matter! You will also have the opportunity to get in touch with our awesome partners, slip into their shoes and solve real-world challenges using their APIs and expertise."
3637
}, {
37-
title: "Will HackHPI 2024 take place onsite?",
38-
text: "Yes, and that's quite a sure thing. We believe that Hackathons need the human contact that only in-person events can provide, and we're glad to announce that the HackHPI 2024 will be an in-presence only event!"
38+
title: "Will HackHPI 2025 take place onsite?",
39+
text: "Yes, and that's quite a sure thing. We believe that Hackathons need the human contact that only in-person events can provide, and we're glad to announce that the HackHPI 2025 will be an in-presence only event!"
3940
}, {
4041
title: "Are there any costs for me?",
4142
text: "Nope! HackHPI is completely free, and we provide you with food, drinks (and a lot of caffeine! :D) during the whole Hackathon. Unfortunately, we are not able to provide travel reimbursements. However, as an attendee, your confirmation email will include a link to our DB Event Ticket to receive a discount when booking via DB."
@@ -160,7 +161,7 @@ export function Faq() {
160161
ask!</Typography>
161162
</CardContent>
162163
<CardActions>
163-
<Button size="small" color={"inherit"} href={"mailto:team@hackhpi.org"}>Contact us</Button>
164+
<Button sx={{ ml: 1, mb: 1 }} variant="contained" size="small" color="primary" href={"mailto:team@hackhpi.org"} startIcon={<MailOutline />}>Contact us</Button>
164165
</CardActions>
165166
</Card>
166167
</Stack>

src/components/Gallery/Gallery.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export function Gallery() {
6161
{renderImages(secondImages, -150)}
6262
{renderImages(thirdImages, -200)}
6363
<Container sx={{display: "flex", justifyContent: "flex-end"}}>
64-
<Button color={"inherit"} sx={{mt: 3}} onClick={() => setIsGalleryOpen(true)}>View full Gallery</Button>
64+
<Button variant="contained" color={"primary"} sx={{mt: 3}} onClick={() => setIsGalleryOpen(true)}>View full Gallery</Button>
6565
</Container>
6666
<GalleryDialog isOpen={isGalleryOpen} onClose={() => setIsGalleryOpen(false)}/>
6767
</Box>

src/components/LandingImage/Countdown.jsx

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/components/Registration/Registration.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ function Registration() {
596596
<Link href={"/privacy"} color={"inherit"}>
597597
privacy policy
598598
</Link>{" "}
599-
for information on how we handle your data and what you rights are.
599+
for information on how we handle your data and what your rights are.
600600
</Typography>
601601
</>
602602
);

0 commit comments

Comments
 (0)