From b7c6ded375df9714e73ed5624af1e0b4551c1661 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Tue, 28 Nov 2023 15:08:17 -0600 Subject: [PATCH 1/6] 5.13.0 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 76f2d79357..a3160a1846 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "5.12.2", + "version": "5.13.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a1f8d94555..8d1cb46036 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "5.12.2", + "version": "5.13.0", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.22.10", From 97c63e2be799acf0fd2a6f6a646401ab37afcc68 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Fri, 1 Dec 2023 16:44:40 -0600 Subject: [PATCH 2/6] fix(faq): correct duped index --- website/common/script/content/faq.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/common/script/content/faq.js b/website/common/script/content/faq.js index 7502b2cbc2..5f7d46967f 100644 --- a/website/common/script/content/faq.js +++ b/website/common/script/content/faq.js @@ -31,7 +31,7 @@ const questionList = [ }, { heading: 'choose-class', - translationIndex: 31, + translationIndex: 32, }, { heading: 'blue-bar', From bb095ae296207d8de83a9825fab11f3ebf2b4fc3 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Fri, 1 Dec 2023 16:44:47 -0600 Subject: [PATCH 3/6] 5.13.1 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index a3160a1846..70d641ef03 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "5.13.0", + "version": "5.13.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 8d1cb46036..f2cea6e173 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "5.13.0", + "version": "5.13.1", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.22.10", From 1c9c9908c5a3c02bd0725f816b898fa68f85791c Mon Sep 17 00:00:00 2001 From: SabreCat Date: Wed, 6 Dec 2023 13:22:11 -0600 Subject: [PATCH 4/6] fix(dev): use working version of MongoDB on run-rs https://github.com/vkarpov15/run-rs/issues/47 --- gulp/gulp-build.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gulp/gulp-build.js b/gulp/gulp-build.js index 3aa106b8fc..11f91b454f 100644 --- a/gulp/gulp-build.js +++ b/gulp/gulp-build.js @@ -51,7 +51,7 @@ gulp.task('build:prepare-mongo', async () => { console.log('MongoDB data folder is missing, setting up.'); // eslint-disable-line no-console // use run-rs without --keep, kill it as soon as the replica set starts - const runRsProcess = spawn('run-rs', ['-v', '4.2.8', '-l', 'ubuntu1804', '--dbpath', 'mongodb-data', '--number', '1', '--quiet']); + const runRsProcess = spawn('run-rs', ['-v', '4.1.1', '-l', 'ubuntu1804', '--dbpath', 'mongodb-data', '--number', '1', '--quiet']); for await (const chunk of runRsProcess.stdout) { const stringChunk = chunk.toString(); diff --git a/package.json b/package.json index f2cea6e173..bcb1f6298c 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "client:unit": "cd website/client && npm run test:unit", "start": "gulp nodemon", "debug": "gulp nodemon --inspect", - "mongo:dev": "run-rs -v 4.2.8 -l ubuntu1804 --keep --dbpath mongodb-data --number 1 --quiet", + "mongo:dev": "run-rs -v 4.1.1 -l ubuntu1804 --keep --dbpath mongodb-data --number 1 --quiet", "postinstall": "git config --global url.\"https://\".insteadOf git:// && gulp build && cd website/client && npm install", "apidoc": "gulp apidoc" }, From 101be5d6a61b3f13eb6353f24ca170763a8cfed8 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Wed, 6 Dec 2023 13:36:08 -0600 Subject: [PATCH 5/6] 5.13.2 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 70d641ef03..5e4a934d52 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "5.13.1", + "version": "5.13.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index bcb1f6298c..8026fce418 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "5.13.1", + "version": "5.13.2", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.22.10", From f572aa442e4d3c0bdcfc5a723adba05228741277 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Thu, 7 Dec 2023 16:15:53 -0600 Subject: [PATCH 6/6] fix(lint): merge #14942 --- .../admin-panel/user-support/index.vue | 8 +- .../user-support/subscriptionAndPerks.vue | 14 +-- website/client/src/components/avatar.vue | 2 +- .../client/src/components/bugReportModal.vue | 2 +- .../components/challenges/challengeDetail.vue | 10 +-- .../components/challenges/findChallenges.vue | 4 +- .../components/challenges/myChallenges.vue | 4 +- .../client/src/components/creatorIntro.vue | 10 +-- .../group-plans/groupPlansUpdateModal.vue | 21 ++--- .../group-plans/taskInformation.vue | 10 ++- .../src/components/groups/groupPlan.vue | 34 +++++-- .../src/components/groups/lookingForParty.vue | 35 +++++--- .../src/components/groups/membersModal.vue | 4 +- .../src/components/groups/rightSidebar.vue | 2 +- .../components/header/banners/chatBanner.vue | 2 +- .../components/inventory/equipment/index.vue | 2 +- .../inventory/equipment/unequipDropdown.vue | 2 +- .../client/src/components/memberDetails.vue | 2 +- .../components/members/reportMemberModal.vue | 11 ++- .../src/components/messages/messageCard.vue | 2 +- .../src/components/payments/buyGemsModal.vue | 8 +- .../src/components/payments/sendGiftModal.vue | 6 +- .../src/components/settings/subscription.vue | 5 +- .../src/components/snackbars/notification.vue | 10 +-- .../src/components/static/chatSunsetFaq.vue | 1 - .../client/src/components/static/header.vue | 2 +- .../src/components/static/staticWrapper.vue | 10 +-- .../src/components/tasks/approvalFooter.vue | 10 +-- .../tasks/modal-controls/checklist.vue | 2 +- .../tasks/modal-controls/selectMulti.vue | 2 +- .../tasks/modal-controls/selectSingle.vue | 6 +- .../modal-controls/selectTranslatedArray.vue | 2 +- .../client/src/components/tasks/spells.vue | 2 +- website/client/src/components/tasks/task.vue | 5 +- .../src/components/tasks/taskSummary.vue | 8 +- website/client/src/components/tasks/user.vue | 8 +- .../src/components/ui/filterDropdown.vue | 2 +- .../components/ui/purchaseHistoryTable.vue | 88 ++++++++++++++----- .../src/components/userMenu/profile.vue | 2 +- .../client/src/components/userMenu/stats.vue | 4 +- website/client/src/pages/private-messages.vue | 36 ++++---- 41 files changed, 246 insertions(+), 154 deletions(-) diff --git a/website/client/src/components/admin-panel/user-support/index.vue b/website/client/src/components/admin-panel/user-support/index.vue index 91be09e8b6..0573ea9896 100644 --- a/website/client/src/components/admin-panel/user-support/index.vue +++ b/website/client/src/components/admin-panel/user-support/index.vue @@ -119,6 +119,10 @@ export default { SubscriptionAndPerks, }, mixins: [userStateMixin], + beforeRouteUpdate (to, from, next) { + this.userIdentifier = to.params.userIdentifier; + next(); + }, data () { return { userIdentifier: '', @@ -184,9 +188,5 @@ export default { this.resetCounter += 1; // tell child components to reinstantiate from scratch }, }, - beforeRouteUpdate (to, from, next) { - this.userIdentifier = to.params.userIdentifier; - next(); - }, }; diff --git a/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue b/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue index 5c5e3e8a43..8ed67e85ad 100644 --- a/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue +++ b/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue @@ -57,13 +57,13 @@
Perk month count: + v-model="hero.purchased.plan.perkMonthCount" + class="form-control" + type="number" + min="0" + max="2" + step="1" + >
Next Mystic Hourglass: diff --git a/website/client/src/components/avatar.vue b/website/client/src/components/avatar.vue index cf28966c02..2e1798d671 100644 --- a/website/client/src/components/avatar.vue +++ b/website/client/src/components/avatar.vue @@ -136,10 +136,10 @@ import foolPet from '../mixins/foolPet'; import ClassBadge from '@/components/members/classBadge'; export default { - mixins: [foolPet], components: { ClassBadge, }, + mixins: [foolPet], props: { member: { type: Object, diff --git a/website/client/src/components/bugReportModal.vue b/website/client/src/components/bugReportModal.vue index 8cf60c768c..68e261d3cf 100644 --- a/website/client/src/components/bugReportModal.vue +++ b/website/client/src/components/bugReportModal.vue @@ -65,7 +65,7 @@ rows="5" :required="true" :placeholder="question ? $t('questionPlaceholder') : $t('reportDescriptionPlaceholder')" - :class="{'input-invalid': messageInvalid && this.message.length === 0}" + :class="{'input-invalid': messageInvalid && message.length === 0}" > diff --git a/website/client/src/components/challenges/challengeDetail.vue b/website/client/src/components/challenges/challengeDetail.vue index 67c437c390..23027db3f8 100644 --- a/website/client/src/components/challenges/challengeDetail.vue +++ b/website/client/src/components/challenges/challengeDetail.vue @@ -413,6 +413,11 @@ export default { groupLink, }, mixins: [challengeMemberSearchMixin, externalLinks, userStateMixin], + async beforeRouteUpdate (to, from, next) { + this.searchId = to.params.challengeId; + await this.loadChallenge(); + next(); + }, props: ['challengeId'], data () { return { @@ -487,11 +492,6 @@ export default { updated () { this.handleExternalLinks(); }, - async beforeRouteUpdate (to, from, next) { - this.searchId = to.params.challengeId; - await this.loadChallenge(); - next(); - }, methods: { cleanUpTask (task) { const cleansedTask = omit(task, TASK_KEYS_TO_REMOVE); diff --git a/website/client/src/components/challenges/findChallenges.vue b/website/client/src/components/challenges/findChallenges.vue index 6093b405f8..cdadffab47 100644 --- a/website/client/src/components/challenges/findChallenges.vue +++ b/website/client/src/components/challenges/findChallenges.vue @@ -32,7 +32,7 @@

@@ -42,7 +42,7 @@

diff --git a/website/client/src/components/challenges/myChallenges.vue b/website/client/src/components/challenges/myChallenges.vue index c37c3d2416..e778f82dce 100644 --- a/website/client/src/components/challenges/myChallenges.vue +++ b/website/client/src/components/challenges/myChallenges.vue @@ -51,7 +51,7 @@

@@ -61,7 +61,7 @@

diff --git a/website/client/src/components/creatorIntro.vue b/website/client/src/components/creatorIntro.vue index 07ef7c34d4..0e49b81e80 100644 --- a/website/client/src/components/creatorIntro.vue +++ b/website/client/src/components/creatorIntro.vue @@ -182,8 +182,8 @@
@@ -215,8 +215,8 @@ >
@@ -245,8 +245,8 @@ >
diff --git a/website/client/src/components/group-plans/groupPlansUpdateModal.vue b/website/client/src/components/group-plans/groupPlansUpdateModal.vue index 30205a0576..9ec18dfcfe 100644 --- a/website/client/src/components/group-plans/groupPlansUpdateModal.vue +++ b/website/client/src/components/group-plans/groupPlansUpdateModal.vue @@ -13,8 +13,8 @@ class="w-100 d-flex pt-2 justify-content-center" >

{{ $t('newGroupsWelcome') }}

@@ -43,8 +43,8 @@ >

{{ $t('newGroupsWhatsNew') }}

@@ -66,7 +66,8 @@
  • {{ $t('newGroupsBullet07') }}
  • {{ $t('newGroupsBullet08') }}
  • {{ $t('newGroupsBullet09') }}
  • -
  • {{ $t('newGroupsBullet10') }} +
  • + {{ $t('newGroupsBullet10') }}
    • @@ -83,13 +84,13 @@ > {{ $t('newGroupsEnjoy') }}
  • - +
    diff --git a/website/client/src/components/group-plans/taskInformation.vue b/website/client/src/components/group-plans/taskInformation.vue index a77b09f5d0..c48c919ef9 100644 --- a/website/client/src/components/group-plans/taskInformation.vue +++ b/website/client/src/components/group-plans/taskInformation.vue @@ -47,19 +47,21 @@
    {{ $t('findMorePartyMembers') }} diff --git a/website/client/src/components/groups/membersModal.vue b/website/client/src/components/groups/membersModal.vue index 939925d0ec..d0010cec4b 100644 --- a/website/client/src/components/groups/membersModal.vue +++ b/website/client/src/components/groups/membersModal.vue @@ -49,7 +49,7 @@ key-prop="value" @select="changeSortOption($event)" > -