From ef69538ccb4bb16ce63f33b2cf2ae721c0c8a611 Mon Sep 17 00:00:00 2001 From: jitendra Date: Thu, 18 Oct 2018 10:25:45 +0530 Subject: [PATCH 1/2] Refactor css --- .../Shop/src/Resources/assets/sass/app.scss | 117 +++++++++- .../src/Resources/assets/sass/components.scss | 82 ------- .../Webkul/Shop/src/Resources/lang/en/app.php | 17 +- .../views/checkout/cart/index.blade.php | 21 +- .../Resources/views/layouts/master.blade.php | 7 +- .../views/products/add-to-cart.blade.php | 4 +- .../views/products/buy-now.blade.php | 4 +- .../Resources/views/products/index.blade.php | 84 ++++--- .../views/products/list/card.blade.php | 10 +- .../Resources/views/products/price.blade.php | 4 + .../Resources/views/products/view.blade.php | 15 +- public/themes/default/assets/css/shop.css | 205 ++++++++++-------- 12 files changed, 349 insertions(+), 221 deletions(-) diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index 03189a737..b5e7d6337 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -17,7 +17,113 @@ display: block; } + // product card, requires no changes for responsiveness. + .product-grid-4 { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(235px, 1fr)); + grid-auto-rows: auto; + grid-column-gap: 48px; + grid-row-gap: 15px; + } + + .product-grid-3 { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(235px, 1fr)); + grid-gap: 27px; + grid-auto-rows: auto; + } + + @media only screen and (max-width: 854px) { + .product-grid-4 { + grid-template-columns: 29.5% 29.5% 29.5%; + grid-column-gap: 35px; + } + } + + @media only screen and (max-width: 653px) { + .product-grid-4 { + grid-template-columns: 48.5% 48.5%; + grid-column-gap: 17px; + } + } + + .product-card { + position: relative; + + .product-image { + max-height: 350px; + max-width: 280px; + margin-bottom: 10px; + background: #F2F2F2; + + img { + display: block; + width: 100%; + } + } + + .product-name { + margin-bottom: 14px; + width: 100%; + color: $font-color; + + a { + color: $font-color; + } + } + + .product-description { + display: none; + } + + .product-ratings { + width: 100%; + + .icon { + width: 16px; + height: 16px; + } + } + + .cart-wish-wrap { + display: inline-flex; + justify-content: flex-start; + align-items: center; + height: 40px; + + .addtocart { + margin-right: 10px; + text-transform: uppercase; + } + + .add-to-wishlist { + margin-top: 5px; + } + } + + .sticker { + border-radius: 100px; + position: absolute; + top: 10px; + left: 10px; + text-transform: uppercase; + padding: 4px 13px; + font-size: 14px; + color: #fff; + + &.sale { + background: #FF6472; + } + + &.new { + background: #2ED04C; + } + } + } + .product-list { + min-height: 200px; + .product-card { width: 100%; display: inline-block; @@ -43,6 +149,12 @@ margin-bottom: 0; } } + + &.empty { + h2 { + font-size: 20px; + } + } } section.featured-products { @@ -182,11 +294,8 @@ section.slider-block { //responsive css for slider @media only screen and (max-width: 770px) { - section.slider-block { - div.slider-content { - div.slider-control { display: flex; justify-content:space-between; @@ -997,6 +1106,7 @@ section.product-detail { width: 49%; background: black; white-space: nowrap; + text-transform: uppercase; } .buynow { @@ -1004,6 +1114,7 @@ section.product-detail { width: 49%; float:right; white-space: nowrap; + text-transform: uppercase; } } } diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/components.scss b/packages/Webkul/Shop/src/Resources/assets/sass/components.scss index de24f9f32..b4c9bfa0a 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/components.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/components.scss @@ -1,86 +1,4 @@ -.product-card { - .product-image { - max-height: 350px; - max-width: 280px; - margin-bottom: 10px; - background: #F2F2F2; - - img { - display: block; - width: 100%; - } - } - - .product-name { - margin-bottom: 14px; - width: 100%; - color: $font-color; - - a { - color: $font-color; - } - } - - .product-description { - display: none; - } - - .product-ratings { - width: 100%; - - .icon { - width: 16px; - height: 16px; - } - } - - .cart-wish-wrap { - display: inline-flex; - justify-content: flex-start; - align-items: center; - height: 40px; - - .addtocart { - margin-right: 10px; - text-transform: uppercase; - } - - .add-to-wishlist { - margin-top: 5px; - } - } -} - -// product card, requires no changes for responsiveness. -.product-grid-4 { - display: grid; - grid-template-columns: repeat(auto-fill, minmax(235px, 1fr)); - grid-auto-rows: auto; - grid-column-gap: 48px; - grid-row-gap: 15px; -} - -.product-grid-3 { - display: grid; - grid-template-columns: repeat(auto-fill, minmax(235px, 1fr)); - grid-gap: 27px; - grid-auto-rows: auto; -} - -@media only screen and (max-width: 854px) { - .product-grid-4 { - grid-template-columns: 29.5% 29.5% 29.5%; - grid-column-gap: 35px; - } -} - -@media only screen and (max-width: 653px) { - .product-grid-4 { - grid-template-columns: 48.5% 48.5%; - grid-column-gap: 17px; - } -} @media only screen and (max-width: 425px) { .product-card { diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php index 894a5ab36..eba7c0777 100644 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -4,11 +4,7 @@ return [ 'home' => [ 'page-title' => 'Bagisto - Home', 'featured-products' => 'Featured Products', - 'new-products' => 'New Products', - - 'product-card' => [ - 'add-to-cart' => 'ADD TO CART' - ] + 'new-products' => 'New Products' ], 'footer' => [ @@ -198,7 +194,13 @@ return [ 'up-sell-title' => 'We found other products you might like!', 'reviews-title' => 'Ratings & Reviews', 'write-review-btn' => 'Write Review', - 'choose-option' => 'Choose an option' + 'choose-option' => 'Choose an option', + 'sale' => 'Sale', + 'new' => 'New', + 'empty' => 'No products available in this category.', + 'add-to-cart' => 'Add To Cart', + 'buy-now' => 'Buy Now', + 'whoops' => 'Whoops!' ], 'wishlist' => [ @@ -219,7 +221,8 @@ return [ ], 'title' => 'Shopping Cart', - 'empty' => 'Shopping Cart Is Empty', + 'empty' => 'Your shopping cart is empty.', + 'update-cart' => 'Update Cart', 'continue-shopping' => 'Continue Shopping', 'proceed-to-checkout' => 'Proceed To Checkout', 'remove' => 'Remove', diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php index 53ac65869..f8b072085 100644 --- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php @@ -22,7 +22,9 @@
+ @csrf + @foreach($cart->items as $item) @endforeach
+
{{ __('shop::app.checkout.cart.continue-shopping') }}
- + @if (!cart()->hasError()) @@ -96,9 +101,21 @@ @include('shop::checkout.total.summary', ['cart' => $cart])
+ @else +
- {{ __('shop::app.checkout.cart.empty') }} + {{ __('shop::app.checkout.cart.title') }} +
+ +
+

+ {{ __('shop::app.checkout.cart.empty') }} +

+ +

+ {{ __('shop::app.checkout.cart.continue-shopping') }} +

@endif diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php index c158bcb57..1893f295e 100644 --- a/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php @@ -1,5 +1,5 @@ - + @@ -13,12 +13,15 @@ @yield('head') + @section('seo') + + @show + @yield('css') -
diff --git a/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php b/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php index 67e0e56fa..569ae11f4 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php @@ -1 +1,3 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/products/buy-now.blade.php b/packages/Webkul/Shop/src/Resources/views/products/buy-now.blade.php index a46559ed5..115754deb 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/buy-now.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/buy-now.blade.php @@ -1 +1,3 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/products/index.blade.php b/packages/Webkul/Shop/src/Resources/views/products/index.blade.php index e9eb00dc5..fa3a1c718 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/index.blade.php @@ -1,40 +1,64 @@ @extends('shop::layouts.master') -@section('content-wrapper') +@section('page_title') + {{ $category->meta_title ?? $category->name }} +@stop + +@section('seo') + + +@stop + +@section('content-wrapper') + @inject ('productRepository', 'Webkul\Product\Repositories\ProductRepository') -@inject ('productRepository', 'Webkul\Product\Repositories\ProductRepository')
+ @include ('shop::products.list.layered-navigation')
- +
findAllByCategory($category->id); ?> + + @if ($products->count()) - @include ('shop::products.list.toolbar') + @include ('shop::products.list.toolbar') - @inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar') + @inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar') - @if ($toolbarHelper->getCurrentMode() == 'grid') -
- @foreach ($products as $product) - @include ('shop::products.list.card', ['product' => $product]) - @endforeach + @if ($toolbarHelper->getCurrentMode() == 'grid') +
+ @foreach ($products as $product) + @include ('shop::products.list.card', ['product' => $product]) + @endforeach +
+ @else +
+ @foreach ($products as $product) + @include ('shop::products.list.card', ['product' => $product]) + @endforeach +
+ @endif + +
+ {{ $products->appends(request()->input())->links() }}
+ @else -
- @foreach ($products as $product) - @include ('shop::products.list.card', ['product' => $product]) - @endforeach -
- @endif -
- {{ $products->appends(request()->input())->links() }} -
+
+

{{ __('shop::app.products.whoops') }}

+ +

+ {{ __('shop::app.products.empty') }} +

+
+ + @endif
@@ -48,42 +72,42 @@ var sortLimit = document.getElementsByClassName('reponsive-sorter-limiter')[0]; var layerFilter = document.getElementsByClassName('responsive-layred-filter')[0]; - if(sort && filter){ + if(sort && filter) { sort.addEventListener("click", sortFilter); filter.addEventListener("click", sortFilter); } - function sortFilter(){ + function sortFilter() { var className = document.getElementById(this.id).className; - if(className === 'icon sort-icon'){ + 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"; + sortLimit.style.display = "flex"; + sortLimit.style.justifyContent = "space-between"; layerFilter.style.display ="none"; - }else if(className === 'icon filter-icon'){ + } 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{ + 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"; + sortLimit.style.display = "none"; + layerFilter.style.display = "none"; } } }); diff --git a/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php b/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php index 7ab65e6eb..e3ed3934e 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php @@ -4,6 +4,12 @@ getProductBaseImage($product); ?> + @if($product->new) +
+ {{ __('shop::app.products.new') }} +
+ @endif +
@@ -32,7 +38,7 @@ @include ('shop::products.add-to', ['product' => $product]) @else @if($product->type == "configurable") - {{ __('shop::app.home.product-card.add-to-cart') }} + {{ __('shop::app.products.add-to-cart') }} @include('shop::products.wishlist') @else
@@ -41,7 +47,7 @@ - + @include('shop::products.wishlist')
diff --git a/packages/Webkul/Shop/src/Resources/views/products/price.blade.php b/packages/Webkul/Shop/src/Resources/views/products/price.blade.php index 9a17ee063..610cc632c 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/price.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/price.blade.php @@ -12,6 +12,10 @@ @if ($priceHelper->haveSpecialPrice($product)) +
+ {{ __('shop::app.products.sale') }} +
+ {{ core()->currency($product->price) }} {{ core()->currency($priceHelper->getSpecialPrice($product)) }} diff --git a/packages/Webkul/Shop/src/Resources/views/products/view.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view.blade.php index 913ab6911..8cdf3c963 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/view.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/view.blade.php @@ -1,14 +1,20 @@ @extends('shop::layouts.master') @section('page_title') - {{ $product->name }} + {{ $product->meta_title ?? $product->name }} +@stop + +@section('seo') + + @stop @section('content-wrapper')
-
+ +
@csrf() @@ -23,13 +29,12 @@ {{ $product->name }}
- {{-- @include ('shop::products.review', ['product' => $product]) --}} + @include ('shop::products.review', ['product' => $product]) @include ('shop::products.price', ['product' => $product]) @include ('shop::products.view.stock') -
{{ $product->short_description }}
diff --git a/public/themes/default/assets/css/shop.css b/public/themes/default/assets/css/shop.css index 607334527..b181cfa3e 100644 --- a/public/themes/default/assets/css/shop.css +++ b/public/themes/default/assets/css/shop.css @@ -120,92 +120,6 @@ height: 18px; } -.product-card .product-image { - max-height: 350px; - max-width: 280px; - margin-bottom: 10px; - background: #F2F2F2; -} - -.product-card .product-image img { - display: block; - width: 100%; -} - -.product-card .product-name { - margin-bottom: 14px; - width: 100%; - color: #242424; -} - -.product-card .product-name a { - color: #242424; -} - -.product-card .product-description { - display: none; -} - -.product-card .product-ratings { - width: 100%; -} - -.product-card .product-ratings .icon { - width: 16px; - height: 16px; -} - -.product-card .cart-wish-wrap { - display: -webkit-inline-box; - display: -ms-inline-flexbox; - display: inline-flex; - -webkit-box-pack: start; - -ms-flex-pack: start; - justify-content: flex-start; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; - height: 40px; -} - -.product-card .cart-wish-wrap .addtocart { - margin-right: 10px; - text-transform: uppercase; -} - -.product-card .cart-wish-wrap .add-to-wishlist { - margin-top: 5px; -} - -.product-grid-4 { - display: grid; - grid-template-columns: repeat(auto-fill, minmax(235px, 1fr)); - grid-auto-rows: auto; - grid-column-gap: 48px; - grid-row-gap: 15px; -} - -.product-grid-3 { - display: grid; - grid-template-columns: repeat(auto-fill, minmax(235px, 1fr)); - grid-gap: 27px; - grid-auto-rows: auto; -} - -@media only screen and (max-width: 854px) { - .product-grid-4 { - grid-template-columns: 29.5% 29.5% 29.5%; - grid-column-gap: 35px; - } -} - -@media only screen and (max-width: 653px) { - .product-grid-4 { - grid-template-columns: 48.5% 48.5%; - grid-column-gap: 17px; - } -} - @media only screen and (max-width: 425px) { .product-card { font-size: 90%; @@ -616,6 +530,119 @@ body { display: block; } +.main-container-wrapper .product-grid-4 { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(235px, 1fr)); + grid-auto-rows: auto; + grid-column-gap: 48px; + grid-row-gap: 15px; +} + +.main-container-wrapper .product-grid-3 { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(235px, 1fr)); + grid-gap: 27px; + grid-auto-rows: auto; +} + +@media only screen and (max-width: 854px) { + .main-container-wrapper .product-grid-4 { + grid-template-columns: 29.5% 29.5% 29.5%; + grid-column-gap: 35px; + } +} + +@media only screen and (max-width: 653px) { + .main-container-wrapper .product-grid-4 { + grid-template-columns: 48.5% 48.5%; + grid-column-gap: 17px; + } +} + +.main-container-wrapper .product-card { + position: relative; +} + +.main-container-wrapper .product-card .product-image { + max-height: 350px; + max-width: 280px; + margin-bottom: 10px; + background: #F2F2F2; +} + +.main-container-wrapper .product-card .product-image img { + display: block; + width: 100%; +} + +.main-container-wrapper .product-card .product-name { + margin-bottom: 14px; + width: 100%; + color: #242424; +} + +.main-container-wrapper .product-card .product-name a { + color: #242424; +} + +.main-container-wrapper .product-card .product-description { + display: none; +} + +.main-container-wrapper .product-card .product-ratings { + width: 100%; +} + +.main-container-wrapper .product-card .product-ratings .icon { + width: 16px; + height: 16px; +} + +.main-container-wrapper .product-card .cart-wish-wrap { + display: -webkit-inline-box; + display: -ms-inline-flexbox; + display: inline-flex; + -webkit-box-pack: start; + -ms-flex-pack: start; + justify-content: flex-start; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + height: 40px; +} + +.main-container-wrapper .product-card .cart-wish-wrap .addtocart { + margin-right: 10px; + text-transform: uppercase; +} + +.main-container-wrapper .product-card .cart-wish-wrap .add-to-wishlist { + margin-top: 5px; +} + +.main-container-wrapper .product-card .sticker { + border-radius: 100px; + position: absolute; + top: 10px; + left: 10px; + text-transform: uppercase; + padding: 4px 13px; + font-size: 14px; + color: #fff; +} + +.main-container-wrapper .product-card .sticker.sale { + background: #FF6472; +} + +.main-container-wrapper .product-card .sticker.new { + background: #2ED04C; +} + +.main-container-wrapper .product-list { + min-height: 200px; +} + .main-container-wrapper .product-list .product-card { width: 100%; display: inline-block; @@ -642,6 +669,10 @@ body { margin-bottom: 0; } +.main-container-wrapper .product-list.empty h2 { + font-size: 20px; +} + .main-container-wrapper section.featured-products { display: block; margin-bottom: 5%; @@ -1685,6 +1716,7 @@ section.product-detail div.layouter form div.product-image-group .add-to-buttons width: 49%; background: black; white-space: nowrap; + text-transform: uppercase; } section.product-detail div.layouter form div.product-image-group .add-to-buttons .buynow { @@ -1692,6 +1724,7 @@ section.product-detail div.layouter form div.product-image-group .add-to-buttons width: 49%; float: right; white-space: nowrap; + text-transform: uppercase; } section.product-detail div.layouter form .details { From 258262935a4515c32514d1eb6609f3cf3608243f Mon Sep 17 00:00:00 2001 From: jitendra Date: Thu, 18 Oct 2018 11:54:36 +0530 Subject: [PATCH 2/2] user on 404 page fixed --- app/Http/Kernel.php | 3 +- packages/Webkul/Admin/src/Http/routes.php | 12 +-- .../src/Providers/AdminServiceProvider.php | 22 ++-- .../src/Resources/assets/images/logo.png | Bin 3235 -> 0 bytes .../Admin/src/Resources/assets/sass/app.scss | 24 ----- .../Resources/views/layouts/master.blade.php | 2 + .../Resources/views/layouts/nav-top.blade.php | 2 +- .../src/Resources/assets/images/favicon.ico | Bin 0 -> 5430 bytes .../assets/js/components/category-nav.vue | 5 - .../src/Resources/assets/sass/components.scss | 2 - .../views/layouts/header/index.blade.php | 98 +++++++++++------- .../Resources/views/layouts/master.blade.php | 6 ++ .../src/Resources/assets/images/favicon.ico | Bin 0 -> 5430 bytes .../Ui/src/Resources/assets/sass/app.scss | 5 + public/themes/default/assets/js/shop.js | 40 ++----- 15 files changed, 96 insertions(+), 125 deletions(-) delete mode 100644 packages/Webkul/Admin/src/Resources/assets/images/logo.png create mode 100644 packages/Webkul/Shop/src/Resources/assets/images/favicon.ico create mode 100644 packages/Webkul/Ui/src/Resources/assets/images/favicon.ico diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 1087cfa39..8537a5535 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -19,6 +19,7 @@ class Kernel extends HttpKernel \App\Http\Middleware\TrimStrings::class, \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class, \App\Http\Middleware\TrustProxies::class, + \Illuminate\Session\Middleware\StartSession::class, ]; /** @@ -31,7 +32,7 @@ class Kernel extends HttpKernel \App\Http\Middleware\EncryptCookies::class, \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class, \Illuminate\Session\Middleware\StartSession::class, - // \Illuminate\Session\Middleware\AuthenticateSession::class, + \Illuminate\Session\Middleware\AuthenticateSession::class, \Illuminate\View\Middleware\ShareErrorsFromSession::class, \App\Http\Middleware\VerifyCsrfToken::class, \Illuminate\Routing\Middleware\SubstituteBindings::class, diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index 878a88148..3b82f2c7f 100644 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -40,27 +40,27 @@ Route::group(['middleware' => ['web']], function () { Route::get('dashboard', 'Webkul\Admin\Http\Controllers\DashboardController@index')->name('admin.dashboard.index'); //Customers Management Routes - Route::get('customer', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@index')->defaults('_config', [ + Route::get('customers', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@index')->defaults('_config', [ 'view' => 'admin::customers.index' ])->name('admin.customer.index'); - Route::get('customer/orders', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@index')->defaults('_config',[ + Route::get('customers/orders', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@index')->defaults('_config',[ 'view' => 'admin::customers.orders.index' ])->name('admin.customer.orders.index'); - Route::get('customer/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@create')->defaults('_config',[ + Route::get('customers/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@create')->defaults('_config',[ 'view' => 'admin::customers.create' ])->name('admin.customer.create'); - Route::post('customer/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@store')->defaults('_config',[ + Route::post('customers/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@store')->defaults('_config',[ 'redirect' => 'admin.customer.index' ])->name('admin.customer.store'); - Route::get('customer/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@edit')->defaults('_config',[ + Route::get('customers/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@edit')->defaults('_config',[ 'view' => 'admin::customers.edit' ])->name('admin.customer.edit'); - Route::put('customer/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@update')->defaults('_config', [ + Route::put('customers/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@update')->defaults('_config', [ 'redirect' => 'admin.customer.index' ])->name('admin.customer.update'); diff --git a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php index 1fe463fbb..e9bbe7479 100644 --- a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php @@ -38,6 +38,15 @@ class AdminServiceProvider extends ServiceProvider ); } + /** + * Register services. + * + * @return void + */ + public function register() + { + } + /** * Bind the the data to the views * @@ -76,19 +85,6 @@ class AdminServiceProvider extends ServiceProvider }); } - /** - * Register services. - * - * @return void - */ - public function register() - { - // $this->mergeConfigFrom( - // __DIR__ . '/../Config/auth.php', - // 'auth' - // ); - } - /** * Merge the given configuration with the existing configuration. * diff --git a/packages/Webkul/Admin/src/Resources/assets/images/logo.png b/packages/Webkul/Admin/src/Resources/assets/images/logo.png deleted file mode 100644 index f3a6baf4d8290592b61e918e8d8a70e6a3fdf9c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3235 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 diff --git a/packages/Webkul/Admin/src/Resources/assets/sass/app.scss b/packages/Webkul/Admin/src/Resources/assets/sass/app.scss index 77b325653..43653f4a7 100644 --- a/packages/Webkul/Admin/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Admin/src/Resources/assets/sass/app.scss @@ -526,30 +526,6 @@ body { } } - - - - - - - - - - - - - - - - - - - - - - - - // customer oder css for admin start here .sale-container { .sale-section { diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php index a47db30c1..f1a786c9b 100644 --- a/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php @@ -7,6 +7,8 @@ + + diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php index a52a6a85d..36a6fc1bd 100644 --- a/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php @@ -14,7 +14,7 @@
- {{-- {{ auth()->guard('admin')->user()->name }} --}} + {{ auth()->guard('admin')->user()->name }} diff --git a/packages/Webkul/Shop/src/Resources/assets/images/favicon.ico b/packages/Webkul/Shop/src/Resources/assets/images/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..e9c217bb395c0bd8eb3ea6755633f62b0781ff2c GIT binary patch literal 5430 zcmeHLJx?1!6dYm`qwwj&1+tKE1*sww=zrc()9%jBd$XQfpS=f6;0+cQz_y3|Ca?;i*BgwFiT@z> zo*27i3~)BVtKEQD!Y^jYRj!{eI}l6M`NIxayi@LQHZZRItvSf2+5Elq@iP5vANlL? z@p0#8^{DfpTAfKOWmwX}QmX%uVP!3OXDRnMVGRwAPg3lxEHA^`O{|l9pYq-B|Hze#QLvzu)5?*ZN@x#_hLXFRX6=z47bE#Sdpod2}%>-pmt->UEbzwq_^ag1NIyJdAPIBV;f)pqt{ zjzuHHZMQMUHC$C*gL0V@s%f3;bTE_K3k9AiN4eJeRr!4Xu}L2exd;AI>+U7kS4`)s i*2#D`!2D~5%-_gMwE807e~WyZ5IJv%^jjj2EAkA9Xf6r> literal 0 HcmV?d00001 diff --git a/packages/Webkul/Shop/src/Resources/assets/js/components/category-nav.vue b/packages/Webkul/Shop/src/Resources/assets/js/components/category-nav.vue index 286ff15cf..e82d91329 100644 --- a/packages/Webkul/Shop/src/Resources/assets/js/components/category-nav.vue +++ b/packages/Webkul/Shop/src/Resources/assets/js/components/category-nav.vue @@ -7,11 +7,6 @@ :item="item" :parent="index"> - -
  • - - Offer Zone -
    • diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/components.scss b/packages/Webkul/Shop/src/Resources/assets/sass/components.scss index b4c9bfa0a..b5259a317 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/components.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/components.scss @@ -1,5 +1,3 @@ - - @media only screen and (max-width: 425px) { .product-card { font-size: 90%; diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php index 2a7be34ab..2f0b3455d 100644 --- a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php @@ -1,11 +1,14 @@ -