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

changes for installer

This commit is contained in:
rahul shukla 2019-01-25 20:11:35 +05:30
parent 48fbbeac7c
commit 6b762686a3
6 changed files with 31 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/Webkul/Shop/src/Resources/assets/sass/app.scss vendored
View File

@ -867,17 +867,6 @@ section.slider-block {
border-left: 2px solid #c7c7c7;
}
.list:after {
content: "";
border-right: 2px solid #c7c7c7;
color: red;
background: red;
position: absolute;
height: 100px;
top: 0px;
right: 0px;
}
.list:first-child {
border: none;
}

5
packages/Webkul/Ui/publishable/assets/mix-manifest.json
View File

@ -1,9 +1,4 @@
{
<<<<<<< HEAD
"/js/ui.js": "/js/ui.js",
"/css/ui.css": "/css/ui.css"
=======
"/js/ui.js": "/js/ui.js?id=711bb1082d5b116e929f",
"/css/ui.css": "/css/ui.css?id=384d20a09ced97996829"
>>>>>>> 97cb751c56e436baed6fe43c0e0fccfbf726334d
}

2
public/index.php
View File

@ -2,7 +2,7 @@
$install = require __DIR__.'/installer/install.php';
if (0 && !is_null($install)) {
if (!is_null($install)) {
header("Location: $install");

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

@ -78,7 +78,7 @@ span {
line-height: 30px;
}
.requirement, .environment, .migration, .permission, .admin, .finish {
.welcome, .environment, .migration, .permission, .admin, .finish {
display : none;
}

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

@ -12,19 +12,17 @@ class Requirement {
{
// Server Requirements
$requirements = [
// 'requirements' => [
'php' => [
// 'openssl',
// 'pdo',
// 'mbstring',
// 'tokenizer',
// 'JSON',
// 'cURL',
],
'apache' => [
// 'mod_rewrite',
]
// ]
'php' => [
'openssl',
'pdo',
'mbstring',
'tokenizer',
'JSON',
'cURL',
],
'apache' => [
'mod_rewrite',
]
];
$results = [];
@ -180,7 +178,7 @@ class Requirement {
*/
public function render()
{
// $requirements = $this->checkRequirements();
$requirements = $this->checkRequirements();
$phpVersion = $this->checkPHPversion();

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

@ -38,16 +38,26 @@
<a href="https://getcomposer.org/" style="color: #0041FF; font-size: 16px">https://getcomposer.org/</a>
<?php endif; ?>
</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 = 'Images/green-check.svg' : $src = 'Images/red-check.svg' ): ?>
<img src="<?php echo $src ?>">
<?php endif; ?>
<span style="margin-left: 10px"><b><?php echo $extention ?></b></span>
<span>(<?php echo $extention ?> Required)</span>
</div>
<?php endforeach; ?>
<?php endforeach; ?>
</div>
<?php if($phpVersion['supported'] && ($composerInstall == 0)): ?>
<?php if(!isset($requirements['errors']) && $phpVersion['supported'] && ($composerInstall == 0) ): ?>
<div>
<button type="button" class="prepare-btn" id="requirement-check">Continue</button>
</div>
<div style="cursor: pointer; margin-top:10px">
<span id="requirement-back">back</span>
</div>
<?php endif; ?>
@ -60,4 +70,5 @@
</div>
</body>
</html>
</html>