From af59359f68f1fd84638c86d2287e5a0a9184120b Mon Sep 17 00:00:00 2001
From: sajochems <scottiej2001@gmail.com>
Date: Thu, 23 Nov 2023 14:01:38 +0100
Subject: [PATCH] Changed the about us and the committee function names and
 order to match constitutional order

---
 src/components/about/index.tsx     | 28 +++++++++++++++--------
 src/components/about/style.scss    | 36 +++++++++++++++++++++++++++++-
 src/components/committee/index.tsx | 14 ++++++------
 3 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/src/components/about/index.tsx b/src/components/about/index.tsx
index e989072..1a24e1e 100644
--- a/src/components/about/index.tsx
+++ b/src/components/about/index.tsx
@@ -12,16 +12,26 @@ import * as style from "./style.scss";
 export const About: FunctionalComponent = () => (
     <section class={style.about}>
         <h2>About us</h2>
-        <p>
-            Join us on May 25th and May 26th in this all-inclusive 24 hour
-            hackathon where you solve fun challenges provided by our partner
-            companies, win prizes, and have a good time!
-        </p>
-        <p>
-            Tickets are not available yet but check back here soon!
-        </p>
+        <div class={style.columns}>
+            <div class={style.column}>
+                <h3>What?</h3>
+                <p>
+                    Hack to the future is an all-inclusive 24 hour hackathon where you solve fun challenges provided by our partner companies, win prizes, and have a good time!
+                </p>
+                <h3>Who?</h3>
+                <p>
+                    Any current university student can join the Hackathon and your team can consist of 1 to 4 students. The hackathon is beginner friendly and no prior knowledge is needed to attend but even for more experienced people there will surely be a challenge waiting.
+                </p>
+            </div>
+            <div class={style.column}>
+                <h3>When?</h3>
+                <p>
+                    Join us on May 25th and May 26th at TU Delft X. The entire event will run from saturday morning till sunday evening. Dinner is included and sleeping over on location is also possible. During these two days you will get 24 hours to solve a case.
+                </p>
+            </div>
+        </div>
         <div>
-            {/* <a
+        {/* <a
                 class={style.tickets}
                 href="https://forms.gle/VmVWSof6tLyaVyBB8"
                 target="_blank"
diff --git a/src/components/about/style.scss b/src/components/about/style.scss
index 424bd69..621a1fd 100644
--- a/src/components/about/style.scss
+++ b/src/components/about/style.scss
@@ -2,7 +2,8 @@
 @import "./src/variables";
 
 .about {
-    margin-bottom: 32px;
+    margin-bottom: 32px; 
+
 
     h2 {
         color: $primary-color;
@@ -16,8 +17,41 @@
         padding-left: 2px;
     }
 
+    h3 {
+        font-family: "Krona-One";
+        font-size: 32px;
+        font-style: normal;
+        font-weight: 400;
+        line-height: normal;
+        text-align: center;
+        margin: 0;
+        padding-left: 2px;
+    }
+
+    .columns {
+        display: flex;
+        justify-content: space-around;
+        width: 100%;
+    }
+    
+    .column {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        text-align: left;
+        padding: 20px;
+    }
+    
+
     p {
         margin: 8px;
+        margin-bottom: 50px;
+
+        font-family: Krona One;
+        font-size: 24px;
+        font-style: normal;
+        font-weight: 400;
+        line-height: normal;
 
         a {
             color: $primary-color;
diff --git a/src/components/committee/index.tsx b/src/components/committee/index.tsx
index 62f1e04..0d64fb2 100644
--- a/src/components/committee/index.tsx
+++ b/src/components/committee/index.tsx
@@ -32,17 +32,17 @@ export const Committee: FunctionalComponent = () => (
                     <td>Merle de Jong</td>
                 </tr>
                 <tr>
-                    <th>The Head of Logistics</th>
-                    <td>Marijn van der Tuin</td>
-                </tr>
-                <tr>
-                    <th>The Commissioner of Promotional Affairs</th>
+                    <th>The Commissioner of Promotion</th>
                     <td>Simon Deuten</td>
                 </tr>
                 <tr>
-                    <th>The Head of Acquisition</th>
+                    <th>The Commissioner of Acquisition</th>
                     <td>Scott Jochems</td>
-                </tr>            
+                </tr>
+                <tr>
+                    <th>The Commissioner of Logistics</th>
+                    <td>Marijn van der Tuin</td>
+                </tr>       
                 <tr>
                     <th>The Qualitate Qua</th>
                     <td>Robert van Dijk</td>