From 49ddb9387741e1cb4c7fa0a4c40a8b0bb403fcc0 Mon Sep 17 00:00:00 2001 From: sajochems Date: Fri, 17 May 2024 16:49:12 +0200 Subject: [PATCH] final changes --- data/faq.json | 2 +- data/timeline.json | 14 ++++++++++---- src/components/header/index.tsx | 2 +- src/components/header/style.scss | 4 ++-- src/components/timeline/style.scss | 12 +++++++++--- src/components/timer/index.tsx | 2 +- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/data/faq.json b/data/faq.json index b6cd01a..e034115 100644 --- a/data/faq.json +++ b/data/faq.json @@ -5,7 +5,7 @@ }, { "question": "How can I sign up for HackDelft?", - "answer": "Buy a ticket at: https://ch.tudelft.nl/activities/event/2024/hackaton/ and don't forget to fill in the form at: wisv.ch/hackform" + "answer": "Unfortunatly we are sold out! if you already have a ticket don't forget to fill in the form at: wisv.ch/hackform" }, { "question": "What languages can I use during the event?", diff --git a/data/timeline.json b/data/timeline.json index e0d4811..befb6d2 100644 --- a/data/timeline.json +++ b/data/timeline.json @@ -22,7 +22,7 @@ "id": "sa4", "time": "16:30 - 17:30", "name": "Pitch workshop", - "description": "A pitch workshop will take place in which you will learn how to create the perfect pitch. This will be helpfull when you have to pitch your solution to the judges at the end of the contest." + "description": "A pitch workshop will take place in which you will learn how to create the perfect pitch. This will be helpfull when you have to pitch your solution to the judges at the end of the contest. The workshop is provided by UniPartners" }, { "id": "sa5", @@ -40,18 +40,24 @@ }, { "id": "su2", - "time": "8:00 - 14:30", + "time": "9:00 - 09:30", + "name": "Morning Gymnastics", + "description": "Do you want to start the day of right? Join Marjolein for a healthy and energetic gymnastics session." + }, + { + "id": "su3", + "time": "9:30 - 14:30", "name": "Brunch", "description": "In order to join the brunch you will have to buy a ticket. You can buy this at wisv.ch/hackticket " }, { - "id": "su3", + "id": "su4", "time": "13:30 - 16:00", "name": "Judging", "description": "You will have to present a short pitch to the judges." }, { - "id": "su4", + "id": "su5", "time": "16:00 - 17:00", "name": "Award Ceremony", "description": "During this ceremony we will hand out prizes to the winners of each case" diff --git a/src/components/header/index.tsx b/src/components/header/index.tsx index e704766..2346bb9 100644 --- a/src/components/header/index.tsx +++ b/src/components/header/index.tsx @@ -20,7 +20,7 @@ export const Header: FunctionalComponent = () => (

25 and 26 May 2024

-

X TU Delft

+

X TU Delft Hall 1

diff --git a/src/components/header/style.scss b/src/components/header/style.scss index 1bec83b..d7eb29d 100644 --- a/src/components/header/style.scss +++ b/src/components/header/style.scss @@ -30,7 +30,7 @@ .buttons { display: flex; justify-content: center; - gap: 30px; + gap: 20px; flex-wrap: wrap; } @@ -69,7 +69,7 @@ small { color: $primary-color; - font-size: 16px; + font-size: 14px; font-family: "Krona-One"; } } diff --git a/src/components/timeline/style.scss b/src/components/timeline/style.scss index deef09a..a2d2bf2 100644 --- a/src/components/timeline/style.scss +++ b/src/components/timeline/style.scss @@ -92,26 +92,32 @@ height: 100%; } .timelineEntry:nth-child(2) { + grid-column-start: 1; + grid-row-start: 2; + grid-row-end: 3; + height: 100%; + } + .timelineEntry:nth-child(3) { grid-column-start: 1; grid-row-start: 4; grid-row-end: 7; height: 100%; } - .timelineEntry:nth-child(3) { + .timelineEntry:nth-child(4) { grid-column-start: 2; grid-row-start: 6; grid-row-end: 8; height: 100%; } - .timelineEntry:nth-child(4) { + .timelineEntry:nth-child(5) { grid-column-start: 1; grid-row-start: 8; grid-row-end: 9; height: 100%; } - .timelineEntry:nth-child(5) { + .timelineEntry:nth-child(6) { grid-column-start: 1; grid-row-start: 7 ; } diff --git a/src/components/timer/index.tsx b/src/components/timer/index.tsx index 6f253b0..cf9542f 100644 --- a/src/components/timer/index.tsx +++ b/src/components/timer/index.tsx @@ -6,7 +6,7 @@ import * as style from "./style.scss"; export const Timer: FunctionalComponent = () => { const calculateTimeLeft = () => { - const difference = (new Date("2024-05-25T13:00:00")).valueOf() - (new Date()).valueOf() + const difference = (new Date("2024-05-25T13:30:00")).valueOf() - (new Date()).valueOf() let timeLeft = {};