From 7e534ce00f9df4e7183fb52cc3dd97e6eaf6e22d Mon Sep 17 00:00:00 2001 From: Erik Roemmelt Date: Wed, 5 Dec 2018 19:32:36 +0100 Subject: [PATCH] move several files in folder (+ rename links); remove .eslintrc file; serviceWorker update --- .eslintrc.js | 92 ------------------------ .gitignore | 1 + public/{ => img}/favicon.ico | Bin public/{ => img}/th_nbg_ohmicon_amp.png | Bin public/index.html | 4 +- public/main.js | 39 +--------- public/message.html | 4 +- public/{ => style}/style.css | 0 public/{ => style}/style.less | 0 9 files changed, 8 insertions(+), 132 deletions(-) delete mode 100644 .eslintrc.js create mode 100644 .gitignore rename public/{ => img}/favicon.ico (100%) rename public/{ => img}/th_nbg_ohmicon_amp.png (100%) rename public/{ => style}/style.css (100%) rename public/{ => style}/style.less (100%) diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index 199da60..0000000 --- a/.eslintrc.js +++ /dev/null @@ -1,92 +0,0 @@ -module.exports = { - "rules": { - // the rules below should be sorted in a same way they are sorted on http://eslint.org/docs/rules page - // http://eslint.org/docs/rules/#possible-errors - "no-caller": 2, - "no-control-regex": 2, - "no-empty": 1, - "no-invalid-regexp": 2, - "no-regex-spaces": 2, - "no-unsafe-negation": 1, - "valid-jsdoc": 0, - "valid-typeof": 2, - // http://eslint.org/docs/rules/#best-practices - "curly": 2, - "eqeqeq": [2, "smart"], - "guard-for-in": 0, - "no-else-return": 1, - "no-fallthrough": 2, - "no-invalid-this": 1, - "no-iterator": 2, - "no-loop-func": 2, - "no-multi-str": 2, - "no-new-func": 2, - "no-new-wrappers": 2, - "no-new": 2, - "no-proto": 2, - "no-redeclare": 1, - "no-script-url": 2, - "wrap-iife": [2, "outside"], - // http://eslint.org/docs/rules/#strict-mode - "strict": 2, - // http://eslint.org/docs/rules/#variables - "no-shadow-restricted-names": 2, - "no-shadow": 1, - "no-undef": 2, - "no-unused-vars": [1, { - "vars": "all", - "args": "none" - }], - "no-use-before-define": 0, - // http://eslint.org/docs/rules/#nodejs-and-commonjs - "no-new-require": 2, - // http://eslint.org/docs/rules/#stylistic-issues - "block-spacing": 1, - "brace-style": [1, "1tbs", { - allowSingleLine: true - }], - "camelcase": 1, - "comma-dangle": 2, - "comma-spacing": 1, - "comma-style": [1, "last"], - "computed-property-spacing": 1, - "eol-last": 1, - "func-call-spacing": 1, - "indent": [1, 4], - "key-spacing": [1, { - beforeColon: false, - afterColon: true - }], - "max-len": [1, 120], - "new-cap": [0, { - "capIsNewExceptions": [ - "$.Deferred", - "$.Event", - "CodeMirror.Pos", - "Immutable.Map", - "Immutable.List", - "JSLINT" - ] - }], - "new-parens": 2, - "no-bitwise": 2, - "no-new-object": 2, - "no-trailing-spaces": 1, - "semi-spacing": 1, - "semi": 2 - }, - "globals": { - "$": false, - "brackets": false, - "clearTimeout": false, - "console": false, - "define": false, - "require": false, - "setTimeout": false, - "window": false, - "ArrayBuffer": false, - "Uint32Array": false, - "WebSocket": false, - "XMLHttpRequest": false - } -}; diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5527a01 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +# Comment no entry \ No newline at end of file diff --git a/public/favicon.ico b/public/img/favicon.ico similarity index 100% rename from public/favicon.ico rename to public/img/favicon.ico diff --git a/public/th_nbg_ohmicon_amp.png b/public/img/th_nbg_ohmicon_amp.png similarity index 100% rename from public/th_nbg_ohmicon_amp.png rename to public/img/th_nbg_ohmicon_amp.png diff --git a/public/index.html b/public/index.html index 53669a7..db1969f 100644 --- a/public/index.html +++ b/public/index.html @@ -22,7 +22,7 @@ - + @@ -38,7 +38,7 @@
- +
diff --git a/public/main.js b/public/main.js index 4364e23..485c57b 100644 --- a/public/main.js +++ b/public/main.js @@ -10,13 +10,13 @@ if ('serviceWorker' in navigator) { return navigator.serviceWorker.register('/serviceWorker.js', { scope: '/' }).then(function (registration) { - return console.log('Service worker registration succeeded: ', registration); + return console.log('[ServiceWorker] Registration succeeded: ', registration); }).catch(function (error) { - return console.log('Service worker registration failed: ', error); + return console.log('[Service worker] Registration failed: ', error); }); }); } else { - console.log('Service workers are not supported.'); + console.log('[ServiceWorker] are not supported.'); } // NOTE: Set Bootstrap materialdesign @@ -28,36 +28,3 @@ $(document).ready(function() { $('body').bootstrapMaterialDesign(); }); */ - -/* -// NOTE: Define routes -const routes = [{ - path: "/home", - component: RouterHome - }, - { - path: "/folder", - component: RouterFolder - }, - { - path: "/bookmark", - component: RouterBookmark - }, - { - path: "/profil", - component: RouterProfil - }, - { - path: "/entry/:what/:id", - component: RouterEntry - }, - { - path: "/entry/:what", - component: RouterEntry - }, - ]; - const router = new VueRouter({ - routes - }); -*/ - diff --git a/public/message.html b/public/message.html index 56c5fb9..60ffd93 100644 --- a/public/message.html +++ b/public/message.html @@ -12,7 +12,7 @@ - + oma @@ -20,7 +20,7 @@
- +
diff --git a/public/style.css b/public/style/style.css similarity index 100% rename from public/style.css rename to public/style/style.css diff --git a/public/style.less b/public/style/style.less similarity index 100% rename from public/style.less rename to public/style/style.less