feat(content): new Feathery Friends daterange

Also fixes up some style oddities in quest modals
This commit is contained in:
Sabe Jones
2021-05-13 15:07:31 -05:00
parent 79df18df68
commit f6bd69569f
5 changed files with 48 additions and 42 deletions

View File

@@ -26,7 +26,10 @@
class="content" class="content"
> >
<div class="inner-content"> <div class="inner-content">
<questDialogContent :item="item" /> <questDialogContent
:item="item"
:abbreviated="true"
/>
<div <div
v-if="!item.locked" v-if="!item.locked"
class="purchase-amount" class="purchase-amount"
@@ -131,11 +134,6 @@
padding-bottom: 0px; padding-bottom: 0px;
} }
.questInfo {
width: 70%;
margin: 0 auto 10px auto;
}
.right-sidebar { .right-sidebar {
position: absolute; position: absolute;
right: -350px; right: -350px;

View File

@@ -14,6 +14,7 @@
<questInfo <questInfo
class="questInfo" class="questInfo"
:quest="item" :quest="item"
:abbreviated="true"
/> />
</div> </div>
</template> </template>

View File

@@ -1,11 +1,10 @@
<template> <template>
<div>
<div <div
class="row" class="d-flex flex-column justify-content-center"
> >
<div <div
v-if="quest.collect" v-if="quest.collect"
class="table-row" class="table-row m-auto"
> >
<dt>{{ $t('collect') + ':' }}</dt> <dt>{{ $t('collect') + ':' }}</dt>
<dd> <dd>
@@ -19,12 +18,12 @@
</div> </div>
<div <div
v-if="quest.boss" v-if="quest.boss"
class="table-row" class="table-row m-auto"
> >
<dt>{{ $t('bossHP') + ':' }}</dt> <dt>{{ $t('bossHP') + ':' }}</dt>
<dd>{{ quest.boss.hp }}</dd> <dd>{{ quest.boss.hp }}</dd>
</div> </div>
<div class="table-row"> <div class="table-row m-auto">
<dt>{{ $t('difficulty') + ':' }}</dt> <dt>{{ $t('difficulty') + ':' }}</dt>
<dd> <dd>
<div <div
@@ -35,8 +34,10 @@
></div> ></div>
</dd> </dd>
</div> </div>
</div> <div
<div v-if="quest.event"> v-if="quest.event && !abbreviated"
class="m-auto"
>
{{ limitedString }} {{ limitedString }}
</div> </div>
</div> </div>
@@ -131,6 +132,10 @@ export default {
quest: { quest: {
type: Object, type: Object,
}, },
abbreviated: {
type: Boolean,
default: false,
},
}, },
data () { data () {
return { return {

View File

@@ -21,8 +21,9 @@ const bundles = {
'harpy', 'harpy',
'owl', 'owl',
], ],
event: EVENTS.potions202105,
canBuy () { canBuy () {
return moment().isBetween('2019-05-09', '2019-06-02'); return moment().isBefore(EVENTS.potions202105.end);
}, },
type: 'quests', type: 'quests',
class: 'quest_bundle_featheredFriends', class: 'quest_bundle_featheredFriends',

View File

@@ -122,6 +122,7 @@ export default function getItemInfo (user, type, item, officialPinnedItems, lang
purchaseType: 'bundles', purchaseType: 'bundles',
path: `bundles.${item.key}`, path: `bundles.${item.key}`,
pinType: 'bundles', pinType: 'bundles',
event: item.event,
}; };
break; break;
case 'quests': // eslint-disable-line no-case-declarations case 'quests': // eslint-disable-line no-case-declarations