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/

.ruby-version

@@ -1 +1 @@
-2.7.0
+2.7.1

Dockerfile

@@ -0,0 +1,32 @@
+# ------- Build -------
+FROM ruby:2.7.1-alpine3.11 AS build
+
+RUN apk add build-base
+
+RUN mkdir -p /app
+WORKDIR /app
+
+COPY Gemfile .
+COPY Gemfile.lock .
+RUN bundle config set deployment 'true'
+RUN bundle config set without 'development'
+RUN bundle install
+
+COPY content content/
+COPY layouts layouts/
+COPY lib lib/
+COPY Guardfile .
+COPY Rules .
+COPY nanoc.yaml .
+
+RUN bundle exec nanoc
+
+
+
+# ------- Release -------
+FROM nginx:latest AS release
+
+RUN rm -rf /usr/share/nginx/html/*
+COPY --from=build /app/output /usr/share/nginx/html
+
+ENTRYPOINT ["nginx", "-g", "daemon off;"]

Gemfile

@@ -3,18 +3,19 @@ source 'https://rubygems.org'
 
 gem 'adsf'
 gem 'autoprefixer-rails'
-gem 'byebug'
 gem 'htmlcompressor'
 gem 'kramdown'
 gem 'mini_racer'
 gem 'nanoc'
 gem 'pdfkit'
 gem 'sass'
-gem 'sassc'
+gem 'nokogiri'
-gem 'slim'
-gem 'sass'
 
 group :nanoc do
   gem 'guard-nanoc'
   gem 'guard-livereload'
 end
+
+group :development do
+  gem 'byebug'
+end

Gemfile.lock

@@ -5,28 +5,28 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     adsf (1.4.3)
       rack (>= 1.0.0, < 3.0.0)
-    autoprefixer-rails (9.7.4)
+    autoprefixer-rails (9.8.6.3)
       execjs
-    byebug (11.1.1)
+    byebug (11.1.3)
-    coderay (1.1.2)
+    coderay (1.1.3)
     colored (1.2)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     cri (2.15.10)
     ddmemoize (1.0.0)
       ddmetrics (~> 1.0)
       ref (~> 2.0)
     ddmetrics (1.0.1)
     ddplugin (1.0.2)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     equatable (0.6.1)
     eventmachine (1.2.7)
     execjs (2.7.0)
-    ffi (1.12.2)
+    ffi (1.13.1)
     formatador (0.2.5)
-    guard (2.16.1)
+    guard (2.16.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -41,39 +41,48 @@ GEM
       guard (~> 2.8)
       guard-compat (~> 1.0)
       multi_json (~> 1.8)
-    guard-nanoc (2.1.7)
+    guard-nanoc (2.1.9)
       guard (~> 2.8)
       guard-compat (~> 1.0)
-      nanoc (>= 4.11.13, < 5.0)
+      nanoc-cli (~> 4.11, >= 4.11.14)
+      nanoc-core (~> 4.11, >= 4.11.14)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
     htmlcompressor (0.4.0)
     http_parser.rb (0.6.0)
-    json_schema (0.20.8)
+    json_schema (0.20.9)
-    kramdown (2.1.0)
+    kramdown (2.3.0)
-    libv8 (7.3.492.27.1)
+      rexml
+    libv8 (8.4.255.0)
     listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.4)
+    lumberjack (1.2.7)
-    method_source (0.9.2)
+    method_source (1.0.0)
-    mini_racer (0.2.9)
+    mini_portile2 (2.4.0)
-      libv8 (>= 6.9.411)
+    mini_racer (0.3.1)
-    multi_json (1.14.1)
+      libv8 (~> 8.4.255)
-    nanoc (4.11.14)
+    multi_json (1.15.0)
+    nanoc (4.11.18)
       addressable (~> 2.5)
       colored (~> 1.2)
-      nanoc-cli (= 4.11.14)
+      nanoc-checking (~> 1.0)
-      nanoc-core (= 4.11.14)
+      nanoc-cli (= 4.11.18)
+      nanoc-core (= 4.11.18)
+      nanoc-deploying (~> 1.0)
       parallel (~> 1.12)
       tty-command (~> 0.8)
       tty-which (~> 0.4)
-    nanoc-cli (4.11.14)
+    nanoc-checking (1.0.0)
+      nanoc-cli (~> 4.11, >= 4.11.15)
+      nanoc-core (~> 4.11, >= 4.11.15)
+    nanoc-cli (4.11.18)
       cri (~> 2.15)
       diff-lcs (~> 1.3)
-      nanoc-core (= 4.11.14)
+      nanoc-core (= 4.11.18)
       zeitwerk (~> 2.1)
-    nanoc-core (4.11.14)
+    nanoc-core (4.11.18)
+      concurrent-ruby (~> 1.1)
       ddmemoize (~> 1.0)
       ddmetrics (~> 1.0)
       ddplugin (~> 1.0)
@@ -83,46 +92,53 @@ GEM
       tomlrb (~> 1.2)
       tty-platform (~> 0.2)
       zeitwerk (~> 2.1)
+    nanoc-deploying (1.0.0)
+      nanoc-checking (~> 1.0)
+      nanoc-cli (~> 4.11, >= 4.11.15)
+      nanoc-core (~> 4.11, >= 4.11.15)
     nenv (0.3.0)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.19.1)
+    parallel (1.19.2)
-    pastel (0.7.3)
+    pastel (0.7.4)
       equatable (~> 0.6)
       tty-color (~> 0.5)
-    pdfkit (0.8.4.1)
+    pdfkit (0.8.4.3.2)
-    pry (0.12.2)
+    pry (0.13.1)
-      coderay (~> 1.1.0)
+      coderay (~> 1.1)
-      method_source (~> 0.9.0)
+      method_source (~> 1.0)
-    public_suffix (4.0.3)
+    public_suffix (4.0.5)
-    rack (2.2.2)
+    rack (2.2.3)
-    rb-fsevent (0.10.3)
+    rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     ref (2.0.0)
+    rexml (3.2.4)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sassc (2.2.1)
+    sassc (2.4.0)
       ffi (~> 1.9)
     shellany (0.0.1)
-    slim (4.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.2.9)
+    tomlrb (1.3.0)
-    tty-color (0.5.1)
+    tty-color (0.5.2)
     tty-command (0.9.0)
       pastel (~> 0.7.0)
     tty-platform (0.3.0)
     tty-which (0.4.2)
-    zeitwerk (2.2.2)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby
@@ -137,6 +153,7 @@ DEPENDENCIES
   kramdown
   mini_racer
   nanoc
+  nokogiri
   pdfkit
   sass
   sassc

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,6 +3,24 @@ Durf Doen 2.0
 
 ## Setup instructions
 
-1. Install bundler (`gem install bundler`)
+1. Install Ruby, preferably the version specified in `.ruby-version`
-2. Install other gems (`bundle install`)
+2. Install bundler (`gem install bundler`)
-3. Build and serve the site (`bundle exec nanoc live`)
+3. Install other dependencies (`bundle install`)
+4. Build and serve the site (`bundle exec nanoc live`)
+
+To build the artefacts for production: `bundle exec nanoc`
+
+### 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

@@ -1,23 +1,32 @@
 #!/usr/bin/env ruby
 
-compile '/verenigingen/*.md' do
+preprocess do
+  # Fetch a list of theme names from all items and construct items from them
+  themas = @items.map { |i| i[:themas] }.flatten.uniq.compact
+  themas.each do |thema|
+    content = ''
+    attributes = {
+        identifier: thema,
+        naam: thema.downcase
+    }
+    identifier = "/themas/#{thema}"
+
+    @items.create(content, attributes, identifier)
+  end
+end
+
+compile '/{verenigingen,projecten,konventen}/*.md' do
   filter :kramdown
-  layout '/vereniging.*'
+  layout '/detail.*'
   layout '/default.*'
+  layout '/base.*'
   write ext: 'html'
 end
 
-compile '/events/*.md' do
+compile '/themas/*' do
-  filter :kramdown
+  layout '/thema.*'
-  layout '/event.*'
-  layout '/default.*'
-  write ext: 'html'
-end
-
-compile '/konventen/*.md' do
-  filter :kramdown
-  layout '/konvent.*'
   layout '/default.*'
+  layout '/base.*'
   write ext: 'html'
 end
 
@@ -25,6 +34,7 @@ compile '/homepage.md' do
   filter :kramdown
   layout '/homepage.*'
   layout '/default.*'
+  layout '/base.*'
   write '/index.html'
 end
 
@@ -32,29 +42,33 @@ compile '/faq/*' do
   filter :kramdown
 end
 
-compile '/faq.erb' do
-  filter :erb
-  layout '/default.*'
-  write '/faq/index.html'
-end
-
 compile '/verenigingen.md' do
   filter :kramdown
   layout '/verenigingen.*'
   layout '/default.*'
-  write ext: 'html'
+  layout '/base.*'
+  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.*'
+  layout '/base.*'
   write ext: 'html'
 end
 
@@ -66,7 +80,9 @@ end
 
 compile '/*.erb' do
   filter :erb
-  write item.identifier.without_ext
+  layout '/default.*'
+  layout '/base.*'
+  write item.identifier.without_ext + '/index.html'
 end
 
 layout '/**/*', :erb
@@ -75,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);
+  }
+});