From f9923b781307bdefc7818a4693e82214758d34df Mon Sep 17 00:00:00 2001 From: Mark van Renswoude Date: Tue, 3 Apr 2018 23:28:43 +0200 Subject: [PATCH] More admin login preparation --- index.js | 1 + package-lock.json | 991 ++++++++++++++----------------- package.json | 2 +- public/dist/custom.css | 1 + public/src/App.vue | 15 - public/src/app.js | 16 + public/src/index.html | 2 + public/src/lang.js | 20 + public/src/route/Code.vue | 2 +- public/src/route/Landing.vue | 2 +- public/src/route/admin/Login.vue | 69 ++- 11 files changed, 560 insertions(+), 561 deletions(-) create mode 100644 public/dist/custom.css diff --git a/index.js b/index.js index 503223f..c66fa47 100644 --- a/index.js +++ b/index.js @@ -59,6 +59,7 @@ const webpackConfig = require('./webpack.config.js'); app.use(webpackHotMiddleware(compiler)); } + app.use(express.static(path.join(__dirname, 'custom'))); app.use(express.static(path.join(__dirname, 'public', 'dist'))); diff --git a/package-lock.json b/package-lock.json index f3bba0d..d78eef3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4278,7 +4278,8 @@ "jsbn": { "version": "0.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "json-schema": { "version": "0.2.3", @@ -7862,9 +7863,9 @@ } }, "npm": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/npm/-/npm-5.7.1.tgz", - "integrity": "sha512-r1grvv6mcEt+nlMzMWPc5n/z5q8NNuBWj0TGFp1PBSFCl6ubnAoUGBsucYsnZYT7MOJn0ha1ptEjmdBoAdJ+SA==", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/npm/-/npm-5.8.0.tgz", + "integrity": "sha512-DowXzQwtSWDtbAjuWecuEiismR0VdNEYaL3VxNTYTdW6AGkYxfGk9LUZ/rt6etEyiH4IEk95HkJeGfXE5Rz9xQ==", "requires": { "JSONStream": "1.3.2", "abbrev": "1.1.1", @@ -7884,6 +7885,7 @@ "config-chain": "1.1.11", "debuglog": "1.0.1", "detect-indent": "5.0.0", + "detect-newline": "2.1.0", "dezalgo": "1.0.3", "editor": "1.0.0", "find-npm-prefix": "1.0.2", @@ -7893,17 +7895,18 @@ "glob": "7.1.2", "graceful-fs": "4.1.11", "has-unicode": "2.0.1", - "hosted-git-info": "2.5.0", + "hosted-git-info": "2.6.0", "iferr": "0.1.5", "imurmurhash": "0.1.4", "inflight": "1.0.6", "inherits": "2.0.3", "ini": "1.3.5", - "init-package-json": "1.10.1", + "init-package-json": "1.10.3", "is-cidr": "1.0.0", + "json-parse-better-errors": "1.0.1", "lazy-property": "1.0.0", - "libcipm": "1.3.3", - "libnpx": "9.7.1", + "libcipm": "1.6.0", + "libnpx": "10.0.1", "lockfile": "1.0.3", "lodash._baseindexof": "3.1.0", "lodash._baseuniq": "4.6.0", @@ -7918,24 +7921,24 @@ "lodash.without": "4.4.0", "lru-cache": "4.1.1", "meant": "1.0.1", - "mississippi": "2.0.0", + "mississippi": "3.0.0", "mkdirp": "0.5.1", "move-concurrently": "1.0.1", "nopt": "4.0.1", "normalize-package-data": "2.4.0", "npm-cache-filename": "1.0.2", "npm-install-checks": "3.0.0", - "npm-lifecycle": "2.0.0", + "npm-lifecycle": "2.0.1", "npm-package-arg": "6.0.0", "npm-packlist": "1.1.10", "npm-profile": "3.0.1", - "npm-registry-client": "8.5.0", + "npm-registry-client": "8.5.1", "npm-user-validate": "1.0.0", "npmlog": "4.1.2", "once": "1.4.0", "opener": "1.4.3", "osenv": "0.1.5", - "pacote": "7.3.3", + "pacote": "7.6.1", "path-is-inside": "1.0.2", "promise-inflight": "1.0.1", "qrcode-terminal": "0.11.0", @@ -7944,9 +7947,9 @@ "read": "1.0.7", "read-cmd-shim": "1.0.1", "read-installed": "4.0.3", - "read-package-json": "2.0.12", + "read-package-json": "2.0.13", "read-package-tree": "5.1.6", - "readable-stream": "2.3.4", + "readable-stream": "2.3.5", "readdir-scoped-modules": "1.0.2", "request": "2.83.0", "retry": "0.10.1", @@ -7959,7 +7962,7 @@ "sorted-union-stream": "2.1.3", "ssri": "5.2.4", "strip-ansi": "4.0.0", - "tar": "4.3.3", + "tar": "4.4.0", "text-table": "0.2.0", "uid-number": "0.0.6", "umask": "1.1.0", @@ -7970,9 +7973,9 @@ "validate-npm-package-license": "3.0.1", "validate-npm-package-name": "3.0.0", "which": "1.3.0", - "worker-farm": "1.5.2", + "worker-farm": "1.5.4", "wrappy": "1.0.2", - "write-file-atomic": "2.1.0" + "write-file-atomic": "2.3.0" }, "dependencies": { "JSONStream": { @@ -8052,6 +8055,138 @@ "y18n": "4.0.0" }, "dependencies": { + "mississippi": { + "version": "2.0.0", + "bundled": true, + "requires": { + "concat-stream": "1.6.1", + "duplexify": "3.5.4", + "end-of-stream": "1.4.1", + "flush-write-stream": "1.0.2", + "from2": "2.3.0", + "parallel-transform": "1.1.0", + "pump": "2.0.1", + "pumpify": "1.4.0", + "stream-each": "1.2.2", + "through2": "2.0.3" + }, + "dependencies": { + "concat-stream": { + "version": "1.6.1", + "bundled": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.3.5", + "typedarray": "0.0.6" + }, + "dependencies": { + "typedarray": { + "version": "0.0.6", + "bundled": true + } + } + }, + "duplexify": { + "version": "3.5.4", + "bundled": true, + "requires": { + "end-of-stream": "1.4.1", + "inherits": "2.0.3", + "readable-stream": "2.3.5", + "stream-shift": "1.0.0" + }, + "dependencies": { + "stream-shift": { + "version": "1.0.0", + "bundled": true + } + } + }, + "end-of-stream": { + "version": "1.4.1", + "bundled": true, + "requires": { + "once": "1.4.0" + } + }, + "flush-write-stream": { + "version": "1.0.2", + "bundled": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.3.5" + } + }, + "from2": { + "version": "2.3.0", + "bundled": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.3.5" + } + }, + "parallel-transform": { + "version": "1.1.0", + "bundled": true, + "requires": { + "cyclist": "0.2.2", + "inherits": "2.0.3", + "readable-stream": "2.3.5" + }, + "dependencies": { + "cyclist": { + "version": "0.2.2", + "bundled": true + } + } + }, + "pump": { + "version": "2.0.1", + "bundled": true, + "requires": { + "end-of-stream": "1.4.1", + "once": "1.4.0" + } + }, + "pumpify": { + "version": "1.4.0", + "bundled": true, + "requires": { + "duplexify": "3.5.4", + "inherits": "2.0.3", + "pump": "2.0.1" + } + }, + "stream-each": { + "version": "1.2.2", + "bundled": true, + "requires": { + "end-of-stream": "1.4.1", + "stream-shift": "1.0.0" + }, + "dependencies": { + "stream-shift": { + "version": "1.0.0", + "bundled": true + } + } + }, + "through2": { + "version": "2.0.3", + "bundled": true, + "requires": { + "readable-stream": "2.3.5", + "xtend": "4.0.1" + }, + "dependencies": { + "xtend": { + "version": "4.0.1", + "bundled": true + } + } + } + } + }, "y18n": { "version": "4.0.0", "bundled": true @@ -8202,6 +8337,10 @@ "version": "5.0.0", "bundled": true }, + "detect-newline": { + "version": "2.1.0", + "bundled": true + }, "dezalgo": { "version": "1.0.3", "bundled": true, @@ -8240,7 +8379,7 @@ "graceful-fs": "4.1.11", "iferr": "0.1.5", "imurmurhash": "0.1.4", - "readable-stream": "2.3.4" + "readable-stream": "2.3.5" } }, "gentle-fs": { @@ -8315,7 +8454,7 @@ "bundled": true }, "hosted-git-info": { - "version": "2.5.0", + "version": "2.6.0", "bundled": true }, "iferr": { @@ -8343,29 +8482,19 @@ "bundled": true }, "init-package-json": { - "version": "1.10.1", + "version": "1.10.3", "bundled": true, "requires": { "glob": "7.1.2", - "npm-package-arg": "5.1.2", + "npm-package-arg": "6.0.0", "promzard": "0.3.0", "read": "1.0.7", - "read-package-json": "2.0.12", + "read-package-json": "2.0.13", "semver": "5.5.0", "validate-npm-package-license": "3.0.1", "validate-npm-package-name": "3.0.0" }, "dependencies": { - "npm-package-arg": { - "version": "5.1.2", - "bundled": true, - "requires": { - "hosted-git-info": "2.5.0", - "osenv": "0.1.5", - "semver": "5.5.0", - "validate-npm-package-name": "3.0.0" - } - }, "promzard": { "version": "0.3.0", "bundled": true, @@ -8388,12 +8517,16 @@ } } }, + "json-parse-better-errors": { + "version": "1.0.1", + "bundled": true + }, "lazy-property": { "version": "1.0.0", "bundled": true }, "libcipm": { - "version": "1.3.3", + "version": "1.6.0", "bundled": true, "requires": { "bin-links": "1.1.0", @@ -8401,20 +8534,16 @@ "find-npm-prefix": "1.0.2", "graceful-fs": "4.1.11", "lock-verify": "2.0.0", - "npm-lifecycle": "2.0.0", + "npm-lifecycle": "2.0.1", "npm-logical-tree": "1.2.1", "npm-package-arg": "6.0.0", - "pacote": "7.3.3", + "pacote": "7.6.1", "protoduck": "5.0.0", - "read-package-json": "2.0.12", + "read-package-json": "2.0.13", "rimraf": "2.6.2", - "worker-farm": "1.5.2" + "worker-farm": "1.5.4" }, "dependencies": { - "find-npm-prefix": { - "version": "1.0.2", - "bundled": true - }, "lock-verify": { "version": "2.0.0", "bundled": true, @@ -8427,7 +8556,7 @@ "version": "5.1.2", "bundled": true, "requires": { - "hosted-git-info": "2.5.0", + "hosted-git-info": "2.6.0", "osenv": "0.1.5", "semver": "5.5.0", "validate-npm-package-name": "3.0.0" @@ -8453,7 +8582,7 @@ } }, "worker-farm": { - "version": "1.5.2", + "version": "1.5.4", "bundled": true, "requires": { "errno": "0.1.7", @@ -8482,116 +8611,103 @@ } }, "libnpx": { - "version": "9.7.1", + "version": "10.0.1", "bundled": true, "requires": { - "dotenv": "4.0.0", - "npm-package-arg": "5.1.2", + "dotenv": "5.0.1", + "npm-package-arg": "6.0.0", "rimraf": "2.6.2", "safe-buffer": "5.1.1", "update-notifier": "2.3.0", "which": "1.3.0", - "y18n": "3.2.1", - "yargs": "8.0.2" + "y18n": "4.0.0", + "yargs": "11.0.0" }, "dependencies": { "dotenv": { + "version": "5.0.1", + "bundled": true + }, + "y18n": { "version": "4.0.0", "bundled": true }, - "npm-package-arg": { - "version": "5.1.2", - "bundled": true, - "requires": { - "hosted-git-info": "2.5.0", - "osenv": "0.1.5", - "semver": "5.5.0", - "validate-npm-package-name": "3.0.0" - } - }, - "y18n": { - "version": "3.2.1", - "bundled": true - }, "yargs": { - "version": "8.0.2", + "version": "11.0.0", "bundled": true, "requires": { - "camelcase": "4.1.0", - "cliui": "3.2.0", + "cliui": "4.0.0", "decamelize": "1.2.0", + "find-up": "2.1.0", "get-caller-file": "1.0.2", "os-locale": "2.1.0", - "read-pkg-up": "2.0.0", "require-directory": "2.1.1", "require-main-filename": "1.0.1", "set-blocking": "2.0.0", "string-width": "2.1.1", "which-module": "2.0.0", "y18n": "3.2.1", - "yargs-parser": "7.0.0" + "yargs-parser": "9.0.2" }, "dependencies": { - "camelcase": { - "version": "4.1.0", - "bundled": true - }, "cliui": { - "version": "3.2.0", + "version": "4.0.0", "bundled": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", + "string-width": "2.1.1", + "strip-ansi": "4.0.0", "wrap-ansi": "2.1.0" }, "dependencies": { - "string-width": { - "version": "1.0.2", - "bundled": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - }, - "dependencies": { - "code-point-at": { - "version": "1.1.0", - "bundled": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "requires": { - "number-is-nan": "1.0.1" - }, - "dependencies": { - "number-is-nan": { - "version": "1.0.1", - "bundled": true - } - } - } - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "requires": { - "ansi-regex": "2.1.1" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "bundled": true - } - } - }, "wrap-ansi": { "version": "2.1.0", "bundled": true, "requires": { "string-width": "1.0.2", "strip-ansi": "3.0.1" + }, + "dependencies": { + "string-width": { + "version": "1.0.2", + "bundled": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + }, + "dependencies": { + "code-point-at": { + "version": "1.1.0", + "bundled": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "requires": { + "number-is-nan": "1.0.1" + }, + "dependencies": { + "number-is-nan": { + "version": "1.0.1", + "bundled": true + } + } + } + } + }, + "strip-ansi": { + "version": "3.0.1", + "bundled": true, + "requires": { + "ansi-regex": "2.1.1" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "bundled": true + } + } + } } } } @@ -8600,6 +8716,51 @@ "version": "1.2.0", "bundled": true }, + "find-up": { + "version": "2.1.0", + "bundled": true, + "requires": { + "locate-path": "2.0.0" + }, + "dependencies": { + "locate-path": { + "version": "2.0.0", + "bundled": true, + "requires": { + "p-locate": "2.0.0", + "path-exists": "3.0.0" + }, + "dependencies": { + "p-locate": { + "version": "2.0.0", + "bundled": true, + "requires": { + "p-limit": "1.2.0" + }, + "dependencies": { + "p-limit": { + "version": "1.2.0", + "bundled": true, + "requires": { + "p-try": "1.0.0" + }, + "dependencies": { + "p-try": { + "version": "1.0.0", + "bundled": true + } + } + } + } + }, + "path-exists": { + "version": "3.0.0", + "bundled": true + } + } + } + } + }, "get-caller-file": { "version": "1.0.2", "bundled": true @@ -8702,129 +8863,17 @@ "version": "1.1.0", "bundled": true, "requires": { - "mimic-fn": "1.1.0" + "mimic-fn": "1.2.0" }, "dependencies": { "mimic-fn": { - "version": "1.1.0", + "version": "1.2.0", "bundled": true } } } } }, - "read-pkg-up": { - "version": "2.0.0", - "bundled": true, - "requires": { - "find-up": "2.1.0", - "read-pkg": "2.0.0" - }, - "dependencies": { - "find-up": { - "version": "2.1.0", - "bundled": true, - "requires": { - "locate-path": "2.0.0" - }, - "dependencies": { - "locate-path": { - "version": "2.0.0", - "bundled": true, - "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" - }, - "dependencies": { - "p-locate": { - "version": "2.0.0", - "bundled": true, - "requires": { - "p-limit": "1.1.0" - }, - "dependencies": { - "p-limit": { - "version": "1.1.0", - "bundled": true - } - } - }, - "path-exists": { - "version": "3.0.0", - "bundled": true - } - } - } - } - }, - "read-pkg": { - "version": "2.0.0", - "bundled": true, - "requires": { - "load-json-file": "2.0.0", - "normalize-package-data": "2.4.0", - "path-type": "2.0.0" - }, - "dependencies": { - "load-json-file": { - "version": "2.0.0", - "bundled": true, - "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "strip-bom": "3.0.0" - }, - "dependencies": { - "parse-json": { - "version": "2.2.0", - "bundled": true, - "requires": { - "error-ex": "1.3.1" - }, - "dependencies": { - "error-ex": { - "version": "1.3.1", - "bundled": true, - "requires": { - "is-arrayish": "0.2.1" - }, - "dependencies": { - "is-arrayish": { - "version": "0.2.1", - "bundled": true - } - } - } - } - }, - "pify": { - "version": "2.3.0", - "bundled": true - }, - "strip-bom": { - "version": "3.0.0", - "bundled": true - } - } - }, - "path-type": { - "version": "2.0.0", - "bundled": true, - "requires": { - "pify": "2.3.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "bundled": true - } - } - } - } - } - } - }, "require-directory": { "version": "2.1.1", "bundled": true @@ -8855,11 +8904,21 @@ "version": "2.0.0", "bundled": true }, + "y18n": { + "version": "3.2.1", + "bundled": true + }, "yargs-parser": { - "version": "7.0.0", + "version": "9.0.2", "bundled": true, "requires": { "camelcase": "4.1.0" + }, + "dependencies": { + "camelcase": { + "version": "4.1.0", + "bundled": true + } } } } @@ -8954,27 +9013,27 @@ "bundled": true }, "mississippi": { - "version": "2.0.0", + "version": "3.0.0", "bundled": true, "requires": { - "concat-stream": "1.6.0", - "duplexify": "3.5.3", + "concat-stream": "1.6.1", + "duplexify": "3.5.4", "end-of-stream": "1.4.1", "flush-write-stream": "1.0.2", "from2": "2.3.0", "parallel-transform": "1.1.0", - "pump": "2.0.1", + "pump": "3.0.0", "pumpify": "1.4.0", "stream-each": "1.2.2", "through2": "2.0.3" }, "dependencies": { "concat-stream": { - "version": "1.6.0", + "version": "1.6.1", "bundled": true, "requires": { "inherits": "2.0.3", - "readable-stream": "2.3.4", + "readable-stream": "2.3.5", "typedarray": "0.0.6" }, "dependencies": { @@ -8985,12 +9044,12 @@ } }, "duplexify": { - "version": "3.5.3", + "version": "3.5.4", "bundled": true, "requires": { "end-of-stream": "1.4.1", "inherits": "2.0.3", - "readable-stream": "2.3.4", + "readable-stream": "2.3.5", "stream-shift": "1.0.0" }, "dependencies": { @@ -9012,7 +9071,7 @@ "bundled": true, "requires": { "inherits": "2.0.3", - "readable-stream": "2.3.4" + "readable-stream": "2.3.5" } }, "from2": { @@ -9020,7 +9079,7 @@ "bundled": true, "requires": { "inherits": "2.0.3", - "readable-stream": "2.3.4" + "readable-stream": "2.3.5" } }, "parallel-transform": { @@ -9029,7 +9088,7 @@ "requires": { "cyclist": "0.2.2", "inherits": "2.0.3", - "readable-stream": "2.3.4" + "readable-stream": "2.3.5" }, "dependencies": { "cyclist": { @@ -9039,7 +9098,7 @@ } }, "pump": { - "version": "2.0.1", + "version": "3.0.0", "bundled": true, "requires": { "end-of-stream": "1.4.1", @@ -9050,9 +9109,19 @@ "version": "1.4.0", "bundled": true, "requires": { - "duplexify": "3.5.3", + "duplexify": "3.5.4", "inherits": "2.0.3", "pump": "2.0.1" + }, + "dependencies": { + "pump": { + "version": "2.0.1", + "bundled": true, + "requires": { + "end-of-stream": "1.4.1", + "once": "1.4.0" + } + } } }, "stream-each": { @@ -9073,7 +9142,7 @@ "version": "2.0.3", "bundled": true, "requires": { - "readable-stream": "2.3.4", + "readable-stream": "2.3.5", "xtend": "4.0.1" }, "dependencies": { @@ -9131,93 +9200,6 @@ } } }, - "node-gyp": { - "version": "3.6.2", - "bundled": true, - "requires": { - "fstream": "1.0.11", - "glob": "7.1.2", - "graceful-fs": "4.1.11", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "nopt": "3.0.6", - "npmlog": "4.1.2", - "osenv": "0.1.5", - "request": "2.83.0", - "rimraf": "2.6.2", - "semver": "5.3.0", - "tar": "2.2.1", - "which": "1.3.0" - }, - "dependencies": { - "fstream": { - "version": "1.0.11", - "bundled": true, - "requires": { - "graceful-fs": "4.1.11", - "inherits": "2.0.3", - "mkdirp": "0.5.1", - "rimraf": "2.6.2" - } - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "requires": { - "brace-expansion": "1.1.8" - }, - "dependencies": { - "brace-expansion": { - "version": "1.1.8", - "bundled": true, - "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" - }, - "dependencies": { - "balanced-match": { - "version": "1.0.0", - "bundled": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true - } - } - } - } - }, - "nopt": { - "version": "3.0.6", - "bundled": true, - "requires": { - "abbrev": "1.1.1" - } - }, - "semver": { - "version": "5.3.0", - "bundled": true - }, - "tar": { - "version": "2.2.1", - "bundled": true, - "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" - }, - "dependencies": { - "block-stream": { - "version": "0.0.9", - "bundled": true, - "requires": { - "inherits": "2.0.3" - } - } - } - } - } - }, "nopt": { "version": "4.0.1", "bundled": true, @@ -9230,7 +9212,7 @@ "version": "2.4.0", "bundled": true, "requires": { - "hosted-git-info": "2.5.0", + "hosted-git-info": "2.6.0", "is-builtin-module": "1.0.0", "semver": "5.5.0", "validate-npm-package-license": "3.0.1" @@ -9263,7 +9245,7 @@ } }, "npm-lifecycle": { - "version": "2.0.0", + "version": "2.0.1", "bundled": true, "requires": { "byline": "5.0.0", @@ -9280,6 +9262,93 @@ "version": "5.0.0", "bundled": true }, + "node-gyp": { + "version": "3.6.2", + "bundled": true, + "requires": { + "fstream": "1.0.11", + "glob": "7.1.2", + "graceful-fs": "4.1.11", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "nopt": "3.0.6", + "npmlog": "4.1.2", + "osenv": "0.1.5", + "request": "2.83.0", + "rimraf": "2.6.2", + "semver": "5.3.0", + "tar": "2.2.1", + "which": "1.3.0" + }, + "dependencies": { + "fstream": { + "version": "1.0.11", + "bundled": true, + "requires": { + "graceful-fs": "4.1.11", + "inherits": "2.0.3", + "mkdirp": "0.5.1", + "rimraf": "2.6.2" + } + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "requires": { + "brace-expansion": "1.1.11" + }, + "dependencies": { + "brace-expansion": { + "version": "1.1.11", + "bundled": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + }, + "dependencies": { + "balanced-match": { + "version": "1.0.0", + "bundled": true + }, + "concat-map": { + "version": "0.0.1", + "bundled": true + } + } + } + } + }, + "nopt": { + "version": "3.0.6", + "bundled": true, + "requires": { + "abbrev": "1.1.1" + } + }, + "semver": { + "version": "5.3.0", + "bundled": true + }, + "tar": { + "version": "2.2.1", + "bundled": true, + "requires": { + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" + }, + "dependencies": { + "block-stream": { + "version": "0.0.9", + "bundled": true, + "requires": { + "inherits": "2.0.3" + } + } + } + } + } + }, "resolve-from": { "version": "4.0.0", "bundled": true @@ -9290,7 +9359,7 @@ "version": "6.0.0", "bundled": true, "requires": { - "hosted-git-info": "2.5.0", + "hosted-git-info": "2.6.0", "osenv": "0.1.5", "semver": "5.5.0", "validate-npm-package-name": "3.0.0" @@ -9508,7 +9577,7 @@ "bundled": true, "requires": { "inherits": "2.0.3", - "readable-stream": "2.3.4", + "readable-stream": "2.3.5", "typedarray": "0.0.6" }, "dependencies": { @@ -9524,7 +9593,7 @@ "requires": { "end-of-stream": "1.4.1", "inherits": "2.0.3", - "readable-stream": "2.3.4", + "readable-stream": "2.3.5", "stream-shift": "1.0.0" }, "dependencies": { @@ -9546,7 +9615,7 @@ "bundled": true, "requires": { "inherits": "2.0.3", - "readable-stream": "2.3.4" + "readable-stream": "2.3.5" } }, "from2": { @@ -9554,7 +9623,7 @@ "bundled": true, "requires": { "inherits": "2.0.3", - "readable-stream": "2.3.4" + "readable-stream": "2.3.5" } }, "parallel-transform": { @@ -9563,7 +9632,7 @@ "requires": { "cyclist": "0.2.2", "inherits": "2.0.3", - "readable-stream": "2.3.4" + "readable-stream": "2.3.5" }, "dependencies": { "cyclist": { @@ -9617,7 +9686,7 @@ "version": "2.0.3", "bundled": true, "requires": { - "readable-stream": "2.3.4", + "readable-stream": "2.3.5", "xtend": "4.0.1" }, "dependencies": { @@ -9726,28 +9795,29 @@ } }, "npm-registry-client": { - "version": "8.5.0", + "version": "8.5.1", "bundled": true, "requires": { - "concat-stream": "1.6.0", + "concat-stream": "1.6.1", "graceful-fs": "4.1.11", "normalize-package-data": "2.4.0", - "npm-package-arg": "5.1.2", + "npm-package-arg": "6.0.0", "npmlog": "4.1.2", "once": "1.4.0", "request": "2.83.0", "retry": "0.10.1", + "safe-buffer": "5.1.1", "semver": "5.5.0", "slide": "1.1.6", - "ssri": "4.1.6" + "ssri": "5.2.4" }, "dependencies": { "concat-stream": { - "version": "1.6.0", + "version": "1.6.1", "bundled": true, "requires": { "inherits": "2.0.3", - "readable-stream": "2.3.4", + "readable-stream": "2.3.5", "typedarray": "0.0.6" }, "dependencies": { @@ -9756,23 +9826,6 @@ "bundled": true } } - }, - "npm-package-arg": { - "version": "5.1.2", - "bundled": true, - "requires": { - "hosted-git-info": "2.5.0", - "osenv": "0.1.5", - "semver": "5.5.0", - "validate-npm-package-name": "3.0.0" - } - }, - "ssri": { - "version": "4.1.6", - "bundled": true, - "requires": { - "safe-buffer": "5.1.1" - } } } }, @@ -9795,7 +9848,7 @@ "bundled": true, "requires": { "delegates": "1.0.0", - "readable-stream": "2.3.4" + "readable-stream": "2.3.5" }, "dependencies": { "delegates": { @@ -9916,7 +9969,7 @@ } }, "pacote": { - "version": "7.3.3", + "version": "7.6.1", "bundled": true, "requires": { "bluebird": "3.5.1", @@ -9926,7 +9979,8 @@ "lru-cache": "4.1.1", "make-fetch-happen": "2.6.0", "minimatch": "3.0.4", - "mississippi": "2.0.0", + "mississippi": "3.0.0", + "mkdirp": "0.5.1", "normalize-package-data": "2.4.0", "npm-package-arg": "6.0.0", "npm-packlist": "1.1.10", @@ -9935,10 +9989,11 @@ "promise-inflight": "1.0.1", "promise-retry": "1.1.1", "protoduck": "5.0.0", + "rimraf": "2.6.2", "safe-buffer": "5.1.1", "semver": "5.5.0", "ssri": "5.2.4", - "tar": "4.3.3", + "tar": "4.4.0", "unique-filename": "1.1.0", "which": "1.3.0" }, @@ -9951,11 +10006,11 @@ "version": "2.6.0", "bundled": true, "requires": { - "agentkeepalive": "3.3.0", + "agentkeepalive": "3.4.0", "cacache": "10.0.4", "http-cache-semantics": "3.8.1", - "http-proxy-agent": "2.0.0", - "https-proxy-agent": "2.1.1", + "http-proxy-agent": "2.1.0", + "https-proxy-agent": "2.2.0", "lru-cache": "4.1.1", "mississippi": "1.3.1", "node-fetch-npm": "2.0.2", @@ -9965,7 +10020,7 @@ }, "dependencies": { "agentkeepalive": { - "version": "3.3.0", + "version": "3.4.0", "bundled": true, "requires": { "humanize-ms": "1.2.1" @@ -9991,11 +10046,11 @@ "bundled": true }, "http-proxy-agent": { - "version": "2.0.0", + "version": "2.1.0", "bundled": true, "requires": { "agent-base": "4.2.0", - "debug": "2.6.9" + "debug": "3.1.0" }, "dependencies": { "agent-base": { @@ -10021,7 +10076,7 @@ } }, "debug": { - "version": "2.6.9", + "version": "3.1.0", "bundled": true, "requires": { "ms": "2.0.0" @@ -10036,7 +10091,7 @@ } }, "https-proxy-agent": { - "version": "2.1.1", + "version": "2.2.0", "bundled": true, "requires": { "agent-base": "4.2.0", @@ -10084,8 +10139,8 @@ "version": "1.3.1", "bundled": true, "requires": { - "concat-stream": "1.6.0", - "duplexify": "3.5.3", + "concat-stream": "1.6.1", + "duplexify": "3.5.4", "end-of-stream": "1.4.1", "flush-write-stream": "1.0.2", "from2": "2.3.0", @@ -10097,11 +10152,11 @@ }, "dependencies": { "concat-stream": { - "version": "1.6.0", + "version": "1.6.1", "bundled": true, "requires": { "inherits": "2.0.3", - "readable-stream": "2.3.4", + "readable-stream": "2.3.5", "typedarray": "0.0.6" }, "dependencies": { @@ -10112,12 +10167,12 @@ } }, "duplexify": { - "version": "3.5.3", + "version": "3.5.4", "bundled": true, "requires": { "end-of-stream": "1.4.1", "inherits": "2.0.3", - "readable-stream": "2.3.4", + "readable-stream": "2.3.5", "stream-shift": "1.0.0" }, "dependencies": { @@ -10139,7 +10194,7 @@ "bundled": true, "requires": { "inherits": "2.0.3", - "readable-stream": "2.3.4" + "readable-stream": "2.3.5" } }, "from2": { @@ -10147,7 +10202,7 @@ "bundled": true, "requires": { "inherits": "2.0.3", - "readable-stream": "2.3.4" + "readable-stream": "2.3.5" } }, "parallel-transform": { @@ -10156,7 +10211,7 @@ "requires": { "cyclist": "0.2.2", "inherits": "2.0.3", - "readable-stream": "2.3.4" + "readable-stream": "2.3.5" }, "dependencies": { "cyclist": { @@ -10177,7 +10232,7 @@ "version": "1.4.0", "bundled": true, "requires": { - "duplexify": "3.5.3", + "duplexify": "3.5.4", "inherits": "2.0.3", "pump": "2.0.1" }, @@ -10210,7 +10265,7 @@ "version": "2.0.3", "bundled": true, "requires": { - "readable-stream": "2.3.4", + "readable-stream": "2.3.5", "xtend": "4.0.1" }, "dependencies": { @@ -10329,138 +10384,6 @@ } } }, - "mississippi": { - "version": "2.0.0", - "bundled": true, - "requires": { - "concat-stream": "1.6.0", - "duplexify": "3.5.3", - "end-of-stream": "1.4.1", - "flush-write-stream": "1.0.2", - "from2": "2.3.0", - "parallel-transform": "1.1.0", - "pump": "2.0.1", - "pumpify": "1.4.0", - "stream-each": "1.2.2", - "through2": "2.0.3" - }, - "dependencies": { - "concat-stream": { - "version": "1.6.0", - "bundled": true, - "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.4", - "typedarray": "0.0.6" - }, - "dependencies": { - "typedarray": { - "version": "0.0.6", - "bundled": true - } - } - }, - "duplexify": { - "version": "3.5.3", - "bundled": true, - "requires": { - "end-of-stream": "1.4.1", - "inherits": "2.0.3", - "readable-stream": "2.3.4", - "stream-shift": "1.0.0" - }, - "dependencies": { - "stream-shift": { - "version": "1.0.0", - "bundled": true - } - } - }, - "end-of-stream": { - "version": "1.4.1", - "bundled": true, - "requires": { - "once": "1.4.0" - } - }, - "flush-write-stream": { - "version": "1.0.2", - "bundled": true, - "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.4" - } - }, - "from2": { - "version": "2.3.0", - "bundled": true, - "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.4" - } - }, - "parallel-transform": { - "version": "1.1.0", - "bundled": true, - "requires": { - "cyclist": "0.2.2", - "inherits": "2.0.3", - "readable-stream": "2.3.4" - }, - "dependencies": { - "cyclist": { - "version": "0.2.2", - "bundled": true - } - } - }, - "pump": { - "version": "2.0.1", - "bundled": true, - "requires": { - "end-of-stream": "1.4.1", - "once": "1.4.0" - } - }, - "pumpify": { - "version": "1.4.0", - "bundled": true, - "requires": { - "duplexify": "3.5.3", - "inherits": "2.0.3", - "pump": "2.0.1" - } - }, - "stream-each": { - "version": "1.2.2", - "bundled": true, - "requires": { - "end-of-stream": "1.4.1", - "stream-shift": "1.0.0" - }, - "dependencies": { - "stream-shift": { - "version": "1.0.0", - "bundled": true - } - } - }, - "through2": { - "version": "2.0.3", - "bundled": true, - "requires": { - "readable-stream": "2.3.4", - "xtend": "4.0.1" - }, - "dependencies": { - "xtend": { - "version": "4.0.1", - "bundled": true - } - } - } - } - }, "npm-pick-manifest": { "version": "2.1.0", "bundled": true, @@ -10495,10 +10418,6 @@ "bundled": true } } - }, - "semver": { - "version": "5.5.0", - "bundled": true } } }, @@ -10567,7 +10486,7 @@ "requires": { "debuglog": "1.0.1", "graceful-fs": "4.1.11", - "read-package-json": "2.0.12", + "read-package-json": "2.0.13", "readdir-scoped-modules": "1.0.2", "semver": "5.5.0", "slide": "1.1.6", @@ -10581,7 +10500,7 @@ } }, "read-package-json": { - "version": "2.0.12", + "version": "2.0.13", "bundled": true, "requires": { "glob": "7.1.2", @@ -10608,12 +10527,12 @@ "debuglog": "1.0.1", "dezalgo": "1.0.3", "once": "1.4.0", - "read-package-json": "2.0.12", + "read-package-json": "2.0.13", "readdir-scoped-modules": "1.0.2" } }, "readable-stream": { - "version": "2.3.4", + "version": "2.3.5", "bundled": true, "requires": { "core-util-is": "1.0.2", @@ -11030,7 +10949,7 @@ "bundled": true, "requires": { "graceful-fs": "4.1.11", - "readable-stream": "2.3.4" + "readable-stream": "2.3.5" } }, "slide": { @@ -11087,7 +11006,7 @@ "version": "1.2.0", "bundled": true, "requires": { - "readable-stream": "2.3.4", + "readable-stream": "2.3.5", "stream-shift": "1.0.0" }, "dependencies": { @@ -11120,7 +11039,7 @@ } }, "tar": { - "version": "4.3.3", + "version": "4.4.0", "bundled": true, "requires": { "chownr": "1.0.1", @@ -11438,7 +11357,7 @@ "graceful-fs": "4.1.11", "make-dir": "1.0.0", "unique-string": "1.0.0", - "write-file-atomic": "2.1.0", + "write-file-atomic": "2.3.0", "xdg-basedir": "3.0.0" }, "dependencies": { @@ -11751,7 +11670,7 @@ } }, "worker-farm": { - "version": "1.5.2", + "version": "1.5.4", "bundled": true, "requires": { "errno": "0.1.7", @@ -11782,12 +11701,18 @@ "bundled": true }, "write-file-atomic": { - "version": "2.1.0", + "version": "2.3.0", "bundled": true, "requires": { "graceful-fs": "4.1.11", "imurmurhash": "0.1.4", - "slide": "1.1.6" + "signal-exit": "3.0.2" + }, + "dependencies": { + "signal-exit": { + "version": "3.0.2", + "bundled": true + } } } } diff --git a/package.json b/package.json index 2dec7f0..de2bf04 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "lodash": "^4.17.5", "mkdirp": "^0.5.1", "nedb": "^1.8.0", - "npm": "^5.7.1", + "npm": "^5.8.0", "shortid": "^2.2.8", "tus-node-server": "^0.2.10" }, diff --git a/public/dist/custom.css b/public/dist/custom.css new file mode 100644 index 0000000..1c4e248 --- /dev/null +++ b/public/dist/custom.css @@ -0,0 +1 @@ +/* This space intentionally left blank */ \ No newline at end of file diff --git a/public/src/App.vue b/public/src/App.vue index 03bbdac..6dd6b03 100644 --- a/public/src/App.vue +++ b/public/src/App.vue @@ -17,21 +17,6 @@ import _ from 'lodash'; import shared from './shared'; -if (typeof customMessages !== 'undefined') -{ - _.merge(messages, customMessages); - - if (customMessages.hasOwnProperty('allLocales')) - { - for (var key in messages) - { - if (key !== 'allLocales' && messages.hasOwnProperty(key)) - _.merge(messages[key], customMessages.allLocales); - } - } -} - - export default { name: 'app', data () { diff --git a/public/src/app.js b/public/src/app.js index 098ffe4..269c97c 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -4,6 +4,22 @@ import VueRouter from 'vue-router'; import App from './App.vue'; import messages from './lang'; + +if (typeof customMessages !== 'undefined') +{ + _.merge(messages, customMessages); + + if (customMessages.hasOwnProperty('allLocales')) + { + for (var key in messages) + { + if (key !== 'allLocales' && messages.hasOwnProperty(key)) + _.merge(messages[key], customMessages.allLocales); + } + } +} + + Vue.use(VueI18n); Vue.use(VueRouter); diff --git a/public/src/index.html b/public/src/index.html index 05ff100..5f962a1 100644 --- a/public/src/index.html +++ b/public/src/index.html @@ -4,8 +4,10 @@ Recv +
+ \ No newline at end of file diff --git a/public/src/lang.js b/public/src/lang.js index ce84bc5..64a2895 100644 --- a/public/src/lang.js +++ b/public/src/lang.js @@ -19,6 +19,16 @@ export default { done: 'Done', dropPaste: 'Drop files here, paste or', browse: 'browse' + }, + + + admin: { + login: { + usernamePlaceholder: 'Username or e-mail address', + passwordPlaceholder: 'Password', + button: 'Login', + buttonChecking: 'Checking...' + } } }, @@ -42,6 +52,16 @@ export default { done: 'Gereed', dropPaste: 'Sleep bestanden, plak of ', browse: 'selecteer' + }, + + + admin: { + login: { + usernamePlaceholder: 'Gebruikersnaam of e-mail adres', + passwordPlaceholder: 'Wachtwoord', + button: 'Inloggen', + buttonChecking: 'Controleren...' + } } } } \ No newline at end of file diff --git a/public/src/route/Code.vue b/public/src/route/Code.vue index a368f22..5ff3ff6 100644 --- a/public/src/route/Code.vue +++ b/public/src/route/Code.vue @@ -2,7 +2,7 @@
- +
diff --git a/public/src/route/Landing.vue b/public/src/route/Landing.vue index faa9367..deb5623 100644 --- a/public/src/route/Landing.vue +++ b/public/src/route/Landing.vue @@ -1,5 +1,5 @@