adata-ui 0.1.60 → 0.1.64

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "adata-ui",
-  "version": "0.1.45",
+  "version": "0.1.62",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adata-ui",
-  "version": "0.1.60",
+  "version": "0.1.64",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/Header/Header.vue

@@ -39,7 +39,7 @@
             </a>
           </div>
         </div>
-        <div class="header__right">
+        <div class="header__right" v-show="!noAuth">
           <slot name="chooseCountry"></slot>
           <Profile
             :profileDropDown="profileDropDown"
@@ -237,11 +237,11 @@
                 </div>
               </div>
               <div class="menu-mobile__info-footer">
-                <div v-if="requestCount" class="menu-mobile__info-footer-item">
+                <div class="menu-mobile__info-footer-item" v-show="requestCount === 0 || requestCount">
                   <span class="menu-mobile__info-footer-title">Суточный лимит запросов:</span>
                   <span class="menu-mobile__info-footer-circle">{{ requestCount }}</span>
                 </div>
-                <div v-if="daysRemaining" class="menu-mobile__info-footer-item">
+                <div class="menu-mobile__info-footer-item" v-show="daysRemaining === 0 || daysRemaining">
                   <span class="menu-mobile__info-footer-title">Остаток дней:</span>
                   <span class="menu-mobile__info-footer-circle">{{ daysRemaining }}</span>
                 </div>
@@ -275,6 +275,10 @@ export default {
         return ["prod", "dev", "staging"].indexOf(value) !== -1;
       },
     },
+    noAuth: {
+      type: Boolean,
+      default: false
+    },
     isAuthenticated: {
       type: Boolean,
       default: false,
@@ -379,17 +383,12 @@ export default {
   },
   mounted() {
     this.setBalance(this.balance);
-    this.timer = setTimeout(this.fetchNotification, 3000);
+    this.notificationShow()
   },
   watch: {
     balance(newBalance) {
       this.setBalance(newBalance);
     },
-    isOpenNotification() {
-      if(!this.isOpenNotification) {
-        clearTimeout(this.timer);
-      }
-    }
   },
   methods: {
     async fetchNotification() {
@@ -400,12 +399,24 @@ export default {
         if (data.details.length) {
           this.systemMessage = data.details[0].message;
           this.isOpenNotification = true;
+          localStorage.setItem('start_time', JSON.stringify(new Date()))
         }
 
       } catch(e) {
         console.log(e.message)
       }
     },
+    notificationShow() {
+      const startTime = localStorage.getItem('start_time');
+      let diffTime = startTime ? Math.round((new Date() - new Date(JSON.parse(startTime))) / 3600000): 0
+      if (startTime) {
+        if (diffTime >= 24) {
+          localStorage.removeItem('start_time')
+        }
+      } else {
+        this.fetchNotification()
+      }
+    },
     async fetchCurrencies() {
       try {
         const response = await fetch('https://users.adata.kz/api/v1/information/currency');

package/src/components/Header/InfoHeader.vue

@@ -131,11 +131,11 @@
           </div>
           <div v-if="isAuthenticated" class="info-header__item">
             <div class="info-header__item-elem">
-              <div class="info-header__inner-item" v-show="requestCount">
+              <div class="info-header__inner-item" v-show="requestCount === 0 || requestCount">
                 <span class="info-header__title">Суточный лимит запросов</span>
                 <span class="info-header__result info-header__result_circled">{{ requestCount }}</span>
               </div>
-              <div class="info-header__inner-item" v-show="daysRemaining">
+              <div class="info-header__inner-item" v-show="daysRemaining === 0 || daysRemaining">
                 <span class="info-header__title">остаток дней</span>
                 <span class="info-header__result info-header__result_circled">{{ daysRemaining }}</span>
               </div>