merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

issue #546

This commit is contained in:
rahul shukla 2019-02-12 16:17:29 +05:30
parent e824f4741b
commit 024e78540e
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
public/installer/Migration.php
View File

@ -69,12 +69,12 @@
<div class="content" id="migration-result"> <div class="content" id="migration-result">
<div class="window" id="migrate"> <div class="window" id="migrate">
</div> </div>
<div class="window" id="key">
</div>
<div class="window" id="seed"> <div class="window" id="seed">
</div> </div>
<div class="window" id="publish"> <div class="window" id="publish">
</div> </div>
<div class="window" id="storage">
</div>
<div class="window" id="composer"> <div class="window" id="composer">
</div> </div>
@ -194,11 +194,11 @@
if (data['publish']) { if (data['publish']) {
$('#publish').append('<div class="terminal">' + data['publish'] + '</div>'); $('#publish').append('<div class="terminal">' + data['publish'] + '</div>');
} }
if (data['storage']) { if (data['key']) {
$('#storage').append('<div class="terminal">' + data['storage'] + '</div>'); $('#key').append('<div class="terminal">' + data['key'] + '</div>');
} }
if ((data['key_results'] == 0) && (data['seeder_results'] == 0) && (data['publish_results'] == 0) && (data['storage_results'] == 0)) { if ((data['key_results'] == 0) && (data['seeder_results'] == 0) && (data['publish_results'] == 0)) {
$('#continue').show(); $('#continue').show();
$('#migrate-seed').hide(); $('#migrate-seed').hide();
$('#loader').hide(); $('#loader').hide();
@ -207,6 +207,7 @@
} else { } else {
$('#migrate').show(); $('#migrate').show();
$('#loader').hide();
$('#migrate-seed').show(); $('#migrate-seed').show();
$('#migration-back').show(); $('#migration-back').show();
if (data['migrate']) { if (data['migrate']) {
@ -232,10 +233,3 @@
}); });
</script> </script>

4
public/installer/Seeder.php
View File

@ -1,17 +1,15 @@
<?php <?php
// array to pass back data // array to pass back data
$data = array(); $data = array();
// run command on terminal // run command on terminal
$key = 'cd ../.. && php artisan key:generate 2>&1'; $key = 'cd ../.. && php artisan key:generate 2>&1';
$seeder = 'cd ../.. && php artisan db:seed 2>&1'; $seeder = 'cd ../.. && php artisan db:seed 2>&1';
$storage = 'cd ../.. && php artisan storage:link 2>&1';
$publish = 'cd ../.. && php artisan vendor:publish 2>&1'; $publish = 'cd ../.. && php artisan vendor:publish 2>&1';
$key_output = exec($key, $data['key'], $data['key_results']); $key_output = exec($key, $data['key'], $data['key_results']);
$seeder_output = exec($seeder, $data['seeder'], $data['seeder_results']); $seeder_output = exec($seeder, $data['seeder'], $data['seeder_results']);
$storage_output = exec($storage, $data['storage'], $data['storage_results']);
$publish = exec($publish, $data['publish'], $data['publish_results']); $publish = exec($publish, $data['publish'], $data['publish_results']);
// return a response // return a response

2
public/installer/index.php
View File

@ -82,6 +82,8 @@
echo $requirement->render(); echo $requirement->render();
echo $permission->render(); echo $permission->render();
echo $welcome->render(); echo $welcome->render();
$storage_output = exec('cd ../.. && php artisan storage:link 2>&1');
} else { } else {
// getting url // getting url
$actual_link = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"; $actual_link = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";