From f45d0bb31764c54f545eb3f3c3cdee3afe27ca18 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 11 Mar 2018 18:46:18 +0100
Subject: [PATCH] Expand install routine.

---
 public/js/ff/install/index.js      | 16 ++++++++++++++--
 resources/views/install/index.twig |  1 +
 routes/web.php                     |  1 +
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/public/js/ff/install/index.js b/public/js/ff/install/index.js
index 22b8575918..ac3f5e34b3 100644
--- a/public/js/ff/install/index.js
+++ b/public/js/ff/install/index.js
@@ -53,17 +53,29 @@ function startPassport() {
 function startUpgrade() {
     $('#status-box').html('<i class="fa fa-spin fa-spinner"></i> Upgrading database...');
     $.post(upgradeUri, {_token: token}).done(function () {
-        completeDone();
+        startVerify();
     }).fail(function () {
         $('#status-box').html('<i class="fa fa-warning"></i> Upgrade failed! See log files :(');
     });
 }
 
+/**
+ *
+ */
+function startVerify() {
+    $('#status-box').html('<i class="fa fa-spin fa-spinner"></i> Verify database integrity...');
+    $.post(verifyUri, {_token: token}).done(function () {
+        completeDone();
+    }).fail(function () {
+        $('#status-box').html('<i class="fa fa-warning"></i> Verification failed! See log files :(');
+    });
+}
+
 /**
  *
  */
 function completeDone() {
-    $('#status-box').html('<i class="fa fa-thumbs-up"></i> Installation complete! Wait to be redirected...');
+    $('#status-box').html('<i class="fa fa-thumbs-up"></i> Installation + upgrade complete! Wait to be redirected...');
     setTimeout(function () {
         window.location = homeUri;
     }, 3000);
diff --git a/resources/views/install/index.twig b/resources/views/install/index.twig
index e913abb5d8..38acf4a3e1 100644
--- a/resources/views/install/index.twig
+++ b/resources/views/install/index.twig
@@ -18,6 +18,7 @@
         var migrateUri = '{{ route('installer.migrate') }}';
         var keysUri = '{{ route('installer.keys') }}';
         var upgradeUri = '{{ route('installer.upgrade') }}';
+        var verifyUri = '{{ route('installer.verify') }}';
         var homeUri = '{{ route('home') }}';
     </script>
     <script type="text/javascript" src="js/ff/install/index.js"></script>
diff --git a/routes/web.php b/routes/web.php
index 23e38b188d..a53e147996 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -29,6 +29,7 @@ Route::group(
     Route::post('migrate', ['uses' => 'InstallController@migrate', 'as' => 'migrate']);
     Route::post('keys', ['uses' => 'InstallController@keys', 'as' => 'keys']);
     Route::post('upgrade', ['uses' => 'InstallController@upgrade', 'as' => 'upgrade']);
+    Route::post('verify', ['uses' => 'InstallController@verify', 'as' => 'verify']);
 }
 );