Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/HackHPI/hackhpi.github.io i…
Browse files Browse the repository at this point in the history 
…nto feature/website-2.0
  • Loading branch information
@tanja04
tanja04 committed Apr 3, 2024
2 parents 0e021aa + 8fcdc66 commit 217b4d4
Show file tree
Hide file tree
Showing 13 changed files with 386 additions and 219 deletions.
30 changes: 0 additions & 30 deletions .github/workflows/pages.yml
View file

This file was deleted.

2 changes: 2 additions & 0 deletions src/app/page.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import Team from "../components/Team/Team";
import Speakers from "../components/Speakers/Speakers";
import {Features} from "../components/Features/Features";
import LandingImage from "../components/LandingImage/LandingImage";
import {Location} from "../components/Location/Location";

export default function Page() {
return (
Expand All @@ -20,6 +21,7 @@ export default function Page() {
<Features/>
<Sponsors />
<Registration/>
<Location/>
<Speakers/>
<TimeTable />
<Gallery />
Expand Down
Binary file added src/assets/images/locationImage.webp
View file
Binary file not shown.
Binary file added src/assets/images/sponsors/DreesSommer.webp
View file
Binary file not shown.
107 changes: 107 additions & 0 deletions src/assets/images/sponsors/berta-rudi_logo_negativ_sw.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
190 changes: 60 additions & 130 deletions src/components/Gallery/Gallery.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,147 +55,77 @@ import DSC03006 from '../../assets/images/event/DSC03006_1920.webp'
import DSC03022 from '../../assets/images/event/DSC03022_1920.webp'
import DSC03032 from '../../assets/images/event/DSC03032_1920.webp'

let images = {
name: "2023",
subtitle: "about://building-trust-in-digital-state",
items: [
DSC02572,
DSC02594,
DSC02601,
DSC02604,
DSC02609,
DSC02617,
DSC02619,
DSC02630,
DSC02632,
DSC02635,
DSC02638,
DSC02639,
DSC02643,
DSC02645,
DSC02646,
DSC02659,
DSC02677,
DSC02680,
DSC02762,
DSC02810,
DSC02820,
DSC02823,
DSC02824,
DSC02830,
DSC02868,
DSC02870,
DSC02872,
DSC02876,
DSC02879,
DSC02886,
DSC02889,
DSC02903,
DSC02908,
DSC02914,
DSC02919,
DSC02920,
DSC02923,
DSC02926,
DSC02928,
DSC02931,
DSC02941,
DSC02946,
DSC02949,
DSC02957,
DSC02962,
DSC02969,
DSC02974,
DSC02983,
DSC02992,
DSC02998,
DSC03006,
DSC03022,
DSC03032,

/*
const images={}
await Astro.glob("/src/assets/images/*.jpg").then((files) => {
files.forEach((file) => {
const name = file.default.src.split(".")[0].split("/").pop()
images[name]=file.default
});
});
k
places.forEach((place)=>{
const image = images[place.name]
if(image)
place.image=image
else
place.image = fallbackImage
})
console.log(images)
*/
let faqs = [
{
name: "2023",
subtitle: "about://building-trust-in-digital-state",
items: [
DSC02572,
DSC02594,
DSC02601,
DSC02604,
DSC02609,
DSC02617,
DSC02619,
DSC02630,
DSC02632,
DSC02635,
DSC02638,
DSC02639,
DSC02643,
DSC02645,
DSC02646,
DSC02659,
DSC02677,
DSC02680,
DSC02762,
DSC02810,
DSC02820,
DSC02823,
DSC02824,
DSC02830,
DSC02868,
DSC02870,
DSC02872,
DSC02876,
DSC02879,
DSC02886,
DSC02889,
DSC02903,
DSC02908,
DSC02914,
DSC02919,
DSC02920,
DSC02923,
DSC02926,
DSC02928,
DSC02931,
DSC02941,
DSC02946,
DSC02949,
DSC02957,
DSC02962,
DSC02969,
DSC02974,
DSC02983,
DSC02992,
DSC02998,
DSC03006,
DSC03022,
DSC03032,

]
},
{
name: "2022",
items: [
{
title: "Lorem 2",
text: "Some Text"
}
]
},
{
name: "2021",
items: [
{
title: "Lorem 2",
text: "Some Text"
}
]
}
]
]
}


export function Gallery() {
const [selectedIndex, setSelectedIndex] = React.useState(0);

const handleListItemClick = (
event,
index,
) => {
setSelectedIndex(index);
};
return (
<Container sx={{paddingTop: 10, paddingBottom: 10}}>
<Typography variant={"h2"} component={"h1"} gutterBottom>Gallery</Typography>
<Grid container spacing={7} alignItems="center">
{/*<Grid item xs={12} md={4}>
<Card sx={{width: '100%', bgcolor: 'background.paper'}}>
<List component="nav" aria-label="main mailbox folders">
{
faqs.map((faq, idx) => (
<ListItemButton
key={faq.name}
selected={selectedIndex === idx}
onClick={(event) => handleListItemClick(event, idx)}
sx={{padding: 2}}
>
<ListItemIcon>
<KeyboardArrowRight
fontSize={"large"}
color={selectedIndex === idx ? "secondary" : undefined}/>
</ListItemIcon>
<Typography sx={{fontSize: "1.5rem"}} noWrap>{faq.name}</Typography>
</ListItemButton>
))
}
</List>
</Card>
</Grid> */}
<Grid item xs={12} md={12}>
<Box sx={{maxHeight: "30rem", overflowY: "scroll"}}>
<ImageList variant="masonry" cols={3} gap={8}>
{faqs[selectedIndex].items.map((item, i) => (
{images.items.map((item, i) => (
<ImageListItem key={i}>
<img
key={"img" + i}
Expand Down
12 changes: 6 additions & 6 deletions src/components/LandingImage/LandingImage.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import {Box, Button, Card, Container, Stack, Typography} from "@mui/material";
import {TypeAnimation} from "react-type-animation";
import Countdown from "./Countdown.jsx";
import {CalendarMonthOutlined} from "@mui/icons-material";
import {CalendarMonthOutlined, LocationOn} from "@mui/icons-material";

function LandingImage() {

Expand Down Expand Up @@ -51,17 +51,17 @@ function LandingImage() {
<Button
variant={"contained"}
sx={{
//background: "linear-gradient(90deg, rgba(58,12,163,1) 0%, rgba(114,9,183,1) 100%)",
//backgroundColor: "secondary.main",
background: "linear-gradient(90deg, rgba(58,12,163,1) 0%, rgba(114,9,183,1) 100%)",
backgroundColor: "secondary.main",
borderWidth: "1rem",
width: "13rem",
height: "3.5rem",
fontSize: "1rem",
}}
disabled
//onClick={() => document.getElementById("signupForm").scrollIntoView({ behavior: "smooth", block: "start", inline: "nearest" })}
startIcon={<LocationOn/>}
onClick={() => document.getElementById("location").scrollIntoView({ behavior: "smooth", block: "start", inline: "nearest" })}
>
Sign Up closed
Directions
</Button>
<Card sx={{height: "3.5rem", width: "13rem", justifyContent: "center", display:"flex"}}>
<Stack direction={"row"} alignItems={"center"} display={"flex"}
Expand Down
Loading

0 comments on commit 217b4d4

Please sign in to comment.