Skip to content

Commit 6fef28d

Browse files
authored
Merge pull request #204 from HackHPI/develop
RELEASE
2 parents 3f077b4 + 8eb8d8e commit 6fef28d

2 files changed

Lines changed: 107 additions & 12 deletions

File tree

src/components/Team/Team.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ const teamMembers25 = [
152152
{
153153
name: "Constantin Sachse",
154154
position: "Team Member",
155-
linkedIn: "",
155+
linkedIn: "constantinsachse",
156156
profilePicture: ConstantinSachseProfile2025
157157
},
158158
]
@@ -191,7 +191,7 @@ const teamMembers26 = [
191191
{
192192
name: "Constantin Sachse",
193193
position: "Team Member",
194-
linkedIn: "",
194+
linkedIn: "constantinsachse",
195195
profilePicture: ConstantinSachseProfile2025,
196196
},
197197
{

src/components/TimeTable/TimeTable.jsx

Lines changed: 105 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,77 @@ import {
1010
KeyboardArrowRight,
1111
PlayArrow,
1212
Restaurant,
13+
Coffee,
14+
BakeryDining,
1315
Stop
1416
} from "@mui/icons-material";
1517
import * as React from "react";
1618
import {useState} from "react";
1719
import {IconContainer} from "../Features/Features";
1820
import colorYears from "../Theme/HackHpiColors";
21+
import { title } from "process";
1922

2023
const dayOneYears = [
21-
{
22-
year: 2026,
23-
subtitle: "TBA",
24-
dayOne: [],
25-
},
24+
{
25+
year: 2026,
26+
subtitle: "Friday 10.04",
27+
dayOne: [
28+
{
29+
time: "09:00 - 11:00",
30+
icon: <ConfirmationNumber/>,
31+
title: "Check-In + Breakfast",
32+
person: "",
33+
},
34+
{
35+
time: "11:00 - 12:00",
36+
icon: <Campaign/>,
37+
title: "Speaker",
38+
person: "",
39+
},
40+
{
41+
time: "12:00 - 13:00",
42+
icon: <Campaign/>,
43+
title: "Challenge Presentation",
44+
person: "",
45+
},
46+
{
47+
time: "13:00 - 14:00",
48+
icon: <Restaurant/>,
49+
title: "Lunch",
50+
person: "",
51+
},
52+
{
53+
time: "14:00 - 15:00",
54+
icon: <EmojiObjects/>,
55+
title: "Challenge Input",
56+
person: "optional",
57+
},
58+
{
59+
time: "14:00 - 13:00 next day (continuously)",
60+
icon: <PlayArrow/>,
61+
title: "Begin Hacking Time",
62+
person: "",
63+
},
64+
{
65+
time: "16:00 - 17:00",
66+
icon: <BakeryDining/>,
67+
title: "Waffles",
68+
person: "by Cula"
69+
},
70+
{
71+
time: "19:00 - 20:00",
72+
icon: <Restaurant/>,
73+
title: "Dinner",
74+
person: "",
75+
},
76+
{
77+
time: "00:00 - 01:00",
78+
icon: <Restaurant/>,
79+
title: "Midnight Snack",
80+
person: "",
81+
}
82+
],
83+
},
2684
{
2785
year: 2025,
2886
subtitle: "Friday 21.03",
@@ -164,11 +222,48 @@ const dayOneYears = [
164222
]
165223

166224
const dayTwoYears = [
167-
{
168-
year: 2026,
169-
subtitle: "TBA",
170-
dayTwo: [],
171-
},
225+
{
226+
year: 2026,
227+
subtitle: "Saturday 11.04",
228+
dayTwo: [
229+
{
230+
time: "08:00 - 09:00",
231+
icon: <Restaurant/>,
232+
title: "Breakfast",
233+
person: "",
234+
},
235+
{
236+
time: "09:00 - 11:00",
237+
icon: <Coffee/>,
238+
title: "Coffee Cart",
239+
person: "by Quantco",
240+
},
241+
{
242+
time: "13:00",
243+
icon: <Stop/>,
244+
title: "End Hacking Time",
245+
person: "",
246+
},
247+
{
248+
time: "13:00 - 14:00",
249+
icon: <Restaurant/>,
250+
title: "Lunch",
251+
person: "",
252+
},
253+
{
254+
time: "14:00 - 16:00",
255+
icon: <Campaign/>,
256+
title: "Presentations",
257+
person: "",
258+
},
259+
{
260+
time: "16:00 - 17:00",
261+
icon: <EmojiEvents/>,
262+
title: "Awards + Final Words",
263+
person: "",
264+
}
265+
],
266+
},
172267
{
173268
year: 2025,
174269
subtitle: "Saturday 22.03",

0 commit comments

Comments
 (0)