From 5bf4a328d0210e2a92bd4a41fe978a5156e999aa Mon Sep 17 00:00:00 2001
From: Pauline MAROT <pauline.marot2@outlook.fr>
Date: Mon, 3 Jan 2022 17:18:58 +0100
Subject: [PATCH] ModificationMenu

---
 src/NervTN.vue                                | 30 +++++++----
 src/assets/css/sidebar.less                   | 51 +++++++++++--------
 src/components/contact/ContactsList.vue       | 11 ++++
 src/components/contact/contact-routes.js      | 18 ++++++-
 src/components/contact/contact-state.js       | 10 ++++
 .../message/{Message.vue => Chat.vue}         | 10 ++--
 src/components/message/NavContact.vue         | 29 +++++++++++
 src/components/message/NavMessage.vue         | 30 +++--------
 src/components/message/locale/en.json         |  6 +--
 src/components/message/locale/fr.json         |  6 +--
 src/components/message/message-routes.js      |  1 -
 src/components/message/message-state.js       | 10 ++++
 src/locale/en.json                            |  4 +-
 src/locale/fr.json                            |  6 ++-
 src/nervtn-routes.js                          | 47 ++++++++++++++---
 15 files changed, 189 insertions(+), 80 deletions(-)
 create mode 100644 src/components/contact/ContactsList.vue
 rename src/components/message/{Message.vue => Chat.vue} (79%)
 create mode 100644 src/components/message/NavContact.vue

diff --git a/src/NervTN.vue b/src/NervTN.vue
index 3591f26..e8e40cf 100644
--- a/src/NervTN.vue
+++ b/src/NervTN.vue
@@ -1,17 +1,12 @@
 <script setup>
 import ReloadPWA from './components/ReloadPWA.vue';
 import NavMessage from './components/message/NavMessage.vue';
+import NavContact from './components/message/NavContact.vue';
 import {useI18n} from 'vue-i18n';
 
 const {t} = useI18n({useScope: 'local'});
 </script>
 
-<script>
-export default{
-    components: {NavMessage}
-}
-</script>
-
 <template>
     <div id="appflex">
         <div id="page">
@@ -25,10 +20,15 @@ export default{
         </div>
         <div id="sidebar" class="sidebar">
             <router-view name="Sidebar"></router-view>
+
             <div id="menu">
                 <NavMessage/>
                 <router-view name="navMessage"></router-view>
-            </div> 
+
+                <NavContact/>
+                <router-view name="navContact"></router-view>
+
+            </div>
         </div>
         </div>
     <header class="navbar">
@@ -36,6 +36,14 @@ export default{
             <img id="main-logo" alt="" src="./assets/logo.svg"/>
             <span id="site-name">{{ t('home.apps') }}</span>
         </router-link>
+<div class="menu">
+    <div class="navMessage">
+      <router-link to="/navMessage">💬 ✉️ {{ t('home.messages') }}</router-link>
+    </div>
+
+    <div class="navContact">
+      <router-link to="/navContact">👤 {{ t('home.contact') }}</router-link>
+    </div>
 
         <div class="nav-menu">
             <details>
@@ -46,9 +54,10 @@ export default{
                     <li><router-link to="/">{{ t('home.account') }}</router-link></li>
                     <li><router-link to="/">{{ t('home.dashboard') }}</router-link></li>
                     <li><router-link to="/">{{ t('home.disconnect') }}</router-link></li>
-                </ul>  
+                </ul>
             </details>
-        </div>    
+        </div>
+    </div>
 
         <div class="links">
             <router-view name="Links"></router-view>
@@ -58,7 +67,8 @@ export default{
                 <option value="fr">Français</option>
                 <option value="nl">Nederlands</option>
             </select>
-        </div> 
+        </div>
+
     </header>
     <footer class="footer">
     </footer>
diff --git a/src/assets/css/sidebar.less b/src/assets/css/sidebar.less
index a502b18..1bc4cc4 100644
--- a/src/assets/css/sidebar.less
+++ b/src/assets/css/sidebar.less
@@ -24,39 +24,48 @@
 }
 
 #menu {
-    font-size: 1.1rem;
-    margin: 0.5rem;
-    padding: 1rem;
+  padding: 10px;
+}
+.menu {
+    display: inline-block;
+    margin-left: auto;
+}
+.navMessage{
+  vertical-align: top;
+  float: left;
+  padding: 10px;
+  max-height: 2em;
 
-    summary {
-        padding: 10px;
-    }
+}
 
-    li {
-        list-style: none;
-    }
+.navContact{
+  vertical-align: top;
+  float: left;
+  padding: 10px;
+  max-height: 2em;
 }
 
 .nav-menu{
-    margin-left: auto;
-    padding-right: 10px;
-    cursor: pointer;
-}
+  vertical-align: top;
+  float: left;
+  padding: 10px;
+  max-height: 2em;
 
+details{
+  padding: 0 .5em;
+  background: #282828;
+  border-radius: .5em;
+  color: #a0bede;
 
-.connect {
-    padding: 0.5rem;
-
-    ul {
+    li {
         padding: 0;
         margin: 0;
-        list-style-type: none;
+        list-style: none;
+
+      }
     }
 }
 
-.nav-connect {
-    list-style: none;
-}
 
 .nav-links {
     display: inline-block;
diff --git a/src/components/contact/ContactsList.vue b/src/components/contact/ContactsList.vue
new file mode 100644
index 0000000..8ab8493
--- /dev/null
+++ b/src/components/contact/ContactsList.vue
@@ -0,0 +1,11 @@
+
+<template>
+    <h1>Contacts List</h1>
+
+</template>
+
+
+<script>
+
+
+</script>
diff --git a/src/components/contact/contact-routes.js b/src/components/contact/contact-routes.js
index def00b2..906b4b8 100644
--- a/src/components/contact/contact-routes.js
+++ b/src/components/contact/contact-routes.js
@@ -1,3 +1,19 @@
 /* jshint -W097 */ // don't warn about "use strict"
 "use strict";
-
+/*Ne fonctionne pas */
+const router = new VueRouter({
+  routes: [
+    { path: '/navContact', component:NavContact ,
+      children: [
+        {
+          path: '/profile',
+          component: Profile
+        },
+        {
+          path: '/contactsList',
+          component: ContactsList
+        }
+      ]
+    }
+  ]
+})
diff --git a/src/components/contact/contact-state.js b/src/components/contact/contact-state.js
index def00b2..6b433da 100644
--- a/src/components/contact/contact-state.js
+++ b/src/components/contact/contact-state.js
@@ -1,3 +1,13 @@
 /* jshint -W097 */ // don't warn about "use strict"
 "use strict";
 
+import Vuex from 'vuex';
+
+const store = new Vuex.Store({
+    state: {},
+    mutations: {},
+    actions: {},
+    modules: {}
+});
+
+export default store;
diff --git a/src/components/message/Message.vue b/src/components/message/Chat.vue
similarity index 79%
rename from src/components/message/Message.vue
rename to src/components/message/Chat.vue
index d58270b..d1c6b48 100644
--- a/src/components/message/Message.vue
+++ b/src/components/message/Chat.vue
@@ -2,17 +2,13 @@
 <template>
     <h1>Chat</h1>
 
-    <div
-      :class='["message", { dark }]'>
+    <div  :class='["message", { dark }]'>
 
     <h5>{{ user }}</h5>
     {{ text }}
   </div>
 
-  <ChatBox
-        class='chat-box'
-        @submit='onSubmit'
-    />
+  <ChatBox class='chat-box' @submit='onSubmit'/>
 </template>
 
 
@@ -46,4 +42,4 @@ export default {
 h5 {
   margin: 0 0 .5rem 0;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/message/NavContact.vue b/src/components/message/NavContact.vue
new file mode 100644
index 0000000..22f6e98
--- /dev/null
+++ b/src/components/message/NavContact.vue
@@ -0,0 +1,29 @@
+<script setup>
+import {useI18n} from 'vue-i18n';
+
+const {t} = useI18n({useScope: 'local'});
+</script>
+
+<template>
+
+
+        <ul>
+            <li><router-link to="/navContact/profile">📝 {{ t('menu.profile') }}</router-link></li>
+            <li><router-link to="/navContact/contactsList">🗒️ {{ t('menu.contacts list') }}</router-link></li>
+        </ul>
+
+
+    </template>
+
+    <style scoped>
+        li {
+            list-style-type: none;
+        }
+        details {
+            padding-bottom: 5px;
+        }
+    </style>
+
+
+    <i18n lang="json" locale="en" src="./locale/en.json"/>
+    <i18n lang="json" locale="fr" src="./locale/fr.json"/>
diff --git a/src/components/message/NavMessage.vue b/src/components/message/NavMessage.vue
index 2e60df1..a677fe3 100644
--- a/src/components/message/NavMessage.vue
+++ b/src/components/message/NavMessage.vue
@@ -5,28 +5,14 @@ const {t} = useI18n({useScope: 'local'});
 </script>
 
 <template>
-          
-    <details>
-        <summary>
-            <span>👤 {{ t('menu.contact') }}</span>
-        </summary>
-        <ul>
-            <li><router-link to="/profil">📝 {{ t('menu.profile') }}</router-link></li>
-            <li><router-link to="">🗒️ {{ t('menu.contacts list') }}</router-link></li>
-        </ul>
-    </details>
 
-    <details>
-        <summary>
-            <span>💬 ✉️ {{ t('menu.messages') }}</span>
-        </summary>
-        <ul>
-            <li><router-link to="/correspondance">📭 {{ t('menu.correspondence') }}</router-link></li>
-            <li><router-link to="/chat">💬 {{ t('menu.chat') }}</router-link></li>
-            <li><router-link to="">🎥 {{ t('menu.video conferencing') }}</router-link></li>
-        </ul>  
-    </details> 
-           
+    <ul>
+        <li><router-link to="/navMessage/correspondance">📭 {{ t('menu.correspondence') }}</router-link></li>
+        <li><router-link to="/navMessage/chat">💬 {{ t('menu.chat') }}</router-link></li>
+        <li><router-link to="/navMessage/videoConferencing">🎥 {{ t('menu.video conferencing') }}</router-link></li>
+    </ul>
+
+
 </template>
 
 <style scoped>
@@ -40,4 +26,4 @@ const {t} = useI18n({useScope: 'local'});
 
 
 <i18n lang="json" locale="en" src="./locale/en.json"/>
-<i18n lang="json" locale="fr" src="./locale/fr.json"/>
\ No newline at end of file
+<i18n lang="json" locale="fr" src="./locale/fr.json"/>
diff --git a/src/components/message/locale/en.json b/src/components/message/locale/en.json
index c9c2882..aa6be8d 100644
--- a/src/components/message/locale/en.json
+++ b/src/components/message/locale/en.json
@@ -1,9 +1,7 @@
 {
     "menu": {
-        "contact": "Contact",
-        "profile": "Profil",
+        "profile": "Profile",
         "contacts list": "contacts list",
-        "messages": "Messages",
         "correspondence": "Correspondence",
         "chat": "Chat",
         "video conferencing": "Video conferencing"
@@ -14,4 +12,4 @@
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/src/components/message/locale/fr.json b/src/components/message/locale/fr.json
index 8357ee6..5f77a59 100644
--- a/src/components/message/locale/fr.json
+++ b/src/components/message/locale/fr.json
@@ -1,9 +1,7 @@
 {
     "menu": {
-        "contact": "Contact",
         "profile ": "Profil",
         "contacts list": "Liste des contacts",
-        "messages": "Messages",
         "correspondence": "Correspondence",
         "chat": "Chat",
         "video conferencing": "Visioconférence"
@@ -11,8 +9,8 @@
 
     "pwa": {
         "send": "Envoyer"
-       
+
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/src/components/message/message-routes.js b/src/components/message/message-routes.js
index def00b2..4c9e3fa 100644
--- a/src/components/message/message-routes.js
+++ b/src/components/message/message-routes.js
@@ -1,3 +1,2 @@
 /* jshint -W097 */ // don't warn about "use strict"
 "use strict";
-
diff --git a/src/components/message/message-state.js b/src/components/message/message-state.js
index def00b2..6b433da 100644
--- a/src/components/message/message-state.js
+++ b/src/components/message/message-state.js
@@ -1,3 +1,13 @@
 /* jshint -W097 */ // don't warn about "use strict"
 "use strict";
 
+import Vuex from 'vuex';
+
+const store = new Vuex.Store({
+    state: {},
+    mutations: {},
+    actions: {},
+    modules: {}
+});
+
+export default store;
diff --git a/src/locale/en.json b/src/locale/en.json
index cc0a849..9f13c03 100644
--- a/src/locale/en.json
+++ b/src/locale/en.json
@@ -13,7 +13,9 @@
         "connection": "Connection",
         "account":"Account",
         "dashboard": "Dashboard",
-        "disconnect": "Disconnect"
+        "disconnect": "Disconnect",
+        "messages": "Messages",
+        "contact": "Contact"
     },
     "pwa": {
         "ready": "Your applications are ready for offline.",
diff --git a/src/locale/fr.json b/src/locale/fr.json
index e59ecb4..552e550 100644
--- a/src/locale/fr.json
+++ b/src/locale/fr.json
@@ -13,7 +13,9 @@
         "connection": "Connexion",
         "account":"Compte",
         "dashboard": "Tableau de bord",
-        "disconnect": "Déconnexion"
+        "disconnect": "Déconnexion",
+        "contact": "Contact",
+        "messages": "Messages"
     },
     "pwa": {
         "ready": "Vous êtes prêts pour le mode hors-ligne.",
@@ -22,5 +24,5 @@
         "reload": "Recharger"
     }
 
-   
+
 }
diff --git a/src/nervtn-routes.js b/src/nervtn-routes.js
index c8d25a4..6b39d62 100644
--- a/src/nervtn-routes.js
+++ b/src/nervtn-routes.js
@@ -5,9 +5,12 @@ import * as VueRouter from 'vue-router';
 
 const Apps = () => import('./components/NervTNApps.vue');
 const Dashboard = () => import('./components/Dashboard.vue');
-const Chat = () => import('./components/message/Message.vue');
+const NavMessage = () => import('./components/message/NavMessage.vue');
+const Chat = () => import('./components/message/Chat.vue');
 const Correspondance = () => import('./components/message/Correspondance.vue');
-const Profil = () =>import('./components/contact/Profile.vue');
+const NavContact = () => import('./components/message/NavContact.vue');
+const Profile = () => import('./components/contact/Profile.vue');
+const ContactsList = () => import('./components/contact/ContactsList.vue');
 
 
 const routes = [
@@ -32,7 +35,17 @@ const routes = [
         }
     },
     {
-        path: '/chat',
+        path: '/navMessage',
+        name: "NavMessage",
+        components: {
+            default: NavMessage,
+            //Links: {},
+            //Sidebar: {},
+            //ActionBar: {}
+        }
+    },
+    {
+        path: '/navMessage/chat',
         name: "Chat",
         components: {
             default: Chat,
@@ -42,7 +55,7 @@ const routes = [
         }
     },
     {
-        path: '/correspondance',
+        path: '/navMessage/correspondance',
         name: "Correspondance",
         components: {
             default: Correspondance,
@@ -52,10 +65,30 @@ const routes = [
         }
     },
     {
-        path: '/profil',
-        name: "Profil",
+        path: '/navContact',
+        name: "NavContact",
         components: {
-            default: Profil,
+            default: NavContact,
+            //Links: {},
+            //Sidebar: {},
+            //ActionBar: {}
+        }
+    },
+    {
+        path: '/navContact/profile',
+        name: "Profile",
+        components: {
+            default: Profile,
+            //Links: {},
+            //Sidebar: {},
+            //ActionBar: {}
+        }
+    },
+    {
+        path: '/navContact/contactsList',
+        name: "ContactsList",
+        components: {
+            default: ContactsList,
             //Links: {},
             //Sidebar: {},
             //ActionBar: {}