Merge pull request #54 from ZeusWPI/eventpage

Eventpage

.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_WITHOUT: "production"

content/assets/stylesheets/includes/eventpage.scss

@@ -11,3 +11,11 @@
     height: 400px;
   }
 }
+
+.banner-image{
+  justify-content: center;
+  display: flex;
+  img{
+    height: 256px;
+  }
+}

content/assets/stylesheets/includes/events.scss

@@ -8,14 +8,15 @@
 .box.event-preview {
   border-radius: 0px;
   display: flex;
-  align-items: center;
   box-shadow : none;
-  margin-bottom: 0px;
+  margin: 0px;
+  padding:20px;
+  padding-top:0px;
 
   // border-top: 1px solid lighten(gray, 40%);
 
   .image-holder {
-    border-radius: 50%;
+    //border-radius: 50%;
     padding: 10px;
     border: 1px solid lighten(gray, 30%);
     width: 15%;
@@ -23,13 +24,14 @@
   }
 
   .image {
-    border-radius: 50%;
+    //border-radius: 50%;
-    vertical-align: middle;
+    vertical-align: baseline;
     border: 1px solid gray;
   }
 
   .info {
-    margin: 1.5em;
+  padding:20px;
+  padding-top:0px;
     box-shadow : none;
     width: 60%;
 

content/events/15-16/awk.md

@@ -5,6 +5,7 @@ description: Een AWK-les voor AWK gerelateerde dingen
 created_at: 01-02-2016
 time: 23-02-2016
 location: Auditorium A1, Campus Sterre, Gebouw S9
+locationlink: Zeus WPI,Ghent Belgium
 description: Dit is een description van het awk event!
 ---
 

content/events/16-17/LAN.md

@@ -0,0 +1,15 @@
+---
+title: Geeks, Attack! V
+banner: https://scontent.xx.fbcdn.net/v/t1.0-9/13903431_1277596932251344_3927837466166230371_n.jpg?oh=bdda0d18a635c49893a097fba6aa99b9&oe=587C7886
+description: Zeus' vijfde LAN-Party
+created_at: 13-09-2016
+time: 4-11-2016
+location: Therminal, Hoveniersberg 24 9000 Gent
+locationlink: Therminal,Ghent Belgium
+description: Zeus' vijfde LAN-Party
+---
+
+De vijfde editie van Zeus WPI's LAN-Party komt eraan!
+Hou alvast de datum vrij!
+
+Wij houden jullie op de hoogte!

layouts/eventpost.erb

@@ -9,22 +9,33 @@
   <div class="hero-head">
     <%= render '/partials/_navbar.*', zeus_logo_color: :white %>
   </div>
-  <div class="hero-body">
+  <div class="hero-body ">
+
     <div class="container">
-      <p class="title is-1">
+      <div class="columns">
-        <b>
+
-        <%= item[:title] %>
+        <div class="column">
-        </b>
+          <p class="title is-1">
-      </p>
+          <b>
-      <p class="subtitle is-3">
+            <%= item[:title] %>
-        <%= item[:description] %>
+          </b>
-      </p>
+          </p>
-      <p class="subtitle is-3">
+          <p class="subtitle is-3">
-        <ul class="fa-ul">
+          <%= item[:description] %>
-          <li><%= fa 'clock-o', li: true %><%= item[:time] %></li>
+          </p>
-          <li><%= fa 'globe', li: true %><%= item[:location] %></li>
+          <p class="subtitle is-3">
-        </ul>
+          <ul class="fa-ul">
-      </p>
+            <li><%= fa 'clock-o', li: true %><%= item[:time] %></li>
+            <li><%= fa 'globe', li: true %><%= item[:location] %></li>
+          </ul>
+          </p>
+        </div>
+
+        <div class="is-narrow column banner-image">
+          <img src=<%= item[:banner] %>  >
+        </div>
+
+      </div>
     </div>
   </div>
 </section>
@@ -41,8 +52,7 @@
     <div class="google-maps column is-8 is-offset-2">
       <iframe
         frameborder="0" style="border:0"
-        src="https://www.google.com/maps/embed/v1/place?key=AIzaSyBDTmw7LtDG28o9QjCnNucAJv2zTZpLjJU
+        src="<%= locationlink item[:locationlink] %>" allowfullscreen>
-          &q=Zeus+WPI,Ghent+Belgium" allowfullscreen>
       </iframe>
     </div>
   </div>

layouts/partials/_event_preview.erb

@@ -1,6 +1,6 @@
 <div class="box event-preview">
   <div class="image-holder">
-    <img src="https://placehold.it/150x150" alt="" class="image" />
+    <img src="<%= event[:banner]%>" alt="" class="image" />
   </div>
 
   <div class="box info">

lib/helpers/events.rb

@@ -1,3 +1,4 @@
+require 'uri'
 module EventsHelper
   def all_events
     @items.find_all('/events/*/*') + grouped_events
@@ -17,4 +18,8 @@ module EventsHelper
       []
     end
   end
+
+  def locationlink(location)
+    "https://www.google.com/maps/embed/v1/place?key=AIzaSyBDTmw7LtDG28o9QjCnNucAJv2zTZpLjJU&q=#{URI.escape(location)}" if location
+  end
 end