From b493627d6a20f1ab53749dfdf2c58fd3b61463f4 Mon Sep 17 00:00:00 2001
From: Lorin Werthen <werthenlorin@gmail.com>
Date: Tue, 2 Aug 2016 20:05:50 +0200
Subject: [PATCH 1/3] remove old

---
 content/assets/stylesheets/includes/old.scss | 97 --------------------
 1 file changed, 97 deletions(-)
 delete mode 100644 content/assets/stylesheets/includes/old.scss

diff --git a/content/assets/stylesheets/includes/old.scss b/content/assets/stylesheets/includes/old.scss
deleted file mode 100644
index b849cca..0000000
--- a/content/assets/stylesheets/includes/old.scss
+++ /dev/null
@@ -1,97 +0,0 @@
-$zeus_orange: #FF7F00;
-$event-padding: 10px;
-$navbar-border-color: #CCC;
-$event-border-color: #DDD;
-
-$cammie-controls-color: rgba(0, 0, 0, 0.60);
-
-img {
-  max-width: 200px;
-}
-
-.fa-ul {
-  list-style: none !important;
-
-  .fa {
-    font-size: inherit;
-  }
-}
-
-.header-top {
-  display: flex;
-  justify-content: space-between;
-  align-items: flex-end;
-
-}
-
-#navbar {
-  .nav-item {
-    transition: 0.2s;
-
-    font-variant: small-caps;
-    font-size: 1.25em;
-
-    &:hover {
-      transition: 0.2s;
-    }
-  }
-}
-
-#cammie {
-  object-fit: contain;
-  max-width: 100%;
-  height: auto;
-}
-
-.fullpage {
-  min-width: 100%;
-  min-height: 100%;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  background-color: black;
-}
-
-.ctrl {
-  background-color: $cammie-controls-color;
-  color: white;
-  position: absolute;
-  z-index: 100;
-
-  // Chevron centering
-  display: flex;
-  justify-content: center;
-  align-items: center;
-
-  &:hover {
-    background-color: $zeus_orange;
-    z-index: 200;
-    cursor: pointer;
-  }
-}
-
-#left {
-  height: 100%;
-  width: 100px;
-  top: 0;
-  left: 0;
-}
-
-#right {
-  height: 100%;
-  width: 100px;
-  top: 0;
-  right: 0;
-}
-
-#up {
-  height: 100px;
-  width: 100%;
-  top: 0;
-}
-
-#down {
-  height: 100px;
-  width: 100%;
-  bottom: 0;
-}

From 3b9f63b3f0d5164c6fbe95ac34697c11dcfced3e Mon Sep 17 00:00:00 2001
From: Lorin Werthen <werthenlorin@gmail.com>
Date: Tue, 2 Aug 2016 20:20:22 +0200
Subject: [PATCH 2/3] add data helper

---
 content/about.erb    | 22 ++++++----------------
 content/ical.ics.erb |  1 -
 lib/helpers/data.rb  |  6 +++++-
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/content/about.erb b/content/about.erb
index c526ec6..c2cc627 100644
--- a/content/about.erb
+++ b/content/about.erb
@@ -22,24 +22,14 @@ title: About
   Het bestuur zorgt ervoor dat alle wieltjes blijven draaien en organiseert regelmatig activiteiten voor de leden. Het bestuur voor het academiejaar 2016-2017 van Zeus WPI is.
 
   <ul>
+    <% data_from('bestuur').each do |lid| %>
     <li>
-      Voorzitter: Wout Schellaert
-    </li>
-    <li>
-      Vice-voorzitter: Isaura Claeys
-    </li>
-    <li>
-      Penning: Jeroen De Clerck
-    </li>
-    <li>
-      Systeembeheerders: Rien Maertens &amp; Lorin Werthen
-    </li>
-    <li>
-      Activiteiten: Eloïse Piret
-    </li>
-    <li>
-      Project: Feliciaan De Palmenaer
+      <%= lid['rol'] %>:
+      <a href="mailto:<%= lid['mail'] %>">
+        <%= lid['naam'] %>
+      </a>
     </li>
+    <% end %>
   </ul>
 
   <h2>Zeus waar? Zeus daar!</h2>
diff --git a/content/ical.ics.erb b/content/ical.ics.erb
index 16afb87..2b4d96e 100644
--- a/content/ical.ics.erb
+++ b/content/ical.ics.erb
@@ -1,2 +1 @@
 <%= event_calendar %>
-<%= data_from "hey" %>
diff --git a/lib/helpers/data.rb b/lib/helpers/data.rb
index bab537c..ac675c4 100644
--- a/lib/helpers/data.rb
+++ b/lib/helpers/data.rb
@@ -1,5 +1,9 @@
 module DataHelper
   def data_from(identifier)
-    p `ls data`
+    data = YAML.load_file("data/#{identifier}.yaml")
+    data.each do |d|
+      p d
+    end
+    data
   end
 end

From ca36e9b3fff42fd0252ab9cef5f786c73228f175 Mon Sep 17 00:00:00 2001
From: Lorin Werthen <werthenlorin@gmail.com>
Date: Tue, 2 Aug 2016 20:40:08 +0200
Subject: [PATCH 3/3] small edit

---
 content/about.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/about.erb b/content/about.erb
index c2cc627..e741599 100644
--- a/content/about.erb
+++ b/content/about.erb
@@ -22,7 +22,7 @@ title: About
   Het bestuur zorgt ervoor dat alle wieltjes blijven draaien en organiseert regelmatig activiteiten voor de leden. Het bestuur voor het academiejaar 2016-2017 van Zeus WPI is.
 
   <ul>
-    <% data_from('bestuur').each do |lid| %>
+    <% data_from(:bestuur).each do |lid| %>
     <li>
       <%= lid['rol'] %>:
       <a href="mailto:<%= lid['mail'] %>">