diff --git a/habitica-images b/habitica-images index 69724d88ef..335b47650f 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit 69724d88ef6a4be85104fb08ae1e3d0a3f649765 +Subproject commit 335b47650fa5c4929c7c1680ed8960fe66cca266 diff --git a/package-lock.json b/package-lock.json index a7cb0f99df..d3c25c7a6b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "5.3.0", + "version": "5.7.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -27,33 +27,74 @@ "integrity": "sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==" }, "@babel/core": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.5.tgz", - "integrity": "sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz", + "integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==", "requires": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.22.5", - "@babel/generator": "^7.22.5", - "@babel/helper-compilation-targets": "^7.22.5", - "@babel/helper-module-transforms": "^7.22.5", - "@babel/helpers": "^7.22.5", - "@babel/parser": "^7.22.5", + "@babel/code-frame": "^7.22.10", + "@babel/generator": "^7.22.10", + "@babel/helper-compilation-targets": "^7.22.10", + "@babel/helper-module-transforms": "^7.22.9", + "@babel/helpers": "^7.22.10", + "@babel/parser": "^7.22.10", "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.5", - "@babel/types": "^7.22.5", + "@babel/traverse": "^7.22.10", + "@babel/types": "^7.22.10", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", "json5": "^2.2.2", - "semver": "^6.3.0" + "semver": "^6.3.1" }, "dependencies": { "@babel/code-frame": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz", - "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz", + "integrity": "sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==", "requires": { - "@babel/highlight": "^7.22.5" + "@babel/highlight": "^7.22.10", + "chalk": "^2.4.2" + } + }, + "@babel/compat-data": { + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz", + "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==" + }, + "@babel/generator": { + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz", + "integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==", + "requires": { + "@babel/types": "^7.22.10", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" + } + }, + "@babel/helper-compilation-targets": { + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz", + "integrity": "sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==", + "requires": { + "@babel/compat-data": "^7.22.9", + "@babel/helper-validator-option": "^7.22.5", + "browserslist": "^4.21.9", + "lru-cache": "^5.1.1", + "semver": "^6.3.1" + } + }, + "@babel/helper-module-transforms": { + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz", + "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==", + "requires": { + "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-simple-access": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/helper-validator-identifier": "^7.22.5" } }, "@babel/helper-validator-identifier": { @@ -62,25 +103,72 @@ "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==" }, "@babel/highlight": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz", - "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz", + "integrity": "sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==", "requires": { "@babel/helper-validator-identifier": "^7.22.5", - "chalk": "^2.0.0", + "chalk": "^2.4.2", "js-tokens": "^4.0.0" } }, - "@babel/types": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz", - "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==", + "@babel/parser": { + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz", + "integrity": "sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==" + }, + "@babel/traverse": { + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz", + "integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==", "requires": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5", - "to-fast-properties": "^2.0.0" + "@babel/code-frame": "^7.22.10", + "@babel/generator": "^7.22.10", + "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-function-name": "^7.22.5", + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.22.10", + "@babel/types": "^7.22.10", + "debug": "^4.1.0", + "globals": "^11.1.0" } }, + "@jridgewell/resolve-uri": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", + "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==" + }, + "@jridgewell/sourcemap-codec": { + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==" + }, + "@jridgewell/trace-mapping": { + "version": "0.3.19", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz", + "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==", + "requires": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "browserslist": { + "version": "4.21.10", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz", + "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==", + "requires": { + "caniuse-lite": "^1.0.30001517", + "electron-to-chromium": "^1.4.477", + "node-releases": "^2.0.13", + "update-browserslist-db": "^1.0.11" + } + }, + "caniuse-lite": { + "version": "1.0.30001522", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001522.tgz", + "integrity": "sha512-TKiyTVZxJGhsTszLuzb+6vUZSjVOAhClszBr2Ta2k9IwtNBT/4dzmL6aywt0HCgEZlmwJzXJd8yNiob6HgwTRg==" + }, "chalk": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", @@ -91,10 +179,32 @@ "supports-color": "^5.3.0" } }, + "lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "requires": { + "yallist": "^3.0.2" + } + }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" + }, + "update-browserslist-db": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz", + "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==", + "requires": { + "escalade": "^3.1.1", + "picocolors": "^1.0.0" + } + }, + "yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" } } }, @@ -542,28 +652,99 @@ } }, "@babel/helpers": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.5.tgz", - "integrity": "sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.10.tgz", + "integrity": "sha512-a41J4NW8HyZa1I1vAndrraTlPZ/eZoga2ZgS7fEr0tZJGVU4xqdE80CEm0CcNjha5EZ8fTBYLKHF0kqDUuAwQw==", "requires": { "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/traverse": "^7.22.10", + "@babel/types": "^7.22.10" }, "dependencies": { + "@babel/code-frame": { + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz", + "integrity": "sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==", + "requires": { + "@babel/highlight": "^7.22.10", + "chalk": "^2.4.2" + } + }, + "@babel/generator": { + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz", + "integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==", + "requires": { + "@babel/types": "^7.22.10", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" + } + }, "@babel/helper-validator-identifier": { "version": "7.22.5", "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz", "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==" }, - "@babel/types": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz", - "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==", + "@babel/highlight": { + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz", + "integrity": "sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==", "requires": { - "@babel/helper-string-parser": "^7.22.5", "@babel/helper-validator-identifier": "^7.22.5", - "to-fast-properties": "^2.0.0" + "chalk": "^2.4.2", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz", + "integrity": "sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==" + }, + "@babel/traverse": { + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz", + "integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==", + "requires": { + "@babel/code-frame": "^7.22.10", + "@babel/generator": "^7.22.10", + "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-function-name": "^7.22.5", + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.22.10", + "@babel/types": "^7.22.10", + "debug": "^4.1.0", + "globals": "^11.1.0" + } + }, + "@jridgewell/resolve-uri": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", + "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==" + }, + "@jridgewell/sourcemap-codec": { + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==" + }, + "@jridgewell/trace-mapping": { + "version": "0.3.19", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz", + "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==", + "requires": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } } } @@ -2105,13 +2286,13 @@ "integrity": "sha512-UdkG3mLEqXgnlKsWanWcgb6dOjUzJ+XC5f+aWw30qrtjxeNUSfKX1cd5FBzOaXQumoe9nIqeZUvrRJS03HCCtw==" }, "@parse/node-apn": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/@parse/node-apn/-/node-apn-5.1.3.tgz", - "integrity": "sha512-Bwhmbm895lEIF2772PJ8dSvBjrtOG9/q/TDMxmX40IgZxQFoXS73+JUIKTq3CA7SUB/Szu5roJINQ0L2U/1MJw==", + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/@parse/node-apn/-/node-apn-5.2.3.tgz", + "integrity": "sha512-uBUTTbzk0YyMOcE5qTcNdit5v1BdaECCRSQYbMGU/qY1eHwBaqeWOYd8rwi2Caga3K7IZyQGhpvL4/56H+uvrQ==", "requires": { "debug": "4.3.3", - "jsonwebtoken": "8.5.1", - "node-forge": "1.3.0", + "jsonwebtoken": "9.0.0", + "node-forge": "1.3.1", "verror": "1.10.1" }, "dependencies": { @@ -2124,20 +2305,14 @@ } }, "jsonwebtoken": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", - "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz", + "integrity": "sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==", "requires": { "jws": "^3.2.2", - "lodash.includes": "^4.3.0", - "lodash.isboolean": "^3.0.3", - "lodash.isinteger": "^4.0.4", - "lodash.isnumber": "^3.0.3", - "lodash.isplainobject": "^4.0.6", - "lodash.isstring": "^4.0.1", - "lodash.once": "^4.0.0", + "lodash": "^4.17.21", "ms": "^2.1.1", - "semver": "^5.6.0" + "semver": "^7.3.8" } }, "jwa": { @@ -2159,10 +2334,13 @@ "safe-buffer": "^5.0.1" } }, - "node-forge": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.0.tgz", - "integrity": "sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA==" + "semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "requires": { + "lru-cache": "^6.0.0" + } }, "verror": { "version": "1.10.1", @@ -2177,9 +2355,9 @@ } }, "@sindresorhus/is": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.2.0.tgz", - "integrity": "sha512-VkE3KLBmJwcCaVARtQpfuKcKv8gcBmUubrfHGF84dXuuW6jgsRYxPtzcIhPyK9WAPpRt2/xY6zkD9MnRaJzSyw==" + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", + "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==" }, "@sinonjs/commons": { "version": "3.0.0", @@ -2252,14 +2430,6 @@ } } }, - "@szmarczak/http-timer": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", - "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", - "requires": { - "defer-to-connect": "^1.0.1" - } - }, "@tootallnate/once": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", @@ -2283,14 +2453,14 @@ } }, "@types/cacheable-request": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz", - "integrity": "sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz", + "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==", "requires": { "@types/http-cache-semantics": "*", - "@types/keyv": "*", + "@types/keyv": "^3.1.4", "@types/node": "*", - "@types/responselike": "*" + "@types/responselike": "^1.0.0" } }, "@types/color-name": { @@ -2383,9 +2553,9 @@ } }, "@types/keyv": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.3.tgz", - "integrity": "sha512-FXCJgyyN3ivVgRoml4h94G/p3kY+u/B86La+QptcqJaWtBWtmc6TtkNfS40n9bIvyLteHh7zXOtgbobORKPbDg==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz", + "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==", "requires": { "@types/node": "*" } @@ -2717,26 +2887,6 @@ } } }, - "ansi-align": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz", - "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==", - "requires": { - "string-width": "^3.0.0" - }, - "dependencies": { - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - } - } - }, "ansi-colors": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", @@ -2792,9 +2942,9 @@ "integrity": "sha512-uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg==" }, "anymatch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", - "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", "requires": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -3173,7 +3323,7 @@ "array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" }, "array-includes": { "version": "3.1.1", @@ -3355,9 +3505,9 @@ "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==" }, "axios": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.6.tgz", - "integrity": "sha512-PEcdkk7JcdPiMDkvM4K6ZBRYq9keuVJsToxm2zQIM70Qqo2WHTdJZMXcG9X+RmRp2VPNUQC8W1RAGbgt6b1yMg==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz", + "integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==", "dev": true, "requires": { "follow-redirects": "^1.15.0", @@ -4210,70 +4360,9 @@ "optional": true }, "bootstrap": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.0.tgz", - "integrity": "sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==" - }, - "boxen": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz", - "integrity": "sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==", - "requires": { - "ansi-align": "^3.0.0", - "camelcase": "^5.3.1", - "chalk": "^3.0.0", - "cli-boxes": "^2.2.0", - "string-width": "^4.1.0", - "term-size": "^2.1.0", - "type-fest": "^0.8.1", - "widest-line": "^3.1.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" - }, - "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", - "requires": { - "has-flag": "^4.0.0" - } - } - } + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz", + "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==" }, "brace-expansion": { "version": "1.1.11", @@ -4408,35 +4497,6 @@ "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz", "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==" }, - "cacheable-request": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", - "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", - "requires": { - "clone-response": "^1.0.2", - "get-stream": "^5.1.0", - "http-cache-semantics": "^4.0.0", - "keyv": "^3.0.0", - "lowercase-keys": "^2.0.0", - "normalize-url": "^4.1.0", - "responselike": "^1.0.2" - }, - "dependencies": { - "get-stream": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", - "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==", - "requires": { - "pump": "^3.0.0" - } - }, - "lowercase-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", - "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==" - } - } - }, "call-bind": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", @@ -4451,11 +4511,6 @@ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" - }, "camelcase-keys": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", @@ -4552,18 +4607,28 @@ "dev": true }, "chokidar": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.1.tgz", - "integrity": "sha512-TQTJyr2stihpC4Sya9hs2Xh+O2wf+igjL36Y75xx2WdHuiICcn/XJza46Jwt0eT5hVpQOzo3FpY3cj3RVYLX0g==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", "requires": { - "anymatch": "~3.1.1", + "anymatch": "~3.1.2", "braces": "~3.0.2", - "fsevents": "~2.1.2", - "glob-parent": "~5.1.0", + "fsevents": "~2.3.2", + "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", - "readdirp": "~3.4.0" + "readdirp": "~3.6.0" + }, + "dependencies": { + "glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "requires": { + "is-glob": "^4.0.1" + } + } } }, "chownr": { @@ -4577,11 +4642,6 @@ "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==" }, - "ci-info": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", - "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==" - }, "class-utils": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", @@ -4603,11 +4663,6 @@ } } }, - "cli-boxes": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.0.tgz", - "integrity": "sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==" - }, "cli-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", @@ -4734,7 +4789,7 @@ "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", + "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", "dev": true }, "coa": { @@ -4955,34 +5010,6 @@ "proto-list": "~1.2.1" } }, - "configstore": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", - "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==", - "requires": { - "dot-prop": "^5.2.0", - "graceful-fs": "^4.1.2", - "make-dir": "^3.0.0", - "unique-string": "^2.0.0", - "write-file-atomic": "^3.0.0", - "xdg-basedir": "^4.0.0" - }, - "dependencies": { - "make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "requires": { - "semver": "^6.0.0" - } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - } - } - }, "confusing-browser-globals": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz", @@ -5026,7 +5053,7 @@ "contentstream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/contentstream/-/contentstream-1.0.0.tgz", - "integrity": "sha1-C9z6RtowRkqGzo+n7OVlQQ3G+aU=", + "integrity": "sha512-jqWbfFZFG9tZbdej7+TzXI4kanABh3BLtTWY6NxqTK5zo6iTIeo5aq4iRVfYsLQ0y8ccQqmJR/J4NeMmEdnR2w==", "requires": { "readable-stream": "~1.0.33-1" }, @@ -5034,7 +5061,7 @@ "isarray": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==" }, "readable-stream": { "version": "1.0.34", @@ -5105,7 +5132,7 @@ "cookie-signature": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" }, "cookiejar": { "version": "2.1.4", @@ -5241,11 +5268,6 @@ } } }, - "crypto-random-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", - "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==" - }, "css-select": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz", @@ -5346,7 +5368,7 @@ "cwise-compiler": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/cwise-compiler/-/cwise-compiler-1.1.3.tgz", - "integrity": "sha1-9NZnQQ6FDToxOn0tt7HlBbsDTMU=", + "integrity": "sha512-WXlK/m+Di8DMMcCjcWr4i+XzcQra9eCdXIJrgh4TUgh0pIS/yJduLxS9JgefsHJ/YVLdgPtXm9r62W92MvanEQ==", "requires": { "uniq": "^1.0.0" } @@ -5371,7 +5393,7 @@ "data-uri-to-buffer": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-0.0.3.tgz", - "integrity": "sha1-GK6XmmoMqZSwYlhTkW0mYruuCxo=" + "integrity": "sha512-Cp+jOa8QJef5nXS5hU7M1DWzXPEIoVR3kbV0dQuVGwROZg8bGf1DcCnkmajBTnvghTtSNMUdRrPjgaT6ZQucbw==" }, "debug": { "version": "4.1.1", @@ -5436,6 +5458,7 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", + "optional": true, "requires": { "mimic-response": "^1.0.0" } @@ -5565,7 +5588,8 @@ "deep-extend": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "dev": true }, "deep-is": { "version": "0.1.3", @@ -5612,11 +5636,6 @@ "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz", "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=" }, - "defer-to-connect": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", - "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==" - }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", @@ -5789,14 +5808,6 @@ "domelementtype": "1" } }, - "dot-prop": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz", - "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==", - "requires": { - "is-obj": "^2.0.0" - } - }, "download": { "version": "6.2.5", "resolved": "https://registry.npmjs.org/download/-/download-6.2.5.tgz", @@ -5902,7 +5913,8 @@ "duplexer3": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", - "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=" + "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", + "optional": true }, "duplexify": { "version": "4.1.2", @@ -5977,7 +5989,7 @@ "encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" }, "end-of-stream": { "version": "1.4.4", @@ -5999,7 +6011,7 @@ "ent": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", - "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=" + "integrity": "sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==" }, "entities": { "version": "2.0.3", @@ -6146,15 +6158,10 @@ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" }, - "escape-goat": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz", - "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==" - }, "escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" }, "escape-string-regexp": { "version": "1.0.5", @@ -6529,7 +6536,7 @@ "etag": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==" }, "event-stream": { "version": "3.3.4", @@ -7246,7 +7253,7 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "on-finished": { "version": "2.4.1", @@ -7311,7 +7318,7 @@ "first-chunk-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz", - "integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=" + "integrity": "sha512-ArRi5axuv66gEsyl3UuK80CzW7t56hem73YGNYxNWTGNKFJUadSb9Gu9SHijYEUi8ulQMf1bJomYNwSCPHhtTQ==" }, "flagged-respawn": { "version": "1.0.1", @@ -7466,7 +7473,7 @@ "fresh": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==" }, "from": { "version": "0.1.7", @@ -7590,9 +7597,9 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", - "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "optional": true }, "function-bind": { @@ -7741,6 +7748,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "optional": true, "requires": { "pump": "^3.0.0" } @@ -7761,7 +7769,7 @@ "gif-encoder": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/gif-encoder/-/gif-encoder-0.4.3.tgz", - "integrity": "sha1-iitP6MqJWkjjoLbLs0CgpqNXGJk=", + "integrity": "sha512-HMfSa+EIng62NbDhM63QGYoc49/m8DcZ9hhBtw+CXX9mKboSpeFVxjZ2WEWaMFZ14MUjfACK7jsrxrJffIVrCg==", "requires": { "readable-stream": "~1.1.9" }, @@ -7769,7 +7777,7 @@ "isarray": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==" }, "readable-stream": { "version": "1.1.14", @@ -7847,7 +7855,7 @@ "github-from-package": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", - "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=", + "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==", "dev": true }, "glob": { @@ -8162,14 +8170,6 @@ } } }, - "global-dirs": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.0.1.tgz", - "integrity": "sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==", - "requires": { - "ini": "^1.3.5" - } - }, "global-modules": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", @@ -8265,9 +8265,9 @@ } }, "got": { - "version": "11.8.3", - "resolved": "https://registry.npmjs.org/got/-/got-11.8.3.tgz", - "integrity": "sha512-7gtQ5KiPh1RtGS9/Jbv1ofDpBFuq42gyfEib+ejaRBJuj/3tQFeR5+gw57e4ipaU8c/rCjvX6fkQz2lyDlGAOg==", + "version": "11.8.6", + "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz", + "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==", "requires": { "@sindresorhus/is": "^4.0.0", "@szmarczak/http-timer": "^4.0.5", @@ -8291,9 +8291,9 @@ } }, "cacheable-request": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz", - "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz", + "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==", "requires": { "clone-response": "^1.0.2", "get-stream": "^5.1.0", @@ -8331,9 +8331,9 @@ "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==" }, "keyv": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.0.4.tgz", - "integrity": "sha512-vqNHbAc8BBsxk+7QBYLW0Y219rWcClspR6WSeoHYKG5mnsSoOH+BL1pWq02DDCVdvvuUny5rkBlzMRzoqc+GIg==", + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz", + "integrity": "sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==", "requires": { "json-buffer": "3.0.1" } @@ -8359,9 +8359,9 @@ "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==" }, "responselike": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz", - "integrity": "sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz", + "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==", "requires": { "lowercase-keys": "^2.0.0" } @@ -8635,7 +8635,7 @@ "handlebars-layouts": { "version": "3.1.4", "resolved": "https://registry.npmjs.org/handlebars-layouts/-/handlebars-layouts-3.1.4.tgz", - "integrity": "sha1-JrO+uTG0uHffv35v6vQFjuYiiwI=" + "integrity": "sha512-2llBmvnj8ueOfxNHdRzJOcgalzZjYVd9+WAl93kPYmlX4WGx7FTHTzNxhK+i9YKY2OSjzfehgpLiIwP/OJr6tw==" }, "har-schema": { "version": "2.0.0", @@ -8756,11 +8756,6 @@ } } }, - "has-yarn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz", - "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==" - }, "he": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", @@ -8968,11 +8963,6 @@ "resolve-from": "^4.0.0" } }, - "import-lazy": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", - "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=" - }, "import-local": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", @@ -9234,7 +9224,7 @@ "iota-array": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/iota-array/-/iota-array-1.0.0.tgz", - "integrity": "sha1-ge9X/l0FgUzVjCSDYyqZwwoOgIc=" + "integrity": "sha512-pZ2xT+LOHckCatGQ3DcG/a+QuEqvoxqkiL7tvE8nn3uuu+f6i1TtpB5/FtWFbxUuVr5PZCx8KskuGatbJDXOWA==" }, "ipaddr.js": { "version": "1.9.1", @@ -9306,14 +9296,6 @@ "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz", "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==" }, - "is-ci": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", - "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", - "requires": { - "ci-info": "^2.0.0" - } - }, "is-core-module": { "version": "2.10.0", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz", @@ -9412,15 +9394,6 @@ "is-extglob": "^2.1.1" } }, - "is-installed-globally": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz", - "integrity": "sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==", - "requires": { - "global-dirs": "^2.0.1", - "is-path-inside": "^3.0.1" - } - }, "is-jpg": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-jpg/-/is-jpg-2.0.0.tgz", @@ -9438,32 +9411,17 @@ "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz", "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=" }, - "is-npm": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz", - "integrity": "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==" - }, "is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" }, - "is-obj": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", - "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==" - }, "is-object": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz", "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=", "optional": true }, - "is-path-inside": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz", - "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==" - }, "is-plain-obj": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", @@ -9561,11 +9519,6 @@ "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" }, - "is-yarn-global": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz", - "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==" - }, "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", @@ -9611,7 +9564,7 @@ "async": { "version": "1.5.2", "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "integrity": "sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==", "dev": true }, "nopt": { @@ -9873,7 +9826,8 @@ "json-buffer": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", - "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=" + "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=", + "optional": true }, "json-content-demux": { "version": "0.1.4", @@ -10057,14 +10011,6 @@ "tsscmp": "1.0.6" } }, - "keyv": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", - "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==", - "requires": { - "json-buffer": "3.0.0" - } - }, "kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -10092,18 +10038,10 @@ "es6-weak-map": "^2.0.1" } }, - "latest-version": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz", - "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==", - "requires": { - "package-json": "^6.3.0" - } - }, "layout": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/layout/-/layout-2.2.0.tgz", - "integrity": "sha1-MeRL/BjdEBmz/7II5AKku/4uavQ=", + "integrity": "sha512-+kdgg25XW11BA4cl9vF+SH01HaBipld2Nf/PlU2kSYncAbdUbDoahzrlh6yhR93N/wR2TGgcFoxebzR1LKmZUg==", "requires": { "bin-pack": "~1.0.1" } @@ -10256,41 +10194,6 @@ "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==", "dev": true }, - "lodash.includes": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", - "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==" - }, - "lodash.isboolean": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", - "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==" - }, - "lodash.isinteger": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", - "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==" - }, - "lodash.isnumber": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", - "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==" - }, - "lodash.isplainobject": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", - "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==" - }, - "lodash.isstring": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", - "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==" - }, - "lodash.once": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", - "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==" - }, "log-driver": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz", @@ -10368,7 +10271,8 @@ "lowercase-keys": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", - "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==" + "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", + "optional": true }, "lpad-align": { "version": "1.1.2", @@ -10402,7 +10306,7 @@ "lru-cache": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz", - "integrity": "sha1-HRdnnAac2l0ECZGgnbwsDbN35V4=", + "integrity": "sha512-uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw==", "requires": { "pseudomap": "^1.0.1", "yallist": "^2.0.0" @@ -10411,7 +10315,7 @@ "yallist": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" + "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==" } } }, @@ -10661,7 +10565,7 @@ "merge-descriptors": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" + "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" }, "merge-stream": { "version": "2.0.0", @@ -10987,7 +10891,7 @@ "module-details-from-path": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.3.tgz", - "integrity": "sha1-EUyUlnPiqKNenTV4hSeqN7Z52is=" + "integrity": "sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A==" }, "moment": { "version": "2.29.4", @@ -11113,16 +11017,17 @@ } }, "mongoose": { - "version": "5.13.7", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.13.7.tgz", - "integrity": "sha512-ADIvftZ+KfoTALMZ0n8HvBlezFhcUd73hQaHQDwQ+3X+JZlqE47fUy9yhFZ2SjT+qzmuaCcIXCfhewIc38t2fQ==", + "version": "5.13.20", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.13.20.tgz", + "integrity": "sha512-TjGFa/XnJYt+wLmn8y9ssjyO2OhBMeEBtOHb9iJM16EWu2Du6L1Q6zSiEK2ziyYQM8agb4tumNIQFzqbxId7MA==", "requires": { + "@types/bson": "1.x || 4.0.x", "@types/mongodb": "^3.5.27", "bson": "^1.1.4", "kareem": "2.3.2", - "mongodb": "3.6.11", + "mongodb": "3.7.4", "mongoose-legacy-pluralize": "1.0.2", - "mpath": "0.8.3", + "mpath": "0.8.4", "mquery": "3.2.5", "ms": "2.1.2", "optional-require": "1.0.x", @@ -11142,22 +11047,32 @@ } }, "mongodb": { - "version": "3.6.11", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.6.11.tgz", - "integrity": "sha512-4Y4lTFHDHZZdgMaHmojtNAlqkvddX2QQBEN0K//GzxhGwlI9tZ9R0vhbjr1Decw+TF7qK0ZLjQT292XgHRRQgw==", + "version": "3.7.4", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.7.4.tgz", + "integrity": "sha512-K5q8aBqEXMwWdVNh94UQTwZ6BejVbFhh1uB6c5FKtPE9eUMZPUO3sRZdgIEcHSrAWmxzpG/FeODDKL388sqRmw==", "requires": { "bl": "^2.2.1", "bson": "^1.1.4", "denque": "^1.4.1", - "optional-require": "^1.0.3", + "optional-require": "^1.1.8", "safe-buffer": "^5.1.2", "saslprep": "^1.0.0" + }, + "dependencies": { + "optional-require": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/optional-require/-/optional-require-1.1.8.tgz", + "integrity": "sha512-jq83qaUb0wNg9Krv1c5OQ+58EK+vHde6aBPzLvPPqJm89UQWsvSuFy9X/OSNJnFeSOKo7btE0n8Nl2+nE+z5nA==", + "requires": { + "require-at": "^1.0.6" + } + } } }, "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -11300,9 +11215,9 @@ } }, "mpath": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.8.3.tgz", - "integrity": "sha512-eb9rRvhDltXVNL6Fxd2zM9D4vKBxjVVQNLNijlj7uoXUy19zNDsIif5zR+pWmPCWNKwAtqyo4JveQm4nfD5+eA==" + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.8.4.tgz", + "integrity": "sha512-DTxNZomBcTWlrMW76jy1wvV37X/cNNxPW1y2Jzd4DZkAaC5ZGsm8bfGfNOthcDuRJujXLqiuS6o3Tpy0JEoh7g==" }, "mquery": { "version": "3.2.5", @@ -11327,7 +11242,7 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" } } }, @@ -11493,7 +11408,7 @@ "ndarray-ops": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/ndarray-ops/-/ndarray-ops-1.2.2.tgz", - "integrity": "sha1-WeiNLDKn7ryxvGkPrhQVeVV6YU4=", + "integrity": "sha512-BppWAFRjMYF7N/r6Ie51q6D4fs0iiGmeXIACKY66fLpnwIui3Wc3CXiD/30mgLbDjPpSLrsqcp3Z62+IcHZsDw==", "requires": { "cwise-compiler": "^1.0.0" } @@ -11501,7 +11416,7 @@ "ndarray-pack": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ndarray-pack/-/ndarray-pack-1.2.1.tgz", - "integrity": "sha1-jK6+qqJNXs9w/4YCBjeXfajuWFo=", + "integrity": "sha512-51cECUJMT0rUZNQa09EoKsnFeDL4x2dHRT0VR5U2H5ZgEcm95ZDWcMA5JShroXjHOejmAD/fg8+H+OvUnVXz2g==", "requires": { "cwise-compiler": "^1.1.2", "ndarray": "^1.0.13" @@ -11583,7 +11498,7 @@ "node-bitmap": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/node-bitmap/-/node-bitmap-0.0.1.tgz", - "integrity": "sha1-GA6scAPgxwdhjvMTaPYvhLKmkJE=" + "integrity": "sha512-Jx5lPaaLdIaOsj2mVLWMWulXF6GQVdyLvNSxmiYCvZ8Ma2hfKX0POoR2kgKOqz+oFsRreq0yYZjQ2wjE9VNzCA==" }, "node-fetch": { "version": "2.6.7", @@ -11634,36 +11549,44 @@ "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==" }, "nodemon": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.4.tgz", - "integrity": "sha512-Ltced+hIfTmaS28Zjv1BM552oQ3dbwPqI4+zI0SLgq+wpJhSyqgYude/aZa/3i31VCQWMfXJVxvu86abcam3uQ==", + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.20.tgz", + "integrity": "sha512-Km2mWHKKY5GzRg6i1j5OxOHQtuvVsgskLfigG25yTtbyfRGn/GNvIbRyOf1PSCKJ2aT/58TiuUsuOU5UToVViw==", "requires": { - "chokidar": "^3.2.2", - "debug": "^3.2.6", + "chokidar": "^3.5.2", + "debug": "^3.2.7", "ignore-by-default": "^1.0.1", - "minimatch": "^3.0.4", - "pstree.remy": "^1.1.7", + "minimatch": "^3.1.2", + "pstree.remy": "^1.1.8", "semver": "^5.7.1", + "simple-update-notifier": "^1.0.7", "supports-color": "^5.5.0", "touch": "^3.1.0", - "undefsafe": "^2.0.2", - "update-notifier": "^4.0.0" + "undefsafe": "^2.0.5" }, "dependencies": { "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "requires": { "ms": "^2.1.1" } + }, + "minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "requires": { + "brace-expansion": "^1.1.7" + } } } }, "noop-logger": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz", - "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=", + "integrity": "sha512-6kM8CLXvuW5crTxsAtva2YLrRrDaiTIkIePWs9moLHqbFWT94WpNFjwS/5dfLfECg5i/lkmw3aoqVidxt23TEQ==", "dev": true }, "nopt": { @@ -11690,11 +11613,6 @@ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" }, - "normalize-url": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz", - "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==" - }, "now-and-later": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz", @@ -11769,7 +11687,7 @@ "obj-extend": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/obj-extend/-/obj-extend-0.1.0.tgz", - "integrity": "sha1-u0SKR3X7les0p4H5CLusLfI9u1s=" + "integrity": "sha512-or9c7Ue2wWCun41DuLP3+LKEUjSZcDSxfCM4HZQSX9tcjLL/yuzTW7MmtVNs+MmN16uDRpDrFmFK/WVSm4vklg==" }, "object-assign": { "version": "4.1.1", @@ -12031,11 +11949,6 @@ "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" }, - "p-cancelable": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.0.0.tgz", - "integrity": "sha512-USgPoaC6tkTGlS831CxsVdmZmyb8tR1D+hStI84MyckLOzfJlYQUweomrwE3D8T7u5u5GVuW064LT501wHTYYA==" - }, "p-event": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/p-event/-/p-event-1.3.0.tgz", @@ -12107,47 +12020,6 @@ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" }, - "package-json": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz", - "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==", - "requires": { - "got": "^9.6.0", - "registry-auth-token": "^4.0.0", - "registry-url": "^5.0.0", - "semver": "^6.2.0" - }, - "dependencies": { - "@sindresorhus/is": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", - "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==" - }, - "got": { - "version": "9.6.0", - "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", - "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", - "requires": { - "@sindresorhus/is": "^0.14.0", - "@szmarczak/http-timer": "^1.1.2", - "cacheable-request": "^6.0.0", - "decompress-response": "^3.3.0", - "duplexer3": "^0.1.4", - "get-stream": "^4.1.0", - "lowercase-keys": "^1.0.1", - "mimic-response": "^1.0.1", - "p-cancelable": "^1.0.0", - "to-readable-stream": "^1.0.0", - "url-parse-lax": "^3.0.0" - } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - } - } - }, "parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -12159,7 +12031,7 @@ "parse-data-uri": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/parse-data-uri/-/parse-data-uri-0.2.0.tgz", - "integrity": "sha1-vwTYUd1ch7CrI45dAazklLYEtMk=", + "integrity": "sha512-uOtts8NqDcaCt1rIsO3VFDRsAfgE4c6osG4d9z3l4dCBlxYFzni6Di/oNU270SDrjkfZuUvLZx1rxMyqh46Y9w==", "requires": { "data-uri-to-buffer": "0.0.3" } @@ -12203,9 +12075,9 @@ "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=" }, "passport": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/passport/-/passport-0.5.0.tgz", - "integrity": "sha512-ln+ue5YaNDS+fes6O5PCzXKSseY5u8MYhX9H5Co4s+HfYI5oqvnHKoOORLYDUPh+8tHvrxugF2GFcUA1Q1Gqfg==", + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/passport/-/passport-0.5.3.tgz", + "integrity": "sha512-gGc+70h4gGdBWNsR3FuV3byLDY6KBTJAIExGFXTpQaYfbbcHCBlRRKx7RBQSpqEqc5Hh2qVzRs7ssvSfOpkUEA==", "requires": { "passport-strategy": "1.x.x", "pause": "0.0.1" @@ -12293,7 +12165,7 @@ "path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" + "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" }, "path-type": { "version": "2.0.0", @@ -12319,7 +12191,7 @@ "pause": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz", - "integrity": "sha1-HUCLP9t2kjuVQ9lvtMnf1TXZy10=" + "integrity": "sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==" }, "pause-stream": { "version": "0.0.11", @@ -12467,7 +12339,7 @@ "pngjs-nozlib": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/pngjs-nozlib/-/pngjs-nozlib-1.0.0.tgz", - "integrity": "sha1-nmTWAs/pzOTZ1Zl9BodCmnPwt9c=" + "integrity": "sha512-N1PggqLp9xDqwAoKvGohmZ3m4/N9xpY0nDZivFqQLcpLHmliHnCp9BuNCsOeqHWMuEEgFjpEaq9dZq6RZyy0fA==" }, "posix-character-classes": { "version": "0.1.1", @@ -12512,7 +12384,8 @@ "prepend-http": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" + "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", + "optional": true }, "pretty-bytes": { "version": "5.3.0", @@ -12661,14 +12534,6 @@ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" }, - "pupa": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.0.1.tgz", - "integrity": "sha512-hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA==", - "requires": { - "escape-goat": "^2.0.0" - } - }, "q": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", @@ -12774,6 +12639,7 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "dev": true, "requires": { "deep-extend": "^0.6.0", "ini": "~1.3.0", @@ -12851,9 +12717,9 @@ } }, "readdirp": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz", - "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "requires": { "picomatch": "^2.2.1" } @@ -12970,22 +12836,6 @@ "unicode-match-property-value-ecmascript": "^2.1.0" } }, - "registry-auth-token": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.0.tgz", - "integrity": "sha512-P+lWzPrsgfN+UEpDS3U8AQKg/UjZX6mQSJueZj3EK+vNESoqBSpBUD3gmu4sF9lOsjXWjF11dQKUqemf3veq1w==", - "requires": { - "rc": "^1.2.8" - } - }, - "registry-url": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz", - "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==", - "requires": { - "rc": "^1.2.8" - } - }, "regjsparser": { "version": "0.9.1", "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz", @@ -13153,6 +13003,11 @@ "integrity": "sha1-7W2Lm9Y4wTMosV3YOL1mYRHdeBw=", "dev": true }, + "require-at": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/require-at/-/require-at-1.0.6.tgz", + "integrity": "sha512-7i1auJbMUrXEAZCOQ0VNJgmcT2VOKPRl2YGJwgpHpC9CE91Mv4/4UYIUm4chGJaI381ZDq1JUicFii64Hapd8g==" + }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -13198,7 +13053,7 @@ "resolve-from": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", - "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=", + "integrity": "sha512-qpFcKaXsq8+oRoLilkwyc7zHGF5i9Q2/25NIgLQQ/+VVv9rU4qvr6nXVAw1DsnXJyQkZsR4Ytfbtg5ehfcUssQ==", "dev": true } } @@ -13262,6 +13117,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", + "optional": true, "requires": { "lowercase-keys": "^1.0.0" } @@ -13473,21 +13329,6 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" }, - "semver-diff": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz", - "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==", - "requires": { - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - } - } - }, "semver-greatest-satisfied-range": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz", @@ -13542,7 +13383,7 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" } } }, @@ -13809,7 +13650,7 @@ "sliced": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz", - "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E=" + "integrity": "sha512-VZBmZP8WU3sMOZm1bdgTadsQbcscK0UM8oKxKVBs4XAhUo2Xxzm/OFMGBkPusxw9xL3Uy8LrzEqGqJhclsr0yA==" }, "snapdragon": { "version": "0.8.2", @@ -14084,7 +13925,7 @@ "concat-stream": { "version": "1.5.2", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz", - "integrity": "sha1-cIl4Yk2FavQaWnQd790mHadSwmY=", + "integrity": "sha512-H6xsIBfQ94aESBG8jGHXQ7i5AEpy5ZeVaLDOisDICiTCKpqEfr34/KmTrspKQNoLKNu9gTkovlpQcUi630AKiQ==", "requires": { "inherits": "~2.0.1", "readable-stream": "~2.0.0", @@ -14094,7 +13935,7 @@ "process-nextick-args": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" + "integrity": "sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==" }, "readable-stream": { "version": "2.0.6", @@ -14390,7 +14231,8 @@ "strip-json-comments": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "dev": true }, "strip-outer": { "version": "1.0.1", @@ -14402,9 +14244,9 @@ } }, "stripe": { - "version": "12.9.0", - "resolved": "https://registry.npmjs.org/stripe/-/stripe-12.9.0.tgz", - "integrity": "sha512-stYtrWetRYUsEbsUVyJaPG9Sppt0ds2szBqXsuDG6KZPPuUmCccbpceLrhoOBwNl1RziEfNB7oG9wg1n2eW+EQ==", + "version": "12.18.0", + "resolved": "https://registry.npmjs.org/stripe/-/stripe-12.18.0.tgz", + "integrity": "sha512-cYjgBM2SY/dTm8Lr6eMyyONaHTZHA/QjHxFUIW5WH8FevSRIGAVtXEmBkUXF1fsqe7QvvRgQSGSJZmjDacegGg==", "requires": { "@types/node": ">=8.1.0", "qs": "^6.11.0" @@ -14429,7 +14271,7 @@ "stubs": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz", - "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls=" + "integrity": "sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw==" }, "style-loader": { "version": "3.3.1", @@ -14716,11 +14558,6 @@ } } }, - "term-size": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz", - "integrity": "sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==" - }, "terser": { "version": "5.16.3", "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.3.tgz", @@ -14959,7 +14796,7 @@ "to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==" + "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" }, "to-object-path": { "version": "0.3.0", @@ -14984,11 +14821,6 @@ } } }, - "to-readable-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", - "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==" - }, "to-regex": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", @@ -15189,14 +15021,6 @@ "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" }, - "typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", - "requires": { - "is-typedarray": "^1.0.0" - } - }, "uc.micro": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", @@ -15229,27 +15053,9 @@ "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=" }, "undefsafe": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.3.tgz", - "integrity": "sha512-nrXZwwXrD/T/JXeygJqdCO6NZZ1L66HrxM/Z7mIq2oPanoN0F1nLx3lwJMu6AwJY69hdixaFQOuoYsMjE5/C2A==", - "requires": { - "debug": "^2.2.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - } - } + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", + "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==" }, "underscore": { "version": "1.8.3", @@ -15342,14 +15148,6 @@ "through2-filter": "^3.0.0" } }, - "unique-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", - "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", - "requires": { - "crypto-random-string": "^2.0.0" - } - }, "universal-analytics": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.5.3.tgz", @@ -15440,72 +15238,6 @@ "picocolors": "^1.0.0" } }, - "update-notifier": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.0.tgz", - "integrity": "sha512-w3doE1qtI0/ZmgeoDoARmI5fjDoT93IfKgEGqm26dGUOh8oNpaSTsGNdYRN/SjOuo10jcJGwkEL3mroKzktkew==", - "requires": { - "boxen": "^4.2.0", - "chalk": "^3.0.0", - "configstore": "^5.0.1", - "has-yarn": "^2.1.0", - "import-lazy": "^2.1.0", - "is-ci": "^2.0.0", - "is-installed-globally": "^0.3.1", - "is-npm": "^4.0.0", - "is-yarn-global": "^0.3.0", - "latest-version": "^5.0.0", - "pupa": "^2.0.1", - "semver-diff": "^3.1.1", - "xdg-basedir": "^4.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" - }, - "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "uri-js": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", @@ -15530,7 +15262,7 @@ "punycode": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" + "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==" } } }, @@ -15538,6 +15270,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", + "optional": true, "requires": { "prepend-http": "^2.0.0" } @@ -15636,9 +15369,9 @@ } }, "validator": { - "version": "13.9.0", - "resolved": "https://registry.npmjs.org/validator/-/validator-13.9.0.tgz", - "integrity": "sha512-B+dGG8U3fdtM0/aNK4/X8CXq/EcxU2WPrPEkJGslb47qyHsxmbggTWK0yEA4qnYVNF+nxNlN88o14hIcPmSIEA==" + "version": "13.11.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-13.11.0.tgz", + "integrity": "sha512-Ii+sehpSfZy+At5nPdnyMhx78fEoPDkR2XW/zimHEL3MyGJQOCQ7WeP20jPYRz7ZCpcKLB21NxuXHF3bxjStBQ==" }, "value-or-function": { "version": "3.0.0", @@ -15729,12 +15462,12 @@ "clone": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=" + "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==" }, "clone-stats": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", - "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=" + "integrity": "sha512-dhUqc57gSMCo6TX85FLfe51eC/s+Im2MLkAgJwfaRRexR2tA4dd3eLEW4L6efzHc2iNorrRRXITifnDLlRrhaA==" }, "replace-ext": { "version": "0.0.1", @@ -16093,14 +15826,6 @@ } } }, - "widest-line": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", - "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==", - "requires": { - "string-width": "^4.0.0" - } - }, "wildcard": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", @@ -16245,22 +15970,6 @@ "mkdirp": "^0.5.1" } }, - "write-file-atomic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", - "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", - "requires": { - "imurmurhash": "^0.1.4", - "is-typedarray": "^1.0.0", - "signal-exit": "^3.0.2", - "typedarray-to-buffer": "^3.1.5" - } - }, - "xdg-basedir": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", - "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==" - }, "xml-crypto": { "version": "0.10.1", "resolved": "https://registry.npmjs.org/xml-crypto/-/xml-crypto-0.10.1.tgz", diff --git a/package.json b/package.json index f5142dd939..2cab790d72 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,14 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "5.3.0", + "version": "5.7.0", "main": "./website/server/index.js", "dependencies": { - "@babel/core": "^7.22.5", + "@babel/core": "^7.22.10", "@babel/preset-env": "^7.22.10", "@babel/register": "^7.22.5", "@google-cloud/trace-agent": "^7.1.2", - "@parse/node-apn": "^5.1.3", + "@parse/node-apn": "^5.2.3", "@slack/webhook": "^6.1.0", "accepts": "^1.3.8", "amazon-payments": "^0.2.9", @@ -17,7 +17,7 @@ "apple-auth": "^1.0.9", "bcrypt": "^5.1.1", "body-parser": "^1.20.2", - "bootstrap": "^4.6.0", + "bootstrap": "^4.6.2", "compression": "^1.7.4", "cookie-session": "^2.0.0", "coupon-code": "^0.4.5", @@ -31,11 +31,12 @@ "express-basic-auth": "^1.2.1", "express-validator": "^5.2.0", "glob": "^8.1.0", - "got": "^11.8.3", + "got": "^11.8.6", "gulp": "^4.0.0", "gulp-babel": "^8.0.0", "gulp-imagemin": "^7.1.0", "gulp-nodemon": "^2.5.0", + "nodemon": "^2.0.20", "gulp.spritesmith": "^6.13.0", "habitica-markdown": "^3.0.0", "helmet": "^4.6.0", @@ -49,12 +50,12 @@ "method-override": "^3.0.0", "moment": "^2.29.4", "moment-recur": "^1.0.7", - "mongoose": "^5.13.7", + "mongoose": "^5.13.20", "morgan": "^1.10.0", "nconf": "^0.12.0", "node-gcm": "^1.0.5", "on-headers": "^1.0.2", - "passport": "^0.5.0", + "passport": "^0.5.3", "passport-facebook": "^3.0.0", "passport-google-oauth2": "^0.2.0", "passport-google-oauth20": "2.0.0", @@ -67,12 +68,12 @@ "remove-markdown": "^0.5.0", "rimraf": "^3.0.2", "short-uuid": "^4.2.2", - "stripe": "^12.9.0", + "stripe": "^12.18.0", "superagent": "^8.1.2", "universal-analytics": "^0.5.3", "useragent": "^2.1.9", "uuid": "^9.0.0", - "validator": "^13.9.0", + "validator": "^13.11.0", "vinyl-buffer": "^1.0.1", "winston": "^3.10.0", "winston-loggly-bulk": "^3.2.1", @@ -110,7 +111,7 @@ "apidoc": "gulp apidoc" }, "devDependencies": { - "axios": "^1.3.6", + "axios": "^1.4.0", "chai": "^4.3.7", "chai-as-promised": "^7.1.1", "chai-moment": "^0.1.0", diff --git a/test/api/v3/integration/members/POST-members_memberId_clear-flags.js b/test/api/v3/integration/members/POST-members_memberId_clear-flags.js new file mode 100644 index 0000000000..a135e698b2 --- /dev/null +++ b/test/api/v3/integration/members/POST-members_memberId_clear-flags.js @@ -0,0 +1,64 @@ +import { v4 as generateUUID } from 'uuid'; +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /members/:memberId/clear-flags', () => { + let reporter; + let admin; + let moderator; + + beforeEach(async () => { + reporter = await generateUser(); + admin = await generateUser({ permissions: { userSupport: true } }); + moderator = await generateUser({ permissions: { moderator: true } }); + await reporter.post(`/members/${admin._id}/flag`); + }); + + context('error cases', () => { + it('returns error when memberId is not a UUID', async () => { + await expect(moderator.post('/members/gribbly/clear-flags')) + .to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); + + it('returns error when member with UUID is not found', async () => { + const randomId = generateUUID(); + + await expect(moderator.post(`/members/${randomId}/clear-flags`)) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('userWithIDNotFound', { userId: randomId }), + }); + }); + + it('returns error when requesting user is not a moderator', async () => { + await expect(reporter.post(`/members/${admin._id}/clear-flags`)) + .to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: 'Only a moderator may clear reports from a profile.', + }); + }); + }); + + context('valid request', () => { + it('removes a single flag from user', async () => { + await expect(moderator.post(`/members/${admin._id}/clear-flags`)).to.eventually.be.ok; + const updatedTarget = await admin.get(`/hall/heroes/${admin._id}`); + expect(updatedTarget.profile.flags).to.eql({}); + }); + + it('removes multiple flags from user', async () => { + await moderator.post(`/members/${admin._id}/flag`); + await expect(moderator.post(`/members/${admin._id}/clear-flags`)).to.eventually.be.ok; + const updatedTarget = await admin.get(`/hall/heroes/${admin._id}`); + expect(updatedTarget.profile.flags).to.eql({}); + }); + }); +}); diff --git a/test/api/v3/integration/members/POST-members_memberId_flag.js b/test/api/v3/integration/members/POST-members_memberId_flag.js new file mode 100644 index 0000000000..964660d959 --- /dev/null +++ b/test/api/v3/integration/members/POST-members_memberId_flag.js @@ -0,0 +1,151 @@ +import { v4 as generateUUID } from 'uuid'; +import moment from 'moment'; +import nconf from 'nconf'; +import { IncomingWebhook } from '@slack/webhook'; +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /members/:memberId/flag', () => { + let reporter; + let target; + + beforeEach(async () => { + reporter = await generateUser(); + target = await generateUser({ + 'profile.blurb': 'Naughty Text', + 'profile.imageUrl': 'https://evil.com/', + }); + }); + + context('error cases', () => { + it('returns error when memberId is not a UUID', async () => { + await expect(reporter.post('/members/gribbly/flag')) + .to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); + + it('returns error when member with UUID is not found', async () => { + const randomId = generateUUID(); + + await expect(reporter.post(`/members/${randomId}/flag`)) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('userWithIDNotFound', { userId: randomId }), + }); + }); + + it('returns error when non-admin flags same profile twice', async () => { + await reporter.post(`/members/${target._id}/flag`); + await expect(reporter.post(`/members/${target._id}/flag`)) + .to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: 'A profile can not be flagged more than once by the same user.', + }); + }); + }); + + context('valid request', () => { + let admin; + const comment = 'this profile is bad'; + const source = 'Third Party Script'; + + beforeEach(async () => { + admin = await generateUser({ 'permissions.userSupport': true }); + sandbox.stub(IncomingWebhook.prototype, 'send').returns(Promise.resolve()); + }); + + afterEach(() => { + sandbox.restore(); + }); + + it('adds flags object to target user', async () => { + await reporter.post(`/members/${target._id}/flag`); + const updatedTarget = await admin.get(`/hall/heroes/${target._id}`); + expect(updatedTarget.profile.flags[reporter._id]).to.have.all.keys([ + 'comment', + 'source', + 'timestamp', + ]); + expect(moment(updatedTarget.profile.flags[reporter._id].timestamp).toDate()).to.be.a('date'); + }); + + it('allows addition of a comment and source', async () => { + await reporter.post(`/members/${target._id}/flag`, { + comment, + source, + }); + const updatedTarget = await admin.get(`/hall/heroes/${target._id}`); + expect(updatedTarget.profile.flags[reporter._id].comment).to.eql(comment); + expect(updatedTarget.profile.flags[reporter._id].source).to.eql(source); + }); + + it('allows moderator to flag twice', async () => { + const moderator = await generateUser({ 'permissions.moderator': true }); + await moderator.post(`/members/${target._id}/flag`); + await expect(moderator.post(`/members/${target._id}/flag`)).to.eventually.be.ok; + }); + + it('allows multiple non-moderators to flag individually', async () => { + await admin.post(`/members/${target._id}/flag`); + await reporter.post(`/members/${target._id}/flag`); + const updatedTarget = await admin.get(`/hall/heroes/${target._id}`); + expect(updatedTarget.profile.flags[admin._id]).to.exist; + expect(updatedTarget.profile.flags[reporter._id]).to.exist; + }); + + it('sends a flag report to moderation Slack', async () => { + const BASE_URL = nconf.get('BASE_URL'); + await reporter.post(`/members/${target._id}/flag`, { + comment, + source, + }); + + /* eslint-disable camelcase */ + expect(IncomingWebhook.prototype.send).to.be.calledWith({ + text: `@${reporter.auth.local.username} (${reporter._id}; language: ${reporter.preferences.language}) flagged @${target.auth.local.username}'s profile from ${source} and commented: ${comment}`, + attachments: [{ + fallback: 'Flag Profile', + color: 'danger', + title: 'User Profile Report', + title_link: `${BASE_URL}/profile/${target._id}`, + text: `Display Name: ${target.profile.name}\n\nImage URL: ${target.profile.imageUrl}\n\nAbout: ${target.profile.blurb}`, + mrkdwn_in: [ + 'text', + ], + }], + }); + /* eslint-enable camelcase */ + }); + + it('excludes empty fields when sending Slack message', async () => { + const BASE_URL = nconf.get('BASE_URL'); + await reporter.post(`/members/${admin._id}/flag`, { + comment, + source, + }); + + /* eslint-disable camelcase */ + expect(IncomingWebhook.prototype.send).to.be.calledWith({ + text: `@${reporter.auth.local.username} (${reporter._id}; language: ${reporter.preferences.language}) flagged @${admin.auth.local.username}'s profile from ${source} and commented: ${comment}`, + attachments: [{ + fallback: 'Flag Profile', + color: 'danger', + title: 'User Profile Report', + title_link: `${BASE_URL}/profile/${admin._id}`, + text: `Display Name: ${admin.profile.name}`, + mrkdwn_in: [ + 'text', + ], + }], + }); + /* eslint-enable camelcase */ + }); + }); +}); diff --git a/test/api/v4/user/POST-user_reset.test.js b/test/api/v4/user/POST-user_reset.test.js index c96e30f93a..2aba79baff 100644 --- a/test/api/v4/user/POST-user_reset.test.js +++ b/test/api/v4/user/POST-user_reset.test.js @@ -21,7 +21,9 @@ describe('POST /user/reset', () => { type: 'habit', }); - await user.post('/user/reset'); + await user.post('/user/reset', { + password: 'password', + }); await user.sync(); await expect(user.get(`/tasks/${task._id}`)).to.eventually.be.rejected.and.eql({ @@ -39,7 +41,9 @@ describe('POST /user/reset', () => { type: 'daily', }); - await user.post('/user/reset'); + await user.post('/user/reset', { + password: 'password', + }); await user.sync(); await expect(user.get(`/tasks/${task._id}`)).to.eventually.be.rejected.and.eql({ @@ -57,7 +61,9 @@ describe('POST /user/reset', () => { type: 'todo', }); - await user.post('/user/reset'); + await user.post('/user/reset', { + password: 'password', + }); await user.sync(); await expect(user.get(`/tasks/${task._id}`)).to.eventually.be.rejected.and.eql({ @@ -75,7 +81,9 @@ describe('POST /user/reset', () => { type: 'reward', }); - await user.post('/user/reset'); + await user.post('/user/reset', { + password: 'password', + }); await user.sync(); await expect(user.get(`/tasks/${task._id}`)).to.eventually.be.rejected.and.eql({ @@ -87,6 +95,26 @@ describe('POST /user/reset', () => { expect(user.tasksOrder.rewards).to.be.empty; }); + it('does not allow to reset if the password is missing', async () => { + await expect(user.post('/user/reset', { + password: '', + })).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('missingPassword'), + }); + }); + + it('does not allow to reset if the password is wrong', async () => { + await expect(user.post('/user/reset', { + password: 'passdw', + })).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('wrongPassword'), + }); + }); + it('does not delete challenge or group tasks', async () => { const guild = await generateGroup(user, {}, { 'purchased.plan.customerId': 'group-unlimited' }); const challenge = await generateChallenge(user, guild); @@ -102,7 +130,9 @@ describe('POST /user/reset', () => { }); await user.post(`/tasks/${groupTask._id}/assign`, [user._id]); - await user.post('/user/reset'); + await user.post('/user/reset', { + password: 'password', + }); await user.sync(); await user.put('/user', { @@ -133,7 +163,9 @@ describe('POST /user/reset', () => { }, }); - await hero.post('/user/reset'); + await user.post('/user/reset', { + password: 'password', + }); const heroRes = await admin.get(`/hall/heroes/${hero.auth.local.username}`); diff --git a/test/common/ops/addTask.js b/test/common/ops/addTask.js index 6f02f47fdc..e32c3525a6 100644 --- a/test/common/ops/addTask.js +++ b/test/common/ops/addTask.js @@ -126,13 +126,5 @@ describe('shared.ops.addTask', () => { expect(addTask(user)._editing).not.be.ok; expect(addTask(user)._edit).to.not.be.ok; }); - - it('respects advancedCollapsed preference', () => { - user.preferences.advancedCollapsed = true; - expect(addTask(user)._advanced).not.be.ok; - - user.preferences.advancedCollapsed = false; - expect(addTask(user)._advanced).to.be.ok; - }); }); }); diff --git a/test/common/ops/buy/purchase.js b/test/common/ops/buy/purchase.js index fa5f7c5473..962175d2ae 100644 --- a/test/common/ops/buy/purchase.js +++ b/test/common/ops/buy/purchase.js @@ -197,14 +197,14 @@ describe('shared.ops.purchase', () => { it('purchases quest bundles', async () => { const startingBalance = user.balance; - const clock = sandbox.useFakeTimers(moment('2019-05-20').valueOf()); + const clock = sandbox.useFakeTimers(moment('2022-03-16').valueOf()); const type = 'bundles'; - const key = 'featheredFriends'; + const key = 'cuddleBuddies'; const price = 1.75; const questList = [ - 'falcon', - 'harpy', - 'owl', + 'bunny', + 'ferret', + 'guineapig', ]; await purchase(user, { params: { type, key } }); diff --git a/website/client/.eslintrc.js b/website/client/.eslintrc.js index 7dc69cc284..f880031749 100644 --- a/website/client/.eslintrc.js +++ b/website/client/.eslintrc.js @@ -15,6 +15,7 @@ module.exports = { 'import/no-unresolved': 'off', 'import/extensions': 'off', 'vue/no-v-html': 'off', + 'vue/no-mutating-props': 'warn', 'vue/html-self-closing': ['error', { html: { void: 'never', diff --git a/website/client/README.md b/website/client/README.md index 400b7cf9f3..a2f31b718f 100644 --- a/website/client/README.md +++ b/website/client/README.md @@ -55,3 +55,13 @@ in a separate `.add('function of component', ...` ### Storybook Build After each client build, storybook build is also triggered and will be available in `dist/storybook` + +### Vue Structure + +Currently pages and components are mixed in `/src/components` this is not a good way to find the files easy. + +Thats why each changed / upcoming page / component should be put in either `/src/components` or in the `/src/pages` directory. + +Inside Pages, each page can have a subfolder which contains sub-components only needed for that page - otherwise it has to be added to the normal components folder. + +At the end of all the changes - the components should only contain components needed between all pages diff --git a/website/client/package-lock.json b/website/client/package-lock.json index 7dae385ce4..b953f2507b 100644 --- a/website/client/package-lock.json +++ b/website/client/package-lock.json @@ -13318,11 +13318,34 @@ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, + "emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", + "optional": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "optional": true + }, "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, + "loader-utils": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", @@ -13354,6 +13377,38 @@ "ansi-regex": "^5.0.1" } }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.8.3", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz", + "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + }, + "dependencies": { + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + } + } + }, "wrap-ansi": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", @@ -17346,7 +17401,7 @@ "de-indent": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", - "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=" + "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==" }, "debug": { "version": "4.1.1", @@ -18568,13 +18623,29 @@ } }, "eslint-plugin-vue": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-6.2.2.tgz", - "integrity": "sha512-Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ==", + "version": "7.20.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.20.0.tgz", + "integrity": "sha512-oVNDqzBC9h3GO+NTgWeLMhhGigy6/bQaQbHS+0z7C4YEu/qK/yxHvca/2PTZtGNPsCrHwOTgKMrwu02A9iPBmw==", "requires": { + "eslint-utils": "^2.1.0", "natural-compare": "^1.4.0", - "semver": "^5.6.0", - "vue-eslint-parser": "^7.0.0" + "semver": "^6.3.0", + "vue-eslint-parser": "^7.10.0" + }, + "dependencies": { + "eslint-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "requires": { + "eslint-visitor-keys": "^1.1.0" + } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + } } }, "eslint-scope": { @@ -21856,7 +21927,7 @@ "is-window": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-window/-/is-window-1.0.2.tgz", - "integrity": "sha1-LIlspT25feRdPDMTOmXYyfVjSA0=" + "integrity": "sha512-uj00kdXyZb9t9RcAUAwMZAnkBUwdYGhYlt7djMXhfyhUCzwNba50tIiBKR7q0l7tdoBtFVw/3JmLY6fI3rmZmg==" }, "is-windows": { "version": "1.0.2", @@ -30255,7 +30326,7 @@ "uuid-browser": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/uuid-browser/-/uuid-browser-3.1.0.tgz", - "integrity": "sha1-DwWkCu90+eWVHiDvv0SxGHHlZBA=" + "integrity": "sha512-dsNgbLaTrd6l3MMxTtouOCFw4CBFc/3a+GgYA2YyrJvyQ1u6q4pcu3ktLoUZ/VN/Aw9WsauazbgsgdfVWgAKQg==" }, "v8-compile-cache": { "version": "2.1.0", @@ -30549,29 +30620,90 @@ } }, "vue-eslint-parser": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.0.0.tgz", - "integrity": "sha512-yR0dLxsTT7JfD2YQo9BhnQ6bUTLsZouuzt9SKRP7XNaZJV459gvlsJo4vT2nhZ/2dH9j3c53bIx9dnqU2prM9g==", + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz", + "integrity": "sha512-qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg==", "requires": { "debug": "^4.1.1", - "eslint-scope": "^5.0.0", + "eslint-scope": "^5.1.1", "eslint-visitor-keys": "^1.1.0", - "espree": "^6.1.2", - "esquery": "^1.0.1", - "lodash": "^4.17.15" + "espree": "^6.2.1", + "esquery": "^1.4.0", + "lodash": "^4.17.21", + "semver": "^6.3.0" }, "dependencies": { + "acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==" + }, + "acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==" + }, "eslint-scope": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz", - "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "requires": { - "esrecurse": "^4.1.0", + "esrecurse": "^4.3.0", "estraverse": "^4.1.1" } + }, + "espree": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz", + "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==", + "requires": { + "acorn": "^7.1.1", + "acorn-jsx": "^5.2.0", + "eslint-visitor-keys": "^1.1.0" + } + }, + "esquery": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", + "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", + "requires": { + "estraverse": "^5.1.0" + }, + "dependencies": { + "estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==" + } + } + }, + "esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "requires": { + "estraverse": "^5.2.0" + }, + "dependencies": { + "estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==" + } + } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" } } }, + "vue-fragment": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/vue-fragment/-/vue-fragment-1.6.0.tgz", + "integrity": "sha512-a5T8ZZZK/EQzgVShEl374HbobUJ0a7v12BzOzS6Z/wd/5EE/5SffcyHC+7bf9hP3L7Yc0hhY/GhMdwFQ25O/8A==" + }, "vue-functional-data-merge": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/vue-functional-data-merge/-/vue-functional-data-merge-3.1.0.tgz", @@ -30606,76 +30738,6 @@ } } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.8.3", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz", - "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==" - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" - }, - "loader-utils": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", - "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-mugen-scroll": { "version": "0.2.6", "resolved": "https://registry.npmjs.org/vue-mugen-scroll/-/vue-mugen-scroll-0.2.6.tgz", @@ -30706,6 +30768,340 @@ } } }, + "vue-template-babel-compiler": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/vue-template-babel-compiler/-/vue-template-babel-compiler-2.0.0.tgz", + "integrity": "sha512-O0GOktQ5TZCZ5sWVl8CbyLBFriwwai7xDBtpdUI1xZSbbVVNf5Um/mDHYJXaHX6vfhmeAuohggXxIi0RPgXZ4g==", + "requires": { + "@babel/core": "^7.14.3", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5", + "@babel/plugin-proposal-object-rest-spread": "^7.15.6", + "@babel/plugin-proposal-optional-chaining": "^7.14.2", + "@babel/plugin-transform-arrow-functions": "^7.14.5", + "@babel/plugin-transform-block-scoping": "^7.14.5", + "@babel/plugin-transform-computed-properties": "^7.14.5", + "@babel/plugin-transform-destructuring": "^7.14.5", + "@babel/plugin-transform-parameters": "^7.14.5", + "@babel/plugin-transform-spread": "^7.14.5", + "@babel/types": "^7.14.5", + "deepmerge": "^4.2.2" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", + "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", + "requires": { + "@babel/highlight": "^7.18.6" + } + }, + "@babel/compat-data": { + "version": "7.20.1", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.1.tgz", + "integrity": "sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ==" + }, + "@babel/core": { + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.2.tgz", + "integrity": "sha512-w7DbG8DtMrJcFOi4VrLm+8QM4az8Mo+PuLBKLp2zrYRCow8W/f9xiXm5sN53C8HksCyDQwCKha9JiDoIyPjT2g==", + "requires": { + "@ampproject/remapping": "^2.1.0", + "@babel/code-frame": "^7.18.6", + "@babel/generator": "^7.20.2", + "@babel/helper-compilation-targets": "^7.20.0", + "@babel/helper-module-transforms": "^7.20.2", + "@babel/helpers": "^7.20.1", + "@babel/parser": "^7.20.2", + "@babel/template": "^7.18.10", + "@babel/traverse": "^7.20.1", + "@babel/types": "^7.20.2", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.1", + "semver": "^6.3.0" + } + }, + "@babel/generator": { + "version": "7.20.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.4.tgz", + "integrity": "sha512-luCf7yk/cm7yab6CAW1aiFnmEfBJplb/JojV56MYEK7ziWfGmFlTfmL9Ehwfy4gFhbjBfWO1wj7/TuSbVNEEtA==", + "requires": { + "@babel/types": "^7.20.2", + "@jridgewell/gen-mapping": "^0.3.2", + "jsesc": "^2.5.1" + } + }, + "@babel/helper-compilation-targets": { + "version": "7.20.0", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz", + "integrity": "sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==", + "requires": { + "@babel/compat-data": "^7.20.0", + "@babel/helper-validator-option": "^7.18.6", + "browserslist": "^4.21.3", + "semver": "^6.3.0" + } + }, + "@babel/helper-environment-visitor": { + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", + "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==" + }, + "@babel/helper-function-name": { + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", + "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==", + "requires": { + "@babel/template": "^7.18.10", + "@babel/types": "^7.19.0" + } + }, + "@babel/helper-hoist-variables": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", + "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", + "requires": { + "@babel/types": "^7.18.6" + } + }, + "@babel/helper-module-imports": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", + "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==", + "requires": { + "@babel/types": "^7.18.6" + } + }, + "@babel/helper-module-transforms": { + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz", + "integrity": "sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==", + "requires": { + "@babel/helper-environment-visitor": "^7.18.9", + "@babel/helper-module-imports": "^7.18.6", + "@babel/helper-simple-access": "^7.20.2", + "@babel/helper-split-export-declaration": "^7.18.6", + "@babel/helper-validator-identifier": "^7.19.1", + "@babel/template": "^7.18.10", + "@babel/traverse": "^7.20.1", + "@babel/types": "^7.20.2" + } + }, + "@babel/helper-plugin-utils": { + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz", + "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==" + }, + "@babel/helper-simple-access": { + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz", + "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==", + "requires": { + "@babel/types": "^7.20.2" + } + }, + "@babel/helper-skip-transparent-expression-wrappers": { + "version": "7.20.0", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz", + "integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==", + "requires": { + "@babel/types": "^7.20.0" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", + "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", + "requires": { + "@babel/types": "^7.18.6" + } + }, + "@babel/helper-validator-identifier": { + "version": "7.19.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", + "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==" + }, + "@babel/helper-validator-option": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz", + "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==" + }, + "@babel/helpers": { + "version": "7.20.1", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.1.tgz", + "integrity": "sha512-J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg==", + "requires": { + "@babel/template": "^7.18.10", + "@babel/traverse": "^7.20.1", + "@babel/types": "^7.20.0" + } + }, + "@babel/highlight": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", + "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "requires": { + "@babel/helper-validator-identifier": "^7.18.6", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.20.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.3.tgz", + "integrity": "sha512-OP/s5a94frIPXwjzEcv5S/tpQfc6XhxYUnmWpgdqMWGgYCuErA3SzozaRAMQgSZWKeTJxht9aWAkUY+0UzvOFg==" + }, + "@babel/plugin-proposal-nullish-coalescing-operator": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz", + "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==", + "requires": { + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" + } + }, + "@babel/plugin-proposal-object-rest-spread": { + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.2.tgz", + "integrity": "sha512-Ks6uej9WFK+fvIMesSqbAto5dD8Dz4VuuFvGJFKgIGSkJuRGcrwGECPA1fDgQK3/DbExBJpEkTeYeB8geIFCSQ==", + "requires": { + "@babel/compat-data": "^7.20.1", + "@babel/helper-compilation-targets": "^7.20.0", + "@babel/helper-plugin-utils": "^7.20.2", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-transform-parameters": "^7.20.1" + } + }, + "@babel/plugin-transform-arrow-functions": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz", + "integrity": "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.18.6" + } + }, + "@babel/plugin-transform-block-scoping": { + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.2.tgz", + "integrity": "sha512-y5V15+04ry69OV2wULmwhEA6jwSWXO1TwAtIwiPXcvHcoOQUqpyMVd2bDsQJMW8AurjulIyUV8kDqtjSwHy1uQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.20.2" + } + }, + "@babel/plugin-transform-computed-properties": { + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz", + "integrity": "sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==", + "requires": { + "@babel/helper-plugin-utils": "^7.18.9" + } + }, + "@babel/plugin-transform-destructuring": { + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz", + "integrity": "sha512-mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw==", + "requires": { + "@babel/helper-plugin-utils": "^7.20.2" + } + }, + "@babel/plugin-transform-parameters": { + "version": "7.20.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.3.tgz", + "integrity": "sha512-oZg/Fpx0YDrj13KsLyO8I/CX3Zdw7z0O9qOd95SqcoIzuqy/WTGWvePeHAnZCN54SfdyjHcb1S30gc8zlzlHcA==", + "requires": { + "@babel/helper-plugin-utils": "^7.20.2" + } + }, + "@babel/plugin-transform-spread": { + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz", + "integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==", + "requires": { + "@babel/helper-plugin-utils": "^7.19.0", + "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9" + } + }, + "@babel/template": { + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz", + "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==", + "requires": { + "@babel/code-frame": "^7.18.6", + "@babel/parser": "^7.18.10", + "@babel/types": "^7.18.10" + } + }, + "@babel/traverse": { + "version": "7.20.1", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.1.tgz", + "integrity": "sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==", + "requires": { + "@babel/code-frame": "^7.18.6", + "@babel/generator": "^7.20.1", + "@babel/helper-environment-visitor": "^7.18.9", + "@babel/helper-function-name": "^7.19.0", + "@babel/helper-hoist-variables": "^7.18.6", + "@babel/helper-split-export-declaration": "^7.18.6", + "@babel/parser": "^7.20.1", + "@babel/types": "^7.20.0", + "debug": "^4.1.0", + "globals": "^11.1.0" + } + }, + "@babel/types": { + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.2.tgz", + "integrity": "sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==", + "requires": { + "@babel/helper-string-parser": "^7.19.4", + "@babel/helper-validator-identifier": "^7.19.1", + "to-fast-properties": "^2.0.0" + } + }, + "browserslist": { + "version": "4.21.4", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", + "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", + "requires": { + "caniuse-lite": "^1.0.30001400", + "electron-to-chromium": "^1.4.251", + "node-releases": "^2.0.6", + "update-browserslist-db": "^1.0.9" + } + }, + "caniuse-lite": { + "version": "1.0.30001434", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001434.tgz", + "integrity": "sha512-aOBHrLmTQw//WFa2rcF1If9fa3ypkC1wzqqiKHgfdrXTWcU8C4gKVZT77eQAPWN1APys3+uQ0Df07rKauXGEYA==" + }, + "deepmerge": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", + "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==" + }, + "electron-to-chromium": { + "version": "1.4.284", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", + "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==" + }, + "json5": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", + "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==" + }, + "node-releases": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", + "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==" + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + } + } + }, "vue-template-compiler": { "version": "2.7.10", "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.10.tgz", diff --git a/website/client/package.json b/website/client/package.json index 0a2174cc29..8804fb0c3b 100644 --- a/website/client/package.json +++ b/website/client/package.json @@ -37,7 +37,7 @@ "eslint": "^6.8.0", "eslint-config-habitrpg": "^6.2.0", "eslint-plugin-mocha": "^5.3.0", - "eslint-plugin-vue": "^6.2.2", + "eslint-plugin-vue": "^7.20.0", "habitica-markdown": "^3.0.0", "hellojs": "^1.20.0", "inspectpack": "^4.7.1", @@ -58,9 +58,11 @@ "validator": "^13.9.0", "vue": "^2.7.10", "vue-cli-plugin-storybook": "2.1.0", + "vue-fragment": "^1.6.0", "vue-mugen-scroll": "^0.2.6", "vue-router": "^3.6.5", "vue-template-compiler": "^2.7.10", + "vue-template-babel-compiler": "^2.0.0", "vuedraggable": "^2.24.3", "vuejs-datepicker": "git://github.com/habitrpg/vuejs-datepicker.git#153d339e4dbebb73733658aeda1d5b7fcc55b0a0", "webpack": "^4.47.0" diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css index 2f5f207a24..4edc504143 100644 --- a/website/client/src/assets/css/sprites/spritesmith-main.css +++ b/website/client/src/assets/css/sprites/spritesmith-main.css @@ -1439,6 +1439,11 @@ width: 141px; height: 147px; } +.background_jack_o_lantern_stacks { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_jack_o_lantern_stacks.png'); + width: 141px; + height: 147px; +} .background_jungle_canopy { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_jungle_canopy.png'); width: 141px; @@ -1564,6 +1569,11 @@ width: 141px; height: 147px; } +.background_monstrous_cave { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_monstrous_cave.png'); + width: 141px; + height: 147px; +} .background_mountain_lake { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_mountain_lake.png'); width: 141px; @@ -1884,6 +1894,11 @@ width: 141px; height: 147px; } +.background_spectral_candle_room { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_spectral_candle_room.png'); + width: 141px; + height: 147px; +} .background_spider_web { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_spider_web.png'); width: 141px; @@ -3200,6 +3215,11 @@ width: 68px; height: 68px; } +.icon_background_jack_o_lantern_stacks { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_jack_o_lantern_stacks.png'); + width: 68px; + height: 68px; +} .icon_background_jungle_canopy { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_jungle_canopy.png'); width: 68px; @@ -3325,6 +3345,11 @@ width: 68px; height: 68px; } +.icon_background_monstrous_cave { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_monstrous_cave.png'); + width: 68px; + height: 68px; +} .icon_background_mountain_lake { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_mountain_lake.png'); width: 68px; @@ -3645,6 +3670,11 @@ width: 68px; height: 68px; } +.icon_background_spectral_candle_room { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_spectral_candle_room.png'); + width: 68px; + height: 68px; +} .icon_background_spider_web { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_spider_web.png'); width: 68px; @@ -19130,6 +19160,11 @@ width: 114px; height: 90px; } +.head_armoire_blackSpookySorceryHat { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_blackSpookySorceryHat.png'); + width: 114px; + height: 90px; +} .head_armoire_blueFloppyHat { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_blueFloppyHat.png'); width: 90px; @@ -19395,6 +19430,11 @@ width: 90px; height: 90px; } +.head_armoire_purpleSpookySorceryHat { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_purpleSpookySorceryHat.png'); + width: 114px; + height: 90px; +} .head_armoire_ramHeaddress { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_ramHeaddress.png'); width: 90px; @@ -20505,6 +20545,11 @@ width: 68px; height: 68px; } +.shop_head_armoire_blackSpookySorceryHat { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_armoire_blackSpookySorceryHat.png'); + width: 68px; + height: 68px; +} .shop_head_armoire_blueFloppyHat { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_armoire_blueFloppyHat.png'); width: 68px; @@ -20770,6 +20815,11 @@ width: 68px; height: 68px; } +.shop_head_armoire_purpleSpookySorceryHat { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_armoire_purpleSpookySorceryHat.png'); + width: 68px; + height: 68px; +} .shop_head_armoire_ramHeaddress { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_armoire_ramHeaddress.png'); width: 68px; @@ -21650,6 +21700,11 @@ width: 68px; height: 68px; } +.shop_weapon_armoire_ridingBroom { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_ridingBroom.png'); + width: 68px; + height: 68px; +} .shop_weapon_armoire_sandySpade { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_sandySpade.png'); width: 68px; @@ -22600,6 +22655,11 @@ width: 114px; height: 90px; } +.weapon_armoire_ridingBroom { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_ridingBroom.png'); + width: 114px; + height: 90px; +} .weapon_armoire_sandySpade { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_sandySpade.png'); width: 90px; @@ -23760,6 +23820,26 @@ width: 114px; height: 90px; } +.broad_armor_special_fall2023Healer { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_fall2023Healer.png'); + width: 114px; + height: 90px; +} +.broad_armor_special_fall2023Mage { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_fall2023Mage.png'); + width: 114px; + height: 90px; +} +.broad_armor_special_fall2023Rogue { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_fall2023Rogue.png'); + width: 114px; + height: 90px; +} +.broad_armor_special_fall2023Warrior { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_fall2023Warrior.png'); + width: 114px; + height: 90px; +} .broad_armor_special_fallHealer { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_fallHealer.png'); width: 90px; @@ -23950,6 +24030,26 @@ width: 114px; height: 90px; } +.head_special_fall2023Healer { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_fall2023Healer.png'); + width: 114px; + height: 90px; +} +.head_special_fall2023Mage { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_fall2023Mage.png'); + width: 114px; + height: 90px; +} +.head_special_fall2023Rogue { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_fall2023Rogue.png'); + width: 114px; + height: 90px; +} +.head_special_fall2023Warrior { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_fall2023Warrior.png'); + width: 114px; + height: 90px; +} .head_special_fallHealer { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_fallHealer.png'); width: 90px; @@ -24090,6 +24190,21 @@ width: 114px; height: 90px; } +.shield_special_fall2023Healer { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_fall2023Healer.png'); + width: 114px; + height: 90px; +} +.shield_special_fall2023Rogue { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_fall2023Rogue.png'); + width: 114px; + height: 90px; +} +.shield_special_fall2023Warrior { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_fall2023Warrior.png'); + width: 114px; + height: 90px; +} .shield_special_fallHealer { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_fallHealer.png'); width: 90px; @@ -24265,6 +24380,26 @@ width: 68px; height: 68px; } +.shop_armor_special_fall2023Healer { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_fall2023Healer.png'); + width: 68px; + height: 68px; +} +.shop_armor_special_fall2023Mage { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_fall2023Mage.png'); + width: 68px; + height: 68px; +} +.shop_armor_special_fall2023Rogue { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_fall2023Rogue.png'); + width: 68px; + height: 68px; +} +.shop_armor_special_fall2023Warrior { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_fall2023Warrior.png'); + width: 68px; + height: 68px; +} .shop_armor_special_fallHealer { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_fallHealer.png'); width: 68px; @@ -24455,6 +24590,21 @@ width: 68px; height: 68px; } +.shop_head_special_fall2023Healer { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_fall2023Healer.png'); + width: 68px; + height: 68px; +} +.shop_head_special_fall2023Mage { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_fall2023Mage.png'); + width: 68px; + height: 68px; +} +.shop_head_special_fall2023Warrior { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_fall2023Warrior.png'); + width: 68px; + height: 68px; +} .shop_head_special_fallHealer { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_fallHealer.png'); width: 68px; @@ -24595,6 +24745,21 @@ width: 68px; height: 68px; } +.shop_shield_special_fall2023Healer { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_fall2023Healer.png'); + width: 68px; + height: 68px; +} +.shop_shield_special_fall2023Rogue { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_fall2023Rogue.png'); + width: 68px; + height: 68px; +} +.shop_shield_special_fall2023Warrior { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_fall2023Warrior.png'); + width: 68px; + height: 68px; +} .shop_shield_special_fallHealer { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_fallHealer.png'); width: 68px; @@ -24770,6 +24935,16 @@ width: 68px; height: 68px; } +.shop_weapon_special_fall2023Healer { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_fall2023Healer.png'); + width: 68px; + height: 68px; +} +.shop_weapon_special_fall2023Rogue { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_fall2023Rogue.png'); + width: 68px; + height: 68px; +} .shop_weapon_special_fallHealer { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_fallHealer.png'); width: 68px; @@ -24790,6 +24965,21 @@ width: 68px; height: 68px; } +.shop_head_special_fall2023Rogue { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_fall2023Rogue.png'); + width: 68px; + height: 68px; +} +.shop_weapon_special_fall2023Mage { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_fall2023Mage.png'); + width: 68px; + height: 68px; +} +.shop_weapon_special_fall2023Warrior { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_fall2023Warrior.png'); + width: 68px; + height: 68px; +} .slim_armor_special_fall2015Healer { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_fall2015Healer.png'); width: 93px; @@ -24950,6 +25140,26 @@ width: 114px; height: 90px; } +.slim_armor_special_fall2023Healer { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_fall2023Healer.png'); + width: 114px; + height: 90px; +} +.slim_armor_special_fall2023Mage { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_fall2023Mage.png'); + width: 114px; + height: 90px; +} +.slim_armor_special_fall2023Rogue { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_fall2023Rogue.png'); + width: 114px; + height: 90px; +} +.slim_armor_special_fall2023Warrior { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_fall2023Warrior.png'); + width: 114px; + height: 90px; +} .slim_armor_special_fallHealer { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_fallHealer.png'); width: 90px; @@ -25130,6 +25340,26 @@ width: 114px; height: 90px; } +.weapon_special_fall2023Healer { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_fall2023Healer.png'); + width: 114px; + height: 90px; +} +.weapon_special_fall2023Mage { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_fall2023Mage.png'); + width: 114px; + height: 90px; +} +.weapon_special_fall2023Rogue { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_fall2023Rogue.png'); + width: 114px; + height: 90px; +} +.weapon_special_fall2023Warrior { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_fall2023Warrior.png'); + width: 114px; + height: 90px; +} .weapon_special_fallHealer { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_fallHealer.png'); width: 90px; @@ -28460,6 +28690,46 @@ width: 68px; height: 68px; } +.broad_armor_mystery_202310 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_202310.png'); + width: 117px; + height: 120px; +} +.headAccessory_mystery_202310 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_mystery_202310.png'); + width: 117px; + height: 120px; +} +.head_mystery_202310 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_mystery_202310.png'); + width: 117px; + height: 120px; +} +.shop_armor_mystery_202310 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_mystery_202310.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_mystery_202310 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_mystery_202310.png'); + width: 68px; + height: 68px; +} +.shop_head_mystery_202310 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_mystery_202310.png'); + width: 68px; + height: 68px; +} +.shop_set_mystery_202310 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_set_mystery_202310.png'); + width: 68px; + height: 68px; +} +.slim_armor_mystery_202310 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_mystery_202310.png'); + width: 117px; + height: 120px; +} .broad_armor_mystery_301404 { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_301404.png'); width: 90px; @@ -34474,214 +34744,6 @@ width: 68px; height: 68px; } -.headAccessory_special_bearEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_bearEars.png'); - width: 90px; - height: 90px; -} -.customize-option.headAccessory_special_bearEars { - background-position: -25px -15px; - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_bearEars.png'); - width: 60px; - height: 60px; -} -.headAccessory_special_blackHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_blackHeadband.png'); - width: 114px; - height: 90px; -} -.headAccessory_special_blueHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_blueHeadband.png'); - width: 114px; - height: 90px; -} -.headAccessory_special_cactusEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_cactusEars.png'); - width: 90px; - height: 90px; -} -.customize-option.headAccessory_special_cactusEars { - background-position: -25px -15px; - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_cactusEars.png'); - width: 60px; - height: 60px; -} -.headAccessory_special_foxEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_foxEars.png'); - width: 90px; - height: 90px; -} -.customize-option.headAccessory_special_foxEars { - background-position: -25px -15px; - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_foxEars.png'); - width: 60px; - height: 60px; -} -.headAccessory_special_greenHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_greenHeadband.png'); - width: 114px; - height: 90px; -} -.headAccessory_special_heroicCirclet { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_heroicCirclet.png'); - width: 114px; - height: 90px; -} -.headAccessory_special_lionEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_lionEars.png'); - width: 90px; - height: 90px; -} -.customize-option.headAccessory_special_lionEars { - background-position: -25px -15px; - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_lionEars.png'); - width: 60px; - height: 60px; -} -.headAccessory_special_pandaEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pandaEars.png'); - width: 90px; - height: 90px; -} -.customize-option.headAccessory_special_pandaEars { - background-position: -25px -15px; - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pandaEars.png'); - width: 60px; - height: 60px; -} -.headAccessory_special_pigEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pigEars.png'); - width: 90px; - height: 90px; -} -.customize-option.headAccessory_special_pigEars { - background-position: -25px -15px; - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pigEars.png'); - width: 60px; - height: 60px; -} -.headAccessory_special_pinkHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pinkHeadband.png'); - width: 114px; - height: 90px; -} -.headAccessory_special_redHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_redHeadband.png'); - width: 114px; - height: 90px; -} -.headAccessory_special_tigerEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_tigerEars.png'); - width: 90px; - height: 90px; -} -.customize-option.headAccessory_special_tigerEars { - background-position: -25px -15px; - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_tigerEars.png'); - width: 60px; - height: 60px; -} -.headAccessory_special_whiteHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_whiteHeadband.png'); - width: 114px; - height: 90px; -} -.headAccessory_special_wolfEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_wolfEars.png'); - width: 90px; - height: 90px; -} -.customize-option.headAccessory_special_wolfEars { - background-position: -25px -15px; - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_wolfEars.png'); - width: 60px; - height: 60px; -} -.headAccessory_special_yellowHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_yellowHeadband.png'); - width: 114px; - height: 90px; -} -.shop_headAccessory_special_bearEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_bearEars.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_blackHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_blackHeadband.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_blueHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_blueHeadband.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_cactusEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_cactusEars.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_foxEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_foxEars.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_greenHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_greenHeadband.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_heroicCirclet { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_heroicCirclet.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_lionEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_lionEars.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_pandaEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_pandaEars.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_pigEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_pigEars.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_pinkHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_pinkHeadband.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_redHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_redHeadband.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_tigerEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_tigerEars.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_whiteHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_whiteHeadband.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_wolfEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_wolfEars.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_yellowHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_yellowHeadband.png'); - width: 68px; - height: 68px; -} .head_0 { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_0.png'); width: 90px; @@ -35063,6 +35125,214 @@ width: 68px; height: 68px; } +.headAccessory_special_bearEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_bearEars.png'); + width: 90px; + height: 90px; +} +.customize-option.headAccessory_special_bearEars { + background-position: -25px -15px; + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_bearEars.png'); + width: 60px; + height: 60px; +} +.headAccessory_special_blackHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_blackHeadband.png'); + width: 114px; + height: 90px; +} +.headAccessory_special_blueHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_blueHeadband.png'); + width: 114px; + height: 90px; +} +.headAccessory_special_cactusEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_cactusEars.png'); + width: 90px; + height: 90px; +} +.customize-option.headAccessory_special_cactusEars { + background-position: -25px -15px; + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_cactusEars.png'); + width: 60px; + height: 60px; +} +.headAccessory_special_foxEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_foxEars.png'); + width: 90px; + height: 90px; +} +.customize-option.headAccessory_special_foxEars { + background-position: -25px -15px; + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_foxEars.png'); + width: 60px; + height: 60px; +} +.headAccessory_special_greenHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_greenHeadband.png'); + width: 114px; + height: 90px; +} +.headAccessory_special_heroicCirclet { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_heroicCirclet.png'); + width: 114px; + height: 90px; +} +.headAccessory_special_lionEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_lionEars.png'); + width: 90px; + height: 90px; +} +.customize-option.headAccessory_special_lionEars { + background-position: -25px -15px; + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_lionEars.png'); + width: 60px; + height: 60px; +} +.headAccessory_special_pandaEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pandaEars.png'); + width: 90px; + height: 90px; +} +.customize-option.headAccessory_special_pandaEars { + background-position: -25px -15px; + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pandaEars.png'); + width: 60px; + height: 60px; +} +.headAccessory_special_pigEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pigEars.png'); + width: 90px; + height: 90px; +} +.customize-option.headAccessory_special_pigEars { + background-position: -25px -15px; + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pigEars.png'); + width: 60px; + height: 60px; +} +.headAccessory_special_pinkHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pinkHeadband.png'); + width: 114px; + height: 90px; +} +.headAccessory_special_redHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_redHeadband.png'); + width: 114px; + height: 90px; +} +.headAccessory_special_tigerEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_tigerEars.png'); + width: 90px; + height: 90px; +} +.customize-option.headAccessory_special_tigerEars { + background-position: -25px -15px; + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_tigerEars.png'); + width: 60px; + height: 60px; +} +.headAccessory_special_whiteHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_whiteHeadband.png'); + width: 114px; + height: 90px; +} +.headAccessory_special_wolfEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_wolfEars.png'); + width: 90px; + height: 90px; +} +.customize-option.headAccessory_special_wolfEars { + background-position: -25px -15px; + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_wolfEars.png'); + width: 60px; + height: 60px; +} +.headAccessory_special_yellowHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_yellowHeadband.png'); + width: 114px; + height: 90px; +} +.shop_headAccessory_special_bearEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_bearEars.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_blackHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_blackHeadband.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_blueHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_blueHeadband.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_cactusEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_cactusEars.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_foxEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_foxEars.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_greenHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_greenHeadband.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_heroicCirclet { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_heroicCirclet.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_lionEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_lionEars.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_pandaEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_pandaEars.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_pigEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_pigEars.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_pinkHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_pinkHeadband.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_redHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_redHeadband.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_tigerEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_tigerEars.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_whiteHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_whiteHeadband.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_wolfEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_wolfEars.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_yellowHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_yellowHeadband.png'); + width: 68px; + height: 68px; +} .shield_healer_1 { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_healer_1.png'); width: 90px; diff --git a/website/client/src/assets/scss/button.scss b/website/client/src/assets/scss/button.scss index d9f9464660..5af924ae93 100644 --- a/website/client/src/assets/scss/button.scss +++ b/website/client/src/assets/scss/button.scss @@ -5,15 +5,15 @@ font-weight: bold; line-height: 1.71; border: 1px solid transparent; - padding: 0.219rem 0.75rem; - border-radius: 2px; + padding: 4px 12px; + border-radius: 4px; box-shadow: 0 1px 3px 0 rgba($black, 0.12), 0 1px 2px 0 rgba($black, 0.24); color: $white; &:hover, &:focus { box-shadow: 0 3px 6px 0 rgba($black, 0.16), 0 3px 6px 0 rgba($black, 0.24); - &:disabled, &.disabled, &.btn-flat { + &.btn-flat { box-shadow: none; } } @@ -264,6 +264,10 @@ box-shadow: none; } +.btn-cancel { + color: $blue-10; +} + .btn-small { font-size: 12px; line-height: 1.33; diff --git a/website/client/src/assets/scss/dropdown.scss b/website/client/src/assets/scss/dropdown.scss index f2e027bca2..f619baf112 100644 --- a/website/client/src/assets/scss/dropdown.scss +++ b/website/client/src/assets/scss/dropdown.scss @@ -7,6 +7,10 @@ .dropdown-toggle:hover { --caret-color: #{$purple-300}; + + &.disabled { + pointer-events: none; + } } .dropdown.show > .dropdown-toggle:not(.btn-success) { @@ -136,6 +140,8 @@ .dropdown-menu.show { min-width: 100% !important; + overflow: scroll; + max-height: 400px; } } diff --git a/website/client/src/assets/scss/form.scss b/website/client/src/assets/scss/form.scss index b161472271..b572ec26bf 100644 --- a/website/client/src/assets/scss/form.scss +++ b/website/client/src/assets/scss/form.scss @@ -26,11 +26,11 @@ input, textarea, input.form-control, textarea.form-control { color: $gray-50; border: 1px solid $gray-400; - &:hover:not(:disabled) { + &:hover:not(:disabled):not(:read-only) { border-color: $gray-300; } - &:active:not(:disabled), &:focus:not(:disabled) { + &:active:not(:disabled):not(:read-only), &:focus:not(:disabled):not(:read-only) { border-color: $purple-400; outline: 0; box-shadow: none; @@ -56,13 +56,13 @@ input, textarea, input.form-control, textarea.form-control { &.input-valid, &.input-invalid { background-repeat: no-repeat; - background-position: center right 16px; + background-position: center right 0.5rem; } &.input-valid { - padding-right: 37px; + padding-right: 27px; background-image: url(~@/assets/svg/for-css/check.svg); - background-size: 13px 10px; + background-size: 1rem; } &.input-invalid { @@ -91,8 +91,10 @@ input, textarea, input.form-control, textarea.form-control { border-color: $gray-300; } - &:focus, &:active, &:focus-within { - border: solid 1px $purple-400; + &:not(:read-only) { + &:focus, &:active, &:focus-within { + border: solid 1px $purple-400; + } } .input-group-prepend , .input-group-append { @@ -163,8 +165,22 @@ input, textarea, input.form-control, textarea.form-control { input { height: 30px; border: 0; - background: $white !important; } + + &.is-valid { + border-color: $green-10 !important; + } + + &.is-invalid { + border-color: $red-100 !important; + } +} + +.input-error { + font-size: 12px; + line-height: 1.33; + + color: $maroon-10; } .input-group-spaced { @@ -231,20 +247,20 @@ $bg-disabled-control: $gray-10; background-color: inherit; } - &:focus:not(:checked):not(:disabled)~.custom-control-label::before, + &:focus:not(:checked):not(:disabled)~.custom-control-label::before, &:active:not(:checked):not(:disabled)~.custom-control-label::before { border: 2px solid $gray-300; box-shadow: 0 0 0 2px rgba(146, 92, 243, 0.5); } - &:focus:checked:not(:disabled)~.custom-control-label::before, + &:focus:checked:not(:disabled)~.custom-control-label::before, &:active:checked:not(:disabled)~.custom-control-label::before { box-shadow: 0 0 0 2px rgba(146, 92, 243, 0.5); border-color: 2 px solid $purple-400; background-color: $purple-400; } - &:focus:disabled~.custom-control-label::before, + &:focus:disabled~.custom-control-label::before, &:active:disabled~.custom-control-label::before { box-shadow: 0 0 0 6px rgba($bg-disabled-control, 0.1); } @@ -398,8 +414,6 @@ $bg-color: $purple-400; margin-top: 0 !important; } - - // Disable default style Firefox for invalid elements. // Selectors taken from view-source:resource://gre-resources/forms.css on Firefox :not(output):-moz-ui-invalid { diff --git a/website/client/src/assets/svg/apple_black.svg b/website/client/src/assets/svg/apple_black.svg index 8fd241fed4..c488811f4c 100644 --- a/website/client/src/assets/svg/apple_black.svg +++ b/website/client/src/assets/svg/apple_black.svg @@ -1,55 +1,3 @@ - - - - - - image/svg+xml - - - - - - - - + + diff --git a/website/client/src/assets/svg/crown.svg b/website/client/src/assets/svg/crown.svg new file mode 100644 index 0000000000..c8b2610256 --- /dev/null +++ b/website/client/src/assets/svg/crown.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/website/client/src/assets/svg/for-css/check.svg b/website/client/src/assets/svg/for-css/check.svg index 5cec88fe81..2e9d0c0f3e 100644 --- a/website/client/src/assets/svg/for-css/check.svg +++ b/website/client/src/assets/svg/for-css/check.svg @@ -1,3 +1,18 @@ - - + + + + + + + + + + + + + + + + + diff --git a/website/client/src/assets/svg/level.svg b/website/client/src/assets/svg/level.svg index 325437ce95..a60b9f71b6 100644 --- a/website/client/src/assets/svg/level.svg +++ b/website/client/src/assets/svg/level.svg @@ -1 +1,3 @@ - + + + diff --git a/website/client/src/assets/svg/lock-small.svg b/website/client/src/assets/svg/lock-small.svg new file mode 100644 index 0000000000..cf4d7d330e --- /dev/null +++ b/website/client/src/assets/svg/lock-small.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/website/client/src/assets/svg/mute.svg b/website/client/src/assets/svg/mute.svg new file mode 100644 index 0000000000..8c20be79d2 --- /dev/null +++ b/website/client/src/assets/svg/mute.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/website/client/src/assets/svg/shadow-mute.svg b/website/client/src/assets/svg/shadow-mute.svg new file mode 100644 index 0000000000..77086a3ddb --- /dev/null +++ b/website/client/src/assets/svg/shadow-mute.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/website/client/src/components/auth/registerLoginReset.vue b/website/client/src/components/auth/registerLoginReset.vue index f48bbd2811..f9c41edce0 100644 --- a/website/client/src/components/auth/registerLoginReset.vue +++ b/website/client/src/components/auth/registerLoginReset.vue @@ -731,6 +731,8 @@ export default { }, }, mounted () { + this.forgotPassword = this.$route.path.startsWith('/forgot-password'); + hello.init({ google: process.env.GOOGLE_CLIENT_ID, // eslint-disable-line }); diff --git a/website/client/src/components/groups/createPartyModal.vue b/website/client/src/components/groups/createPartyModal.vue index c1021b47e7..10c43f95b0 100644 --- a/website/client/src/components/groups/createPartyModal.vue +++ b/website/client/src/components/groups/createPartyModal.vue @@ -245,12 +245,13 @@ import notifications from '@/mixins/notifications'; import closeX from '../ui/closeX'; import copyIcon from '@/assets/svg/copy.svg'; +import copyToClipboard from '@/mixins/copyToClipboard'; export default { components: { closeX, }, - mixins: [notifications], + mixins: [notifications, copyToClipboard], data () { return { icons: Object.freeze({ @@ -287,17 +288,10 @@ export default { this.$root.$emit('bv::hide::modal', 'create-party-modal'); }, copyUsername () { - if (navigator.clipboard) { - navigator.clipboard.writeText(this.user.auth.local.username); - } else { - const copyText = document.createElement('textarea'); - copyText.value = this.user.auth.local.username; - document.body.appendChild(copyText); - copyText.select(); - document.execCommand('copy'); - document.body.removeChild(copyText); - } - this.text(this.$t('usernameCopied')); + this.mixinCopyToClipboard( + this.user.auth.local.username, + this.$t('usernameCopied'), + ); }, seekParty () { this.$store.dispatch('user:set', { diff --git a/website/client/src/components/groups/inviteModal.vue b/website/client/src/components/groups/inviteModal.vue index 81872c01cd..4ec5932adb 100644 --- a/website/client/src/components/groups/inviteModal.vue +++ b/website/client/src/components/groups/inviteModal.vue @@ -86,11 +86,6 @@ color: $gray-50; } - .input-error { - color: $red-50; - font-size: 90%; - } - .input-group { border-radius: 2px; border: solid 1px $gray-400; diff --git a/website/client/src/components/groups/membersModal.vue b/website/client/src/components/groups/membersModal.vue index b987af65a5..939925d0ec 100644 --- a/website/client/src/components/groups/membersModal.vue +++ b/website/client/src/components/groups/membersModal.vue @@ -84,7 +84,7 @@ v-if="invites.length > 0" class="row" > -
+
-
+
@@ -216,7 +217,7 @@ :key="member._id" class="row" > -
+
@@ -259,10 +260,6 @@ color: #878190; } - .no-padding-left { - padding-left: 0; - } - .modal-body { padding-left: 0; padding-right: 0; @@ -303,21 +300,15 @@ } .actions { - padding-top: 5em; - + .b-dropdown { + position: absolute; + right: 24px; + top: 8px; + } .dots { height: 16px; width: 4px; } - - .btn-group { - margin-left: -2em; - margin-top: -2em; - } - - .action-icon { - margin-right: 1em; - } } #members-modal_modal_body { @@ -353,8 +344,6 @@ .nav { font-weight: bold; - margin-bottom: .5em; - margin-top: .5em; } .nav-item { diff --git a/website/client/src/components/header/index.vue b/website/client/src/components/header/index.vue index 7d95387d9c..a97d5e3205 100644 --- a/website/client/src/components/header/index.vue +++ b/website/client/src/components/header/index.vue @@ -16,6 +16,7 @@ :class-badge-position="'next-to-name'" :is-header="true" :disable-name-styling="true" + class="mr-3" />
+ {{ $t('achievements') }} {{ $t('settings') }} @@ -141,7 +141,7 @@ import { mapState } from '@/libs/store'; import userIcon from '@/assets/svg/user.svg'; import MenuDropdown from '../ui/customMenuDropdown'; -import MessageCount from './messageCount'; +import MessageCount from './messageCount.functional.vue'; import { EVENTS } from '@/libs/events'; import { PAGES } from '@/libs/consts'; diff --git a/website/client/src/components/inventory/items/index.vue b/website/client/src/components/inventory/items/index.vue index e1df439a36..5c278b176a 100644 --- a/website/client/src/components/inventory/items/index.vue +++ b/website/client/src/components/inventory/items/index.vue @@ -231,7 +231,7 @@
@@ -248,7 +248,7 @@
diff --git a/website/client/src/components/inventory/stable/hatchingModal.vue b/website/client/src/components/inventory/stable/hatchingModal.vue index ba05037e82..9efa21ae94 100644 --- a/website/client/src/components/inventory/stable/hatchingModal.vue +++ b/website/client/src/components/inventory/stable/hatchingModal.vue @@ -6,10 +6,10 @@ >
-
+
-
+

diff --git a/website/client/src/components/inventory/stable/index.vue b/website/client/src/components/inventory/stable/index.vue index 4087784c29..13c7481bb4 100644 --- a/website/client/src/components/inventory/stable/index.vue +++ b/website/client/src/components/inventory/stable/index.vue @@ -268,7 +268,7 @@
-
+
-
+

- {{ member.profile.name }} -
+
+ {{ member.profile.name }}
+ v-if="isBuffed" + v-b-tooltip.hover.bottom="$t('buffed')" + class="is-buffed ml-2 mt-n1" + > +
+

@@ -98,9 +105,12 @@ } } + .standard-page .member-details { + padding-left: 24px; + } + .member-stats { padding-left: 12px; - padding-right: 24px; opacity: 1; transition: width 0.15s ease-out; } @@ -114,10 +124,6 @@ color: $header-color; } - .profile-name-character { - margin-left: 12px; - } - .character-name { margin-bottom: 1px; color: $white; @@ -133,7 +139,6 @@ height: 20px; background: $header-dark-background; display: inline-block; - margin-left: 16px; vertical-align: middle; padding-top: 4px; diff --git a/website/client/src/components/members/reportMemberModal.vue b/website/client/src/components/members/reportMemberModal.vue new file mode 100644 index 0000000000..b029966cdb --- /dev/null +++ b/website/client/src/components/members/reportMemberModal.vue @@ -0,0 +1,199 @@ + + + + + + + diff --git a/website/client/src/components/payments/buyGemsModal.vue b/website/client/src/components/payments/buyGemsModal.vue index 3c4c0ff568..92d3898e3c 100644 --- a/website/client/src/components/payments/buyGemsModal.vue +++ b/website/client/src/components/payments/buyGemsModal.vue @@ -171,7 +171,12 @@

{{ $t('limitations') }}

- {{ $t('gemSaleLimitations', { eventStartMonth, eventStartOrdinal, eventEndOrdinal }) }} + {{ $t('gemSaleLimitations', { + eventStartMonth, + eventStartOrdinal, + eventEndMonth, + eventEndOrdinal, + }) }}
@@ -441,6 +446,9 @@ export default { eventStartOrdinal () { return moment(this.currentEvent.start).format('Do'); }, + eventEndMonth () { + return moment(this.currentEvent.end).format('MMMM'); + }, eventEndOrdinal () { return moment(this.currentEvent.end).format('Do'); }, diff --git a/website/client/src/components/payments/selectUserModal.vue b/website/client/src/components/payments/selectUserModal.vue index afe8181fb5..3bfa32b92c 100644 --- a/website/client/src/components/payments/selectUserModal.vue +++ b/website/client/src/components/payments/selectUserModal.vue @@ -22,18 +22,19 @@ v-if="currentEvent && currentEvent.promo === 'g1g1'" class="g1g1-margin d-flex flex-column align-items-center" > -
+
+ v-else + class="d-flex flex-column align-items-center" + >
@@ -49,9 +50,10 @@ >
+ v-else + class="modal-close" + @click="close()" + >
-
- -
-
- {{ $t('userWithUsernameOrUserIdNotFound') }} -
+ +
- {{ $t('cancel') }} -
-
-
+
@@ -121,182 +108,179 @@ slot="modal-footer" class="g1g1-fine-print text-center pt-3" > - - {{ $t ('howItWorks') }} + + {{ $t('howItWorks') }}

- {{ $t ('g1g1HowItWorks') }} + {{ $t('g1g1HowItWorks') }}

- - {{ $t ('limitations') }} + + {{ $t('limitations') }}

- {{ $t ('g1g1Limitations') }} + {{ $t('g1g1Limitations') }}

@@ -308,8 +292,10 @@ import isUUID from 'validator/lib/isUUID'; import { mapState } from '@/libs/store'; import closeIcon from '@/assets/svg/close.svg'; import bigGiftIcon from '@/assets/svg/big-gift.svg'; +import ValidatedTextInput from '@/components/ui/validatedTextInput.vue'; export default { + components: { ValidatedTextInput }, data () { return { userNotFound: false, @@ -332,6 +318,12 @@ export default { if (this.userSearchTerm.length < 1) return true; return typeof this.foundUser._id === 'undefined'; }, + + userInputInvalidIssues () { + return this.userSearchTerm.length > 0 && this.userNotFound + ? [this.$t('userWithUsernameOrUserIdNotFound')] + : ['']; + }, }, watch: { userSearchTerm: { diff --git a/website/client/src/components/settings/api.vue b/website/client/src/components/settings/api.vue deleted file mode 100644 index 48a5155ddd..0000000000 --- a/website/client/src/components/settings/api.vue +++ /dev/null @@ -1,190 +0,0 @@ - - - - - diff --git a/website/client/src/components/settings/dataExport.vue b/website/client/src/components/settings/dataExport.vue deleted file mode 100644 index b439483cf5..0000000000 --- a/website/client/src/components/settings/dataExport.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - diff --git a/website/client/src/components/settings/dayStartAdjustment.vue b/website/client/src/components/settings/dayStartAdjustment.vue deleted file mode 100644 index 54d312740c..0000000000 --- a/website/client/src/components/settings/dayStartAdjustment.vue +++ /dev/null @@ -1,132 +0,0 @@ - - - - - diff --git a/website/client/src/components/settings/deleteModal.vue b/website/client/src/components/settings/deleteModal.vue deleted file mode 100644 index 3a0d167099..0000000000 --- a/website/client/src/components/settings/deleteModal.vue +++ /dev/null @@ -1,86 +0,0 @@ - - - diff --git a/website/client/src/components/settings/index.vue b/website/client/src/components/settings/index.vue deleted file mode 100644 index a390dbcb8f..0000000000 --- a/website/client/src/components/settings/index.vue +++ /dev/null @@ -1,158 +0,0 @@ - - - - - diff --git a/website/client/src/components/settings/notifications.vue b/website/client/src/components/settings/notifications.vue deleted file mode 100644 index d53c4a614f..0000000000 --- a/website/client/src/components/settings/notifications.vue +++ /dev/null @@ -1,143 +0,0 @@ - - - diff --git a/website/client/src/components/settings/promoCode.vue b/website/client/src/components/settings/promoCode.vue deleted file mode 100644 index 704ec54dff..0000000000 --- a/website/client/src/components/settings/promoCode.vue +++ /dev/null @@ -1,117 +0,0 @@ - - - diff --git a/website/client/src/components/settings/resetModal.vue b/website/client/src/components/settings/resetModal.vue deleted file mode 100644 index 8aa9f6544e..0000000000 --- a/website/client/src/components/settings/resetModal.vue +++ /dev/null @@ -1,46 +0,0 @@ - - - diff --git a/website/client/src/components/settings/restoreModal.vue b/website/client/src/components/settings/restoreModal.vue deleted file mode 100644 index bbd86f000a..0000000000 --- a/website/client/src/components/settings/restoreModal.vue +++ /dev/null @@ -1,210 +0,0 @@ - - - diff --git a/website/client/src/components/settings/site.vue b/website/client/src/components/settings/site.vue deleted file mode 100644 index 82db3f08f5..0000000000 --- a/website/client/src/components/settings/site.vue +++ /dev/null @@ -1,859 +0,0 @@ - - - - - diff --git a/website/client/src/components/settings/usernameForm.vue b/website/client/src/components/settings/usernameForm.vue index 1d680302c2..c62c605458 100644 --- a/website/client/src/components/settings/usernameForm.vue +++ b/website/client/src/components/settings/usernameForm.vue @@ -115,8 +115,6 @@ } .input-error { - color: $red-50; - font-size: 90%; width: 100%; } diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue index 7120dbabdd..74f6f848fb 100644 --- a/website/client/src/components/shops/buyModal.vue +++ b/website/client/src/components/shops/buyModal.vue @@ -152,7 +152,7 @@

+
-
-
+ class="Pet" + :class="`Pet-${user.items.currentPet}`" + >
-
-
{{ formatAnimal(user.items.currentPet, 'pet') }}
-
- {{ $t('petsFound') }}: - {{ totalCount(user.items.pets) }} -
-
- {{ $t('beastMasterProgress') }}: - {{ beastMasterProgress(user.items.pets) }} -
+
+
+
{{ formatAnimal(user.items.currentPet, 'pet') }}
+
+ {{ $t('petsFound') }}: + {{ totalCount(user.items.pets) }}
+
+ {{ $t('beastMasterProgress') }}: + {{ beastMasterProgress(user.items.pets) }} +
+
diff --git a/website/client/src/main.js b/website/client/src/main.js index 7a9e39a2f3..2905c0dae1 100644 --- a/website/client/src/main.js +++ b/website/client/src/main.js @@ -1,5 +1,6 @@ import Vue from 'vue'; import BootstrapVue from 'bootstrap-vue'; +import Fragment from 'vue-fragment'; import AppComponent from './app'; import { setup as setupAnalytics, @@ -28,6 +29,7 @@ Vue.config.productionTip = IS_PRODUCTION; Vue.use(i18n, { i18nData: window && window['habitica-i18n'] }); Vue.use(StoreModule); Vue.use(BootstrapVue); +Vue.use(Fragment.Plugin); setUpLogging(); setupAnalytics(); // just create queues for analytics, no scripts loaded at this time diff --git a/website/client/src/mixins/copyToClipboard.js b/website/client/src/mixins/copyToClipboard.js new file mode 100644 index 0000000000..68246310f5 --- /dev/null +++ b/website/client/src/mixins/copyToClipboard.js @@ -0,0 +1,23 @@ +import notifications from './notifications'; + +export default { + mixins: [notifications], + methods: { + async mixinCopyToClipboard (valueToCopy, notificationToShow = null) { + if (navigator.clipboard) { + await navigator.clipboard.writeText(valueToCopy); + } else { + // fallback if clipboard API does not exist + const copyText = document.createElement('textarea'); + copyText.value = valueToCopy; + document.body.appendChild(copyText); + copyText.select(); + document.execCommand('copy'); + document.body.removeChild(copyText); + } + if (notificationToShow) { + this.text(notificationToShow); + } + }, + }, +}; diff --git a/website/client/src/mixins/notifications.js b/website/client/src/mixins/notifications.js index c5143a9ce3..738631c1f3 100644 --- a/website/client/src/mixins/notifications.js +++ b/website/client/src/mixins/notifications.js @@ -10,7 +10,7 @@ function toFixedWithoutRounding (num, fixed) { return num.toString().match(re)[0]; } -export default { +export const NotificationMixins = { computed: { ...mapState({ notifications: 'notificationStore' }), }, @@ -90,3 +90,5 @@ export default { }, }, }; + +export default NotificationMixins; diff --git a/website/client/src/mixins/passwordInputChecks.js b/website/client/src/mixins/passwordInputChecks.js new file mode 100644 index 0000000000..77758f5144 --- /dev/null +++ b/website/client/src/mixins/passwordInputChecks.js @@ -0,0 +1,62 @@ +/** + * Component Example + * + * + */ + +export const PasswordInputChecksMixin = { + data () { + return { + mixinData: { + currentPasswordIssues: [], + newPasswordIssues: [], + confirmPasswordIssues: [], + }, + }; + }, + methods: { + clearPasswordIssues () { + this.mixinData.currentPasswordIssues.length = 0; + this.mixinData.newPasswordIssues.length = 0; + this.mixinData.confirmPasswordIssues.length = 0; + }, + /** + * @param {() => Promise} promiseCall + * @returns {Promise} + */ + async passwordInputCheckMixinTryCall (promiseCall) { + try { + // reset previous issues + this.clearPasswordIssues(); + + await promiseCall(); + } catch (axiosError) { + const message = axiosError.response?.data?.message; + + if ([this.$t('wrongPassword'), this.$t('missingPassword')].includes(message)) { + this.mixinData.currentPasswordIssues.push(message); + } else if ([this.$t('missingNewPassword'), this.$t('passwordIssueLength'), this.$t('passwordConfirmationMatch')].includes(message)) { + this.mixinData.newPasswordIssues.push(message); + this.mixinData.confirmPasswordIssues.push(message); + } else if (this.$t('invalidReqParams') === message) { + const errors = axiosError.response?.data?.errors ?? []; + + for (const error of errors) { + if (error.param === 'password') { + this.mixinData.currentPasswordIssues.push(error.message); + } else if (error.param === 'newPassword') { + this.mixinData.newPasswordIssues.push(error.message); + } else { + this.mixinData.confirmPasswordIssues.push(error.message); + } + } + } + } + }, + }, +}; diff --git a/website/client/src/mixins/userState.js b/website/client/src/mixins/userState.js index 8d007f4184..e24b0366e9 100644 --- a/website/client/src/mixins/userState.js +++ b/website/client/src/mixins/userState.js @@ -3,7 +3,7 @@ import { mapState } from '@/libs/store'; export const userCustomStateMixin = fieldname => { const map = { }; map[fieldname] = 'user.data'; - return { // eslint-disable-line import/prefer-default-export + return { computed: { ...mapState(map), }, diff --git a/website/client/src/pages/settings-overview.vue b/website/client/src/pages/settings-overview.vue new file mode 100644 index 0000000000..982ff74283 --- /dev/null +++ b/website/client/src/pages/settings-overview.vue @@ -0,0 +1,238 @@ + + + + + diff --git a/website/client/src/pages/settings/components/classIconLabel.vue b/website/client/src/pages/settings/components/classIconLabel.vue new file mode 100644 index 0000000000..2ff46c9c0b --- /dev/null +++ b/website/client/src/pages/settings/components/classIconLabel.vue @@ -0,0 +1,91 @@ + + + + + diff --git a/website/client/src/pages/settings/components/currentPasswordInput.vue b/website/client/src/pages/settings/components/currentPasswordInput.vue new file mode 100644 index 0000000000..8fa2654c2b --- /dev/null +++ b/website/client/src/pages/settings/components/currentPasswordInput.vue @@ -0,0 +1,53 @@ + + + + + diff --git a/website/client/src/pages/settings/components/genericUserPreferencesMixin.js b/website/client/src/pages/settings/components/genericUserPreferencesMixin.js new file mode 100644 index 0000000000..c64678487a --- /dev/null +++ b/website/client/src/pages/settings/components/genericUserPreferencesMixin.js @@ -0,0 +1,13 @@ +export const GenericUserPreferencesMixin = { + methods: { + setUserPreference (preferenceType, subtype) { + const settings = {}; + if (!subtype) { + settings[`preferences.${preferenceType}`] = this.user.preferences[preferenceType]; + } else { + settings[`preferences.${preferenceType}.${subtype}`] = this.user.preferences[preferenceType][subtype]; + } + return this.$store.dispatch('user:set', settings); + }, + }, +}; diff --git a/website/client/src/pages/settings/components/inlineSettingMixin.js b/website/client/src/pages/settings/components/inlineSettingMixin.js new file mode 100644 index 0000000000..4fc9ae595e --- /dev/null +++ b/website/client/src/pages/settings/components/inlineSettingMixin.js @@ -0,0 +1,83 @@ +import { reactive } from 'vue'; + +export const sharedInlineSettingStore = reactive({ + inlineSettingAlreadyOpen: false, + inlineSettingUnsavedValues: false, + /** + * @type InlineSettingMixin + */ + instanceOfCurrentlyOpened: null, + markAsOpened (currentInstance) { + this.inlineSettingAlreadyOpen = true; + this.instanceOfCurrentlyOpened = currentInstance; + }, + markAsClosed () { + this.inlineSettingUnsavedValues = false; + this.inlineSettingAlreadyOpen = false; + }, +}); + +export const InlineSettingMixin = { + data () { + return { + mixinData: { + inlineSettingMixin: { + modalVisible: false, + sharedState: sharedInlineSettingStore, + }, + }, + }; + }, + methods: { + openModal () { + if (this.mixinData.inlineSettingMixin.sharedState.inlineSettingAlreadyOpen) { + if (this.mixinData.inlineSettingMixin.sharedState.inlineSettingUnsavedValues) { + if (window.confirm(this.$t('confirmCancelChanges'))) { + this._hidePrevious(); + this._openIt(); + } else { + return; + } + } else { + this._hidePrevious(); + } + } + + this._openIt(); + }, + _openIt () { + this.mixinData.inlineSettingMixin.sharedState.markAsOpened(this); + this.mixinData.inlineSettingMixin.modalVisible = true; + + this.$el.scrollTo({ + behavior: 'smooth', + }); + }, + _hidePrevious () { + this.mixinData.inlineSettingMixin.sharedState.instanceOfCurrentlyOpened.resetControls(); + this.mixinData.inlineSettingMixin.sharedState.instanceOfCurrentlyOpened.closeModal(); + }, + /** + * This is just for the cancel buttons - so that they also ask if there are unchanged values + */ + requestCloseModal () { + if (this.mixinData.inlineSettingMixin.sharedState.inlineSettingUnsavedValues && !window.confirm(this.$t('confirmCancelChanges'))) { + return; + } + + this.resetControls(); + this.closeModal(); + }, + /** + * This is for the save methods to call it after they are done + */ + closeModal () { + this.mixinData.inlineSettingMixin.modalVisible = false; + this.mixinData.inlineSettingMixin.sharedState.markAsClosed(); + }, + modalValuesChanged (value = true) { + this.mixinData.inlineSettingMixin.sharedState.inlineSettingUnsavedValues = value; + }, + resetControls () {}, + }, +}; diff --git a/website/client/src/pages/settings/components/lockedInput.vue b/website/client/src/pages/settings/components/lockedInput.vue new file mode 100644 index 0000000000..3286eef8c8 --- /dev/null +++ b/website/client/src/pages/settings/components/lockedInput.vue @@ -0,0 +1,100 @@ + + + + + diff --git a/website/client/src/pages/settings/components/saveCancelButtons.vue b/website/client/src/pages/settings/components/saveCancelButtons.vue new file mode 100644 index 0000000000..e6f4732e86 --- /dev/null +++ b/website/client/src/pages/settings/components/saveCancelButtons.vue @@ -0,0 +1,68 @@ + + + + + diff --git a/website/client/src/pages/settings/components/yourBalance.vue b/website/client/src/pages/settings/components/yourBalance.vue new file mode 100644 index 0000000000..2e439cfffd --- /dev/null +++ b/website/client/src/pages/settings/components/yourBalance.vue @@ -0,0 +1,56 @@ + + + + + diff --git a/website/client/src/pages/settings/generalSettings.vue b/website/client/src/pages/settings/generalSettings.vue new file mode 100644 index 0000000000..de79a3e468 --- /dev/null +++ b/website/client/src/pages/settings/generalSettings.vue @@ -0,0 +1,140 @@ + + + + + diff --git a/website/client/src/pages/settings/notificationSettings.vue b/website/client/src/pages/settings/notificationSettings.vue new file mode 100644 index 0000000000..7a5593e1d0 --- /dev/null +++ b/website/client/src/pages/settings/notificationSettings.vue @@ -0,0 +1,325 @@ + + + + + diff --git a/website/client/src/pages/settings/promoCode.vue b/website/client/src/pages/settings/promoCode.vue new file mode 100644 index 0000000000..bf6809134d --- /dev/null +++ b/website/client/src/pages/settings/promoCode.vue @@ -0,0 +1,77 @@ + + + diff --git a/website/client/src/components/settings/purchaseHistory.vue b/website/client/src/pages/settings/purchaseHistory.vue similarity index 91% rename from website/client/src/components/settings/purchaseHistory.vue rename to website/client/src/pages/settings/purchaseHistory.vue index d9a9bc5f84..0c795f8430 100644 --- a/website/client/src/components/settings/purchaseHistory.vue +++ b/website/client/src/pages/settings/purchaseHistory.vue @@ -9,7 +9,7 @@ diff --git a/website/client/src/pages/settings/settingRows/classSetting.vue b/website/client/src/pages/settings/settingRows/classSetting.vue new file mode 100644 index 0000000000..a59f81c983 --- /dev/null +++ b/website/client/src/pages/settings/settingRows/classSetting.vue @@ -0,0 +1,252 @@ + + + + + diff --git a/website/client/src/pages/settings/settingRows/dateFormatSetting.vue b/website/client/src/pages/settings/settingRows/dateFormatSetting.vue new file mode 100644 index 0000000000..f880288ec8 --- /dev/null +++ b/website/client/src/pages/settings/settingRows/dateFormatSetting.vue @@ -0,0 +1,121 @@ + + + + + diff --git a/website/client/src/pages/settings/settingRows/dayStartAdjustmentSetting.vue b/website/client/src/pages/settings/settingRows/dayStartAdjustmentSetting.vue new file mode 100644 index 0000000000..ff5222193d --- /dev/null +++ b/website/client/src/pages/settings/settingRows/dayStartAdjustmentSetting.vue @@ -0,0 +1,181 @@ + + + + + diff --git a/website/client/src/pages/settings/settingRows/deleteAccount.vue b/website/client/src/pages/settings/settingRows/deleteAccount.vue new file mode 100644 index 0000000000..af89e5c6a0 --- /dev/null +++ b/website/client/src/pages/settings/settingRows/deleteAccount.vue @@ -0,0 +1,153 @@ + + + + + diff --git a/website/client/src/pages/settings/settingRows/displayNameSetting.vue b/website/client/src/pages/settings/settingRows/displayNameSetting.vue new file mode 100644 index 0000000000..5c8620f7c5 --- /dev/null +++ b/website/client/src/pages/settings/settingRows/displayNameSetting.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/website/client/src/pages/settings/settingRows/fixValuesSetting.vue b/website/client/src/pages/settings/settingRows/fixValuesSetting.vue new file mode 100644 index 0000000000..ef63f77058 --- /dev/null +++ b/website/client/src/pages/settings/settingRows/fixValuesSetting.vue @@ -0,0 +1,291 @@ + + + + + diff --git a/website/client/src/pages/settings/settingRows/headerSettings.vue b/website/client/src/pages/settings/settingRows/headerSettings.vue new file mode 100644 index 0000000000..e2238182cc --- /dev/null +++ b/website/client/src/pages/settings/settingRows/headerSettings.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/website/client/src/pages/settings/settingRows/languageSetting.vue b/website/client/src/pages/settings/settingRows/languageSetting.vue new file mode 100644 index 0000000000..67f1616ffd --- /dev/null +++ b/website/client/src/pages/settings/settingRows/languageSetting.vue @@ -0,0 +1,145 @@ + + + + + diff --git a/website/client/src/pages/settings/settingRows/loginMethods.vue b/website/client/src/pages/settings/settingRows/loginMethods.vue new file mode 100644 index 0000000000..f10f778360 --- /dev/null +++ b/website/client/src/pages/settings/settingRows/loginMethods.vue @@ -0,0 +1,185 @@ + + + + + diff --git a/website/client/src/pages/settings/settingRows/passwordSetting.vue b/website/client/src/pages/settings/settingRows/passwordSetting.vue new file mode 100644 index 0000000000..0c42b67a9f --- /dev/null +++ b/website/client/src/pages/settings/settingRows/passwordSetting.vue @@ -0,0 +1,189 @@ + + + + + diff --git a/website/client/src/pages/settings/settingRows/resetAccount.vue b/website/client/src/pages/settings/settingRows/resetAccount.vue new file mode 100644 index 0000000000..5cbb4f1666 --- /dev/null +++ b/website/client/src/pages/settings/settingRows/resetAccount.vue @@ -0,0 +1,135 @@ + + + + + diff --git a/website/client/src/pages/settings/settingRows/sleepMode.vue b/website/client/src/pages/settings/settingRows/sleepMode.vue new file mode 100644 index 0000000000..2a0376ff12 --- /dev/null +++ b/website/client/src/pages/settings/settingRows/sleepMode.vue @@ -0,0 +1,95 @@ + + + + + diff --git a/website/client/src/pages/settings/settingRows/userEmailSetting.vue b/website/client/src/pages/settings/settingRows/userEmailSetting.vue new file mode 100644 index 0000000000..a9361eb2e0 --- /dev/null +++ b/website/client/src/pages/settings/settingRows/userEmailSetting.vue @@ -0,0 +1,136 @@ + + + + + diff --git a/website/client/src/pages/settings/settingRows/userNameSetting.vue b/website/client/src/pages/settings/settingRows/userNameSetting.vue new file mode 100644 index 0000000000..3ac79d737e --- /dev/null +++ b/website/client/src/pages/settings/settingRows/userNameSetting.vue @@ -0,0 +1,169 @@ + + + + + diff --git a/website/client/src/pages/settings/siteData.vue b/website/client/src/pages/settings/siteData.vue new file mode 100644 index 0000000000..e94fe6e780 --- /dev/null +++ b/website/client/src/pages/settings/siteData.vue @@ -0,0 +1,71 @@ + + + + + diff --git a/website/client/src/pages/settings/siteDataRows/apiRow.vue b/website/client/src/pages/settings/siteDataRows/apiRow.vue new file mode 100644 index 0000000000..b9e9a94920 --- /dev/null +++ b/website/client/src/pages/settings/siteDataRows/apiRow.vue @@ -0,0 +1,131 @@ + + + + + diff --git a/website/client/src/pages/settings/siteDataRows/developerModeRow.vue b/website/client/src/pages/settings/siteDataRows/developerModeRow.vue new file mode 100644 index 0000000000..716b60bd13 --- /dev/null +++ b/website/client/src/pages/settings/siteDataRows/developerModeRow.vue @@ -0,0 +1,56 @@ + + + + + diff --git a/website/client/src/pages/settings/siteDataRows/userDataRow.vue b/website/client/src/pages/settings/siteDataRows/userDataRow.vue new file mode 100644 index 0000000000..79e114291c --- /dev/null +++ b/website/client/src/pages/settings/siteDataRows/userDataRow.vue @@ -0,0 +1,139 @@ + + + + + diff --git a/website/client/src/pages/settings/siteDataRows/userIdRow.vue b/website/client/src/pages/settings/siteDataRows/userIdRow.vue new file mode 100644 index 0000000000..0d9be29deb --- /dev/null +++ b/website/client/src/pages/settings/siteDataRows/userIdRow.vue @@ -0,0 +1,58 @@ + + + + + diff --git a/website/client/src/pages/settings/siteDataRows/webhooksRow.vue b/website/client/src/pages/settings/siteDataRows/webhooksRow.vue new file mode 100644 index 0000000000..d31bf015fd --- /dev/null +++ b/website/client/src/pages/settings/siteDataRows/webhooksRow.vue @@ -0,0 +1,323 @@ + + + + + diff --git a/website/client/src/router/index.js b/website/client/src/router/index.js index ea8cceb6e9..578bec7751 100644 --- a/website/client/src/router/index.js +++ b/website/client/src/router/index.js @@ -8,7 +8,6 @@ import { PAGES } from '@/libs/consts'; import { STATIC_ROUTES } from './static-routes'; import { USER_ROUTES } from './user-routes'; import { DEPRECATED_ROUTES } from '@/router/deprecated-routes'; -import { ProfilePage } from './shared-route-imports'; // NOTE: when adding a page make sure to implement the `common:setTitle` action @@ -89,16 +88,14 @@ const router = new VueRouter({ { name: 'logout', path: '/logout', component: Logout }, { name: 'resetPassword', path: '/reset-password', component: RegisterLoginReset, meta: { requiresLogin: false }, + }, { + name: 'forgotPassword', path: '/forgot-password', component: RegisterLoginReset, meta: { requiresLogin: false }, }, { name: 'tasks', path: '/', component: UserTasks }, { name: 'userProfile', path: '/profile/:userId', - component: ProfilePage, props: true, - children: [ - { name: 'userProfilePage', path: ':startingPage', component: ProfilePage }, - ], }, { path: '/inventory', @@ -319,34 +316,40 @@ router.beforeEach(async (to, from, next) => { }); } - if ((to.name === 'userProfile' || to.name === 'userProfilePage') && from.name !== null) { + if ((to.name === 'userProfile')) { let startingPage = 'profile'; if (to.params.startingPage !== undefined) { startingPage = to.params.startingPage; } + if (from.name === null) { + store.state.postLoadModal = `profile/${to.params.userId}`; + return next({ name: 'tasks' }); + } router.app.$emit('habitica:show-profile', { userId: to.params.userId, startingPage, - path: to.path, + fromPath: from.path, + toPath: to.path, }); return null; } if (to.name === 'tasks' && to.query.openGemsModal === 'true') { - setTimeout(() => router.app.$emit('bv::show::modal', 'buy-gems'), 500); + store.state.postLoadModal = 'buy-gems'; return next({ name: 'tasks' }); } if ((to.name === 'stats' || to.name === 'achievements' || to.name === 'profile') && from.name !== null) { router.app.$emit('habitica:show-profile', { startingPage: to.name, - path: to.path, + fromPath: from.path, + toPath: to.path, }); return null; } - if (from.name === 'userProfile' || from.name === 'userProfilePage' || from.name === 'stats' || from.name === 'achievements' || from.name === 'profile') { + if (from.name === 'userProfile' || from.name === 'stats' || from.name === 'achievements' || from.name === 'profile') { router.app.$root.$emit('bv::hide::modal', 'profile'); } diff --git a/website/client/src/router/shared-route-imports.js b/website/client/src/router/shared-route-imports.js index e336f99cc6..e3b5d24d13 100644 --- a/website/client/src/router/shared-route-imports.js +++ b/website/client/src/router/shared-route-imports.js @@ -1,3 +1 @@ export const NotFoundPage = () => import(/* webpackChunkName: "not-found" */'@/components/404'); - -export const ProfilePage = () => import(/* webpackChunkName: "user" */'@/components/userMenu/profilePage'); diff --git a/website/client/src/router/user-routes.js b/website/client/src/router/user-routes.js index bece6045f8..4e59fa9d1e 100644 --- a/website/client/src/router/user-routes.js +++ b/website/client/src/router/user-routes.js @@ -1,45 +1,37 @@ import ParentPage from '@/components/parentPage.vue'; -import { ProfilePage } from './shared-route-imports'; - // Settings -const Settings = () => import(/* webpackChunkName: "settings" */'@/components/settings/index'); -const API = () => import(/* webpackChunkName: "settings" */'@/components/settings/api'); -const DataExport = () => import(/* webpackChunkName: "settings" */'@/components/settings/dataExport'); -const Notifications = () => import(/* webpackChunkName: "settings" */'@/components/settings/notifications'); -const PromoCode = () => import(/* webpackChunkName: "settings" */'@/components/settings/promoCode'); -const Site = () => import(/* webpackChunkName: "settings" */'@/components/settings/site'); -const Subscription = () => import(/* webpackChunkName: "settings" */'@/components/settings/subscription'); -const Transactions = () => import(/* webpackChunkName: "settings" */'@/components/settings/purchaseHistory'); +const Settings = () => import(/* webpackChunkName: "settings" */'@/pages/settings-overview'); +const GeneralSettings = () => import(/* webpackChunkName: "settings" */'@/pages/settings/generalSettings'); +const Notifications = () => import(/* webpackChunkName: "settings" */'@/pages/settings/notificationSettings'); +const Transactions = () => import(/* webpackChunkName: "settings" */'@/pages/settings/purchaseHistory.vue'); +const SiteData = () => import(/* webpackChunkName: "settings" */'@/pages/settings/siteData.vue'); + +// not converted yet +const PromoCode = () => import(/* webpackChunkName: "settings" */'@/pages/settings/promoCode.vue'); +const Subscription = () => import(/* webpackChunkName: "settings" */'@/components/settings/subscription'); export const USER_ROUTES = { path: '/user', component: ParentPage, children: [ - { name: 'stats', path: 'stats', component: ProfilePage }, - { name: 'achievements', path: 'achievements', component: ProfilePage }, - { name: 'profile', path: 'profile', component: ProfilePage }, { name: 'settings', path: 'settings', component: Settings, children: [ { - name: 'site', - path: 'site', - component: Site, + name: 'general', + path: 'general', + component: GeneralSettings, }, { - name: 'api', - path: 'api', - component: API, - }, - { - name: 'dataExport', - path: 'data-export', - component: DataExport, + name: 'siteData', + path: 'siteData', + component: SiteData, }, + { path: 'api', redirect: { name: 'siteData' } }, { name: 'promoCode', path: 'promo-code', diff --git a/website/client/src/store/actions/members.js b/website/client/src/store/actions/members.js index 85e44251a2..d9377cd800 100644 --- a/website/client/src/store/actions/members.js +++ b/website/client/src/store/actions/members.js @@ -114,3 +114,19 @@ export async function getPurchaseHistory (store, payload) { const response = await axios.get(`${apiv4Prefix}/members/${payload.memberId}/purchase-history`); return response.data.data; } + +export async function reportMember (store, payload) { + const url = `${apiv4Prefix}/members/${payload.memberId}/flag`; + const data = { + comment: payload.comment, + source: payload.source, + }; + const response = await axios.post(url, data); + return response; +} + +export async function clearMemberFlags (store, payload) { + const url = `${apiv4Prefix}/members/${payload.memberId}/clear-flags`; + const response = await axios.post(url); + return response; +} diff --git a/website/client/src/store/actions/user.js b/website/client/src/store/actions/user.js index 9ea7e29357..84bb39adbe 100644 --- a/website/client/src/store/actions/user.js +++ b/website/client/src/store/actions/user.js @@ -65,7 +65,7 @@ export async function sleep (store) { } export async function addWebhook (store, payload) { - const response = await axios.post('/api/v4/user/webhook', payload.webhookInfo); + const response = await axios.post('/api/v4/user/webhook', payload.webhook); return response.data.data; } diff --git a/website/client/src/store/index.js b/website/client/src/store/index.js index 20d2332406..56eaac19d7 100644 --- a/website/client/src/store/index.js +++ b/website/client/src/store/index.js @@ -151,6 +151,7 @@ export default function () { bugReportOptions: { question: false, }, + postLoadModal: '', }, }); diff --git a/website/client/vue.config.js b/website/client/vue.config.js index 42ecd094e5..ab70e7047e 100644 --- a/website/client/vue.config.js +++ b/website/client/vue.config.js @@ -2,6 +2,7 @@ const path = require('path'); const webpack = require('webpack'); const nconf = require('nconf'); +const vueTemplateCompiler = require('vue-template-babel-compiler'); const { DuplicatesPlugin } = require('inspectpack/plugin'); const setupNconf = require('../server/libs/setupNconf'); const pkg = require('./package.json'); @@ -126,6 +127,15 @@ module.exports = { if (process.env.NODE_ENV === 'development') { config.plugins.delete('preload'); } + + // enable optional chaining in templates + config.module + .rule('vue') + .use('vue-loader') + .tap(options => { + options.compiler = vueTemplateCompiler; + return options; + }); }, devServer: { diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index 9b5c46e817..cb0893ae63 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -915,6 +915,14 @@ "backgroundBaobabForestText": "Baobab Forest", "backgroundBaobabForestNotes": "Gaze in wonder at the Baobab Forest.", + "backgrounds102023": "SET 113: Released October 2023", + "backgroundSpectralCandleRoomText": "Room of Spectral Candles", + "backgroundSpectralCandleRoomNotes": "Commune with spirits in a Room of Spectral Candles.", + "backgroundMonstrousCaveText": "Monstrous Cave", + "backgroundMonstrousCaveNotes": "Gaze into the maw of the Monstrous Cave.", + "backgroundJackOLanternStacksText": "Jack O'Lantern Stacks", + "backgroundJackOLanternStacksNotes": "Admire a field of Jack O’Lantern Stacks.", + "timeTravelBackgrounds": "Steampunk Backgrounds", "backgroundAirshipText": "Airship", "backgroundAirshipNotes": "Become a sky sailor on board your very own Airship.", diff --git a/website/common/locales/en/character.json b/website/common/locales/en/character.json index 0b6620cd1c..4b6bdd7ecd 100644 --- a/website/common/locales/en/character.json +++ b/website/common/locales/en/character.json @@ -175,8 +175,9 @@ "photo": "Photo", "info": "Info", "joined": "Joined", - "totalLogins": "Total Check Ins", - "latestCheckin": "Latest Check In", + "totalLogins": "Total Log Ins", + "latestCheckin": "Latest Log In", + "nextReward": "Next Log In Reward", "editProfile": "Edit Profile", "challengesWon": "Challenges Won", "questsCompleted": "Quests Completed", diff --git a/website/common/locales/en/faq.json b/website/common/locales/en/faq.json index 6fdf93cfb6..228cbab0e3 100644 --- a/website/common/locales/en/faq.json +++ b/website/common/locales/en/faq.json @@ -1,7 +1,5 @@ { "frequentlyAskedQuestions": "Frequently Asked Questions", - "general": "General", - "faqQuestion0": "I'm confused. Where do I get an overview?", "iosFaqAnswer0": "First, you'll set up tasks that you want to do in your everyday life. Then, as you complete the tasks in real life and check them off, you'll earn experience and gold. Gold is used to buy equipment and some items, as well as custom rewards. Experience causes your character to level up and unlock content such as Pets, Skills, and Quests! You can customize your character under Menu > Customize Avatar.\n\n Some basic ways to interact: click the (+) in the upper-right-hand corner to add a new task. Tap on an existing task to edit it, and swipe left on a task to delete it. You can sort tasks using Tags in the upper-left-hand corner, and expand and contract checklists by clicking on the checklist bubble.", "androidFaqAnswer0": "First, you'll set up tasks that you want to do in your everyday life. Then, as you complete the tasks in real life and check them off, you'll earn experience and gold. Gold is used to buy equipment and some items, as well as custom rewards. Experience causes your character to level up and unlock content such as Pets, Skills, and Quests! You can customize your character under Menu > [Inventory >] Avatar.\n\n Some basic ways to interact: click the (+) in the lower-right-hand corner to add a new task. Tap on an existing task to edit it, and swipe left on a task to delete it. You can sort tasks using Tags in the upper-right-hand corner, and expand and contract checklists by clicking on the checklist count box.", diff --git a/website/common/locales/en/front.json b/website/common/locales/en/front.json index 6e82d48588..536841a4c5 100644 --- a/website/common/locales/en/front.json +++ b/website/common/locales/en/front.json @@ -114,7 +114,7 @@ "missingPassword": "Missing password.", "missingNewPassword": "Missing new password.", "invalidEmailDomain": "You cannot register with emails with the following domains: <%= domains %>", - "wrongPassword": "Wrong password.", + "wrongPassword": "Password is incorrect. If you forgot your password, click \"Forgot Password.\"", "incorrectDeletePhrase": "Please type <%= magicWord %> in all capital letters to delete your account.", "notAnEmail": "Invalid email address.", "emailTaken": "Email address is already used in an account.", diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index d47f001b8b..3085134f63 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -486,6 +486,15 @@ "weaponSpecialSummer2023HealerText": "Swaying Kelp", "weaponSpecialSummer2023HealerNotes": "They may look frondly, but they get quite grumpy if you call them 'plants'. Increases Intelligence by <%= int %>. Limited Edition 2023 Summer Gear.", + "weaponSpecialFall2023RogueText": "Soupernatural Spoon", + "weaponSpecialFall2023RogueNotes": "It takes an exceptionally strong stirrer to cook up bubbles and toiling troubles. Increases Strength by <%= str %>. Limited Edition 2023 Fall Gear.", + "weaponSpecialFall2023WarriorText": "Tasty Popcorn", + "weaponSpecialFall2023WarriorNotes": "The most terrifying thing of all is the thought of a scary movie night with no snacks! Increases Strength by <%= str %>. Limited Edition 2023 Fall Gear.", + "weaponSpecialFall2023MageText": "Shining Staff", + "weaponSpecialFall2023MageNotes": "With a crystal at its core, this shining staff makes magic emerge from the mundane. Increases Intelligence by <%= int %>. Limited Edition 2023 Fall Gear.", + "weaponSpecialFall2023HealerText": "Log Great Hammer", + "weaponSpecialFall2023HealerNotes": "With slow, heavy attacks, this gnarled hammer deals out healing blows instead of damage. Increases Intelligence by <%= int %>. Limited Edition 2023 Fall Gear.", + "weaponMystery201411Text": "Pitchfork of Feasting", "weaponMystery201411Notes": "Stab your enemies or dig in to your favorite foods - this versatile pitchfork does it all! Confers no benefit. November 2014 Subscriber Item.", "weaponMystery201502Text": "Shimmery Winged Staff of Love and Also Truth", @@ -711,6 +720,8 @@ "weaponArmoireMopNotes": "Step 1: Dunk the mop in a bucket of water and suds. Step 2: Drag the mop along the floor. Step 3: Pretend the end of the mop handle is a microphone and sing your heart out. Step 4: Repeat Steps 1-3 until floor is clean. Increases Constitution and Perception by <%= attrs %> each. Enchanted Armoire: Cleaning Supplies Set Two (Item 2 of 3)", "weaponArmoireCleaningClothText": "Cleaning Cloth", "weaponArmoireCleaningClothNotes": "Take this tidying tool on your adventures and always be able to polish a pretty plaque or wipe a wooden windowsill. Increases Strength and Constitution by <%= attrs %> each. Enchanted Armoire: Cleaning Supplies Set Two (Item 3 of 3)", + "weaponArmoireRidingBroomText": "Riding Broom", + "weaponArmoireRidingBroomNotes": "Run all your most magical errands on this fine broom--or, just take it for a joyride around the neighborhood. Whee! Increases Strength by <%= str %> and Intelligence by <%= int %>. Enchanted Armoire: Spooky Sorcery Set (Item 1 of 3)", "armor": "armor", "armorCapitalized": "Armor", @@ -1177,6 +1188,15 @@ "armorSpecialSummer2023HealerText": "Kelp Kirtle", "armorSpecialSummer2023HealerNotes": "Hold fast to your goals and convictions in this elegant green gown. Increases Constitution by <%= con %>. Limited Edition 2023 Summer Gear.", + "armorSpecialFall2023RogueText": "Cursed Cauldron", + "armorSpecialFall2023RogueNotes": "You were lured with the promise of a nice hot soak... Joke's on you! Increases Perception by <%= per %>. Limited Edition 2023 Fall Gear.", + "armorSpecialFall2023WarriorText": "Video Player Armor", + "armorSpecialFall2023WarriorNotes": "Does it play DVDs? VHS?? What kind of cables does this need to plug into the TV?! Turns out this is the scariest part of the whole thing! Increases Constitution by <%= con %>. Limited Edition 2023 Summer Gear.", + "armorSpecialFall2023MageText": "Scarlet Warlock Robe", + "armorSpecialFall2023MageNotes": "With scarlet threads and gold accents, this outfit is a wonder for the senses. Increases Intelligence by <%= int %>. Limited Edition 2023 Fall Gear.", + "armorSpecialFall2023HealerText": "Bog Creature Body", + "armorSpecialFall2023HealerNotes": "With moss, rock, wood, and bog water merged into one, this outfit is sometimes tough and sometimes spongey (but always intimidating). Increases Constitution by <%= con %>. Limited Edition 2023 Fall Gear.", + "armorMystery201402Text": "Messenger Robes", "armorMystery201402Notes": "Shimmering and strong, these robes have many pockets to carry letters. Confers no benefit. February 2014 Subscriber Item.", "armorMystery201403Text": "Forest Walker Armor", @@ -1297,6 +1317,8 @@ "armorMystery202306Notes": "No one’s going to rain on your parade! And if they try, you’ll stay colorful and dry! Confers no benefit. June 2023 Subscriber Item.", "armorMystery202307Text": "Kraken's Tentacles", "armorMystery202307Notes": "Suction cups have the best traction on the sea floor and on the sides of wayward ships. Confers no benefit. July 2023 Subscriber Item.", + "armorMystery202310Text": "Wraith's Robe", + "armorMystery202310Notes": "A ghostly garment that will curl and drift gracefully as you float amidst the haunted bogs and wastes. Confers no benefit. October 2023 Subscriber Item.", "armorMystery301404Text": "Steampunk Suit", "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.", @@ -1954,6 +1976,15 @@ "headSpecialSummer2023HealerText": "Kelp Crown", "headSpecialSummer2023HealerNotes": "They're not snakes! You can open your eyes, it's safe! Increases Intelligence by <%= int %>. Limited Edition 2023 Summer Gear.", + "headSpecialFall2023RogueText": "Enchanted Visage", + "headSpecialFall2023RogueNotes": "This jinxed stew has given you the fuzzy face and long ears of a donkey! How very Shakespearean. Increases Perception by <%= per %>. Limited Edition 2023 Fall Gear.", + "headSpecialFall2023WarriorText": "Haunted Screen", + "headSpecialFall2023WarriorNotes": "What horror lurks in this realm of distortion and static? You'll have to stay tuned to find out! Increases Strength by <%= str %>. Limited Edition 2023 Fall Gear.", + "headSpecialFall2023MageText": "Scarlet Warlock Mask", + "headSpecialFall2023MageNotes": "With piercing eyes and pointed flair, it makes any illusion a sudden possibility. Increases Perception by <%= per %>. Limited Edition 2023 Fall Gear.", + "headSpecialFall2023HealerText": "Bog Creature Mask", + "headSpecialFall2023HealerNotes": "With eyes as dark as the bog it emerged from, it fixes its gaze upon enemies. Increases Intelligence by <%= int %>. Limited Edition 2023 Fall Gear.", + "headSpecialGaymerxText": "Rainbow Warrior Helm", "headSpecialGaymerxNotes": "In celebration of the GaymerX Conference, this special helmet is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGTBQ and gaming and is open to everyone.", @@ -2105,6 +2136,8 @@ "headMystery202304Notes": "Wear this helm for your own safe-tea. Confers no benefit. April 2023 Subscriber Item.", "headMystery202308Text": "Purple Protagonist Hair", "headMystery202308Notes": "Does the unruly cowlick sticking up from the middle of your head represent your persistence or your penchant for mischief? Confers no benefit. August 2023 Subscriber Item.", + "headMystery202310Text": "Wraith's Hood", + "headMystery202310Notes": "It hides your face, and yet lends your eyes an unsettling and spectral glow. Confers no benefit. October 2023 Subscriber Item.", "headMystery301404Text": "Fancy Top Hat", "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.", @@ -2289,6 +2322,10 @@ "headArmoirePaintersBeretNotes": "See the world with a more artistic eye when you wear this jaunty beret. Increases Perception by <%= per %>. Enchanted Armoire: Painter Set (Item 2 of 4).", "headArmoireAdmiralsBicorneText": "Admiral's Bicorne Hat", "headArmoireAdmiralsBicorneNotes": "Hats off to you! Wearing this two-cornered hat will make you wiser, brighter, braver...and taller. Increases Intelligence and Perception by <%= attrs %> each. Enchanted Armoire: Admiral’s Set (Item 1 of 2).", + "headArmoirePurpleSpookySorceryHatText": "Purple Spooky Sorcery Hat", + "headArmoirePurpleSpookySorceryHatNotes": "Purple as dusk and full of mysteries, this hat is suited to all your sorcerous needs. Increases Perception by <%= per %> and Constitution by <%= con %>. Enchanted Armoire: Spooky Sorcery Set (Item 2 of 3).", + "headArmoireBlackSpookySorceryHatText": "Black Spooky Sorcery Hat", + "headArmoireBlackSpookySorceryHatNotes": "Black as night and full of secrets, this hat is suited to all your sorcerous needs. Increases Intelligence by <%= int %> and Constitution by <%= con %>. Enchanted Armoire: Spooky Sorcery Set (Item 3 of 3).", "offhand": "off-hand item", "offHandCapitalized": "Off-Hand Item", @@ -2546,6 +2583,13 @@ "shieldSpecialSummer2023HealerText": "Sea Urchin", "shieldSpecialSummer2023HealerNotes": "You conceal and shelter it. It dissuades nosy monsters from coming too close. Perfect symbiosis! Increases Constitution by <%= con %>. Limited Edition 2023 Summer Gear.", + "shieldSpecialFall2023RogueText": "Bewitched Bottle", + "shieldSpecialFall2023RogueNotes": "Enchanted with the strongest spells to hold powerful potions. Increases Strength by <%= str %>. Limited Edition 2023 Fall Gear.", + "shieldSpecialFall2023WarriorText": "Comfy Pillow", + "shieldSpecialFall2023WarriorNotes": "Perfect for making yourself comfortable while enjoying a scary movie... But we won't tell anyone if you need to hug it during the really spooky scenes! Increases Constitution by <%= con %>. Limited Edition 2023 Fall Gear.", + "shieldSpecialFall2023HealerText": "Mossy Rock", + "shieldSpecialFall2023HealerNotes": "With a firm base and a soft top, this is perfect to hurl at enemies or to sit upon when you need a rest from your adventures. Increases Constitution by <%= con %>. Limited Edition 2023 Fall Gear.", + "shieldMystery201601Text": "Resolution Slayer", "shieldMystery201601Notes": "This blade can be used to parry away all distractions. Confers no benefit. January 2016 Subscriber Item.", "shieldMystery201701Text": "Time-Freezer Shield", @@ -3026,6 +3070,8 @@ "headAccessoryMystery202307Notes": "This mighty circlet summons cyclones and stormy weather! Confers no benefit. July 2023 Subscriber Item.", "headAccessoryMystery202309Text": "Colossal Comet Moth Antennae", "headAccessoryMystery202309Notes": "These antennae are fashionable and feathery, but also help you navigate! Confers no benefit. September 2023 Subscriber Item.", + "headAccessoryMystery202310Text": "Crown of Ghostly Lights", + "headAccessoryMystery202310Notes": "Like a will-o'-the-wisp, these unearthly lights may lure curious souls to their doom. Confers no benefit. October 2023 Subscriber Item.", "headAccessoryMystery301405Text": "Headwear Goggles", "headAccessoryMystery301405Notes": "\"Goggles are for your eyes,\" they said. \"Nobody wants goggles that you can only wear on your head,\" they said. Hah! You sure showed them! Confers no benefit. August 3015 Subscriber Item.", diff --git a/website/common/locales/en/generic.json b/website/common/locales/en/generic.json index bb07735c43..bfaa238727 100644 --- a/website/common/locales/en/generic.json +++ b/website/common/locales/en/generic.json @@ -24,6 +24,7 @@ "modalAchievement": "Achievement!", "special": "Special", "site": "Site", + "general": "General", "help": "Help", "user": "User", "market": "Market", @@ -71,6 +72,7 @@ "error": "Error", "menu": "Menu", "notifications": "Notifications", + "allNotifications": "All Notifications", "noNotifications": "You're all caught up!", "noNotificationsText": "The notification fairies give you a raucous round of applause! Well done!", "clear": "Clear", @@ -213,6 +215,16 @@ "loadEarlierMessages": "Load Earlier Messages", "askQuestion": "Ask a Question", "emptyReportBugMessage": "Report Bug Message missing", + "reportPlayer": "Report Player", + "blockPlayer": "Block Player", + "unblockPlayer": "Unblock Player", + "adminTools": "Admin Tools", + "viewAdminPanel": "View Admin Panel", + "shadowMute": "Shadow Mute", + "mutePlayer": "Mute", + "banPlayer": "Ban Player", + "unbanPlayer": "Unban Player", + "bannedPlayer": "This player is banned.", "refreshList": "Refresh List", "leaveHabitica": "You are about to leave Habitica.com", "leaveHabiticaText": "Habitica is not responsible for the content of any linked website that is not owned or operated by HabitRPG.
Please note that these websites' practices may differ from Habitica’s community guidelines.", @@ -222,5 +234,9 @@ "question": "Question", "questionDescriptionText": "It's okay to ask your questions in your primary language if you aren't comfortable speaking in English.", "questionPlaceholder": "Ask your question here", - "submitQuestion": "Submit Question" + "submitQuestion": "Submit Question", + "reportPlayer": "Report Player", + "whyReportingPlayer": "Why are you reporting this player?", + "whyReportingPlayerPlaceholder": "Reason for report", + "playerReportModalBody": "You should only report a player who violates the <%= firstLinkStart %>Community Guidelines<%= linkEnd %> and/or <%= secondLinkStart %>Terms of Service<%= linkEnd %>. Submitting a false report is a violation of Habitica’s Community Guidelines." } diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json index acf0ab5e10..89f3f443da 100644 --- a/website/common/locales/en/groups.json +++ b/website/common/locales/en/groups.json @@ -67,12 +67,12 @@ "applySortToHeader": "Apply Sort Options to Party Header", "confirmGuild": "Create Guild for 4 Gems?", "confirm": "Confirm", - "leaveGuild": "Leave Guild", + "leaveGuild": "Leave Group", "leaveParty": "Leave Party", "editParty": "Edit Party", - "editGuild": "Edit Guild", + "editGuild": "Edit Group", "joinParty": "Join Party", - "joinGuild": "Join Guild", + "joinGuild": "Join Group", "send": "Send", "pmsMarkedRead": "Your Private Messages have been marked as read", "possessiveParty": "<%= name %>'s Party", @@ -87,10 +87,12 @@ "PMCanNotReply": "You can not reply to this conversation", "PMUserDoesNotReceiveMessages": "This user is no longer receiving private messages", "PMUnblockUserToSendMessages": "Unblock this user to continue sending and receiving messages.", - "block": "Block", - "unblock": "Un-block", + "block": "Block Player", + "blockedUser": "You blocked this player. They cannot send you Private Messages but you will still see their posts.", + "bannedUser": "This player has been banned.", + "unblock": "Unblock Player", "blockYourself": "You cannot block yourself", - "blockWarning": "Block - This will have no effect if the player is a moderator now or becomes a moderator in future.", + "blockWarning": "This will have no effect if the player is an admin.", "inbox": "Inbox", "messageRequired": "A message is required.", "toUserIDRequired": "A User ID is required", @@ -244,7 +246,7 @@ "viewParty": "View Party", "newGuildPlaceholder": "Enter your guild's name.", "newPartyPlaceholder": "Enter your party's name.", - "guildBank": "Guild Bank", + "guildBank": "Bank", "chatPlaceholder": "Type your message to Group members here", "partyChatPlaceholder": "Type your message to Party members here", "fetchRecentMessages": "Fetch Recent Messages", diff --git a/website/common/locales/en/limited.json b/website/common/locales/en/limited.json index cdd9f893fa..cf9671beec 100644 --- a/website/common/locales/en/limited.json +++ b/website/common/locales/en/limited.json @@ -203,6 +203,10 @@ "summer2023GuppyRogueSet": "Guppy (Rogue)", "summer2023KelpHealerSet": "Kelp (Healer)", "summer2023CoralMageSet": "Coral (Mage)", + "fall2023ScaryMovieWarriorSet": "Scary Movie (Warrior)", + "fall2023ScarletWarlockMageSet": "Scarlet Warlock (Mage)", + "fall2023WitchsBrewRogueSet": "Witch's Brew (Rogue)", + "fall2023BogCreatureHealerSet": "Bog Creature (Healer)", "eventAvailability": "Available for purchase until <%= date(locale) %>.", "eventAvailabilityReturning": "Available for purchase until <%= availableDate(locale) %>. This potion was last available in <%= previousDate(locale) %>.", "dateEndJanuary": "January 31", @@ -245,7 +249,7 @@ "g1g1Limitations": "This is a limited time event that starts on December 15th at 8:00 AM ET (13:00 UTC) and will end January 8th at 11:59 PM ET (January 9th 04:59 UTC). This promotion only applies when you gift to another Habitican. If you or your gift recipient already have a subscription, the gifted subscription will add months of credit that will only be used after the current subscription is canceled or expires.", "noLongerAvailable": "This item is no longer available.", "gemSaleHow": "Between <%= eventStartMonth %> <%= eventStartOrdinal %> and <%= eventEndOrdinal %>, simply purchase any Gem bundle like usual and your account will be credited with the promotional amount of Gems. More Gems to spend, share, or save for any future releases!", - "gemSaleLimitations": "This promotion only applies during the limited time event. This event starts on <%= eventStartMonth %> <%= eventStartOrdinal %> at 8:00 AM EDT (12:00 UTC) and will end <%= eventStartMonth %> <%= eventEndOrdinal %> at 8:00 PM EDT (00:00 UTC). The promo offer is only available when buying Gems for yourself.", + "gemSaleLimitations": "This promotion only applies during the limited time event. This event starts on <%= eventStartMonth %> <%= eventStartOrdinal %> at 8:00 AM EDT (12:00 UTC) and will end <%= eventEndMonth %> <%= eventEndOrdinal %> at 8:00 PM EDT (00:00 UTC). The promo offer is only available when buying Gems for yourself.", "anniversaryLimitations": "This is a limited time event that starts on January 30th at 8:00 AM ET (13:00 UTC) and will end February 8th at 11:59 PM ET (04:59 UTC). The Limited Edition Jubilant Gryphatrice and ten Magic Hatching Potions will be available to buy during this time. The other Gifts listed in the Four for Free section will be automatically delivered to all accounts that were active in the 30 days prior to day the gift is sent. Accounts created after the gifts are sent will not be able to claim them.", "anniversaryLimitedDates": "January 30th to February 8th", "limitedEvent": "Limited Event", diff --git a/website/common/locales/en/settings.json b/website/common/locales/en/settings.json index b25a2c9bad..a9586a943c 100644 --- a/website/common/locales/en/settings.json +++ b/website/common/locales/en/settings.json @@ -1,18 +1,26 @@ { "settings": "Settings", + "generalSettings": "General Settings", + "siteData": "Site Data", + "taskSettings": "Task Settings", + "confirmCancelChanges": "Are you sure? You will lose your unsaved changes.", + "account": "Account", + "loginMethods": "Login Methods", + "character": "Character", "language": "Language", + "siteLanguage": "Site Language", "americanEnglishGovern": "In the event of a discrepancy in the translations, the American English version governs.", - "helpWithTranslation": "Would you like to help with the translation of Habitica? Great! Then visit Habitica's Weblate site!", + "helpWithTranslation": "Are you interested in helping with the translation of Habitica? Great! Then visit Habitica's Weblate site!", "stickyHeader": "Sticky header", "newTaskEdit": "Open new tasks in edit mode", "reverseChatOrder": "Show chat messages in reverse order", - "startAdvCollapsed": "Advanced Settings in tasks start collapsed", - "startAdvCollapsedPop": "With this option set, Advanced Settings will be hidden when you first open a task for editing.", "dontShowAgain": "Don't show this again", - "suppressLevelUpModal": "Don't show popup when gaining a level", - "suppressHatchPetModal": "Don't show popup when hatching a pet", - "suppressRaisePetModal": "Don't show popup when raising a pet into a mount", - "suppressStreakModal": "Don't show popup when attaining a Streak achievement", + "showLevelUpModal": "When Gaining a Level", + "showHatchPetModal": "When Hatching a Pet", + "showRaisePetModal": "When Raising a Pet into a Mount", + "showStreakModal": "When Attaining a Streak Achievement", + "baileyAnnouncement": "Latest Bailey Announcement", + "view": "View", "showTour": "Show Tour", "showBailey": "Show Bailey", "showBaileyPop": "Bring Bailey the Town Crier out of hiding so you can review past news.", @@ -25,17 +33,28 @@ "resetAccPop": "Start over, removing all levels, gold, gear, history, and tasks.", "deleteAccount": "Delete Account", "deleteAccPop": "Cancel and remove your Habitica account.", - "feedback": "If you'd like to give us feedback, please enter it below - we'd love to know what you liked or didn't like about Habitica! Don't speak English well? No problem! Use the language you prefer.", + "feedback": "If you'd like to give us feedback, please enter it below - we'd love to hear your feedback! It will be anonymous unless you choose to enter your contact details. Don't speak English well? No problem! Use the language you prefer.", + "feedbackPlaceholder": "Add your feedback", "dataExport": "Data Export", "saveData": "Here are a few options for saving your data.", "habitHistory": "Habit History", "exportHistory": "Export History:", "csv": "(CSV)", + "downloadCSV": "Download CSV", + "downloadAs": "Download as", "userData": "User Data", + "yourUserData": "Your User Data", + "taskHistory": "Task History", + "yourUserDataDisclaimer": "Here you can download a copy of your task history or your full user data.", "exportUserData": "Export User Data:", + "useridCopied": "User ID copied to clipboard.", + "userIdTooltip": "The User ID is a unique number that Habitica automatically generates when a player joins, similar to a Username. However, unlike the Username, a User ID can not be changed.", + "developerMode": "Developer Mode", + "developerModeTooltip": "Habitica provides a developer mode to enable additional features that interact with Habitica's API.", "export": "Export", - "xml": "(XML)", - "json": "(JSON)", + "xml": "XML", + "json": "JSON", + "api": "API", "customDayStart": "Custom Day Start", "adjustment": "Adjustment", "dayStartAdjustment": "Day Start Adjustment", @@ -45,6 +64,7 @@ "customDayStartInfo1": "Habitica checks and resets your Dailies at midnight in your own time zone each day. You can adjust when that happens past the default time here.", "misc": "Misc", "showHeader": "Show Header", + "currentPass": "Current Password", "changePass": "Change Password", "changeUsername": "Change Username", "changeEmail": "Change Email Address", @@ -54,11 +74,18 @@ "confirmPass": "Confirm New Password", "newUsername": "New Username", "dangerZone": "Danger Zone", - "resetText1": "WARNING! This resets many parts of your account. This is highly discouraged, but some people find it useful in the beginning after playing with the site for a short time.", - "resetText2": "You will lose all your levels, Gold, and Experience points. All your tasks (except those from challenges) will be deleted permanently and you will lose all of their historical data. You will lose all your equipment except Subscriber Mystery Items and free commemorative items. You will be able to buy the deleted items back, including all limited edition equipment (you will need to be in the correct class to re-buy class-specific gear). You will keep your current class, achievements and your pets and mounts. You might prefer to use an Orb of Rebirth instead, which is a much safer option and which will preserve your tasks and equipment.", - "deleteLocalAccountText": "Are you sure? This will delete your account forever, and it can never be restored! You will need to register a new account to use Habitica again. Banked or spent Gems will not be refunded. If you're absolutely certain, type your password into the text box below.", - "deleteSocialAccountText": "Are you sure? This will delete your account forever, and it can never be restored! You will need to register a new account to use Habitica again. Banked or spent Gems will not be refunded. If you're absolutely certain, type \"<%= magicWord %>\" into the text box below.", + "resetText1": "Be careful! This resets many parts of your account. This is highly discouraged, but some people find it useful in the beginning after playing with the site for a short time.", + "resetDetail1": "You will lose all your levels, Gold, and Experience points.", + "resetDetail2": "You will keep your current class, achievements and your pets and mounts.", + "resetDetail3": "All your tasks (except those from challenges) will be deleted permanently and you will lose all of their historical data.", + "resetDetail4": "You will lose all your equipment except Subscriber Mystery Items and free commemorative items. You will be able to buy the deleted items back, including all limited edition equipment (you will need to be in the correct class to re-buy class-specific gear).", + "resetText2": "Another option is using an Orb of Rebirth, which will reset everything else while preserving your Tasks and Equipment.", + "deleteLocalAccountText": "Are you sure? This will delete your account forever, and it can never be restored! You will need to register a new account to use Habitica again. Banked or spent Gems will not be refunded. If you're absolutely certain, type your password into the text box below.", + "deleteSocialAccountText": "Are you sure? This will delete your account forever, and it can never be restored! You will need to register a new account to use Habitica again. Banked or spent Gems will not be refunded. If you're absolutely certain, type \"<%= magicWord %>\" into the text box below.", "API": "API", + "APICopied": "API token copied to clipboard.", + "APITokenTitle": "API Token", + "APITokenDisclaimer": "Your API Token is like a password; Do not share it publicly. You may occasionally be asked for your User ID, but never post your API Token where others can see it, including on Github.

Note: If you need a new API Token (e.g., if you accidentally shared it), email admin@habitica.com with your User ID and current Token. Once it is reset you will need to re-authorize everything by logging out of the website and mobile app and by providing the new Token to any other Habitica tools that you use.", "APIv3": "API v3", "APIText": "Copy these for use in third party applications. However, think of your API Token like a password, and do not share it publicly. You may occasionally be asked for your User ID, but never post your API Token where others can see it, including on Github.", "APIToken": "API Token (this is a password - see warning above!)", @@ -70,13 +97,14 @@ "resetDo": "Do it, reset my account!", "resetComplete": "Reset complete!", "fixValues": "Fix Values", - "fixValuesText1": "If you've encountered a bug or made a mistake that unfairly changed your character (damage you shouldn't have taken, Gold you didn't really earn, etc.), you can manually correct your numbers here. Yes, this makes it possible to cheat: use this feature wisely, or you'll sabotage your own habit-building!", - "fixValuesText2": "Note that you cannot restore Streaks on individual tasks here. To do that, edit the Daily and go to Advanced Settings, where you will find a Restore Streak field.", + "fixValuesText1": "If you've encountered an issue that unfairly changed your character (damage you shouldn't have taken, Gold you didn't really earn, etc.), you can manually correct those values here. Yes, this makes it possible to cheat: use this feature wisely, or you'll sabotage your own habit-building!", + "fixValuesText2": "Note: To restore Streaks on individual Tasks, edit the Task and use the Restore Streak field.", "fix21Streaks": "21-Day Streaks", "discardChanges": "Discard Changes", "deleteDo": "Do it, delete my account!", "invalidPasswordResetCode": "The supplied password reset code is invalid or has expired.", "passwordChangeSuccess": "Your password was successfully changed to the one you just chose. You can now use it to access your account.", + "userNameSuccess": "Username successfully changed", "displayNameSuccess": "Display name successfully changed", "emailSuccess": "Email successfully changed", "passwordSuccess": "Password successfully changed", @@ -99,7 +127,7 @@ "giftedSubscriptionFull": "Hello <%= username %>, <%= sender %> has sent you <%= monthCount %> months of subscription!", "giftedSubscriptionWinterPromo": "Hello <%= username %>, you received <%= monthCount %> months of subscription as part of our holiday gift-giving promotion!", "invitedParty": "You were invited to a Party", - "invitedGuild": "You were invited to a Guild", + "invitedGuild": "You were invited to a Group", "importantAnnouncements": "Reminders to check in to complete tasks and receive prizes", "weeklyRecaps": "Summaries of your account activity in the past week (Note: this is currently disabled due to performance issues, but we hope to have this back up and sending e-mails again soon!)", "onboarding": "Guidance with setting up your Habitica account", @@ -107,25 +135,24 @@ "subscriptionReminders": "Subscriptions Reminders", "questStarted": "Your Quest has Begun", "invitedQuest": "Invited to Quest", - "kickedGroup": "Kicked from group", + "kickedGroup": "Removed from group", "remindersToLogin": "Reminders to check in to Habitica", "unsubscribedSuccessfully": "Unsubscribed successfully!", "unsubscribedTextUsers": "You have successfully unsubscribed from all Habitica emails. You can enable only the emails you want to receive from Settings > > Notifications (requires login).", "unsubscribedTextOthers": "You won't receive any other email from Habitica.", - "unsubscribeAllEmails": "Check to Unsubscribe from Emails", - "unsubscribeAllEmailsText": "By checking this box, I certify that I understand that by unsubscribing from all emails, Habitica will never be able to notify me via email about important changes to the site or my account.", - "unsubscribeAllPush": "Check to Unsubscribe from all Push Notifications", + "unsubscribeAllEmails": "Unsubscribe from Emails", + "unsubscribeAllEmailsText": "Habitica will be unable to notify you via email about important changes to the site or your account.", + "unsubscribeAllPush": "Unsubscribe from all Push Notifications", "correctlyUnsubscribedEmailType": "Correctly unsubscribed from \"<%= emailType %>\" emails.", "subscriptionRateText": "Recurring $<%= price %> USD every <%= months %> months", "giftSubscriptionRateText": "$<%= price %> USD for <%= months %> months", "benefits": "Benefits", "coupon": "Coupon", - "couponText": "We sometimes have events and give out promo codes for special gear. (eg, those who stop by our Wondercon booth)", + "couponText": "We sometimes have events and give out promo codes for special gear.", "apply": "Apply", "promoCode": "Promo Code", "promoCodeApplied": "Promo Code Applied! Check your inventory", "promoPlaceholder": "Enter Promotion Code", - "displayInviteToPartyWhenPartyIs1": "Display Invite To Party button when party has 1 member.", "saveCustomDayStart": "Save Custom Day Start", "registration": "Registration", "addLocalAuth": "Add Email and Password Login", @@ -134,9 +161,10 @@ "generate": "Generate", "getCodes": "Get Codes", "webhooks": "Webhooks", - "webhooksInfo": "Habitica provides webhooks so that when certain actions occur in your account, information can be sent to a script on another website. You can specify those scripts here. Be careful with this feature because specifying an incorrect URL can cause errors or slowness in Habitica. For more information, see the wiki's Webhooks page.", + "webhooksInfo": "Webhooks provide a way for developers to receive notifications when a particular action is performed, such as scoring or updating a Task, or sending a message in a Group. By creating a webhook, you will be able to listen to changes in Habitica and build apps that respond to these changes.

For additional information and examples on webhooks, please visit our API Docs", "enabled": "Enabled", "webhookURL": "Webhook URL", + "addWebhook": "Add Webhook", "invalidUrl": "invalid url", "invalidWebhookId": "the \"id\" parameter should be a valid UUID.", "webhookBooleanOption": "\"<%= option %>\" must be a Boolean value.", @@ -179,7 +207,14 @@ "usernameVerifiedConfirmation": "Your username, <%= username %>, is confirmed!", "usernameNotVerified": "Please confirm your username.", "changeUsernameDisclaimer": "Your username is used for invitations, @mentions in chat, and messaging. It must be 1 to 20 characters, containing only letters a to z, numbers 0 to 9, hyphens, or underscores, and cannot include any inappropriate terms.", + "changeEmailDisclaimer": "This is the email address that you use to log in to Habitica, as well as receive notifications.", + "changeDisplayNameDisclaimer": "This is the name that will be displayed for your Avatar in Habitica.", + "changePasswordDisclaimer": "Password must be 8 characters or more. We recommend a strong password that you're not using elsewhere.", + "dateFormatDisclaimer": "Adjust the date formatting across Habitica.", "verifyUsernameVeteranPet": "One of these Veteran Pets will be waiting for you after you've finished confirming!", + "enableAudio": "Enable Audio", + "playDemoAudio": "Play Demo", + "audioThemeDisclaimer": "Audio themes add optional sound effects to the Habitica website. Volume levels are controlled using your computer's volume settings.", "mentioning": "Mentioning", "suggestMyUsername": "Suggest my username", "everywhere": "Everywhere", @@ -189,6 +224,11 @@ "amount": "Amount", "action": "Action", "note": "Note", + "noClassSelected": "No Class Selected", + "currentClass": "Current Class", + "changeClassSetting": "Change Class", + "chooseClassSetting": "Choose Class", + "changeClassDisclaimer": "Changing your class will refund all of your existing Stat Points. Once you have selected your new class, adjust your Stat Points from the Stats section of your profile.", "remainingBalance": "Remaining Balance", "transactions": "Transactions", "hourglassTransactions": "Hourglass Transactions", @@ -203,7 +243,6 @@ "transaction_gift_receive": "Received from", "transaction_create_challenge": "Created challenge", "transaction_create_bank_challenge": "Created bank challenge", - "transaction_create_bank_challenge": "Created bank challenge", "transaction_create_guild": "Created guild", "transaction_change_class": "Class change", "transaction_rebirth": "Used Orb of Rebirth", @@ -212,5 +251,8 @@ "transaction_reroll": "Used Fortify Potion", "transaction_subscription_perks": "Subscription perk", "transaction_admin_update_balance": "Admin given", - "transaction_admin_update_hourglasses": "Admin updated" + "transaction_admin_update_hourglasses": "Admin updated", + "connected": "Connected", + "connect": "Connect", + "remove": "Remove" } diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json index fa43c663a6..7b2f819774 100644 --- a/website/common/locales/en/subscriber.json +++ b/website/common/locales/en/subscriber.json @@ -154,6 +154,7 @@ "mysterySet202307": "Perilous Kraken Set", "mysterySet202308": "Purple Protagonist Set", "mysterySet202309": "Colossal Comet Moth Set", + "mysterySet202310": "Ghostlight Wraith Set", "mysterySet301404": "Steampunk Standard Set", "mysterySet301405": "Steampunk Accessories Set", "mysterySet301703": "Peacock Steampunk Set", diff --git a/website/common/locales/en/tasks.json b/website/common/locales/en/tasks.json index 48859cd848..044db57552 100644 --- a/website/common/locales/en/tasks.json +++ b/website/common/locales/en/tasks.json @@ -93,6 +93,9 @@ "streakCoins": "Streak Bonus!", "taskToTop": "To top", "taskToBottom": "To bottom", + "taskAlias": "Task Alias", + "taskAliasPopover": "This task alias can be used when integrating with 3rd party integrations. Only dashes, underscores, and alphanumeric characters are supported. The task alias must be unique among all your tasks.", + "taskAliasPlaceholder": "your-task-alias-here", "taskAliasAlreadyUsed": "Task alias already used on another task.", "invalidTaskType": "Task type must be one of \"habit\", \"daily\", \"todo\", \"reward\".", "invalidTasksType": "Task type must be one of \"habits\", \"dailys\", \"todos\", \"rewards\".", diff --git a/website/common/script/constants.js b/website/common/script/constants.js index bc569da079..b3ca1162a1 100644 --- a/website/common/script/constants.js +++ b/website/common/script/constants.js @@ -21,8 +21,8 @@ export const CHAT_FLAG_FROM_SHADOW_MUTE = 10; // @TODO use those constants to replace hard-coded numbers export const SUPPORTED_SOCIAL_NETWORKS = [ - { key: 'google', name: 'Google' }, { key: 'apple', name: 'Apple' }, + { key: 'google', name: 'Google' }, ]; export const GUILDS_PER_PAGE = 30; // number of guilds to return per page when using pagination diff --git a/website/common/script/content/appearance/backgrounds.js b/website/common/script/content/appearance/backgrounds.js index 1f558cb272..dab98500df 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -580,6 +580,11 @@ const backgrounds = { covered_bridge_in_autumn: { }, baobab_forest: { }, }, + backgrounds102023: { + spectral_candle_room: { }, + monstrous_cave: { }, + jack_o_lantern_stacks: { }, + }, eventBackgrounds: { birthday_bash: { price: 0, diff --git a/website/common/script/content/appearance/sets.js b/website/common/script/content/appearance/sets.js index 5a95f5f4d9..60254bc8ae 100644 --- a/website/common/script/content/appearance/sets.js +++ b/website/common/script/content/appearance/sets.js @@ -15,7 +15,7 @@ export default prefill({ setPrice: 5, availableFrom: '2023-04-11T08:00-05:00', availableUntil: EVENTS.spring2023.end, text: t('shimmerColors'), }, hauntedHairColors: { - setPrice: 5, availableFrom: '2022-10-04T08:00-04:00', availableUntil: EVENTS.fall2022.end, text: t('hauntedColors'), + setPrice: 5, availableFrom: '2023-10-03T08:00-04:00', availableUntil: EVENTS.fall2023.end, text: t('hauntedColors'), }, winteryHairColors: { setPrice: 5, availableFrom: '2023-01-17T08:00-05:00', availableUntil: EVENTS.winter2023.end, text: t('winteryColors'), @@ -27,7 +27,7 @@ export default prefill({ }, spookySkins: { setPrice: 5, availableUntil: '2016-01-01', text: t('spookySkins') }, supernaturalSkins: { - setPrice: 5, availableFrom: '2022-10-04T08:00-04:00', availableUntil: EVENTS.fall2022.end, text: t('supernaturalSkins'), + setPrice: 5, availableFrom: '2023-10-03T08:00-04:00', availableUntil: EVENTS.fall2023.end, text: t('supernaturalSkins'), }, splashySkins: { setPrice: 5, availableFrom: '2023-07-11T08:00-05:00', availableUntil: EVENTS.summer2023.end, text: t('splashySkins'), diff --git a/website/common/script/content/bundles.js b/website/common/script/content/bundles.js index 2d0d90935a..efb229a453 100644 --- a/website/common/script/content/bundles.js +++ b/website/common/script/content/bundles.js @@ -18,9 +18,9 @@ const bundles = { 'harpy', 'owl', ], - event: EVENTS.potions202105, + event: EVENTS.bundle202309, canBuy () { - return moment().isBefore(EVENTS.potions202105.end); + return moment().isBetween(EVENTS.bundle202309.start, EVENTS.bundle202309.end); }, type: 'quests', class: 'quest_bundle_featheredFriends', @@ -251,14 +251,15 @@ const bundles = { sandySidekicks: { key: 'sandySidekicks', text: t('sandySidekicksText'), - notes: t('sandySidekicksNotes', { date: moment('2020-10-31').format('LL') }), + notes: t('sandySidekicksNotes', { date: moment('2023-10-31').format('LL') }), bundleKeys: [ 'armadillo', 'snake', 'spider', ], + event: EVENTS.bundle202310, canBuy () { - return moment().isBetween('2020-10-13', '2020-11-02'); + return moment().isBetween(EVENTS.bundle202310.start, EVENTS.bundle202310.end); }, type: 'quests', value: 7, diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js index 41dafd0ad2..737c44bece 100644 --- a/website/common/script/content/constants/events.js +++ b/website/common/script/content/constants/events.js @@ -10,11 +10,35 @@ const gemsPromo = { export const EVENTS = { noEvent: { - start: '2023-08-01T23:59-04:00', - end: '2023-08-10T08:00-04:00', + start: '2023-11-01T00:00-04:00', + end: '2023-12-21T08:00-04:00', season: 'normal', npcImageSuffix: '', }, + spooky_extra_gems: { + start: '2022-10-24T08:00-04:00', + end: '2022-10-31T23:59-04:00', + gemsPromo, + }, + bundle202310: { + start: '2023-10-17T08:00-04:00', + end: '2023-10-31T23:59-04:00', + }, + potions202310: { + start: '2023-09-21T08:00-04:00', + end: '2023-10-31T23:59-04:00', + }, + fall2023: { + start: '2023-09-21T08:00-04:00', + end: '2023-10-31T23:59-04:00', + npcImageSuffix: '_fall', + season: 'fall', + gear: true, + }, + bundle202309: { + start: '2023-09-12T08:00-04:00', + end: '2023-09-30T23:59-04:00', + }, bundle202308: { start: '2023-08-15T08:00-04:00', end: '2023-08-31T23:59-04:00', @@ -113,11 +137,6 @@ export const EVENTS = { season: 'fall', gear: true, }, - spooky_extra_gems: { - start: '2022-10-27T08:00-04:00', - end: '2022-10-31T20:00-04:00', - gemsPromo, - }, fall_extra_gems: { start: '2022-10-06T08:00-04:00', end: '2022-10-13T20:00-04:00', diff --git a/website/common/script/content/constants/index.js b/website/common/script/content/constants/index.js index 64c86f22a3..358edb82b1 100644 --- a/website/common/script/content/constants/index.js +++ b/website/common/script/content/constants/index.js @@ -1,12 +1,9 @@ -import moment from 'moment'; - -export const CURRENT_SEASON = moment().isBefore('2020-08-02') ? 'summer' : '_NONE_'; - +// sorting this also changes the class selection export const CLASSES = [ - 'warrior', - 'rogue', 'healer', 'wizard', + 'rogue', + 'warrior', ]; export const GEAR_TYPES = [ diff --git a/website/common/script/content/constants/seasonalSets.js b/website/common/script/content/constants/seasonalSets.js index e30ffc82b7..31d1b63092 100644 --- a/website/common/script/content/constants/seasonalSets.js +++ b/website/common/script/content/constants/seasonalSets.js @@ -209,6 +209,11 @@ const SEASONAL_SETS = { 'fall2022OrcWarriorSet', 'fall2022HarpyMageSet', 'fall2022WatcherHealerSet', + + 'fall2023WitchsBrewRogueSet', + 'fall2023BogCreatureHealerSet', + 'fall2023ScaryMovieWarriorSet', + 'fall2023ScarletWarlockMageSet', ], }; diff --git a/website/common/script/content/gear/sets/armoire.js b/website/common/script/content/gear/sets/armoire.js index 2bea5b9e54..71e7b97e02 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -919,6 +919,16 @@ const head = { per: 7, set: 'admiralsSet', }, + blackSpookySorceryHat: { + int: 5, + con: 3, + set: 'somethingSpooky', + }, + purpleSpookySorceryHat: { + per: 5, + con: 3, + set: 'somethingSpooky', + }, }; const shield = { @@ -1694,6 +1704,11 @@ const weapon = { con: 4, set: 'cleaningSuppliesTwo', }, + ridingBroom: { + str: 5, + int: 3, + set: 'somethingSpooky', + }, }; forEach({ diff --git a/website/common/script/content/gear/sets/mystery.js b/website/common/script/content/gear/sets/mystery.js index e791bb0398..6ceadc952a 100644 --- a/website/common/script/content/gear/sets/mystery.js +++ b/website/common/script/content/gear/sets/mystery.js @@ -63,6 +63,7 @@ const armor = { 202304: { }, 202306: { }, 202307: { }, + 202310: { }, 301404: { }, 301703: { }, 301704: { }, @@ -211,6 +212,7 @@ const head = { 202303: { }, 202304: { }, 202308: { }, + 202310: { }, 301404: { }, 301405: { }, 301703: { }, @@ -242,6 +244,7 @@ const headAccessory = { 202302: { }, 202305: { }, 202309: { }, + 202310: { }, 301405: { }, }; diff --git a/website/common/script/content/gear/sets/special/index.js b/website/common/script/content/gear/sets/special/index.js index 813652340e..28faa567f1 100644 --- a/website/common/script/content/gear/sets/special/index.js +++ b/website/common/script/content/gear/sets/special/index.js @@ -828,15 +828,31 @@ const armor = { }, summer2023Rogue: { set: 'summer2023GuppyRogueSet', + canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer', }, summer2023Warrior: { set: 'summer2023GoldfishWarriorSet', + canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer', }, summer2023Mage: { set: 'summer2023CoralMageSet', + canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer', }, summer2023Healer: { set: 'summer2023KelpHealerSet', + canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer', + }, + fall2023Warrior: { + set: 'fall2023ScaryMovieWarriorSet', + }, + fall2023Healer: { + set: 'fall2023BogCreatureHealerSet', + }, + fall2023Mage: { + set: 'fall2023ScarletWarlockMageSet', + }, + fall2023Rogue: { + set: 'fall2023WitchsBrewRogueSet', }, }; @@ -2019,15 +2035,31 @@ const head = { }, summer2023Rogue: { set: 'summer2023GuppyRogueSet', + canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer', }, summer2023Warrior: { set: 'summer2023GoldfishWarriorSet', + canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer', }, summer2023Mage: { set: 'summer2023CoralMageSet', + canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer', }, summer2023Healer: { set: 'summer2023KelpHealerSet', + canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer', + }, + fall2023Healer: { + set: 'fall2023BogCreatureHealerSet', + }, + fall2023Mage: { + set: 'fall2023ScarletWarlockMageSet', + }, + fall2023Rogue: { + set: 'fall2023WitchsBrewRogueSet', + }, + fall2023Warrior: { + set: 'fall2023ScaryMovieWarriorSet', }, }; @@ -2861,12 +2893,26 @@ const shield = { }, summer2023Rogue: { set: 'summer2023GuppyRogueSet', + canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall', }, summer2023Warrior: { set: 'summer2023GoldfishWarriorSet', + canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall', }, summer2023Healer: { set: 'summer2023KelpHealerSet', + canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall', + }, + fall2023Rogue: { + set: 'fall2023WitchsBrewRogueSet', + text: t('shieldSpecialFall2023RogueText'), + notes: t('shieldSpecialFall2023RogueNotes', { str: 8 }), + }, + fall2023Warrior: { + set: 'fall2023ScaryMovieWarriorSet', + }, + fall2023Healer: { + set: 'fall2023BogCreatureHealerSet', }, }; @@ -3642,15 +3688,31 @@ const weapon = { }, summer2023Rogue: { set: 'summer2023GuppyRogueSet', + canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall', }, summer2023Warrior: { set: 'summer2023GoldfishWarriorSet', + canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall', }, summer2023Mage: { set: 'summer2023CoralMageSet', + canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall', }, summer2023Healer: { set: 'summer2023KelpHealerSet', + canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall', + }, + fall2023Rogue: { + set: 'fall2023WitchsBrewRogueSet', + }, + fall2023Healer: { + set: 'fall2023BogCreatureHealerSet', + }, + fall2023Warrior: { + set: 'fall2023ScaryMovieWarriorSet', + }, + fall2023Mage: { + set: 'fall2023ScarletWarlockMageSet', }, }; diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js index bd826e5d71..8b15c330e8 100644 --- a/website/common/script/content/hatching-potions.js +++ b/website/common/script/content/hatching-potions.js @@ -153,13 +153,13 @@ const premium = { value: 2, text: t('hatchingPotionSpooky'), limited: true, - event: EVENTS.fall2021, + event: EVENTS.fall2023, _addlNotes: t('eventAvailabilityReturning', { availableDate: t('dateEndOctober'), - previousDate: t('septemberYYYY', { year: 2019 }), + previousDate: t('octoberYYYY', { year: 2021 }), }), canBuy () { - return moment().isBefore(EVENTS.fall2021.end); + return moment().isBetween(EVENTS.fall2023.start, EVENTS.fall2023.end); }, }, Ghost: { @@ -244,13 +244,13 @@ const premium = { value: 2, text: t('hatchingPotionGlow'), limited: true, - event: EVENTS.birthday10, + event: EVENTS.fall2023, _addlNotes: t('eventAvailabilityReturning', { - availableDate: t('dateStartFebruary'), - previousDate: t('octoberYYYY', { year: 2021 }), + availableDate: t('dateEndOctober'), + previousDate: t('januaryYYYY', { year: 2023 }), }), canBuy () { - return moment().isBetween(EVENTS.birthday10.start, EVENTS.birthday10.end); + return moment().isBetween(EVENTS.fall2023.start, EVENTS.fall2023.end); }, }, Frost: { @@ -436,13 +436,13 @@ const premium = { value: 2, text: t('hatchingPotionVampire'), limited: true, - event: EVENTS.birthday10, + event: EVENTS.fall2023, _addlNotes: t('eventAvailabilityReturning', { - availableDate: t('dateStartFebruary'), - previousDate: t('octoberYYYY', { year: 2022 }), + availableDate: t('dateEndOctober'), + previousDate: t('januaryYYYY', { year: 2023 }), }), canBuy () { - return moment().isBetween(EVENTS.birthday10.start, EVENTS.birthday10.end); + return moment().isBetween(EVENTS.fall2023.start, EVENTS.fall2023.end); }, }, AutumnLeaf: { diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js index 3219ce9592..92e16d7813 100644 --- a/website/common/script/content/shop-featuredItems.js +++ b/website/common/script/content/shop-featuredItems.js @@ -5,7 +5,7 @@ import { EVENTS } from './constants'; // path: 'premiumHatchingPotions.Rainbow', const featuredItems = { market () { - if (moment().isBetween(EVENTS.potions202308.start, EVENTS.potions202308.end)) { + if (moment().isBetween(EVENTS.fall2023.start, EVENTS.fall2023.end)) { return [ { type: 'armoire', @@ -13,15 +13,15 @@ const featuredItems = { }, { type: 'premiumHatchingPotion', - path: 'premiumHatchingPotions.Thunderstorm', + path: 'premiumHatchingPotions.Glow', }, { type: 'premiumHatchingPotion', - path: 'premiumHatchingPotions.Porcelain', + path: 'premiumHatchingPotions.Spooky', }, { - type: 'hatchingPotions', - path: 'hatchingPotions.Zombie', + type: 'premiumHatchingPotion', + path: 'premiumHatchingPotions.Vampire', }, ]; } @@ -32,7 +32,7 @@ const featuredItems = { }, { type: 'food', - path: 'food.Meat', + path: 'food.RottenMeat', }, { type: 'hatchingPotions', @@ -40,40 +40,24 @@ const featuredItems = { }, { type: 'eggs', - path: 'eggs.Fox', + path: 'eggs.Cactus', }, ]; }, quests () { - if (moment().isBetween(EVENTS.bundle202308.start, EVENTS.bundle202308.end)) { + if (moment().isBetween(EVENTS.bundle202310.start, EVENTS.bundle202310.end)) { return [ { type: 'bundles', - path: 'bundles.hugabug', + path: 'bundles.sandySidekicks', }, { type: 'quests', - path: 'quests.octopus', + path: 'quests.beetle', }, { type: 'quests', - path: 'quests.rock', - }, - ]; - } - if (moment().isBetween('2023-03-28T08:00-05:00', EVENTS.spring2023.end)) { - return [ - { - type: 'quests', - path: 'quests.egg', - }, - { - type: 'quests', - path: 'quests.yarn', - }, - { - type: 'quests', - path: 'quests.ghost_stag', + path: 'quests.frog', }, ]; } @@ -93,7 +77,7 @@ const featuredItems = { }, ]; }, - seasonal: 'summer2022MantaRayMageSet', + seasonal: 'fall2017TrickOrTreatSet', timeTravelers: [ // TODO ], diff --git a/website/common/script/content/spells.js b/website/common/script/content/spells.js index 2b201c2c7b..e4ccd37c4e 100644 --- a/website/common/script/content/spells.js +++ b/website/common/script/content/spells.js @@ -313,7 +313,7 @@ spells.special = { target: 'user', notes: t('spellSpecialSpookySparklesNotes'), canOwn () { - return moment().isBetween('2021-10-11T08:00-04:00', EVENTS.fall2022.end); + return moment().isBetween('2023-10-03T08:00-04:00', EVENTS.fall2023.end); }, cast (user, target, req) { if (!user.items.special.spookySparkles) throw new NotAuthorized(t('spellNotOwned')(req.language)); diff --git a/website/common/script/libs/shops-seasonal.config.js b/website/common/script/libs/shops-seasonal.config.js index b5f60177bb..3f77a98439 100644 --- a/website/common/script/libs/shops-seasonal.config.js +++ b/website/common/script/libs/shops-seasonal.config.js @@ -29,16 +29,16 @@ export default { pinnedSets: CURRENT_EVENT ? { - rogue: 'summer2023GuppyRogueSet', - warrior: 'summer2023GoldfishWarriorSet', - wizard: 'summer2023CoralMageSet', - healer: 'summer2023KelpHealerSet', + rogue: 'fall2023WitchsBrewRogueSet', + warrior: 'fall2023ScaryMovieWarriorSet', + wizard: 'fall2023ScarletWarlockMageSet', + healer: 'fall2023BogCreatureHealerSet', } : {}, - availableSpells: CURRENT_EVENT && moment().isBetween('2023-07-11T08:00-04:00', CURRENT_EVENT.end) + availableSpells: CURRENT_EVENT && moment().isBetween('2023-10-03T08:00-04:00', CURRENT_EVENT.end) ? [ - 'seafoam', + 'spookySparkles', ] : [], @@ -46,5 +46,5 @@ export default { ? [] : [], - featuredSet: 'summer2022MantaRayMageSet', + featuredSet: 'fall2022HarpyMageSet', }; diff --git a/website/common/script/ops/addTask.js b/website/common/script/ops/addTask.js index e89485bb3c..1907c59034 100644 --- a/website/common/script/ops/addTask.js +++ b/website/common/script/ops/addTask.js @@ -12,7 +12,6 @@ export default function addTask (user, req = { body: {} }) { if (task._editing) { task._edit = clone(task); } - task._advanced = !user.preferences.advancedCollapsed; return task; } diff --git a/website/server/controllers/api-v3/chat.js b/website/server/controllers/api-v3/chat.js index d964d310bb..c94dbc8add 100644 --- a/website/server/controllers/api-v3/chat.js +++ b/website/server/controllers/api-v3/chat.js @@ -14,10 +14,9 @@ import { NotAuthorized, } from '../../libs/errors'; import { removeFromArray } from '../../libs/collectionManipulators'; -import { getUserInfo, getGroupUrl, sendTxn } from '../../libs/email'; +import { getUserInfo } from '../../libs/email'; import * as slack from '../../libs/slack'; import { chatReporterFactory } from '../../libs/chatReporting/chatReporterFactory'; -import { getAuthorEmailFromMessage } from '../../libs/chat'; import bannedWords from '../../libs/bannedWords'; import { getMatchesByWordArray } from '../../libs/stringUtils'; import bannedSlurs from '../../libs/bannedSlurs'; @@ -28,7 +27,6 @@ import { getAnalyticsServiceByEnvironment } from '../../libs/analyticsService'; const analytics = getAnalyticsServiceByEnvironment(); const ACCOUNT_MIN_CHAT_AGE = Number(nconf.get('ACCOUNT_MIN_CHAT_AGE')); -const FLAG_REPORT_EMAILS = nconf.get('FLAG_REPORT_EMAIL').split(',').map(email => ({ email, canSend: true })); /** * @apiDefine MessageNotFound @@ -147,24 +145,6 @@ api.postChat = { // Email the mods const authorEmail = getUserInfo(user, ['email']).email; - const groupUrl = getGroupUrl(group); - - const report = [ - { name: 'MESSAGE_TIME', content: (new Date()).toString() }, - { name: 'MESSAGE_TEXT', content: message }, - - { name: 'AUTHOR_USERNAME', content: user.profile.name }, - { name: 'AUTHOR_UUID', content: user._id }, - { name: 'AUTHOR_EMAIL', content: authorEmail }, - { name: 'AUTHOR_MODAL_URL', content: `/profile/${user._id}` }, - - { name: 'GROUP_NAME', content: group.name }, - { name: 'GROUP_TYPE', content: group.type }, - { name: 'GROUP_ID', content: group._id }, - { name: 'GROUP_URL', content: groupUrl }, - ]; - - sendTxn(FLAG_REPORT_EMAILS, 'slur-report-to-mods', report); // Slack the mods slack.sendSlurNotification({ @@ -224,24 +204,6 @@ api.postChat = { // Email the mods const authorEmail = getUserInfo(user, ['email']).email; - const groupUrl = getGroupUrl(group); - - const report = [ - { name: 'MESSAGE_TIME', content: (new Date()).toString() }, - { name: 'MESSAGE_TEXT', content: message }, - - { name: 'AUTHOR_USERNAME', content: user.profile.name }, - { name: 'AUTHOR_UUID', content: user._id }, - { name: 'AUTHOR_EMAIL', content: authorEmail }, - { name: 'AUTHOR_MODAL_URL', content: `/profile/${user._id}` }, - - { name: 'GROUP_NAME', content: group.name }, - { name: 'GROUP_TYPE', content: group.type }, - { name: 'GROUP_ID', content: group._id }, - { name: 'GROUP_URL', content: groupUrl }, - ]; - - sendTxn(FLAG_REPORT_EMAILS, 'shadow-muted-post-report-to-mods', report); // Slack the mods slack.sendShadowMutedPostNotification({ @@ -443,30 +405,6 @@ api.clearChatFlags = { message.flagCount = 0; await message.save(); - const adminEmailContent = getUserInfo(user, ['email']).email; - const authorEmail = getAuthorEmailFromMessage(message); - const groupUrl = getGroupUrl(group); - - sendTxn(FLAG_REPORT_EMAILS, 'unflag-report-to-mods', [ - { name: 'MESSAGE_TIME', content: (new Date(message.timestamp)).toString() }, - { name: 'MESSAGE_TEXT', content: message.text }, - - { name: 'ADMIN_USERNAME', content: user.profile.name }, - { name: 'ADMIN_UUID', content: user._id }, - { name: 'ADMIN_EMAIL', content: adminEmailContent }, - { name: 'ADMIN_MODAL_URL', content: `/profile/${user._id}` }, - - { name: 'AUTHOR_USERNAME', content: message.user }, - { name: 'AUTHOR_UUID', content: message.uuid }, - { name: 'AUTHOR_EMAIL', content: authorEmail }, - { name: 'AUTHOR_MODAL_URL', content: `/profile/${message.uuid}` }, - - { name: 'GROUP_NAME', content: group.name }, - { name: 'GROUP_TYPE', content: group.type }, - { name: 'GROUP_ID', content: group._id }, - { name: 'GROUP_URL', content: groupUrl }, - ]); - res.respond(200, {}); }, }; diff --git a/website/server/controllers/api-v3/hall.js b/website/server/controllers/api-v3/hall.js index d8f5a086e8..e9e4f03ee1 100644 --- a/website/server/controllers/api-v3/hall.js +++ b/website/server/controllers/api-v3/hall.js @@ -146,7 +146,7 @@ api.getHeroes = { // Note, while the following routes are called getHero / updateHero // they can be used by admins to get/update any user -const heroAdminFields = 'auth balance contributor flags items lastCron party preferences profile.name purchased secret permissions'; +const heroAdminFields = 'auth balance contributor flags items lastCron party preferences profile purchased secret permissions'; const heroAdminFieldsToFetch = heroAdminFields; // these variables will make more sense when... const heroAdminFieldsToShow = heroAdminFields; // ... apiTokenObscured is added @@ -200,6 +200,7 @@ api.getHero = { if (!heroRes.contributor) heroRes.contributor = {}; heroRes.secret = hero.getSecretData(); + heroRes.profile.flags = hero.getFlagData(); res.respond(200, heroRes); }, diff --git a/website/server/controllers/api-v3/members.js b/website/server/controllers/api-v3/members.js index 11469a5684..ac8a85815c 100644 --- a/website/server/controllers/api-v3/members.js +++ b/website/server/controllers/api-v3/members.js @@ -11,6 +11,7 @@ import { import { model as Group } from '../../models/group'; import { model as Challenge } from '../../models/challenge'; import { + BadRequest, NotFound, NotAuthorized, } from '../../libs/errors'; @@ -27,6 +28,7 @@ import { } from '../../models/message'; import highlightMentions from '../../libs/highlightMentions'; import { handleGetMembersForChallenge } from '../../libs/challenges/handleGetMembersForChallenge'; +import { chatReporterFactory } from '../../libs/chatReporting/chatReporterFactory'; const { achievements } = common; @@ -777,4 +779,92 @@ api.transferGems = { }, }; +/** + * @api {post} /api/v3/members/:memberId/flag Flag (report) a user + * @apiDescription Sends an email to staff about another user or their profile + * @apiName FlagUser + * @apiGroup Members + * + * @apiParam (Path) {UUID} memberId The unique ID of the user being flagged + * @apiParam (Body) {String} [comment] explain why the user was flagged + * @apiParam (Body) {String} [source] URL or view from which the user was flagged + * + * @apiSuccess {Object} data The flagged user + * @apiSuccess {UUID} data.id The id of the flagged user + * @apiSuccess {String} data.username The username of the flagged user + * @apiSuccess {Object} data.profile The flagged user's profile information + * @apiSuccess {String} data.profile.blurb Text of the flagged user's profile bio + * @apiSuccess {Object} data.profile.flags Data about flags the profile has received. + * Restricted to the reporting user's own flag + * unless the reporting user is a moderator. + * Each key is a UUID, and fields are comment, + * source, and timestamp. + * @apiSuccess {String} data.profile.imageUrl URL of the flagged user's profile image + * @apiSuccess {String} data.profile.name The flagged user's display name + * + * @apiError (400) {BadRequest} AlreadyFlagged A profile cannot be flagged + * more than once by the same user. + * @apiError (400) {BadRequest} MemberIdRequired The `memberId` param is required + * and must be a valid `UUID`. + * @apiError (404) {NotFound} UserWithIdNotFound The `memberId` param did not + * belong to an existing user. + */ +api.flagUser = { + method: 'POST', + url: '/members/:memberId/flag', + middlewares: [authWithHeaders()], + async handler (req, res) { + const chatReporter = chatReporterFactory('User', req, res); + const flaggedUser = await chatReporter.flag(); + res.respond(200, flaggedUser); + }, +}; + +/** + * @api {post} /api/v3/members/:memberId/clear-flags Delete flags from a user + * @apiDescription Removes any abuse reports flagged on a user profile. + * @apiPermission Admin + * @apiName ClearUserFlags + * @apiGroup Members + * + * @apiParam (Path) {UUID} memberId The unique ID of the flagged user to reset + * + * @apiSuccess {Object} data An empty object + * + * @apiError (400) {BadRequest} MemberIdRequired The `memberId` param is required + * and must be a valid `UUID`. + * @apiError (400) {BadRequest} MustBeAdmin Must be a moderator to use this route + * @apiError (404) {NotFound} UserWithIdNotFound The `memberId` param did not + * belong to an existing user. + */ + +api.clearUserFlags = { + method: 'POST', + url: '/members/:memberId/clear-flags', + middlewares: [authWithHeaders()], + async handler (req, res) { + const { user } = res.locals; + const { memberId } = req.params; + + req.checkParams('memberId', res.t('memberIdRequired')).notEmpty().isUUID(); + const validationErrors = req.validationErrors(); + if (validationErrors) throw validationErrors; + + if (!user.hasPermission('moderator')) { + throw new BadRequest('Only a moderator may clear reports from a profile.'); + } + const flaggedUser = await User.findOne( + { _id: memberId }, + { profile: 1 }, + ).exec(); + if (!flaggedUser) { + throw new NotFound(res.t('userWithIDNotFound', { userId: memberId })); + } + flaggedUser.profile.flags = {}; + await flaggedUser.save(); + + res.respond(200, {}); + }, +}; + export default api; diff --git a/website/server/controllers/api-v4/user.js b/website/server/controllers/api-v4/user.js index b0e6e59773..52b5e6d895 100644 --- a/website/server/controllers/api-v4/user.js +++ b/website/server/controllers/api-v4/user.js @@ -3,6 +3,8 @@ import * as userLib from '../../libs/user'; import { verifyDisplayName } from '../../libs/user/validation'; import common from '../../../common'; import { TransactionModel as Transaction } from '../../models/transaction'; +import { BadRequest, NotAuthorized } from '../../libs/errors'; +import * as passwordUtils from '../../libs/password'; const api = {}; @@ -60,7 +62,7 @@ const api = {}; * } * } * -*/ + */ api.getUser = { method: 'GET', middlewares: [authWithHeaders()], @@ -193,6 +195,8 @@ api.userReroll = { * @apiName UserReset * @apiGroup User * + * @apiParam (Body) {String} password The user's password + * * @apiSuccess {Object} data.user * @apiSuccess {Array} data.tasksToRemove IDs of removed tasks * @apiSuccess {String} message Success message @@ -214,6 +218,17 @@ api.userReset = { middlewares: [authWithHeaders()], url: '/user/reset', async handler (req, res) { + const { user } = res.locals; + const { password } = req.body; + if (!password) { + throw new BadRequest(res.t('missingPassword')); + } + + const isValidPassword = await passwordUtils.compare(user, password); + if (!isValidPassword) { + throw new NotAuthorized(res.t('wrongPassword')); + } + await userLib.reset(req, res, { isV3: false }); }, }; diff --git a/website/server/libs/chatReporting/chatReporterFactory.js b/website/server/libs/chatReporting/chatReporterFactory.js index 39f8810ba5..e0b9e7b019 100644 --- a/website/server/libs/chatReporting/chatReporterFactory.js +++ b/website/server/libs/chatReporting/chatReporterFactory.js @@ -1,11 +1,14 @@ import GroupChatReporter from './groupChatReporter'; import InboxChatReporter from './inboxChatReporter'; +import ProfileReporter from './profileReporter'; export function chatReporterFactory (type, req, res) { // eslint-disable-line import/prefer-default-export, max-len if (type === 'Group') { return new GroupChatReporter(req, res); } if (type === 'Inbox') { return new InboxChatReporter(req, res); + } if (type === 'Profile' || type === 'User') { + return new ProfileReporter(req, res); } throw new Error('Invalid chat reporter type.'); diff --git a/website/server/libs/chatReporting/groupChatReporter.js b/website/server/libs/chatReporting/groupChatReporter.js index 18caf90c9a..e51b8bbcda 100644 --- a/website/server/libs/chatReporting/groupChatReporter.js +++ b/website/server/libs/chatReporting/groupChatReporter.js @@ -1,22 +1,17 @@ import nconf from 'nconf'; import moment from 'moment'; - +import { getAuthorEmailFromMessage } from '../chat'; import ChatReporter from './chatReporter'; import { BadRequest, NotFound, } from '../errors'; -import { sendTxn } from '../email'; import * as slack from '../slack'; import { model as Group } from '../../models/group'; import { chatModel as Chat } from '../../models/message'; import apiError from '../apiError'; const COMMUNITY_MANAGER_EMAIL = nconf.get('EMAILS_COMMUNITY_MANAGER_EMAIL'); -const FLAG_REPORT_EMAILS = nconf - .get('FLAG_REPORT_EMAIL') - .split(',') - .map(email => ({ email, canSend: true })); const USER_AGE_FOR_FLAGGING = 3; // accounts less than this many days old don't increment flagCount export default class GroupChatReporter extends ChatReporter { @@ -51,15 +46,9 @@ export default class GroupChatReporter extends ChatReporter { } async notify (group, message, userComment, automatedComment = '') { - let emailVariables = await this.getMessageVariables(group, message); - emailVariables = emailVariables.concat([ - { name: 'REPORTER_COMMENT', content: userComment || '' }, - ]); - - sendTxn(FLAG_REPORT_EMAILS, 'flag-report-to-mods-with-comments', emailVariables); - + const authorEmail = await getAuthorEmailFromMessage(message); slack.sendFlagNotification({ - authorEmail: this.authorEmail, + authorEmail, flagger: this.user, group, message, diff --git a/website/server/libs/chatReporting/inboxChatReporter.js b/website/server/libs/chatReporting/inboxChatReporter.js index 94c6302cf4..b2210d56bf 100644 --- a/website/server/libs/chatReporting/inboxChatReporter.js +++ b/website/server/libs/chatReporting/inboxChatReporter.js @@ -1,21 +1,16 @@ -import nconf from 'nconf'; import { model as User } from '../../models/user'; import ChatReporter from './chatReporter'; import { BadRequest, } from '../errors'; -import { getUserInfo, sendTxn } from '../email'; +import { getUserInfo } from '../email'; import * as slack from '../slack'; import apiError from '../apiError'; import * as inboxLib from '../inbox'; import { getAuthorEmailFromMessage } from '../chat'; -const FLAG_REPORT_EMAILS = nconf.get('FLAG_REPORT_EMAIL') - .split(',') - .map(email => ({ email, canSend: true })); - export default class InboxChatReporter extends ChatReporter { constructor (req, res) { super(req, res); @@ -43,19 +38,6 @@ export default class InboxChatReporter extends ChatReporter { } async notify (message, userComment) { - const group = { - type: 'private messages', - name: 'N/A', - _id: 'N/A', - }; - - let emailVariables = await this.getMessageVariables(group, message); - emailVariables = emailVariables.concat([ - { name: 'REPORTER_COMMENT', content: userComment || '' }, - ]); - - sendTxn(FLAG_REPORT_EMAILS, 'flag-report-to-mods-with-comments', emailVariables); - slack.sendInboxFlagNotification({ messageUserEmail: this.messageUserEmail, flagger: this.user, diff --git a/website/server/libs/chatReporting/profileReporter.js b/website/server/libs/chatReporting/profileReporter.js new file mode 100644 index 0000000000..008146dcf5 --- /dev/null +++ b/website/server/libs/chatReporting/profileReporter.js @@ -0,0 +1,81 @@ +import { model as User } from '../../models/user'; +import * as slack from '../slack'; + +import ChatReporter from './chatReporter'; +import { + BadRequest, + NotFound, +} from '../errors'; + +export default class ProfileReporter extends ChatReporter { + constructor (req, res) { + super(req, res); + + this.user = res.locals.user; + } + + async validate () { + this.req.checkParams('memberId', this.res.t('memberIdRequired')).notEmpty().isUUID(); + + const validationErrors = this.req.validationErrors(); + if (validationErrors) throw validationErrors; + + const flaggedUser = await User.findOne( + { _id: this.req.params.memberId }, + { auth: 1, profile: 1 }, + ).exec(); + if (!flaggedUser) { + throw new NotFound(this.res.t('userWithIDNotFound', { userId: this.req.params.memberId })); + } + + if (flaggedUser.profile.flags && flaggedUser.profile.flags[this.user._id] + && !this.user.hasPermission('moderator')) { + throw new BadRequest('A profile can not be flagged more than once by the same user.'); + } + + const { comment, source } = this.req.body; + + return { flaggedUser, comment, source }; + } + + async flagProfile (flaggedUser, comment, source) { + const timestamp = new Date(); + // Log user ids that have flagged the account + if (!flaggedUser.profile.flags) { + flaggedUser.profile.flags = {}; + } + + flaggedUser.profile.flags[this.user._id] = { + comment, + source, + timestamp, + }; + flaggedUser.markModified('profile.flags'); + await flaggedUser.save(); + return timestamp; + } + + notify (flaggedUser, comment, source) { + slack.sendProfileFlagNotification({ + reporter: this.user, + flaggedUser, + userComment: comment, + source, + }); + } + + async flag () { + const { flaggedUser, comment, source } = await this.validate(); + const timestamp = await this.flagProfile(flaggedUser, comment, source); + this.notify(flaggedUser, comment, source); + if (!this.user.hasPermission('moderator')) { + flaggedUser.profile.flags = {}; + flaggedUser.profile.flags[this.user._id] = { + comment, + source, + timestamp, + }; + } + return flaggedUser; + } +} diff --git a/website/server/libs/slack.js b/website/server/libs/slack.js index 615c7d4284..0f2997a239 100644 --- a/website/server/libs/slack.js +++ b/website/server/libs/slack.js @@ -176,6 +176,43 @@ function sendInboxFlagNotification ({ .catch(err => logger.error(err, 'Error while sending flag data to Slack.')); } +function sendProfileFlagNotification ({ + reporter, + flaggedUser, + userComment, + source, +}) { + const title = 'User Profile Report'; + const titleLink = `${BASE_URL}/profile/${flaggedUser._id}`; + let text = `@${reporter.auth.local.username} (${reporter._id}; language: ${reporter.preferences.language}) flagged @${flaggedUser.auth.local.username}'s profile from ${source}`; + if (userComment) { + text += ` and commented: ${userComment}`; + } + let profileData = `Display Name: ${flaggedUser.profile.name}`; + if (flaggedUser.profile.imageUrl) { + profileData += `\n\nImage URL: ${flaggedUser.profile.imageUrl}`; + } + if (flaggedUser.profile.blurb) { + profileData += `\n\nAbout: ${flaggedUser.profile.blurb}`; + } + + flagSlack + .send({ + text, + attachments: [{ + fallback: 'Flag Profile', + color: 'danger', + title, + title_link: titleLink, + text: profileData, + mrkdwn_in: [ + 'text', + ], + }], + }) + .catch(err => logger.error(err, 'Error while sending flag data to Slack.')); +} + function sendSubscriptionNotification ({ buyer, recipient, @@ -302,6 +339,7 @@ function sendSlurNotification ({ export { sendFlagNotification, sendInboxFlagNotification, + sendProfileFlagNotification, sendSubscriptionNotification, sendShadowMutedPostNotification, sendSlurNotification, diff --git a/website/server/models/user/hooks.js b/website/server/models/user/hooks.js index e1b00de15b..a64d49fde9 100644 --- a/website/server/models/user/hooks.js +++ b/website/server/models/user/hooks.js @@ -24,7 +24,7 @@ schema.plugin(baseModel, { // noSet is not used as updating uses a whitelist and creating only accepts // specific params (password, email, username, ...) noSet: [], - private: ['auth.local.hashed_password', 'auth.local.passwordHashMethod', 'auth.local.salt', '_cronSignature', '_ABtests', 'secret'], + private: ['auth.local.hashed_password', 'auth.local.passwordHashMethod', 'auth.local.salt', '_cronSignature', '_ABtests', 'secret', 'profile.flags'], toJSONTransform: function userToJSON (plainObj, originalDoc) { plainObj._tmp = originalDoc._tmp; // be sure to send down drop notifs diff --git a/website/server/models/user/methods.js b/website/server/models/user/methods.js index 6272c84b72..760e81ac35 100644 --- a/website/server/models/user/methods.js +++ b/website/server/models/user/methods.js @@ -548,6 +548,12 @@ schema.methods.getSecretData = function getSecretData () { return user.secret; }; +schema.methods.getFlagData = function getFlagData () { + const user = this; + + return user.profile.flags; +}; + schema.methods.updateBalance = async function updateBalance (amount, transactionType, reference, diff --git a/website/server/models/user/schema.js b/website/server/models/user/schema.js index 5bc38ff769..38a4dbaabe 100644 --- a/website/server/models/user/schema.js +++ b/website/server/models/user/schema.js @@ -13,7 +13,7 @@ import { schema as WebhookSchema } from '../webhook'; const RESTRICTED_EMAIL_DOMAINS = Object.freeze(['habitica.com', 'habitrpg.com']); // User schema definition -export default new Schema({ +export const UserSchema = new Schema({ apiToken: { $type: String, default: shared.uuid, @@ -541,10 +541,13 @@ export default new Schema({ newTaskEdit: { $type: Boolean, default: false }, // not used anymore, now the current filter is saved in preferences.activeFilter dailyDueDefaultView: { $type: Boolean, default: false }, + // deprecated, unused advancedCollapsed: { $type: Boolean, default: false }, toolbarCollapsed: { $type: Boolean, default: false }, reverseChatOrder: { $type: Boolean, default: false }, + developerMode: { $type: Boolean, default: false }, background: String, + // deprecated, unused displayInviteToPartyWhenPartyIs1: { $type: Boolean, default: true }, webhooks: { $type: Schema.Types.Mixed, @@ -625,6 +628,7 @@ export default new Schema({ required: true, trim: true, }, + flags: { $type: Schema.Types.Mixed }, }, stats: { hp: { $type: Number, default: shared.maxHealth }, @@ -640,7 +644,7 @@ export default new Schema({ // Class System class: { - $type: String, enum: ['warrior', 'rogue', 'wizard', 'healer'], default: 'warrior', required: true, + $type: String, enum: shared.content.classes, default: 'warrior', required: true, }, points: { $type: Number, default: 0, min: 0 }, str: { $type: Number, default: 0, min: 0 }, @@ -721,3 +725,5 @@ export default new Schema({ minimize: false, // So empty objects are returned typeKey: '$type', // So that we can use fields named `type` }); + +export default UserSchema; // fallback export until all imports using the Named one