From 61a7aea0cd71577e267f676a042fb70c43e51f35 Mon Sep 17 00:00:00 2001
From: Mohit Panjwani <mohit.panjvani@gmail.com>
Date: Sat, 16 Nov 2019 12:41:46 +0530
Subject: [PATCH 1/4] fix version compare check on listner.php

---
 app/Listeners/Updates/Listener.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Listeners/Updates/Listener.php b/app/Listeners/Updates/Listener.php
index 0d149c4f..4e44d98c 100644
--- a/app/Listeners/Updates/Listener.php
+++ b/app/Listeners/Updates/Listener.php
@@ -15,10 +15,10 @@ class Listener
     protected function check($event)
     {
         // Do not apply to the same or newer versions
-        if (version_compare($event->old, static::VERSION, '>=')) {
-            return false;
+        if (version_compare(static::VERSION, $event->old, '>')) {
+            return true;
         }
 
-        return true;
+        return false;
     }
 }

From 2a0c6932ca08705cd4a33b9005d31ff9eddade99 Mon Sep 17 00:00:00 2001
From: Mohit Panjwani <mohit.panjvani@gmail.com>
Date: Sat, 16 Nov 2019 13:27:37 +0530
Subject: [PATCH 2/4] fix update-app screen spacing and alerts

---
 app/Space/Updater.php                         |  6 +--
 resources/assets/js/plugins/en.js             |  6 ++-
 .../assets/js/views/settings/UpdateApp.vue    | 49 +++++++++++++------
 .../assets/plugins/vue-font-awesome/index.js  |  6 ++-
 4 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/app/Space/Updater.php b/app/Space/Updater.php
index 83f8add3..f2de65c8 100644
--- a/app/Space/Updater.php
+++ b/app/Space/Updater.php
@@ -26,7 +26,7 @@ class Updater
         if ($response instanceof RequestException) {
             return [
                 'success' => false,
-                'errors' => 'Download Exception',
+                'error' => 'Download Exception',
                 'data' => [
                     'path' => $path
                 ]
@@ -84,13 +84,13 @@ class Updater
 
             return [
                 'success' => true,
-                'errors' => false,
+                'error' => false,
                 'data' => []
             ];
         } catch (\Exception $e) {
             return [
                 'success' => false,
-                'errors' => 'Update error',
+                'error' => 'Update error',
                 'data' => []
             ];
         }
diff --git a/resources/assets/js/plugins/en.js b/resources/assets/js/plugins/en.js
index dcbf2166..7eb954e8 100644
--- a/resources/assets/js/plugins/en.js
+++ b/resources/assets/js/plugins/en.js
@@ -672,9 +672,11 @@ export default {
       check_update: 'Check for updates',
       avail_update: 'New Update available',
       next_version: 'Next version',
-      update: 'Update',
+      update: 'Update Now',
       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'
+      progress_text: 'It will just take a few minutes. Please do not refresh the screen or close the window before the update finishes',
+      update_success: 'App has been updated successfully',
+      latest_message: 'No update available! You are on the latest version.'
     }
   },
   wizard: {
diff --git a/resources/assets/js/views/settings/UpdateApp.vue b/resources/assets/js/views/settings/UpdateApp.vue
index 0ea5349c..7bb07b3d 100644
--- a/resources/assets/js/views/settings/UpdateApp.vue
+++ b/resources/assets/js/views/settings/UpdateApp.vue
@@ -7,24 +7,24 @@
           {{ $t('settings.update_app.description') }}
         </p>
         <label class="input-label">Current version</label><br>
-        <label class="version">1.0.0</label>
-        <base-button :outline="true" :disabled="isCheckingforUpdate" size="large" color="theme" @click="checkUpdate" >
+        <label class="version mb-4">{{ currentVersion }}</label>
+        <base-button :outline="true" :disabled="isCheckingforUpdate || isUpdating" size="large" color="theme" @click="checkUpdate" class="mb-4">
           <font-awesome-icon :class="{'update': isCheckingforUpdate}" style="margin-right: 10px;" icon="sync-alt" />
           {{ $t('settings.update_app.check_update') }}
         </base-button>
         <hr>
         <div v-show="!isUpdating" v-if="isUpdateAvailable" class="mt-4 content">
-          <h3 class="page-title">{{ $t('settings.update_app.avail_update') }}</h3>
+          <h3 class="page-title mb-3">{{ $t('settings.update_app.avail_update') }}</h3>
           <label class="input-label">{{ $t('settings.update_app.next_version') }}</label><br>
           <label class="version">{{ updateData.version }}</label>
           <p class="page-sub-title">
             {{ description }}
           </p>
-          <base-button size="large" color="theme" @click="onUpdateApp">
+          <base-button size="large" icon="rocket" color="theme" @click="onUpdateApp">
             {{ $t('settings.update_app.update') }}
           </base-button>
         </div>
-        <div v-if="isUpdating">
+        <div v-if="isUpdating" class="mt-4 content">
           <h3 class="page-title">{{ $t('settings.update_app.update_progress') }}</h3>
           <p class="page-sub-title">
             {{ $t('settings.update_app.progress_text') }}
@@ -35,8 +35,8 @@
     </div>
   </div>
 </template>
+
 <script>
-import { mapActions, mapGetters } from 'vuex'
 export default {
   data () {
     return {
@@ -47,6 +47,7 @@ export default {
       progress: 10,
       interval: null,
       description: '',
+      currentVersion: '',
       updateData: {
         isMinor: Boolean,
         installed: '',
@@ -54,26 +55,44 @@ export default {
       }
     }
   },
-  computed: {
-  },
-  watch: {
-  },
+
   mounted () {
+    window.axios.get('/api/settings/app/version').then((res) => {
+      this.currentVersion = res.data.version
+    })
   },
   methods: {
     async onUpdateApp () {
-      this.isUpdating = true
-      const data = this.updateData
-      let response = await axios.post('/api/update', data)
+      try {
+        this.isUpdating = true
+        let res = await window.axios.post('/api/update', this.updateData)
+        if (res.data.success) {
+          this.isUpdateAvailable = false
+          window.toastr['success'](this.$t('settings.update_app.update_success'))
+          this.currentVersion = this.updateData.version
+        } else {
+          console.log(res.data)
+          window.toastr['error'](res.data.error)
+        }
+      } catch (e) {
+        console.log(e)
+        window.toastr['error']('Something went wrong')
+      }
+
       this.isUpdating = false
-      this.isUpdateAvailable = false
     },
     async checkUpdate () {
       try {
         this.isCheckingforUpdate = true
-        let response = await axios.get('/api/check/update')
+        let response = await window.axios.get('/api/check/update')
         this.isCheckingforUpdate = false
 
+        if (!response.data.version) {
+          window.toastr['warning'](this.$t('settings.update_app.latest_message'))
+
+          return
+        }
+
         if (response.data) {
           this.updateData.isMinor = response.data.is_minor
           this.updateData.version = response.data.version
diff --git a/resources/assets/plugins/vue-font-awesome/index.js b/resources/assets/plugins/vue-font-awesome/index.js
index 3de7d44e..8443e7a2 100644
--- a/resources/assets/plugins/vue-font-awesome/index.js
+++ b/resources/assets/plugins/vue-font-awesome/index.js
@@ -52,7 +52,8 @@ import {
   faCopy,
   faPaperPlane,
   faEyeSlash,
-  faSyncAlt
+  faSyncAlt,
+  faRocket
 } from '@fortawesome/free-solid-svg-icons'
 import { far } from '@fortawesome/free-regular-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
@@ -115,7 +116,8 @@ library.add(
   faEllipsisH,
   faCopy,
   faPaperPlane,
-  faSyncAlt
+  faSyncAlt,
+  faRocket
 )
 
 Vue.component('font-awesome-icon', FontAwesomeIcon)

From 6df6cf498b956d0eb35a92a22f6bf45dcfc4e759 Mon Sep 17 00:00:00 2001
From: Mohit Panjwani <mohit.panjvani@gmail.com>
Date: Sat, 16 Nov 2019 13:42:26 +0530
Subject: [PATCH 3/4] fix update-app

---
 resources/assets/js/views/settings/UpdateApp.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/resources/assets/js/views/settings/UpdateApp.vue b/resources/assets/js/views/settings/UpdateApp.vue
index 7bb07b3d..323e09ae 100644
--- a/resources/assets/js/views/settings/UpdateApp.vue
+++ b/resources/assets/js/views/settings/UpdateApp.vue
@@ -65,7 +65,9 @@ export default {
     async onUpdateApp () {
       try {
         this.isUpdating = true
+        this.updateData.installed = this.currentVersion
         let res = await window.axios.post('/api/update', this.updateData)
+
         if (res.data.success) {
           this.isUpdateAvailable = false
           window.toastr['success'](this.$t('settings.update_app.update_success'))
@@ -95,7 +97,7 @@ export default {
 
         if (response.data) {
           this.updateData.isMinor = response.data.is_minor
-          this.updateData.version = response.data.version
+          this.updateData.version = response.data.version.version
           this.description = response.data.description
           this.isUpdateAvailable = true
         }

From cb2fc18d5539aadc7f67ae313864523f865fdba3 Mon Sep 17 00:00:00 2001
From: Mohit Panjwani <mohit.panjvani@gmail.com>
Date: Sat, 16 Nov 2019 14:11:24 +0530
Subject: [PATCH 4/4] update default wizard step to first

---
 resources/assets/js/views/wizard/Index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/assets/js/views/wizard/Index.vue b/resources/assets/js/views/wizard/Index.vue
index ecdedccd..8200c251 100644
--- a/resources/assets/js/views/wizard/Index.vue
+++ b/resources/assets/js/views/wizard/Index.vue
@@ -67,8 +67,8 @@ export default {
   data () {
     return {
       loading: false,
-      tab: 'step_3',
-      step: 3
+      tab: 'step_1',
+      step: 1
     }
   },
   created () {