From 9a617e85ae4c632bf12f32e59da519b676216004 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Fri, 23 Mar 2018 19:33:08 +0100 Subject: Project cleanup --- .babelrc | 3 --- .bowerrc | 3 --- .eslintrc.js | 4 +-- bower.json | 22 ----------------- package.json | 6 +++-- src/client/static/apple-touch-icon.png | Bin 6447 -> 0 bytes src/client/static/favicon-16x16.png | Bin 1293 -> 0 bytes src/client/static/favicon-32x32.png | Bin 2103 -> 0 bytes src/client/static/icons/apple-touch-icon.png | Bin 0 -> 6447 bytes src/client/static/icons/favicon-16x16.png | Bin 0 -> 1293 bytes src/client/static/icons/favicon-32x32.png | Bin 0 -> 2103 bytes src/client/static/icons/safari-pinned-tab.svg | 34 ++++++++++++++++++++++++++ src/client/static/manifest.beta.webmanifest | 29 ---------------------- src/client/static/manifest.json | 29 ++++++++++++++++++++++ src/client/static/manifest.webmanifest | 29 ---------------------- src/client/static/safari-pinned-tab.svg | 34 -------------------------- src/client/static/sw.js | 29 ---------------------- src/client/static/untisinfo.css | 11 --------- src/client/views/partials/head.handlebars | 10 ++++---- webpack.config.js | 2 +- 20 files changed, 74 insertions(+), 171 deletions(-) delete mode 100644 .babelrc delete mode 100644 .bowerrc delete mode 100644 bower.json delete mode 100644 src/client/static/apple-touch-icon.png delete mode 100644 src/client/static/favicon-16x16.png delete mode 100644 src/client/static/favicon-32x32.png create mode 100644 src/client/static/icons/apple-touch-icon.png create mode 100644 src/client/static/icons/favicon-16x16.png create mode 100644 src/client/static/icons/favicon-32x32.png create mode 100644 src/client/static/icons/safari-pinned-tab.svg delete mode 100644 src/client/static/manifest.beta.webmanifest create mode 100644 src/client/static/manifest.json delete mode 100644 src/client/static/manifest.webmanifest delete mode 100644 src/client/static/safari-pinned-tab.svg delete mode 100644 src/client/static/sw.js delete mode 100644 src/client/static/untisinfo.css 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 " - ], - "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/apple-touch-icon.png deleted file mode 100644 index 5adfc69..0000000 Binary files a/src/client/static/apple-touch-icon.png and /dev/null differ diff --git a/src/client/static/favicon-16x16.png b/src/client/static/favicon-16x16.png deleted file mode 100644 index 1df47d3..0000000 Binary files a/src/client/static/favicon-16x16.png and /dev/null differ diff --git a/src/client/static/favicon-32x32.png b/src/client/static/favicon-32x32.png deleted file mode 100644 index 36cd5da..0000000 Binary files a/src/client/static/favicon-32x32.png and /dev/null differ diff --git a/src/client/static/icons/apple-touch-icon.png b/src/client/static/icons/apple-touch-icon.png new file mode 100644 index 0000000..5adfc69 Binary files /dev/null and b/src/client/static/icons/apple-touch-icon.png differ diff --git a/src/client/static/icons/favicon-16x16.png b/src/client/static/icons/favicon-16x16.png new file mode 100644 index 0000000..1df47d3 Binary files /dev/null and b/src/client/static/icons/favicon-16x16.png differ diff --git a/src/client/static/icons/favicon-32x32.png b/src/client/static/icons/favicon-32x32.png new file mode 100644 index 0000000..36cd5da Binary files /dev/null and b/src/client/static/icons/favicon-32x32.png differ diff --git a/src/client/static/icons/safari-pinned-tab.svg b/src/client/static/icons/safari-pinned-tab.svg new file mode 100644 index 0000000..97ce8bf --- /dev/null +++ b/src/client/static/icons/safari-pinned-tab.svg @@ -0,0 +1,34 @@ + + + + +Created by potrace 1.11, written by Peter Selinger 2001-2013 + + + + + + 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.json b/src/client/static/manifest.json new file mode 100644 index 0000000..d33ee8e --- /dev/null +++ b/src/client/static/manifest.json @@ -0,0 +1,29 @@ +{ + "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/src/client/static/manifest.webmanifest b/src/client/static/manifest.webmanifest deleted file mode 100644 index d33ee8e..0000000 --- a/src/client/static/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/src/client/static/safari-pinned-tab.svg b/src/client/static/safari-pinned-tab.svg deleted file mode 100644 index 97ce8bf..0000000 --- a/src/client/static/safari-pinned-tab.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - - -Created by potrace 1.11, written by Peter Selinger 2001-2013 - - - - - - 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 @@ - - - - - + + + + + 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/), ], }; -- cgit v1.1