🐛 Fix linter error
Karian Før karian@subtext.studio
Tue, 13 Oct 2020 15:47:51 +0000
6 files changed,
169 insertions(+),
327 deletions(-)
M
app/.eslintrc
→
app/.eslintrc
@@ -38,7 +38,11 @@ "complexity": ["warn", 16],
"max-len": ["warn", 110], "arrow-parens": "off", "prefer-destructuring": "error", - "indent": ["error", 2, {"ignoredNodes": ["ConditionalExpression"]}], + "indent": [ + "error", + 2, + {"ignoredNodes": ["ConditionalExpression", "TemplateLiteral"]} + ], "operator-linebreak": "off", "curly": "off", "no-extra-boolean-cast": "off",
M
app/package-lock.json
→
app/package-lock.json
@@ -3162,6 +3162,15 @@ "version": "2.1.0",
"resolved": "https://npm-8ee.hidora.com/binary-extensions/-/binary-extensions-2.1.0.tgz", "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==" }, + "bindings": { + "version": "1.5.0", + "resolved": "https://npm-8ee.hidora.com/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "optional": true, + "requires": { + "file-uri-to-path": "1.0.0" + } + }, "bluebird": { "version": "3.7.2", "resolved": "https://npm-8ee.hidora.com/bluebird/-/bluebird-3.7.2.tgz",@@ -3576,9 +3585,9 @@ "resolved": "https://npm-8ee.hidora.com/chardet/-/chardet-0.7.0.tgz",
"integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, "chokidar": { - "version": "3.4.2", - "resolved": "https://npm-8ee.hidora.com/chokidar/-/chokidar-3.4.2.tgz", - "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==", + "version": "3.4.3", + "resolved": "https://npm-8ee.hidora.com/chokidar/-/chokidar-3.4.3.tgz", + "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==", "requires": { "anymatch": "~3.1.1", "braces": "~3.0.2",@@ -3587,7 +3596,7 @@ "glob-parent": "~5.1.0",
"is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", - "readdirp": "~3.4.0" + "readdirp": "~3.5.0" }, "dependencies": { "anymatch": {@@ -3778,11 +3787,6 @@ "chalk": "^2.4.1",
"q": "^1.1.2" } }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://npm-8ee.hidora.com/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" - }, "collection-visit": { "version": "1.0.0", "resolved": "https://npm-8ee.hidora.com/collection-visit/-/collection-visit-1.0.0.tgz",@@ -5056,9 +5060,9 @@ "ext": "^1.1.2"
} }, "escalade": { - "version": "3.1.0", - "resolved": "https://npm-8ee.hidora.com/escalade/-/escalade-3.1.0.tgz", - "integrity": "sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig==" + "version": "3.1.1", + "resolved": "https://npm-8ee.hidora.com/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" }, "escape-html": { "version": "1.0.3",@@ -5973,6 +5977,12 @@ "loader-utils": "^1.2.3",
"schema-utils": "^2.5.0" } }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://npm-8ee.hidora.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "optional": true + }, "filesize": { "version": "6.0.1", "resolved": "https://npm-8ee.hidora.com/filesize/-/filesize-6.0.1.tgz",@@ -6771,11 +6781,6 @@ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
} } }, - "http-parser-js": { - "version": "0.5.2", - "resolved": "https://npm-8ee.hidora.com/http-parser-js/-/http-parser-js-0.5.2.tgz", - "integrity": "sha512-opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ==" - }, "http-proxy": { "version": "1.18.1", "resolved": "https://npm-8ee.hidora.com/http-proxy/-/http-proxy-1.18.1.tgz",@@ -7067,11 +7072,6 @@ "requires": {
"loose-envify": "^1.0.0" } }, - "invert-kv": { - "version": "2.0.0", - "resolved": "https://npm-8ee.hidora.com/invert-kv/-/invert-kv-2.0.0.tgz", - "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==" - }, "ip": { "version": "1.1.5", "resolved": "https://npm-8ee.hidora.com/ip/-/ip-1.1.5.tgz",@@ -7642,7 +7642,11 @@ "fsevents": {
"version": "1.2.13", "resolved": "https://npm-8ee.hidora.com/fsevents/-/fsevents-1.2.13.tgz", "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", - "optional": true + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } } } },@@ -8207,14 +8211,6 @@ "version": "1.0.4",
"resolved": "https://npm-8ee.hidora.com/lazy-cache/-/lazy-cache-1.0.4.tgz", "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=" }, - "lcid": { - "version": "2.0.0", - "resolved": "https://npm-8ee.hidora.com/lcid/-/lcid-2.0.0.tgz", - "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", - "requires": { - "invert-kv": "^2.0.0" - } - }, "left-pad": { "version": "1.3.0", "resolved": "https://npm-8ee.hidora.com/left-pad/-/left-pad-1.3.0.tgz",@@ -8455,14 +8451,6 @@ "version": "0.0.3",
"resolved": "https://npm-8ee.hidora.com/mamacro/-/mamacro-0.0.3.tgz", "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==" }, - "map-age-cleaner": { - "version": "0.1.3", - "resolved": "https://npm-8ee.hidora.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", - "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", - "requires": { - "p-defer": "^1.0.0" - } - }, "map-cache": { "version": "0.2.2", "resolved": "https://npm-8ee.hidora.com/map-cache/-/map-cache-0.2.2.tgz",@@ -8500,16 +8488,6 @@ "media-typer": {
"version": "0.3.0", "resolved": "https://npm-8ee.hidora.com/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" - }, - "mem": { - "version": "4.3.0", - "resolved": "https://npm-8ee.hidora.com/mem/-/mem-4.3.0.tgz", - "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==", - "requires": { - "map-age-cleaner": "^0.1.1", - "mimic-fn": "^2.0.0", - "p-is-promise": "^2.0.0" - } }, "memory-fs": { "version": "0.4.1",@@ -8843,6 +8821,12 @@ "mute-stream": {
"version": "0.0.8", "resolved": "https://npm-8ee.hidora.com/mute-stream/-/mute-stream-0.0.8.tgz", "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" + }, + "nan": { + "version": "2.14.2", + "resolved": "https://npm-8ee.hidora.com/nan/-/nan-2.14.2.tgz", + "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==", + "optional": true }, "nanomatch": { "version": "1.2.13",@@ -9086,11 +9070,6 @@ "version": "1.2.2",
"resolved": "https://npm-8ee.hidora.com/num2fraction/-/num2fraction-1.2.2.tgz", "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=" }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://npm-8ee.hidora.com/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" - }, "nwsapi": { "version": "2.2.0", "resolved": "https://npm-8ee.hidora.com/nwsapi/-/nwsapi-2.2.0.tgz",@@ -9399,26 +9378,11 @@ "version": "0.3.0",
"resolved": "https://npm-8ee.hidora.com/os-browserify/-/os-browserify-0.3.0.tgz", "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=" }, - "os-locale": { - "version": "3.1.0", - "resolved": "https://npm-8ee.hidora.com/os-locale/-/os-locale-3.1.0.tgz", - "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", - "requires": { - "execa": "^1.0.0", - "lcid": "^2.0.0", - "mem": "^4.0.0" - } - }, "os-tmpdir": { "version": "1.0.2", "resolved": "https://npm-8ee.hidora.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" }, - "p-defer": { - "version": "1.0.0", - "resolved": "https://npm-8ee.hidora.com/p-defer/-/p-defer-1.0.0.tgz", - "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=" - }, "p-each-series": { "version": "1.0.0", "resolved": "https://npm-8ee.hidora.com/p-each-series/-/p-each-series-1.0.0.tgz",@@ -9431,11 +9395,6 @@ "p-finally": {
"version": "1.0.0", "resolved": "https://npm-8ee.hidora.com/p-finally/-/p-finally-1.0.0.tgz", "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" - }, - "p-is-promise": { - "version": "2.1.0", - "resolved": "https://npm-8ee.hidora.com/p-is-promise/-/p-is-promise-2.1.0.tgz", - "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==" }, "p-limit": { "version": "2.3.0",@@ -11216,9 +11175,9 @@ "tiny-warning": "^1.0.0"
} }, "react-scripts": { - "version": "3.4.1", - "resolved": "https://npm-8ee.hidora.com/react-scripts/-/react-scripts-3.4.1.tgz", - "integrity": "sha512-JpTdi/0Sfd31mZA6Ukx+lq5j1JoKItX7qqEK4OiACjVQletM1P38g49d9/D0yTxp9FrSF+xpJFStkGgKEIRjlQ==", + "version": "3.4.3", + "resolved": "https://npm-8ee.hidora.com/react-scripts/-/react-scripts-3.4.3.tgz", + "integrity": "sha512-oSnoWmii/iKdeQiwaO6map1lUaZLmG0xIUyb/HwCVFLT7gNbj8JZ9RmpvMCZ4fB98ZUMRfNmp/ft8uy/xD1RLA==", "requires": { "@babel/core": "7.9.0", "@svgr/webpack": "4.3.3",@@ -11266,11 +11225,11 @@ "resolve-url-loader": "3.1.1",
"sass-loader": "8.0.2", "semver": "6.3.0", "style-loader": "0.23.1", - "terser-webpack-plugin": "2.3.5", + "terser-webpack-plugin": "2.3.8", "ts-pnp": "1.1.6", "url-loader": "2.3.0", "webpack": "4.42.0", - "webpack-dev-server": "3.10.3", + "webpack-dev-server": "3.11.0", "webpack-manifest-plugin": "2.2.0", "workbox-webpack-plugin": "4.3.1" }@@ -11345,9 +11304,9 @@ "util-deprecate": "^1.0.1"
} }, "readdirp": { - "version": "3.4.0", - "resolved": "https://npm-8ee.hidora.com/readdirp/-/readdirp-3.4.0.tgz", - "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", + "version": "3.5.0", + "resolved": "https://npm-8ee.hidora.com/readdirp/-/readdirp-3.5.0.tgz", + "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", "requires": { "picomatch": "^2.2.1" }@@ -11993,9 +11952,12 @@ }
} }, "serialize-javascript": { - "version": "2.1.2", - "resolved": "https://npm-8ee.hidora.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz", - "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==" + "version": "4.0.0", + "resolved": "https://npm-8ee.hidora.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz", + "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", + "requires": { + "randombytes": "^2.1.0" + } }, "serve-index": { "version": "1.9.1",@@ -12319,12 +12281,13 @@ "kind-of": "^3.2.0"
} }, "sockjs": { - "version": "0.3.19", - "resolved": "https://npm-8ee.hidora.com/sockjs/-/sockjs-0.3.19.tgz", - "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==", + "version": "0.3.20", + "resolved": "https://npm-8ee.hidora.com/sockjs/-/sockjs-0.3.20.tgz", + "integrity": "sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==", "requires": { "faye-websocket": "^0.10.0", - "uuid": "^3.0.1" + "uuid": "^3.4.0", + "websocket-driver": "0.6.5" } }, "sockjs-client": {@@ -12985,18 +12948,18 @@ "source-map-support": "~0.5.12"
} }, "terser-webpack-plugin": { - "version": "2.3.5", - "resolved": "https://npm-8ee.hidora.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.5.tgz", - "integrity": "sha512-WlWksUoq+E4+JlJ+h+U+QUzXpcsMSSNXkDy9lBVkSqDn1w23Gg29L/ary9GeJVYCGiNJJX7LnVc4bwL1N3/g1w==", + "version": "2.3.8", + "resolved": "https://npm-8ee.hidora.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz", + "integrity": "sha512-/fKw3R+hWyHfYx7Bv6oPqmk4HGQcrWLtV3X6ggvPuwPNHSnzvVV51z6OaaCOus4YLjutYGOz3pEpbhe6Up2s1w==", "requires": { "cacache": "^13.0.1", - "find-cache-dir": "^3.2.0", - "jest-worker": "^25.1.0", - "p-limit": "^2.2.2", - "schema-utils": "^2.6.4", - "serialize-javascript": "^2.1.2", + "find-cache-dir": "^3.3.1", + "jest-worker": "^25.4.0", + "p-limit": "^2.3.0", + "schema-utils": "^2.6.6", + "serialize-javascript": "^4.0.0", "source-map": "^0.6.1", - "terser": "^4.4.3", + "terser": "^4.6.12", "webpack-sources": "^1.4.3" }, "dependencies": {@@ -13684,7 +13647,11 @@ "fsevents": {
"version": "1.2.13", "resolved": "https://npm-8ee.hidora.com/fsevents/-/fsevents-1.2.13.tgz", "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", - "optional": true + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } }, "glob-parent": { "version": "3.1.0",@@ -13854,14 +13821,6 @@ "ajv-errors": "^1.0.0",
"ajv-keywords": "^3.1.0" } }, - "serialize-javascript": { - "version": "4.0.0", - "resolved": "https://npm-8ee.hidora.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz", - "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", - "requires": { - "randombytes": "^2.1.0" - } - }, "ssri": { "version": "6.0.1", "resolved": "https://npm-8ee.hidora.com/ssri/-/ssri-6.0.1.tgz",@@ -13901,9 +13860,9 @@ "webpack-log": "^2.0.0"
} }, "webpack-dev-server": { - "version": "3.10.3", - "resolved": "https://npm-8ee.hidora.com/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz", - "integrity": "sha512-e4nWev8YzEVNdOMcNzNeCN947sWJNd43E5XvsJzbAL08kGc2frm1tQ32hTJslRS+H65LCb/AaUCYU7fjHCpDeQ==", + "version": "3.11.0", + "resolved": "https://npm-8ee.hidora.com/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz", + "integrity": "sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==", "requires": { "ansi-html": "0.0.7", "bonjour": "^3.5.0",@@ -13913,31 +13872,31 @@ "connect-history-api-fallback": "^1.6.0",
"debug": "^4.1.1", "del": "^4.1.1", "express": "^4.17.1", - "html-entities": "^1.2.1", + "html-entities": "^1.3.1", "http-proxy-middleware": "0.19.1", "import-local": "^2.0.0", "internal-ip": "^4.3.0", "ip": "^1.1.5", "is-absolute-url": "^3.0.3", "killable": "^1.0.1", - "loglevel": "^1.6.6", + "loglevel": "^1.6.8", "opn": "^5.5.0", "p-retry": "^3.0.1", - "portfinder": "^1.0.25", + "portfinder": "^1.0.26", "schema-utils": "^1.0.0", "selfsigned": "^1.10.7", "semver": "^6.3.0", "serve-index": "^1.9.1", - "sockjs": "0.3.19", + "sockjs": "0.3.20", "sockjs-client": "1.4.0", - "spdy": "^4.0.1", + "spdy": "^4.0.2", "strip-ansi": "^3.0.1", "supports-color": "^6.1.0", "url": "^0.11.0", "webpack-dev-middleware": "^3.7.2", "webpack-log": "^2.0.0", "ws": "^6.2.1", - "yargs": "12.0.5" + "yargs": "^13.3.2" }, "dependencies": { "ansi-regex": {@@ -13969,41 +13928,15 @@ "readdirp": "^2.2.1",
"upath": "^1.1.1" } }, - "cliui": { - "version": "4.1.0", - "resolved": "https://npm-8ee.hidora.com/cliui/-/cliui-4.1.0.tgz", - "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", - "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://npm-8ee.hidora.com/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://npm-8ee.hidora.com/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, "fsevents": { "version": "1.2.13", "resolved": "https://npm-8ee.hidora.com/fsevents/-/fsevents-1.2.13.tgz", "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", - "optional": true - }, - "get-caller-file": { - "version": "1.0.3", - "resolved": "https://npm-8ee.hidora.com/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } }, "glob-parent": { "version": "3.1.0",@@ -14037,11 +13970,6 @@ "requires": {
"binary-extensions": "^1.0.0" } }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://npm-8ee.hidora.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" - }, "isarray": { "version": "1.0.0", "resolved": "https://npm-8ee.hidora.com/isarray/-/isarray-1.0.0.tgz",@@ -14076,11 +14004,6 @@ "micromatch": "^3.1.10",
"readable-stream": "^2.0.2" } }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://npm-8ee.hidora.com/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" - }, "schema-utils": { "version": "1.0.0", "resolved": "https://npm-8ee.hidora.com/schema-utils/-/schema-utils-1.0.0.tgz",@@ -14091,30 +14014,6 @@ "ajv-errors": "^1.0.0",
"ajv-keywords": "^3.1.0" } }, - "string-width": { - "version": "2.1.1", - "resolved": "https://npm-8ee.hidora.com/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://npm-8ee.hidora.com/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://npm-8ee.hidora.com/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, "string_decoder": { "version": "1.1.1", "resolved": "https://npm-8ee.hidora.com/string_decoder/-/string_decoder-1.1.1.tgz",@@ -14139,69 +14038,12 @@ "requires": {
"has-flag": "^3.0.0" } }, - "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://npm-8ee.hidora.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" - }, - "dependencies": { - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://npm-8ee.hidora.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://npm-8ee.hidora.com/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - } - } - }, "ws": { "version": "6.2.1", "resolved": "https://npm-8ee.hidora.com/ws/-/ws-6.2.1.tgz", "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", "requires": { "async-limiter": "~1.0.0" - } - }, - "yargs": { - "version": "12.0.5", - "resolved": "https://npm-8ee.hidora.com/yargs/-/yargs-12.0.5.tgz", - "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", - "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.2.0", - "find-up": "^3.0.0", - "get-caller-file": "^1.0.1", - "os-locale": "^3.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1 || ^4.0.0", - "yargs-parser": "^11.1.1" - } - }, - "yargs-parser": { - "version": "11.1.1", - "resolved": "https://npm-8ee.hidora.com/yargs-parser/-/yargs-parser-11.1.1.tgz", - "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" } } }@@ -14248,12 +14090,10 @@ "source-map": "~0.6.1"
} }, "websocket-driver": { - "version": "0.7.4", - "resolved": "https://npm-8ee.hidora.com/websocket-driver/-/websocket-driver-0.7.4.tgz", - "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", + "version": "0.6.5", + "resolved": "https://npm-8ee.hidora.com/websocket-driver/-/websocket-driver-0.6.5.tgz", + "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=", "requires": { - "http-parser-js": ">=0.5.1", - "safe-buffer": ">=5.1.0", "websocket-extensions": ">=0.1.1" } },
M
app/package.json
→
app/package.json
@@ -19,7 +19,7 @@ "react-dom": "^16.13.1",
"react-helmet": "^6.1.0", "react-i18next": "^11.7.0", "react-router-dom": "^5.2.0", - "react-scripts": "3.4.1", + "react-scripts": "^3.4.3", "react-slick": "^0.26.1", "strapi-react-context": "^0.3.2" },
M
app/src/containers/EventBar/index.js
→
app/src/containers/EventBar/index.js
@@ -86,6 +86,7 @@ >
<Toolbar> <div className={classes.name}> <Link + to={''} onClick={() => { window.location.href = settings['about_link']; }}
M
app/src/containers/NewCarDialog/index.js
→
app/src/containers/NewCarDialog/index.js
@@ -2,7 +2,6 @@ import React, {useState} from 'react';
import Dialog from '@material-ui/core/Dialog'; import DialogActions from '@material-ui/core/DialogActions'; import DialogContent from '@material-ui/core/DialogContent'; -import DialogContentText from '@material-ui/core/DialogContentText'; import DialogTitle from '@material-ui/core/DialogTitle'; import Button from '@material-ui/core/Button'; import Slide from '@material-ui/core/Slide';@@ -86,69 +85,67 @@ >
<form onSubmit={onCreate}> <DialogTitle>{t('car.creation.title')}</DialogTitle> <DialogContent> - <DialogContentText> - <TextField - label={t('car.creation.name')} - value={name} - onChange={e => setName(e.target.value)} - fullWidth - autoFocus - id="NewCarName" - name="name" - /> - <DateTimePicker - label={t('event.creation.date')} - value={date} - onChange={setDate} - className={classes.picker} - fullWidth - disablePast - format="LLLL" - id="NewCarDateTime" - name="date" - /> - <Typography variant="caption">{t('car.creation.seats')}</Typography> - <Slider - value={seats} - onChange={(e, value) => setSeats(value)} - step={1} - min={1} - max={marks.length} - marks={marks} - valueLabelDisplay="auto" - /> - <TextField - label={t('car.creation.meeting')} - value={meeting} - onChange={e => setMeeting(e.target.value)} - fullWidth - margin="dense" - id="NewCarMeeting" - name="meeting" - /> - <TextField - label={t('car.creation.phone')} - value={phone} - onChange={e => setPhone(e.target.value)} - fullWidth - margin="dense" - id="NewCarPhone" - name="phone" - /> - <TextField - label={t('car.creation.notes')} - value={details} - onChange={e => setDetails(e.target.value)} - fullWidth - margin="dense" - inputProps={{maxLength: 250}} - helperText={`${details.length}/250`} - multiline - rows={4} - id="NewCarDetails" - name="details" - /> - </DialogContentText> + <TextField + label={t('car.creation.name')} + value={name} + onChange={e => setName(e.target.value)} + fullWidth + autoFocus + id="NewCarName" + name="name" + /> + <DateTimePicker + label={t('event.creation.date')} + value={date} + onChange={setDate} + className={classes.picker} + fullWidth + disablePast + format="LLLL" + id="NewCarDateTime" + name="date" + /> + <Typography variant="caption">{t('car.creation.seats')}</Typography> + <Slider + value={seats} + onChange={(e, value) => setSeats(value)} + step={1} + min={1} + max={marks.length} + marks={marks} + valueLabelDisplay="auto" + /> + <TextField + label={t('car.creation.meeting')} + value={meeting} + onChange={e => setMeeting(e.target.value)} + fullWidth + margin="dense" + id="NewCarMeeting" + name="meeting" + /> + <TextField + label={t('car.creation.phone')} + value={phone} + onChange={e => setPhone(e.target.value)} + fullWidth + margin="dense" + id="NewCarPhone" + name="phone" + /> + <TextField + label={t('car.creation.notes')} + value={details} + onChange={e => setDetails(e.target.value)} + fullWidth + margin="dense" + inputProps={{maxLength: 250}} + helperText={`${details.length}/250`} + multiline + rows={4} + id="NewCarDetails" + name="details" + /> </DialogContent> <DialogActions> <Button
M
app/src/containers/WaitingList/CarDialog.js
→
app/src/containers/WaitingList/CarDialog.js
@@ -35,24 +35,24 @@ </Toolbar>
</AppBar> <div className={classes.offset}> <List disablePadding> - {cars?.map((car, i) => ( - <ListItem - key={i} - button - divider - disabled={car.passengers?.length === car.seats} - onClick={() => onSelect(car)} - > - <ListItemText - primary={car.name} - secondary={t('passenger.creation.seats', { - seats: `${car.passengers ? car.passengers.length : 0} / ${ - car.seats - }`, - })} - /> - </ListItem> - ))} + {cars?.map((car, i) => { + const passengers = car.passengers ? car.passengers.length : 0; + const counter = `${passengers} / ${car.seats}`; + return ( + <ListItem + key={i} + button + divider + disabled={passengers === car.seats} + onClick={() => onSelect(car)} + > + <ListItemText + primary={car.name} + secondary={t('passenger.creation.seats', {seats: counter})} + /> + </ListItem> + ); + })} </List> </div> </Dialog>