diff options
| -rw-r--r-- | .babelrc | 3 | ||||
| -rw-r--r-- | .bowerrc | 3 | ||||
| -rw-r--r-- | .eslintrc.js | 4 | ||||
| -rw-r--r-- | bower.json | 22 | ||||
| -rw-r--r-- | package.json | 6 | ||||
| -rw-r--r-- | src/client/static/icons/apple-touch-icon.png (renamed from src/client/static/apple-touch-icon.png) | bin | 6447 -> 6447 bytes | |||
| -rw-r--r-- | src/client/static/icons/favicon-16x16.png (renamed from src/client/static/favicon-16x16.png) | bin | 1293 -> 1293 bytes | |||
| -rw-r--r-- | src/client/static/icons/favicon-32x32.png (renamed from src/client/static/favicon-32x32.png) | bin | 2103 -> 2103 bytes | |||
| -rw-r--r-- | src/client/static/icons/safari-pinned-tab.svg (renamed from src/client/static/safari-pinned-tab.svg) | 0 | ||||
| -rw-r--r-- | src/client/static/manifest.beta.webmanifest | 29 | ||||
| -rw-r--r-- | src/client/static/manifest.json (renamed from src/client/static/manifest.webmanifest) | 0 | ||||
| -rw-r--r-- | src/client/static/sw.js | 29 | ||||
| -rw-r--r-- | src/client/static/untisinfo.css | 11 | ||||
| -rw-r--r-- | src/client/views/partials/head.handlebars | 10 | ||||
| -rw-r--r-- | webpack.config.js | 2 |
15 files changed, 11 insertions, 108 deletions
diff --git a/.babelrc b/.babelrc deleted file mode 100644 index 27b5c0d..0000000 --- a/.babelrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "presets": ["es2015", "react", "stage-2"] -} diff --git a/.bowerrc b/.bowerrc deleted file mode 100644 index c7c43d3..0000000 --- a/.bowerrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "directory" : "src/client/static/components" -} diff --git a/.eslintrc.js b/.eslintrc.js index da38fd5..9944cf8 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -7,10 +7,8 @@ module.exports = { "jest": true, }, "rules": { - "strict": "off", - "react/jsx-filename-extension": ["error", { "extensions": [".js"] }], + "react/jsx-filename-extension": "off", "no-underscore-dangle": ["error", { "allow": ["_test"] }], - "class-methods-use-this": "off", "no-prototype-builtins": "off", "react/forbid-prop-types": "off", "react/prefer-stateless-function": "off", diff --git a/bower.json b/bower.json deleted file mode 100644 index 0e80221..0000000 --- a/bower.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "rooster", - "description": "", - "main": "app.js", - "authors": [ - "Noah Loomans <noahloomans@gmail.com>" - ], - "license": "MIT", - "homepage": "https://github.com/nloomans/rooster-mml", - "private": true, - "ignore": [ - "**/.*", - "node_modules", - "public/components", - "test", - "tests" - ], - "dependencies": { - "sw-toolbox": "^3.3.0", - "material-design-lite": "^1.3.0" - } -} diff --git a/package.json b/package.json index 931aa31..2459fe7 100644 --- a/package.json +++ b/package.json @@ -8,11 +8,13 @@ "build": "webpack -p", "build:dev": "webpack -wd", "test": "jest", - "test:dev": "jest --watch" + "test:dev": "jest --watch", + "lint": "eslint . --ignore-pattern src/client/static --ignore-pattern node_modules", + "lint:fix": "eslint . --ignore-pattern src/client/static --ignore-pattern node_modules --fix" }, "jest": { "transform": { - "^.+\\.jsx?$": "babel-jest" + "^.+\\.js$": "babel-jest" } }, "dependencies": { diff --git a/src/client/static/apple-touch-icon.png b/src/client/static/icons/apple-touch-icon.png Binary files differindex 5adfc69..5adfc69 100644 --- a/src/client/static/apple-touch-icon.png +++ b/src/client/static/icons/apple-touch-icon.png diff --git a/src/client/static/favicon-16x16.png b/src/client/static/icons/favicon-16x16.png Binary files differindex 1df47d3..1df47d3 100644 --- a/src/client/static/favicon-16x16.png +++ b/src/client/static/icons/favicon-16x16.png diff --git a/src/client/static/favicon-32x32.png b/src/client/static/icons/favicon-32x32.png Binary files differindex 36cd5da..36cd5da 100644 --- a/src/client/static/favicon-32x32.png +++ b/src/client/static/icons/favicon-32x32.png diff --git a/src/client/static/safari-pinned-tab.svg b/src/client/static/icons/safari-pinned-tab.svg index 97ce8bf..97ce8bf 100644 --- a/src/client/static/safari-pinned-tab.svg +++ b/src/client/static/icons/safari-pinned-tab.svg diff --git a/src/client/static/manifest.beta.webmanifest b/src/client/static/manifest.beta.webmanifest deleted file mode 100644 index a1fdd92..0000000 --- a/src/client/static/manifest.beta.webmanifest +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name": "BETA Metis Rooster", - "short_name": "BETA 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/src/client/static/manifest.webmanifest b/src/client/static/manifest.json index d33ee8e..d33ee8e 100644 --- a/src/client/static/manifest.webmanifest +++ b/src/client/static/manifest.json diff --git a/src/client/static/sw.js b/src/client/static/sw.js deleted file mode 100644 index bd43805..0000000 --- a/src/client/static/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/src/client/static/untisinfo.css b/src/client/static/untisinfo.css deleted file mode 100644 index d74a7aa..0000000 --- a/src/client/static/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/src/client/views/partials/head.handlebars b/src/client/views/partials/head.handlebars index 9801a95..9cf4023 100644 --- a/src/client/views/partials/head.handlebars +++ b/src/client/views/partials/head.handlebars @@ -23,8 +23,8 @@ <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"> -<link rel="manifest" href="/manifest.webmanifest"> -<link rel="apple-touch-icon" sizes="120x120" href="/apple-touch-icon.png"> -<link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"> -<link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"> -<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#f44336"> +<link rel="manifest" href="/manifest.json"> +<link rel="apple-touch-icon" sizes="120x120" href="/icons/apple-touch-icon.png"> +<link rel="icon" type="image/png" href="/icons/favicon-32x32.png" sizes="32x32"> +<link rel="icon" type="image/png" href="/icons/favicon-16x16.png" sizes="16x16"> +<link rel="mask-icon" href="/icons/safari-pinned-tab.svg" color="#f44336"> diff --git a/webpack.config.js b/webpack.config.js index 1c37a6b..463e3ce 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -28,6 +28,6 @@ module.exports = { plugins: [ // Only load the dutch local for moment.js // https://stackoverflow.com/questions/25384360/how-to-prevent-moment-js-from-loading-locales-with-webpack#25426019 - new webpack.ContextReplacementPlugin(/moment[\/\\]locale$/, /nl/), + new webpack.ContextReplacementPlugin(/moment[/\\]locale$/, /nl/), ], }; |
