From 9123ce9f5f45974a1904c78fd6c584e4a1ce6007 Mon Sep 17 00:00:00 2001
From: joan <joan@verdnatura.es>
Date: Tue, 19 Apr 2022 11:03:37 +0200
Subject: [PATCH] Changes

---
 src/layouts/MainLayout.vue            |  7 +------
 src/pages/Customer/CustomerLayout.vue | 15 ---------------
 src/pages/Customer/CustomerList.vue   | 22 ++++++++--------------
 src/pages/Customer/CustomerMain.vue   | 21 +++++++++++++++++++++
 src/router/routes.js                  | 22 +++++++++++++++-------
 5 files changed, 45 insertions(+), 42 deletions(-)
 create mode 100644 src/pages/Customer/CustomerMain.vue

diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue
index c26912fa4..4d43d79b8 100644
--- a/src/layouts/MainLayout.vue
+++ b/src/layouts/MainLayout.vue
@@ -13,12 +13,7 @@ import Navbar from 'src/components/Navbar.vue';
 <template>
     <q-layout view="hHh lpR fFf">
         <Navbar @toggle-drawer="onToggleDrawer()" />
-        <slot name="drawer"></slot>
-        <q-page-container>
-
-            <router-view>
-            </router-view>
-        </q-page-container>
+        <router-view> </router-view>
     </q-layout>
 </template>
 
diff --git a/src/pages/Customer/CustomerLayout.vue b/src/pages/Customer/CustomerLayout.vue
index 755652635..2785996d8 100644
--- a/src/pages/Customer/CustomerLayout.vue
+++ b/src/pages/Customer/CustomerLayout.vue
@@ -1,18 +1,3 @@
-<script setup>
-import { ref } from 'vue';
-import LeftMenu from 'src/components/LeftMenu.vue';
-const drawer = ref(false);
-const miniState = ref(true);
-</script>
 <template>
-    <slot name="drawer">
-        <q-drawer v-model="drawer" show-if-above :mini="miniState" @mouseover="miniState = false"
-            @mouseout="miniState = true" mini-to-overlay :width="200" :breakpoint="500">
-            <q-scroll-area class="fit text-grey-8">
-                <LeftMenu />
-            </q-scroll-area>
-        </q-drawer>
-
-    </slot>
     <router-view></router-view>
 </template>
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 47960b007..22dc02b7b 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -25,9 +25,14 @@ const customers = [
 function navigate(id) {
     router.push({ path: `/customer/${id}` });
 }
+
+// function onToggleDrawer() {
+//     drawer.value = !drawer.value;
+// }
 </script>
 
 <template>
+
     <q-page class="q-pa-md">
         <div class="column items-center q-gutter-y-md">
             <q-card v-for="customer in customers" :key="customer.id" class="card">
@@ -67,24 +72,13 @@ function navigate(id) {
                     </q-btn>
                     <q-separator vertical />
                     <q-card-actions vertical class="justify-between">
-                        <q-btn
-                            flat
-                            round
-                            color="orange"
-                            icon="arrow_circle_right"
-                            @click="navigate(customer.id)"
-                        />
+                        <q-btn flat round color="orange" icon="arrow_circle_right" @click="navigate(customer.id)" />
                         <q-btn flat round color="accent" icon="preview" />
                         <q-btn flat round color="accent" icon="vn:ticket" />
                         <q-card-actions>
-                            <q-btn
-                                color="grey"
-                                round
-                                flat
-                                dense
+                            <q-btn color="grey" round flat dense
                                 :icon="customer.expanded.value ? 'keyboard_arrow_up' : 'keyboard_arrow_down'"
-                                @click="customer.expanded.value = !customer.expanded.value"
-                            />
+                                @click="customer.expanded.value = !customer.expanded.value" />
                         </q-card-actions>
                     </q-card-actions>
                 </q-item>
diff --git a/src/pages/Customer/CustomerMain.vue b/src/pages/Customer/CustomerMain.vue
new file mode 100644
index 000000000..6f54e6e21
--- /dev/null
+++ b/src/pages/Customer/CustomerMain.vue
@@ -0,0 +1,21 @@
+<script setup>
+import { ref } from 'vue';
+import LeftMenu from 'src/components/LeftMenu.vue';
+
+const drawer = ref(false);
+const miniState = ref(true);
+
+</script>
+
+<template>
+    <q-drawer v-model="drawer" show-if-above :mini="miniState" @mouseover="miniState = false"
+        @mouseout="miniState = true" mini-to-overlay :width="200" :breakpoint="500">
+        <q-scroll-area class="fit text-grey-8">
+            <LeftMenu />
+        </q-scroll-area>
+    </q-drawer>
+    <q-page-container>
+
+        <router-view></router-view>
+    </q-page-container>
+</template>
diff --git a/src/router/routes.js b/src/router/routes.js
index 168a907e2..652ec4610 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -29,15 +29,23 @@ const routes = [
                     roles: ['salesPerson'],
                 },
                 component: () => import('src/pages/Customer/CustomerLayout.vue'),
-                redirect: { name: 'CustomerList' },
+                redirect: { name: 'CustomerMain' },
                 children: [
                     {
-                        path: 'list',
-                        name: 'CustomerList',
-                        meta: {
-                            title: 'list'
-                        },
-                        component: () => import('src/pages/Customer/CustomerList.vue'),
+                        path: '',
+                        name: 'CustomerMain',
+                        component: () => import('src/pages/Customer/CustomerMain.vue'),
+                        redirect: { name: 'CustomerList' },
+                        children: [
+                            {
+                                path: 'list',
+                                name: 'CustomerList',
+                                meta: {
+                                    title: 'list'
+                                },
+                                component: () => import('src/pages/Customer/CustomerList.vue'),
+                            },
+                        ]
                     },
                     {
                         path: ':id',