Add information to the timeline and fix overlapping time boxes

WISVCH · Mar 7, 2024 · 3427405 · 3427405
1 parent 275cfd3
commit 3427405
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 15 deletions.
diff --git a/data/timeline.json b/data/timeline.json
@@ -4,25 +4,25 @@
             "id": "sa1",
             "time": "11:30 - 12:00",
             "name": "Walk-in",
-            "description": "More information will follow soon..."
+            "description": "During this time you can sign in with your team. If you don't have a team yet you can use this time to form some teams aswell. You can also already choose your table and setup your stuff."
         },
         {
             "id": "sa2",
             "time": "12:00 - 13:30",
             "name": "Opening",
-            "description": "More information will follow soon..."
+            "description": "The companies will present their cases to you in the opening. After the presentation the cases will be divided overall groups according to your preferences. During this time we will also finalize the teams."
         },
         {
             "id": "sa3",
             "time": "13:30 - 00:00",
             "name": "Hacking!",
-            "description": "More information will follow soon..."
+            "description": "You have 24 hours to create your solution. Good luck!"
         },
         {
             "id": "sa4",
             "time": "16:30 - 17:30",
             "name": "Pitch workshop",
-            "description": "More information will follow soon..."
+            "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."
         },
         {
             "id": "sa5",
@@ -36,19 +36,25 @@
             "id": "su1",
             "time": "00:00 - 13:30",
             "name": "Hacking!",
-            "description": "More information will follow soon..."
+            "description": "You have 24 hours to create your solution. Good luck!"
         },
         {
             "id": "su2",
             "time": "8:00 - 14:30",
             "name": "Brunch",
-            "description": "In order to join the brunch you will have to buy a ticket. More information will follow soon... "
+            "description": "In order to join the brunch you will have to buy a ticket. You can buy this at wisv.ch/hackticket "
         },
         {
             "id": "su3",
+            "time": "13:30 - 16:00",
+            "name": "Judging",
+            "description": "You will have to present a short pitch to the judges."
+        },
+        {
+            "id": "su4",
             "time": "16:00 - 17:00",
             "name": "Award Ceremony",
-            "description": "More information will follow soon..."
+            "description": "During this ceremony we will hand out prizes to the winners of each case"
         }
     ]
 }
diff --git a/src/components/timeline/style.scss b/src/components/timeline/style.scss
@@ -52,15 +52,19 @@
     .saturday {    
         width: 50%;   
         .timelineEntry:nth-child(1) {
-            grid-column-start: 1;
+            grid-column-start: 2;
+            grid-row-start: 0;
+            grid-row-end: 1;
         }
         .timelineEntry:nth-child(2) {
             grid-column-start: 1;
+            grid-row-start: 1;
+            grid-row-end: 2;
         }
         .timelineEntry:nth-child(3) {
             grid-column-start: 2;
-            grid-row-start: 3;
-            grid-row-end: 10;
+            grid-row-start: 2;
+            grid-row-end: 12;
             height: 100%;
 
             div {
@@ -70,10 +74,12 @@
         .timelineEntry:nth-child(4) {
             grid-column-start: 1;
             grid-row-start: 6;
+            grid-row-end: 8;
         }
         .timelineEntry:nth-child(5) {
             grid-column-start: 1;
-            grid-row-start: 8;
+            grid-row-start: 9;
+            grid-row-end: 10;
         }
     }
 
@@ -93,14 +99,15 @@
         }
         .timelineEntry:nth-child(3) {
             grid-column-start: 2;
-            grid-row-start: 8;
+            grid-row-start: 6;
+            grid-row-end: 8;
             height: 100%;
         }
 
         .timelineEntry:nth-child(4) {
-            grid-column-start: 2;
-            grid-row-start: 5;
-            grid-row-end: 7;
+            grid-column-start: 1;
+            grid-row-start: 8;
+            grid-row-end: 9;
             height: 100%;
         }