Merge pull request #223 from Support-pl/dev

fixed minor bugs
Support-pl · Jul 7, 2023 · 29b5cec · 29b5cec
2 parents e9d8102 + c8b51f4
commit 29b5cec
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 18 deletions.
diff --git a/src/components/appMain/appHeader.vue b/src/components/appMain/appHeader.vue
@@ -155,7 +155,10 @@
               </div>
             </div>
           </transition-group>
-          <transition v-if="viewport < 576" name="header__item-anim">
+          <transition
+            name="header__item-anim"
+            v-if="viewport < 576 && headers[active]?.buttons.length > 0 && isLogged"
+          >
             <div class="header__button" @click="isButtonsVisible = !isButtonsVisible">
               <div class="icon__wrapper" :style="(isButtonsVisible) ? {
                 borderRadius: '50%',
@@ -361,7 +364,7 @@ export default {
         this.$router.push({ path: '/iaas', query });
         return;
       }
-      if (this.getActiveTab.title.includes('service')) {
+      if (this.getActiveTab.title.includes('service-')) {
         this.$router.push('/services');
         return;
       }
@@ -726,9 +729,14 @@ export default {
     left: 0;
     z-index: 10;
     width: 100%;
-    border-radius: 10px;
+    border-radius: 0 0 10px 10px;
     background: var(--main);
     box-shadow: 0 10px 15px rgba(0, 0, 0, 0.2);
   }
+
+  .icon__wrapper {
+    width: 40px;
+    height: 40px;
+  }
 }
 </style>
diff --git a/src/components/appMain/invoice/openTransaction.vue b/src/components/appMain/invoice/openTransaction.vue
@@ -54,7 +54,7 @@
                     </div>
                   </div>
 
-                <div class="info__main" v-if="records.length > 0">
+                <div class="info__main" style="overflow-x: auto" v-if="records.length > 0">
                   <a-table row-key="uuid" :data-source="records" :columns="columns">
                     <template slot="date" slot-scope="text, record">
                       {{ date(record.exec) }}
@@ -70,8 +70,8 @@
                   </a-table>
                 </div>
 
-                <div class="info__main" v-if="invoice">
-                  <a-card v-if="invoice.meta.description" :title="$t('description') | capitalize">
+                <div class="info__main" v-if="invoice?.meta.description">
+                  <a-card :title="$t('description') | capitalize">
                     <div>{{ invoice.meta.description }}</div>
                   </a-card>
 
@@ -93,12 +93,10 @@
                   </a-card>
                 </div>
 
-                <div class="info__footer">
-                  <template v-if="invoice.exec == 0">
-                    <a-button class="info__button" :loading="isPayLoading" @click='payRequest'>
-                      {{ $t("Pay") }}
-                    </a-button>
-                  </template>
+                <div class="info__footer" v-if="invoice.exec == 0">
+                  <a-button class="info__button" :loading="isPayLoading" @click='payRequest'>
+                    {{ $t("Pay") }}
+                  </a-button>
                 </div>
               </div>
             </div>
@@ -391,7 +389,7 @@ export default {
 .info__date-value {
   font-weight: bold;
   font-size: 16px;
-  line-height: 10px;
+  line-height: 1.2;
   padding: 0;
 }
 

diff --git a/src/routes/login.vue b/src/routes/login.vue
@@ -116,7 +116,7 @@
             remember ? $t("forgotPass") : $t("I have a password") | capitalize
           }}</a>
         </div>
-        <div class="login__forgot">
+        <div class="login__forgot" style="margin-bottom: 30px">
           <router-link :to="{ name: 'register' }">{{
             $t("sign up") | capitalize
           }}</router-link>

diff --git a/src/routes/userService.vue b/src/routes/userService.vue
@@ -289,7 +289,7 @@ export default {
           case 'virtual': {
             domain.data.expiry = {
               expiredate: this.date(domain.data.last_monitoring ?? 0),
-              regdate: '0000-00-00'
+              regdate: domain.data.creation ?? '0000-00-00'
             };
             groupname = 'Custom';
             date = 'month';
@@ -298,7 +298,7 @@ export default {
           case 'goget': {
             domain.data.expiry = {
               expiredate: '0000-00-00',
-              regdate: '0000-00-00'
+              regdate: domain.data.creation ?? '0000-00-00'
             };
             groupname = 'SSL';
             date = 'month';
@@ -326,7 +326,7 @@ export default {
             };
             domain.data.expiry = {
               expiredate: domain.data.expires_at.split('T')[0],
-              regdate: '0000-00-00'
+              regdate: domain.data.creation ?? '0000-00-00'
             };
           }
         }

diff --git a/src/store/support.js b/src/store/support.js
@@ -99,7 +99,7 @@ export default {
 
     createTransport({ state, rootState }) {
       const transport = createGrpcWebTransport({
-        baseUrl: 'https://api.nocloud.ione-cloud.net/',
+        baseUrl: VUE_APP_BASE_URL,
         interceptors: [
           (next) => async (req) => {
             const { token } = rootState.nocloud.auth;