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

Merge branch 'master' into privacy

Browse source
This commit is contained in:
Niko Strijbol 2019-11-27 23:44:25 +01:00
commit 1a0f9e59a0
No known key found for this signature in database
GPG key ID: 1A8AEBABD9012251
11 changed files with 84 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.codeclimate.yml
View file

@ -1,14 +1,11 @@
engines: engines:
bundler-audit: bundler-audit:
enabled: true enabled: true
coffeelint:
enabled: true
duplication: duplication:
enabled: true enabled: true
config: config:
languages: languages:
- ruby: - ruby:
- coffeescript:
eslint: eslint:
enabled: true enabled: true
fixme: fixme:

2
.ruby-version
View file

@ -1 +1 @@
2.5.0 2.6.5

6
.travis.yml
View file

@ -26,13 +26,13 @@ branches:
- master - master
rvm: rvm:
- 2.5.0 - 2.6.5
notifications: notifications:
slack: slack:
secure: tej68wbYns4DYg488iz+4ncU3/CHJvG/5c1qntGcEjti6vZp24atuH32BzNMY+gqa5ftZtcRfqIiJ0I0tkbiFWEDzjSk89bgjG4sgwXq1gMqi/Fj4bqEpjU5m7QLa786q4UfYyTF+srca1fHPLVS5REdGjRr2wxX+bcFnTRxreGCIrlNdWhoZPPJyS37R4RR9k+l5ZWZnqWgUN6bD448O8EzMRVRWoUSxQcJ6+u4QLpinEvem4iXe+WcHOyFfsNmavxGGMMpkOSed/tzA1l+gNpl224qOJl3yAk2qrGi4N6SOnSkeJFfUO5RzX56KDC/tcCL1oJpamhDmzDvRrbDNnCjSriv+g+PkXEjiwBF/tkZwIe7nMKyc9QF698Zvdgb6Ffbq21obsRnkkddkxijthdbUKMAIREPQuU7pXRL4ykPkBeB5GkNjPlErOooxvUHvQEVElJ8NMD4ychQqW6relaYJ0W0uy0QMvrtS+cHkpprZAOZzWLa3AdEOvD50kiS2hDhJway5JHJg/LMl3I6XVVMx6fNGdNWBcezeCqkDZM+nuMJqgAtQ+Tz8bwrHLCJgS5u0lQq/MbrDkYdpmmzvA5LXxn2SpjfOAlgiFKnSIwKSuuuwzW/zCEGdPo1pfBba2VfYAN4y1l863j5ph+eMtlHf7JG8mzIWTo3k+Jx8lQ= secure: tej68wbYns4DYg488iz+4ncU3/CHJvG/5c1qntGcEjti6vZp24atuH32BzNMY+gqa5ftZtcRfqIiJ0I0tkbiFWEDzjSk89bgjG4sgwXq1gMqi/Fj4bqEpjU5m7QLa786q4UfYyTF+srca1fHPLVS5REdGjRr2wxX+bcFnTRxreGCIrlNdWhoZPPJyS37R4RR9k+l5ZWZnqWgUN6bD448O8EzMRVRWoUSxQcJ6+u4QLpinEvem4iXe+WcHOyFfsNmavxGGMMpkOSed/tzA1l+gNpl224qOJl3yAk2qrGi4N6SOnSkeJFfUO5RzX56KDC/tcCL1oJpamhDmzDvRrbDNnCjSriv+g+PkXEjiwBF/tkZwIe7nMKyc9QF698Zvdgb6Ffbq21obsRnkkddkxijthdbUKMAIREPQuU7pXRL4ykPkBeB5GkNjPlErOooxvUHvQEVElJ8NMD4ychQqW6relaYJ0W0uy0QMvrtS+cHkpprZAOZzWLa3AdEOvD50kiS2hDhJway5JHJg/LMl3I6XVVMx6fNGdNWBcezeCqkDZM+nuMJqgAtQ+Tz8bwrHLCJgS5u0lQq/MbrDkYdpmmzvA5LXxn2SpjfOAlgiFKnSIwKSuuuwzW/zCEGdPo1pfBba2VfYAN4y1l863j5ph+eMtlHf7JG8mzIWTo3k+Jx8lQ=
before_install: before_install:
- wget https://github.com/jgm/pandoc/releases/download/2.7.3/pandoc-2.7.3-1-amd64.deb - wget https://github.com/jgm/pandoc/releases/download/2.8/pandoc-2.8-1-amd64.deb
- sudo dpkg -i pandoc-2.7.3-1-amd64.deb - sudo dpkg -i pandoc-2.8-1-amd64.deb
- openssl aes-256-cbc -K $encrypted_6059a4f451fd_key -iv $encrypted_6059a4f451fd_iv - openssl aes-256-cbc -K $encrypted_6059a4f451fd_key -iv $encrypted_6059a4f451fd_iv
-in id_rsa.enc -out deploy_key -d -in id_rsa.enc -out deploy_key -d
- mv deploy_key ~/.ssh/id_rsa - mv deploy_key ~/.ssh/id_rsa

5
Gemfile
View file

@ -2,8 +2,7 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'nanoc' gem 'nanoc'
# General filtering
gem 'coffee-script'
gem 'icalendar' # ical files gem 'icalendar' # ical files
gem 'kramdown' gem 'kramdown'
gem 'sassc' gem 'sassc'
@ -25,7 +24,7 @@ end
group :production do group :production do
# Faster css autoprefixing # Faster css autoprefixing
gem 'therubyracer' gem 'mini_racer'
# Autoprefixing for class # Autoprefixing for class
gem 'autoprefixer-rails' gem 'autoprefixer-rails'
gem 'htmlcompressor' gem 'htmlcompressor'

119
Gemfile.lock
View file

@ -1,31 +1,28 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
addressable (2.5.2) addressable (2.7.0)
public_suffix (>= 2.0.2, < 4.0) public_suffix (>= 2.0.2, < 5.0)
adsf (1.4.1) adsf (1.4.2)
rack (>= 1.0.0, < 3.0.0) rack (>= 1.0.0, < 3.0.0)
autoprefixer-rails (8.5.0) autoprefixer-rails (9.7.2)
execjs execjs
builder (3.2.3) builder (3.2.3)
coderay (1.1.2) coderay (1.1.2)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.12.2)
colored (1.2) colored (1.2)
concurrent-ruby (1.0.5) concurrent-ruby (1.1.5)
cri (2.15.1) cri (2.15.9)
colored (~> 1.2)
ddmemoize (1.0.0) ddmemoize (1.0.0)
ddmetrics (~> 1.0) ddmetrics (~> 1.0)
ref (~> 2.0) ref (~> 2.0)
ddmetrics (1.0.1) ddmetrics (1.0.1)
ddplugin (1.0.2) ddplugin (1.0.2)
diff-lcs (1.3)
equatable (0.6.1)
execjs (2.7.0) execjs (2.7.0)
ffi (1.9.25) ffi (1.11.3)
formatador (0.2.5) formatador (0.2.5)
guard (2.14.2) guard (2.16.1)
formatador (>= 0.2.4) formatador (>= 0.2.4)
listen (>= 2.7, < 4.0) listen (>= 2.7, < 4.0)
lumberjack (>= 1.0.12, < 2.0) lumberjack (>= 1.0.12, < 2.0)
@ -35,80 +32,97 @@ GEM
shellany (~> 0.0) shellany (~> 0.0)
thor (>= 0.18.1) thor (>= 0.18.1)
guard-compat (1.2.1) guard-compat (1.2.1)
guard-nanoc (2.1.4) guard-nanoc (2.1.7)
guard (~> 2.8) guard (~> 2.8)
guard-compat (~> 1.0) guard-compat (~> 1.0)
nanoc (>= 4.3.8, < 5.0) nanoc (>= 4.11.13, < 5.0)
hamster (3.0.0) hamster (3.0.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
highline (1.7.10) highline (2.0.3)
htmlcompressor (0.4.0) htmlcompressor (0.4.0)
icalendar (2.4.1) icalendar (2.6.0)
json (2.1.0) ice_cube (~> 0.16)
json_schema (0.19.1) ice_cube (0.16.3)
kramdown (1.16.2) json (2.2.0)
libv8 (3.16.14.19) json_schema (0.20.8)
listen (3.1.5) kramdown (2.1.0)
rb-fsevent (~> 0.9, >= 0.9.4) libv8 (7.3.492.27.1)
rb-inotify (~> 0.9, >= 0.9.7) listen (3.2.0)
ruby_dep (~> 1.2) rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
lumberjack (1.0.13) lumberjack (1.0.13)
method_source (0.9.0) method_source (0.9.2)
mini_portile2 (2.3.0) mini_portile2 (2.4.0)
nanoc (4.10.1) mini_racer (0.2.8)
libv8 (>= 6.9.411)
nanoc (4.11.14)
addressable (~> 2.5) addressable (~> 2.5)
colored (~> 1.2)
nanoc-cli (= 4.11.14)
nanoc-core (= 4.11.14)
parallel (~> 1.12)
tty-command (~> 0.8)
tty-which (~> 0.4)
nanoc-cli (4.11.14)
cri (~> 2.15) cri (~> 2.15)
diff-lcs (~> 1.3)
nanoc-core (= 4.11.14)
zeitwerk (~> 2.1)
nanoc-core (4.11.14)
ddmemoize (~> 1.0) ddmemoize (~> 1.0)
ddmetrics (~> 1.0) ddmetrics (~> 1.0)
ddplugin (~> 1.0) ddplugin (~> 1.0)
hamster (~> 3.0) hamster (~> 3.0)
json_schema (~> 0.19) json_schema (~> 0.19)
parallel (~> 1.12)
ref (~> 2.0)
slow_enumerator_tools (~> 1.0) slow_enumerator_tools (~> 1.0)
tomlrb (~> 1.2) tomlrb (~> 1.2)
tty-platform (~> 0.2)
zeitwerk (~> 2.1)
nenv (0.3.0) nenv (0.3.0)
nokogiri (1.8.2) nokogiri (1.10.5)
mini_portile2 (~> 2.3.0) mini_portile2 (~> 2.4.0)
notiffany (0.1.1) notiffany (0.1.3)
nenv (~> 0.1) nenv (~> 0.1)
shellany (~> 0.0) shellany (~> 0.0)
pandoc-ruby (2.0.2) pandoc-ruby (2.0.2)
parallel (1.12.1) parallel (1.19.1)
pry (0.11.3) pastel (0.7.3)
equatable (~> 0.6)
tty-color (~> 0.5)
pry (0.12.2)
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.9.0) method_source (~> 0.9.0)
public_suffix (3.0.3) public_suffix (4.0.1)
rack (2.0.5) rack (2.0.7)
rainpress (1.0.1) rainpress (1.0.1)
rake (12.3.1)
rb-fsevent (0.10.3) rb-fsevent (0.10.3)
rb-inotify (0.9.10) rb-inotify (0.10.0)
ffi (>= 0.5.0, < 2) ffi (~> 1.0)
ref (2.0.0) ref (2.0.0)
ruby_dep (1.5.0)
rubypants (0.7.0) rubypants (0.7.0)
sassc (2.0.0) sassc (2.2.1)
ffi (~> 1.9.6) ffi (~> 1.9)
rake
shellany (0.0.1) shellany (0.0.1)
slow_enumerator_tools (1.1.0) slow_enumerator_tools (1.1.0)
terminal-notifier (2.0.0) terminal-notifier (2.0.0)
terminal-notifier-guard (1.7.0) terminal-notifier-guard (1.7.0)
therubyracer (0.12.3) thor (0.20.3)
libv8 (~> 3.16.14.15) tomlrb (1.2.9)
ref tty-color (0.5.0)
thor (0.20.0) tty-command (0.9.0)
tomlrb (1.2.7) pastel (~> 0.7.0)
tty-platform (0.2.1)
tty-which (0.4.1)
typogruby (1.0.18) typogruby (1.0.18)
rubypants rubypants
uglifier (4.1.10) uglifier (4.2.0)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
w3c_validators (1.3.3) w3c_validators (1.3.4)
json (>= 1.8) json (>= 1.8)
nokogiri (~> 1.6) nokogiri (~> 1.6)
words_counted (1.0.2) words_counted (1.0.2)
yui-compressor (0.12.0) yui-compressor (0.12.0)
zeitwerk (2.2.1)
PLATFORMS PLATFORMS
ruby ruby
@ -117,19 +131,18 @@ DEPENDENCIES
adsf adsf
autoprefixer-rails autoprefixer-rails
builder builder
coffee-script
guard-nanoc guard-nanoc
highline highline
htmlcompressor htmlcompressor
icalendar icalendar
kramdown kramdown
mini_racer
nanoc nanoc
pandoc-ruby pandoc-ruby
rainpress rainpress
sassc sassc
terminal-notifier terminal-notifier
terminal-notifier-guard terminal-notifier-guard
therubyracer
typogruby typogruby
uglifier (>= 4.0.0) uglifier (>= 4.0.0)
w3c_validators w3c_validators

6
Rules
View file

@ -185,12 +185,6 @@ end
# #
# ASSETS # ASSETS
# #
compile '/assets/scripts/**/*.coffee' do
filter :coffeescript
filter :uglify_js if production?
write ext: 'js'
end
compile '/assets/scripts/**/*.js' do compile '/assets/scripts/**/*.js' do
filter :uglify_js, harmony: true if production? filter :uglify_js, harmony: true if production?
end end

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

@ -81,24 +81,6 @@ footer.footer {
align-items: center; align-items: center;
} }
.imgcenter {
margin: auto;
display: block;
}
.hydra-tile {
background-color: #1E64C8;
}
.lana-tile {
background-color: $tile-orange;
}
.project-tile {
background-color: $turquoise;
}
// For better centering on mobile // For better centering on mobile
@include mobile { @include mobile {
#tipue_search_input { #tipue_search_input {

14
content/blog/16-17/bestuur.md
View file

@ -20,7 +20,7 @@ Favoriete taal : Malbolge
Favoriete OS : LFS Favoriete OS : LFS
![alt text](//media.giphy.com/media/1lop3XEoCngYg/giphy.gif){: .imgcenter } ![alt text](//media.giphy.com/media/1lop3XEoCngYg/giphy.gif){: .image .container }
# Isaura Claeys | Vicevoorzitter # Isaura Claeys | Vicevoorzitter
@ -36,7 +36,7 @@ Favoriete taal : Isauriaans (//en.wikipedia.org/wiki/Isaurian_language)
Favoriete OS : OSX Favoriete OS : OSX
![alt text](//i.imgur.com/ebvggMn.gif){: .imgcenter } ![alt text](//i.imgur.com/ebvggMn.gif){: .image .container }
# Jeroen De Clerck | Penningmeester # Jeroen De Clerck | Penningmeester
@ -52,7 +52,7 @@ Favoriete taal : python
Favoriete OS : archlinux Favoriete OS : archlinux
![alt text](//i.imgur.com/5c22RvF.gif){: .imgcenter } ![alt text](//i.imgur.com/5c22RvF.gif){: .image .container }
# Eloïse Piret | Eventverantwoordelijke # Eloïse Piret | Eventverantwoordelijke
@ -68,7 +68,7 @@ Favoriete taal : Python
Favoriete OS : OS X (pls don't kill me) Favoriete OS : OS X (pls don't kill me)
![alt text](//media.tenor.co/images/6659f7a4dead984cdcc05903e7c9503f/tenor.gif){: .imgcenter } ![alt text](//media.tenor.co/images/6659f7a4dead984cdcc05903e7c9503f/tenor.gif){: .image .container }
# Lorin Werthen | Systeemadministrator # Lorin Werthen | Systeemadministrator
@ -84,7 +84,7 @@ Favoriete taal : Ruby :heart:
Favoriete OS : Arch Linux Favoriete OS : Arch Linux
![alt text](//iruntheinternet.com/lulzdump/images/skateboarder-never-drops-it-keeps-running-runs-away-bye-14344846555.gif){: .imgcenter } ![alt text](//iruntheinternet.com/lulzdump/images/skateboarder-never-drops-it-keeps-running-runs-away-bye-14344846555.gif){: .image .container }
# Rien Maertens | Systeemadministrator # Rien Maertens | Systeemadministrator
@ -100,7 +100,7 @@ Favoriete taal : West-Vlams
Favoriete OS : Arch Linux Favoriete OS : Arch Linux
![alt text](https://i.imgur.com/RGITm8c.gif){: .imgcenter } ![alt text](https://i.imgur.com/RGITm8c.gif){: .image .container }
# Feliciaan De Palmenaer | Projectverantwoordelijke # Feliciaan De Palmenaer | Projectverantwoordelijke
@ -116,4 +116,4 @@ Favoriete taal : Swift
Favoriete OS : macOs Favoriete OS : macOs
![alt text](//emoji.slack-edge.com/T02E8K8GY/zeustux/19b65368560af6c2.jpg){: .imgcenter } ![alt text](//emoji.slack-edge.com/T02E8K8GY/zeustux/19b65368560af6c2.jpg){: .image .container }

1
lib/filters/autoprefixer.rb
View file

@ -1,4 +1,3 @@
require 'v8'
require 'autoprefixer-rails' require 'autoprefixer-rails'
Nanoc::Filter.define(:autoprefixer) do |content, _params| Nanoc::Filter.define(:autoprefixer) do |content, _params|

2
package.json
View file

@ -7,7 +7,7 @@
"license": "MIT", "license": "MIT",
"repository": "https://github.com/ZeusWPI/zeus.ugent.be", "repository": "https://github.com/ZeusWPI/zeus.ugent.be",
"dependencies": { "dependencies": {
"bulma": "0.7.5", "bulma": "0.8.0",
"bulma-divider": "~0.2.0", "bulma-divider": "~0.2.0",
"bulma-timeline": "^3.0.4" "bulma-timeline": "^3.0.4"
} }

8
yarn.lock
View file

@ -12,7 +12,7 @@ bulma-timeline@^3.0.4:
resolved "https://registry.yarnpkg.com/bulma-timeline/-/bulma-timeline-3.0.4.tgz#494f458098a06dcf8dcc7fe8f2f158b63d1d1ef2" resolved "https://registry.yarnpkg.com/bulma-timeline/-/bulma-timeline-3.0.4.tgz#494f458098a06dcf8dcc7fe8f2f158b63d1d1ef2"
integrity sha512-gCUOcSUuzHoeVMkCpLF49j5Z5yl78XQ+KgJcT+1ju5WIGgBgVytRUob/dw5NHAxPLO2rmcvwYNbCJFp7w4WT4Q== integrity sha512-gCUOcSUuzHoeVMkCpLF49j5Z5yl78XQ+KgJcT+1ju5WIGgBgVytRUob/dw5NHAxPLO2rmcvwYNbCJFp7w4WT4Q==
bulma@0.7.5: bulma@0.8.0:
version "0.7.5" version "0.8.0"
resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.7.5.tgz#35066c37f82c088b68f94450be758fc00a967208" resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.8.0.tgz#ac1606431703a4761b18a4a2d5cc1fa864a2aece"
integrity sha512-cX98TIn0I6sKba/DhW0FBjtaDpxTelU166pf7ICXpCCuplHWyu6C9LYZmL5PEsnePIeJaiorsTEzzNk3Tsm1hw== integrity sha512-nhf3rGyiZh/VM7FrSJ/5KeLlfaFkXz0nYcXriynfPH4vVpnxnqyEwaNGdNCVzHyyCA3cHgkQAMpdF/SFbFGZfA==