From dd7cecb58154028d8f7fe666c08fe9064d3f8f35 Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jan.tuomi@eficode.com>
Date: Fri, 16 Nov 2018 21:59:11 +0200
Subject: [PATCH] Add placeholder elements to front page

---
 src/assets/scss/_globals.scss               |  1 +
 src/components/PageSection/PageSection.scss |  2 +-
 src/index.scss                              |  1 +
 src/pages/FrontPage/FrontPage.tsx           | 19 ++++++++++++++++---
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/assets/scss/_globals.scss b/src/assets/scss/_globals.scss
index 585b17d..ea7038e 100644
--- a/src/assets/scss/_globals.scss
+++ b/src/assets/scss/_globals.scss
@@ -1,4 +1,5 @@
 $dark-blue: #002d3a;
+$light-blue: #bfdbd9;
 $white: #fff;
 $black: #000;
 $grey1: #d4d0c7;
diff --git a/src/components/PageSection/PageSection.scss b/src/components/PageSection/PageSection.scss
index a86cf22..700ab79 100644
--- a/src/components/PageSection/PageSection.scss
+++ b/src/components/PageSection/PageSection.scss
@@ -4,7 +4,7 @@
   padding: 2rem 1rem;
   background-color: $dark-blue;
   display: flex;
-  flex-flow: column wrap;
+  flex-flow: row wrap;
   justify-content: flex-start;
 
   &.dark-blue {
diff --git a/src/index.scss b/src/index.scss
index 2ce6764..300b1c8 100644
--- a/src/index.scss
+++ b/src/index.scss
@@ -19,6 +19,7 @@ body {
 body {
   padding: 0;
   margin: auto !important;
+  overflow: hidden;
 }
 
 h1 {
diff --git a/src/pages/FrontPage/FrontPage.tsx b/src/pages/FrontPage/FrontPage.tsx
index 8f9a6f5..e14ee31 100644
--- a/src/pages/FrontPage/FrontPage.tsx
+++ b/src/pages/FrontPage/FrontPage.tsx
@@ -9,6 +9,8 @@ import { StaticContext } from "../../server/StaticContext";
 import * as BeerImage from "../../assets/img/beer.jpeg";
 import PageSection from "../../components/PageSection";
 import { BackgroundColor as PageSectionColor }  from "../../components/PageSection/PageSection";
+import HeroMainSection from "../../components/HeroMainSection";
+import HeroAsideSection from "../../components/HeroAsideSection";
 
 interface FrontPageProps {
   staticContext: StaticContext;
@@ -63,6 +65,18 @@ class FrontPage extends React.Component<FrontPageProps, FrontPageState> {
     return (
       <div className="front-page">
         <PageSection backgroundColor={PageSectionColor.DarkBlue}>
+          <HeroMainSection>
+            <h1>Aalto-yliopiston Sähköinsinöörikilta</h1>
+            <p>on elektroniikan ja sähkötekniikan opiskelijoiden järjestö.
+            Kilta kasaa yhteen yli 600 alansa huippua, jotka ovat
+            avainasemassa vauhdilla sähköistyvän maailmamme
+            kehityksessä.</p>
+          </HeroMainSection>
+          <HeroAsideSection>
+            Kikkeli
+          </HeroAsideSection>
+        </PageSection>
+        <PageSection backgroundColor={PageSectionColor.White}>
           {events.map(event => (
             <Card
               title={event.title}
@@ -72,10 +86,9 @@ class FrontPage extends React.Component<FrontPageProps, FrontPageState> {
             />
           ))}
         </PageSection>
-        <PageSection backgroundColor={PageSectionColor.White}>
-            Huumori huiskaus
+        <PageSection backgroundColor={PageSectionColor.DarkBlue}>
+          Märkää
         </PageSection>
-
       </div>
     );
   }