Merge branch 'master' of ssh://git.zeus.gent:2222/kelder/durfdoen-2.0

stuveco fix

.gitignore

@@ -10,3 +10,6 @@ tmp/nanoc/
 crash.log
 
 .idea/
+
+
+.sass-cache/

Gemfile.lock

@@ -122,9 +122,16 @@ GEM
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
+    sassc (2.4.0)
+      ffi (~> 1.9)
     shellany (0.0.1)
+    slim (4.1.0)
+      temple (>= 0.7.6, < 0.9)
+      tilt (>= 2.0.6, < 2.1)
     slow_enumerator_tools (1.1.0)
+    temple (0.8.2)
     thor (1.0.1)
+    tilt (2.0.10)
     tomlrb (1.3.0)
     tty-color (0.5.2)
     tty-command (0.9.0)
@@ -149,6 +156,8 @@ DEPENDENCIES
   nokogiri
   pdfkit
   sass
+  sassc
+  slim
 
 BUNDLED WITH
    2.1.4

Makefile

@@ -1,2 +1,11 @@
+.PHONY: live build setup
+
+live:
+	bundle exec nanoc live
+
 build:
-	nanoc
+	bundle exec nanoc
+
+setup:
+	which bundle || { { gem install bundler && which bundle; } || echo 'Could not find `bundle`.'" Make sure the directory with the Ruby's gem executables is in your PATH. (Typically ~/.gem/ruby/*/bin)" && false; }
+	bundle install

README.md

@@ -3,12 +3,24 @@ Durf Doen 2.0
 
 ## Setup instructions
 
-1. Install bundler (`gem install bundler`)
-2. Install other gems (`bundle install`)
-3. Build and serve the site (`bundle exec nanoc live`)
+1. Install Ruby, preferably the version specified in `.ruby-version`
+2. Install bundler (`gem install bundler`)
+3. Install other dependencies (`bundle install`)
+4. Build and serve the site (`bundle exec nanoc live`)
 
-### Optional setup via docker
+To build the artefacts for production: `bundle exec nanoc`
 
-You can run the code in a separated docker environment. It compiles the code and serves the files via nginx.
+### Setup on windows
+
+This is very flaky, but it might help to
+- Of course only install Ruby 2.6
+- Change `gem 'mini_racer'` to `gem 'mini_racer', platforms: :ruby` in Gemfile
+- Follow this GitHub page https://github.com/eakmotion/therubyracer_for_windows
+- Edit this file `C:\Ruby26-x64\lib\ruby\gems\2.6.0\gems\eventmachine-1.2.7-x64-mingw32\lib`, adding `require 'em pure_ruby'` and a newline to the top of the file
+- After all this, on my machine, it still throws an exception, but the live reloading works, until it doesn't (most of the time after a failed compile)
+
+### Optional setup via Docker
+
+You can run the code in a separated Docker environment. It compiles the code and serves the files via nginx.
 
     docker build --tag durfdoen2 . && docker run --publish 8080:80 --detach --name dd durfdoen2

Rules

@@ -6,8 +6,8 @@ preprocess do
   themas.each do |thema|
     content = ''
     attributes = {
-        naam: thema,
-        verenigingen: @items.filter{|i| i[:themas] and i[:themas].include?(thema)}.flatten.uniq.compact
+        identifier: thema,
+        naam: thema.downcase
     }
     identifier = "/themas/#{thema}"
 
@@ -15,25 +15,9 @@ preprocess do
   end
 end
 
-compile '/{verenigingen,projecten}/*.md' do
+compile '/{verenigingen,projecten,konventen}/*.md' do
   filter :kramdown
-  layout '/vereniging.*'
-  layout '/default.*'
-  layout '/base.*'
-  write ext: 'html'
-end
-
-compile '/evenementen/*.md' do
-  filter :kramdown
-  layout '/evenement.*'
-  layout '/default.*'
-  layout '/base.*'
-  write ext: 'html'
-end
-
-compile '/konventen/*.md' do
-  filter :kramdown
-  layout '/konvent.*'
+  layout '/detail.*'
   layout '/default.*'
   layout '/base.*'
   write ext: 'html'
@@ -42,12 +26,14 @@ end
 compile '/themas/*' do
   layout '/thema.*'
   layout '/default.*'
+  layout '/base.*'
   write ext: 'html'
 end
 
 compile '/homepage.md' do
   filter :kramdown
   layout '/homepage.*'
+  layout '/default.*'
   layout '/base.*'
   write '/index.html'
 end
@@ -64,6 +50,21 @@ compile '/verenigingen.md' do
   write '/verenigingen/index.html'
 end
 
+compile '/quiz.md' do
+  filter :kramdown
+  layout '/quiz.*'
+  layout '/default.*'
+  layout '/base.*'
+  write '/quiz/index.html'
+end
+
+compile '/search.html.erb' do
+  filter :erb
+  layout '/default.*'
+  layout '/base.*'
+  write ext: 'html'
+end
+
 compile '/*.md' do
   filter :kramdown
   layout '/default.*'
@@ -90,4 +91,3 @@ layout '/**/*', :erb
 compile '/**/*' do
   write item.identifier.to_s
 end
-

content/assets/js/random_vereniging.js

@@ -0,0 +1,16 @@
+window.addEventListener('load', function() {
+  let options = document.getElementsByClassName('randomVerenigingWrapper');
+  let selected = Array.from(options).map(x => ({ x, r: Math.random() + -0.5 * x.hasAttribute('data-iszeus')}))
+   .sort((a, b) => a.r - b.r)
+   .map(a => a.x)
+   .slice(0, 3)
+   .map(x => ({ x, r: Math.random()}))
+   .sort((a, b) => a.r - b.r)
+   .map(a => a.x);
+
+  let destination = document.getElementById("display_repo");
+  for (node of selected) {
+    node.getElementsByTagName("img")[0].setAttribute("loading", "eager");
+    destination.prepend(node);
+  }
+});