diff options
-rw-r--r-- | app.js | 5 | ||||
-rw-r--r-- | package.json | 6 | ||||
-rw-r--r-- | public-kiemm/android-chrome-192x192.png | bin | 0 -> 11744 bytes | |||
-rw-r--r-- | public-kiemm/android-chrome-512x512.png | bin | 0 -> 33206 bytes | |||
-rw-r--r-- | public-kiemm/apple-touch-icon.png | bin | 0 -> 6964 bytes | |||
-rw-r--r-- | public-kiemm/browserconfig.xml | 9 | ||||
-rw-r--r-- | public-kiemm/favicon-16x16.png | bin | 0 -> 771 bytes | |||
-rw-r--r-- | public-kiemm/favicon-32x32.png | bin | 0 -> 1171 bytes | |||
-rw-r--r-- | public-kiemm/favicon.ico | bin | 0 -> 15086 bytes | |||
-rw-r--r-- | public-kiemm/icons/fav.png | bin | 0 -> 7725 bytes | |||
-rw-r--r-- | public-kiemm/icons/logo.svg | 37 | ||||
-rw-r--r-- | public-kiemm/manifest.webmanifest | 17 | ||||
-rw-r--r-- | public-kiemm/mstile-144x144.png | bin | 0 -> 5670 bytes | |||
-rw-r--r-- | public-kiemm/mstile-150x150.png | bin | 0 -> 3218 bytes | |||
-rw-r--r-- | public-kiemm/mstile-310x150.png | bin | 0 -> 3565 bytes | |||
-rw-r--r-- | public-kiemm/mstile-310x310.png | bin | 0 -> 12259 bytes | |||
-rw-r--r-- | public-kiemm/mstile-70x70.png | bin | 0 -> 2467 bytes | |||
-rw-r--r-- | public-kiemm/safari-pinned-tab.svg | 45 | ||||
-rw-r--r-- | public-kiemm/site.webmanifest | 19 | ||||
-rw-r--r-- | public-metis/.well-known/keybase.txt (renamed from public/.well-known/keybase.txt) | 0 | ||||
-rw-r--r-- | public-metis/apple-touch-icon.png (renamed from public/apple-touch-icon.png) | bin | 6447 -> 6447 bytes | |||
-rw-r--r-- | public-metis/browserconfig.xml (renamed from public/browserconfig.xml) | 0 | ||||
-rw-r--r-- | public-metis/favicon-16x16.png (renamed from public/favicon-16x16.png) | bin | 1293 -> 1293 bytes | |||
-rw-r--r-- | public-metis/favicon-32x32.png (renamed from public/favicon-32x32.png) | bin | 2103 -> 2103 bytes | |||
-rw-r--r-- | public-metis/favicon.ico (renamed from public/favicon.ico) | bin | 15086 -> 15086 bytes | |||
-rw-r--r-- | public-metis/icons/kiemm-logo-app.png | bin | 0 -> 7725 bytes | |||
-rw-r--r-- | public-metis/icons/kiemm-logo.png | bin | 0 -> 2513 bytes | |||
-rw-r--r-- | public-metis/icons/kiemm-logo.svg | 37 | ||||
-rw-r--r-- | public-metis/icons/logo.png (renamed from public/icons/mml-logo.png) | bin | 12508 -> 12508 bytes | |||
-rw-r--r-- | public-metis/icons/res/mipmap-hdpi/ic_launcher.png (renamed from public/icons/res/mipmap-hdpi/ic_launcher.png) | bin | 6503 -> 6503 bytes | |||
-rw-r--r-- | public-metis/icons/res/mipmap-mdpi/ic_launcher.png (renamed from public/icons/res/mipmap-mdpi/ic_launcher.png) | bin | 3854 -> 3854 bytes | |||
-rw-r--r-- | public-metis/icons/res/mipmap-xhdpi/ic_launcher.png (renamed from public/icons/res/mipmap-xhdpi/ic_launcher.png) | bin | 9631 -> 9631 bytes | |||
-rw-r--r-- | public-metis/icons/res/mipmap-xxhdpi/ic_launcher.png (renamed from public/icons/res/mipmap-xxhdpi/ic_launcher.png) | bin | 15315 -> 15315 bytes | |||
-rw-r--r-- | public-metis/icons/res/mipmap-xxxhdpi/ic_launcher.png (renamed from public/icons/res/mipmap-xxxhdpi/ic_launcher.png) | bin | 23445 -> 23445 bytes | |||
-rw-r--r-- | public-metis/manifest.webmanifest (renamed from public/manifest.webmanifest) | 2 | ||||
-rw-r--r-- | public-metis/mstile-150x150.png (renamed from public/mstile-150x150.png) | bin | 3995 -> 3995 bytes | |||
-rw-r--r-- | public-metis/safari-pinned-tab.svg (renamed from public/safari-pinned-tab.svg) | 0 | ||||
-rw-r--r-- | public/stylesheets/style.css | 75 | ||||
-rw-r--r-- | public/sw.js | 29 | ||||
-rw-r--r-- | public/untisinfo.css | 11 | ||||
-rw-r--r-- | routes/index.js | 9 | ||||
-rw-r--r-- | views/index.jade | 11 | ||||
-rw-r--r-- | views/layout.jade | 5 |
43 files changed, 225 insertions, 92 deletions
@@ -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 Binary files differnew file mode 100644 index 0000000..3f2171f --- /dev/null +++ b/public-kiemm/android-chrome-192x192.png diff --git a/public-kiemm/android-chrome-512x512.png b/public-kiemm/android-chrome-512x512.png Binary files differnew file mode 100644 index 0000000..2e75315 --- /dev/null +++ b/public-kiemm/android-chrome-512x512.png diff --git a/public-kiemm/apple-touch-icon.png b/public-kiemm/apple-touch-icon.png Binary files differnew file mode 100644 index 0000000..bbec64c --- /dev/null +++ b/public-kiemm/apple-touch-icon.png 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<browserconfig> + <msapplication> + <tile> + <square150x150logo src="/mstile-150x150.png"/> + <TileColor>#de403b</TileColor> + </tile> + </msapplication> +</browserconfig> diff --git a/public-kiemm/favicon-16x16.png b/public-kiemm/favicon-16x16.png Binary files differnew file mode 100644 index 0000000..3a3bbc2 --- /dev/null +++ b/public-kiemm/favicon-16x16.png diff --git a/public-kiemm/favicon-32x32.png b/public-kiemm/favicon-32x32.png Binary files differnew file mode 100644 index 0000000..fe300c4 --- /dev/null +++ b/public-kiemm/favicon-32x32.png diff --git a/public-kiemm/favicon.ico b/public-kiemm/favicon.ico Binary files differnew file mode 100644 index 0000000..448035e --- /dev/null +++ b/public-kiemm/favicon.ico diff --git a/public-kiemm/icons/fav.png b/public-kiemm/icons/fav.png Binary files differnew file mode 100644 index 0000000..ec2829d --- /dev/null +++ b/public-kiemm/icons/fav.png 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 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ viewBox="0 0 170 170" style="enable-background:new 0 0 170 170;" xml:space="preserve">
+<style type="text/css">
+ .st0{fill:#1D1D1B;}
+ .st1{fill:#FFFFFF;}
+</style>
+<circle class="st0" cx="85" cy="85" r="85"/>
+<g>
+ <path class="st1" d="M34.04,106.71l-3.88,4.1v6.85h-7.75V75.53h7.75v25.56l10.34-11.52h9.72l-11.4,12.08l11.8,16.01h-8.99
+ L34.04,106.71z"/>
+ <path class="st1" d="M55.65,84.44c-0.92-0.92-1.38-2.01-1.38-3.29c0-1.31,0.47-2.42,1.4-3.34c0.94-0.92,2.04-1.38,3.31-1.38
+ c1.31,0,2.42,0.46,3.34,1.38s1.38,2.03,1.38,3.34c0,1.27-0.46,2.37-1.38,3.29c-0.92,0.92-2.03,1.38-3.34,1.38
+ C57.68,85.81,56.56,85.36,55.65,84.44z M62.87,117.67h-7.75V89.3h7.75V117.67z"/>
+ <path class="st1" d="M79.02,110.28c1.25,0.95,2.82,1.43,4.69,1.43c2.66,0,4.92-0.88,6.8-2.64l5.06,4.83
+ c-1.5,1.42-3.24,2.53-5.23,3.32c-1.99,0.79-4.12,1.18-6.4,1.18c-2.92,0-5.55-0.63-7.89-1.88c-2.34-1.25-4.18-3.01-5.51-5.28
+ c-1.33-2.27-1.99-4.88-1.99-7.84c0-2.85,0.62-5.39,1.85-7.64c1.24-2.25,2.98-4.01,5.23-5.28c2.25-1.27,4.83-1.91,7.75-1.91
+ c3,0,5.54,0.63,7.64,1.88s3.66,2.9,4.69,4.94c1.03,2.04,1.55,4.24,1.55,6.6c0,0.6-0.04,1.33-0.11,2.19
+ c-0.08,0.86-0.17,1.54-0.28,2.02H76.52C76.93,107.97,77.76,109.33,79.02,110.28z M78.88,96.77c-1.16,0.97-1.95,2.32-2.36,4.04h13.2
+ c-0.15-1.69-0.79-3.02-1.91-4.02c-1.12-0.99-2.62-1.49-4.5-1.49C81.52,95.31,80.04,95.8,78.88,96.77z"/>
+ <path class="st1" d="M142.48,89.92c1.61,0.9,2.87,2.17,3.76,3.82c0.9,1.65,1.35,3.56,1.35,5.73v18.2h-7.75v-16.52
+ c0-1.72-0.43-3.05-1.29-3.99c-0.86-0.94-2.08-1.4-3.65-1.4c-1.65,0-3.06,0.5-4.24,1.49c-1.18,0.99-1.77,2.33-1.77,4.02v16.41h-7.7
+ v-16.52c0-1.72-0.44-3.05-1.32-3.99c-0.88-0.94-2.11-1.4-3.68-1.4c-1.61,0-3.01,0.49-4.19,1.46c-1.18,0.97-1.77,2.32-1.77,4.04
+ v16.41h-7.75V89.3h6.97l0.34,3.54c0.94-1.35,2.15-2.4,3.65-3.15c1.5-0.75,3.15-1.12,4.94-1.12c1.95,0,3.7,0.43,5.25,1.29
+ c1.55,0.86,2.78,2.06,3.68,3.6c1.05-1.53,2.42-2.73,4.1-3.6c1.69-0.86,3.54-1.29,5.56-1.29C139.03,88.57,140.86,89.02,142.48,89.92
+ z"/>
+</g>
+<g>
+ <path class="st1" d="M142.52,53.35c1.61,0.9,2.87,2.17,3.76,3.82c0.9,1.65,1.35,3.56,1.35,5.73v18.2h-7.75V64.58
+ c0-1.72-0.43-3.05-1.29-3.99c-0.86-0.94-2.08-1.4-3.65-1.4c-1.65,0-3.06,0.5-4.24,1.49c-1.18,0.99-1.77,2.33-1.77,4.02V81.1h-7.7
+ V64.58c0-1.72-0.44-3.05-1.32-3.99c-0.88-0.94-2.11-1.4-3.68-1.4c-1.61,0-3.01,0.49-4.19,1.46c-1.18,0.97-1.77,2.32-1.77,4.04V81.1
+ h-7.75V52.73h6.97l0.34,3.54c0.94-1.35,2.15-2.4,3.65-3.15c1.5-0.75,3.15-1.12,4.94-1.12c1.95,0,3.7,0.43,5.25,1.29
+ c1.55,0.86,2.78,2.06,3.68,3.6c1.05-1.54,2.42-2.73,4.1-3.6c1.69-0.86,3.54-1.29,5.56-1.29C139.08,52,140.91,52.45,142.52,53.35z"
+ />
+</g>
+</svg>
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 Binary files differnew file mode 100644 index 0000000..a58305c --- /dev/null +++ b/public-kiemm/mstile-144x144.png diff --git a/public-kiemm/mstile-150x150.png b/public-kiemm/mstile-150x150.png Binary files differnew file mode 100644 index 0000000..6f69b48 --- /dev/null +++ b/public-kiemm/mstile-150x150.png diff --git a/public-kiemm/mstile-310x150.png b/public-kiemm/mstile-310x150.png Binary files differnew file mode 100644 index 0000000..a666a54 --- /dev/null +++ b/public-kiemm/mstile-310x150.png diff --git a/public-kiemm/mstile-310x310.png b/public-kiemm/mstile-310x310.png Binary files differnew file mode 100644 index 0000000..3b76ab5 --- /dev/null +++ b/public-kiemm/mstile-310x310.png diff --git a/public-kiemm/mstile-70x70.png b/public-kiemm/mstile-70x70.png Binary files differnew file mode 100644 index 0000000..a729c5b --- /dev/null +++ b/public-kiemm/mstile-70x70.png 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 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" + "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"> +<svg version="1.0" xmlns="http://www.w3.org/2000/svg" + width="700.000000pt" height="700.000000pt" viewBox="0 0 700.000000 700.000000" + preserveAspectRatio="xMidYMid meet"> +<metadata> +Created by potrace 1.11, written by Peter Selinger 2001-2013 +</metadata> +<g transform="translate(0.000000,700.000000) scale(0.100000,-0.100000)" +fill="#000000" stroke="none"> +<path d="M3225 6994 c-246 -25 -498 -70 -680 -123 -1007 -289 -1826 -1002 +-2249 -1956 -102 -228 -176 -461 -226 -705 -56 -278 -64 -367 -64 -710 0 -343 +8 -432 64 -710 224 -1101 978 -2034 2015 -2494 301 -134 618 -223 975 -273 +179 -25 701 -25 880 0 734 103 1343 382 1890 863 556 490 951 1173 1100 1904 +56 278 64 367 64 710 0 343 -8 432 -64 710 -224 1101 -978 2034 -2015 2494 +-300 134 -622 224 -970 272 -114 15 -617 28 -720 18z m1847 -2187 c69 -34 129 +-84 156 -133 10 -17 16 -14 69 37 104 101 198 139 345 139 186 0 316 -79 392 +-240 l31 -65 3 -442 3 -443 -156 0 -155 0 0 378 c0 344 -2 381 -19 417 -49 +110 -189 143 -319 76 -47 -24 -76 -56 -99 -106 -16 -36 -18 -80 -21 -402 l-3 +-363 -149 0 -148 0 -4 373 c-4 414 -6 427 -73 486 -81 71 -252 55 -332 -31 +-51 -54 -53 -71 -53 -463 l0 -365 -155 0 -155 0 0 580 0 580 140 0 140 0 0 +-39 c0 -21 3 -52 6 -68 l6 -30 48 48 c89 89 174 120 321 116 99 -2 110 -4 181 +-40z m-3830 -1444 l3 -527 213 237 214 237 195 0 195 0 -153 -162 c-85 -89 +-189 -199 -233 -245 -43 -45 -76 -88 -73 -95 2 -7 109 -154 236 -326 127 -172 +231 -315 231 -318 0 -2 -80 -4 -177 -4 l-178 0 -155 224 -155 225 -82 -82 -83 +-82 0 -142 0 -143 -155 0 -155 0 0 865 0 865 155 0 155 0 2 -527z m1256 472 +c49 -21 81 -52 103 -100 62 -134 -55 -283 -204 -261 -56 9 -130 70 -147 122 +-30 91 11 186 100 232 52 26 96 28 148 7z m1069 -500 c198 -37 350 -172 408 +-362 21 -66 29 -175 20 -266 l-7 -77 -419 0 c-338 0 -419 -3 -419 -13 0 -29 +54 -119 91 -151 109 -93 309 -88 452 11 l38 27 97 -97 97 -97 -25 -24 c-42 +-42 -141 -95 -225 -122 -294 -94 -622 14 -760 250 -55 93 -77 172 -82 292 -11 +231 69 414 231 529 143 100 318 135 503 100z m1418 0 c86 -23 152 -63 208 +-126 l49 -57 58 58 c211 211 581 174 714 -71 54 -97 56 -120 56 -566 l0 -413 +-155 0 -155 0 0 363 c0 222 -4 377 -11 400 -35 126 -194 175 -330 101 -59 -32 +-93 -78 -108 -144 -6 -26 -11 -189 -11 -382 l0 -338 -155 0 -155 0 0 373 c0 +413 -2 423 -68 479 -110 92 -307 43 -370 -92 -14 -30 -17 -88 -20 -397 l-4 +-363 -154 0 -154 0 0 580 0 580 139 0 c156 0 151 3 151 -79 0 -26 3 -51 7 -54 +3 -4 29 15 58 42 112 106 261 144 410 106z m-2405 -595 l0 -580 -155 0 -155 0 +0 580 0 580 155 0 155 0 0 -580z"/> +<path d="M3327 3063 c-59 -20 -130 -86 -157 -146 -11 -23 -20 -48 -20 -54 0 +-10 62 -13 275 -13 l275 0 -6 28 c-12 53 -46 112 -82 142 -69 57 -188 75 -285 +43z"/> +</g> +</svg> 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/.well-known/keybase.txt b/public-metis/.well-known/keybase.txt index 7e11526..7e11526 100644 --- a/public/.well-known/keybase.txt +++ b/public-metis/.well-known/keybase.txt diff --git a/public/apple-touch-icon.png b/public-metis/apple-touch-icon.png Binary files differindex 5adfc69..5adfc69 100644 --- a/public/apple-touch-icon.png +++ b/public-metis/apple-touch-icon.png diff --git a/public/browserconfig.xml b/public-metis/browserconfig.xml index b3930d0..b3930d0 100644 --- a/public/browserconfig.xml +++ b/public-metis/browserconfig.xml diff --git a/public/favicon-16x16.png b/public-metis/favicon-16x16.png Binary files differindex 1df47d3..1df47d3 100644 --- a/public/favicon-16x16.png +++ b/public-metis/favicon-16x16.png diff --git a/public/favicon-32x32.png b/public-metis/favicon-32x32.png Binary files differindex 36cd5da..36cd5da 100644 --- a/public/favicon-32x32.png +++ b/public-metis/favicon-32x32.png diff --git a/public/favicon.ico b/public-metis/favicon.ico Binary files differindex c201043..c201043 100644 --- a/public/favicon.ico +++ b/public-metis/favicon.ico diff --git a/public-metis/icons/kiemm-logo-app.png b/public-metis/icons/kiemm-logo-app.png Binary files differnew file mode 100644 index 0000000..ec2829d --- /dev/null +++ b/public-metis/icons/kiemm-logo-app.png diff --git a/public-metis/icons/kiemm-logo.png b/public-metis/icons/kiemm-logo.png Binary files differnew file mode 100644 index 0000000..6a162a6 --- /dev/null +++ b/public-metis/icons/kiemm-logo.png 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 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ viewBox="0 0 170 170" style="enable-background:new 0 0 170 170;" xml:space="preserve">
+<style type="text/css">
+ .st0{fill:#1D1D1B;}
+ .st1{fill:#FFFFFF;}
+</style>
+<circle class="st0" cx="85" cy="85" r="85"/>
+<g>
+ <path class="st1" d="M34.04,106.71l-3.88,4.1v6.85h-7.75V75.53h7.75v25.56l10.34-11.52h9.72l-11.4,12.08l11.8,16.01h-8.99
+ L34.04,106.71z"/>
+ <path class="st1" d="M55.65,84.44c-0.92-0.92-1.38-2.01-1.38-3.29c0-1.31,0.47-2.42,1.4-3.34c0.94-0.92,2.04-1.38,3.31-1.38
+ c1.31,0,2.42,0.46,3.34,1.38s1.38,2.03,1.38,3.34c0,1.27-0.46,2.37-1.38,3.29c-0.92,0.92-2.03,1.38-3.34,1.38
+ C57.68,85.81,56.56,85.36,55.65,84.44z M62.87,117.67h-7.75V89.3h7.75V117.67z"/>
+ <path class="st1" d="M79.02,110.28c1.25,0.95,2.82,1.43,4.69,1.43c2.66,0,4.92-0.88,6.8-2.64l5.06,4.83
+ c-1.5,1.42-3.24,2.53-5.23,3.32c-1.99,0.79-4.12,1.18-6.4,1.18c-2.92,0-5.55-0.63-7.89-1.88c-2.34-1.25-4.18-3.01-5.51-5.28
+ c-1.33-2.27-1.99-4.88-1.99-7.84c0-2.85,0.62-5.39,1.85-7.64c1.24-2.25,2.98-4.01,5.23-5.28c2.25-1.27,4.83-1.91,7.75-1.91
+ c3,0,5.54,0.63,7.64,1.88s3.66,2.9,4.69,4.94c1.03,2.04,1.55,4.24,1.55,6.6c0,0.6-0.04,1.33-0.11,2.19
+ c-0.08,0.86-0.17,1.54-0.28,2.02H76.52C76.93,107.97,77.76,109.33,79.02,110.28z M78.88,96.77c-1.16,0.97-1.95,2.32-2.36,4.04h13.2
+ c-0.15-1.69-0.79-3.02-1.91-4.02c-1.12-0.99-2.62-1.49-4.5-1.49C81.52,95.31,80.04,95.8,78.88,96.77z"/>
+ <path class="st1" d="M142.48,89.92c1.61,0.9,2.87,2.17,3.76,3.82c0.9,1.65,1.35,3.56,1.35,5.73v18.2h-7.75v-16.52
+ c0-1.72-0.43-3.05-1.29-3.99c-0.86-0.94-2.08-1.4-3.65-1.4c-1.65,0-3.06,0.5-4.24,1.49c-1.18,0.99-1.77,2.33-1.77,4.02v16.41h-7.7
+ v-16.52c0-1.72-0.44-3.05-1.32-3.99c-0.88-0.94-2.11-1.4-3.68-1.4c-1.61,0-3.01,0.49-4.19,1.46c-1.18,0.97-1.77,2.32-1.77,4.04
+ v16.41h-7.75V89.3h6.97l0.34,3.54c0.94-1.35,2.15-2.4,3.65-3.15c1.5-0.75,3.15-1.12,4.94-1.12c1.95,0,3.7,0.43,5.25,1.29
+ c1.55,0.86,2.78,2.06,3.68,3.6c1.05-1.53,2.42-2.73,4.1-3.6c1.69-0.86,3.54-1.29,5.56-1.29C139.03,88.57,140.86,89.02,142.48,89.92
+ z"/>
+</g>
+<g>
+ <path class="st1" d="M142.52,53.35c1.61,0.9,2.87,2.17,3.76,3.82c0.9,1.65,1.35,3.56,1.35,5.73v18.2h-7.75V64.58
+ c0-1.72-0.43-3.05-1.29-3.99c-0.86-0.94-2.08-1.4-3.65-1.4c-1.65,0-3.06,0.5-4.24,1.49c-1.18,0.99-1.77,2.33-1.77,4.02V81.1h-7.7
+ V64.58c0-1.72-0.44-3.05-1.32-3.99c-0.88-0.94-2.11-1.4-3.68-1.4c-1.61,0-3.01,0.49-4.19,1.46c-1.18,0.97-1.77,2.32-1.77,4.04V81.1
+ h-7.75V52.73h6.97l0.34,3.54c0.94-1.35,2.15-2.4,3.65-3.15c1.5-0.75,3.15-1.12,4.94-1.12c1.95,0,3.7,0.43,5.25,1.29
+ c1.55,0.86,2.78,2.06,3.68,3.6c1.05-1.54,2.42-2.73,4.1-3.6c1.69-0.86,3.54-1.29,5.56-1.29C139.08,52,140.91,52.45,142.52,53.35z"
+ />
+</g>
+</svg>
diff --git a/public/icons/mml-logo.png b/public-metis/icons/logo.png Binary files differindex fa5ae11..fa5ae11 100644 --- a/public/icons/mml-logo.png +++ b/public-metis/icons/logo.png diff --git a/public/icons/res/mipmap-hdpi/ic_launcher.png b/public-metis/icons/res/mipmap-hdpi/ic_launcher.png Binary files differindex 514ad14..514ad14 100644 --- a/public/icons/res/mipmap-hdpi/ic_launcher.png +++ b/public-metis/icons/res/mipmap-hdpi/ic_launcher.png diff --git a/public/icons/res/mipmap-mdpi/ic_launcher.png b/public-metis/icons/res/mipmap-mdpi/ic_launcher.png Binary files differindex 59bab1d..59bab1d 100644 --- a/public/icons/res/mipmap-mdpi/ic_launcher.png +++ b/public-metis/icons/res/mipmap-mdpi/ic_launcher.png diff --git a/public/icons/res/mipmap-xhdpi/ic_launcher.png b/public-metis/icons/res/mipmap-xhdpi/ic_launcher.png Binary files differindex 908a6e8..908a6e8 100644 --- a/public/icons/res/mipmap-xhdpi/ic_launcher.png +++ b/public-metis/icons/res/mipmap-xhdpi/ic_launcher.png diff --git a/public/icons/res/mipmap-xxhdpi/ic_launcher.png b/public-metis/icons/res/mipmap-xxhdpi/ic_launcher.png Binary files differindex f12048f..f12048f 100644 --- a/public/icons/res/mipmap-xxhdpi/ic_launcher.png +++ b/public-metis/icons/res/mipmap-xxhdpi/ic_launcher.png diff --git a/public/icons/res/mipmap-xxxhdpi/ic_launcher.png b/public-metis/icons/res/mipmap-xxxhdpi/ic_launcher.png Binary files differindex 7a0462e..7a0462e 100644 --- a/public/icons/res/mipmap-xxxhdpi/ic_launcher.png +++ b/public-metis/icons/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/public/manifest.webmanifest b/public-metis/manifest.webmanifest index d33ee8e..dd1d03d 100644 --- a/public/manifest.webmanifest +++ b/public-metis/manifest.webmanifest @@ -4,7 +4,7 @@ "start_url": "/", "display": "standalone", "background_color": "#ececec", - "description": "Een verbeterde rooster pagina voor het metis", + "description": "De rooster pagina van het Metis Montessori Lyceum", "icons": [{ "src": "/icons/res/mipmap-mdpi/ic_launcher.png", "sizes": "48x48", diff --git a/public/mstile-150x150.png b/public-metis/mstile-150x150.png Binary files differindex 5e381e6..5e381e6 100644 --- a/public/mstile-150x150.png +++ b/public-metis/mstile-150x150.png diff --git a/public/safari-pinned-tab.svg b/public-metis/safari-pinned-tab.svg index 97ce8bf..97ce8bf 100644 --- a/public/safari-pinned-tab.svg +++ b/public-metis/safari-pinned-tab.svg 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 <strong>docentafkorting</strong>, <strong>klas</strong>, <strong>leerlingnummer</strong> of <strong>lokaalnummer</strong> 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') |