diff --git a/website/client/package-lock.json b/website/client/package-lock.json index d75b3b07be..f70989a808 100644 --- a/website/client/package-lock.json +++ b/website/client/package-lock.json @@ -6776,6 +6776,11 @@ "integrity": "sha512-zzK8+ByrzvOL6N92hRewwUKL0wN0TOaIuUjX0Jj8lraxWvr5wHYs2YTjaj2lstF+8qMv5cmPPef47va8NT8lDw==", "dev": true }, + "jquery": { + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz", + "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==" + }, "js-levenshtein": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz", diff --git a/website/client/package.json b/website/client/package.json index ac2a34374e..2d34b99794 100644 --- a/website/client/package.json +++ b/website/client/package.json @@ -18,6 +18,7 @@ "habitica-markdown": "^1.3.0", "hellojs": "^1.18.1", "intro.js": "^2.9.3", + "jquery": "^3.4.1", "smartbanner.js": "^1.14.5", "vue": "^2.6.10", "vue-mugen-scroll": "^0.2.6", @@ -40,6 +41,7 @@ "pug-plain-loader": "^1.0.0", "sass": "^1.19.0", "sass-loader": "^8.0.0", - "vue-template-compiler": "^2.6.10" + "vue-template-compiler": "^2.6.10", + "webpack": "^4.41.0" } } diff --git a/website/client/src/app.vue b/website/client/src/app.vue index bdc896c4e4..cfbcf29354 100644 --- a/website/client/src/app.vue +++ b/website/client/src/app.vue @@ -198,7 +198,7 @@ import { CONSTANTS, getLocalSetting, removeLocalSetting } from '@/libs/userlocal import svgClose from '@/assets/svg/close.svg'; import bannedAccountModal from '@/components/bannedAccountModal'; -const COMMUNITY_MANAGER_EMAIL = process.env.EMAILS.COMMUNITY_MANAGER_EMAIL; // eslint-disable-line +const COMMUNITY_MANAGER_EMAIL = process.env.EMAILS_COMMUNITY_MANAGER_EMAIL; // eslint-disable-line export default { mixins: [notifications, spellsMixin], @@ -247,7 +247,7 @@ export default { const min = 1; const randomNumber = Math.random() * (numberOfTips - min) + min; const tipNumber = Math.floor(randomNumber); - this.currentTipNumber = tipNumber; + this.currentTipNumber = tipNumber; // eslint-disable-line vue/no-side-effects-in-computed-properties return this.$t(`tip${tipNumber}`); }, diff --git a/website/client/src/components/avatar.vue b/website/client/src/components/avatar.vue index 6f45dfd6f1..0699576841 100644 --- a/website/client/src/components/avatar.vue +++ b/website/client/src/components/avatar.vue @@ -180,6 +180,8 @@ export default { if (!this.avatarOnly && this.member.items.currentMount && this.member.items.currentMount.indexOf('Kangaroo') !== -1) { return 'offset-kangaroo'; } + + return null; }, }, methods: { diff --git a/website/client/src/components/bannedAccountModal.vue b/website/client/src/components/bannedAccountModal.vue index 20f613f4a6..191a18e211 100644 --- a/website/client/src/components/bannedAccountModal.vue +++ b/website/client/src/components/bannedAccountModal.vue @@ -15,7 +15,7 @@