From 36a05a4bcd1e009f4d82285765818775b8a1fc75 Mon Sep 17 00:00:00 2001
From: prashant-webkul <prashant.singh852@webkul.com>
Date: Wed, 22 Aug 2018 10:41:48 +0530
Subject: [PATCH] Customer routes now tranferred in master route table for
 packages, removed display bug from navigation menu and removed the item from
 the root parent of navigation menu in storefront

---
 packages/Webkul/Admin/src/Http/routes.php     | 46 +++++++++++++++++++
 packages/Webkul/Customer/src/Http/routes.php  | 46 -------------------
 .../src/Providers/CustomerServiceProvider.php |  2 +-
 .../assets/js/components/category-item.vue    |  2 +-
 .../assets/js/components/category-nav.vue     |  3 +-
 .../Shop/src/Resources/assets/sass/app.scss   |  4 +-
 public/themes/default/assets/css/shop.css     |  2 +-
 public/themes/default/assets/js/shop.js       |  5 +-
 8 files changed, 57 insertions(+), 53 deletions(-)
 delete mode 100644 packages/Webkul/Customer/src/Http/routes.php

diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php
index ffa52dcad..12685443f 100644
--- a/packages/Webkul/Admin/src/Http/routes.php
+++ b/packages/Webkul/Admin/src/Http/routes.php
@@ -315,4 +315,50 @@ Route::group(['middleware' => ['web']], function () {
             ])->name('admin.sliders.store');
         });
     });
+
+
+    //customer routes starts here
+    Route::prefix('customer')->group(function () {
+
+        // Login Routes
+        Route::get('login', 'Webkul\Customer\Http\Controllers\SessionController@show')->defaults('_config', [
+            'view' => 'shop::customers.session.index',
+        ])->name('customer.session.index');
+
+        Route::post('login', 'Webkul\Customer\Http\Controllers\SessionController@create')->defaults('_config', [
+            'redirect' => 'customer.account.profile'
+        ])->name('customer.session.create');
+
+
+        // Registration Routes
+        Route::get('register', 'Webkul\Customer\Http\Controllers\RegistrationController@show')->defaults('_config', [
+            'view' => 'shop::customers.signup.index' //hint path
+        ])->name('customer.register.index');
+
+        Route::post('register', 'Webkul\Customer\Http\Controllers\RegistrationController@create')->defaults('_config', [
+            'redirect' => 'customer.account.profile',
+        ])->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 () {
+
+            //route for logout which will be under the auth guard of the customer by default
+            Route::get('logout', 'Webkul\Customer\Http\Controllers\SessionController@destroy')->defaults('_config', [
+                'redirect' => 'customer.session.index'
+            ])->name('customer.session.destroy');
+
+            //customer account
+            Route::prefix('account')->group(function () {
+                Route::get('profile', 'Webkul\Customer\Http\Controllers\CustomerController@profile')->defaults('_config', [
+                '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.account.profile.edit.index'
+                ])->name('customer.profile.edit');
+            });
+        });
+    });
+    //customer routes end here
 });
diff --git a/packages/Webkul/Customer/src/Http/routes.php b/packages/Webkul/Customer/src/Http/routes.php
deleted file mode 100644
index 65dd874ef..000000000
--- a/packages/Webkul/Customer/src/Http/routes.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-Route::group(['middleware' => ['web']], function () {
-    Route::prefix('customer')->group(function () {
-
-        // Login Routes
-        Route::get('login', 'Webkul\Customer\Http\Controllers\SessionController@show')->defaults('_config', [
-            'view' => 'shop::customers.session.index',
-        ])->name('customer.session.index');
-
-        Route::post('login', 'Webkul\Customer\Http\Controllers\SessionController@create')->defaults('_config', [
-            'redirect' => 'customer.account.profile'
-        ])->name('customer.session.create');
-
-
-        // Registration Routes
-        Route::get('register', 'Webkul\Customer\Http\Controllers\RegistrationController@show')->defaults('_config', [
-            'view' => 'shop::customers.signup.index' //hint path
-        ])->name('customer.register.index');
-
-        Route::post('register', 'Webkul\Customer\Http\Controllers\RegistrationController@create')->defaults('_config', [
-            'redirect' => 'customer.account.profile',
-        ])->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 () {
-
-            //route for logout which will be under the auth guard of the customer by default
-            Route::get('logout', 'Webkul\Customer\Http\Controllers\SessionController@destroy')->defaults('_config', [
-                'redirect' => 'customer.session.index'
-            ])->name('customer.session.destroy');
-
-            //customer account
-            Route::prefix('account')->group(function () {
-                Route::get('profile', 'Webkul\Customer\Http\Controllers\CustomerController@profile')->defaults('_config', [
-                '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.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 0749c8f21..e6109be99 100644
--- a/packages/Webkul/Customer/src/Providers/CustomerServiceProvider.php
+++ b/packages/Webkul/Customer/src/Providers/CustomerServiceProvider.php
@@ -13,7 +13,7 @@ class CustomerServiceProvider extends ServiceProvider
 {
     public function boot(Router $router)
     {
-        include __DIR__ . '/../Http/routes.php';
+        // include __DIR__ . '/../Http/routes.php';
 
         $this->publishes([
             __DIR__ . '/../../publishable/assets' => public_path('vendor/webkul/customer/assets'),
diff --git a/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue b/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue
index 2ffceecc3..e072840f4 100644
--- a/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue
+++ b/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue
@@ -1,7 +1,7 @@
 <template>
     <li>
         <a href="">{{ this.item['translations'][0].name }}&emsp;<i class="icon dropdown-right-icon"
-        v-if="haveChildren"></i></a>
+        v-if="haveChildren && item.parent_id != null"></i></a>
         <ul v-if="haveChildren">
             <category-item
                 v-for="(child, index) in item.children"
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 6bbcda3bd..d879344c0 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
@@ -5,7 +5,8 @@
             v-for="(item, index) in items"
             :key="index"
             :url="url"
-            :item="item">
+            :item="item"
+            :parent="index">
         </category-item>
         <li>
             <img src="vendor/webkul/shop/assets/images/offer-zone.svg"/>
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
index 5b9425167..51b490301 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
@@ -214,6 +214,7 @@ body {
         .nav > li {
             float: left;
             margin-right: 1px;
+
         }
 
         .nav > li > a {
@@ -267,7 +268,7 @@ body {
         .nav > li li:hover > ul {
             left: 100%;
             margin-left: 1px;
-            top: -1px;
+            top: -2px;
         }
 
         .nav > li:hover > a:first-child:nth-last-child(2):before {
@@ -281,6 +282,7 @@ body {
         .nav li li:hover > a:first-child:nth-last-child(2):before {
             right: 10px;
         }
+
     }
 }
 
diff --git a/public/themes/default/assets/css/shop.css b/public/themes/default/assets/css/shop.css
index 21951f975..bcaa5163f 100644
--- a/public/themes/default/assets/css/shop.css
+++ b/public/themes/default/assets/css/shop.css
@@ -332,7 +332,7 @@ body {
 .header .header-bottom .nav > li li:hover > ul {
   left: 100%;
   margin-left: 1px;
-  top: -1px;
+  top: -2px;
 }
 
 .header .header-bottom .nav > li:hover > a:first-child:nth-last-child(2):before {
diff --git a/public/themes/default/assets/js/shop.js b/public/themes/default/assets/js/shop.js
index 7fda5f523..87f8eea4e 100644
--- a/public/themes/default/assets/js/shop.js
+++ b/public/themes/default/assets/js/shop.js
@@ -29115,6 +29115,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 //
 //
 //
+//
 
 
 // define the item component
@@ -29160,7 +29161,7 @@ var render = function() {
       _vm._l(_vm.items, function(item, index) {
         return _c("category-item", {
           key: index,
-          attrs: { url: _vm.url, item: item }
+          attrs: { url: _vm.url, item: item, parent: index }
         })
       }),
       _vm._v(" "),
@@ -29293,7 +29294,7 @@ var render = function() {
   return _c("li", [
     _c("a", { attrs: { href: "" } }, [
       _vm._v(_vm._s(this.item["translations"][0].name) + " "),
-      _vm.haveChildren
+      _vm.haveChildren && _vm.item.parent_id != null
         ? _c("i", { staticClass: "icon dropdown-right-icon" })
         : _vm._e()
     ]),