Merge branch 'master' into indexpage

This commit is contained in:
Eloïse Piret 2016-10-03 15:35:03 +02:00
commit c8a8ebfd04
13 changed files with 282 additions and 44 deletions

12
Rules
View file

@ -4,6 +4,9 @@
require 'json'
require 'icalendar'
# Please @NoctuaNivalis
require 'socket'
#
#
# PREPROCESS
@ -28,11 +31,13 @@ preprocess do
academic_years.each do |year|
@items.create(
'',
{ academic_year: year },
"/archives/#{year}-#{year + 1}.html",
{ academic_year: year, title: "Blog" },
"/blog/#{year}-#{year + 1}.html",
binary: false
)
end
academic_years_items[academic_years.max][:navigable] = true
end
#
@ -48,7 +53,7 @@ end
#
# ARCHIVES
#
compile '/archives/*' do
compile '/blog/*' do
layout '/archive_page.*'
layout '/generic.*'
layout '/default.*'
@ -130,6 +135,7 @@ ignore '/assets/stylesheets/includes/**/*'
compile '/assets/stylesheets/**/*.scss' do
filter :sass, syntax: :scss
filter :autoprefixer if Socket.gethostname == 'abysm'
end
passthrough '/assets/images/*.{png,svg}'

View file

@ -1,11 +0,0 @@
---
navigable: true
title: Archieven
---
<ul class = "archive_list">
<% academic_years_items.each do |year, item| %>
<li>
<%= link_to pretty_year(year), item %>
</li>
<% end %>
</ul>

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

View file

@ -3,3 +3,14 @@
font-size: 4em;
}
}
.padbox{
margin-bottom:10px;
}
.bolder a{
color:#565C5E;
font-weight: bold;
font-size: 20pt;
font-family: 'Avenir';
}

View file

@ -0,0 +1,25 @@
/*# sourceMappingURL=projects.css.map */
/* line 4, /Users/mehmet/Projects/zeus.ugent.be/content/assets/stylesheets/includes/projects.scss */
.imgspace {
display: flex;
justify-content: space-around;
width: 100%;
text-align: center; }
/* line 11, /Users/mehmet/Projects/zeus.ugent.be/content/assets/stylesheets/includes/projects.scss */
.imgcenter {
display: flex;
justify-content: center;
/* align horizontal */
align-items: center;
/* align vertical */ }
/* line 18, /Users/mehmet/Projects/zeus.ugent.be/content/assets/stylesheets/includes/projects.scss */
.padbot {
padding-bottom: 15px; }
/* line 24, /Users/mehmet/Projects/zeus.ugent.be/content/assets/stylesheets/includes/projects.scss */
.padtop {
padding-top: 25px; }
/*# sourceMappingURL=projects.css.map */

View file

@ -0,0 +1,28 @@
/*# sourceMappingURL=projects.css.map */
.imgspace {
display: flex;
justify-content: space-around;
width: 100%;
text-align: center;
}
.imgcenter {
display: flex;
justify-content: center; /* align horizontal */
align-items: center; /* align vertical */
}
.padbot {
padding-bottom: 15px;
}
.padtop {
padding-top: 25px;
}

View file

@ -29,3 +29,4 @@ body.site {
@import "includes/general";
@import "includes/eventpage";
@import "includes/404";
@import "includes/projects";

View file

@ -0,0 +1,7 @@
---
title: moar review
description: blub
banner: https://i.ytimg.com/vi/tntOCGkgt98/maxresdefault.jpg
created_at: 24-10-2016
---
blub

View file

@ -1,4 +1,5 @@
---
banner: https://thumbs.dreamstime.com/z/letter-c-cat-4240140.jpg
title: C review
description: We hebben even wat dingen in C geschreven, en dit zijn onze meningen
created_at: 23-10-2016

View file

@ -2,17 +2,174 @@
navigable: true
title: Projecten
---
<% 5.times do %>
<section class="hero is-primary">
<div class="hero-body">
<div class="content">
<div class="container">
<h1 class="title">
Hydra
</h1>
<p>
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Temporibus facere, ut in magnam harum at, aliquam nostrum totam tempore distinctio explicabo natus quis pariatur quos maiores dignissimos inventore! Ad amet harum ipsum laudantium modi ipsa dolores, omnis impedit nostrum expedita sed molestias similique veritatis, quo explicabo odit minus cum quibusdam accusamus beatae quam vitae cumque ipsam eius. Alias ipsam blanditiis deleniti nam magni veritatis, quas quae. Quam quia at tempora repellat optio aliquam, quasi deserunt esse distinctio voluptate harum hic sed vel blanditiis nam modi fuga, totam neque vero! Sunt, ipsum sit! Libero quam temporibus deserunt, quo itaque perspiciatis earum.
</p>
<div class="tile is-vertical">
<div class="tile">
<article class="tile is-child notification is-default">
<div class="columns">
<div class="column is-one-quarter has-text-centered padtop">
<img src="/assets/images/unnamed.png">
</div>
<div class="column">
<p class="title">Hydra</p>
<p class="subtitle">Android, iOS, and Windows 10 application providing all the information a student at Ghent University needs.</p>
<div class="columns">
<div class="column is-one-quarter"></div>
<div class="column imgspace">
<a href="https://itunes.apple.com/be/app/hydra/id602640924"><img src="https://camo.githubusercontent.com/c5065f53773c01c20c7cb90cbbefc9552b4e3187/687474703a2f2f73747564656e742e7567656e742e62652f68796472612f696d672f73746f72652d696f732e706e67"></a>
<a href="http://play.google.com/store/apps/details?id=be.ugent.zeus.hydra"><img src="https://camo.githubusercontent.com/2b3471ae9f71b68d99ec52802a1c14c9a6803086/687474703a2f2f73747564656e742e7567656e742e62652f68796472612f696d672f73746f72652d616e64726f69642e706e67"></a>
<a href="http://www.windowsphone.com/s?appId=08d3268e-aad6-48fa-ae83-5ccd1663e73a"><img src="/assets/images/win.png"></a>
</div>
</div>
<div class="columns">
<div class="column is-one-quarter"></div>
<div class="column imgspace">
<a href="https://github.com/ZeusWPI/hydra-iOS">iOS <span class="icon"><i class="fa fa-github"></i></span></a>
<a href="https://github.com/ZeusWPI/hydra-android">Android <span class="icon"><i class="fa fa-github"></i></span></a>
<a href="https://github.com/ZeusWPI/hydra-windows">Windows 10 <span class="icon"><i class="fa fa-github"></i></span></a>
</div>
</div>
</div>
</div>
</article>
</div>
</div>
</div>
</div>
</section>
<% end %>
</div>
<div class="content">
<div class="container">
<div class="tile is-vertical">
<div class="tile">
<article class="tile is-child notification is-default">
<p class="title has-text-centered">FK-enrolment</p>
<p class="subtitle has-text-centered">Enrolment system for new members of FK-clubs at Ghent University.</p>
<div class="has-text-centered"><a href="https://github.com/ZeusWPI/FK-enrolment">FK-enrolment<span class="icon"><i class="fa fa-github"></i></span></a></div>
</article>
</div>
</div>
</div>
</div>
<div class="content">
<div class="container">
<div class="tile is-vertical">
<div class="tile">
<article class="tile is-child notification is-default">
<p class="title has-text-centered">Badass Bottle Bats</p>
<p class="subtitle has-text-centered">A bot writing contest <a href="https://zeus.ugent.be/bottlebats">https://zeus.ugent.be/bottlebats</a></p>
<div class="has-text-centered"><a href="https://github.com/ZeusWPI/aichallenge">Badass Bottle Bats<span class="icon"><i class="fa fa-github"></i></span></a></div>
</article>
</div>
</div>
</div>
</div>
<div class="content">
<div class="container">
<div class="tile is-vertical">
<div class="tile">
<article class="tile is-child notification is-default">
<p class="title has-text-centered">Haldis</p>
<p class="subtitle has-text-centered">Haldis is your friendly neighbourhood servant. He exists so lazy fucks like you and me don't need to keep tabs of who is ordering what from where. Start an order and let people add items with a simple mouse-click! No more calculating prices and making lists! Be lazier today!</p>
<div class="has-text-centered padbot subtitle"><a href="http://zeus.ugent.be/haldis">http://zeus.ugent.be/haldis</a></div>
<div class="has-text-centered"><a href="https://github.com/ZeusWPI/Haldis">Haldis<span class="icon"><i class="fa fa-github"></i></span></a></div>
</article>
</div>
</div>
</div>
</div>
<div class="content">
<div class="container">
<div class="tile is-vertical">
<div class="tile">
<article class="tile is-child notification is-default">
<p class="title has-text-centered">Tab</p>
<p class="subtitle has-text-centered">💰 Yes. We have to drink. But we also have to pay. This does the paying part. <a href="https://zeus.ugent.be/tab">https://zeus.ugent.be/tab</a></p>
<div class="has-text-centered"><a href="https://github.com/ZeusWPI/Tab">Tab<span class="icon"><i class="fa fa-github"></i></span></a></div>
</article>
</div>
</div>
</div>
</div>
<div class="content">
<div class="container">
<div class="tile is-vertical">
<div class="tile">
<article class="tile is-child notification is-default">
<p class="title has-text-centered">Gandalf</p>
<p class="subtitle has-text-centered">You Shall Not Pass - An advanced e-ticket system for student clubs - <a href="http://event.fkgent.be">http://event.fkgent.be</a></p>
<div class="has-text-centered"><a href="https://github.com/ZeusWPI/Gandalf">Gandalf<span class="icon"><i class="fa fa-github"></i></span></a></div>
</article>
</div>
</div>
</div>
</div>
<div class="content">
<div class="container">
<div class="tile is-vertical">
<div class="tile">
<article class="tile is-child notification is-default">
<p class="title has-text-centered">Lana</p>
<p class="subtitle has-text-centered">🐕 LAN-Party Assistant. An application to make the life of a LAN-partygoer easier!</p>
<div class="has-text-centered"><a href="https://github.com/ZeusWPI/Lana">Lana<span class="icon"><i class="fa fa-github"></i></span></a></div>
</article>
</div>
</div>
</div>
</div>
<div class="content">
<div class="container">
<div class="tile is-vertical">
<div class="tile">
<article class="tile is-child notification is-default">
<p class="title has-text-centered">Saruman</p>
<p class="subtitle has-text-centered">Saruman is a material management tool where partners can reserve stuff.</p>
<div class="has-text-centered"><a href="https://github.com/ZeusWPI/Saruman">Saruman<span class="icon"><i class="fa fa-github"></i></span></a></div>
</article>
</div>
</div>
</div>
</div>
<div class="content">
<div class="container">
<div class="tile is-vertical">
<div class="tile">
<article class="tile is-child notification is-default">
<p class="title has-text-centered">12urenloop</p>
<p class="subtitle has-text-centered">Application to count laps based on bluetooth dongle detection <a href="http://12urenloop.be">http://12urenloop.be</a></p>
<div class="has-text-centered"><a href="https://github.com/ZeusWPI/12urenloop">12urenloop<span class="icon"><i class="fa fa-github"></i></span></a></div>
</article>
</div>
</div>
</div>
</div>
<div class="content">
<div class="container">
<div class="tile is-vertical">
<div class="tile">
<article class="tile is-child notification is-default">
<p class="title has-text-centered">SlotMachien</p>
<p class="subtitle has-text-centered">This repository contains all applications related to SlotMachien; a Lego MindStorms robot designed to turn a specific lock.</p>
<div class="has-text-centered"><a href="https://github.com/ZeusWPI/slotmachien">SlotMachien<span class="icon"><i class="fa fa-github"></i></span></a></div>
</article>
</div>
</div>
</div>
</div>

View file

@ -1,19 +1,32 @@
<% posts_in_year(item[:academic_year]).each do |post| %>
<a href="<%= relative_path_to(post) %>">
<div class="box">
<article class="media">
<figure class="media-left">
<p class="image is-64x64">
<img src="<%= post[:banner] %>">
</p>
</figure>
<div class="media-content">
<div class="content">
<h2><%= post[:title] %></h2>
<%= excerptize(post.reps[:text].compiled_content, length: 200) %>
</div>
<div class="columns" >
<div class="column">
<% posts_in_year(item[:academic_year]).each do |post| %>
<a href="<%= relative_path_to(post) %>" >
<div class="box padbox">
<article class="media">
<figure class="media-left">
<p class="image is-64x64">
<img src="<%= post[:banner] %>">
</p>
</figure>
<div class="media-content">
<div class="content">
<h2><%= post[:title] %></h2>
<%= excerptize(post.reps[:text].compiled_content, length: 200) %>
</div>
</div>
</article>
</div>
</article>
</a>
<% end %>
</div>
</a>
<% end %>
<div class="column is-narrow">
<ul class = "archive_list">
<% academic_years_items.each do |year, item| %>
<li class="bolder">
<%= link_to pretty_year(year), item %>
</li>
<% end %>
</ul>
</div>
</div>

View file

@ -11,7 +11,7 @@ module ArchiveHelper
end
def academic_years_items
academic_years.map { |y| [y, items["/archives/#{y}-#{y + 1}.html"]] }.to_h
academic_years.to_a.reverse.map { |y| [y, items["/blog/#{y}-#{y + 1}.html"]] }.to_h
end
def pretty_year(year)