🔀 Merge #1990 into deploy/rinkeby

likecoin · Dec 19, 2024 · b471d61 · b471d61
2 parents 8aeeac6 + 68bd5b0
commit b471d61
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 13 deletions.
diff --git a/src/components/SiteMenuForMobile.vue b/src/components/SiteMenuForMobile.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="fixed inset-0 z-50 bg-black bg-opacity-[30%]">
     <div
-      class="flex flex-col items-center gap-[22px] w-full bg-white pl-[16px] pr-[8px] py-[28px]"
+      class="flex flex-col items-center gap-[22px] w-full bg-white pl-[16px] pr-[8px] pt-[40px] pb-[28px]"
     >
       <header
         class="flex items-center justify-between w-full text-like-green mb-[10px]"

diff --git a/src/components/ChristmasCampaign/banner.vue → src/components/SiteTopBanner.vue b/src/components/ChristmasCampaign/banner.vue → src/components/SiteTopBanner.vue
@@ -30,15 +30,22 @@
 export default {
   data() {
     return {
-      messages: ['🎄聖誕限時 全店9折優惠', '於付款頁面輸入優惠碼”CHRISTMAS10”'],
+      messages: [
+        this.$t('christmas_campaign_text_1'),
+        this.$t('christmas_campaign_text_2'),
+        this.$t('christmas_campaign_text_3'),
+      ],
       showBanner: true,
     };
   },
   computed: {
     repeatedMessages() {
-      return [...this.messages, ...this.messages];
+      return this.messages.concat(this.messages);
     },
   },
+  created() {
+    this.checkBannerStatus();
+  },
   methods: {
     closeBanner() {
       this.showBanner = false;
@@ -56,27 +63,28 @@ export default {
       } catch (error) {}
     },
   },
-  created() {
-    this.checkBannerStatus();
-  },
 };
 </script>
 
 <style scoped>
 .scrolling-content {
   display: flex;
   flex-direction: column;
-  animation: scrollUp 10s linear infinite;
+  animation: scrollUp 12s cubic-bezier(0.7, 0, 0.25, 1) infinite;
 }
 
 @keyframes scrollUp {
   0%,
-  25% {
+  16.666% {
     transform: translateY(0%);
   }
-  50%,
-  75% {
-    transform: translateY(-25%);
+  33.333%,
+  50% {
+    transform: translateY(-16.666%);
+  }
+  66.666%,
+  83.333% {
+    transform: translateY(-33.333%);
   }
   100% {
     transform: translateY(-50%);

diff --git a/src/layouts/default.vue b/src/layouts/default.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="flex flex-col items-stretch min-h-screen">
-    <ChristmasCampaignBanner />
+    <SiteTopBanner />
     <!-- <AlertBanner
       v-if="getRouteBaseName($route) !== 'nft-class-classId' && $route.params.classId !== alertBannerNFTClassId"
       :primary-button-text="$t('alert_banner_actions_purchase')"

diff --git a/src/layouts/index.vue b/src/layouts/index.vue
@@ -3,7 +3,7 @@
     <AlertBanner v-if="uiIsChainUpgrading">{{
       $t('notice_chain_upgrading')
     }}</AlertBanner>
-    <ChristmasCampaignBanner />
+    <SiteTopBanner />
 
     <nuxt
       :class="[

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -90,6 +90,9 @@
   "cart_item_free_not_supported": "Free items cannot be added to cart",
   "cart_item_tipping": "Price includes a tip of {amount} USD",
   "cart_purchase_channel": "via {from}",
+  "christmas_campaign_text_1": "🎄 Christmas exclusive discount until DEC 31 🎄",
+  "christmas_campaign_text_2": "⭐️ Enjoy 15% off on order over $9 USD ⭐️",
+  "christmas_campaign_text_3": "Code \"XMASREAD\" will be applied automatically",
   "civic_dashboard_v3_about_url": "https://docs.like.co/user-guide/civic-liker",
   "civic_dashboard_v3_banner_book_nft": "NFT BOOK",
   "civic_dashboard_v3_banner_book_nft_description": "unleashes the potential value of ebooks, elevating the essence of books, making them books, yet no longer just books",

diff --git a/src/locales/zh-Hant.json b/src/locales/zh-Hant.json
@@ -90,6 +90,9 @@
   "cart_item_free_not_supported": "購物車暫不支援免費收藏",
   "cart_item_tipping": "單價已含小額打賞 {amount} USD",
   "cart_purchase_channel": "透過 {from}",
+  "christmas_campaign_text_1": "🎄 聖誕限時優惠至12月31號 🎄",
+  "christmas_campaign_text_2": "⭐️ 凡購買滿 $9 USD 即享全單85折 ⭐️",
+  "christmas_campaign_text_3": "優惠碼 \"XMASREAD\" 將自動套用",
   "civic_dashboard_v3_about_url": "https://docs.like.co/v/zh/user-guide/civic-liker",
   "civic_dashboard_v3_banner_book_nft": "NFT BOOK",
   "civic_dashboard_v3_banner_book_nft_description": "Liker Land 也解放電子書的潛在價值，昇華書的本質，令書不再只是書。",