From ab68e8a5fe7e51fb751e98fac6b33125f3f6ea7c Mon Sep 17 00:00:00 2001
From: Natalie L <78037386+CuriousMagpie@users.noreply.github.com>
Date: Mon, 12 Jun 2023 16:01:34 -0400
Subject: [PATCH] feat(content): add June pet quest bundle (#14694)

* feat(content): add June subscriber items

* feat(content): add June pet quest bundle

* fix(bundle): correct timing and visual issues

---------

Co-authored-by: SabreCat <sabe@habitica.com>
---
 website/client/src/components/shops/countdownBanner.vue   | 3 ---
 .../client/src/components/shops/quests/buyQuestModal.vue  | 3 +--
 website/common/locales/en/questsContent.json              | 2 +-
 website/common/script/content/bundles.js                  | 4 ++--
 website/common/script/content/constants/events.js         | 8 ++++++--
 website/common/script/content/shop-featuredItems.js       | 6 +++---
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/website/client/src/components/shops/countdownBanner.vue b/website/client/src/components/shops/countdownBanner.vue
index 6361324148..071213c0c8 100644
--- a/website/client/src/components/shops/countdownBanner.vue
+++ b/website/client/src/components/shops/countdownBanner.vue
@@ -16,9 +16,6 @@
 
   .limitedTime {
     height: 32px;
-    width: calc(100% + 30px);
-    margin: 0 -15px; // the modal content has its own padding
-
     font-size: 12px;
     line-height: 1.33;
     text-align: center;
diff --git a/website/client/src/components/shops/quests/buyQuestModal.vue b/website/client/src/components/shops/quests/buyQuestModal.vue
index c422199b2d..608bb9cef1 100644
--- a/website/client/src/components/shops/quests/buyQuestModal.vue
+++ b/website/client/src/components/shops/quests/buyQuestModal.vue
@@ -89,7 +89,7 @@
         </button>
         <button
           v-else
-          class="btn btn-primary"
+          class="btn btn-primary mb-4"
           :class="{'notEnough': !enoughCurrency(priceType, item.value * selectedAmountToBuy)}"
           :disabled="numberInvalid"
           @click="buyItem()"
@@ -141,7 +141,6 @@
       border-bottom-right-radius: 8px;
       border-bottom-left-radius: 8px;
       display: block;
-      margin-top: 24px;
       padding: 16px 24px;
       align-content: center;
 
diff --git a/website/common/locales/en/questsContent.json b/website/common/locales/en/questsContent.json
index 8db64cb804..fdde384328 100644
--- a/website/common/locales/en/questsContent.json
+++ b/website/common/locales/en/questsContent.json
@@ -586,7 +586,7 @@
   "questNudibranchUnlockText": "Unlocks Nudibranch Eggs for purchase in the Market",
 
   "splashyPalsText": "Splashy Pals Quest Bundle",
-  "splashyPalsNotes": "Contains 'The Dilatory Derby', 'Guide the Turtle', and 'Wail of the Whale'. Available until July 31.",
+  "splashyPalsNotes": "Contains 'The Dilatory Derby', 'Guide the Turtle', and 'Wail of the Whale'. Available until June 30.",
 
   "questHippoText": "What a Hippo-Crite",
   "questHippoNotes": "You and @awesomekitty collapse into the shade of a palm tree, exhausted. The sun beats down over the Sloensteadi Savannah, scorching the ground below. It’s been a productive day so far, conquering your Dailies, and this oasis looks like a nice place to take a break and refresh. Stooping near the water to get a drink, you stumble back in shock as a massive hippopotamus rises. “Resting so soon? Don’t be so lazy, get back to work.” You try and protest that you’ve been working hard and need a break, but the hippo isn’t having any of it.<br><br>@khdarkwolf whispers to you, “Notice how it’s lounging around all day but has the nerve to call you lazy? It’s the Hippo-Crite!”<br><br>Your friend @jumorales nods. “Let’s show it what hard work looks like!”",
diff --git a/website/common/script/content/bundles.js b/website/common/script/content/bundles.js
index f9b3666fab..4388aca9d4 100644
--- a/website/common/script/content/bundles.js
+++ b/website/common/script/content/bundles.js
@@ -35,9 +35,9 @@ const bundles = {
       'turtle',
       'whale',
     ],
-    event: EVENTS.bundle202106,
+    event: EVENTS.bundle202306,
     canBuy () {
-      return moment().isBefore(EVENTS.bundle202106.end);
+      return moment().isBetween(EVENTS.bundle202306.start, EVENTS.bundle202306.end);
     },
     type: 'quests',
     class: 'quest_bundle_splashyPals',
diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js
index d68c78ee21..7f7af6c66b 100644
--- a/website/common/script/content/constants/events.js
+++ b/website/common/script/content/constants/events.js
@@ -10,11 +10,15 @@ const gemsPromo = {
 
 export const EVENTS = {
   noEvent: {
-    start: '2023-05-31T23:59-04:00',
-    end: '2023-06-22T08:00-04:00',
+    start: '2023-06-13T23:59-04:00',
+    end: '2023-06-30T08:00-04:00',
     season: 'normal',
     npcImageSuffix: '',
   },
+  bundle202306: {
+    start:'2023-06-13T08:00-04:00',
+    end:'2023-06-30T23:59-04:00',
+  },
   bundle202305: {
     start:'2023-05-23T08:00-04:00',
     end:'2023-05-31T23:59-04:00',
diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js
index 13eb8ddff9..3e4985ea88 100644
--- a/website/common/script/content/shop-featuredItems.js
+++ b/website/common/script/content/shop-featuredItems.js
@@ -44,12 +44,12 @@ const featuredItems = {
       },
     ];
   },
-  quests () { // start date is 3/28
-    if (moment().isBetween(EVENTS.bundle202305.start, EVENTS.bundle202305.end)) {
+  quests () {
+    if (moment().isBetween(EVENTS.bundle202306.start, EVENTS.bundle202306.end)) {
       return [
         {
           type: 'bundles',
-          path: 'bundles.birdBuddies',
+          path: 'bundles.splashyPals',
         },
         {
           type: 'quests',