Merge pull request #86 from ZeusWPI/lan-party

Geeks, Attack! V
2016-10-09 12:15:31 +02:00 · 2016-10-09 12:15:31 +02:00 · a5c43630da
parent e904a09ced 5758ec94e0
commit a5c43630da
14 changed files with 64 additions and 31 deletions
--- a/1
+++ b/1
@ -22,6 +22,7 @@ gem 'autoprefixer-rails'
 group :development do
  gem 'adsf'
  gem 'highline'
+  gem 'terminal-notifier-guard'
 end

 group :nanoc do
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -70,6 +70,7 @@ GEM
    sass (3.4.22)
    shellany (0.0.1)
    slop (3.6.0)
+    terminal-notifier-guard (1.7.0)
    thor (0.19.1)
    w3c_validators (1.2)
      json
@ -90,6 +91,7 @@ DEPENDENCIES
  nanoc (~> 4.3.3)
  nokogiri
  sass
+  terminal-notifier-guard
  w3c_validators

 BUNDLED WITH
--- a/4
+++ b/4
@ -33,7 +33,7 @@ preprocess do
  academic_years.each do |year|
    @items.create(
      '',
-      { academic_year: year, title: "Blog" },
+      { academic_year: year, title: 'Blog' },
      "/blog/#{year}-#{year + 1}.html",
      binary: false
    )
@ -45,7 +45,7 @@ preprocess do
  )

  all_events.each do |event|
-    event[:time] = Date.parse(event[:time])
+    event[:time] = DateTime.parse(event[:time])
  end
 end

--- a/content/assets/stylesheets/includes/eventpage.scss
+++ b/content/assets/stylesheets/includes/eventpage.scss
@ -23,3 +23,13 @@
 .event-attributes {
  font-size: 1.3em;
 }
+
+.event-social-icons {
+  margin-left: 10px;
+
+  .fa {
+    margin-right: 5px;
+    font-size: 0.60em;
+    vertical-align: baseline;
+  }
+}
--- a/content/assets/stylesheets/includes/general.scss
+++ b/content/assets/stylesheets/includes/general.scss
@ -1,11 +1,3 @@
-.fa-ul {
-  list-style: none !important;
-
-  .fa {
-    font-size: inherit;
-  }
-}
-
 .has-text-justified {
  text-align: justify;
 }
@ -65,9 +57,8 @@ main.section {

 footer.footer {
  padding-bottom: 40px;
+
  .fa {
-    font-size: inherit;
-    text-align: inherit;
    vertical-align: inherit;
  }
 }
--- a/content/events/16-17/LAN.md
+++ b/content/events/16-17/LAN.md
@ -1,15 +1,28 @@
 ---
 title: Geeks, Attack! V
-banner: https://scontent.xx.fbcdn.net/v/t1.0-9/13903431_1277596932251344_3927837466166230371_n.jpg?oh=bdda0d18a635c49893a097fba6aa99b9&oe=587C7886
+image: //i.imgur.com/sQPA5m3.png
+banner: //imgur.com/gVXvesA.png
 description: Zeus' vijfde LAN-Party
 created_at: 13-09-2016
-time: 04-11-2016
+time: 04-11-2016 16:00
 location: Therminal, Hoveniersberg 24 9000 Gent
 locationlink: Therminal,Ghent Belgium
 description: Zeus' vijfde LAN-Party
+facebook: https://www.facebook.com/events/299820833699196/
 ---

-De vijfde editie van Zeus WPI's LAN-Party komt eraan!
-Hou alvast de datum vrij!
+# It's that time of year again

-Wij houden jullie op de hoogte!
+Je leest het goed, op **4 november** vindt onze vijfde editie van onze jaarlijkse LAN-Party plaats in **[Studentenhuis De Therminal](http://student.ugent.be/)** (Hoveniersberg 24, 9000 Gent).
+
+Vanaf **16:00** kunnen jullie elkaars Nexus vernietigen in League of Legends, een Ancient ten val brengen in Dota 2, bommen ontmantelen in Counter Strike: Global Offensive, op ontzagwekkende snelheden door de maps van Trackmania rijden, en nog veel, veel meer.
+
+# Schrijf je in!
+
+Door je in te schrijven krijgen wij een beter beeld van hoeveel volk we kunnen verwachten, wat we allemaal moeten voorzien, en welke competities we kunnen organiseren. **[Klik hier om je in te schrijven.](https://goo.gl/forms/XwHhYB4NkOO2GDoE3)**
+
+# Praktisch
+
+De deuren openen om 16:00. We vragen €2 inkom, die gebruikt zal worden om de prijzenpot van onze competities aan te dikken.
+
+Uit ervaring weten we dat het soms wat kouder kan worden in de Therminal rondom die tijd, dus draag zeker een **trui** of iets dergelijks! We doen echter ons best om de verwarming in orde te krijgen.
--- a/content/events/16-17/datacenter.md
+++ b/content/events/16-17/datacenter.md
@ -1,9 +1,9 @@
 ---
 title: Bezoek datacenter
-banner: https://emergingtechblog.emc.com/wp-content/uploads/2015/10/AdobeStock_86289688.jpeg
+image: https://emergingtechblog.emc.com/wp-content/uploads/2015/10/AdobeStock_86289688.jpeg
 description: Zeus bezoekt het datacenter en de supercomputer in S10!
 created_at: 3-10-2016
-time: 10-10-2016
+time: 10-10-2016 17:45
 location: Datacenter UGent, S10, Sterre
 locationlink: 51.023650, 3.712018
 ---
--- a/content/events/16-17/lip.md
+++ b/content/events/16-17/lip.md
@ -1,9 +1,9 @@
 ---
 title: Linux Install Party
-banner: //scontent-bru2-1.xx.fbcdn.net/t31.0-8/s960x960/14435421_1323382324339471_2958587023924328526_o.jpg
+image: //scontent-bru2-1.xx.fbcdn.net/t31.0-8/s960x960/14435421_1323382324339471_2958587023924328526_o.jpg
 description: Hulp nodig met het installeren van Linux op je laptop? Zeus helpt je graag!
 created_at: 3-10-2016
-time: 5-10-2016
+time: 5-10-2016 17:00
 location: Zeus kelder, S9
 locationlink: Sterre,Ghent Belgium
 ---
--- a/layouts/default.erb
+++ b/layouts/default.erb
@ -8,9 +8,6 @@
      Zeus WPI | <%= item[:title] || 'Werkgroep Informatica van de Universiteit Gent' %>
    </title>

-    <!-- Font Awesome -->
-    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-T8Gy5hrqNKT+hzMclPo118YTQO6cYprQmhrYwIiQ/3axmI1hQomh7Ud2hPOy8SP1" crossorigin="anonymous">
-
    <link rel="icon" href="/assets/images/favicon32.png" type="image/x-icon" />

    <script src="https://code.jquery.com/jquery-3.0.0.min.js" charset="utf-8"></script>
@ -40,6 +37,9 @@

    <%= asset :css, :main %>

+    <!-- Font Awesome -->
+    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-T8Gy5hrqNKT+hzMclPo118YTQO6cYprQmhrYwIiQ/3axmI1hQomh7Ud2hPOy8SP1" crossorigin="anonymous">
+
    <%= content_for(@item, :head) %>
  </head>
  <body class="site">
--- a/layouts/eventpost.erb
+++ b/layouts/eventpost.erb
@ -1,11 +1,15 @@
 <% content_for :head do %>
-<meta property="og:image" content="<%= item[:banner] %>" />
+<meta property="og:image" content="<%= item[:image] %>" />
 <meta property="og:title" content="<%= item[:title] %>" />
 <meta property="og:type" content="article" />
 <meta property="og:url" content="<%= url_for(item) %>" />
 <% end %>

+<% if item[:banner] %>
+<section class="hero is-medium is-primary is-bold" style="background-image:url('<%= item[:banner] %>');">
+<% else %>
 <section class="hero is-medium is-primary is-bold">
+<% end %>
  <div class="hero-head">
    <%= render '/partials/_navbar.*', zeus_logo_color: :white %>
  </div>
@ -17,20 +21,30 @@
            <b>
              <%= item[:title] %>
            </b>
+            <span class="event-social-icons">
+              <% if item[:facebook] %>
+              <a href="<%= item[:facebook] %>">
+                <%= fa :facebook %>
+              </a>
+              <% end %>
+              <a href="<%= item.path rep: :ical %>">
+                <%= fa :calendar %>
+              </a>
+            </span>
          </p>
          <p class="subtitle is-3">
            <%= item[:description] %>
          </p>
          <p class="subtitle is-3">
            <ul class="fa-ul event-attributes">
-              <li><%= fa 'clock-o', li: true %><%= item[:time].strftime '%A %d %B %Y' %></li>
+              <li><%= fa 'clock-o', li: true %><%= item[:time].strftime '%A %d %B %Y %H:%M' %></li>
              <li><%= fa 'map-marker', li: true %><%= item[:location] %></li>
            </ul>
          </p>
        </div>

        <div class="is-narrow column banner-image">
-          <img src="<%= item[:banner] %>"  >
+          <img src="<%= item[:image] %>"  >
        </div>
      </div>
    </div>
--- a/layouts/partials/_event_preview.erb
+++ b/layouts/partials/_event_preview.erb
@ -1,6 +1,6 @@
 <div class="box event-preview">
  <div class="image-holder">
-    <img src="<%= event[:banner]%>" alt="" class="image" />
+    <img src="<%= event[:image]%>" alt="" class="image" />
  </div>

  <div class="box info">
--- a/layouts/partials/_footer.erb
+++ b/layouts/partials/_footer.erb
@ -2,7 +2,7 @@
  <div class="container">
    <div class="content has-text-centered">
      <p>
-        Made with <%= fa :heart, inline: true %> by Zeus WPI
+        Made with <%= fa :heart %> by Zeus WPI
      </p>
      <p>
        <a href="https://github.com/ZeusWPI/zeus.ugent.be">
--- a/lib/helpers/font_awesome.rb
+++ b/lib/helpers/font_awesome.rb
@ -1,9 +1,11 @@
 module FontAwesomeHelper
-  def fa(icon, size: nil, li: false, inline: false)
+  def fa(icon, size: nil, li: false, stack: nil, inverse: false)
    classes = ['fa', "fa-#{icon}"]

    classes << "fa-#{size}" if size
    classes << 'fa-li' if li
+    classes << "fa-stack-#{stack}" if stack
+    classes << 'fa-inverse' if inverse

    "<i class='#{classes.join(' ')}'></i>"
  end
--- a/lib/helpers/ical.rb
+++ b/lib/helpers/ical.rb
@ -12,7 +12,7 @@ module IcalHelper
  def event_for(item)
    event = Icalendar::Event.new
    event.dtstart = item[:time]
-    event.summary = 'A great event!'
+    event.summary = item[:title]

    event
  end