diff --git a/website/client/src/components/payments/sendGemsModal.vue b/website/client/src/components/payments/sendGemsModal.vue index 794676c51d..de1bb640f6 100644 --- a/website/client/src/components/payments/sendGemsModal.vue +++ b/website/client/src/components/payments/sendGemsModal.vue @@ -78,9 +78,7 @@
-
+
-
-

- {{ $t('winterPromoGiftHeader') }} -

-

- {{ $t('winterPromoGiftDetails1') }} -

-

- {{ $t('winterPromoGiftDetails2') }} -

-
@@ -220,7 +204,6 @@ export default { ...mapState({ userLoggedIn: 'user.data', originalSubscriptionBlocks: 'content.subscriptionBlocks', - currentEvent: 'worldState.data.currentEvent', }), subscriptionBlocks () { let subscriptionBlocks = toArray(this.originalSubscriptionBlocks); @@ -246,10 +229,6 @@ export default { } return this.userReceivingGems.profile.name; }, - columnClass () { - if (this.currentEvent && this.currentEvent.promo && this.currentEvent.promo === 'g1g1') return 'col-md-5'; - return 'col-md-12'; - }, }, mounted () { this.$root.$on('habitica::send-gems', data => { diff --git a/website/client/src/components/settings/index.vue b/website/client/src/components/settings/index.vue index 61e6f4bee7..e22daeef68 100644 --- a/website/client/src/components/settings/index.vue +++ b/website/client/src/components/settings/index.vue @@ -45,18 +45,91 @@ {{ $t('notifications') }} +
+
+
+
+ {{ $t('g1g1Event') }} +

{{ $t('g1g1Details') }}

+
+
+
+
+ + diff --git a/website/client/src/components/settings/subscription.vue b/website/client/src/components/settings/subscription.vue index 1372da794f..334a45b6cf 100644 --- a/website/client/src/components/settings/subscription.vue +++ b/website/client/src/components/settings/subscription.vue @@ -113,7 +113,6 @@
@@ -269,13 +265,11 @@
@@ -289,43 +283,22 @@
-
-
-
-
-
- {{ $t('giftSubscription') }} -
- - {{ $t('giftASubscription') }} - -
+
-
-

- {{ $t('winterPromoGiftHeader') }} -

-

- {{ $t('winterPromoGiftDetails1') }} -

-

- {{ $t('winterPromoGiftDetails2') }} -

+
+ {{ $t('giftSubscription') }}
+ + {{ $t('giftASubscription') }} +
@@ -624,11 +597,7 @@ export default { }; }, computed: { - ...mapState({ - user: 'user.data', - credentials: 'credentials', - currentEvent: 'worldState.data.currentEvent', - }), + ...mapState({ user: 'user.data', credentials: 'credentials' }), purchasedPlanIdInfo () { if (!this.subscriptionBlocks[this.user.purchased.plan.planId]) { // @TODO: find which subs are in the common diff --git a/website/common/locales/en/limited.json b/website/common/locales/en/limited.json index f4bd8654de..620b08ea4b 100644 --- a/website/common/locales/en/limited.json +++ b/website/common/locales/en/limited.json @@ -190,6 +190,7 @@ "g1g1Announcement": "Gift a subscription and get a subscription free event going on now!", "g1g1Details": "Gift a subscription to a friend, and you'll receive the same subscription for free!", "g1g1": "Gift One, Get One", + "g1g1Event": "Gift One, Get One event going on now!", "g1g1Returning": "In honor of the season, we’re bringing back a very special promotion. Now when you gift a subscription, you’ll receive the same in return!", "howItWorks": "How it Works", "g1g1HowItWorks": "Type in the username of the account you’d like to gift to. From there, pick the sub length you’d like to gift and check out. Your account will automatically be rewarded with the same level of subscription you just gifted.", diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js index c6b7f77919..ded42687c2 100644 --- a/website/common/script/content/constants/events.js +++ b/website/common/script/content/constants/events.js @@ -24,14 +24,14 @@ export const EVENTS = { season: 'winter', }, winter2021: { - start: '2020-12-17T08:00-05:00', + start: '2020-12-01T08:00-05:00', end: '2021-01-07T20:00-05:00', season: 'winter', promo: 'g1g1', }, noCurrentEvent2020: { start: '2020-10-31T20:00-05:00', - end: '2020-12-17T08:00-05:00', + end: '2020-12-01T08:00-05:00', season: 'normal', }, fall2020: {