kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-19 19:01:58 +00:00
Code Issues Projects Releases Wiki Activity

Expand install routine.

Browse Source
This commit is contained in:
James Cole
2018-03-11 18:46:18 +01:00
parent 93aa5b7753
commit f45d0bb317
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
public/js/ff/install/index.js vendored
View File

@@ -53,17 +53,29 @@ function startPassport() {
function startUpgrade() { function startUpgrade() {
$('#status-box').html('<i class="fa fa-spin fa-spinner"></i> Upgrading database...'); $('#status-box').html('<i class="fa fa-spin fa-spinner"></i> Upgrading database...');
$.post(upgradeUri, {_token: token}).done(function () { $.post(upgradeUri, {_token: token}).done(function () {
completeDone(); startVerify();
}).fail(function () { }).fail(function () {
$('#status-box').html('<i class="fa fa-warning"></i> Upgrade failed! See log files :('); $('#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() { 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 () { setTimeout(function () {
window.location = homeUri; window.location = homeUri;
}, 3000); }, 3000);

1
resources/views/install/index.twig
View File

@@ -18,6 +18,7 @@
var migrateUri = '{{ route('installer.migrate') }}'; var migrateUri = '{{ route('installer.migrate') }}';
var keysUri = '{{ route('installer.keys') }}'; var keysUri = '{{ route('installer.keys') }}';
var upgradeUri = '{{ route('installer.upgrade') }}'; var upgradeUri = '{{ route('installer.upgrade') }}';
var verifyUri = '{{ route('installer.verify') }}';
var homeUri = '{{ route('home') }}'; var homeUri = '{{ route('home') }}';
</script> </script>
<script type="text/javascript" src="js/ff/install/index.js"></script> <script type="text/javascript" src="js/ff/install/index.js"></script>

1
routes/web.php
View File

@@ -29,6 +29,7 @@ Route::group(
Route::post('migrate', ['uses' => 'InstallController@migrate', 'as' => 'migrate']); Route::post('migrate', ['uses' => 'InstallController@migrate', 'as' => 'migrate']);
Route::post('keys', ['uses' => 'InstallController@keys', 'as' => 'keys']); Route::post('keys', ['uses' => 'InstallController@keys', 'as' => 'keys']);
Route::post('upgrade', ['uses' => 'InstallController@upgrade', 'as' => 'upgrade']); Route::post('upgrade', ['uses' => 'InstallController@upgrade', 'as' => 'upgrade']);
Route::post('verify', ['uses' => 'InstallController@verify', 'as' => 'verify']);
} }
); );