From 1145c7ef325f1190e89c4684f180a26d3a74128b Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Sat, 29 Dec 2018 16:58:34 +0100 Subject: Add kiemm version The kiemm is functionally identical to the rosoterTOS version, but branded differently --- app.js | 5 ++ package.json | 6 +- public-kiemm/android-chrome-192x192.png | Bin 0 -> 11744 bytes public-kiemm/android-chrome-512x512.png | Bin 0 -> 33206 bytes public-kiemm/apple-touch-icon.png | Bin 0 -> 6964 bytes public-kiemm/browserconfig.xml | 9 +++ public-kiemm/favicon-16x16.png | Bin 0 -> 771 bytes public-kiemm/favicon-32x32.png | Bin 0 -> 1171 bytes public-kiemm/favicon.ico | Bin 0 -> 15086 bytes public-kiemm/icons/fav.png | Bin 0 -> 7725 bytes public-kiemm/icons/logo.svg | 37 ++++++++++ public-kiemm/manifest.webmanifest | 17 +++++ public-kiemm/mstile-144x144.png | Bin 0 -> 5670 bytes public-kiemm/mstile-150x150.png | Bin 0 -> 3218 bytes public-kiemm/mstile-310x150.png | Bin 0 -> 3565 bytes public-kiemm/mstile-310x310.png | Bin 0 -> 12259 bytes public-kiemm/mstile-70x70.png | Bin 0 -> 2467 bytes public-kiemm/safari-pinned-tab.svg | 45 +++++++++++++ public-kiemm/site.webmanifest | 19 ++++++ public-metis/.well-known/keybase.txt | 54 +++++++++++++++ public-metis/apple-touch-icon.png | Bin 0 -> 6447 bytes public-metis/browserconfig.xml | 9 +++ public-metis/favicon-16x16.png | Bin 0 -> 1293 bytes public-metis/favicon-32x32.png | Bin 0 -> 2103 bytes public-metis/favicon.ico | Bin 0 -> 15086 bytes public-metis/icons/kiemm-logo-app.png | Bin 0 -> 7725 bytes public-metis/icons/kiemm-logo.png | Bin 0 -> 2513 bytes public-metis/icons/kiemm-logo.svg | 37 ++++++++++ public-metis/icons/logo.png | Bin 0 -> 12508 bytes public-metis/icons/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 6503 bytes public-metis/icons/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 3854 bytes .../icons/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 9631 bytes .../icons/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 15315 bytes .../icons/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 23445 bytes public-metis/manifest.webmanifest | 29 ++++++++ public-metis/mstile-150x150.png | Bin 0 -> 3995 bytes public-metis/safari-pinned-tab.svg | 34 ++++++++++ public/.well-known/keybase.txt | 54 --------------- public/apple-touch-icon.png | Bin 6447 -> 0 bytes public/browserconfig.xml | 9 --- public/favicon-16x16.png | Bin 1293 -> 0 bytes public/favicon-32x32.png | Bin 2103 -> 0 bytes public/favicon.ico | Bin 15086 -> 0 bytes public/icons/mml-logo.png | Bin 12508 -> 0 bytes public/icons/res/mipmap-hdpi/ic_launcher.png | Bin 6503 -> 0 bytes public/icons/res/mipmap-mdpi/ic_launcher.png | Bin 3854 -> 0 bytes public/icons/res/mipmap-xhdpi/ic_launcher.png | Bin 9631 -> 0 bytes public/icons/res/mipmap-xxhdpi/ic_launcher.png | Bin 15315 -> 0 bytes public/icons/res/mipmap-xxxhdpi/ic_launcher.png | Bin 23445 -> 0 bytes public/manifest.webmanifest | 29 -------- public/mstile-150x150.png | Bin 3995 -> 0 bytes public/safari-pinned-tab.svg | 34 ---------- public/stylesheets/style.css | 75 +++++++++------------ public/sw.js | 29 -------- public/untisinfo.css | 11 --- routes/index.js | 9 ++- views/index.jade | 11 +-- views/layout.jade | 5 +- 58 files changed, 350 insertions(+), 217 deletions(-) create mode 100644 public-kiemm/android-chrome-192x192.png create mode 100644 public-kiemm/android-chrome-512x512.png create mode 100644 public-kiemm/apple-touch-icon.png create mode 100644 public-kiemm/browserconfig.xml create mode 100644 public-kiemm/favicon-16x16.png create mode 100644 public-kiemm/favicon-32x32.png create mode 100644 public-kiemm/favicon.ico create mode 100644 public-kiemm/icons/fav.png create mode 100644 public-kiemm/icons/logo.svg create mode 100644 public-kiemm/manifest.webmanifest create mode 100644 public-kiemm/mstile-144x144.png create mode 100644 public-kiemm/mstile-150x150.png create mode 100644 public-kiemm/mstile-310x150.png create mode 100644 public-kiemm/mstile-310x310.png create mode 100644 public-kiemm/mstile-70x70.png create mode 100644 public-kiemm/safari-pinned-tab.svg create mode 100644 public-kiemm/site.webmanifest create mode 100644 public-metis/.well-known/keybase.txt create mode 100644 public-metis/apple-touch-icon.png create mode 100644 public-metis/browserconfig.xml create mode 100644 public-metis/favicon-16x16.png create mode 100644 public-metis/favicon-32x32.png create mode 100644 public-metis/favicon.ico create mode 100644 public-metis/icons/kiemm-logo-app.png create mode 100644 public-metis/icons/kiemm-logo.png create mode 100644 public-metis/icons/kiemm-logo.svg create mode 100644 public-metis/icons/logo.png create mode 100644 public-metis/icons/res/mipmap-hdpi/ic_launcher.png create mode 100644 public-metis/icons/res/mipmap-mdpi/ic_launcher.png create mode 100644 public-metis/icons/res/mipmap-xhdpi/ic_launcher.png create mode 100644 public-metis/icons/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 public-metis/icons/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 public-metis/manifest.webmanifest create mode 100644 public-metis/mstile-150x150.png create mode 100644 public-metis/safari-pinned-tab.svg delete mode 100644 public/.well-known/keybase.txt delete mode 100644 public/apple-touch-icon.png delete mode 100644 public/browserconfig.xml delete mode 100644 public/favicon-16x16.png delete mode 100644 public/favicon-32x32.png delete mode 100644 public/favicon.ico delete mode 100644 public/icons/mml-logo.png delete mode 100644 public/icons/res/mipmap-hdpi/ic_launcher.png delete mode 100644 public/icons/res/mipmap-mdpi/ic_launcher.png delete mode 100644 public/icons/res/mipmap-xhdpi/ic_launcher.png delete mode 100644 public/icons/res/mipmap-xxhdpi/ic_launcher.png delete mode 100644 public/icons/res/mipmap-xxxhdpi/ic_launcher.png delete mode 100644 public/manifest.webmanifest delete mode 100644 public/mstile-150x150.png delete mode 100644 public/safari-pinned-tab.svg delete mode 100644 public/sw.js delete mode 100644 public/untisinfo.css diff --git a/app.js b/app.js index 58188e4..5e57e32 100644 --- a/app.js +++ b/app.js @@ -22,6 +22,11 @@ app.use(bodyParser.json()) app.use(bodyParser.urlencoded({ extended: false })) app.use(cookieParser()) app.use(express.static(path.join(__dirname, 'public'))) +if (process.env.SCHOOL === 'kiemm') { + app.use(express.static(path.join(__dirname, 'public-kiemm'))) +} else { + app.use(express.static(path.join(__dirname, 'public-metis'))) +} app.use('/', routes) app.use('/meetingpointProxy', meetingpointProxy) diff --git a/package.json b/package.json index 9b3250b..712f838 100644 --- a/package.json +++ b/package.json @@ -4,13 +4,15 @@ "main": "app.js", "private": true, "scripts": { - "start": "node ./bin/www", - "start-mavo": "SCHOOL_LEVEL=mavo node ./bin/www", + "start": "SCHOOL=metis SCHOOL_LEVEL=havo-vwo node ./bin/www", + "start-mavo": "SCHOOL=metis SCHOOL_LEVEL=mavo node ./bin/www", + "start-kiemm": "SCHOOL=kiemm SCHOOL_LEVEL=mavo node ./bin/www", "setup": "npm install && bower install --allow-root", "build-dev": "browserify -d -t [ babelify --presets [ es2015 ] ] -e ./public/javascripts/main.js > ./public/javascripts/bundle.js", "watch": "watchify -v -d -t [ babelify --presets [ es2015 ] ] -e ./public/javascripts/main.js -o ./public/javascripts/bundle.js", "build": "browserify -t [ babelify --presets [ es2015 ] ] -e ./public/javascripts/main.js | uglifyjs -cm > ./public/javascripts/bundle.js", "build-mavo": "browserify -t [ envify --SCHOOL_LEVEL mavo ] -t [ babelify --presets [ es2015 ] ] -e ./public/javascripts/main.js | uglifyjs -cm > ./public/javascripts/bundle.js", + "build-kiemm": "browserify -t [ envify --SCHOOL kiemm --SCHOOL_LEVEL mavo ] -t [ babelify --presets [ es2015 ] ] -e ./public/javascripts/main.js | uglifyjs -cm > ./public/javascripts/bundle.js", "postinstall": "bower install --allow-root" }, "dependencies": { diff --git a/public-kiemm/android-chrome-192x192.png b/public-kiemm/android-chrome-192x192.png new file mode 100644 index 0000000..3f2171f Binary files /dev/null and b/public-kiemm/android-chrome-192x192.png differ diff --git a/public-kiemm/android-chrome-512x512.png b/public-kiemm/android-chrome-512x512.png new file mode 100644 index 0000000..2e75315 Binary files /dev/null and b/public-kiemm/android-chrome-512x512.png differ diff --git a/public-kiemm/apple-touch-icon.png b/public-kiemm/apple-touch-icon.png new file mode 100644 index 0000000..bbec64c Binary files /dev/null and b/public-kiemm/apple-touch-icon.png differ diff --git a/public-kiemm/browserconfig.xml b/public-kiemm/browserconfig.xml new file mode 100644 index 0000000..4f0614b --- /dev/null +++ b/public-kiemm/browserconfig.xml @@ -0,0 +1,9 @@ + + + + + + #de403b + + + diff --git a/public-kiemm/favicon-16x16.png b/public-kiemm/favicon-16x16.png new file mode 100644 index 0000000..3a3bbc2 Binary files /dev/null and b/public-kiemm/favicon-16x16.png differ diff --git a/public-kiemm/favicon-32x32.png b/public-kiemm/favicon-32x32.png new file mode 100644 index 0000000..fe300c4 Binary files /dev/null and b/public-kiemm/favicon-32x32.png differ diff --git a/public-kiemm/favicon.ico b/public-kiemm/favicon.ico new file mode 100644 index 0000000..448035e Binary files /dev/null and b/public-kiemm/favicon.ico differ diff --git a/public-kiemm/icons/fav.png b/public-kiemm/icons/fav.png new file mode 100644 index 0000000..ec2829d Binary files /dev/null and b/public-kiemm/icons/fav.png differ diff --git a/public-kiemm/icons/logo.svg b/public-kiemm/icons/logo.svg new file mode 100644 index 0000000..c9fff90 --- /dev/null +++ b/public-kiemm/icons/logo.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + diff --git a/public-kiemm/manifest.webmanifest b/public-kiemm/manifest.webmanifest new file mode 100644 index 0000000..6c2033c --- /dev/null +++ b/public-kiemm/manifest.webmanifest @@ -0,0 +1,17 @@ +{ + "name": "Kiemm Rooster", + "short_name": "Rooster", + "start_url": "/", + "display": "standalone", + "background_color": "#ececec", + "description": "De rooster pagina van Kiemm Montessori", + "icons": [{ + "src": "/android-chrome-192x192.png", + "sizes": "192x192", + "type": "image/png" + }, { + "src": "/android-chrome-512x512.png", + "sizes": "512x512", + "type": "image/png" + }] +} diff --git a/public-kiemm/mstile-144x144.png b/public-kiemm/mstile-144x144.png new file mode 100644 index 0000000..a58305c Binary files /dev/null and b/public-kiemm/mstile-144x144.png differ diff --git a/public-kiemm/mstile-150x150.png b/public-kiemm/mstile-150x150.png new file mode 100644 index 0000000..6f69b48 Binary files /dev/null and b/public-kiemm/mstile-150x150.png differ diff --git a/public-kiemm/mstile-310x150.png b/public-kiemm/mstile-310x150.png new file mode 100644 index 0000000..a666a54 Binary files /dev/null and b/public-kiemm/mstile-310x150.png differ diff --git a/public-kiemm/mstile-310x310.png b/public-kiemm/mstile-310x310.png new file mode 100644 index 0000000..3b76ab5 Binary files /dev/null and b/public-kiemm/mstile-310x310.png differ diff --git a/public-kiemm/mstile-70x70.png b/public-kiemm/mstile-70x70.png new file mode 100644 index 0000000..a729c5b Binary files /dev/null and b/public-kiemm/mstile-70x70.png differ diff --git a/public-kiemm/safari-pinned-tab.svg b/public-kiemm/safari-pinned-tab.svg new file mode 100644 index 0000000..ef53027 --- /dev/null +++ b/public-kiemm/safari-pinned-tab.svg @@ -0,0 +1,45 @@ + + + + +Created by potrace 1.11, written by Peter Selinger 2001-2013 + + + + + + diff --git a/public-kiemm/site.webmanifest b/public-kiemm/site.webmanifest new file mode 100644 index 0000000..f3ac7da --- /dev/null +++ b/public-kiemm/site.webmanifest @@ -0,0 +1,19 @@ +{ + "name": "Rooster", + "short_name": "Rooster", + "icons": [ + { + "src": "/android-chrome-192x192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "/android-chrome-512x512.png", + "sizes": "512x512", + "type": "image/png" + } + ], + "theme_color": "#de403b", + "background_color": "#de403b", + "display": "standalone" +} diff --git a/public-metis/.well-known/keybase.txt b/public-metis/.well-known/keybase.txt new file mode 100644 index 0000000..7e11526 --- /dev/null +++ b/public-metis/.well-known/keybase.txt @@ -0,0 +1,54 @@ +================================================================== +https://keybase.io/nloomans +-------------------------------------------------------------------- + +I hereby claim: + + * I am an admin of https://rooster.hetmml.nl + * I am nloomans (https://keybase.io/nloomans) on keybase. + * I have a public key ASCCV4aRFiMkEv7inJTf34RgxZ6IK0wQ-wTH2ZfSIu3OzAo + +To do so, I am signing this object: + +{ + "body": { + "key": { + "eldest_kid": "0101bbdb28841b169de6538a51d17ca94b30088ba2914e56fd19121eec05f7a389cc0a", + "host": "keybase.io", + "kid": "01208257869116232412fee29c94dfdf8460c59e882b4c10fb04c7d997d222edcecc0a", + "uid": "7a52ddabf92293dd59f8fbf3774ea319", + "username": "nloomans" + }, + "service": { + "hostname": "rooster.hetmml.nl", + "protocol": "https:" + }, + "type": "web_service_binding", + "version": 1 + }, + "client": { + "name": "keybase.io go client", + "version": "1.0.20" + }, + "ctime": 1492017398, + "expire_in": 504576000, + "merkle_root": { + "ctime": 1492017367, + "hash": "463e597079ce3829ccc1f1aa7b15533c0848f9e13cdb55407af490a87bf4ac1b2d64e8235518ada07d93003b889157b576aad02eda294ccd594dc0dcbf8862ef", + "seqno": 1015311 + }, + "prev": "36959cd282a98f651138068f8695b07480a016f02ba99a0acbde277e0cf4ca30", + "seqno": 19, + "tag": "signature" +} + +which yields the signature: + +hKRib2R5hqhkZXRhY2hlZMOpaGFzaF90eXBlCqNrZXnEIwEggleGkRYjJBL+4pyU39+EYMWeiCtMEPsEx9mX0iLtzswKp3BheWxvYWTFAvt7ImJvZHkiOnsia2V5Ijp7ImVsZGVzdF9raWQiOiIwMTAxYmJkYjI4ODQxYjE2OWRlNjUzOGE1MWQxN2NhOTRiMzAwODhiYTI5MTRlNTZmZDE5MTIxZWVjMDVmN2EzODljYzBhIiwiaG9zdCI6ImtleWJhc2UuaW8iLCJraWQiOiIwMTIwODI1Nzg2OTExNjIzMjQxMmZlZTI5Yzk0ZGZkZjg0NjBjNTllODgyYjRjMTBmYjA0YzdkOTk3ZDIyMmVkY2VjYzBhIiwidWlkIjoiN2E1MmRkYWJmOTIyOTNkZDU5ZjhmYmYzNzc0ZWEzMTkiLCJ1c2VybmFtZSI6Im5sb29tYW5zIn0sInNlcnZpY2UiOnsiaG9zdG5hbWUiOiJyb29zdGVyLmhldG1tbC5ubCIsInByb3RvY29sIjoiaHR0cHM6In0sInR5cGUiOiJ3ZWJfc2VydmljZV9iaW5kaW5nIiwidmVyc2lvbiI6MX0sImNsaWVudCI6eyJuYW1lIjoia2V5YmFzZS5pbyBnbyBjbGllbnQiLCJ2ZXJzaW9uIjoiMS4wLjIwIn0sImN0aW1lIjoxNDkyMDE3Mzk4LCJleHBpcmVfaW4iOjUwNDU3NjAwMCwibWVya2xlX3Jvb3QiOnsiY3RpbWUiOjE0OTIwMTczNjcsImhhc2giOiI0NjNlNTk3MDc5Y2UzODI5Y2NjMWYxYWE3YjE1NTMzYzA4NDhmOWUxM2NkYjU1NDA3YWY0OTBhODdiZjRhYzFiMmQ2NGU4MjM1NTE4YWRhMDdkOTMwMDNiODg5MTU3YjU3NmFhZDAyZWRhMjk0Y2NkNTk0ZGMwZGNiZjg4NjJlZiIsInNlcW5vIjoxMDE1MzExfSwicHJldiI6IjM2OTU5Y2QyODJhOThmNjUxMTM4MDY4Zjg2OTViMDc0ODBhMDE2ZjAyYmE5OWEwYWNiZGUyNzdlMGNmNGNhMzAiLCJzZXFubyI6MTksInRhZyI6InNpZ25hdHVyZSJ9o3NpZ8RAcP5FuvbGM9nXBzWqChr9zdj452IpBzrVbd6YvcktLyKjaUaRg51BOWsyHmYQ+uxmZ2ZCUI6xZbbJ1SIAnWqvC6hzaWdfdHlwZSCkaGFzaIKkdHlwZQildmFsdWXEING7Z+BlY2sOTnQqQJo/PUBashy75VL9UU4tGIEvMXbco3RhZ80CAqd2ZXJzaW9uAQ== + +And finally, I am proving ownership of this host by posting or +appending to this document. + +View my publicly-auditable identity here: https://keybase.io/nloomans + +================================================================== diff --git a/public-metis/apple-touch-icon.png b/public-metis/apple-touch-icon.png new file mode 100644 index 0000000..5adfc69 Binary files /dev/null and b/public-metis/apple-touch-icon.png differ diff --git a/public-metis/browserconfig.xml b/public-metis/browserconfig.xml new file mode 100644 index 0000000..b3930d0 --- /dev/null +++ b/public-metis/browserconfig.xml @@ -0,0 +1,9 @@ + + + + + + #da532c + + + diff --git a/public-metis/favicon-16x16.png b/public-metis/favicon-16x16.png new file mode 100644 index 0000000..1df47d3 Binary files /dev/null and b/public-metis/favicon-16x16.png differ diff --git a/public-metis/favicon-32x32.png b/public-metis/favicon-32x32.png new file mode 100644 index 0000000..36cd5da Binary files /dev/null and b/public-metis/favicon-32x32.png differ diff --git a/public-metis/favicon.ico b/public-metis/favicon.ico new file mode 100644 index 0000000..c201043 Binary files /dev/null and b/public-metis/favicon.ico differ diff --git a/public-metis/icons/kiemm-logo-app.png b/public-metis/icons/kiemm-logo-app.png new file mode 100644 index 0000000..ec2829d Binary files /dev/null and b/public-metis/icons/kiemm-logo-app.png differ diff --git a/public-metis/icons/kiemm-logo.png b/public-metis/icons/kiemm-logo.png new file mode 100644 index 0000000..6a162a6 Binary files /dev/null and b/public-metis/icons/kiemm-logo.png differ diff --git a/public-metis/icons/kiemm-logo.svg b/public-metis/icons/kiemm-logo.svg new file mode 100644 index 0000000..c9fff90 --- /dev/null +++ b/public-metis/icons/kiemm-logo.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + diff --git a/public-metis/icons/logo.png b/public-metis/icons/logo.png new file mode 100644 index 0000000..fa5ae11 Binary files /dev/null and b/public-metis/icons/logo.png differ diff --git a/public-metis/icons/res/mipmap-hdpi/ic_launcher.png b/public-metis/icons/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..514ad14 Binary files /dev/null and b/public-metis/icons/res/mipmap-hdpi/ic_launcher.png differ diff --git a/public-metis/icons/res/mipmap-mdpi/ic_launcher.png b/public-metis/icons/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..59bab1d Binary files /dev/null and b/public-metis/icons/res/mipmap-mdpi/ic_launcher.png differ diff --git a/public-metis/icons/res/mipmap-xhdpi/ic_launcher.png b/public-metis/icons/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..908a6e8 Binary files /dev/null and b/public-metis/icons/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/public-metis/icons/res/mipmap-xxhdpi/ic_launcher.png b/public-metis/icons/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..f12048f Binary files /dev/null and b/public-metis/icons/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/public-metis/icons/res/mipmap-xxxhdpi/ic_launcher.png b/public-metis/icons/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..7a0462e Binary files /dev/null and b/public-metis/icons/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/public-metis/manifest.webmanifest b/public-metis/manifest.webmanifest new file mode 100644 index 0000000..dd1d03d --- /dev/null +++ b/public-metis/manifest.webmanifest @@ -0,0 +1,29 @@ +{ + "name": "Metis Rooster", + "short_name": "Rooster", + "start_url": "/", + "display": "standalone", + "background_color": "#ececec", + "description": "De rooster pagina van het Metis Montessori Lyceum", + "icons": [{ + "src": "/icons/res/mipmap-mdpi/ic_launcher.png", + "sizes": "48x48", + "type": "image/png" + }, { + "src": "/icons/res/mipmap-hdpi/ic_launcher.png", + "sizes": "72x72", + "type": "image/png" + }, { + "src": "/icons/res/mipmap-xhdpi/ic_launcher.png", + "sizes": "96x96", + "type": "image/png" + }, { + "src": "/icons/res/mipmap-xxhdpi/ic_launcher.png", + "sizes": "144x144", + "type": "image/png" + }, { + "src": "/icons/res/mipmap-xxxhdpi/ic_launcher.png", + "sizes": "192x192", + "type": "image/png" + }] +} diff --git a/public-metis/mstile-150x150.png b/public-metis/mstile-150x150.png new file mode 100644 index 0000000..5e381e6 Binary files /dev/null and b/public-metis/mstile-150x150.png differ diff --git a/public-metis/safari-pinned-tab.svg b/public-metis/safari-pinned-tab.svg new file mode 100644 index 0000000..97ce8bf --- /dev/null +++ b/public-metis/safari-pinned-tab.svg @@ -0,0 +1,34 @@ + + + + +Created by potrace 1.11, written by Peter Selinger 2001-2013 + + + + + + diff --git a/public/.well-known/keybase.txt b/public/.well-known/keybase.txt deleted file mode 100644 index 7e11526..0000000 --- a/public/.well-known/keybase.txt +++ /dev/null @@ -1,54 +0,0 @@ -================================================================== -https://keybase.io/nloomans --------------------------------------------------------------------- - -I hereby claim: - - * I am an admin of https://rooster.hetmml.nl - * I am nloomans (https://keybase.io/nloomans) on keybase. - * I have a public key ASCCV4aRFiMkEv7inJTf34RgxZ6IK0wQ-wTH2ZfSIu3OzAo - -To do so, I am signing this object: - -{ - "body": { - "key": { - "eldest_kid": "0101bbdb28841b169de6538a51d17ca94b30088ba2914e56fd19121eec05f7a389cc0a", - "host": "keybase.io", - "kid": "01208257869116232412fee29c94dfdf8460c59e882b4c10fb04c7d997d222edcecc0a", - "uid": "7a52ddabf92293dd59f8fbf3774ea319", - "username": "nloomans" - }, - "service": { - "hostname": "rooster.hetmml.nl", - "protocol": "https:" - }, - "type": "web_service_binding", - "version": 1 - }, - "client": { - "name": "keybase.io go client", - "version": "1.0.20" - }, - "ctime": 1492017398, - "expire_in": 504576000, - "merkle_root": { - "ctime": 1492017367, - "hash": "463e597079ce3829ccc1f1aa7b15533c0848f9e13cdb55407af490a87bf4ac1b2d64e8235518ada07d93003b889157b576aad02eda294ccd594dc0dcbf8862ef", - "seqno": 1015311 - }, - "prev": "36959cd282a98f651138068f8695b07480a016f02ba99a0acbde277e0cf4ca30", - "seqno": 19, - "tag": "signature" -} - -which yields the signature: - -hKRib2R5hqhkZXRhY2hlZMOpaGFzaF90eXBlCqNrZXnEIwEggleGkRYjJBL+4pyU39+EYMWeiCtMEPsEx9mX0iLtzswKp3BheWxvYWTFAvt7ImJvZHkiOnsia2V5Ijp7ImVsZGVzdF9raWQiOiIwMTAxYmJkYjI4ODQxYjE2OWRlNjUzOGE1MWQxN2NhOTRiMzAwODhiYTI5MTRlNTZmZDE5MTIxZWVjMDVmN2EzODljYzBhIiwiaG9zdCI6ImtleWJhc2UuaW8iLCJraWQiOiIwMTIwODI1Nzg2OTExNjIzMjQxMmZlZTI5Yzk0ZGZkZjg0NjBjNTllODgyYjRjMTBmYjA0YzdkOTk3ZDIyMmVkY2VjYzBhIiwidWlkIjoiN2E1MmRkYWJmOTIyOTNkZDU5ZjhmYmYzNzc0ZWEzMTkiLCJ1c2VybmFtZSI6Im5sb29tYW5zIn0sInNlcnZpY2UiOnsiaG9zdG5hbWUiOiJyb29zdGVyLmhldG1tbC5ubCIsInByb3RvY29sIjoiaHR0cHM6In0sInR5cGUiOiJ3ZWJfc2VydmljZV9iaW5kaW5nIiwidmVyc2lvbiI6MX0sImNsaWVudCI6eyJuYW1lIjoia2V5YmFzZS5pbyBnbyBjbGllbnQiLCJ2ZXJzaW9uIjoiMS4wLjIwIn0sImN0aW1lIjoxNDkyMDE3Mzk4LCJleHBpcmVfaW4iOjUwNDU3NjAwMCwibWVya2xlX3Jvb3QiOnsiY3RpbWUiOjE0OTIwMTczNjcsImhhc2giOiI0NjNlNTk3MDc5Y2UzODI5Y2NjMWYxYWE3YjE1NTMzYzA4NDhmOWUxM2NkYjU1NDA3YWY0OTBhODdiZjRhYzFiMmQ2NGU4MjM1NTE4YWRhMDdkOTMwMDNiODg5MTU3YjU3NmFhZDAyZWRhMjk0Y2NkNTk0ZGMwZGNiZjg4NjJlZiIsInNlcW5vIjoxMDE1MzExfSwicHJldiI6IjM2OTU5Y2QyODJhOThmNjUxMTM4MDY4Zjg2OTViMDc0ODBhMDE2ZjAyYmE5OWEwYWNiZGUyNzdlMGNmNGNhMzAiLCJzZXFubyI6MTksInRhZyI6InNpZ25hdHVyZSJ9o3NpZ8RAcP5FuvbGM9nXBzWqChr9zdj452IpBzrVbd6YvcktLyKjaUaRg51BOWsyHmYQ+uxmZ2ZCUI6xZbbJ1SIAnWqvC6hzaWdfdHlwZSCkaGFzaIKkdHlwZQildmFsdWXEING7Z+BlY2sOTnQqQJo/PUBashy75VL9UU4tGIEvMXbco3RhZ80CAqd2ZXJzaW9uAQ== - -And finally, I am proving ownership of this host by posting or -appending to this document. - -View my publicly-auditable identity here: https://keybase.io/nloomans - -================================================================== diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png deleted file mode 100644 index 5adfc69..0000000 Binary files a/public/apple-touch-icon.png and /dev/null differ diff --git a/public/browserconfig.xml b/public/browserconfig.xml deleted file mode 100644 index b3930d0..0000000 --- a/public/browserconfig.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - #da532c - - - diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png deleted file mode 100644 index 1df47d3..0000000 Binary files a/public/favicon-16x16.png and /dev/null differ diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png deleted file mode 100644 index 36cd5da..0000000 Binary files a/public/favicon-32x32.png and /dev/null differ diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index c201043..0000000 Binary files a/public/favicon.ico and /dev/null differ diff --git a/public/icons/mml-logo.png b/public/icons/mml-logo.png deleted file mode 100644 index fa5ae11..0000000 Binary files a/public/icons/mml-logo.png and /dev/null differ diff --git a/public/icons/res/mipmap-hdpi/ic_launcher.png b/public/icons/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 514ad14..0000000 Binary files a/public/icons/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/public/icons/res/mipmap-mdpi/ic_launcher.png b/public/icons/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 59bab1d..0000000 Binary files a/public/icons/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/public/icons/res/mipmap-xhdpi/ic_launcher.png b/public/icons/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 908a6e8..0000000 Binary files a/public/icons/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/public/icons/res/mipmap-xxhdpi/ic_launcher.png b/public/icons/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index f12048f..0000000 Binary files a/public/icons/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/public/icons/res/mipmap-xxxhdpi/ic_launcher.png b/public/icons/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 7a0462e..0000000 Binary files a/public/icons/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/public/manifest.webmanifest b/public/manifest.webmanifest deleted file mode 100644 index d33ee8e..0000000 --- a/public/manifest.webmanifest +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name": "Metis Rooster", - "short_name": "Rooster", - "start_url": "/", - "display": "standalone", - "background_color": "#ececec", - "description": "Een verbeterde rooster pagina voor het metis", - "icons": [{ - "src": "/icons/res/mipmap-mdpi/ic_launcher.png", - "sizes": "48x48", - "type": "image/png" - }, { - "src": "/icons/res/mipmap-hdpi/ic_launcher.png", - "sizes": "72x72", - "type": "image/png" - }, { - "src": "/icons/res/mipmap-xhdpi/ic_launcher.png", - "sizes": "96x96", - "type": "image/png" - }, { - "src": "/icons/res/mipmap-xxhdpi/ic_launcher.png", - "sizes": "144x144", - "type": "image/png" - }, { - "src": "/icons/res/mipmap-xxxhdpi/ic_launcher.png", - "sizes": "192x192", - "type": "image/png" - }] -} diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png deleted file mode 100644 index 5e381e6..0000000 Binary files a/public/mstile-150x150.png and /dev/null differ diff --git a/public/safari-pinned-tab.svg b/public/safari-pinned-tab.svg deleted file mode 100644 index 97ce8bf..0000000 --- a/public/safari-pinned-tab.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - - -Created by potrace 1.11, written by Peter Selinger 2001-2013 - - - - - - diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index c2c7e8f..c9eaabb 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -15,11 +15,11 @@ html, body { #search { z-index: 2; - background-color: #F44336; + background-color: #DE403B; margin: 0 auto; width: 100%; position: fixed; - box-shadow: 0 0.5px 1.5px rgba(0,0,0,0.06), 0 0.5px 1px rgba(0,0,0,0.12); + box-shadow: 0 0.5px 1.5px rgba(0, 0, 0, 0.06), 0 0.5px 1px rgba(0, 0, 0, 0.12); } #search .top-bar { @@ -53,17 +53,14 @@ html, body { #search input[type='search']:focus { background-color: #FFFFFF; color: #212121; - box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24); } -#search input[type='search']:focus + button { +#search input[type='search']:focus+button { color: #212121; } -input[type="search"]::-webkit-search-decoration, -input[type="search"]::-webkit-search-cancel-button, -input[type="search"]::-webkit-search-results-button, -input[type="search"]::-webkit-search-results-decoration { +input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-results-button, input[type="search"]::-webkit-search-results-decoration { display: none; } @@ -76,39 +73,46 @@ button::-moz-focus-inner { border: 0; } - /* WebKit, Blink, Edge */ + input::-webkit-input-placeholder { color: #FFCDD2; } + input:focus::-webkit-input-placeholder { color: #757575; } /* Mozilla Firefox 4 to 18 */ + input:-moz-placeholder { - color: #FFCDD2; - opacity: 1; + color: #FFCDD2; + opacity: 1; } + input:focus:-moz-placeholder { - color: #757575; + color: #757575; } /* Mozilla Firefox 19+ */ + input::-moz-placeholder { - color: #FFCDD2; - opacity: 1; + color: #FFCDD2; + opacity: 1; } + input:focus::-moz-placeholder { - color: #757575; + color: #757575; } /* Internet Explorer 10-11 */ + input:-ms-input-placeholder { - color: #FFCDD2; + color: #FFCDD2; } + input:focus:-ms-input-placeholder { - color: #757575; + color: #757575; } li:hover { @@ -145,8 +149,8 @@ body.searched #search-space-filler { #week-selector { z-index: 1; - background-color: #F44336; - box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23); + background-color: #DE403B; + box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23); color: white; } @@ -192,7 +196,6 @@ input { padding: 4px; border-radius: 2px; background: none; - display: none; } @@ -238,17 +241,14 @@ body.no-input #week-selector { body.no-input { background-color: #ececec; } - body.no-input #search { height: 100%; background-color: #ececec; box-shadow: none; } - body.no-input #search button { display: none; } - body.no-input #search #overflow-button { position: absolute; display: block; @@ -256,73 +256,65 @@ body.no-input #week-selector { right: 0; color: #757575; } - body.no-input #search .print-page { display: none; } - body.no-input #search #overflow-button:focus { background-color: inherit; color: #212121; } - + body.no-input #search .logo-metis { + background-image: url(/icons/logo.png); + /* virtual center: http://javier.xyz/visual-center/ */ + transform: translate(-8%, -3%); + } + body.no-input #search .logo-kiemm { + background-image: url(/icons/logo.svg); + } body.no-input #search .logo { - background-image: url(/icons/mml-logo.png); background-position: center; background-repeat: no-repeat; background-size: contain; height: 100px; width: 100px; - - /* virtual center: http://javier.xyz/visual-center/ */ - transform: translate(-8%,-3%); margin: 0 auto; } - body.no-input #search .title { display: block; font-size: 55px; padding-bottom: 32px; } - body.no-input #search .title .text { text-align: center; line-height: 55px; } - body.no-input #search .top-bar { position: static; display: block; margin-top: 50vh; transform: translateY(-75%); } - body.no-input #search input[type='search'] { background-color: #FFF; } - /* WebKit, Blink, Edge */ body.no-input #search input::-webkit-input-placeholder { color: #757575; } - /* Mozilla Firefox 4 to 18 */ body.no-input #search input:-moz-placeholder { color: #757575; opacity: 1; } - /* Mozilla Firefox 19+ */ body.no-input #search input::-moz-placeholder { color: #757575; opacity: 1; } - /* Internet Explorer 10-11 */ body.no-input #search input:-ms-input-placeholder { color: #757575; } - body.no-input .tooltip { display: block; position: absolute; @@ -330,11 +322,9 @@ body.no-input #week-selector { padding: 15px; margin: 32px 8px; border-radius: 2px; - left: 16px; right: 16px; } - body.no-input .tooltip::before { content: ''; width: 24px; @@ -356,7 +346,6 @@ body.no-input #week-selector { display: flex; flex-direction: column; } - table * { padding: 0; line-height: 13px; @@ -371,7 +360,7 @@ body.no-input #week-selector { } body.week-selector-not-visible #search { - box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23); + box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23); } body.week-selector-not-visible #week-selector { diff --git a/public/sw.js b/public/sw.js deleted file mode 100644 index bd43805..0000000 --- a/public/sw.js +++ /dev/null @@ -1,29 +0,0 @@ -/* global importScripts toolbox self */ - -(global => { - 'use strict' - - // Load the sw-toolbox library. - importScripts('/components/sw-toolbox/sw-toolbox.js') - - // Ensure that our service worker takes control of the page as soon as possible. - global.addEventListener('install', event => event.waitUntil(global.skipWaiting())) - global.addEventListener('activate', event => event.waitUntil(global.clients.claim())) - - toolbox.precache([ - '/', - '/hello', - '/untisinfo.css', - '/javascripts/bundle.js', - '/stylesheets/style.css', - '/stylesheets/hello.css' - ]) - - toolbox.router.get('/', toolbox.fastest) - toolbox.router.get('/hello', toolbox.fastest) - - toolbox.router.get('/javascripts/bundle.js', toolbox.fastest) - toolbox.router.get('/stylesheets/*', toolbox.fastest) - toolbox.router.get('/untisinfo.css', toolbox.fastest) - toolbox.router.get('/meetingpointProxy/*', toolbox.networkFirst) -})(self) diff --git a/public/untisinfo.css b/public/untisinfo.css deleted file mode 100644 index d74a7aa..0000000 --- a/public/untisinfo.css +++ /dev/null @@ -1,11 +0,0 @@ -html, body { - overflow: auto; - width: 100vw; - height: 100vh; - margin: 0; - -webkit-overflow-scrolling: touch; -} - -center { - margin: 5px; -} diff --git a/routes/index.js b/routes/index.js index 223d97f..4876d67 100644 --- a/routes/index.js +++ b/routes/index.js @@ -19,7 +19,14 @@ router.get('/', function (req, res, next) { const flagsStr = `var FLAGS = ${JSON.stringify(flags)};` const usersStr = `var USERS = ${JSON.stringify(data.users)};` const validWeekNumbersStr = `var VALID_WEEK_NUMBERS = ${JSON.stringify(data.validWeekNumbers)}` - res.render('index', { baseMeetingpointUrl, flagsStr, usersStr, validWeekNumbersStr }) + res.render('index', { + school: process.env.SCHOOL === 'kiemm' ? 'kiemm' : 'metis', + schoolLevel: process.env.SCHOOL_LEVEL === 'mavo' ? 'mavo' : 'havo-vwo', + baseMeetingpointUrl, + flagsStr, + usersStr, + validWeekNumbersStr + }) }).catch(function () { console.error('Unable to get user info, emergency redirect!') res.render('redirect', { diff --git a/views/index.jade b/views/index.jade index eb38e74..03995ae 100644 --- a/views/index.jade +++ b/views/index.jade @@ -11,7 +11,10 @@ block content form#search .top-bar .title - .logo + if school === 'kiemm' + .logo.logo-kiemm + else + .logo.logo-metis .text Rooster .input-wrapper input(type='search', placeholder='Zoeken', autocomplete='off') @@ -20,7 +23,7 @@ block content span Voer hier een docentafkorting, klas, leerlingnummer of lokaalnummer in. button#overflow-button(type='button') i.material-icons  - + ul.mdl-menu.mdl-menu--bottom-right.mdl-js-menu.mdl-js-ripple-effect(for='overflow-button') a(href='#{baseMeetingpointUrl}/basisroosters/default.htm') li.mdl-menu__item Basis rooster gebruiken @@ -35,11 +38,11 @@ block content #search-space-filler .week-wrapper button(type='button').material-icons  - span.current + span.current span.no-print Loading... span.print button(type='button').material-icons  - + #schedule block scripts diff --git a/views/layout.jade b/views/layout.jade index aea6d5f..701fb29 100644 --- a/views/layout.jade +++ b/views/layout.jade @@ -2,7 +2,10 @@ doctype html html(lang='nl') head block head_top - title Metis Rooster + if school === 'kiemm' + title Kiemm Rooster + else + title Metis Rooster meta(name='theme-color',content='#F44336') meta(name='viewport', content='width=device-width, initial-scale=1') link(href='https://fonts.googleapis.com/css?family=Roboto', rel='stylesheet') -- cgit v1.1