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

installer isuue & product page changes

This commit is contained in:
rahul shukla 2019-03-14 14:34:32 +05:30
parent 99405ebcaf
commit ebf96ad9d6
10 changed files with 65 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

@ -1,4 +1,4 @@
{
"/js/shop.js": "/js/shop.js?id=391400bc9a994e60b97f",
"/css/shop.css": "/css/shop.css?id=2717e6e89dd0757ca282"
}
"/js/shop.js": "/js/shop.js?id=e019a3a0b0cbcc981fd8",
"/css/shop.css": "/css/shop.css?id=a3670098698673f115f6"
}

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

@ -2985,7 +2985,7 @@ section.review {
flex-direction: column;
align-content: center;
justify-content: flex-start;
width: 25%;
width: 20%;
height: 100%;
}
@ -3057,7 +3057,7 @@ section.review {
//customer account pages content
.account-layout {
margin-left: 40px;
width: 100%;
width: 80%;
.account-head {
@ -3476,6 +3476,7 @@ section.review {
}
}
/// rtl css start here
.rtl {
direction: rtl;

2
packages/Webkul/Shop/src/Resources/views/products/view.blade.php
View File

@ -26,6 +26,8 @@
<div class="details">
<div class="img-zoom-result" id="img-zoom-result"></div>
<div class="product-heading">
<span>{{ $product->name }}</span>
</div>

40
packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php
View File

@ -22,16 +22,16 @@
<div>
<ul class="thumb-list">
<li class="gallery-control top" @click="moveThumbs('top')" v-if="thumbs.length > 4">
<li class="gallery-control top" @click="moveThumbs('top')" v-if="(thumbs.length > 4) && this.is_move.up">
<span class="overlay"></span>
<i class="icon arrow-up-white-icon"></i>
</li>
<li class="thumb-frame" v-for='(thumb, index) in thumbs' @mouseover="changeImage(thumb)" :class="[thumb.large_image_url == currentLargeImageUrl ? 'active' : '']">
<img :src="thumb.small_image_url" />
<img :src="thumb.small_image_url"/>
</li>
<li class="gallery-control bottom" @click="moveThumbs('bottom')" v-if="thumbs.length > 4">
<li class="gallery-control bottom" @click="moveThumbs('bottom')" v-if="(thumbs.length > 4) && this.is_move.down">
<span class="overlay"></span>
<i class="icon arrow-down-white-icon"></i>
</li>
@ -62,7 +62,17 @@
thumbs: [],
currentLargeImageUrl: ''
currentLargeImageUrl: '',
counter: {
up: 0,
down: 0,
},
is_move: {
up: true,
down: true,
}
}),
watch: {
@ -101,14 +111,36 @@
const moveThumb = this.thumbs.splice(len - 1, 1);
this.thumbs = [moveThumb[0], ...this.thumbs];
this.counter.up = this.counter.up+1;
this.counter.down = this.counter.down-1;
} else {
const moveThumb = this.thumbs.splice(0, 1);
this.thumbs = [...this.thumbs, moveThumb[0]];
this.counter.down = this.counter.down+1;
this.counter.up = this.counter.up-1;
}
if ((len-4) == this.counter.down) {
this.is_move.down = false;
} else {
this.is_move.down = true;
}
if ((len-4) == this.counter.up) {
this.is_move.up = false;
} else {
this.is_move.up = true;
}
},
}
});
</script>
@endpush

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

@ -116,63 +116,6 @@ class Requirement {
];
}
/**
* 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'];
}
// /**
// * check installation for mysql
// * @return boolean
// */
// private static function mysqlInstall()
// {
// $command = 'mysql --version';
// exec($command, $data['mysql'], $data['mysql_install']);
// $mysqlVersion = explode(",", $data['mysql'][0]);
// $mysqlVersion = explode(" ", $mysqlVersion[0]);
// $supported = false;
// $minMysqlVersion = '5.7.23';
// if ($data['mysql_install'] == 0) {
// if (version_compare(end($mysqlVersion), $minMysqlVersion, '>=')) {
// $supported = true;
// }
// }
// $mysqlStatus = [
// 'current' => end($mysqlVersion),
// 'minimum' => $minMysqlVersion,
// 'supported' => $supported
// ];
// return $mysqlStatus;
// }
// /**
// * check installation for composer
// * @return boolean
// */
// private static function nodeInstall()
// {
// $command = 'npm -v 2>&1';
// exec($command, $data['npm'], $data['npm_install']);
// return $data['npm_install'];
// }
/**
* Render view for class.
*
@ -183,12 +126,6 @@ class Requirement {
$phpVersion = $this->checkPHPversion();
$composerInstall = $this->composerInstall();
// $sqlInstall = $this->mysqlInstall();
// $nodeInstall = $this->nodeInstall();
ob_start();
include __DIR__ . '/../Views/requirements.blade.php';

17
public/installer/Composer.php
View File

@ -3,14 +3,21 @@
// array to pass back data
$data = array();
// run command on terminal
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
$command = 'cd ../.. && composer install 2>&1';
$location = str_replace('\\', '/', getcwd());
$currentLocation = explode("/", $location);
array_pop($currentLocation);
array_pop($currentLocation);
$desiredLocation = implode("/", $currentLocation);
$autoLoadFile = $desiredLocation . '/' . 'vendor' . '/' . 'autoload.php';
if (file_exists($autoLoadFile)) {
$data['install'] = 0;
} else {
$command = 'cd ../.. ; export HOME=/root && export COMPOSER_HOME=/root && /usr/bin/composer.phar self-update; composer install 2>&1';
$data['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.';
}
$last_line = exec($command, $data['composer'], $data['install']);
// return a response
//return all our data to an AJAX call

12
public/installer/Migration.php
View File

@ -83,7 +83,7 @@
<span> Click the below button to run following : </span>
</div>
<div class="message" style="margin-top: 20px">
<span> Composer Dependency Installment </span>
<span> Check Composer dependency </span>
</div>
<div class="message">
<span>Database Migartion </span>
@ -99,7 +99,7 @@
</div>
</div>
<span class="composer" id="comp" style="left: calc(50% - 135px);">Installing Composer Dependency</span>
<span class="composer" id="comp" style="left: calc(50% - 135px);">Checking Composer Dependency</span>
<span class="composer" id="composer-migrate" style="left: calc(50% - 85px);">Migrating Database</span>
<span class="composer" id="composer-seed" style="left: calc(50% - 55px);">Seeding Data</span>
</div>
@ -208,8 +208,8 @@
} else {
$('#migrate').show();
$('#loader').hide();
$('#migrate-seed').show();
$('#migration-back').show();
$('#migrate-seed').hide();
$('#migration-back').hide();
if (data['migrate']) {
$('#migrate').append('<div class="terminal">' + data['migrate'] + '</div>');
}
@ -220,8 +220,8 @@
} else {
$('#loader').hide();
$('#composer-migrate').hide();
$('#migrate-seed').show();
$('#migration-back').show();
$('#migrate-seed').hide();
$('#migration-back').hide();
$('#composer').append('<div class="terminal">' + data['composer'] +'</div>');
}
}

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

@ -26,19 +26,6 @@
<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>
<?php foreach($requirements['requirements'] as $type => $require): ?>
<?php foreach($requirements['requirements'][$type] as $extention => $enabled) : ?>
@ -54,7 +41,7 @@
<?php endforeach; ?>
</div>
<?php if(!isset($requirements['errors']) && $phpVersion['supported'] && ($composerInstall == 0) ): ?>
<?php if(!isset($requirements['errors']) && $phpVersion['supported']): ?>
<div>
<button type="button" class="prepare-btn" id="requirement-check">Continue</button>
</div>