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

before merge

This commit is contained in:
prashant-webkul 2018-10-17 12:53:01 +05:30
parent c05ea63603
commit 3a3c89484d
9 changed files with 122 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php
View File

@ -5,7 +5,6 @@ namespace Webkul\Admin\DataGrids;
use Illuminate\View\View;
use Webkul\Ui\DataGrid\Facades\DataGrid;
/**
* Order DataGrid
*
@ -26,10 +25,10 @@ class OrderDataGrid
{
return DataGrid::make([
'name' => 'Categories',
'table' => 'categories as cat',
'select' => 'cat.id',
'perpage' => 10,
'name' => 'Orders',
'table' => 'orders as ord',
'select' => 'ord.id',
'perpage' => 5,
'aliased' => true, //use this with false as default and true in case of joins
'massoperations' =>[

11
packages/Webkul/Shop/src/Resources/assets/images/cross-icon-adj.svg Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 50 (54983) - http://www.bohemiancoding.com/sketch -->
<title>Artboard</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Artboard" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round">
<path d="M9.06852618,23.2496556 L22.5678375,9.75034436" id="Line-2" stroke="#242424" stroke-width="3"></path>
<path d="M9.06852618,9.75034436 L22.5678375,23.2496556" id="Line-2" stroke="#242424" stroke-width="3"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 708 B

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

@ -481,7 +481,7 @@ section.slider-block {
}
.nav a:first-child{
margin-left: 20px;
// margin-left: 20px;
}
.nav li > .icon{

6
packages/Webkul/Shop/src/Resources/assets/sass/icons.scss vendored
View File

@ -17,6 +17,12 @@
height: 24px;
}
.icon-menu-close-adj {
background-image:URL('../images/cross-icon-adj.svg');
width: 32px;
height: 32px;
}
.grid-view-icon {
background-image:URL('../images/icon-grid-view.svg');
width: 24px;

17
packages/Webkul/Shop/src/Resources/views/index.blade.php
View File

@ -1,22 +1,11 @@
@inject('rateHelper' , 'Webkul\Shipping\Helper\Rate')
<div>
@foreach($rateHelper->collectRates() as $key=>$count)
<div class="shipping-method">
<input type="radio" name="price"> ${{ core()->currency($count) }} <span> {{ $key }} </span>
</div>
<div class="shipping-method">
<input type="radio" name="price"> ${{ core()->currency($count) }} <span> {{ $key }} </span>
</div>
@endforeach
</div>
<style>
span {
margin-left: 10px;

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

@ -262,54 +262,46 @@
</div>
</div>
@push('scripts')
<script>
window.onload = function() {
var hamMenu = document.getElementById("hammenu");
var search = document.getElementById("search");
var searchResponsive = document.getElementsByClassName('search-responsive')[0];
var sortLimit = document.getElementsByClassName('reponsive-sorter-limiter')[0];
var layerFilter = document.getElementsByClassName('responsive-layred-filter')[0];
var navResponsive = document.getElementsByClassName('responsive-nav')[0];
var thumbList = document.getElementsByClassName('thumb-list')[0];
<script>
search.addEventListener("click", header);
hamMenu.addEventListener("click", header);
window.onload = function() {
var hamMenu = document.getElementById("hammenu");
var search = document.getElementById("search");
var searchResponsive = document.getElementsByClassName('search-responsive')[0];
var sortLimit = document.getElementsByClassName('reponsive-sorter-limiter')[0];
var layerFilter = document.getElementsByClassName('responsive-layred-filter')[0];
var navResponsive = document.getElementsByClassName('responsive-nav')[0];
var thumbList = document.getElementsByClassName('thumb-list')[0];
search.addEventListener("click", header);
hamMenu.addEventListener("click", header);
// for header responsive icon
function header(){
var className = document.getElementById(this.id).className;
if(className === 'icon icon-search' ){
search.classList.remove("icon-search");
search.classList.add("icon-menu-close");
hamMenu.classList.remove("icon-menu-close");
hamMenu.classList.add("icon-menu");
searchResponsive.style.display = 'block';
navResponsive.style.display = 'none';
}else if(className === 'icon icon-menu'){
hamMenu.classList.remove("icon-menu");
hamMenu.classList.add("icon-menu-close");
search.classList.remove("icon-menu-close");
search.classList.add("icon-search");
searchResponsive.style.display = 'none';
navResponsive.style.display = 'block';
}else{
search.classList.remove("icon-menu-close");
search.classList.add("icon-search");
hamMenu.classList.remove("icon-menu-close");
hamMenu.classList.add("icon-menu");
searchResponsive.style.display = 'none';
navResponsive.style.display = 'none';
// for header responsive icon
function header(){
var className = document.getElementById(this.id).className;
if(className === 'icon icon-search' ){
search.classList.remove("icon-search");
search.classList.add("icon-menu-close");
hamMenu.classList.remove("icon-menu-close");
hamMenu.classList.add("icon-menu");
searchResponsive.style.display = 'block';
navResponsive.style.display = 'none';
}else if(className === 'icon icon-menu'){
hamMenu.classList.remove("icon-menu");
hamMenu.classList.add("icon-menu-close");
search.classList.remove("icon-menu-close");
search.classList.add("icon-search");
searchResponsive.style.display = 'none';
navResponsive.style.display = 'block';
}else{
search.classList.remove("icon-menu-close");
search.classList.add("icon-search");
hamMenu.classList.remove("icon-menu-close");
hamMenu.classList.add("icon-menu");
searchResponsive.style.display = 'none';
navResponsive.style.display = 'none';
}
}
}
}
</script>
</script>
@endpush

102
packages/Webkul/Shop/src/Resources/views/products/index.blade.php
View File

@ -3,16 +3,13 @@
@section('content-wrapper')
@inject ('productRepository', 'Webkul\Product\Repositories\ProductRepository')
<div class="main">
<div class="category-container">
@include ('shop::products.list.layered-navigation')
<div class="category-block">
<div class="hero-image mb-35">
<img src="https://images.pexels.com/photos/428338/pexels-photo-428338.jpeg?cs=srgb&dl=adolescent-casual-cute-428338.jpg&fm=jpg" />
<img src="https://images.pexels.com/photos/428338/pexels-photo-428338.jpeg?cs=srgb&dl=adolescent-casual-cute-428338.jpg&fm=jpg" />
</div>
<?php $products = $productRepository->findAllByCategory($category->id); ?>
@ -20,87 +17,74 @@
@include ('shop::products.list.toolbar')
@inject ('toolbarHelper', 'Webkul\Product\Product\Toolbar')
@if ($toolbarHelper->getCurrentMode() == 'grid')
<div class="product-grid-3">
@foreach ($products as $product)
@include ('shop::products.list.card', ['product' => $product])
@endforeach
</div>
@else
<div class="product-list">
@foreach ($products as $product)
@include ('shop::products.list.card', ['product' => $product])
@endforeach
</div>
@endif
<div class="bottom-toolbar">
{{ $products->appends(request()->input())->links() }}
</div>
</div>
</div>
</div>
@stop
@push('scripts')
<script>
$(document).ready(function() {
var sort = document.getElementById("sort");
var filter = document.getElementById("filter");
var sortLimit = document.getElementsByClassName('reponsive-sorter-limiter')[0];
var layerFilter = document.getElementsByClassName('responsive-layred-filter')[0];
<script>
$(document).ready(function() {
var sort = document.getElementById("sort");
var filter = document.getElementById("filter");
var sortLimit = document.getElementsByClassName('reponsive-sorter-limiter')[0];
var layerFilter = document.getElementsByClassName('responsive-layred-filter')[0];
if(sort && filter){
sort.addEventListener("click", sortFilter);
filter.addEventListener("click", sortFilter);
}
function sortFilter(){
var className = document.getElementById(this.id).className;
if(className === 'icon sort-icon' ){
sort.classList.remove("sort-icon");
sort.classList.add("icon-menu-close");
filter.classList.remove("icon-menu-close");
filter.classList.add("filter-icon");
sortLimit.style.display ="flex";
sortLimit.style.justifyContent="space-between";
layerFilter.style.display ="none";
}else if(className === 'icon filter-icon'){
filter.classList.remove("filter-icon");
filter.classList.add("icon-menu-close");
sort.classList.remove("icon-menu-close");
sort.classList.add("sort-icon");
layerFilter.style.display ="block";
sortLimit.style.display ="none";
}else{
sort.classList.remove("icon-menu-close");
sort.classList.add("sort-icon");
filter.classList.remove("icon-menu-close");
filter.classList.add("filter-icon");
sortLimit.style.display ="none";
layerFilter.style.display ="none";
if(sort && filter){
sort.addEventListener("click", sortFilter);
filter.addEventListener("click", sortFilter);
}
}
})
</script>
@endpush
function sortFilter(){
var className = document.getElementById(this.id).className;
if(className === 'icon sort-icon'){
sort.classList.remove("sort-icon");
sort.classList.add("icon-menu-close-adj");
filter.classList.remove("icon-menu-close-adj");
filter.classList.add("filter-icon");
sortLimit.style.display ="flex";
sortLimit.style.justifyContent="space-between";
layerFilter.style.display ="none";
}else if(className === 'icon filter-icon'){
filter.classList.remove("filter-icon");
filter.classList.add("icon-menu-close-adj");
sort.classList.remove("icon-menu-close-adj");
sort.classList.add("sort-icon");
layerFilter.style.display ="block";
sortLimit.style.display ="none";
}else{
sort.classList.remove("icon-menu-close-adj");
sort.classList.add("sort-icon");
filter.classList.remove("icon-menu-close-adj");
filter.classList.add("filter-icon");
sortLimit.style.display ="none";
layerFilter.style.display ="none";
}
}
});
</script>
@endpush

11
packages/Webkul/Ui/src/Resources/assets/images/cross-icon-adj.svg Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 50 (54983) - http://www.bohemiancoding.com/sketch -->
<title>Artboard</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Artboard" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round">
<path d="M9.06852618,23.2496556 L22.5678375,9.75034436" id="Line-2" stroke="#242424" stroke-width="3"></path>
<path d="M9.06852618,9.75034436 L22.5678375,23.2496556" id="Line-2" stroke="#242424" stroke-width="3"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 708 B

10
public/themes/default/assets/css/shop.css vendored
View File

@ -17,6 +17,12 @@
height: 24px;
}
.icon-menu-close-adj {
background-image: URL("../images/cross-icon-adj.svg");
width: 32px;
height: 32px;
}
.grid-view-icon {
background-image: URL("../images/icon-grid-view.svg");
width: 24px;
@ -1160,10 +1166,6 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
position: relative;
}
.header .header-bottom .nav a:first-child {
margin-left: 20px;
}
.header .header-bottom .nav li > .icon {
display: none;
}