From f6bd69569f3c040959fae1e0cc95ecc69c31d5ec Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Thu, 13 May 2021 15:07:31 -0500
Subject: [PATCH] feat(content): new Feathery Friends daterange Also fixes up
 some style oddities in quest modals

---
 .../components/shops/quests/buyQuestModal.vue | 10 +--
 .../shops/quests/questDialogContent.vue       |  1 +
 .../src/components/shops/quests/questInfo.vue | 75 ++++++++++---------
 website/common/script/content/bundles.js      |  3 +-
 website/common/script/libs/getItemInfo.js     |  1 +
 5 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/website/client/src/components/shops/quests/buyQuestModal.vue b/website/client/src/components/shops/quests/buyQuestModal.vue
index f4dc300f9a..e257f0ceed 100644
--- a/website/client/src/components/shops/quests/buyQuestModal.vue
+++ b/website/client/src/components/shops/quests/buyQuestModal.vue
@@ -26,7 +26,10 @@
       class="content"
     >
       <div class="inner-content">
-        <questDialogContent :item="item" />
+        <questDialogContent
+          :item="item"
+          :abbreviated="true"
+        />
         <div
           v-if="!item.locked"
           class="purchase-amount"
@@ -131,11 +134,6 @@
       padding-bottom: 0px;
     }
 
-    .questInfo {
-      width: 70%;
-      margin: 0 auto 10px auto;
-    }
-
     .right-sidebar {
       position: absolute;
       right: -350px;
diff --git a/website/client/src/components/shops/quests/questDialogContent.vue b/website/client/src/components/shops/quests/questDialogContent.vue
index 45783522f5..27212f452a 100644
--- a/website/client/src/components/shops/quests/questDialogContent.vue
+++ b/website/client/src/components/shops/quests/questDialogContent.vue
@@ -14,6 +14,7 @@
     <questInfo
       class="questInfo"
       :quest="item"
+      :abbreviated="true"
     />
   </div>
 </template>
diff --git a/website/client/src/components/shops/quests/questInfo.vue b/website/client/src/components/shops/quests/questInfo.vue
index f56308c09b..7e788a2522 100644
--- a/website/client/src/components/shops/quests/questInfo.vue
+++ b/website/client/src/components/shops/quests/questInfo.vue
@@ -1,42 +1,43 @@
 <template>
-  <div>
+  <div
+    class="d-flex flex-column justify-content-center"
+  >
     <div
-      class="row"
+      v-if="quest.collect"
+      class="table-row m-auto"
     >
-      <div
-        v-if="quest.collect"
-        class="table-row"
-      >
-        <dt>{{ $t('collect') + ':' }}</dt>
-        <dd>
-          <div
-            v-for="(collect, key) of quest.collect"
-            :key="key"
-          >
-            <span>{{ collect.count }} {{ getCollectText(collect) }}</span>
-          </div>
-        </dd>
-      </div>
-      <div
-        v-if="quest.boss"
-        class="table-row"
-      >
-        <dt>{{ $t('bossHP') + ':' }}</dt>
-        <dd>{{ quest.boss.hp }}</dd>
-      </div>
-      <div class="table-row">
-        <dt>{{ $t('difficulty') + ':' }}</dt>
-        <dd>
-          <div
-            v-for="(star, index) of stars()"
-            :key="index"
-            class="svg-icon inline icon-16"
-            v-html="icons[star]"
-          ></div>
-        </dd>
-      </div>
+      <dt>{{ $t('collect') + ':' }}</dt>
+      <dd>
+        <div
+          v-for="(collect, key) of quest.collect"
+          :key="key"
+        >
+          <span>{{ collect.count }} {{ getCollectText(collect) }}</span>
+        </div>
+      </dd>
     </div>
-    <div v-if="quest.event">
+    <div
+      v-if="quest.boss"
+      class="table-row m-auto"
+    >
+      <dt>{{ $t('bossHP') + ':' }}</dt>
+      <dd>{{ quest.boss.hp }}</dd>
+    </div>
+    <div class="table-row m-auto">
+      <dt>{{ $t('difficulty') + ':' }}</dt>
+      <dd>
+        <div
+          v-for="(star, index) of stars()"
+          :key="index"
+          class="svg-icon inline icon-16"
+          v-html="icons[star]"
+        ></div>
+      </dd>
+    </div>
+    <div
+      v-if="quest.event && !abbreviated"
+      class="m-auto"
+    >
       {{ limitedString }}
     </div>
   </div>
@@ -131,6 +132,10 @@ export default {
     quest: {
       type: Object,
     },
+    abbreviated: {
+      type: Boolean,
+      default: false,
+    },
   },
   data () {
     return {
diff --git a/website/common/script/content/bundles.js b/website/common/script/content/bundles.js
index 97985190a8..74452b1207 100644
--- a/website/common/script/content/bundles.js
+++ b/website/common/script/content/bundles.js
@@ -21,8 +21,9 @@ const bundles = {
       'harpy',
       'owl',
     ],
+    event: EVENTS.potions202105,
     canBuy () {
-      return moment().isBetween('2019-05-09', '2019-06-02');
+      return moment().isBefore(EVENTS.potions202105.end);
     },
     type: 'quests',
     class: 'quest_bundle_featheredFriends',
diff --git a/website/common/script/libs/getItemInfo.js b/website/common/script/libs/getItemInfo.js
index c9d26ac32c..e7ffb300b6 100644
--- a/website/common/script/libs/getItemInfo.js
+++ b/website/common/script/libs/getItemInfo.js
@@ -122,6 +122,7 @@ export default function getItemInfo (user, type, item, officialPinnedItems, lang
         purchaseType: 'bundles',
         path: `bundles.${item.key}`,
         pinType: 'bundles',
+        event: item.event,
       };
       break;
     case 'quests': // eslint-disable-line no-case-declarations