Merge branch 'sabrecat/potion-time' into release

website/client/src/components/shops/market/categoryRow.vue

@@ -11,6 +11,12 @@
       <span slot="popoverContent">
         <strong v-if="item.key === 'gem' && gemsLeft === 0">{{ $t('maxBuyGems') }}</strong>
         <h4 class="popover-content-title">{{ item.text }}</h4>
+        <div
+          v-if="item.event"
+          class="mt-2"
+        >
+          {{ limitedString }}
+        </div>
       </span>
       <template
         slot="itemBadge"
@@ -26,14 +32,15 @@
 import _filter from 'lodash/filter';
 import _sortBy from 'lodash/sortBy';
 import _map from 'lodash/map';
+import moment from 'moment';
 import { mapState } from '@/libs/store';
 import pinUtils from '@/mixins/pinUtils';
 import planGemLimits from '@/../../common/script/libs/planGemLimits';
+import seasonalShopConfig from '@/../../common/script/libs/shops-seasonal.config';
 
 import ShopItem from '../shopItem';
 import CategoryItem from './categoryItem';
 
-
 export default {
   components: {
     CategoryItem,
@@ -53,6 +60,9 @@ export default {
       return planGemLimits.convCap
         + this.user.purchased.plan.consecutive.gemCapExtra - this.user.purchased.plan.gemsBought;
     },
+    limitedString () {
+      return this.$t('limitedOffer', { date: moment(seasonalShopConfig.dateRange.end).format('LL') });
+    },
     sortedMarketItems () {
       let result = _map(this.category.items, e => ({
         ...e,

website/client/src/components/shops/quests/buyQuestModal.vue

@@ -82,6 +82,16 @@
     >
       <questDialogDrops :item="item" />
     </div>
+    <div
+      v-if="item.event"
+      class="limitedTime"
+    >
+      <span
+        class="svg-icon inline icon-16 clock-icon"
+        v-html="icons.clock"
+      ></span>
+      <span class="limitedString">{{ limitedString }}</span>
+    </div>
     <div
       slot="modal-footer"
       class="clearfix"
@@ -121,6 +131,9 @@
       margin: 33px auto auto;
     }
 
+    .modal-body {
+      padding-bottom: 0px;
+    }
 
     .questInfo {
       width: 70%;
@@ -208,6 +221,27 @@
       }
     }
 
+    .limitedTime {
+      height: 32px;
+      background-color: $purple-300;
+      width: calc(100% + 30px);
+      margin: 0 -15px; // the modal content has its own padding
+
+      font-size: 12px;
+      line-height: 1.33;
+      text-align: center;
+      color: $white;
+
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      .limitedString {
+        height: 16px;
+        margin-left: 8px;
+      }
+    }
+
     .notEnough {
       pointer-events: none;
       opacity: 0.55;
@@ -247,14 +281,17 @@
 </style>
 
 <script>
+import moment from 'moment';
 import { mapState } from '@/libs/store';
+import seasonalShopConfig from '@/../../common/script/libs/shops-seasonal.config';
 
+import svgClock from '@/assets/svg/clock.svg';
 import svgClose from '@/assets/svg/close.svg';
-import svgGold from '@/assets/svg/gold.svg';
-import svgGem from '@/assets/svg/gem.svg';
-import svgPin from '@/assets/svg/pin.svg';
 import svgExperience from '@/assets/svg/experience.svg';
+import svgGem from '@/assets/svg/gem.svg';
+import svgGold from '@/assets/svg/gold.svg';
 import svgHourglasses from '@/assets/svg/hourglass.svg';
+import svgPin from '@/assets/svg/pin.svg';
 
 import BalanceInfo from '../balanceInfo.vue';
 import currencyMixin from '../_currencyMixin';
@@ -286,12 +323,13 @@ export default {
   data () {
     return {
       icons: Object.freeze({
+        clock: svgClock,
         close: svgClose,
-        gold: svgGold,
-        gem: svgGem,
-        pin: svgPin,
         experience: svgExperience,
+        gem: svgGem,
+        gold: svgGold,
         hourglass: svgHourglasses,
+        pin: svgPin,
       }),
 
       isPinned: false,
@@ -319,6 +357,9 @@ export default {
       if (this.priceType === 'hourglasses') return this.icons.hourglass;
       return this.icons.gem;
     },
+    limitedString () {
+      return this.$t('limitedOffer', { date: moment(seasonalShopConfig.dateRange.end).format('LL') });
+    },
   },
   watch: {
     item: function itemChanged () {

website/client/src/components/shops/quests/index.vue

@@ -299,7 +299,10 @@
             <span slot="popoverContent">
               <div class="questPopover">
                 <h4 class="popover-content-title">{{ item.text }}</h4>
-                <questInfo :quest="item" />
+                <questInfo
+                  :quest="item"
+                  :popoverVersion="true"
+                />
               </div>
             </span>
             <template

website/client/src/components/shops/quests/questInfo.vue

@@ -1,40 +1,43 @@
 <template>
-  <div
-    class="row"
-    :class="{'small-version': smallVersion}"
-  >
+  <div>
     <div
-      v-if="quest.collect"
-      class="table-row"
+      class="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
+        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 of stars()"
+            :key="star"
+            class="svg-icon inline icon-16"
+            v-html="icons[star]"
+          ></div>
+        </dd>
+      </div>
     </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 of stars()"
-          :key="star"
-          class="svg-icon inline"
-          :class="smallVersion ? 'icon-12' : 'icon-16'"
-          v-html="icons[star]"
-        ></div>
-      </dd>
+    <div v-if="quest.event && popoverVersion">
+      {{ limitedString }}
     </div>
   </div>
 </template>
@@ -115,16 +118,20 @@ dt {
 </style>
 
 <script>
+import moment from 'moment';
+
 import svgStar from '@/assets/svg/difficulty-star.svg';
 import svgStarHalf from '@/assets/svg/difficulty-star-half.svg';
 import svgStarEmpty from '@/assets/svg/difficulty-star-empty.svg';
 
+import seasonalShopConfig from '@/../../common/script/libs/shops-seasonal.config';
+
 export default {
   props: {
     quest: {
       type: Object,
     },
-    smallVersion: {
+    popoverVersion: {
       type: Boolean,
       default: false,
     },
@@ -146,6 +153,9 @@ export default {
 
       return 1;
     },
+    limitedString () {
+      return this.$t('limitedOffer', { date: moment(seasonalShopConfig.dateRange.end).format('LL') });
+    },
   },
   methods: {
     stars () {

website/client/src/components/shops/shopItem.vue

@@ -104,7 +104,7 @@
         </div>
         <div
           v-if="item.event"
-          class="mt-4"
+          :class="item.purchaseType === 'gear' ? 'mt-4' : 'mt-2'"
         >
           {{ limitedString }}
         </div>