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)" > -