Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into namespace-changes

resources/assets/js/plugins/en.js

@@ -668,8 +668,13 @@ export default {
     },
     update_app: {
       title: 'Update App',
-      description: 'update app description',
+      description: 'You can easily update Crater by checking for a new update by clicking the button below',
-      update: 'Update'
+      check_update: 'Check for updates',
+      avail_update: 'New Update available',
+      next_version: 'Next version',
+      update: 'Update',
+      update_progress: 'Update in progress...',
+      progress_text: 'It will just take a few minutes. Please do not refresh the screen or close the window before the update finishes'
     }
   },
   wizard: {

resources/assets/js/views/settings/UpdateApp.vue

@@ -6,50 +6,89 @@
         <p class="page-sub-title">
           {{ $t('settings.update_app.description') }}
         </p>
-        <base-button size="large" icon="sync-alt" color="theme" @click="onUpdateApp">
+        <label class="input-label">Current version</label><br>
-          {{ $t('settings.update_app.update') }}
+        <label class="version">1.0.0</label>
+        <base-button :outline="true" size="large" color="theme" @click="checkUpdate">
+          <font-awesome-icon :class="{'update': isUpdateAvail}" style="margin-right: 5px;" icon="sync-alt" />
+          {{ $t('settings.update_app.check_update') }}
         </base-button>
-        <div v-if="isShowProgressBar" class="progress mt-4">
+        <hr>
-          <div
+        <div class="mt-4 content">
-            :style="[{'width': progress+'%'}]"
+          <h3 class="page-title">{{ $t('settings.update_app.avail_update') }}</h3>
-            class="progress-bar progress-bar-striped progress-bar-animated"
+          <label class="input-label">{{ $t('settings.update_app.next_version') }}</label><br>
-            role="progressbar"
+          <label class="version">{{ updateData.version }}</label>
-            aria-valuenow="0"
+          <p class="page-sub-title">
-            aria-valuemin="0"
+            {{ description }}
-            aria-valuemax="100"
+          </p>
-          />
+          <base-button size="large" color="theme" @click="onUpdateApp">
+            {{ $t('settings.update_app.update') }}
+          </base-button>
         </div>
+        <!-- <div>
+          <h3 class="page-title">{{ $t('settings.update_app.update_progress') }}</h3>
+          <p class="page-sub-title">
+            {{ $t('settings.update_app.progress_text') }}
+          </p>
+          <font-awesome-icon icon="spinner" class="fa-spin"/>
+        </div> -->
       </div>
     </div>
   </div>
 </template>
 <script>
-
+import { mapActions, mapGetters } from 'vuex'
 export default {
   data () {
     return {
       isShowProgressBar: false,
+      isUpdateAvail: false,
       progress: 10,
-      interval: null
+      interval: null,
+      description: '',
+      updateData: {
+        isMinor: Boolean,
+        installed: '',
+        version: ''
+      }
     }
   },
+  computed: {
+  },
   watch: {
   },
   mounted () {
   },
   methods: {
-    onUpdateApp () {
+    async onUpdateApp () {
-      this.isShowProgressBar = true
+      const data = this.updateData
-      this.interval = setInterval(() => {
+      let response = await axios.post('/api/update', data)
-        if (this.progress >= 100) {
+      console.log(response.data)
-          clearInterval(this.interval)
+    },
-          setTimeout(() => {
+    async checkUpdate () {
-            this.isShowProgressBar = false
+      let response = await axios.get('/api/check/update')
-          }, 1000)
+      console.log(response.data)
-        }
+      if (response.data) {
-        this.progress += 10
+        this.updateData.isMinor = response.data.is_minor
-      }, 250)
+        this.updateData.version = response.data.version.version
+        this.updateData.description = response.data.version.description
+      }
     }
   }
 }
 </script>
+
+<style scoped>
+.update {
+  transform: rotate(360deg);
+  animation: rotating 1s linear infinite;
+}
+
+@keyframes rotating {
+  0% {
+    transform: rotate(0);
+  }
+  100% {
+    transform: rotate(360deg);
+  }
+}
+</style>

resources/assets/sass/pages/settings.scss

@@ -150,6 +150,15 @@
             overflow: hidden;
         }
     }
+
+    .version {
+        background: #EAF1FB;
+        border: 1px solid #EAF1FB;
+        box-sizing: border-box;
+        border-radius: 5px;
+        padding: 10px;
+        margin-bottom: 15px;
+    }
 }
 
 @media(max-width: $x-small-breakpoint ) {

resources/views/app/pdf/estimate/estimate1.blade.php

@@ -35,7 +35,7 @@
             width: 100%;
             height: 90px;
             left: 0px;
-            top: 0px;
+            top: -50px;
         }
 
         .header-logo {
@@ -69,10 +69,15 @@
             color: rgba(0, 0, 0, 0.5);
         }
 
+        @page {
+            margin-top: 60px !important;
+        }
+
         .wrapper {
            display: block;
-           padding-top: 60px;
+           margin-top: 0px;
-           padding-bottom: 60px;
+           padding-top: 16px;
+           padding-bottom: 20px;
         }
 
         .address {
@@ -343,6 +348,7 @@
             margin-left: 30px;
             width: 442px;
             text-align: left;
+            page-break-inside: avoid;
         }
 
         .notes-label {
@@ -375,8 +381,8 @@
                 </td>
             </tr>
         </table>
+        <hr class="header-line" style="border: 0.620315px solid #E8E8E8;" />
     </div>
-    <hr class="header-line" />
     <div class="wrapper">
         <div class="address">
             <div class="company">
@@ -413,7 +419,9 @@
             </div>
             <div style="clear: both;"></div>
         </div>
-        @include('app.pdf.estimate.partials.table')
+        <div style="position:relative">
+            @include('app.pdf.estimate.partials.table')
+        </div>
         @include('app.pdf.estimate.partials.notes')
     </div>
 </body>

resources/views/app/pdf/estimate/estimate2.blade.php

@@ -23,15 +23,17 @@
             display:inline-block;
             width:30%;
         }
+
+        @page {
+            margin-top: 60px !important;
+        }
         .header-table {
             background: #817AE3;
             position: absolute;
             width: 100%;
             height: 141px;
             left: 0px;
-            top: 0px;
+            top: -60px;
-
-
         }
         .header-logo {
             position: absolute;
@@ -73,8 +75,8 @@
 
         .wrapper {
            display: block;
-           padding-top: 110px;
+           margin-top: 60px;
-           padding-bottom: 60px;
+           padding-bottom: 20px;
         }
 
         .address {
@@ -371,6 +373,7 @@
             margin-left: 30px;
             width: 442px;
             text-align: left;
+            page-break-inside: avoid;
         }
 
         .notes-label {

resources/views/app/pdf/estimate/estimate3.blade.php

@@ -19,7 +19,7 @@
         hr {
             color:rgba(0, 0, 0, 0.2);
             position: absolute;
-            top: 140px;
+            top: 80px;
             left: 0px;
             right: -70px;
             width: 100%;
@@ -37,9 +37,7 @@
             width: 100%;
             height: 150px;
             left: 0px;
-            top: 0px;
+            top: -60px;
-
-
         }
         .header-logo {
             position: absolute;
@@ -77,10 +75,14 @@
             color: rgba(0, 0, 0, 0.5);
         }
 
+        @page {
+            margin-top: 60px !important;
+        }
+
         .wrapper {
            display: block;
-           padding-top: 110px;
+           padding-top: 50px;
-           padding-bottom: 60px;
+           padding-bottom: 20px;
         }
 
         .address {
@@ -379,6 +381,7 @@
             margin-left: 30px;
             width: 442px;
             text-align: left;
+            page-break-inside: avoid;
         }
 
         .notes-label {
@@ -416,7 +419,7 @@
             </tr>
         </table>
     </div>
-    <hr>
+    <hr style="border: 0.620315px solid #E8E8E8;">
     <div class="wrapper">
         <div class="address">
             <div class="bill-add">

resources/views/app/pdf/invoice/invoice1.blade.php

@@ -70,10 +70,15 @@
             color: rgba(0, 0, 0, 0.5);
         }
 
+        @page {
+            margin-top: 60px !important;
+        }
+
         .wrapper {
            display: block;
+           margin-top: 0px;
            padding-top: 16px;
-           padding-bottom: 60px;
+           padding-bottom: 20px;
         }
 
         .address {
@@ -350,6 +355,7 @@
             margin-left: 30px;
             width: 442px;
             text-align: left;
+            page-break-inside: avoid;
         }
 
         .notes-label {

resources/views/app/pdf/invoice/invoice2.blade.php

@@ -23,15 +23,16 @@
             display:inline-block;
             width:30%;
         }
+        @page {
+            margin-top: 60px !important;
+        }
         .header-table {
             background: #817AE3;
             position: absolute;
             width: 100%;
             height: 141px;
             left: 0px;
-            top: 0px;
+            top: -60px;
-
-
         }
         .header-logo {
             position: absolute;
@@ -73,8 +74,8 @@
 
         .wrapper {
            display: block;
-           padding-top: 110px;
+           margin-top: 60px;
-           padding-bottom: 60px;
+           padding-bottom: 20px;
         }
 
         .address {
@@ -381,6 +382,7 @@
             margin-left: 30px;
             width: 442px;
             text-align: left;
+            page-break-inside: avoid;
         }
 
         .notes-label {

resources/views/app/pdf/invoice/invoice3.blade.php

@@ -19,7 +19,7 @@
         hr {
             color:rgba(0, 0, 0, 0.2);
             position: absolute;
-            top: 140px;
+            top: 80px;
             left: 0px;
             right: -70px;
             width: 100%;
@@ -37,9 +37,7 @@
             width: 100%;
             height: 150px;
             left: 0px;
-            top: 0px;
+            top: -60px;
-
-
         }
         .header-logo {
             position: absolute;
@@ -77,10 +75,13 @@
             color: rgba(0, 0, 0, 0.5);
         }
 
+        @page {
+            margin-top: 60px !important;
+        }
         .wrapper {
            display: block;
-           padding-top: 110px;
+           padding-top: 50px;
-           padding-bottom: 60px;
+           padding-bottom: 20px;
         }
 
         .address {
@@ -390,6 +391,7 @@
             margin-left: 30px;
             width: 442px;
             text-align: left;
+            page-break-inside: avoid;
         }
 
         .notes-label {
@@ -427,7 +429,7 @@
             </tr>
         </table>
     </div>
-    <hr>
+    <hr style="border: 0.620315px solid #E8E8E8;">
     <div class="wrapper">
         <div class="address">
             <div class="bill-add">