diff --git a/packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/UserComposer.php b/packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/UserComposer.php index e9678445c..028d9bd6f 100644 --- a/packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/UserComposer.php +++ b/packages/Webkul/Admin/src/Http/ViewComposers/DataGrids/UserComposer.php @@ -10,23 +10,13 @@ use Webkul\Ui\DataGrid\Facades\DataGrid; class UserComposer { /** - * The user repository implementation. + * The Data Grid implementation. * - * @var UserRepository + * @var UserComposer + * for admin */ protected $users; - /** - * Create a new profile composer. - * - * @param UserRepository $users - * @return void - */ - // public function __construct(UserRepository $users) - // { - // // Dependencies automatically resolved by service container... - // $this->users = $users; - // } /** * Bind data to the view. diff --git a/packages/Webkul/Customer/src/Http/routes.php b/packages/Webkul/Customer/src/Http/routes.php index 7115781ec..792e66916 100644 --- a/packages/Webkul/Customer/src/Http/routes.php +++ b/packages/Webkul/Customer/src/Http/routes.php @@ -20,7 +20,7 @@ Route::group(['middleware' => ['web']], function () { Route::post('register', 'Webkul\Customer\Http\Controllers\RegistrationController@create')->defaults('_config', [ 'redirect' => 'customer.account.profile', - ])->name('customer.register.create'); + ])->name('customer.register.create'); //redirect attribute will get changed immediately to account.index when account's index page will be made // Auth Routes Route::group(['middleware' => ['customer']], function () { @@ -33,12 +33,12 @@ Route::group(['middleware' => ['web']], function () { //customer account Route::prefix('account')->group(function () { Route::get('profile', 'Webkul\Customer\Http\Controllers\CustomerController@profile')->defaults('_config', [ - 'view' => 'shop::customers.profile.home.index' + 'view' => 'shop::customers.account.profile.home.index' ])->name('customer.account.profile'); //profile edit Route::get('profile/edit', 'Webkul\Customer\Http\Controllers\CustomerController@editProfile')->defaults('_config', [ - 'view' => 'shop::customers.profile.edit.index' + 'view' => 'shop::customers.account.profile.edit.index' ])->name('customer.profile.edit'); }); }); diff --git a/packages/Webkul/Customer/src/Providers/CustomerServiceProvider.php b/packages/Webkul/Customer/src/Providers/CustomerServiceProvider.php index 573093851..0749c8f21 100644 --- a/packages/Webkul/Customer/src/Providers/CustomerServiceProvider.php +++ b/packages/Webkul/Customer/src/Providers/CustomerServiceProvider.php @@ -27,10 +27,6 @@ class CustomerServiceProvider extends ServiceProvider $this->composeView(); - Blade::directive('continue', function () { - return ""; - }); - $this->app->register(EventServiceProvider::class); } @@ -46,7 +42,7 @@ class CustomerServiceProvider extends ServiceProvider protected function composeView() { - view()->composer(['shop::customers.profile.partials.sidemenu'], function ($view) { + view()->composer(['shop::customers.account.partials.sidemenu'], function ($view) { $menu = current(Event::fire('customer.menu.create')); $view->with('menu', $menu); diff --git a/packages/Webkul/Customer/src/Resources/assets/sass/_variables.scss b/packages/Webkul/Customer/src/Resources/assets/sass/_variables.scss deleted file mode 100644 index 9d8b4d18e..000000000 --- a/packages/Webkul/Customer/src/Resources/assets/sass/_variables.scss +++ /dev/null @@ -1,6 +0,0 @@ -$sign-up-text-color: #5e5e5e; -$login-text: #3a3a3a; -$background-color: #ffffff; -$border-color: #ffe8e8e8; -$forgot-password-color: #0031f0; -$profile-content-color: #5e5e5e; diff --git a/packages/Webkul/Customer/src/Resources/assets/sass/app.scss b/packages/Webkul/Customer/src/Resources/assets/sass/app.scss deleted file mode 100644 index 570c259ea..000000000 --- a/packages/Webkul/Customer/src/Resources/assets/sass/app.scss +++ /dev/null @@ -1,162 +0,0 @@ -@import "mixins"; -@import "variables"; - -.content { - padding-top: 15%; - padding-bottom: 15%; - - .sign-up-text { - margin-bottom: 2%; - margin-left: auto; - margin-right: auto; - text-align: center; - font-size: 18px; - color: $sign-up-text-color; - letter-spacing: -0.29px; - text-align: center; - } - .login-form { - margin-left: auto; - margin-right: auto; - display: flex; - background: $background-color; - border: 1px solid $border-color; - flex-direction: column; - max-width: 530px; - min-width: 380px; - min-height: 345px; - padding-left: 25px; - padding-right: 25px; - - .login-text { - font-size: 24px; - font-weight: bold; - color: $login-text; - letter-spacing: -0.23px; - margin-top: 5%; - margin-bottom: 3%; - } - - .control-group { - margin-bottom: 15px !important; - .control { - width: 100% !important; - } - } - - .forgot-password-link { - font-size: 17px; - color: $forgot-password-color; - letter-spacing: -0.11px; - margin-bottom: 5%; - } - .signup-confirm { - letter-spacing: -0.11px; - margin-bottom: 5%; - } - - .btn-primary { - width: 100%; - text-transform: uppercase; - border-radius: 0px; - height: 45px; - margin-bottom: 4%; - } - } -} - -.dashboard-content { - width: 100%; - display: flex; - flex-direction: row; - // border: 1px solid red; - margin-top: 5.5%; - margin-bottom: 5.5%; - - .dashboard-side-menu { - display: flex; - flex-direction: column; - align-content: center; - justify-content: flex-start; - border: 1px solid #e8e8e8; - background: #ffffff; - width: 25%; - height: 100%; - text-transform: capitalize; - font-size: 16px; - color: #5e5e5e; - - li { - font-size: 16px; - width: 100%; - height: 50px; - margin-left: 15px; - display: flex; - flex-direction: row; - justify-content: flex-start; - align-items: center; - // border: 1px solid $border-color; - // border-left: none; - // border-bottom: none; - border-bottom: 1px solid $border-color; - text-align: center; - } - li:first-child { - border-top: none; - } - li:last-child { - border-bottom: none; - } - } - - .profile { - margin-left: 5.5%; - margin-top: 1%; - width: 100%; - - .section-head { - // height: 50px; - - .profile-heading { - font-size: 28px; - color: #242424; - text-transform: capitalize; - text-align: left; - } - - .profile-edit { - font-size: 17px; - margin-top: 1%; - color: #0031f0; - letter-spacing: -0.11px; - float: right; - } - - .horizontal-rule { - margin-top: 1.1%; - width: 100%; - height: 1px; - vertical-align: middle; - background: #e8e8e8; - } - } - } - - .profile-content { - font-size: 16px; - color: $profile-content-color; - margin-top: 1.4%; - - table { - tbody { - tr { - height: 45px; - - td { - width: 250px; - } - } - } - } - } -} diff --git a/packages/Webkul/Shop/src/Http/ViewComposers/Categories/CategoryComposer.php b/packages/Webkul/Shop/src/Http/ViewComposers/Categories/CategoryComposer.php new file mode 100644 index 000000000..d81f06b02 --- /dev/null +++ b/packages/Webkul/Shop/src/Http/ViewComposers/Categories/CategoryComposer.php @@ -0,0 +1,41 @@ +category = $category; + } + + public function compose(View $view) + { + $collected_cat = array(); + $categories = $this->category->getCategoryTree(); + foreach ($categories as $category) { + array_push($collected_cat, collect($category)); + } + dd(count($collected_cat[0]['children'])); + $view->with('categories', $collected_cat); + } +} diff --git a/packages/Webkul/Shop/src/Providers/ComposerServiceProvider.php b/packages/Webkul/Shop/src/Providers/ComposerServiceProvider.php new file mode 100644 index 000000000..5b893f6ac --- /dev/null +++ b/packages/Webkul/Shop/src/Providers/ComposerServiceProvider.php @@ -0,0 +1,32 @@ +"; }); - // $this->app->register(EventServiceProvider::class); + $this->app->register(ComposerServiceProvider::class); } /** diff --git a/packages/Webkul/Shop/src/Resources/assets/js/app.js b/packages/Webkul/Shop/src/Resources/assets/js/app.js index e858139d2..2b909ea0e 100644 --- a/packages/Webkul/Shop/src/Resources/assets/js/app.js +++ b/packages/Webkul/Shop/src/Resources/assets/js/app.js @@ -30,6 +30,7 @@ $(window).resize(function() { $(document).ready(function() { Vue.component("image-slider", require("./components/imageSlider.vue")); + // Vue.component("nav-view", require("./components/navVue.vue")); /* Responsiveness script goes here */ var w = $(document).width(); var window = {}; diff --git a/packages/Webkul/Customer/src/Resources/assets/sass/_mixins.scss b/packages/Webkul/Shop/src/Resources/assets/js/components/navView.vue similarity index 100% rename from packages/Webkul/Customer/src/Resources/assets/sass/_mixins.scss rename to packages/Webkul/Shop/src/Resources/assets/js/components/navView.vue diff --git a/packages/Webkul/Shop/src/Resources/views/customers/profile/partials/sidemenu.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php similarity index 100% rename from packages/Webkul/Shop/src/Resources/views/customers/profile/partials/sidemenu.blade.php rename to packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php diff --git a/packages/Webkul/Shop/src/Resources/views/customers/profile/edit/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit/index.blade.php similarity index 98% rename from packages/Webkul/Shop/src/Resources/views/customers/profile/edit/index.blade.php rename to packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit/index.blade.php index 86dc5d38e..8201ce76b 100644 --- a/packages/Webkul/Shop/src/Resources/views/customers/profile/edit/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit/index.blade.php @@ -1,7 +1,7 @@ @extends('shop::store.layouts.master') @section('content-wrapper')
- @include('shop::customers.profile.partials.sidemenu') + @include('shop::customers.account.partials.sidemenu')
Edit Profile
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/profile/home/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/home/index.blade.php similarity index 96% rename from packages/Webkul/Shop/src/Resources/views/customers/profile/home/index.blade.php rename to packages/Webkul/Shop/src/Resources/views/customers/account/profile/home/index.blade.php index c17ca05a2..b6c57decf 100644 --- a/packages/Webkul/Shop/src/Resources/views/customers/profile/home/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/home/index.blade.php @@ -1,7 +1,7 @@ @extends('shop::store.layouts.master') @section('content-wrapper')