From 282d8695bc6dbbdc646b2ea0c0d3505c95e6855b Mon Sep 17 00:00:00 2001 From: prashant-webkul Date: Fri, 10 Aug 2018 14:58:35 +0530 Subject: [PATCH 01/18] Slider now working now make it responsive --- .../Http/Controllers/CategoryController.php | 26 ++++ .../src/Http/Controllers/HomeController.php | 8 +- .../src/Http/Controllers/SliderController.php | 2 +- .../Categories/CategoryComposer.php | 8 ++ packages/Webkul/Shop/src/Http/routes.php | 11 +- .../Shop/src/Resources/assets/js/app.js | 2 +- .../assets/js/components/image-slider.vue | 124 ++++++++++++++++++ .../assets/js/components/imageSlider.vue | 97 -------------- .../Shop/src/Resources/assets/sass/app.scss | 92 ++++++++----- .../views/store/category/index.blade.php | 3 + .../views/store/header/index.blade.php | 49 ++++++- 11 files changed, 281 insertions(+), 141 deletions(-) create mode 100644 packages/Webkul/Shop/src/Http/Controllers/CategoryController.php create mode 100644 packages/Webkul/Shop/src/Resources/assets/js/components/image-slider.vue delete mode 100644 packages/Webkul/Shop/src/Resources/assets/js/components/imageSlider.vue create mode 100644 packages/Webkul/Shop/src/Resources/views/store/category/index.blade.php diff --git a/packages/Webkul/Shop/src/Http/Controllers/CategoryController.php b/packages/Webkul/Shop/src/Http/Controllers/CategoryController.php new file mode 100644 index 000000000..52e58c992 --- /dev/null +++ b/packages/Webkul/Shop/src/Http/Controllers/CategoryController.php @@ -0,0 +1,26 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class CategoryController extends controller +{ + + public function __construct() + { + $this->_config = request('_config'); + } + public function index() + { + return view($this->_config['view']); + } +} diff --git a/packages/Webkul/Shop/src/Http/Controllers/HomeController.php b/packages/Webkul/Shop/src/Http/Controllers/HomeController.php index 8fcf85e12..2ae23eb58 100644 --- a/packages/Webkul/Shop/src/Http/Controllers/HomeController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/HomeController.php @@ -7,13 +7,15 @@ use Illuminate\Http\Response; use Illuminate\Routing\Controller; use Webkul\Core\Repositories\SliderRepository as Sliders; use Webkul\Channel\Channel as Channel; + /** - * Admin user session controller + * Home page controller * - * @author Jitendra Singh + * @author Prashant Singh * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) */ -class HomeController extends controller + + class HomeController extends controller { protected $_config; protected $sliders; diff --git a/packages/Webkul/Shop/src/Http/Controllers/SliderController.php b/packages/Webkul/Shop/src/Http/Controllers/SliderController.php index 22427acac..fb43efd6f 100644 --- a/packages/Webkul/Shop/src/Http/Controllers/SliderController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/SliderController.php @@ -9,7 +9,7 @@ use Webkul\Channel\Channel; use Webkul\Core\Repositories\SliderRepository as Slider; /** - * Slider controller + * Slider controller for managing the slider controls. * * @author Prashant Singh * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) diff --git a/packages/Webkul/Shop/src/Http/ViewComposers/Categories/CategoryComposer.php b/packages/Webkul/Shop/src/Http/ViewComposers/Categories/CategoryComposer.php index 2d7b849eb..8d6b07511 100644 --- a/packages/Webkul/Shop/src/Http/ViewComposers/Categories/CategoryComposer.php +++ b/packages/Webkul/Shop/src/Http/ViewComposers/Categories/CategoryComposer.php @@ -7,6 +7,14 @@ use Illuminate\Support\Collection; use Webkul\Category\Repositories\CategoryRepository as Category; + +/** + * Category List Composer on Navigation Menu + * + * @author Prashant Singh + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ + class CategoryComposer { /** diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php index d2a5138e3..438e7e4fb 100644 --- a/packages/Webkul/Shop/src/Http/routes.php +++ b/packages/Webkul/Shop/src/Http/routes.php @@ -1,11 +1,18 @@ ['web']], function () { + Route::get('/', 'Webkul\Shop\Http\Controllers\HomeController@index')->defaults('_config', [ - 'view' => 'shop::store.home.index' - ]); + 'view' => 'shop::store.home.index' + ])->name('store.home'); + + Route::get('/category', 'Webkul\Shop\Http\Controllers\CategoryController@index')->defaults('_config', [ + 'view' => 'shop::store.category.index' + ]); + }); + Route::group(['middleware' => ['web']], function () { Route::get('/foo', 'Webkul\Shop\Http\Controllers\HomeController@index1'); }); diff --git a/packages/Webkul/Shop/src/Resources/assets/js/app.js b/packages/Webkul/Shop/src/Resources/assets/js/app.js index 8b1427874..b9b9aa82b 100644 --- a/packages/Webkul/Shop/src/Resources/assets/js/app.js +++ b/packages/Webkul/Shop/src/Resources/assets/js/app.js @@ -8,7 +8,7 @@ Vue.use(VeeValidate); Vue.component("category-nav", require("./components/category-nav.vue")); Vue.component("category-item", require("./components/category-item.vue")); -Vue.component("image-slider", require("./components/imageSlider.vue")); +Vue.component("image-slider", require("./components/image-slider.vue")); $(document).ready(function () { diff --git a/packages/Webkul/Shop/src/Resources/assets/js/components/image-slider.vue b/packages/Webkul/Shop/src/Resources/assets/js/components/image-slider.vue new file mode 100644 index 000000000..c574d2997 --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/assets/js/components/image-slider.vue @@ -0,0 +1,124 @@ + + + \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/js/components/imageSlider.vue b/packages/Webkul/Shop/src/Resources/assets/js/components/imageSlider.vue deleted file mode 100644 index 50ba3ef47..000000000 --- a/packages/Webkul/Shop/src/Resources/assets/js/components/imageSlider.vue +++ /dev/null @@ -1,97 +0,0 @@ - - \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index 9ed514a3d..4c0a1c166 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -58,7 +58,7 @@ body { font-size: 14px; } - .q-c { + .search-icon-wrapper { box-sizing: border-box; height: 38px; width: 38px; @@ -111,10 +111,10 @@ body { } } - ul.product-dropdown-container { + ul.cart-dropdown { float: right; - li.product-dropdown { + li.cart-summary { display: flex; flex-direction: row; margin-left: 14px; @@ -307,40 +307,72 @@ body { .slider-block { display: block; width: 80%; + height: 500px; margin-left: auto; margin-right: auto; margin-bottom: 5%; .slider-content { + ul.slider-images { + + li{ + position: absolute; + display: none; + width: 80%; + object-fit: fill; + } + + li.show { + display:block; + height: 500px; + } + li img { width: 100%; height: 500px; object-fit: fill; } - .slider-control { - display: inline-block; - vertical-align: middle; - position: absolute; - right: 10%; - margin-top: -60px; - margin-right: 10px; - .dark-left-icon { - background-color: white; - height: 48px; - width: 48px; - max-height: 100%; - max-width: 100%; - } - .light-right-icon { - background-color: black; - height: 48px; - width: 48px; - max-height: 100%; - max-width: 100%; - } + // li img { + // position: absolute; + // display: none; + // width: 80%; + // height: 500px; + // object-fit: fill; + // } + + // li img.show { + // display:block; + // height: 500px; + // } + + } + .slider-control { + + display: inline-block; + vertical-align: middle; + position: absolute; + right: 10%; + margin-right: 10px; + margin-bottom: 1.8%; + user-select: none; + + .dark-left-icon { + background-color: white; + height: 48px; + width: 48px; + max-height: 100%; + max-width: 100%; + } + + .light-right-icon { + background-color: black; + height: 48px; + width: 48px; + max-height: 100%; + max-width: 100%; } } } @@ -796,7 +828,7 @@ body { padding-left: 10px; } - .q-c { + .search-icon-wrapper { box-sizing: border-box; height: 38px; width: 38px; @@ -840,10 +872,10 @@ body { } } - ul.product-dropdown-container { + ul.cart-dropdown { float: right; - li.product-dropdown { + li.cart-summary { display: flex; flex-direction: row; @@ -1178,7 +1210,7 @@ body { padding-left: 10px; } - .q-c { + .search-icon-wrapper { box-sizing: border-box; height: 38px; width: 38px; @@ -1222,10 +1254,10 @@ body { } } - ul.product-dropdown-container { + ul.cart-dropdown { float: right; - li.product-dropdown { + li.cart-summary { display: flex; flex-direction: row; diff --git a/packages/Webkul/Shop/src/Resources/views/store/category/index.blade.php b/packages/Webkul/Shop/src/Resources/views/store/category/index.blade.php new file mode 100644 index 000000000..3ab35b7a0 --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/views/store/category/index.blade.php @@ -0,0 +1,3 @@ +@extends('shop::store.layouts.master') +@section('content-wrapper') +@endsection diff --git a/packages/Webkul/Shop/src/Resources/views/store/header/index.blade.php b/packages/Webkul/Shop/src/Resources/views/store/header/index.blade.php index 9e78eb5b1..e50c1cb3b 100644 --- a/packages/Webkul/Shop/src/Resources/views/store/header/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/store/header/index.blade.php @@ -1,26 +1,31 @@
+
+
+ -
    +
    • -
      +
      • -
    +
+
+ {{-- Triggered on responsive mode only --}}
  • @@ -28,40 +33,68 @@
-
    -
  • +
      + +
    • + + 5Products + +
      • + + +
    + + {{-- Meant for responsive views only --}}
      +
    • {{-- use this section for the dropdown of the hamburger menu --}}
      • +
    +
+
    • @@ -71,9 +104,11 @@
+
- @include('shop::store.header.nav-menu.navmenu') + @include('shop::store.header.nav-menu.navmenu')
+
@section('javascript') 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 ef9b364ea..303f53038 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/index.blade.php @@ -10,7 +10,7 @@ @inject ('productHelper', 'Webkul\Product\Product\Collection') - getProductCollection($category->id); ?> + getCollection($category->id); ?> @foreach ($products as $product) diff --git a/packages/Webkul/Ui/src/DataGrid/ProductGrid.php b/packages/Webkul/Ui/src/DataGrid/ProductGrid.php index 2bbd665e0..bae6558f2 100644 --- a/packages/Webkul/Ui/src/DataGrid/ProductGrid.php +++ b/packages/Webkul/Ui/src/DataGrid/ProductGrid.php @@ -573,7 +573,7 @@ class ProductGrid $locale = app()->getLocale(); foreach (['name', 'description', 'short_description', 'price'] as $code) { - $attribute = $this->attributes->findBy('code', $code); + $attribute = $this->attributes->findOneByField('code', $code); $productValueAlias = 'pav_' . $attribute->code; @@ -628,7 +628,7 @@ class ProductGrid $locale = $this->locale; foreach ($this->attributeColumns as $code) { - $attribute = $this->attributes->findBy('code', $code); + $attribute = $this->attributes->findOneByField('code', $code); $productValueAlias = 'pav_' . $attribute->code; diff --git a/packages/Webkul/User/src/Http/Controllers/RoleController.php b/packages/Webkul/User/src/Http/Controllers/RoleController.php index 175879aec..0c6a231e2 100644 --- a/packages/Webkul/User/src/Http/Controllers/RoleController.php +++ b/packages/Webkul/User/src/Http/Controllers/RoleController.php @@ -89,7 +89,7 @@ class RoleController extends Controller */ public function edit($id) { - $role = $this->role->findOrFail($id); + $role = $this->role->find($id); return view($this->_config['view'], compact('role')); } diff --git a/packages/Webkul/User/src/Http/Controllers/UserController.php b/packages/Webkul/User/src/Http/Controllers/UserController.php index 6fc63d849..aec000b1a 100644 --- a/packages/Webkul/User/src/Http/Controllers/UserController.php +++ b/packages/Webkul/User/src/Http/Controllers/UserController.php @@ -100,7 +100,7 @@ class UserController extends Controller */ public function edit($id) { - $user = $this->admin->findOrFail($id); + $user = $this->admin->find($id); $roles = $this->role->all();