From 21a16b8cf0a5f4ab79859d50e42636d937ddd992 Mon Sep 17 00:00:00 2001 From: prashant-webkul Date: Thu, 16 Aug 2018 11:35:45 +0530 Subject: [PATCH] Refactored the code for datagrid from view composers to selft dependent injection classes and storefront views directory structure is segregated. --- .../ChannelsDataGrid.php} | 30 +++++----- .../CountryDataGrid.php} | 32 +++++----- .../CurrenciesDataGrid.php} | 31 +++++----- .../ExchangeRatesDataGrid.php} | 32 +++++----- .../InventorySourcesDataGrid.php} | 32 +++++----- .../LocalesDataGrid.php} | 31 +++++----- .../RolesDataGrid.php} | 32 +++++----- .../SliderDataGrid.php} | 33 ++++++----- .../UserDataGrid.php} | 47 ++++++++------- .../src/Providers/AdminServiceProvider.php | 2 - .../src/Providers/ComposerServiceProvider.php | 58 ------------------- .../views/settings/channels/index.blade.php | 3 +- .../views/settings/countries/index.blade.php | 3 +- .../views/settings/currencies/index.blade.php | 3 +- .../settings/exchange_rates/index.blade.php | 3 +- .../inventory_sources/index.blade.php | 3 +- .../views/settings/locales/index.blade.php | 4 +- .../views/settings/sliders/index.blade.php | 3 +- .../views/users/roles/index.blade.php | 3 +- .../views/users/users/index.blade.php | 1 + .../Http/Controllers/CategoryController.php | 3 +- packages/Webkul/Shop/src/Http/routes.php | 4 +- .../src/Providers/ComposerServiceProvider.php | 2 +- .../Shop/src/Resources/assets/sass/app.scss | 5 +- .../account/profile/edit/index.blade.php | 2 +- .../account/profile/home/index.blade.php | 2 +- .../views/customers/session/index.blade.php | 2 +- .../views/customers/signup/index.blade.php | 2 +- .../views/{store => }/layouts/foo.blade.php | 0 .../{store => layouts}/footer/index.blade.php | 0 .../{store => layouts}/header/index.blade.php | 2 +- .../header/nav-menu/navmenu.blade.php | 0 .../{store => }/layouts/master.blade.php | 4 +- .../views/store/home/index.blade.php | 2 +- .../product/{ => details}/index.blade.php | 2 +- .../store/product/review/index.blade.php | 2 +- .../product/{ => view}/cart/index.blade.php | 2 +- .../store/product/view/compare.blade.php | 0 .../store/product/view/sharelinks.blade.php | 0 .../store/product/view/wishlist.blade.php | 0 .../Webkul/Ui/src/DataGrid/ProductGrid.php | 9 +++ 41 files changed, 205 insertions(+), 226 deletions(-) rename packages/Webkul/Admin/src/{Http/ViewComposers/DataGrids/ChannelsComposer.php => DataGrids/ChannelsDataGrid.php} (90%) rename packages/Webkul/Admin/src/{Http/ViewComposers/DataGrids/CountryComposer.php => DataGrids/CountryDataGrid.php} (91%) rename packages/Webkul/Admin/src/{Http/ViewComposers/DataGrids/CurrenciesComposer.php => DataGrids/CurrenciesDataGrid.php} (89%) rename packages/Webkul/Admin/src/{Http/ViewComposers/DataGrids/ExchangeRatesComposer.php => DataGrids/ExchangeRatesDataGrid.php} (89%) rename packages/Webkul/Admin/src/{Http/ViewComposers/DataGrids/InventorySourcesComposer.php => DataGrids/InventorySourcesDataGrid.php} (89%) rename packages/Webkul/Admin/src/{Http/ViewComposers/DataGrids/LocalesComposer.php => DataGrids/LocalesDataGrid.php} (89%) rename packages/Webkul/Admin/src/{Http/ViewComposers/DataGrids/RolesComposer.php => DataGrids/RolesDataGrid.php} (89%) rename packages/Webkul/Admin/src/{Http/ViewComposers/DataGrids/SliderComposer.php => DataGrids/SliderDataGrid.php} (90%) rename packages/Webkul/Admin/src/{Http/ViewComposers/DataGrids/UserComposer.php => DataGrids/UserDataGrid.php} (90%) delete mode 100644 packages/Webkul/Admin/src/Providers/ComposerServiceProvider.php rename packages/Webkul/Shop/src/Resources/views/{store => }/layouts/foo.blade.php (100%) rename packages/Webkul/Shop/src/Resources/views/{store => layouts}/footer/index.blade.php (100%) rename packages/Webkul/Shop/src/Resources/views/{store => layouts}/header/index.blade.php (98%) rename packages/Webkul/Shop/src/Resources/views/{store => layouts}/header/nav-menu/navmenu.blade.php (100%) rename packages/Webkul/Shop/src/Resources/views/{store => }/layouts/master.blade.php (95%) rename packages/Webkul/Shop/src/Resources/views/store/product/{ => details}/index.blade.php (99%) rename packages/Webkul/Shop/src/Resources/views/store/product/{ => view}/cart/index.blade.php (99%) create mode 100644 packages/Webkul/Shop/src/Resources/views/store/product/view/compare.blade.php create mode 100644 packages/Webkul/Shop/src/Resources/views/store/product/view/sharelinks.blade.php create mode 100644 packages/Webkul/Shop/src/Resources/views/store/product/view/wishlist.blade.php diff --git a/packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/ChannelsComposer.php b/packages/Webkul/Admin/src/DataGrids/ChannelsDataGrid.php similarity index 90% rename from packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/ChannelsComposer.php rename to packages/Webkul/Admin/src/DataGrids/ChannelsDataGrid.php index 9a213fa8a..2efa69aeb 100644 --- a/packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/ChannelsComposer.php +++ b/packages/Webkul/Admin/src/DataGrids/ChannelsDataGrid.php @@ -1,13 +1,19 @@ @prashant-webkul + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ + +class ChannelsDataGrid { /** * The Data Grid implementation. @@ -16,17 +22,10 @@ class ChannelsComposer * for countries */ - - /** - * Bind data to the view. - * - * @param View $view - * @return void - */ - public function compose(View $view) + public function createChannelsDataGrid() { - $datagrid = DataGrid::make([ + return DataGrid::make([ 'name' => 'Channels', 'table' => 'channels', 'select' => 'id', @@ -148,7 +147,10 @@ class ChannelsComposer ]); - $view->with('datagrid', $datagrid); - // $view->with('count', $this->users->count()); + } + + public function render() + { + return $this->createChannelsDataGrid()->render(); } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/CountryComposer.php b/packages/Webkul/Admin/src/DataGrids/CountryDataGrid.php similarity index 91% rename from packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/CountryComposer.php rename to packages/Webkul/Admin/src/DataGrids/CountryDataGrid.php index 7d4c1ae36..a3e91cbad 100644 --- a/packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/CountryComposer.php +++ b/packages/Webkul/Admin/src/DataGrids/CountryDataGrid.php @@ -1,13 +1,19 @@ @prashant-webkul + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ + +class CountryDataGrid { /** * The Data Grid implementation. @@ -16,17 +22,10 @@ class CountryComposer * for countries */ - - /** - * Bind data to the view. - * - * @param View $view - * @return void - */ - public function compose(View $view) + public function createCountryDataGrid() { - $datagrid = DataGrid::make([ + return DataGrid::make([ 'name' => 'Countries', 'table' => 'countries', 'select' => 'id', @@ -161,7 +160,12 @@ class CountryComposer ]); - $view->with('datagrid', $datagrid); - // $view->with('count', $this->users->count()); + } + + public function render() + { + + return $this->createCountryDataGrid()->render(); + } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/CurrenciesComposer.php b/packages/Webkul/Admin/src/DataGrids/CurrenciesDataGrid.php similarity index 89% rename from packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/CurrenciesComposer.php rename to packages/Webkul/Admin/src/DataGrids/CurrenciesDataGrid.php index b489aa97d..ec58fad13 100644 --- a/packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/CurrenciesComposer.php +++ b/packages/Webkul/Admin/src/DataGrids/CurrenciesDataGrid.php @@ -1,32 +1,30 @@ @prashant-webkul + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ -class CurrenciesComposer +class CurrenciesDataGrid { /** * The Data Grid implementation. * - * @var CountryComposer + * @var CurrenciesDataGrid * for countries */ - - /** - * Bind data to the view. - * - * @param View $view - * @return void - */ - public function compose(View $view) + public function createCurrencyDataGrid() { - $datagrid = DataGrid::make([ + return DataGrid::make([ 'name' => 'Currencies', 'table' => 'currencies', 'select' => 'id', @@ -148,7 +146,10 @@ class CurrenciesComposer ]); - $view->with('datagrid', $datagrid); - // $view->with('count', $this->users->count()); + } + + public function render() + { + return $this->createCurrencyDataGrid()->render(); } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/ExchangeRatesComposer.php b/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php similarity index 89% rename from packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/ExchangeRatesComposer.php rename to packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php index c207f3881..a2f66ae0d 100644 --- a/packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/ExchangeRatesComposer.php +++ b/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php @@ -1,32 +1,31 @@ @prashant-webkul + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ -class ExchangeRatesComposer +class ExchangeRatesDataGrid { /** * The Data Grid implementation. * - * @var CountryComposer - * for countries + * @var ExchangeRatesDataGrid + * for Exchange Rates */ - /** - * Bind data to the view. - * - * @param View $view - * @return void - */ - public function compose(View $view) + public function createExchangeRatesDataGrid() { - $datagrid = DataGrid::make([ + return DataGrid::make([ 'name' => 'Exchange Rates', 'table' => 'currency_exchange_rates', 'select' => 'id', @@ -156,7 +155,10 @@ class ExchangeRatesComposer ]); - $view->with('datagrid', $datagrid); - // $view->with('count', $this->users->count()); + } + + public function render() + { + return $this->createExchangeRatesDataGrid()->render(); } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/InventorySourcesComposer.php b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php similarity index 89% rename from packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/InventorySourcesComposer.php rename to packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php index b6b2c4083..2c17f7457 100644 --- a/packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/InventorySourcesComposer.php +++ b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php @@ -1,32 +1,29 @@ @prashant-webkul + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ -class InventorySourcesComposer +class InventorySourcesDataGrid { /** * The Data Grid implementation. * - * @var CountryComposer - * for countries + * @var InventorySourcesDataGrid + * for Inventory Sources */ - - /** - * Bind data to the view. - * - * @param View $view - * @return void - */ - public function compose(View $view) + public function createInventorySourcesDataGrid() { - - $datagrid = DataGrid::make([ + return DataGrid::make([ 'name' => 'Inventory Sources', 'table' => 'inventory_sources', 'select' => 'id', @@ -161,7 +158,10 @@ class InventorySourcesComposer // 'css' => [] ]); + } - $view->with('datagrid', $datagrid); + public function render() + { + return $this->createInventorySourcesDataGrid()->render(); } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/LocalesComposer.php b/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php similarity index 89% rename from packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/LocalesComposer.php rename to packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php index 8de71b5c9..ff2abe687 100644 --- a/packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/LocalesComposer.php +++ b/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php @@ -1,32 +1,30 @@ @prashant-webkul + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ -class LocalesComposer +class LocalesDataGrid { /** * The Data Grid implementation. * - * @var CountryComposer + * @var CountryDataGrid * for countries */ - - /** - * Bind data to the view. - * - * @param View $view - * @return void - */ - public function compose(View $view) + public function createCountryDataGrid() { - $datagrid = DataGrid::make([ + return DataGrid::make([ 'name' => 'Locales', 'table' => 'locales', 'select' => 'id', @@ -148,7 +146,10 @@ class LocalesComposer ]); - $view->with('datagrid', $datagrid); - // $view->with('count', $this->users->count()); + } + + public function render() + { + return $this->createCountryDataGrid()->render(); } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/RolesComposer.php b/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php similarity index 89% rename from packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/RolesComposer.php rename to packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php index 82b31fcc9..bc6d46f04 100644 --- a/packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/RolesComposer.php +++ b/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php @@ -1,32 +1,31 @@ @prashant-webkul + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ -class RolesComposer +class RolesDataGrid { /** * The Data Grid implementation. * - * @var CountryComposer - * for countries + * @var RolesDataGrid + * for Roles */ - /** - * Bind data to the view. - * - * @param View $view - * @return void - */ - public function compose(View $view) + public function createRolesDataGrid() { - $datagrid = DataGrid::make([ + return DataGrid::make([ 'name' => 'Roles', 'table' => 'roles', 'select' => 'id', @@ -148,7 +147,10 @@ class RolesComposer ]); - $view->with('datagrid', $datagrid); - // $view->with('count', $this->users->count()); + } + + public function render() + { + return $this->createRolesDataGrid()->render(); } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/SliderComposer.php b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php similarity index 90% rename from packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/SliderComposer.php rename to packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php index 480437e8d..3c9d36b19 100644 --- a/packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/SliderComposer.php +++ b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php @@ -1,32 +1,30 @@ @prashant-webkul + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ -class SliderComposer +class SliderDataGrid { /** * The Data Grid implementation. * - * @var CountryComposer - * for countries + * @var SliderDataGrid + * for Sliders */ - - /** - * Bind data to the view. - * - * @param View $view - * @return void - */ - public function compose(View $view) + public function createSliderDataGrid() { - $datagrid = DataGrid::make([ + return DataGrid::make([ 'name' => 'Sliders', 'table' => 'sliders as s', 'select' => 's.id', @@ -153,7 +151,10 @@ class SliderComposer ]); - $view->with('datagrid', $datagrid); - // $view->with('count', $this->users->count()); + } + + public function render() + { + return $this->createSliderDataGrid()->render(); } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/UserComposer.php b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php similarity index 90% rename from packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/UserComposer.php rename to packages/Webkul/Admin/src/DataGrids/UserDataGrid.php index e64f8f4d5..0a3e1d42c 100644 --- a/packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/UserComposer.php +++ b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php @@ -1,33 +1,30 @@ @prashant-webkul + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ -class UserComposer +class UserDataGrid { /** * The Data Grid implementation. * - * @var UserComposer - * for admin + * @var UserDataGrid + * for admin users */ - protected $users; - - /** - * Bind data to the view. - * - * @param View $view - * @return void - */ - public function compose(View $view) + public function createUserDataGrid() { - $datagrid = DataGrid::make([ + return DataGrid::make([ 'name' => 'Admins', 'table' => 'admins as u', 'select' => 'u.id', @@ -59,7 +56,8 @@ class UserComposer 'route' => route('admin.datagrid.delete'), 'confirm_text' => 'Do you really want to do this?', 'icon' => 'icon pencil-lg-icon', - ], [ + ], + [ 'type' => 'Delete', 'route' => route('admin.datagrid.delete'), 'confirm_text' => 'Do you really want to do this?', @@ -148,12 +146,14 @@ class UserComposer 'alias' => 'Name', 'type' => 'string', 'label' => 'Name' - ], [ + ], + [ 'column' => 'u.id', 'alias' => 'ID', 'type' => 'number', 'label' => 'Admin ID' - ], [ + ], + [ 'column' => 'r.id', 'alias' => 'Role_ID', 'type' => 'number', @@ -166,7 +166,8 @@ class UserComposer 'column' => 'u.email', 'type' => 'string', 'label' => 'E-Mail' - ], [ + ], + [ 'column' => 'u.name', 'type' => 'string', 'label' => 'Name' @@ -187,7 +188,11 @@ class UserComposer ]); - $view->with('datagrid', $datagrid); - // $view->with('count', $this->users->count()); + } + + public function render() { + + return $this->createUserDataGrid()->render(); + } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php index 66e18b19c..5e94fd48d 100644 --- a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php @@ -6,7 +6,6 @@ use Illuminate\Support\ServiceProvider; use Illuminate\Support\Facades\Event; use Illuminate\Support\Facades\Blade; use Webkul\Admin\Providers\EventServiceProvider; -use Webkul\Admin\Providers\ComposerServiceProvider; class AdminServiceProvider extends ServiceProvider { @@ -30,7 +29,6 @@ class AdminServiceProvider extends ServiceProvider $this->composeView(); $this->app->register(EventServiceProvider::class); - $this->app->register(ComposerServiceProvider::class); } /** diff --git a/packages/Webkul/Admin/src/Providers/ComposerServiceProvider.php b/packages/Webkul/Admin/src/Providers/ComposerServiceProvider.php deleted file mode 100644 index ce77d7de8..000000000 --- a/packages/Webkul/Admin/src/Providers/ComposerServiceProvider.php +++ /dev/null @@ -1,58 +0,0 @@ -
- {!! $datagrid->render() !!} + @inject('channels','Webkul\Admin\DataGrids\ChannelsDataGrid') + {!! $channels->render() !!}
@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/settings/countries/index.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/countries/index.blade.php index 69216c383..571bf7471 100644 --- a/packages/Webkul/Admin/src/Resources/views/settings/countries/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/countries/index.blade.php @@ -15,7 +15,8 @@
- {!! $datagrid->render() !!} + @inject('countries','Webkul\Admin\DataGrids\CountryDataGrid') + {!! $countries->render() !!}
@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/settings/currencies/index.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/currencies/index.blade.php index dd000e54d..f34017be7 100644 --- a/packages/Webkul/Admin/src/Resources/views/settings/currencies/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/currencies/index.blade.php @@ -15,7 +15,8 @@
- {!! $datagrid->render() !!} + @inject('currencies','Webkul\Admin\DataGrids\CurrenciesDataGrid') + {!! $currencies->render() !!}
@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/index.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/index.blade.php index 7f9488f70..e42db46f0 100644 --- a/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/index.blade.php @@ -19,7 +19,8 @@
- {!! $datagrid->render() !!} + @inject('exchange_rates','Webkul\Admin\DataGrids\ExchangeRatesDataGrid') + {!! $exchange_rates->render() !!}
@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/index.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/index.blade.php index 8aec9b881..d87341499 100644 --- a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/index.blade.php @@ -19,7 +19,8 @@
- {!! $datagrid->render() !!} + @inject('inventory_sources','Webkul\Admin\DataGrids\InventorySourcesDataGrid') + {!! $inventory_sources->render() !!}
@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/settings/locales/index.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/locales/index.blade.php index 18a88a1b3..198a3ebd5 100644 --- a/packages/Webkul/Admin/src/Resources/views/settings/locales/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/locales/index.blade.php @@ -15,7 +15,9 @@
- {!! $datagrid->render() !!} + + @inject('locales','Webkul\Admin\DataGrids\LocalesDataGrid') + {!! $locales->render() !!}
@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/settings/sliders/index.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/sliders/index.blade.php index 5b2ce8c55..92ffef011 100644 --- a/packages/Webkul/Admin/src/Resources/views/settings/sliders/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/sliders/index.blade.php @@ -15,7 +15,8 @@
- {!! $datagrid->render() !!} + @inject('sliders','Webkul\Admin\DataGrids\SliderDataGrid') + {!! $sliders->render() !!}
@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/users/roles/index.blade.php b/packages/Webkul/Admin/src/Resources/views/users/roles/index.blade.php index 1088d3f8b..5dd7de322 100644 --- a/packages/Webkul/Admin/src/Resources/views/users/roles/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/users/roles/index.blade.php @@ -15,7 +15,8 @@
- {!! $datagrid->render() !!} + @inject('roles','Webkul\Admin\DataGrids\RolesDataGrid') + {!! $roles->render() !!}
@stop diff --git a/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php b/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php index 122c72bf1..d972647e2 100644 --- a/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php @@ -20,6 +20,7 @@
+ @inject('datagrid','Webkul\Admin\DataGrids\UserDataGrid') {!! $datagrid->render() !!} {{-- --}}
diff --git a/packages/Webkul/Shop/src/Http/Controllers/CategoryController.php b/packages/Webkul/Shop/src/Http/Controllers/CategoryController.php index 52e58c992..7bd645606 100644 --- a/packages/Webkul/Shop/src/Http/Controllers/CategoryController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/CategoryController.php @@ -7,11 +7,12 @@ use Illuminate\Http\Response; use Illuminate\Routing\Controller; /** - * Admin user session controller + * Products Category controller * * @author Prashant Singh * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) */ + class CategoryController extends controller { diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php index 0e058027a..75b90458b 100644 --- a/packages/Webkul/Shop/src/Http/routes.php +++ b/packages/Webkul/Shop/src/Http/routes.php @@ -7,7 +7,7 @@ Route::group(['middleware' => ['web']], function () { ])->name('store.home'); Route::get('/product', 'Webkul\Shop\Http\Controllers\CategoryController@index')->defaults('_config', [ - 'view' => 'shop::store.product.index' + 'view' => 'shop::store.product.details.index' ]); Route::get('/product-review', function() { @@ -15,7 +15,7 @@ Route::group(['middleware' => ['web']], function () { }); Route::get('/cart', function() { - return view('shop::store.product.cart.index'); + return view('shop::store.product.view.cart.index'); }); }); diff --git a/packages/Webkul/Shop/src/Providers/ComposerServiceProvider.php b/packages/Webkul/Shop/src/Providers/ComposerServiceProvider.php index 5b893f6ac..470efa738 100644 --- a/packages/Webkul/Shop/src/Providers/ComposerServiceProvider.php +++ b/packages/Webkul/Shop/src/Providers/ComposerServiceProvider.php @@ -17,7 +17,7 @@ class ComposerServiceProvider extends ServiceProvider public function boot() { //using the class based composers... - View::composer('shop::store.header.index', 'Webkul\Shop\Http\ViewComposers\Categories\CategoryComposer'); + View::composer('shop::layouts.header.index', 'Webkul\Shop\Http\ViewComposers\Categories\CategoryComposer'); } /** diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index e4367398d..933f1c307 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -792,8 +792,9 @@ section.product-detail, section.product-review { margin-top: 30px; .title-inline { - display: inline-block; - vertical-align: middle; + display: inline-flex; + align-items: center; + justify-content: space-between; margin-bottom: 20px; width: 100%; diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit/index.blade.php index 8201ce76b..a35fba810 100644 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit/index.blade.php @@ -1,4 +1,4 @@ -@extends('shop::store.layouts.master') +@extends('shop::layouts.master') @section('content-wrapper')