Show progress message in setup and restore

This commit is contained in:
Girish Ramakrishnan
2018-12-15 16:08:44 -08:00
parent 236f66f56f
commit 7c972758af
5 changed files with 8 additions and 3 deletions

View File

@@ -141,7 +141,7 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
if (!status.activated) { if (!status.activated) {
console.log('Not activated yet, redirecting', status); console.log('Not activated yet, redirecting', status);
if (status.restore.active || status.restore.errorMessage) { if (status.restore.active || status.restore.errorMessage) { // show the error message in restore page
window.location.href = '/restore.html'; window.location.href = '/restore.html';
} else { } else {
window.location.href = status.adminFqdn ? '/setup.html' : '/setupdns.html'; window.location.href = status.adminFqdn ? '/setup.html' : '/setupdns.html';

View File

@@ -16,6 +16,7 @@ app.controller('RestoreController', ['$scope', '$http', 'Client', function ($sco
$scope.busy = false; $scope.busy = false;
$scope.error = {}; $scope.error = {};
$scope.message = ''; // progress
$scope.provider = ''; $scope.provider = '';
$scope.bucket = ''; $scope.bucket = '';
$scope.prefix = ''; $scope.prefix = '';
@@ -205,6 +206,8 @@ app.controller('RestoreController', ['$scope', '$http', 'Client', function ($sco
return; return;
} }
$scope.message = status.restore.message;
setTimeout(waitForRestore, 5000); setTimeout(waitForRestore, 5000);
}); });
} }

View File

@@ -202,6 +202,8 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
return; return;
} }
$scope.message = status.setup.message;
setTimeout(waitForDnsSetup, 5000); setTimeout(waitForDnsSetup, 5000);
}); });
} }

View File

@@ -41,7 +41,7 @@
<div class="row"> <div class="row">
<div class="col-md-6 col-md-offset-3"> <div class="col-md-6 col-md-offset-3">
<i class="fa fa-circle-notch fa-spin fa-5x"></i><br/> <i class="fa fa-circle-notch fa-spin fa-5x"></i><br/>
<h3>Downloading backup</h3> <h3>{{ message }} ...</h3>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -44,7 +44,7 @@
<div class="row"> <div class="row">
<div class="col-md-6 col-md-offset-3"> <div class="col-md-6 col-md-offset-3">
<i class="fa fa-circle-notch fa-spin fa-5x"></i><br/> <i class="fa fa-circle-notch fa-spin fa-5x"></i><br/>
<h3>Waiting for domain and certificate setup</h3> <h3>{{ message }} ...</h3>
</div> </div>
</div> </div>
</div> </div>