From df23c45e0194dea89fc6fd63f1c660a86367f439 Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Fri, 1 Oct 2021 17:55:01 -0500
Subject: [PATCH 1/6] 4.207.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5994a83eb9..cfcbfe69b1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.207.0",
+  "version": "4.207.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f26a026f19..9c5f965791 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.207.0",
+  "version": "4.207.1",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.15.5",

From 51fd50e411333e4bcbc4e0d5539a699e0118ab0a Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Wed, 22 Sep 2021 15:24:57 -0500
Subject: [PATCH 2/6] chore(testing): add Gems promo to festival

---
 website/common/script/content/constants/events.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js
index e0d961e4f1..277101c010 100644
--- a/website/common/script/content/constants/events.js
+++ b/website/common/script/content/constants/events.js
@@ -21,6 +21,7 @@ export const EVENTS = {
     npcImageSuffix: '_fall',
     season: 'fall',
     gear: true,
+    gemsPromo,
   },
   bundle202109: {
     start: '2021-09-13T08:00-04:00',

From bbe207600729f835422f673e9257b9d6a6bfeabb Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Wed, 22 Sep 2021 16:34:39 -0500
Subject: [PATCH 3/6] fix(promo): update hardcoded event references

---
 website/client/src/app.vue                    |  6 +++---
 .../components/header/banners/gemsPromo.vue   | 20 +++++++++----------
 .../src/components/payments/buyGemsModal.vue  | 16 +++++++--------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/website/client/src/app.vue b/website/client/src/app.vue
index 3904600b01..31b6a912b4 100644
--- a/website/client/src/app.vue
+++ b/website/client/src/app.vue
@@ -38,7 +38,7 @@
       <template v-else>
         <template v-if="isUserLoaded">
           <damage-paused-banner />
-          <!-- <gems-promo-banner /> -->
+          <gems-promo-banner />
           <gift-promo-banner />
           <notifications-display />
           <app-menu />
@@ -154,7 +154,7 @@ import { loadProgressBar } from 'axios-progress-bar';
 import AppMenu from './components/header/menu';
 import AppHeader from './components/header/index';
 import DamagePausedBanner from './components/header/banners/damagePaused';
-// import GemsPromoBanner from './components/header/banners/gemsPromo';
+import GemsPromoBanner from './components/header/banners/gemsPromo';
 import GiftPromoBanner from './components/header/banners/giftPromo';
 import AppFooter from './components/appFooter';
 import notificationsDisplay from './components/notifications';
@@ -186,7 +186,7 @@ export default {
     AppHeader,
     AppFooter,
     DamagePausedBanner,
-    // GemsPromoBanner,
+    GemsPromoBanner,
     GiftPromoBanner,
     notificationsDisplay,
     snackbars,
diff --git a/website/client/src/components/header/banners/gemsPromo.vue b/website/client/src/components/header/banners/gemsPromo.vue
index 75af6bd8d4..22c2c03230 100644
--- a/website/client/src/components/header/banners/gemsPromo.vue
+++ b/website/client/src/components/header/banners/gemsPromo.vue
@@ -12,7 +12,7 @@
       @click="openGemsModal"
     >
       <img
-        v-if="eventName === 'fall2020'"
+        v-if="eventName === 'fall2021'"
         class="d-none d-xl-block"
         srcset="
     ~@/assets/images/gems/fall-confetti-left/confetti.png,
@@ -21,7 +21,7 @@
         src="~@/assets/images/gems/fall-confetti-left/confetti.png"
       >
       <img
-        v-else-if="eventName === 'fall2020SecondPromo'"
+        v-else-if="eventName === 'fall2021SecondPromo'"
         class="d-none d-xl-block"
         srcset="
     ~@/assets/images/gems/spooky-confetti-left/confetti.png,
@@ -31,7 +31,7 @@
       >
       <div class="promo-test">
         <img
-          v-if="eventName === 'fall2020'"
+          v-if="eventName === 'fall2021'"
           srcset="
       ~@/assets/images/gems/fall-text/text.png,
       ~@/assets/images/gems/fall-text/text@2x.png 2x,
@@ -39,7 +39,7 @@
           src="~@/assets/images/gems/fall-text/text.png"
         >
         <img
-          v-else-if="eventName === 'fall2020SecondPromo'"
+          v-else-if="eventName === 'fall2021SecondPromo'"
           srcset="
       ~@/assets/images/gems/spooky-text/text.png,
       ~@/assets/images/gems/spooky-text/text@2x.png 2x,
@@ -48,7 +48,7 @@
         >
       </div>
       <img
-        v-if="eventName === 'fall2020'"
+        v-if="eventName === 'fall2021'"
         class="d-none d-xl-block"
         srcset="
     ~@/assets/images/gems/fall-confetti-right/confetti.png,
@@ -57,7 +57,7 @@
         src="~@/assets/images/gems/fall-confetti-right/confetti.png"
       >
       <img
-        v-else-if="eventName === 'fall2020SecondPromo'"
+        v-else-if="eventName === 'fall2021SecondPromo'"
         class="d-none d-xl-block"
         srcset="
     ~@/assets/images/gems/spooky-confetti-right/confetti.png,
@@ -72,11 +72,11 @@
 <style lang="scss" scoped>
 @import '~@/assets/scss/colors.scss';
 
-.gems-promo-banner-fall2020 {
+.gems-promo-banner-fall2021 {
   background: $gray-10;
 }
 
-.gems-promo-banner-fall2020SecondPromo {
+.gems-promo-banner-fall2021SecondPromo {
   background: $black;
 }
 
@@ -105,8 +105,8 @@ export default {
     },
     showGemsPromoBanner () {
       const currEvt = this.currentEvent;
-      if (!currEvt) return false;
-      return currEvt.event === 'fall2020' || currEvt.event === 'fall2020SecondPromo';
+      if (!currEvt || !currEvt.gemsPromo) return false;
+      return true;
     },
     bannerClass () {
       const bannerClass = 'gems-promo-banner';
diff --git a/website/client/src/components/payments/buyGemsModal.vue b/website/client/src/components/payments/buyGemsModal.vue
index 47edd0f58e..db58640422 100644
--- a/website/client/src/components/payments/buyGemsModal.vue
+++ b/website/client/src/components/payments/buyGemsModal.vue
@@ -21,7 +21,7 @@
             class="col-12 text-center"
           >
             <img
-              v-if="eventName === 'fall2020'"
+              v-if="eventName === 'fall2021'"
               :alt="$t('supportHabitica')"
               srcset="
           ~@/assets/images/gems/fall-header.png,
@@ -30,7 +30,7 @@
               src="~@/assets/images/gems/fall-header.png"
             >
             <img
-              v-else-if="eventName === 'fall2020SecondPromo'"
+              v-else-if="eventName === 'fall2021SecondPromo'"
               :alt="$t('supportHabitica')"
               srcset="
           ~@/assets/images/gems/spooky-header.png,
@@ -207,8 +207,8 @@
     }
   }
 
-  // Fall 2020 events styles
-  /* #buy-gems.event-fall2020, #buy-gems.event-fall2020SecondPromo {
+  // Fall events styles
+  #buy-gems.event-fall2021, #buy-gems.event-fall2021SecondPromo {
     .header-wrap {
       padding-top: 4.5rem;
       padding-bottom: 1.5rem;
@@ -234,21 +234,21 @@
     .close-icon:hover svg path {
       stroke: $gray-400;
     }
-  } */
+  }
 
-  /* #buy-gems.event-fall2020 {
+  #buy-gems.event-fall2021 {
     .header-wrap {
       background-image: url('~@/assets/images/gems/fall-header-bg@2x.png');
       background-size: 100%;
     }
   }
 
-  #buy-gems.event-fall2020SecondPromo {
+  #buy-gems.event-fall2021SecondPromo {
     .header-wrap {
       background-image: url('~@/assets/images/gems/spooky-header-bg@2x.png');
       background-size: 100%;
     }
-  } */
+  }
 </style>
 
 <style lang="scss" scoped>

From d44b32764f5772820021b5e3fc19aa58636c035f Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Thu, 23 Sep 2021 12:09:38 -0500
Subject: [PATCH 4/6] fix(promo): use mobile generic key, maintain gear date
 range

---
 .../src/components/header/banners/gemsPromo.vue  | 16 ++++++++--------
 .../src/components/payments/buyGemsModal.vue     | 10 +++++-----
 .../common/script/content/constants/events.js    |  8 +++++++-
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/website/client/src/components/header/banners/gemsPromo.vue b/website/client/src/components/header/banners/gemsPromo.vue
index 22c2c03230..a6a903dae2 100644
--- a/website/client/src/components/header/banners/gemsPromo.vue
+++ b/website/client/src/components/header/banners/gemsPromo.vue
@@ -12,7 +12,7 @@
       @click="openGemsModal"
     >
       <img
-        v-if="eventName === 'fall2021'"
+        v-if="eventName === 'fall_extra_gems'"
         class="d-none d-xl-block"
         srcset="
     ~@/assets/images/gems/fall-confetti-left/confetti.png,
@@ -21,7 +21,7 @@
         src="~@/assets/images/gems/fall-confetti-left/confetti.png"
       >
       <img
-        v-else-if="eventName === 'fall2021SecondPromo'"
+        v-else-if="eventName === 'spooky_extra_gems'"
         class="d-none d-xl-block"
         srcset="
     ~@/assets/images/gems/spooky-confetti-left/confetti.png,
@@ -31,7 +31,7 @@
       >
       <div class="promo-test">
         <img
-          v-if="eventName === 'fall2021'"
+          v-if="eventName === 'fall_extra_gems'"
           srcset="
       ~@/assets/images/gems/fall-text/text.png,
       ~@/assets/images/gems/fall-text/text@2x.png 2x,
@@ -39,7 +39,7 @@
           src="~@/assets/images/gems/fall-text/text.png"
         >
         <img
-          v-else-if="eventName === 'fall2021SecondPromo'"
+          v-else-if="eventName === 'spooky_extra_gems'"
           srcset="
       ~@/assets/images/gems/spooky-text/text.png,
       ~@/assets/images/gems/spooky-text/text@2x.png 2x,
@@ -48,7 +48,7 @@
         >
       </div>
       <img
-        v-if="eventName === 'fall2021'"
+        v-if="eventName === 'fall_extra_gems'"
         class="d-none d-xl-block"
         srcset="
     ~@/assets/images/gems/fall-confetti-right/confetti.png,
@@ -57,7 +57,7 @@
         src="~@/assets/images/gems/fall-confetti-right/confetti.png"
       >
       <img
-        v-else-if="eventName === 'fall2021SecondPromo'"
+        v-else-if="eventName === 'spooky_extra_gems'"
         class="d-none d-xl-block"
         srcset="
     ~@/assets/images/gems/spooky-confetti-right/confetti.png,
@@ -72,11 +72,11 @@
 <style lang="scss" scoped>
 @import '~@/assets/scss/colors.scss';
 
-.gems-promo-banner-fall2021 {
+.gems-promo-banner-fall_extra_gems {
   background: $gray-10;
 }
 
-.gems-promo-banner-fall2021SecondPromo {
+.gems-promo-banner-spooky_extra_gems {
   background: $black;
 }
 
diff --git a/website/client/src/components/payments/buyGemsModal.vue b/website/client/src/components/payments/buyGemsModal.vue
index db58640422..a33a0bf475 100644
--- a/website/client/src/components/payments/buyGemsModal.vue
+++ b/website/client/src/components/payments/buyGemsModal.vue
@@ -21,7 +21,7 @@
             class="col-12 text-center"
           >
             <img
-              v-if="eventName === 'fall2021'"
+              v-if="eventName === 'fall_extra_gems'"
               :alt="$t('supportHabitica')"
               srcset="
           ~@/assets/images/gems/fall-header.png,
@@ -30,7 +30,7 @@
               src="~@/assets/images/gems/fall-header.png"
             >
             <img
-              v-else-if="eventName === 'fall2021SecondPromo'"
+              v-else-if="eventName === 'spooky_extra_gems'"
               :alt="$t('supportHabitica')"
               srcset="
           ~@/assets/images/gems/spooky-header.png,
@@ -208,7 +208,7 @@
   }
 
   // Fall events styles
-  #buy-gems.event-fall2021, #buy-gems.event-fall2021SecondPromo {
+  #buy-gems.event-fall_extra_gems, #buy-gems.event-spooky_extra_gems {
     .header-wrap {
       padding-top: 4.5rem;
       padding-bottom: 1.5rem;
@@ -236,14 +236,14 @@
     }
   }
 
-  #buy-gems.event-fall2021 {
+  #buy-gems.event-fall_extra_gems {
     .header-wrap {
       background-image: url('~@/assets/images/gems/fall-header-bg@2x.png');
       background-size: 100%;
     }
   }
 
-  #buy-gems.event-fall2021SecondPromo {
+  #buy-gems.event-spooky_extra_gems {
     .header-wrap {
       background-image: url('~@/assets/images/gems/spooky-header-bg@2x.png');
       background-size: 100%;
diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js
index 277101c010..22e35642cc 100644
--- a/website/common/script/content/constants/events.js
+++ b/website/common/script/content/constants/events.js
@@ -15,13 +15,19 @@ export const EVENTS = {
     season: 'normal',
     npcImageSuffix: '',
   },
+  fall_extra_gems: { // eslint-disable-line camelcase
+    start: '2021-09-23T14:00-04:00',
+    end: '2021-10-31T20:00-04:00',
+    npcImageSuffix: '_fall',
+    season: 'fall',
+    gemsPromo,
+  },
   fall2021: {
     start: '2021-09-21T08:00-04:00',
     end: '2021-10-31T20:00-04:00',
     npcImageSuffix: '_fall',
     season: 'fall',
     gear: true,
-    gemsPromo,
   },
   bundle202109: {
     start: '2021-09-13T08:00-04:00',

From 155f11eabb55ced3969b18f3f834fd2541e17b8a Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Mon, 4 Oct 2021 19:01:47 -0500
Subject: [PATCH 5/6] feat(event): set canonical time range

---
 website/common/script/content/constants/events.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js
index 22e35642cc..16e5c3fe66 100644
--- a/website/common/script/content/constants/events.js
+++ b/website/common/script/content/constants/events.js
@@ -16,11 +16,12 @@ export const EVENTS = {
     npcImageSuffix: '',
   },
   fall_extra_gems: { // eslint-disable-line camelcase
-    start: '2021-09-23T14:00-04:00',
-    end: '2021-10-31T20:00-04:00',
+    start: '2021-10-05T08:00-04:00',
+    end: '2021-10-12T20:00-04:00',
     npcImageSuffix: '_fall',
     season: 'fall',
     gemsPromo,
+    promo: 'fall_extra_gems',
   },
   fall2021: {
     start: '2021-09-21T08:00-04:00',

From 15fa4f47c2ee625e635a31e4b4e3aafdd7cc1fb0 Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Mon, 4 Oct 2021 19:02:53 -0500
Subject: [PATCH 6/6] 4.207.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cfcbfe69b1..0cedc1793f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.207.1",
+  "version": "4.207.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9c5f965791..118736193e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.207.1",
+  "version": "4.207.2",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.15.5",