midgard/zeus.ugent.be
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into wemadeitboyz

Browse source
This commit is contained in:
Lorin Werthen 2016-10-03 22:42:50 +02:00
commit f3ff3cdb8d
34 changed files with 210 additions and 233 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -19,4 +19,4 @@ script:
after_success:
- mv deploy_key ~/.ssh/id_rsa
- chmod 600 ~/.ssh/id_rsa
- '[[ $TRAVIS_BRANCH == "master" ]] && bundle exec nanoc deploy --target public'
- '[[ $TRAVIS_BRANCH == "master" ]] && bundle exec nanoc deploy public'

2
Gemfile
View file

@ -1,7 +1,7 @@
# frozen_string_literal: true
source 'https://rubygems.org'
gem 'nanoc', '~>4.3.1'
gem 'nanoc', '~>4.3.3'
gem 'kramdown'
gem 'coffee-script'
# Needed for relativize_urls

10
Gemfile.lock
View file

@ -3,7 +3,7 @@ GEM
specs:
adsf (1.2.1)
rack (>= 1.0.0)
autoprefixer-rails (6.4.0.3)
autoprefixer-rails (6.5.0.1)
execjs
builder (3.2.2)
coderay (1.1.1)
@ -35,7 +35,7 @@ GEM
hamster (3.0.0)
concurrent-ruby (~> 1.0)
highline (1.7.8)
icalendar (2.4.0)
icalendar (2.4.1)
json (2.0.2)
kramdown (1.12.0)
listen (3.1.5)
@ -45,7 +45,7 @@ GEM
lumberjack (1.0.10)
method_source (0.8.2)
mini_portile2 (2.1.0)
nanoc (4.3.2)
nanoc (4.3.4)
cri (~> 2.3)
hamster (~> 3.0)
ref (~> 2.0)
@ -87,10 +87,10 @@ DEPENDENCIES
highline
icalendar
kramdown
nanoc (~> 4.3.1)
nanoc (~> 4.3.3)
nokogiri
sass
w3c_validators
BUNDLED WITH
1.12.5
1.13.0

21
Rules
View file

@ -4,6 +4,9 @@
require 'json'
require 'icalendar'
# Please @NoctuaNivalis
require 'socket'
#
#
# PREPROCESS
@ -28,11 +31,20 @@ 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].update_attributes(
navigable: true,
order: 10
)
all_events.each do |event|
event[:time] = Date.parse(event[:time])
end
end
#
@ -45,10 +57,12 @@ compile '/feed.xml' do
write '/feed.xml'
end
passthrough '/quotes.json'
#
# ARCHIVES
#
compile '/archives/*' do
compile '/blog/*' do
layout '/archive_page.*'
layout '/generic.*'
layout '/default.*'
@ -139,6 +153,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}'

1
content/about.erb
View file

@ -1,6 +1,7 @@
---
navigable: true
title: About
order: 0
---
<div class="content">
<h1>Over Zeus WPI</h1>

11
content/archives.erb
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>

2
content/assets/scripts/cammie.coffee
View file

@ -25,7 +25,7 @@ $ "#cammie-ctrls"
$ '.ctrl'
.click ->
$context = $ this
$.ajax "//kelder.zeus.ugent.be/webcam/cgi/ptdc.cgi",
$.ajax "https://kelder.zeus.ugent.be/webcam/cgi/ptdc.cgi",
data:
command: $context.data 'command'
posX: $context.data 'x'

8
content/assets/scripts/gamification.coffee Normal file
View file

@ -0,0 +1,8 @@
$ ->
$.getJSON 'https://zeus.ugent.be/game/top4/show.json', (data) ->
str = "<ol>"
for x in data
str += "<li><a href=\"#{x.github_url}\">#{x.github_name}</a> (#{x.score} Z$)</li>"
str += "</ol>"
$('#gamification-coders').html(str)

4
content/assets/scripts/quote.coffee Normal file
View file

@ -0,0 +1,4 @@
$ ->
$.getJSON 'http://localhost:3000/quotes.json', (data) ->
quote = data[Math.floor(Math.random()*data.length)]
$('#quote').append("<h3>#{quote.title}</h3><p>#{quote.description}</p>")

11
content/assets/stylesheets/includes/blogpost.scss
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';
}

5
content/assets/stylesheets/includes/general.scss
View file

@ -48,3 +48,8 @@ footer.footer {
vertical-align: inherit;
}
}
::selection {
color: white;
background: rgba(255, 127, 0, 0.99);
}

25
content/assets/stylesheets/includes/projects.css
View file

@ -1,25 +0,0 @@
/*# 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 */

22
content/assets/stylesheets/includes/tiles.scss
View file

@ -1,20 +1,16 @@
a.box {
color: #000;
&:hover {
box-shadow: 0 2px 3px rgba($black, 0.1), 0 0 0 1px $blue
}
}
#homepage {
.box {
background-color: $box-colour;
&.highlighted {
background-color: $highlighted-box-colour;
color: $highlighted-text-colour;
.content {
h1 {
color: white;
}
}
}
border-radius: 0;
}
}
.centering {
display: flex;
justify-content: center;
}

5
content/assets/stylesheets/includes/variables.scss
View file

@ -1,14 +1,19 @@
// Colours
$zeus-orange: #FF7F00;
$zeus-blue: #00C4FF;
$navbar-border-color: #CCC;
$event-border-color: #DDD;
$orange: $zeus-orange;
$blue: $zeus-blue;
$primary: $orange;
$family-sans-serif: 'Lato', sans-serif;
$link-visited: inherit;
$border_hover: $blue;
$box-colour: #EEE;
$highlighted-box-colour: $zeus-orange;
$highlighted-text-colour: white;

18
content/events.erb
View file

@ -1,6 +1,7 @@
---
navigable: true
title: Events
order: 20
---
<div>
@ -8,7 +9,22 @@ title: Events
<h1>Upcoming events</h1>
</div>
<% all_events.each do |event| %>
<% upcoming_events.each do |event| %>
<!-- <hr class="divider"> -->
<% if (sub_events(event)).empty? %>
<%= render '/partials/_event_preview.*', event: event %>
<% else %>
<% sub_events(event).each do |sub_event| %>
<%= render '/partials/_event_preview.*', event: sub_event, main_event: event %>
<% end %>
<% end %>
<% end %>
<div class="content">
<h1>Past events</h1>
</div>
<% past_events.each do |event| %>
<!-- <hr class="divider"> -->
<% if (sub_events(event)).empty? %>
<%= render '/partials/_event_preview.*', event: event %>

16
content/events/15-16/awk.md
View file

@ -1,16 +0,0 @@
---
title: AWK-les
banner: https://zeus.ugent.be/wp-content/uploads/2016/02/awkles-768x1007.jpg
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!
---
Op **dinsdag 23 februari 18:00** (na de les Scriptingtalen) in **Auditorium A1** organiseren we een **AWK-les** gegeven door **professor Peter Dawyndt**.
**AWK** is een scriptingtaal, bedoeld om lijn per lijn tekstbestanden te verwerken. Zo wordt AWK vaak gebruikt voor de ingebouwde werking met delimiters om CSV bestanden en dergelijke te verwerken. AWK staat tevens bekend om de talloze [one-liners](http://www.pement.org/awk/awk1line.txt) die in de command line gebruikt kunnen worden.
Sinds vorig jaar wordt AWK (samen met sed) niet meer gegeven in het vak Scriptingtalen, om meer te kunnen concentreren op Python en JavaScript. Hoewel deze zeer goede general purpose talen zijn, blijft AWK ongeëvenaard voor razendsnelle tekstverwerking en transformaties.

6
content/events/15-16/bottlebats/intro.md
View file

@ -1,6 +0,0 @@
---
title: Bottle Bats Introductie
time: 12-3-16
location: Grace Hopper
description: Dit is een description!
---

3
content/events/15-16/bottlebats/main.md
View file

@ -1,3 +0,0 @@
---
title: Bottle Bats
---

6
content/events/15-16/bottlebats/test.md
View file

@ -1,6 +0,0 @@
---
title: test
time: 12-3-16
location: Grace Hopper
description: Dit is een description!
---

2
content/events/16-17/LAN.md
View file

@ -3,7 +3,7 @@ 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
time: 04-11-2016
location: Therminal, Hoveniersberg 24 9000 Gent
locationlink: Therminal,Ghent Belgium
description: Zeus' vijfde LAN-Party

14
content/events/16-17/datacenter.md Normal file
View file

@ -0,0 +1,14 @@
---
title: Bezoek datacenter
banner: 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
location: hpc gent
locationlink: 51.023650, 3.712018
---
Zeus WPI organiseert in samenwerking met de medewerkers van de HPC een rondleiding in de S10.
Hier bevindt zich het datacenter en sinds enkele jaren de supercomputer.
Een echte must-see voor elke informaticus.
Inschrijven is verplicht en kunt u [hier](https://event.fkgent.be/events/111) doen .

62
content/index.erb
View file

@ -7,81 +7,73 @@
<div id="homepage">
<div class="tile is-vertical is-ancestor">
<div class="tile is-parent is-12">
<%= render '/partials/_tile.*', article: all_events[0] %>
<%= render '/partials/_tile.*', article: all_events[0], htmlclass: "highlighted", small_text: "Upcoming event" %>
</div>
<div class="tile">
<div class="tile is-parent is-4">
<%= render '/partials/_tile.*', article: all_events[1], htmlclass: "highlighted" %>
<%= render '/partials/_tile.*', article: all_events[1], small_text: "Upcoming event" %>
</div>
<div class="tile is-parent is-4">
<div class="tile is-child box highlighted">
IDK LOL
<!-- <img src="//thecatapi.com/api/images/get?format=src&type=gif&size=small"> -->
<div class="content has-text-centered">
<blockquote id="quote" >
<!-- INTENTIONALLY LEFT BLANK -->
</blockquote>
</div>
</div>
</div>
<div class="tile is-vertical is-2">
<a class="tile" href="https://zeus.ugent.be/wiki">
<div class="tile is-parent">
<div class="tile is-child box has-text-centered">
<div class="tile is-child box imgcenter" >
<%= fa 'wikipedia-w' %>
</div>
</div>
</a>
<a class="tile" href="/cammie">
<div class="tile is-parent">
<div class="tile is-child box has-text-centered">
<div class="tile is-child box imgcenter">
<%= fa 'video-camera' %>
</div>
</div>
</a>
</div>
<div class="tile is-vertical is-2">
<a class="tile" href="https://github.com/ZeusWPI">
<div class="tile is-parent">
<div class="tile is-child box has-text-centered">
<div class="tile is-child box imgcenter">
<%= fa 'github' %>
</div>
</div>
</a>
<a class="tile" href="https://www.facebook.com/zeus.wpi/?fref=ts">
<div class="tile is-parent">
<div class="tile is-child box has-text-centered">
<div class="tile is-child box imgcenter">
<%= fa 'facebook-official' %>
</div>
</div>
</a>
</div>
</div>
<div class="tile">
<div class="tile is-4 is-parent">
<div class="tile is-child box">
<div class="content">
<h1><%= sorted_articles.first[:title] %></h1>
<%= sorted_articles.first[:description] %>
</div>
</div>
<%= render '/partials/_tile.*', article: sorted_articles.first, small_text: "Latest blogpost" %>
</div>
<div class="tile is-vertical">
<div class="tile is-parent">
<div class="tile is-child box">
<p>
Numero uno: @werthen
</p>
<p>
Numero dos: @myncke
</p>
<p>
Numero tres: @iepoev
</p>
<p>
Numero quatro: @becousae
</p>
<div class="content">
<h1><a href="https://zeus.ugent.be/game">Top Zeus WPI coders this week</a></h1>
<div id="gamification-coders">
<!-- EMPTY -->
</div>
</div>
<div class="tile">
<div class="tile is-6 is-parent">
<div class="tile is-child box">
GITHUB
</div>
</div>
<div class="tile is-6 is-parent">
<div class="tile is-child box">
GITHUB
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<%= asset :js, :gamification %>
<%= asset :js, :quote %>

36
content/posts/16-17/review-c.md
View file

@ -1,36 +0,0 @@
---
title: C review
description: We hebben even wat dingen in C geschreven, en dit zijn onze meningen
created_at: 23-10-2016
---
> *Ben ik nu echt de enige die C echt niet leuk vindt?*
>
> <small>&mdash; Ilion Iasoon Beyst</small>
C is een toffe taal enal
~~~
Individual *genetic_algo(Area *area, StationCol *stations, double lo, double hi) {
// Initialize global variables
init_coverage_polygon(area);
MAX_POWER = power_to_energy_usage(43);
Population* p = generate_initial_population(POPULATION_SIZE, stations);
recalculate_fitness(area, stations, p, lo, hi);
Individual* best = genetic_algo_exec(p, area, stations, POPULATION_SIZE, lo, hi, clock());
for (size_t i = 0; i < best->size; i++) {
printf("%d\n", best->distribution[i]);
}
printf("%f\n", calculate_energy_usage(stations, best));
printf("%f\n", calculate_station_coverage(area, stations, best, NULL));
for (size_t i = 0; i < p->size; i++) {
individual__free(p->elems[i]);
}
population__free(p);
return best;
}
~~~

1
content/projects.erb
View file

@ -1,6 +1,7 @@
---
navigable: true
title: Projecten
order: 30
---
<div class="content">
<div class="container">

1
content/quotes.json Normal file
View file

File diff suppressed because one or more lines are too long

2
content/search.erb
View file

@ -1,5 +1,5 @@
---
navigable: true
navigable: false
title: Search
---
<form action="?" method="get">

28
layouts/archive_page.erb
View file

@ -1,12 +1,9 @@
<% posts_in_year(item[:academic_year]).each do |post| %>
<a href="<%= relative_path_to(post) %>">
<div class="box">
<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>
@ -15,5 +12,16 @@
</div>
</article>
</div>
</a>
<% end %>
</a>
<% end %>
</div>
<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>

15
layouts/eventpost.erb
View file

@ -5,15 +5,13 @@
<meta property="og:url" content="<%= url_for(item) %>" />
<% end %>
<section class="hero is-medium is-info is-bold">
<section class="hero is-medium is-primary is-bold">
<div class="hero-head">
<%= render '/partials/_navbar.*', zeus_logo_color: :white %>
</div>
<div class="hero-body ">
<div class="hero-body">
<div class="container">
<div class="columns">
<div class="column">
<p class="title is-1">
<b>
@ -25,16 +23,15 @@
</p>
<p class="subtitle is-3">
<ul class="fa-ul">
<li><%= fa 'clock-o', li: true %><%= item[:time] %></li>
<li><%= fa 'globe', li: true %><%= item[:location] %></li>
<li><%= fa 'clock-o', li: true %><%= item[:time].strftime '%A %d %B %Y' %></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[:banner] %>" >
</div>
</div>
</div>
</div>
@ -43,7 +40,7 @@
<section class="section">
<div class="columns">
<div class="column is-8 is-offset-2">
<div class="content has-text-justified">
<div class="content has-text-justified is-medium">
<%= yield %>
</div>
</div>

8
layouts/partials/_tile.erb
View file

@ -1,19 +1,17 @@
<a href="<%= relative_path_to(@article) %>" class="tile is-child box <%= @htmlclass %>">
<div class="main-tile">
<div class="content">
<div class="columns">
<div class="column">
<h1>
<h2>
<%= @article[:title] %>
</h1>
</h2>
</div>
<div class="column is-narrow">
<small>
<%= @article[:created_at] %>
<%= @small_text %>
</small>
</div>
</div>
<%= @article[:description] %>
</div>
</div>
</a>

2
lib/helpers/archives.rb
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)

10
lib/helpers/events.rb
View file

@ -1,7 +1,15 @@
require 'uri'
module EventsHelper
def all_events
@items.find_all('/events/*/*') + grouped_events
@items.find_all('/events/*/*').sort_by { |x| x[:time] }
end
def upcoming_events
all_events.reject { |x| x[:time] < Date.today }
end
def past_events
all_events.reject { |x| x[:time] >= Date.today }
end
def grouped_events

2
lib/helpers/ical.rb
View file

@ -11,7 +11,7 @@ module IcalHelper
def event_for(item)
event = Icalendar::Event.new
event.dtstart = Date.parse(item[:time])
event.dtstart = item[:time]
event.summary = 'A great event!'
event

2
lib/helpers/nav.rb
View file

@ -1,6 +1,6 @@
module NavigationHelper
def nav_items
navigables = items.select { |i| i[:navigable] }
navigables = items.select { |i| i[:navigable] }.sort_by { |x| x[:order] || 10000 }
navigables.each do |item|
is_active = @item_rep && @item_rep.path == item.path

2
package.json
View file

@ -7,6 +7,6 @@
"license": "MIT",
"repository": "https://github.com/ZeusWPI/zeus.ugent.be",
"dependencies": {
"bulma": "^0.1.2"
"bulma": "^0.2.1"
}
}