From 6b762686a3b76fe7a352314f9f07700f86a7d7ca Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Fri, 25 Jan 2019 20:11:35 +0530
Subject: [PATCH] changes for installer

---
 .../Shop/src/Resources/assets/sass/app.scss   | 11 --------
 .../Ui/publishable/assets/mix-manifest.json   |  5 ----
 public/index.php                              |  2 +-
 public/installer/CSS/style.css                |  2 +-
 public/installer/Classes/Requirement.php      | 26 +++++++++----------
 public/installer/Views/requirements.blade.php | 23 +++++++++++-----
 6 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
index 6d717ac10..d4ee7abad 100755
--- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
@@ -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;
                 }
diff --git a/packages/Webkul/Ui/publishable/assets/mix-manifest.json b/packages/Webkul/Ui/publishable/assets/mix-manifest.json
index 01d83f4f1..3b0c1ac2a 100755
--- a/packages/Webkul/Ui/publishable/assets/mix-manifest.json
+++ b/packages/Webkul/Ui/publishable/assets/mix-manifest.json
@@ -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
 }
diff --git a/public/index.php b/public/index.php
index 230334cae..ea2ec077f 100755
--- a/public/index.php
+++ b/public/index.php
@@ -2,7 +2,7 @@
 
 $install = require __DIR__.'/installer/install.php';
 
-if (0 && !is_null($install)) {
+if (!is_null($install)) {
 
     header("Location: $install");
 
diff --git a/public/installer/CSS/style.css b/public/installer/CSS/style.css
index f6339ed13..db093a41a 100755
--- a/public/installer/CSS/style.css
+++ b/public/installer/CSS/style.css
@@ -78,7 +78,7 @@ span {
     line-height: 30px;
 }
 
-.requirement, .environment, .migration, .permission, .admin, .finish {
+.welcome, .environment, .migration, .permission, .admin, .finish {
     display : none;
 }
 
diff --git a/public/installer/Classes/Requirement.php b/public/installer/Classes/Requirement.php
index ae1c7379b..357910d1a 100755
--- a/public/installer/Classes/Requirement.php
+++ b/public/installer/Classes/Requirement.php
@@ -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();
 
diff --git a/public/installer/Views/requirements.blade.php b/public/installer/Views/requirements.blade.php
index 5b29b61ee..e0765ee9e 100755
--- a/public/installer/Views/requirements.blade.php
+++ b/public/installer/Views/requirements.blade.php
@@ -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>
\ No newline at end of file
+
+</html>