From de3bcf746dd55217ee25c7cb1a9b5571a467da02 Mon Sep 17 00:00:00 2001 From: Cedric Rische Date: Fri, 1 Mar 2024 23:48:36 +0100 Subject: [PATCH 1/5] Added Dates --- src/components/TimeTable/TimeTable.jsx | 192 +++++++++++++++---------- 1 file changed, 114 insertions(+), 78 deletions(-) diff --git a/src/components/TimeTable/TimeTable.jsx b/src/components/TimeTable/TimeTable.jsx index ffa82ec..32b5fdd 100644 --- a/src/components/TimeTable/TimeTable.jsx +++ b/src/components/TimeTable/TimeTable.jsx @@ -1,8 +1,69 @@ import {Avatar, Box, Card, Container, Divider, Grid, Stack, Typography} from "@mui/material"; -export function TimeTable() { +const dayOne = [ + { + time: "08:00 - 09:00", + icon: "", + title: "Check-In", + person: "", + }, + { + time: "09:00 - 10:00", + icon: "", + title: "Breakfast", + person: "", + }, + { + time: "10:00 - 11:00", + icon: "", + title: "Introduction", + person: "", + }, + { + time: "12:00 - 13:00", + icon: "", + title: "Lunch", + person: "", + }, + { + time: "13:00 - 23:59", + icon: "", + title: "Hacking Time", + person: "", + } +] + +const dayTwo = [ + { + time: "00:00 - 12:00", + icon: "", + title: "Hacking Time", + person: "", + },{ + time: "08:00 - 09:00", + icon: "", + title: "Breakfast", + person: "", + },{ + time: "14:00 - 16:00", + icon: "", + title: "Challenge Presentations", + person: "", + },{ + time: "17:00 - 18:00", + icon: "", + title: "Feedback & Awards", + person: "", + },{ + time: "18:00 - *", + icon: "", + title: "After Party", + person: "", + } +] - const timetable = ( +export function Table(props) { + return ( - Day 1 - 06.04.2024 + {props.title} + {props.subtitle} - - - - - SO - - - - 08:00-09:00 - - - Hey There! - - - a Person - - - - - - - - - - - SO - - - - 08:00-09:00 - - - Nothing to see here yet - - - But soon, something will be here - - - - - + + { + props.data.map((item, index) => ( + <> + + + + + + {item.icon} + + + + + {item.time} + + + {item.title} + + + {item.person} + + + + + + + {index !== dayOne.length - 1 ? : undefined} + + )) + } ) +} + +export function TimeTable() { return ( Time Table - - - - Will be announced soon - - - - - - {timetable} - - - {timetable} - - - - + + + + + + +
+ + ) } \ No newline at end of file From df0ef4311038b7859e1420824c2f720a766fb1d6 Mon Sep 17 00:00:00 2001 From: Cedric Rische Date: Thu, 7 Mar 2024 11:52:29 +0100 Subject: [PATCH 2/5] Added timetable --- src/components/Features/Features.jsx | 3 +- src/components/TimeTable/TimeTable.jsx | 96 ++++++++++++++++---------- 2 files changed, 62 insertions(+), 37 deletions(-) diff --git a/src/components/Features/Features.jsx b/src/components/Features/Features.jsx index 7d8a8e6..907072d 100644 --- a/src/components/Features/Features.jsx +++ b/src/components/Features/Features.jsx @@ -1,5 +1,5 @@ import {Box, Card, Container, Grid, Typography} from "@mui/material"; -import {Campaign, Check, ConfirmationNumber, EmojiEvents, MoneyOff} from "@mui/icons-material"; +import {Campaign, ConfirmationNumber, EmojiEvents, MoneyOff} from "@mui/icons-material"; import React from "react"; export function IconContainer(props) { @@ -11,7 +11,6 @@ export function IconContainer(props) { display: "flex", justifyContent: "center", alignItems: "center", - marginBottom: "1rem" }}> {React.cloneElement(props.icon, {sx: {color: "white"}, style: {width: "65%", height: "auto"}})} diff --git a/src/components/TimeTable/TimeTable.jsx b/src/components/TimeTable/TimeTable.jsx index 32b5fdd..01198fc 100644 --- a/src/components/TimeTable/TimeTable.jsx +++ b/src/components/TimeTable/TimeTable.jsx @@ -1,62 +1,94 @@ -import {Avatar, Box, Card, Container, Divider, Grid, Stack, Typography} from "@mui/material"; +import {Box, Card, Container, Divider, Grid, Stack, Typography} from "@mui/material"; +import { + Campaign, + Celebration, + Computer, + ConfirmationNumber, + EmojiEvents, EmojiObjects, + PlayArrow, + Restaurant, + Stop +} from "@mui/icons-material"; +import {IconContainer} from "../Features/Features"; +import {Play} from "next/dist/compiled/@next/font/dist/google"; const dayOne = [ { time: "08:00 - 09:00", - icon: "", + icon: , title: "Check-In", person: "", }, { time: "09:00 - 10:00", - icon: "", + icon: , title: "Breakfast", person: "", }, { time: "10:00 - 11:00", - icon: "", - title: "Introduction", + icon: , + title: "Introduction & Speakers", + person: "", + }, + { + time: "11:00 - 12:00", + icon: , + title: "Challenge Input Sessions", person: "", }, { time: "12:00 - 13:00", - icon: "", + icon: , title: "Lunch", person: "", }, { - time: "13:00 - 23:59", - icon: "", - title: "Hacking Time", + time: "13:00", + icon: , + title: "Start Hacking Time", + person: "", + }, + { + time: "18:00 - 19:00", + icon: , + title: "Dinner", person: "", } ] const dayTwo = [ { - time: "00:00 - 12:00", - icon: "", - title: "Hacking Time", - person: "", - },{ time: "08:00 - 09:00", - icon: "", + icon: , title: "Breakfast", person: "", - },{ + }, + { + time: "12:00", + icon: , + title: "End Hacking Time", + person: "", + }, + { + time: "13:00 - 14:00", + icon: , + title: "Lunch", + person: "", + }, + { time: "14:00 - 16:00", - icon: "", + icon: , title: "Challenge Presentations", person: "", - },{ + }, { time: "17:00 - 18:00", - icon: "", + icon: , title: "Feedback & Awards", person: "", - },{ - time: "18:00 - *", - icon: "", + }, { + time: "18:00", + icon: , title: "After Party", person: "", } @@ -83,19 +115,12 @@ export function Table(props) { <> - - - - {item.icon} - + + + - + + {item.time} @@ -105,12 +130,13 @@ export function Table(props) { {item.person} + - {index !== dayOne.length - 1 ? : undefined} + {index !== props.data.length - 1 ? : undefined} )) } From 8a7cd54a981150fe3af7ecf62947f058fe400845 Mon Sep 17 00:00:00 2001 From: Cedric Rische Date: Thu, 7 Mar 2024 11:57:00 +0100 Subject: [PATCH 3/5] Optimized imports --- src/components/TimeTable/TimeTable.jsx | 34 ++++++++++++++------------ 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/src/components/TimeTable/TimeTable.jsx b/src/components/TimeTable/TimeTable.jsx index 01198fc..98e1a64 100644 --- a/src/components/TimeTable/TimeTable.jsx +++ b/src/components/TimeTable/TimeTable.jsx @@ -2,15 +2,14 @@ import {Box, Card, Container, Divider, Grid, Stack, Typography} from "@mui/mater import { Campaign, Celebration, - Computer, ConfirmationNumber, - EmojiEvents, EmojiObjects, + EmojiEvents, + EmojiObjects, PlayArrow, Restaurant, Stop } from "@mui/icons-material"; import {IconContainer} from "../Features/Features"; -import {Play} from "next/dist/compiled/@next/font/dist/google"; const dayOne = [ { @@ -115,21 +114,26 @@ export function Table(props) { <> - - + + - + - - {item.time} - - - {item.title} - - - {item.person} - + + {item.time} + + + {item.title} + + + {item.person} + From c14283e4993da996486582974fcab8d5dfa51d03 Mon Sep 17 00:00:00 2001 From: Cedric Rische Date: Sun, 10 Mar 2024 20:24:52 +0100 Subject: [PATCH 4/5] Added times --- src/components/TimeTable/TimeTable.jsx | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/components/TimeTable/TimeTable.jsx b/src/components/TimeTable/TimeTable.jsx index 98e1a64..0e4bb2d 100644 --- a/src/components/TimeTable/TimeTable.jsx +++ b/src/components/TimeTable/TimeTable.jsx @@ -43,7 +43,13 @@ const dayOne = [ person: "", }, { - time: "13:00", + time: "13:00 - 18:00", + icon: , + title: "Idea-Workshop", + person: "optional", + }, + { + time: "13:00 - 13:00 next day (Continuously)", icon: , title: "Start Hacking Time", person: "", @@ -64,7 +70,13 @@ const dayTwo = [ person: "", }, { - time: "12:00", + time: "09:00 - 10:00", + icon: , + title: "Pitch-Workshop", + person: "optional", + }, + { + time: "13:00", icon: , title: "End Hacking Time", person: "", From 89f8a4aa5b0940b6adba6a78b540c0a8510f2160 Mon Sep 17 00:00:00 2001 From: Cedric Rische Date: Sun, 17 Mar 2024 12:55:40 +0100 Subject: [PATCH 5/5] Minor fixes --- src/components/TimeTable/TimeTable.jsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/TimeTable/TimeTable.jsx b/src/components/TimeTable/TimeTable.jsx index 0e4bb2d..80b6381 100644 --- a/src/components/TimeTable/TimeTable.jsx +++ b/src/components/TimeTable/TimeTable.jsx @@ -21,7 +21,7 @@ const dayOne = [ { time: "09:00 - 10:00", icon: , - title: "Breakfast", + title: "Breakfast & Get to know each other", person: "", }, { @@ -100,7 +100,7 @@ const dayTwo = [ }, { time: "18:00", icon: , - title: "After Party", + title: "Drinks & Networking", person: "", } ] @@ -137,13 +137,13 @@ export function Table(props) { - + {item.time} - + {item.title} - + {item.person} @@ -168,10 +168,10 @@ export function TimeTable() { -
+
-
+