diff --git a/package-lock.json b/package-lock.json index 54718a797c..040489331b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -920,19 +920,19 @@ } }, "@google-cloud/projectify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-1.0.1.tgz", - "integrity": "sha512-xknDOmsMgOYHksKc1GPbwDLsdej8aRNIA17SlSZgQdyrcC0lx0OGo4VZgYfwoEU1YS8oUxF9Y+6EzDOb0eB7Xg==" + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-1.0.2.tgz", + "integrity": "sha512-WnkGxvk4U1kAJpoS/Ehk+3MZXVW+XHHhwc/QyD6G8Za4xml3Fv+NRn/bYffl1TxSg+gE0N0mj9Shgc7e8+fl8A==" }, "@google-cloud/promisify": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-1.0.2.tgz", - "integrity": "sha512-7WfV4R/3YV5T30WRZW0lqmvZy9hE2/p9MvpI34WuKa2Wz62mLu5XplGTFEMK6uTbJCLWUxTcZ4J4IyClKucE5g==" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-1.0.3.tgz", + "integrity": "sha512-Rufgfl3TnkIil3CjsH33Q6093zeoVqyqCdvtvgHuCqRJxCZYfaVPIyr8JViMeLTD4Ja630pRKKZVSjKggoVbNg==" }, "@google-cloud/trace-agent": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@google-cloud/trace-agent/-/trace-agent-4.2.2.tgz", - "integrity": "sha512-L1AvE07Toub6Bt1pLeW47dLzPEyjwWCKrcNx4CCYAbQpMWPZEMl5DHMrs7r8d6eX4TQdZz/vvzDiG5RmS/eL4w==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/@google-cloud/trace-agent/-/trace-agent-4.2.3.tgz", + "integrity": "sha512-BezSjercoxF7CAjklEwlJ9w7sS7lrGcMKCiyfdGq9cl7ZlsrYU2FnO3x8aDXQicnfaoHEeBFvAcR4ADhoGZamQ==", "requires": { "@google-cloud/common": "^2.0.0", "@opencensus/propagation-stackdriver": "0.0.18", @@ -947,7 +947,7 @@ "require-in-the-middle": "^5.0.0", "semver": "^6.0.0", "shimmer": "^1.2.0", - "source-map-support": "^0.5.12", + "source-map-support": "^0.5.16", "uuid": "^3.0.1" }, "dependencies": { @@ -1138,9 +1138,9 @@ "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==" }, "@types/node": { - "version": "12.12.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.3.tgz", - "integrity": "sha512-opgSsy+cEF9N8MgaVPnWVtdJ3o4mV2aMHvDq7thkQUFt0EuOHJon4rQpJfhjmNHB+ikl0Cd6WhWIErOyQ+f7tw==" + "version": "12.12.8", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.8.tgz", + "integrity": "sha512-XLla8N+iyfjvsa0KKV+BP/iGSoTmwxsu5Ci5sM33z9TjohF72DEz95iNvD6pPmemvbQgxAv/909G73gUn8QR7w==" }, "@types/q": { "version": "1.5.2", @@ -1865,9 +1865,9 @@ "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" }, "aws-sdk": { - "version": "2.568.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.568.0.tgz", - "integrity": "sha512-jPvhiJV2iLyWbJJDM01gvUCzeChWUeRMkIr6dsHu+leH2QnzvGNunTwMGculKE1jouXatajZEoA9bdqfosranw==", + "version": "2.573.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.573.0.tgz", + "integrity": "sha512-NC6A0d96aowA1L1UW8idNTUnDTzjoCysiZY0rDiumMu9jhAouLp07ffc2sXgTWg9pWvXrEex2Aeps9oQWq/6OA==", "requires": { "buffer": "^4.9.1", "events": "^1.1.1", @@ -3532,13 +3532,13 @@ "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=" }, "css-select": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.0.2.tgz", - "integrity": "sha512-dSpYaDVoWaELjvZ3mS6IKZM/y2PMPa/XYoEfYNZePL4U/XgyxZNroHEHReDx/d+VgXh9VbCTtFqLkFbmeqeaRQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz", + "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==", "optional": true, "requires": { "boolbase": "^1.0.0", - "css-what": "^2.1.2", + "css-what": "^3.2.1", "domutils": "^1.7.0", "nth-check": "^1.0.2" } @@ -3568,9 +3568,9 @@ } }, "css-what": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz", - "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.2.1.tgz", + "integrity": "sha512-WwOrosiQTvyms+Ti5ZC5vGEK0Vod3FTt1ca+payZqvKuGJF+dq7bG63DstxtN0dpm6FxY27a/zS3Wten+gEtGw==", "optional": true }, "csso": { @@ -6181,11 +6181,11 @@ } }, "gcp-metadata": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-3.2.0.tgz", - "integrity": "sha512-ympv+yQ6k5QuWCuwQqnGEvFGS7MBKdcQdj1i188v3bW9QLFIchTGaBCEZxSQapT0jffdn1vdt8oJhB5VBWQO1Q==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-3.2.2.tgz", + "integrity": "sha512-vR7kcJMCYJG/mYWp/a1OszdOqnLB/XW1GorWW1hc1lWVNL26L497zypWb9cG0CYDQ4Bl1Wk0+fSZFFjwJlTQgQ==", "requires": { - "gaxios": "^2.0.1", + "gaxios": "^2.1.0", "json-bigint": "^0.3.0" } }, @@ -6502,9 +6502,9 @@ } }, "google-p12-pem": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-2.0.2.tgz", - "integrity": "sha512-UfnEARfJKI6pbmC1hfFFm+UAcZxeIwTiEcHfqKe/drMsXD/ilnVjF7zgOGpHXyhuvX6jNJK3S8A0hOQjwtFxEw==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-2.0.3.tgz", + "integrity": "sha512-Tq2kBCANxYYPxaBpTgCpRfdoPs9+/lNzc/Iaee4kuMVW5ascD+HwhpBsTLwH85C9Ev4qfB8KKHmpPQYyD2vg2w==", "requires": { "node-forge": "^0.9.0" } @@ -6545,11 +6545,11 @@ "dev": true }, "gtoken": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-4.1.0.tgz", - "integrity": "sha512-wqyn2gf5buzEZN4QNmmiiW2i2JkEdZnL7Z/9p44RtZqgt4077m4khRgAYNuu8cBwHWCc6MsP6eDUn/KkF6jFIw==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-4.1.2.tgz", + "integrity": "sha512-/YvFlrrRjiSJf6a4Kmr4+E+HFbYdEntRPD/W+ZGLYDziHiWjX4S6ld8TNCyPMtUG3J3hPkZkpHbva40JA56spw==", "requires": { - "gaxios": "^2.0.0", + "gaxios": "^2.1.0", "google-p12-pem": "^2.0.0", "jws": "^3.1.5", "mime": "^2.2.0" @@ -6616,9 +6616,9 @@ } }, "gulp-imagemin": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/gulp-imagemin/-/gulp-imagemin-6.1.1.tgz", - "integrity": "sha512-fqaSR8bMc5lhqa6HzRPuJaDY6lY7rcCipe6WtqQ5+hNYTCSPYjXic+1gvFG1+8X879gjVJmIxwmqIbfjuMqTpQ==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/gulp-imagemin/-/gulp-imagemin-6.2.0.tgz", + "integrity": "sha512-luHT+8kUz60KGzjJLUFzaPjl4b38UQLj8BJGkpJACRjiVEuzjohMOmLagkgXs+Rs4vYaUBr9tt1F/vLizaxgGg==", "requires": { "chalk": "^2.4.1", "fancy-log": "^1.3.2", @@ -7203,12 +7203,13 @@ } }, "imagemin": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/imagemin/-/imagemin-7.0.0.tgz", - "integrity": "sha512-TXvCSSIYl4KQUASur9S0+E4olVECzvxvZABU9rNqsza7vzIrUQMRTjyczGf8OmtcgvZ9jOYyinXW3epOpd/04A==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/imagemin/-/imagemin-7.0.1.tgz", + "integrity": "sha512-33AmZ+xjZhg2JMCe+vDf6a9mzWukE7l+wAtesjE7KyteqqKjzxv7aVQeWnul1Ve26mWvEQqyPwl0OctNBfSR9w==", "requires": { "file-type": "^12.0.0", "globby": "^10.0.0", + "graceful-fs": "^4.2.2", "junk": "^3.1.0", "make-dir": "^3.0.0", "p-pipe": "^3.0.0", @@ -9062,6 +9063,7 @@ "version": "3.3.3", "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.3.3.tgz", "integrity": "sha512-MdRnoOjstmnrKJsK8PY0PjP6fyF/SBS4R8coxmhsfEU7tQ46/J6j+aSHF2n4c2/H8B+Hc/Klbfp8vggZfI0mmA==", + "dev": true, "requires": { "bson": "^1.1.1", "require_optional": "^1.0.1", @@ -9070,13 +9072,13 @@ } }, "mongoose": { - "version": "5.7.9", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.7.9.tgz", - "integrity": "sha512-wXYY4+IEvplbEEeOxLVOHBGosBDNn/DYgwKzBFgsamCTvRQZHbdw88m9xUH8Srza+jdKND73/4XbQLynPseRAQ==", + "version": "5.7.11", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.7.11.tgz", + "integrity": "sha512-KpXGBTXQTKfTlePpZMY+FBsk9wiyp2gzfph9AsLPfWleK1x2GJY+6xpKx2kKIgLustgNq16OOrqwlAOGUbv3kg==", "requires": { "bson": "~1.1.1", "kareem": "2.3.1", - "mongodb": "3.3.3", + "mongodb": "3.3.4", "mongoose-legacy-pluralize": "1.0.2", "mpath": "0.6.0", "mquery": "3.2.2", @@ -9085,6 +9087,19 @@ "safe-buffer": "5.1.2", "sift": "7.0.1", "sliced": "1.0.1" + }, + "dependencies": { + "mongodb": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.3.4.tgz", + "integrity": "sha512-6fmHu3FJTpeZxacJcfjUGIP3BSteG0l2cxLkSrf1nnnS1OrlnVGiP9P/wAC4aB6dM6H4vQ2io8YDjkuPkje7AA==", + "requires": { + "bson": "^1.1.1", + "require_optional": "^1.0.1", + "safe-buffer": "^5.1.2", + "saslprep": "^1.0.0" + } + } } }, "mongoose-legacy-pluralize": { @@ -10397,9 +10412,9 @@ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, "picomatch": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.1.0.tgz", - "integrity": "sha512-uhnEDzAbrcJ8R3g2fANnSuXZMBtkpSjxTTgn2LeSiQlfmq72enQJWdQllXW24MBLYnA1SBD2vfvx2o0Zw3Ielw==" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.1.1.tgz", + "integrity": "sha512-OYMyqkKzK7blWO/+XZYP6w8hH0LDvkBvdvKukti+7kqYFCiEAk+gI3DWnryapc0Dau05ugGTy0foQ6mqn4AHYA==" }, "pify": { "version": "4.0.1", diff --git a/package.json b/package.json index 4f3047c95d..917c640434 100644 --- a/package.json +++ b/package.json @@ -7,14 +7,14 @@ "@babel/core": "^7.7.2", "@babel/preset-env": "^7.7.1", "@babel/register": "^7.7.0", - "@google-cloud/trace-agent": "^4.2.2", + "@google-cloud/trace-agent": "^4.2.3", "@slack/client": "^3.8.1", "accepts": "^1.3.5", "amazon-payments": "^0.2.7", "amplitude": "^3.5.0", "apidoc": "^0.17.5", "apn": "^2.2.0", - "aws-sdk": "^2.568.0", + "aws-sdk": "^2.573.0", "bcrypt": "^3.0.6", "body-parser": "^1.18.3", "compression": "^1.7.4", @@ -33,7 +33,7 @@ "got": "^9.0.0", "gulp": "^4.0.0", "gulp-babel": "^8.0.0", - "gulp-imagemin": "^6.1.1", + "gulp-imagemin": "^6.2.0", "gulp-nodemon": "^2.4.1", "gulp.spritesmith": "^6.9.0", "habitica-markdown": "^1.3.0", @@ -46,7 +46,7 @@ "method-override": "^3.0.0", "moment": "^2.24.0", "moment-recur": "^1.0.7", - "mongoose": "^5.7.9", + "mongoose": "^5.7.11", "morgan": "^1.7.0", "nconf": "^0.10.0", "node-gcm": "^1.0.2", diff --git a/test/api/v3/integration/webhook/PUT-user_update_webhook.test.js b/test/api/v3/integration/webhook/PUT-user_update_webhook.test.js index 0f00e238e9..571e084742 100644 --- a/test/api/v3/integration/webhook/PUT-user_update_webhook.test.js +++ b/test/api/v3/integration/webhook/PUT-user_update_webhook.test.js @@ -63,6 +63,26 @@ describe('PUT /user/webhook/:id', () => { expect(webhook.options).to.eql(options); }); + it('updates a webhook with empty label', async () => { + const url = 'http://a-new-url.com'; + const type = 'groupChatReceived'; + const label = ''; + const options = { groupId: generateUUID() }; + + await user.put(`/user/webhook/${webhookToUpdate.id}`, { + url, type, options, label, + }); + + await user.sync(); + + const webhook = user.webhooks.find(hook => webhookToUpdate.id === hook.id); + + expect(webhook.url).to.equal(url); + expect(webhook.label).to.equal(label); + expect(webhook.type).to.equal(type); + expect(webhook.options).to.eql(options); + }); + it('returns the updated webhook', async () => { const url = 'http://a-new-url.com'; const type = 'groupChatReceived'; diff --git a/website/client/package-lock.json b/website/client/package-lock.json index 5bb17b940e..87deaff110 100644 --- a/website/client/package-lock.json +++ b/website/client/package-lock.json @@ -2386,13 +2386,13 @@ "integrity": "sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==" }, "bootstrap-vue": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-2.0.4.tgz", - "integrity": "sha512-/5WXa3ir5uajcs7ze7jz7QXpYuJGWHjvJ8biMq0+e0IIIxw2jSdh4LsiFKD7C7qtgKre28hhXOfx79RmZX4wcQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-2.1.0.tgz", + "integrity": "sha512-dftb5fc42x7QLv814nN+3Cx8MMuCB+xrGQjOmSXH81ET0+yo7KYb4lUN3/pOnf+8Tkv8oaawZ1OOth5/AZfktg==", "requires": { "@nuxt/opencollective": "^0.3.0", "bootstrap": ">=4.3.1 <5.0.0", - "popper.js": "^1.15.0", + "popper.js": "^1.16.0", "portal-vue": "^2.1.6", "vue-functional-data-merge": "^3.1.0" } @@ -3120,9 +3120,9 @@ "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==" }, "consola": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/consola/-/consola-2.10.1.tgz", - "integrity": "sha512-4sxpH6SGFYLADfUip4vuY65f/gEogrzJoniVhNUYkJHtng0l8ZjnDCqxxrSVRHOHwKxsy8Vm5ONZh1wOR3/l/w==" + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/consola/-/consola-2.11.0.tgz", + "integrity": "sha512-2bcAqHastlPSCvZ+ur8bgHInGAWvUnysWz3h3xRX+/XZoCY7avolJJnVXOPGoVoyCcg1b231XixonoArmgxaoA==" }, "console-browserify": { "version": "1.1.0", @@ -3283,9 +3283,9 @@ } }, "core-js": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.4.0.tgz", - "integrity": "sha512-lQxb4HScV71YugF/X28LtePZj9AB7WqOpcB+YztYxusvhrgZiQXPmCYfPC5LHsw/+ScEtDbXU3xbqH3CjBRmYA==" + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.4.1.tgz", + "integrity": "sha512-KX/dnuY/J8FtEwbnrzmAjUYgLqtk+cxM86hfG60LGiW3MmltIc2yAmDgBgEkfm0blZhUrdr1Zd84J2Y14mLxzg==" }, "core-js-compat": { "version": "3.3.4", @@ -4525,11 +4525,11 @@ } }, "eslint-plugin-vue": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-6.0.0.tgz", - "integrity": "sha512-+LxTJCd6nDt+AKQ1X+ySD48xJHft8OkeQmAhiq6UoAMxRFTiEKIDusiGgEUJLwKyiwGUGWbbqEbbWvupH5TSjg==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-6.0.1.tgz", + "integrity": "sha512-5tgFPcxGDKjfVB/6Yi56bKiWxygUibfZmzSh26Np3kuwAk/lfaGbVld+Yt+MPgD84ppvcachtiL4/winsXLjXA==", "requires": { - "vue-eslint-parser": "^6.0.4" + "vue-eslint-parser": "^6.0.5" } }, "eslint-scope": { @@ -9779,9 +9779,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "sass": { - "version": "1.23.3", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.23.3.tgz", - "integrity": "sha512-1DKRZxJMOh4Bme16AbWTyYeJAjTlrvw2+fWshHHaepeJfGq2soFZTnt0YhWit+bohtDu4LdyPoEj6VFD4APHog==", + "version": "1.23.6", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.23.6.tgz", + "integrity": "sha512-awBvj9xrAuiS2TOCcYSUGCmaBV3UW6fVSK4oJ2LHS8IRfnRLc5EJihw90C7ZJ/skcEwFGSf9/XO5NlMiKupBCg==", "requires": { "chokidar": ">=2.0.0 <4.0.0" } diff --git a/website/client/package.json b/website/client/package.json index f2e77147d6..89b07e0d8f 100644 --- a/website/client/package.json +++ b/website/client/package.json @@ -22,13 +22,13 @@ "axios-progress-bar": "^1.2.0", "babel-eslint": "^10.0.1", "bootstrap": "^4.3.1", - "bootstrap-vue": "^2.0.4", + "bootstrap-vue": "^2.1.0", "chai": "^4.1.2", - "core-js": "^3.4.0", + "core-js": "^3.4.1", "eslint": "^6.6.0", "eslint-config-habitrpg": "^6.2.0", "eslint-plugin-mocha": "^5.3.0", - "eslint-plugin-vue": "^6.0.0", + "eslint-plugin-vue": "^6.0.1", "habitica-markdown": "^1.3.0", "hellojs": "^1.18.1", "inspectpack": "^4.2.2", @@ -37,7 +37,7 @@ "lodash": "^4.17.15", "moment": "^2.24.0", "nconf": "^0.10.0", - "sass": "^1.23.3", + "sass": "^1.23.6", "sass-loader": "^8.0.0", "smartbanner.js": "^1.14.5", "svg-inline-loader": "^0.8.0", diff --git a/website/client/src/assets/scss/tiers.scss b/website/client/src/assets/scss/tiers.scss index 52028395bd..9e9dfc46fd 100644 --- a/website/client/src/assets/scss/tiers.scss +++ b/website/client/src/assets/scss/tiers.scss @@ -1,41 +1,83 @@ .tier1 { color: #c42870; + + &:hover, &:active, &:focus { + color: #c42870; + } } .tier2 { color: #b01515; + + &:hover, &:active, &:focus { + color: #b01515; + } } .tier3 { color: #d70e14; + + :hover, :active, :focus { + color: #d70e14; + } } .tier4 { color: #c24d00; + + &:hover, &:active, :focus { + color: #c24d00; + } } .tier5 { color: #9e650f; + + :hover, :active, :focus { + color: #9e650f; + } } .tier6 { color: #2b8363; + + :hover, :active, &:focus { + color: #2b8363; + } } .tier7 { color: #167e87; + + &:hover, &:active, &:focus { + color: #167e87; + } } .tier8 { color: #277eab; + + &:hover, &:active, &:focus { + color: #277eab; + } } .tier9 { color: #6133b4; + + &:hover, &:active, &:focus { + color: #6133b4; + } } .tierNPC, .npc { color: #77f4c7; fill: #77f4c7; stroke: #005737; + + &:hover, &:active, &:focus { + color: #77f4c7; + fill: #77f4c7; + stroke: #005737; + } } diff --git a/website/client/src/components/achievements/streak.vue b/website/client/src/components/achievements/streak.vue index 9c239133ec..a8f5d7c4c7 100644 --- a/website/client/src/components/achievements/streak.vue +++ b/website/client/src/components/achievements/streak.vue @@ -33,8 +33,9 @@ v-model="user.preferences.suppressModals.streak" type="checkbox" @change="suppressModals" + id="user-preferences-suppressModals-streak" > - + diff --git a/website/client/src/components/challenges/challengeDetail.vue b/website/client/src/components/challenges/challengeDetail.vue index 2b07ca53b6..d2cbc7b300 100644 --- a/website/client/src/components/challenges/challengeDetail.vue +++ b/website/client/src/components/challenges/challengeDetail.vue @@ -123,7 +123,7 @@ class="col-12 col-sm-6" :type="column" :task-list-override="tasksByType[column]" - :show-options="showOptions" + :challenge="challenge" @editTask="editTask" @taskDestroyed="taskDestroyed" /> @@ -386,9 +386,6 @@ export default { canJoin () { return !this.isMember; }, - showOptions () { - return this.isLeader; - }, }, mounted () { if (!this.searchId) this.searchId = this.challengeId; @@ -417,7 +414,12 @@ export default { return cleansedTask; }, async loadChallenge () { - this.challenge = await this.$store.dispatch('challenges:getChallenge', { challengeId: this.searchId }); + try { + this.challenge = await this.$store.dispatch('challenges:getChallenge', { challengeId: this.searchId }); + } catch (e) { + this.$router.push('/challenges/findChallenges'); + return; + } this.members = await this .loadMembers({ challengeId: this.searchId, includeAllPublicFields: true }); const tasks = await this.$store.dispatch('tasks:getChallengeTasks', { challengeId: this.searchId }); diff --git a/website/client/src/components/group-plans/taskInformation.vue b/website/client/src/components/group-plans/taskInformation.vue index d98baeedd6..f874a79507 100644 --- a/website/client/src/components/group-plans/taskInformation.vue +++ b/website/client/src/components/group-plans/taskInformation.vue @@ -75,7 +75,6 @@ class="col-12 col-md-3" :type="column" :task-list-override="tasksByType[column]" - :show-options="showOptions" :group="group" :search-text="searchText" @editTask="editTask" @@ -199,9 +198,6 @@ export default { return (this.group.leader && this.group.leader._id === this.user._id) || (this.group.managers && Boolean(this.group.managers[this.user._id])); }, - showOptions () { - return this.canCreateTasks; - }, }, watch: { // call again the method if the route changes (when this route is already active) diff --git a/website/client/src/components/groups/group.vue b/website/client/src/components/groups/group.vue index b6d092827b..cc315c0cb8 100644 --- a/website/client/src/components/groups/group.vue +++ b/website/client/src/components/groups/group.vue @@ -160,7 +160,7 @@ -
+
-
+
{{ $t('sleepDescription') }}
  • @@ -263,7 +263,7 @@
-
+