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

fixed #2163

This commit is contained in:
ghermans 2020-02-19 01:31:23 +01:00
parent d570aaf0b3
commit ee45ebd680
9 changed files with 148 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
public/installer/CSS/style.css vendored
View File

@ -9,12 +9,10 @@ body {
height: 100%;
}
a {
color: rgb(0, 65, 255);
}
a { color: rgb(0, 65, 255); text-decoration: none;}
.initial-display{
padding-top: 30px;
padding-top: 50px;
}
.initial-display .logo {
@ -26,7 +24,7 @@ a {
color: #333333;
text-align: center;
font-weight: 600;
margin-top: 50px;
margin-top: 30px;
}
.prepare-btn {
@ -42,6 +40,10 @@ a {
margin-top: 20px;
}
.warning {
margin-left: 15%;
}
.footer {
bottom: 0;
position: absolute;
@ -62,12 +64,76 @@ a {
}
.content {
border-radius: 3px;
box-shadow: 0 10px 40px rgba(62, 85, 120, 0.45);
width: 650px;
border-radius: 5px;
box-shadow: 1px 8px 18px rgba(62, 85, 120, 0.45);
min-height: 300px;
width: 600px;
margin-left: calc(50% - 300px);
text-align: left;
overflow:auto;
overflow-y: auto;
}
.requirements_list {
width: 90%;
list-style: none;
margin-left: 5%;
padding:0;
}
.requirements_list li {
padding: 0 8px 8px;
margin-bottom: 8px;
border-bottom: 1px dashed #dcdcdc;
line-height: normal;
}
.requirements_list li:last-child { border-bottom: 0;}
.requirements_list small {
font-size: 13px;
color:#9b9b9b;
}
.content .cp-round {
position: auto !important;
}
.content .cp-round:before {
border-radius: 50%;
content: " ";
width: 48px;
height: 48px;
display: inline-block;
box-sizing: border-box;
border-top: solid 6px #bababa;
border-right: solid 6px #bababa;
border-bottom: solid 6px #bababa;
border-left: solid 6px #bababa;
position: absolute;
top: calc(40% - 14px);
left: calc(50% - 24px);
}
.content .cp-round:after {
border-radius: 50%;
content: " ";
width: 48px;
height: 48px;
display: inline-block;
box-sizing: border-box;
border-top: solid 6px #0041FF;
border-right: solid 6px #bababa;
border-bottom: solid 6px #bababa;
border-left: solid 6px #bababa;
position: absolute;
top: calc(40% - 14px);
left: calc(50% - 24px);
animation: spin 1s ease-in-out infinite;
}
@keyframes spin {
0% { transform: rotate(0deg); }
100% { transform: rotate(360deg); }
}
.title {
@ -92,7 +158,7 @@ span {
.control-group {
display: block;
margin-bottom: 15px;
margin-bottom: 25px;
font-size: 15px;
color: #333333;
width: 750px;
@ -146,46 +212,9 @@ pre.bash {
height: 100%;
}
.cp-round:before {
border-radius: 50%;
content: " ";
width: 48px;
height: 48px;
display: inline-block;
box-sizing: border-box;
border-top: solid 6px #bababa;
border-right: solid 6px #bababa;
border-bottom: solid 6px #bababa;
border-left: solid 6px #bababa;
position: absolute;
top: calc(50% - 24px);
left: calc(50% - 24px);
}
.check {
line-height: 35px;
}
.cp-round:after {
border-radius: 50%;
content: " ";
width: 48px;
height: 48px;
display: inline-block;
box-sizing: border-box;
border-top: solid 6px #0041FF;
border-right: solid 6px #bababa;
border-bottom: solid 6px #bababa;
border-left: solid 6px #bababa;
position: absolute;
top: calc(50% - 24px);
left: calc(50% - 24px);
animation: spin 1s ease-in-out infinite;
}
@keyframes spin {
0% { transform: rotate(0deg); }
100% { transform: rotate(360deg); }
margin-left: 25%;
}
.composer {
@ -198,19 +227,22 @@ pre.bash {
padding-left: 140px;
}
@media (max-width: 900px) {
@media (min-width: 1281px) {
.content {
padding: 2rem 0;
}
.content {
width: 90%;
height: 350px !important;
margin: 30px auto;
max-height: 484px;
margin: 20px auto;
}
}
@media (min-width: 720px) {
@media (min-width: 768px) and (max-width: 1024px) and (orientation: landscape) {
.initial-display{
padding-top: 15px;
}
.content {
padding: 1rem 0;
}
@ -219,4 +251,8 @@ pre.bash {
max-height: 488px;
margin: 30px auto;
}
.initial-display p {
margin-top: 4px;
}
}

2
public/installer/Classes/Requirement.php
View File

@ -134,7 +134,7 @@ class Requirement {
$data['composer_install'] = 0;
} else {
$data['composer_install'] = 1;
$data['composer'] = 'Composer dependencies is not Installed.Go to root of project, run "composer install" command to install composer dependencies & refresh page again.';
$data['composer'] = 'Bagisto has detected that the required composer dependencies are not installed.<br />Go to the root directory of Bagisto and run "composer install".';
}
return $data;

3
public/installer/Composer.php
View File

@ -1,7 +1,6 @@
<?php
$data = array();
$data = array();
$data['install'] = 0;
echo json_encode($data);

5
public/installer/Email.php
View File

@ -19,7 +19,6 @@
<div class="control-group" id="mail_encryption">
<label for="mail_encryption">Encryption</label>
<select name="mail_encryption" class="control">
<option value="none">None</option>
<option value="ssl">SSL</option>
<option value="tls">TLS</option>
</select>
@ -90,12 +89,12 @@
$('#mail_port').addClass('has-error');
$('#mail_port').append('<div class="form-error">' + data.errors.mail_port + '</div>');
}
/*
if (data.errors.mail_encryption) {
$('#mail_encryption').addClass('has-error');
$('#mail_encryption').append('<div class="form-error">' + data.errors.mail_encryption + '</div>');
}
*/
if (data.errors.mail_from) {
$('#mail_from').addClass('has-error');
$('#mail_from').append('<div class="form-error">' + data.errors.mail_from + '</div>');

2
public/installer/Environment.php
View File

@ -10,7 +10,7 @@
<div class="content">
<div class="databse-error" style="text-align: center; padding-top: 5px" id="database_error">
</div>
<div class="form-container" style="padding: 10%; padding-top: 3px">
<div class="form-container" style="padding: 10%; padding-top: 10px">
<div class="control-group" id="app_name">
<label for="app_name" class="required">App Name</label>
<input type = "text" name = "app_name" class = "control"

9
public/installer/JS/script
View File

@ -11,6 +11,8 @@
var welcomeCheck = document.getElementById('welcome-check');
var requirementCheck = document.getElementById('requirement-check');
var requirementsRefresh = document.getElementById('requirements-refresh');
var permisssionCheck = document.getElementById('permission-check');
var environmentCheck = document.getElementById('environment-check');
var continue_to_admin = document.getElementById('continue');
@ -24,6 +26,10 @@
requirementCheck.addEventListener('click', myFunction);
}
if (requirementsRefresh) {
requirementsRefresh.addEventListener('click', myFunction);
}
if (welcomeCheck) {
welcomeCheck.addEventListener('click', myFunction);
}
@ -56,7 +62,6 @@
migrationBack.addEventListener('click', myFunction);
}
function myFunction() {
if(this.id == 'welcome-check') {
requirement.style.display = "block";
@ -76,6 +81,8 @@
} else if (this.id == 'migration-back') {
migration.style.display = "none";
environment.style.display ="block";
} else if (this.id == 'requirements-refresh') {
location.reload();
}
}
};

4
public/installer/Migration.php
View File

@ -56,10 +56,8 @@
<div class="initial-display">
<p>Migration & Seed</p>
<div class="cp-spinner cp-round" id="loader">
</div>
<div class="content" id="migration-result">
<div class="cp-spinner cp-round" id="loader"></div>
<div class="window" id="migrate">
</div>
<div class="window" id="key">

2
public/installer/MigrationRun.php
View File

@ -3,7 +3,7 @@
ini_set('max_execution_time', 300);
// array to pass back data
$data = array();
$data = array();
// run command on terminal
$command = 'cd ../.. && php artisan migrate --force';

94
public/installer/Views/requirements.blade.php
View File

@ -11,66 +11,60 @@
<div class="container requirement" id="requirement">
<div class="initial-display">
<p>Requirements</p>
<p>Server Requirements</p>
<div class="content">
<div class="title">
Please wait while we are checking the server requirements.
</div>
<ul class="requirements_list">
<li>
<?php if($phpVersion['supported'] ? $src = $greenCheck : $src = $redCheck): ?>
<img src="<?php echo $src ?>">
<?php endif; ?>
<span><b>PHP</b></span>
<small>(<?php echo $phpVersion['minimum'] ?> or higher)</small>
<br>
<?php if(!($phpVersion['supported'] == 1)): ?>
<small style="color: red;">
Bagisto has detected that your PHP version (<?php echo $phpVersion['current']; ?>) is not supported.<br>
Contact your provider if you are not the server administrator.
</small>
<?php endif; ?>
</li>
<br />
<div style="text-align: center; padding-bottom: 20px;">
This is just for testing purpose<br /> it will be removed before pushing to Bagisto's branch.
</div>
<div class="check" style="margin-left: 25%">
<?php if($phpVersion['supported'] ? $src = $greenCheck : $src = $redCheck): ?>
<img src="<?php echo $src ?>">
<?php endif; ?>
<span><b>PHP</b></span>
<span>(<?php echo $phpVersion['minimum'] ?> or Higher)</span>
</div>
<?php foreach($requirements['requirements'] as $type => $require): ?>
<?php foreach($requirements['requirements'][$type] as $extention => $enabled) : ?>
<div class="check" style="margin-left: 25%">
<?php if($enabled ? $src = $greenCheck : $src = $redCheck ): ?>
<img src="<?php echo $src ?>">
<?php endif; ?>
<span><b><?php echo $extention ?></b></span>
<span>(<?php echo $extention ?> Required)</span>
</div>
<?php foreach($requirements['requirements'] as $type => $require): ?>
<?php foreach($requirements['requirements'][$type] as $extention => $enabled) : ?>
<li>
<?php if($enabled ? $src = $greenCheck : $src = $redCheck ): ?>
<img src="<?php echo $src ?>">
<?php endif; ?>
<span><b><?php echo $extention ?></b></span>
</li>
<?php endforeach; ?>
<?php endforeach; ?>
<?php endforeach; ?>
<div class="check" style="margin-left: 25%">
<?php if(($composerInstall['composer_install'] == 0) ? $src = $greenCheck : $src = $redCheck ): ?>
<img src="<?php echo $src ?>">
<span style="margin-left: 10px"><b>Composer</b></span>
<?php endif; ?>
</div>
<div style="margin-left: 30%;">
<?php if(!($composerInstall['composer_install'] == 0)): ?>
<span style="margin-left: 10px; color: red;"><?php echo $composerInstall['composer'] ?></span>
<?php endif; ?>
</div>
<li>
<?php if(($composerInstall['composer_install'] == 0) ? $src = $greenCheck : $src = $redCheck ): ?>
<img src="<?php echo $src ?>">
<span><b>composer</b></span>
<?php endif; ?>
<br>
<?php if(!($composerInstall['composer_install'] == 0)): ?>
<small style="color: red;">
<?php echo $composerInstall['composer'] ?>
</small>
<?php endif; ?>
</li>
</ul>
</div>
<?php if(!isset($requirements['errors']) && ($phpVersion['supported'] && $composerInstall['composer_install'] == 0)): ?>
<div>
<button type="button" class="prepare-btn" id="requirement-check">Continue</button>
</div>
<div><button type="button" class="prepare-btn" id="requirement-check">Continue</button></div>
<?php elseif(!($phpVersion['supported'] && $composerInstall['composer_install'] == 0)): ?>
<div><button type="button" class="prepare-btn" id="requirements-refresh">Refresh</button></div>
<?php endif; ?>
</div>
</div>
<script>
$('#loader').show();
</script>
</body>
</html>