From 64a56cb2ec32d2381071068a6e63704732c498e1 Mon Sep 17 00:00:00 2001
From: Git Repository <melser@macmediainc.com>
Date: Fri, 27 Apr 2018 23:28:47 -0700
Subject: [PATCH] Update VersionCheck Component
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Updated the version check component.

1) Line 25 (Version.vue) was checking for a boolean but a string is returned from VersionController.

2) Line 37 (VersionController.php) was returning “true” if the current version was less then latest version. The version component was only showing “There Is A Update Available” if the return data was false. This was not triggered if the current version is less then the available version Example v1.6 installed < v1.7 latest.
---
 .../Controllers/Staff/VersionController.php   |  7 +-
 resources/assets/js/components/Version.vue    | 85 +++++++++++--------
 2 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/app/Http/Controllers/Staff/VersionController.php b/app/Http/Controllers/Staff/VersionController.php
index 2771140502..92904d974b 100644
--- a/app/Http/Controllers/Staff/VersionController.php
+++ b/app/Http/Controllers/Staff/VersionController.php
@@ -34,6 +34,9 @@ public function checkVersion()
         $client = new Client();
         $response = json_decode($client->get('https://api.github.com/repos/HDInnovations/UNIT3D/releases')->getBody());
         $lastestVersion = $response[0]->tag_name;
-        return response(['updated' => version_compare($this->version, $lastestVersion, '<') ? 'true' : 'false']);
+        return response([
+            'updated' => version_compare($this->version, $lastestVersion, '<') ? 'false' : 'true',
+            'latestversion' => $lastestVersion
+        ]);
     }
-}
\ No newline at end of file
+}
diff --git a/resources/assets/js/components/Version.vue b/resources/assets/js/components/Version.vue
index 3e4790571a..270fafbe49 100644
--- a/resources/assets/js/components/Version.vue
+++ b/resources/assets/js/components/Version.vue
@@ -7,45 +7,56 @@
 </template>
 
 <script>
-  import Swal from 'sweetalert2'
+import Swal from "sweetalert2";
 
-  export default {
+export default {
+  data() {
+    return {
+      loading: false
+    };
+  },
 
-    data() {
-      return {
-        loading: false,
-      }
-    },
-
-    methods: {
-      checkUpdate() {
-        this.loading = true;
-        axios.get('/staff_dashboard/check-update')
-          .then((response) => {
-            if (response.data.updated === false) {
-              this.loading = false;
-              Swal({
-                position: 'center',
-                type: 'warning',
-                title: 'There Is A Update Available!',
-                showConfirmButton: false,
-                timer: 4500
-              })
-            } else {
-              this.loading = false;
-              Swal({
-                position: 'center',
-                type: 'success',
-                title: 'You Are Running The Latest Version Of UNIT3D!',
-                showConfirmButton: false,
-                timer: 4500
-              })
-            }
-          })
-          .catch((error) => {
-            Swal('Oops...', error.response.data, 'error')
-          })
-      },
+  methods: {
+    checkUpdate() {
+      this.loading = true;
+      axios
+        .get("/staff_dashboard/check-update")
+        .then(response => {
+          if (response.data.updated === "false") {
+            this.loading = false;
+            Swal({
+              position: "center",
+              type: "warning",
+              title: "There Is A Update Available!",
+              showCancelButton: true,
+              showConfirmButton: true,
+              confirmButtonText:
+                '<i class="fa fa-github"></i> Download from Github',
+              html: `New version <a href="//github.com/HDInnovations/UNIT3D/releases">v${
+                response.data.latestversion
+              } </a> is available`
+            }).then(result => {
+              if (result.value) {
+                window.location.assign(
+                  "//github.com/HDInnovations/UNIT3D/releases"
+                );
+              }
+            });
+          } else {
+            this.loading = false;
+            Swal({
+              position: "center",
+              type: "success",
+              title: "You Are Running The Latest Version Of UNIT3D!",
+              showCancelButton: false,
+              timer: 4500
+            });
+          }
+        })
+        .catch(error => {
+          Swal("Oops...", error.response.data, "error");
+        });
     }
   }
+};
 </script>
\ No newline at end of file