Skip to content

Commit

Permalink
Merge pull request #23 from WISVCH/Improvements
Browse files Browse the repository at this point in the history
Improvements and adding Navara
  • Loading branch information
sajochems authored Mar 12, 2024
2 parents aed80bc + bbee921 commit 6b202a5
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 16 deletions.
11 changes: 11 additions & 0 deletions data/sponsors.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,16 @@
"title": "X TU Delft"
}
]
},
{
"type": "primary",
"title": "Primary",
"items": [
{
"logoKey": "navara",
"url": "https://www.navara.nl/",
"title": "Navara"
}
]
}
]
1 change: 1 addition & 0 deletions data/sponsors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ export const sponsorLogoMap: { [key: string]: URL } = {
"/static/sponsors/xtudelft.png?as=webp&width=200",
import.meta.url
),
navara: new URL("/static/sponsors/nav_logo_navy_diap_rgb.png?as=webp&width=200", import.meta.url),
};
20 changes: 13 additions & 7 deletions data/timeline.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
]
}
6 changes: 5 additions & 1 deletion src/components/header/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { h, FunctionalComponent } from "preact";
import { faCalendarDay, faLocationDot, faTicket } from "@fortawesome/free-solid-svg-icons";
import { faCalendarDay, faLocationDot, faTicket, faClipboardList } from "@fortawesome/free-solid-svg-icons";
import { faDiscord } from "@fortawesome/free-brands-svg-icons";


Expand Down Expand Up @@ -31,6 +31,10 @@ export const Header: FunctionalComponent = () => (
<Icon icon={faDiscord} pad />
Join Discord
</a>
<a href="https://docs.google.com/forms/d/e/1FAIpQLScIeFxdTOsJnt7DQdpYPtcRsrYT-wHJDa2N1bVtCJNFaQtSIQ/viewform" target="_blank">
<Icon icon={faClipboardList} pad />
Sign-up form
</a>
</div>
</div>

Expand Down
23 changes: 15 additions & 8 deletions src/components/timeline/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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;
}
}

Expand All @@ -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%;
}

Expand Down
Binary file added static/sponsors/nav_logo_navy_diap_rgb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/sponsors/nav_logo_navy_rgb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 6b202a5

Please sign in to comment.