automatic lint fixes (#14942)

* automatic lint fixes

* rerun lint

---------

Co-authored-by: negue <eugen.bolz@gmail.com>
This commit is contained in:
Phillip Thelen
2023-12-04 20:37:05 +01:00
committed by GitHub
parent 8db8a8267b
commit 916cb03a3a
41 changed files with 246 additions and 154 deletions

View File

@@ -119,6 +119,10 @@ export default {
SubscriptionAndPerks, SubscriptionAndPerks,
}, },
mixins: [userStateMixin], mixins: [userStateMixin],
beforeRouteUpdate (to, from, next) {
this.userIdentifier = to.params.userIdentifier;
next();
},
data () { data () {
return { return {
userIdentifier: '', userIdentifier: '',
@@ -184,9 +188,5 @@ export default {
this.resetCounter += 1; // tell child components to reinstantiate from scratch this.resetCounter += 1; // tell child components to reinstantiate from scratch
}, },
}, },
beforeRouteUpdate (to, from, next) {
this.userIdentifier = to.params.userIdentifier;
next();
},
}; };
</script> </script>

View File

@@ -57,13 +57,13 @@
<div class="form-inline"> <div class="form-inline">
Perk month count: Perk month count:
<input <input
v-model="hero.purchased.plan.perkMonthCount" v-model="hero.purchased.plan.perkMonthCount"
class="form-control" class="form-control"
type="number" type="number"
min="0" min="0"
max="2" max="2"
step="1" step="1"
> >
</div> </div>
<div> <div>
Next Mystic Hourglass: Next Mystic Hourglass:

View File

@@ -136,10 +136,10 @@ import foolPet from '../mixins/foolPet';
import ClassBadge from '@/components/members/classBadge'; import ClassBadge from '@/components/members/classBadge';
export default { export default {
mixins: [foolPet],
components: { components: {
ClassBadge, ClassBadge,
}, },
mixins: [foolPet],
props: { props: {
member: { member: {
type: Object, type: Object,

View File

@@ -65,7 +65,7 @@
rows="5" rows="5"
:required="true" :required="true"
:placeholder="question ? $t('questionPlaceholder') : $t('reportDescriptionPlaceholder')" :placeholder="question ? $t('questionPlaceholder') : $t('reportDescriptionPlaceholder')"
:class="{'input-invalid': messageInvalid && this.message.length === 0}" :class="{'input-invalid': messageInvalid && message.length === 0}"
> >
</textarea> </textarea>

View File

@@ -413,6 +413,11 @@ export default {
groupLink, groupLink,
}, },
mixins: [challengeMemberSearchMixin, externalLinks, userStateMixin], mixins: [challengeMemberSearchMixin, externalLinks, userStateMixin],
async beforeRouteUpdate (to, from, next) {
this.searchId = to.params.challengeId;
await this.loadChallenge();
next();
},
props: ['challengeId'], props: ['challengeId'],
data () { data () {
return { return {
@@ -487,11 +492,6 @@ export default {
updated () { updated () {
this.handleExternalLinks(); this.handleExternalLinks();
}, },
async beforeRouteUpdate (to, from, next) {
this.searchId = to.params.challengeId;
await this.loadChallenge();
next();
},
methods: { methods: {
cleanUpTask (task) { cleanUpTask (task) {
const cleansedTask = omit(task, TASK_KEYS_TO_REMOVE); const cleansedTask = omit(task, TASK_KEYS_TO_REMOVE);

View File

@@ -32,7 +32,7 @@
<div class="row"> <div class="row">
<div <div
v-if="!loading && v-if="!loading &&
this.filteredChallenges.length === 0" filteredChallenges.length === 0"
class="no-challenges text-center col-md-6 offset-3" class="no-challenges text-center col-md-6 offset-3"
> >
<h2 v-once> <h2 v-once>
@@ -42,7 +42,7 @@
</div> </div>
<div class="row"> <div class="row">
<div <div
v-for="challenge in this.filteredChallenges" v-for="challenge in filteredChallenges"
:key="challenge._id" :key="challenge._id"
class="col-12 col-md-6" class="col-12 col-md-6"
> >

View File

@@ -51,7 +51,7 @@
</div> </div>
<div class="row"> <div class="row">
<div <div
v-if="!loading && challenges.length > 0 && this.filteredChallenges.length === 0" v-if="!loading && challenges.length > 0 && filteredChallenges.length === 0"
class="no-challenges text-center col-md-6 offset-3" class="no-challenges text-center col-md-6 offset-3"
> >
<h2 v-once> <h2 v-once>
@@ -61,7 +61,7 @@
</div> </div>
<div class="row"> <div class="row">
<div <div
v-for="challenge in this.filteredChallenges" v-for="challenge in filteredChallenges"
:key="challenge._id" :key="challenge._id"
class="col-12 col-md-6" class="col-12 col-md-6"
> >

View File

@@ -182,8 +182,8 @@
</div> </div>
<div <div
v-for="bg in backgroundShopSets[0].items" v-for="bg in backgroundShopSets[0].items"
:key="bg.key"
:id="bg.key" :id="bg.key"
:key="bg.key"
class="col-2" class="col-2"
@click="unlock('background.' + bg.key)" @click="unlock('background.' + bg.key)"
> >
@@ -215,8 +215,8 @@
> >
<div <div
v-for="bg in backgroundShopSets[2].items" v-for="bg in backgroundShopSets[2].items"
:key="bg.key"
:id="bg.key" :id="bg.key"
:key="bg.key"
class="col-4 text-center customize-option background-button" class="col-4 text-center customize-option background-button"
@click="unlock('background.' + bg.key)" @click="unlock('background.' + bg.key)"
> >
@@ -245,8 +245,8 @@
> >
<div <div
v-for="bg in backgroundShopSets[1].items" v-for="bg in backgroundShopSets[1].items"
:key="bg.key"
:id="bg.key" :id="bg.key"
:key="bg.key"
class="col-4 text-center customize-option background-button" class="col-4 text-center customize-option background-button"
@click="!user.purchased.background[bg.key] @click="!user.purchased.background[bg.key]
? backgroundSelected(bg) : unlock('background.' + bg.key)" ? backgroundSelected(bg) : unlock('background.' + bg.key)"
@@ -316,8 +316,8 @@
</div> </div>
<div <div
v-for="bg in set.items" v-for="bg in set.items"
:key="bg.key"
:id="bg.key" :id="bg.key"
:key="bg.key"
class="col-4 text-center customize-option background-button" class="col-4 text-center customize-option background-button"
@click="!user.purchased.background[bg.key] @click="!user.purchased.background[bg.key]
? backgroundSelected(bg) : unlock('background.' + bg.key)" ? backgroundSelected(bg) : unlock('background.' + bg.key)"
@@ -377,8 +377,8 @@
> >
<div <div
v-for="(bg) in ownedBackgrounds" v-for="(bg) in ownedBackgrounds"
:key="bg.key"
:id="bg.key" :id="bg.key"
:key="bg.key"
class="col-4 text-center customize-option background-button" class="col-4 text-center customize-option background-button"
@click="unlock('background.' + bg.key)" @click="unlock('background.' + bg.key)"
> >

View File

@@ -13,8 +13,8 @@
class="w-100 d-flex pt-2 justify-content-center" class="w-100 d-flex pt-2 justify-content-center"
> >
<h2 <h2
class="mx-auto mt-4"
v-once v-once
class="mx-auto mt-4"
> >
{{ $t('newGroupsWelcome') }} {{ $t('newGroupsWelcome') }}
</h2> </h2>
@@ -43,8 +43,8 @@
> >
</div> </div>
<h3 <h3
class="my-auto"
v-once v-once
class="my-auto"
> >
{{ $t('newGroupsWhatsNew') }} {{ $t('newGroupsWhatsNew') }}
</h3> </h3>
@@ -66,7 +66,8 @@
<li>{{ $t('newGroupsBullet07') }}</li> <li>{{ $t('newGroupsBullet07') }}</li>
<li>{{ $t('newGroupsBullet08') }}</li> <li>{{ $t('newGroupsBullet08') }}</li>
<li>{{ $t('newGroupsBullet09') }}</li> <li>{{ $t('newGroupsBullet09') }}</li>
<li>{{ $t('newGroupsBullet10') }} <li>
{{ $t('newGroupsBullet10') }}
<ul class="p-0"> <ul class="p-0">
<li v-html="$t('newGroupsBullet10a')"></li> <li v-html="$t('newGroupsBullet10a')"></li>
<li v-html="$t('newGroupsBullet10b')"></li> <li v-html="$t('newGroupsBullet10b')"></li>
@@ -83,13 +84,13 @@
> >
{{ $t('newGroupsEnjoy') }} {{ $t('newGroupsEnjoy') }}
</div> </div>
<button <button
class="btn btn-primary mt-4 mb-1 mx-auto" class="btn btn-primary mt-4 mb-1 mx-auto"
@click="close()" @click="close()"
@keypress.enter="close()" @keypress.enter="close()"
> >
{{ $t('getStarted') }} {{ $t('getStarted') }}
</button> </button>
</div> </div>
</b-modal> </b-modal>
</template> </template>

View File

@@ -47,19 +47,21 @@
</div> </div>
<div class="create-task-area ml-2"> <div class="create-task-area ml-2">
<button <button
id="create-task-btn"
v-if="canCreateTasks" v-if="canCreateTasks"
id="create-task-btn"
class="btn btn-primary create-btn d-flex align-items-center" class="btn btn-primary create-btn d-flex align-items-center"
:class="{open: openCreateBtn}" :class="{open: openCreateBtn}"
tabindex="0"
@click.stop.prevent="openCreateBtn = !openCreateBtn" @click.stop.prevent="openCreateBtn = !openCreateBtn"
@keypress.enter="openCreateBtn = !openCreateBtn" @keypress.enter="openCreateBtn = !openCreateBtn"
tabindex="0"
> >
<div <div
class="svg-icon icon-10 color" class="svg-icon icon-10 color"
v-html="icons.positive" v-html="icons.positive"
></div> ></div>
<div class="ml-75 mr-1"> {{ $t('addTask') }} </div> <div class="ml-75 mr-1">
{{ $t('addTask') }}
</div>
</button> </button>
<div <div
v-if="openCreateBtn" v-if="openCreateBtn"
@@ -68,8 +70,8 @@
<div <div
v-for="type in columns" v-for="type in columns"
:key="type" :key="type"
@click="createTask(type)"
class="dropdown-item d-flex px-2 py-1" class="dropdown-item d-flex px-2 py-1"
@click="createTask(type)"
> >
<div class="d-flex align-items-center justify-content-center task-icon"> <div class="d-flex align-items-center justify-content-center task-icon">
<div <div

View File

@@ -4,12 +4,18 @@
<group-plan-creation-modal /> <group-plan-creation-modal />
<div> <div>
<div class="header"> <div class="header">
<h1 v-once class="text-center"> <h1
v-once
class="text-center"
>
{{ $t('groupPlanTitle') }} {{ $t('groupPlanTitle') }}
</h1> </h1>
<div class="row"> <div class="row">
<div class="col-8 offset-2 text-center"> <div class="col-8 offset-2 text-center">
<h2 v-once class="sub-text"> <h2
v-once
class="sub-text"
>
{{ $t('groupBenefitsDescription') }} {{ $t('groupBenefitsDescription') }}
</h2> </h2>
</div> </div>
@@ -24,8 +30,12 @@
src="~@/assets/images/group-plans/group-14@3x.png" src="~@/assets/images/group-plans/group-14@3x.png"
> >
<hr> <hr>
<h2 v-once> {{ $t('teamBasedTasks') }} </h2> <h2 v-once>
<p v-once> {{ $t('teamBasedTasksListDesc') }} </p> {{ $t('teamBasedTasks') }}
</h2>
<p v-once>
{{ $t('teamBasedTasksListDesc') }}
</p>
</div> </div>
</div> </div>
<div class="col-4"> <div class="col-4">
@@ -35,8 +45,12 @@
src="~@/assets/images/group-plans/group-12@3x.png" src="~@/assets/images/group-plans/group-12@3x.png"
> >
<hr> <hr>
<h2 v-once> {{ $t('groupManagementControls') }} </h2> <h2 v-once>
<p v-once> {{ $t('groupManagementControlsDesc') }} </p> {{ $t('groupManagementControls') }}
</h2>
<p v-once>
{{ $t('groupManagementControlsDesc') }}
</p>
</div> </div>
</div> </div>
<div class="col-4"> <div class="col-4">
@@ -46,8 +60,12 @@
src="~@/assets/images/group-plans/group-13@3x.png" src="~@/assets/images/group-plans/group-13@3x.png"
> >
<hr> <hr>
<h2 v-once> {{ $t('inGameBenefits') }} </h2> <h2 v-once>
<p v-once> {{ $t('inGameBenefitsDesc') }} </p> {{ $t('inGameBenefits') }}
</h2>
<p v-once>
{{ $t('inGameBenefitsDesc') }}
</p>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -6,13 +6,23 @@
class="fit-content mx-auto mt-4" class="fit-content mx-auto mt-4"
> >
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<h1 v-once class="my-auto mr-auto"> {{ $t('findPartyMembers') }}</h1> <h1
v-once
class="my-auto mr-auto"
>
{{ $t('findPartyMembers') }}
</h1>
<div <div
class="btn btn-secondary btn-sync ml-auto my-auto pl-2 pr-3 d-flex" class="btn btn-secondary btn-sync ml-auto my-auto pl-2 pr-3 d-flex"
@click="refreshList()" @click="refreshList()"
> >
<div class="svg-icon icon-16 color my-auto mr-2" v-html="icons.sync"></div> <div
<div class="ml-auto"> {{ $t('refreshList') }} </div> class="svg-icon icon-16 color my-auto mr-2"
v-html="icons.sync"
></div>
<div class="ml-auto">
{{ $t('refreshList') }}
</div>
</div> </div>
</div> </div>
<div class="d-flex flex-wrap seeker-list"> <div class="d-flex flex-wrap seeker-list">
@@ -24,9 +34,9 @@
<div class="d-flex"> <div class="d-flex">
<avatar <avatar
:member="seeker" :member="seeker"
:hideClassBadge="true" :hide-class-badge="true"
@click.native="showMemberModal(seeker._id)"
class="mr-3 mb-2" class="mr-3 mb-2"
@click.native="showMemberModal(seeker._id)"
/> />
<div class="card-data"> <div class="card-data">
<user-link <user-link
@@ -54,26 +64,32 @@
</strong> </strong>
</div> </div>
<div> <div>
<strong v-once class="mr-2"> {{ $t('checkinsLabel') }} </strong> <strong
v-once
class="mr-2"
> {{ $t('checkinsLabel') }} </strong>
{{ seeker.loginIncentives }} {{ seeker.loginIncentives }}
</div> </div>
<div> <div>
<strong v-once class="mr-2"> {{ $t('languageLabel') }} </strong> <strong
v-once
class="mr-2"
> {{ $t('languageLabel') }} </strong>
{{ displayLanguage(seeker.preferences.language) }} {{ displayLanguage(seeker.preferences.language) }}
</div> </div>
</div> </div>
</div> </div>
<strong <strong
v-if="!seeker.invited" v-if="!seeker.invited"
@click="inviteUser(seeker._id, index)"
class="btn btn-primary w-100" class="btn btn-primary w-100"
@click="inviteUser(seeker._id, index)"
> >
{{ $t('inviteToParty') }} {{ $t('inviteToParty') }}
</strong> </strong>
<div <div
v-else v-else
@click="rescindInvite(seeker._id, index)"
class="btn btn-success w-100" class="btn btn-success w-100"
@click="rescindInvite(seeker._id, index)"
v-html="$t('invitedToYourParty')" v-html="$t('invitedToYourParty')"
> >
</div> </div>
@@ -95,7 +111,6 @@
class="svg-icon icon-32 color m-auto" class="svg-icon icon-32 color m-auto"
v-html="icons.users" v-html="icons.users"
> >
</div> </div>
</div> </div>
<strong class="mb-1"> {{ $t('findMorePartyMembers') }} </strong> <strong class="mb-1"> {{ $t('findMorePartyMembers') }} </strong>

View File

@@ -49,7 +49,7 @@
key-prop="value" key-prop="value"
@select="changeSortOption($event)" @select="changeSortOption($event)"
> >
<template v-slot:item="{ item }"> <template #item="{ item }">
<span <span
v-if="item" v-if="item"
class="label" class="label"
@@ -64,7 +64,7 @@
key-prop="value" key-prop="value"
@select="changeSortDirection($event)" @select="changeSortDirection($event)"
> >
<template v-slot:item="{ item }"> <template #item="{ item }">
<span <span
v-if="item" v-if="item"
class="label" class="label"

View File

@@ -23,7 +23,7 @@
class="ml-2" class="ml-2"
:no-caret="true" :no-caret="true"
> >
<template v-slot:button-content> <template #button-content>
<span <span
v-once v-once
class="svg-icon inline menuIcon" class="svg-icon inline menuIcon"

View File

@@ -1,10 +1,10 @@
<template> <template>
<base-banner <base-banner
v-if="showChatWarning"
banner-id="chat-warning" banner-id="chat-warning"
banner-class="chat-banner" banner-class="chat-banner"
class="chat-banner" class="chat-banner"
height="3rem" height="3rem"
v-if="showChatWarning"
:class="{faq: faqPage}" :class="{faq: faqPage}"
> >
<div <div

View File

@@ -68,7 +68,7 @@
:inline-dropdown="false" :inline-dropdown="false"
@select="groupBy = $event" @select="groupBy = $event"
> >
<template v-slot:item="{ item }"> <template #item="{ item }">
<span class="label">{{ groupByLabel(item) }}</span> <span class="label">{{ groupByLabel(item) }}</span>
</template> </template>
</select-list> </select-list>

View File

@@ -4,7 +4,7 @@
right="right" right="right"
toggle-class="with-icon" toggle-class="with-icon"
> >
<template v-slot:button-content> <template #button-content>
<span <span
class="svg-icon inline color" class="svg-icon inline color"
v-html="icons.unequipIcon" v-html="icons.unequipIcon"

View File

@@ -33,7 +33,7 @@
:name="member.profile.name" :name="member.profile.name"
:backer="member.backer" :backer="member.backer"
:contributor="member.contributor" :contributor="member.contributor"
:showBuffed="isBuffed" :show-buffed="isBuffed"
:context="'profile'" :context="'profile'"
/> />
</span> </span>

View File

@@ -6,7 +6,9 @@
size="md" size="md"
> >
<div slot="modal-header"> <div slot="modal-header">
<h2 class="mt-2 mb-0"> {{ $t('reportPlayer') }} </h2> <h2 class="mt-2 mb-0">
{{ $t('reportPlayer') }}
</h2>
<close-x <close-x
@close="close()" @close="close()"
/> />
@@ -14,7 +16,9 @@
<div> <div>
<blockquote> <blockquote>
<strong> {{ displayName }} </strong> <strong> {{ displayName }} </strong>
<p class="mb-0"> {{ username }} </p> <p class="mb-0">
{{ username }}
</p>
</blockquote> </blockquote>
<div> <div>
<strong>{{ $t('whyReportingPlayer') }}</strong> <strong>{{ $t('whyReportingPlayer') }}</strong>
@@ -26,7 +30,8 @@
</div> </div>
<p <p
class="mb-2" class="mb-2"
v-html="$t('playerReportModalBody', abuseFlagModalBody)"> v-html="$t('playerReportModalBody', abuseFlagModalBody)"
>
</p> </p>
</div> </div>
<div class="footer text-center d-flex flex-column"> <div class="footer text-center d-flex flex-column">

View File

@@ -152,12 +152,12 @@ export default {
components: { components: {
userLink, userLink,
}, },
mixins: [externalLinks],
filters: { filters: {
timeAgo (value) { timeAgo (value) {
return moment(value).fromNow(); return moment(value).fromNow();
}, },
}, },
mixins: [externalLinks],
props: { props: {
msg: {}, msg: {},
}, },

View File

@@ -165,11 +165,15 @@
v-if="eventName === 'fall_extra_gems' || eventName === 'spooky_extra_gems'" v-if="eventName === 'fall_extra_gems' || eventName === 'spooky_extra_gems'"
class="d-flex flex-column justify-content-center" class="d-flex flex-column justify-content-center"
> >
<h4 class="mt-3 mx-auto"> {{ $t('howItWorks') }}</h4> <h4 class="mt-3 mx-auto">
{{ $t('howItWorks') }}
</h4>
<small class="text-center"> <small class="text-center">
{{ $t('gemSaleHow', { eventStartMonth, eventStartOrdinal, eventEndOrdinal }) }} {{ $t('gemSaleHow', { eventStartMonth, eventStartOrdinal, eventEndOrdinal }) }}
</small> </small>
<h4 class="mt-3 mx-auto"> {{ $t('limitations') }}</h4> <h4 class="mt-3 mx-auto">
{{ $t('limitations') }}
</h4>
<small class="text-center"> <small class="text-center">
{{ $t('gemSaleLimitations', { {{ $t('gemSaleLimitations', {
eventStartMonth, eventStartMonth,

View File

@@ -31,7 +31,7 @@
> >
<avatar <avatar
:member="userReceivingGift" :member="userReceivingGift"
:hideClassBadge="true" :hide-class-badge="true"
class="d-flex flex-column mx-auto align-items-center" class="d-flex flex-column mx-auto align-items-center"
/> />
<div class="avatar-spacer"></div> <div class="avatar-spacer"></div>
@@ -74,8 +74,8 @@
<subscription-options <subscription-options
v-show="selectedPage === 'subscription'" v-show="selectedPage === 'subscription'"
class="subscribe-option" class="subscribe-option"
:userReceivingGift="userReceivingGift" :user-receiving-gift="userReceivingGift"
:receiverName="receiverName" :receiver-name="receiverName"
/> />
<!-- gem block --> <!-- gem block -->

View File

@@ -279,7 +279,10 @@
</div> </div>
</div> </div>
<div class="mt-4 nextHourglassDescription" v-once> <div
v-once
class="mt-4 nextHourglassDescription"
>
*{{ $t('nextHourglassDescription') }} *{{ $t('nextHourglassDescription') }}
</div> </div>
</div> </div>

View File

@@ -246,11 +246,6 @@ export default {
}), }),
}; };
}, },
mounted () {
if (this.notification.type === 'drop' && this.notification.emptied) {
this.$root.$emit('bv::show::modal', 'armoire-empty');
}
},
computed: { computed: {
message () { message () {
if (this.notification.flavorMessage) { if (this.notification.flavorMessage) {
@@ -275,6 +270,11 @@ export default {
return `${this.notification.type} ${this.negative}`; return `${this.notification.type} ${this.negative}`;
}, },
}, },
mounted () {
if (this.notification.type === 'drop' && this.notification.emptied) {
this.$root.$emit('bv::show::modal', 'armoire-empty');
}
},
methods: { methods: {
handleOnClick () { handleOnClick () {
if (typeof this.notification.onClick === 'function') { if (typeof this.notification.onClick === 'function') {

View File

@@ -153,7 +153,6 @@
<div class="body-text"> <div class="body-text">
<p v-html="$t('sunsetFaqPara20')"></p> <p v-html="$t('sunsetFaqPara20')"></p>
</div> </div>
</div> </div>
<!-- sidebar --> <!-- sidebar -->

View File

@@ -6,7 +6,7 @@
:to="!isUserLoggedIn ? '/static/home' : '/'" :to="!isUserLoggedIn ? '/static/home' : '/'"
> >
<div <div
v-if="this.$route.name === 'plans'" v-if="$route.name === 'plans'"
class="logo svg-icon" class="logo svg-icon"
v-html="icons.purpleLogo" v-html="icons.purpleLogo"
></div> ></div>

View File

@@ -2,11 +2,11 @@
<div> <div>
<chat-banner /> <chat-banner />
<static-header <static-header
v-if="showContentWrap" v-if="showContentWrap"
:class="{ :class="{
'home-header': ['home', 'front'].indexOf($route.name) !== -1, 'home-header': ['home', 'front'].indexOf($route.name) !== -1,
'white-header': this.$route.name === 'plans' 'white-header': $route.name === 'plans'
}" }"
/> />
<div class="static-wrapper"> <div class="static-wrapper">
<router-view /> <router-view />

View File

@@ -31,7 +31,7 @@
<strong> @{{ completion.userName }} </strong> <strong> @{{ completion.userName }} </strong>
</div> </div>
<div <div
v-if='completion.completedDate' v-if="completion.completedDate"
:class="{'green-10': completion.completed}" :class="{'green-10': completion.completed}"
> >
{{ completion.completedDateString }} {{ completion.completedDateString }}
@@ -54,16 +54,16 @@
v-html="message" v-html="message"
></div> ></div>
<div <div
class="d-flex ml-auto mr-1 my-auto"
v-if="task.group.assignedUsers && ['daily','todo'].indexOf(task.type) !== -1" v-if="task.group.assignedUsers && ['daily','todo'].indexOf(task.type) !== -1"
class="d-flex ml-auto mr-1 my-auto"
> >
<span <span
v-if="assignedUsersCount > 1" v-if="assignedUsersCount > 1"
class="d-flex mr-1 my-auto" class="d-flex mr-1 my-auto"
> >
<span <span
class="small-check"
v-if="!showStatus && completionsCount" v-if="!showStatus && completionsCount"
class="small-check"
> >
<div <div
class="svg-icon color" class="svg-icon color"
@@ -73,9 +73,9 @@
</div> </div>
</span> </span>
<span <span
v-if="!showStatus && completionsCount"
class="ml-1 mr-2 my-auto" class="ml-1 mr-2 my-auto"
:class="{'green-10': completionsCount === assignedUsersCount}" :class="{'green-10': completionsCount === assignedUsersCount}"
v-if="!showStatus && completionsCount"
> >
{{ completionsCount }}/{{ assignedUsersCount }} {{ completionsCount }}/{{ assignedUsersCount }}
</span> </span>
@@ -98,10 +98,10 @@
class="mr-1 d-inline-flex" class="mr-1 d-inline-flex"
> >
<span <span
v-html="icons.lastComplete"
v-b-tooltip.hover.bottom="$t('lastCompleted')" v-b-tooltip.hover.bottom="$t('lastCompleted')"
class="svg-icon color last-completed mr-1 my-auto" class="svg-icon color last-completed mr-1 my-auto"
:class="{'gray-200': completionsCount !== assignedUsersCount}" :class="{'gray-200': completionsCount !== assignedUsersCount}"
v-html="icons.lastComplete"
> >
</span> </span>
<span <span

View File

@@ -10,8 +10,8 @@
<div <div
class="svg-icon icon-16 my-auto ml-auto pointer" class="svg-icon icon-16 my-auto ml-auto pointer"
:class="{'chevron-flip': showChecklist}" :class="{'chevron-flip': showChecklist}"
v-html="icons.chevron"
@click="showChecklist = !showChecklist" @click="showChecklist = !showChecklist"
v-html="icons.chevron"
> >
</div> </div>
</div> </div>

View File

@@ -27,7 +27,7 @@
@remove-item="removeItem($event)" @remove-item="removeItem($event)"
/> />
</b-dropdown-header> </b-dropdown-header>
<template v-slot:button-content> <template #button-content>
<multi-list <multi-list
class="d-flex flex-wrap" class="d-flex flex-wrap"
:items="selectedItemsAsObjects" :items="selectedItemsAsObjects"

View File

@@ -19,14 +19,14 @@
/> />
</div> </div>
</b-dropdown-header> </b-dropdown-header>
<template v-slot:button-content> <template #button-content>
<div <div
class="mr-1 d-inline-flex align-items-center"
@click.stop="selectItem({id: selectedItem})"
v-markdown=" v-markdown="
allItemsMap[selectedItem] ? `@${allItemsMap[selectedItem].name}` allItemsMap[selectedItem] ? `@${allItemsMap[selectedItem].name}`
: emptyMessage : emptyMessage
" "
class="mr-1 d-inline-flex align-items-center"
@click.stop="selectItem({id: selectedItem})"
> >
</div> </div>
</template> </template>

View File

@@ -12,7 +12,7 @@
:placeholder="placeholder" :placeholder="placeholder"
@select="selectItem($event)" @select="selectItem($event)"
> >
<template v-slot:item="{ item }"> <template #item="{ item }">
<span class="label">{{ $t(item) }}</span> <span class="label">{{ $t(item) }}</span>
</template> </template>
</select-list> </select-list>

View File

@@ -69,7 +69,7 @@
<div <div
class="spell-border" class="spell-border"
:class="{ disabled: spellDisabled(key) || user.stats.lvl < skill.lvl, :class="{ disabled: spellDisabled(key) || user.stats.lvl < skill.lvl,
'insufficient-mana': user.stats.mp < skill.mana }" 'insufficient-mana': user.stats.mp < skill.mana }"
> >
<div <div
class="spell" class="spell"

View File

@@ -1,5 +1,8 @@
<template> <template>
<div class="task-wrapper" draggable> <div
class="task-wrapper"
draggable
>
<div <div
class="task transition" class="task transition"
:class="[{ :class="[{

View File

@@ -43,7 +43,7 @@
</div> </div>
<div class="summary-block"> <div class="summary-block">
<h3> {{ $t('description') }} </h3> <h3> {{ $t('description') }} </h3>
<p v-html="summarySentence" ></p> <p v-html="summarySentence"></p>
</div> </div>
<div <div
v-if="task.checklist && task.checklist.length > 0" v-if="task.checklist && task.checklist.length > 0"
@@ -51,13 +51,13 @@
> >
<checklist <checklist
:items.sync="task.checklist" :items.sync="task.checklist"
:disableDrag="true" :disable-drag="true"
:disableEdit="true" :disable-edit="true"
/> />
</div> </div>
<div <div
class="summary-block"
v-if="assignedUsernames.length > 0" v-if="assignedUsernames.length > 0"
class="summary-block"
> >
<h3> {{ $t('assignedTo') }} </h3> <h3> {{ $t('assignedTo') }} </h3>
<div <div

View File

@@ -173,15 +173,17 @@
id="create-task-btn" id="create-task-btn"
class="btn btn-primary create-btn d-flex align-items-center" class="btn btn-primary create-btn d-flex align-items-center"
:class="{open: openCreateBtn}" :class="{open: openCreateBtn}"
tabindex="0"
@click.stop.prevent="openCreateBtn = !openCreateBtn" @click.stop.prevent="openCreateBtn = !openCreateBtn"
@keypress.enter="openCreateBtn = !openCreateBtn" @keypress.enter="openCreateBtn = !openCreateBtn"
tabindex="0"
> >
<div <div
class="svg-icon icon-10 color" class="svg-icon icon-10 color"
v-html="icons.positive" v-html="icons.positive"
></div> ></div>
<div class="ml-75 mr-1"> {{ $t('addTask') }} </div> <div class="ml-75 mr-1">
{{ $t('addTask') }}
</div>
</div> </div>
<div <div
v-if="openCreateBtn" v-if="openCreateBtn"
@@ -190,8 +192,8 @@
<div <div
v-for="type in columns" v-for="type in columns"
:key="type" :key="type"
@click="createTask(type)"
class="dropdown-item d-flex px-2 py-1" class="dropdown-item d-flex px-2 py-1"
@click="createTask(type)"
> >
<div class="d-flex align-items-center justify-content-center task-icon"> <div class="d-flex align-items-center justify-content-center task-icon">
<div <div

View File

@@ -10,7 +10,7 @@
:inline-dropdown="false" :inline-dropdown="false"
@select="selectItem($event)" @select="selectItem($event)"
> >
<template v-slot:item="{ item }"> <template #item="{ item }">
<span :class="{'dropdown-icon-item': withIcon}"> <span :class="{'dropdown-icon-item': withIcon}">
<slot <slot
name="item" name="item"

View File

@@ -20,23 +20,38 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-12" v-if="selectedTab === 'gems'"> <div
v-if="selectedTab === 'gems'"
class="col-12"
>
<span v-if="gemTransactions.length === 0"> <span v-if="gemTransactions.length === 0">
{{ $t('noGemTransactions') }} {{ $t('noGemTransactions') }}
</span> </span>
<table class="table"> <table class="table">
<tr> <tr>
<th v-once class="timestamp-column"> <th
{{ $t('timestamp')}} v-once
class="timestamp-column"
>
{{ $t('timestamp') }}
</th> </th>
<th v-once class="amount-column"> <th
{{ $t('amount')}} v-once
class="amount-column"
>
{{ $t('amount') }}
</th> </th>
<th v-once class="action-column"> <th
{{ $t('action')}} v-once
class="action-column"
>
{{ $t('action') }}
</th> </th>
<th v-once class="note-column"> <th
{{ $t('note')}} v-once
class="note-column"
>
{{ $t('note') }}
</th> </th>
</tr> </tr>
<tr <tr
@@ -49,7 +64,10 @@
>{{ entry.createdAt | timeAgo }}</span> >{{ entry.createdAt | timeAgo }}</span>
</td> </td>
<td> <td>
<div class="amount-with-icon" :id="entry.id"> <div
:id="entry.id"
class="amount-with-icon"
>
<span <span
class="svg-icon inline icon-16 my-1" class="svg-icon inline icon-16 my-1"
aria-hidden="true" aria-hidden="true"
@@ -95,39 +113,58 @@
</span> </span>
<span v-else-if="transactionTypes.challenges.includes(entry.transactionType)"> <span v-else-if="transactionTypes.challenges.includes(entry.transactionType)">
<router-link <router-link
class="challenge-link" class="challenge-link"
:to="{ name: 'challenge', params: { challengeId: entry.reference } }"> :to="{ name: 'challenge', params: { challengeId: entry.reference } }"
>
<span <span
v-markdown="entry.referenceText" v-markdown="entry.referenceText"
></span> ></span>
</router-link> </router-link>
</span> </span>
<span v-else v-html="entryReferenceText(entry)"></span> <span
v-else
v-html="entryReferenceText(entry)"
></span>
<span v-if="entry.reference"> <span v-if="entry.reference">
({{entry.reference}}) ({{ entry.reference }})
</span> </span>
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
<div class="col-12" v-if="selectedTab === 'hourglass'"> <div
v-if="selectedTab === 'hourglass'"
class="col-12"
>
<span v-if="hourglassTransactions.length === 0"> <span v-if="hourglassTransactions.length === 0">
{{ $t('noHourglassTransactions') }} {{ $t('noHourglassTransactions') }}
</span> </span>
<table class="table"> <table class="table">
<tr> <tr>
<th v-once class="timestamp-column"> <th
{{ $t('timestamp')}} v-once
class="timestamp-column"
>
{{ $t('timestamp') }}
</th> </th>
<th v-once class="amount-column"> <th
{{ $t('amount')}} v-once
class="amount-column"
>
{{ $t('amount') }}
</th> </th>
<th v-once class="action-column"> <th
{{ $t('action')}} v-once
class="action-column"
>
{{ $t('action') }}
</th> </th>
<th v-once class="note-column"> <th
{{ $t('note')}} v-once
class="note-column"
>
{{ $t('note') }}
</th> </th>
</tr> </tr>
<tr <tr
@@ -140,7 +177,10 @@
>{{ entry.createdAt | timeAgo }}</span> >{{ entry.createdAt | timeAgo }}</span>
</td> </td>
<td> <td>
<div class="amount-with-icon" :id="entry.id"> <div
:id="entry.id"
class="amount-with-icon"
>
<span <span
class="svg-icon inline icon-16 my-1" class="svg-icon inline icon-16 my-1"
aria-hidden="true" aria-hidden="true"

View File

@@ -139,7 +139,7 @@
class="mx-auto" class="mx-auto"
:no-caret="true" :no-caret="true"
> >
<template v-slot:button-content> <template #button-content>
<span <span
v-once v-once
class="svg-icon dots-icon with-icon" class="svg-icon dots-icon with-icon"

View File

@@ -147,10 +147,10 @@
class="row" class="row"
> >
<div <div
class="col-4"
:id="statInfo.title" :id="statInfo.title"
class="col-4"
> >
<strong> {{ $t(statInfo.title)}} </strong> <strong> {{ $t(statInfo.title) }} </strong>
<strong>: {{ statsComputed[stat] }}</strong> <strong>: {{ statsComputed[stat] }}</strong>
<b-popover <b-popover
:target="statInfo.title" :target="statInfo.title"

View File

@@ -47,7 +47,7 @@
<div class="disable-background"> <div class="disable-background">
<toggle-switch <toggle-switch
:label="optTextSet.switchDescription" :label="optTextSet.switchDescription"
:checked="this.user.inbox.optOut" :checked="user.inbox.optOut"
:hover-text="optTextSet.popoverText" :hover-text="optTextSet.popoverText"
@change="toggleOpt()" @change="toggleOpt()"
/> />
@@ -588,6 +588,23 @@ export default {
}, },
}, },
mixins: [styleHelper], mixins: [styleHelper],
beforeRouteEnter (to, from, next) {
next(vm => {
const data = vm.$store.state.privateMessageOptions;
if ((!data || (data && !data.userIdToMessage)) && vm.$route.query && vm.$route.query.uuid) {
vm.$store.dispatch('user:userLookup', { uuid: vm.$route.query.uuid }).then(res => {
if (res && res.data && res.data.data) {
vm.$store.dispatch('user:newPrivateMessageTo', {
member: res.data.data,
});
}
});
} else {
vm.hasPrivateMessageOptionsOnPageLoad = true;
}
});
},
data () { data () {
return { return {
icons: Object.freeze({ icons: Object.freeze({
@@ -612,23 +629,6 @@ export default {
MAX_MESSAGE_LENGTH: MAX_MESSAGE_LENGTH.toString(), MAX_MESSAGE_LENGTH: MAX_MESSAGE_LENGTH.toString(),
}; };
}, },
beforeRouteEnter (to, from, next) {
next(vm => {
const data = vm.$store.state.privateMessageOptions;
if ((!data || (data && !data.userIdToMessage)) && vm.$route.query && vm.$route.query.uuid) {
vm.$store.dispatch('user:userLookup', { uuid: vm.$route.query.uuid }).then(res => {
if (res && res.data && res.data.data) {
vm.$store.dispatch('user:newPrivateMessageTo', {
member: res.data.data,
});
}
});
} else {
vm.hasPrivateMessageOptionsOnPageLoad = true;
}
});
},
computed: { computed: {
...mapState({ user: 'user.data' }), ...mapState({ user: 'user.data' }),
canLoadMore () { canLoadMore () {