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

installer command differentilate according OS

This commit is contained in:
rahul shukla 2019-01-25 17:22:59 +05:30
parent dff609e4c0
commit 54377fd966
11 changed files with 270 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
packages/Webkul/Shop/publishable/assets/css/shop.css vendored
View File

File diff suppressed because one or more lines are too long

8
packages/Webkul/Shop/publishable/assets/js/shop.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -1,9 +1,4 @@
{
<<<<<<< HEAD
"/js/shop.js": "/js/shop.js",
"/css/shop.css": "/css/shop.css"
=======
"/js/shop.js": "/js/shop.js?id=0076f480705e7ce1f8e0",
"/css/shop.css": "/css/shop.css?id=064ee767a010fa58727e"
>>>>>>> 97cb751c56e436baed6fe43c0e0fccfbf726334d
}

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

@ -791,195 +791,7 @@ section.slider-block {
}
div.right-content {
display: flex;
flex-direction: row;
justify-content: flex-end;
align-items: center;
.currency-switcher {
float: right;
border-right: 2px solid $border-color;
cursor: pointer;
.dropdown-toggle {
line-height: 25px;
margin-left: 14px;
margin-right: 14px;
}
.dropdown-list {
width: 100px;
top: 37px;
.dropdown-container {
padding: 0 10px;
}
}
}
ul.account-dropdown-container {
float: right;
border-right: 2px solid $border-color;
cursor: pointer;
li.account-dropdown {
display: flex;
flex-direction: row;
margin-left: 14px;
margin-right: 14px;
.account {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.dropdown-list {
width: 300px;
padding: 25px;
}
.dropdown-container {
padding: 0px;
overflow: hidden;
}
ul.account-dropdown-list {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
li > a {
color: white;
}
.btn {
min-width: 100px;
text-align: center;
}
}
}
}
ul.cart-dropdown-container {
float: right;
margin-left: 10px;
li.cart-dropdown {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
.cart-icon {
margin-right: 8px;
height: 24px;
width: 24px;
}
.icon.arrow-down-icon {
margin-top: 10px;
}
.dropdown-list {
width: 387px;
}
.dropdown-list .dropdown-container {
padding: 10px 18px 10px 18px;
max-height: 410px;
overflow-y: auto;
.dropdown-cart {
color: $font-color;
}
.dropdown-cart > .dropdown-header {
width: 100%;
}
.dropdown-cart > .dropdown-header p{
display: inline;
line-height: 25px;
}
.dropdown-cart > .dropdown-header i{
// cursor: pointer;
float: right;
height: 22px;
width: 22px;
}
.dropdown-cart > .dropdown-header p.heading {
font-weight: lighter;
}
.dropdown-content {
padding-top: 8px;
padding-bottom: 10px;
}
.dropdown-content .item{
display: flex;
flex-direction: row;
border-bottom: 1px solid $border-color;
padding-top: 8px;
padding-bottom: 8px;
}
.dropdown-content .item img{
height: 75px;
width: 75px;
margin-right: 8px;
}
.dropdown-content .item-details{
max-height: 125px;
}
.item-details .item-name {
font-size: 16px;
font-weight: bold;
margin-bottom: 8px;
}
.item-details .item-options {
font-size: 16px;
margin-bottom: 8px;
}
.item-details .item-price {
margin-bottom: 8px;
}
.item-details .item-qty {
font-weight: lighter;
margin-bottom: 8px;
}
.dropdown-footer {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
margin-bottom: 8px;
.btn {
margin: 0;
}
}
.dropdown-footer .btn {
max-width: 170px;
text-align: center;
}
}
}
}
// new css
.account-cart-currency {
.right-content-menu {
li {
display: inline;
}
@ -991,6 +803,7 @@ section.slider-block {
.account-icon {
position: relative;
top: 6px;
left: 5px;
margin-left: 12px;
}
@ -1020,11 +833,15 @@ section.slider-block {
}
.currency {
margin-left: -27px;
position: absolute;
right: 0px;
width: 100px;
}
.account {
position: absolute;
right: 0px;
li {
padding: 25px !important;
@ -1040,25 +857,146 @@ section.slider-block {
.guest {
width: 300px;
margin-left: -150px;
}
.customer {
margin-left: -50px;
}
.cart-dropdown-container {
margin-top: 5px;
margin-left: 0px !important;
.arrow-down-icon {
margin-right: 0px !important;
}
}
.cart-icon {
margin-top: -10px;
}
.list {
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;
}
.cart-dropdown-container {
float: right;
margin-left: 0px;
margin-top: 8px;
ul.cart-dropdown {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
.cart-icon {
margin-right: 8px;
height: 24px;
width: 24px;
}
.icon.arrow-down-icon {
margin-right: 0px !important;
}
.dropdown-list {
width: 387px;
}
.dropdown-list .dropdown-container {
padding: 10px 18px 10px 18px;
max-height: 410px;
overflow-y: auto;
.dropdown-cart {
color: $font-color;
}
.dropdown-cart > .dropdown-header {
width: 100%;
}
.dropdown-cart > .dropdown-header p{
display: inline;
line-height: 25px;
}
.dropdown-cart > .dropdown-header i{
// cursor: pointer;
float: right;
height: 22px;
width: 22px;
}
.dropdown-cart > .dropdown-header p.heading {
font-weight: lighter;
}
.dropdown-content {
padding-top: 8px;
padding-bottom: 10px;
}
.dropdown-content .item{
display: flex;
flex-direction: row;
border-bottom: 1px solid $border-color;
padding-top: 8px;
padding-bottom: 8px;
}
.dropdown-content .item img{
height: 75px;
width: 75px;
margin-right: 8px;
}
.dropdown-content .item-details{
max-height: 125px;
}
.item-details .item-name {
font-size: 16px;
font-weight: bold;
margin-bottom: 8px;
}
.item-details .item-options {
font-size: 16px;
margin-bottom: 8px;
}
.item-details .item-price {
margin-bottom: 8px;
}
.item-details .item-qty {
font-weight: lighter;
margin-bottom: 8px;
}
.dropdown-footer {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
margin-bottom: 8px;
.btn {
margin: 0;
}
}
.dropdown-footer .btn {
max-width: 170px;
text-align: center;
}
}
}
}
}
}

22
packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
View File

@ -29,10 +29,10 @@
</div>
<div class="right-content">
<ul class="account-cart-currency">
<ul class="right-content-menu">
@if (core()->getCurrentChannel()->currencies->count() > 1)
<li>
<li class="list">
<span class="dropdown-toggle">
{{ core()->getCurrentCurrencyCode() }}
<i class="icon arrow-down-icon active"></i>
@ -45,12 +45,10 @@
</li>
@endforeach
</ul>
<div style="position: absolute; height: 25px; margin-left: 70px; margin-top: -23px;border-right: 2px solid #C7C7C7;"></div>
</li>
@endif
<li>
<li class="list">
<span class="dropdown-toggle">
<i class="icon account-icon"></i>
<i class="icon arrow-down-icon active"></i>
@ -91,18 +89,14 @@
</li>
</ul>
@endauth
<div style="position: absolute; height: 25px; margin-left: 142px; margin-top: -23px;border-right: 2px solid #C7C7C7;"></div>
</li>
<li>
<ul class="cart-dropdown-container">
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
<li class="cart-dropdown-container list">
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
<li class="cart-dropdown">
<span class="icon cart-icon"></span>
@include('shop::checkout.cart.mini-cart')
</li>
<ul class="cart-dropdown">
<span class="icon cart-icon"></span>
@include('shop::checkout.cart.mini-cart')
</ul>
</li>
</ul>

4
packages/Webkul/Shop/webpack.mix.js vendored
View File

@ -1,8 +1,8 @@
const { mix } = require("laravel-mix");
require("laravel-mix-merge-manifest");
var publicPath = 'publishable/assets';
// var publicPath = "../../../public/themes/default/assets";
// var publicPath = 'publishable/assets';
var publicPath = "../../../public/themes/default/assets";
mix.setPublicPath(publicPath).mergeManifest();
mix.disableNotifications();

3
packages/Webkul/Ui/src/Resources/assets/js/dropdown.js vendored
View File

@ -13,8 +13,7 @@ $(function() {
function toggleDropdown(e) {
var currentElement = $(e.currentTarget);
if(currentElement.attr('disabled') == "disabled")
return;
$('.dropdown-list').hide();
if(currentElement.hasClass('active')) {

4
packages/Webkul/Ui/webpack.mix.js vendored
View File

@ -1,8 +1,8 @@
const { mix } = require("laravel-mix");
require("laravel-mix-merge-manifest");
var publicPath = 'publishable/assets';
// var publicPath = "../../../public/vendor/webkul/ui/assets";
// var publicPath = 'publishable/assets';
var publicPath = "../../../public/vendor/webkul/ui/assets";
mix.setPublicPath(publicPath).mergeManifest();
mix.disableNotifications();

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

@ -117,17 +117,21 @@ class Requirement {
];
}
// /**
// * check installation for composer
// * @return boolean
// */
// private static function composerInstall()
// {
// $command = 'cd ../.. ; export HOME=/root && export COMPOSER_HOME=/root && /usr/bin/composer.phar self-update; composer --version';
// exec($command, $data['composer'], $data['composer_install']);
/**
* check installation for composer
* @return boolean
*/
private static function composerInstall()
{
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
$command = 'cd ../.. && composer --version';
} else {
$command = 'cd ../.. ; export HOME=/root && export COMPOSER_HOME=/root && /usr/bin/composer.phar self-update; composer --version';
}
exec($command, $data['composer'], $data['composer_install']);
// return $data['composer_install'];
// }
return $data['composer_install'];
}
// /**
// * check installation for mysql
@ -180,7 +184,7 @@ class Requirement {
$phpVersion = $this->checkPHPversion();
// $composerInstall = $this->composerInstall();
$composerInstall = $this->composerInstall();
// $sqlInstall = $this->mysqlInstall();

6
public/installer/Composer.php
View File

@ -4,7 +4,11 @@
$data = array();
// run command on terminal
$command = 'cd ../.. ; export HOME=/root && export COMPOSER_HOME=/root && /usr/bin/composer.phar self-update; composer install 2>&1';
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
$command = 'cd ../.. && composer install 2>&1';
} else {
$command = 'cd ../.. ; export HOME=/root && export COMPOSER_HOME=/root && /usr/bin/composer.phar self-update; composer install 2>&1';
}
$last_line = exec($command, $data['composer'], $data['install']);

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

@ -25,9 +25,22 @@
<span style="margin-left: 10px"><b>PHP</b></span>
<span>(<?php echo $phpVersion['minimum'] ?> or Higher)</span>
</div>
<div class="check" style="margin-left: 25%;">
<?php if(($composerInstall == 0) ? $src = 'Images/green-check.svg' : $src = 'Images/red-check.svg' ): ?>
<img src="<?php echo $src ?>">
<?php endif; ?>
<span style="margin-left: 10px"><b>Composer</b></span>
</div>
<div style="margin-left: 30%;">
<?php if(!($composerInstall == 0)): ?>
<a href="https://getcomposer.org/" style="color: #0041FF; font-size: 16px">https://getcomposer.org/</a>
<?php endif; ?>
</div>
</div>
<?php if($phpVersion['supported']): ?>
<?php if($phpVersion['supported'] && ($composerInstall == 0)): ?>
<div>
<button type="button" class="prepare-btn" id="requirement-check">Continue</button>