From 483124e57c80961594f12cd3372314aa42284e04 Mon Sep 17 00:00:00 2001
From: vincent <vincent@ducamps.win>
Date: Fri, 10 May 2019 12:53:48 +0200
Subject: [PATCH 1/6] init modal login

---
 client/src/components/chainetv.vue |  8 +++-
 client/src/components/login.vue    | 76 ------------------------------
 client/src/router/index.js         |  8 +---
 3 files changed, 8 insertions(+), 84 deletions(-)
 delete mode 100644 client/src/components/login.vue

diff --git a/client/src/components/chainetv.vue b/client/src/components/chainetv.vue
index 9b6be2c..5ac4e4d 100644
--- a/client/src/components/chainetv.vue
+++ b/client/src/components/chainetv.vue
@@ -73,17 +73,23 @@
         </div>
       </div>
     </div>
+    <modalLogin v-bind:class="{'is-active': showModalLogin}" @close="showModalLogin = false"/>
   </div>
 </template>
 
 <script>
 import { putparsechaine } from '../api';
+import modalLogin from './modalLogin'
 
 export default {
   name: 'chainetv',
+  components: {
+    modalLogin
+  },
   data() {
     return {
       chaine: '',
+      showModalLogin: false,
     };
   },
   methods: {
@@ -110,7 +116,7 @@ export default {
     },
     parsechaine() {
       if (!this.$store.getters.isAuthenticated) {
-        this.$router.push('/login');
+        this.showModalLogin=true;
       } else {
         return putparsechaine(this.$store.state.jwt.token)
           .then((res) => {
diff --git a/client/src/components/login.vue b/client/src/components/login.vue
deleted file mode 100644
index a6edca6..0000000
--- a/client/src/components/login.vue
+++ /dev/null
@@ -1,76 +0,0 @@
-<!-- components/Login.vue -->
-<template>
-  <div>
-    <section class="hero is-success">
-      <div class="hero-body">
-        <div class="container has-text-centered">
-          <h2 class="title">Login </h2>
-          <p class="subtitle error-msg">{{ errorMsg }}</p>
-        </div>
-      </div>
-    </section>
-    <section class="section">
-      <div class="container">
-        <div class="field">
-          <label class="label is-large" for="name">Name:</label>
-          <div class="control">
-            <input type="name" class="input is-large" id="email" v-model="name">
-          </div>
-        </div>
-        <div class="field">
-          <label class="label is-large" for="password">Password:</label>
-          <div class="control">
-            <input type="password" class="input is-large" id="password" v-model="password">
-          </div>
-        </div>
-
-        <div class="control">
-          <a class="button is-large is-success" @click="authenticate">Login</a>
-        </div>
-
-      </div>
-    </section>
-
-  </div>
-</template>
-
-<script>
-import { EventBus } from '../utils';
-
-export default {
-  data() {
-    return {
-      name: '',
-      password: '',
-      errorMsg: '',
-    };
-  },
-  methods: {
-    authenticate() {
-      this.$store.dispatch('login', { name: this.name, password: this.password })
-        .then(() => {
-          if (this.$store.getters.isAuthenticated) {
-            this.$router.push('/');
-          }
-        },
-        );
-    },
-    register() {
-      this.$store.dispatch('register', { name: this.name, password: this.password })
-        .then(() => this.$router.push('/'));
-    },
-  },
-  mounted() {
-    EventBus.$on('failedRegistering', (msg) => {
-      this.errorMsg = msg;
-    });
-    EventBus.$on('failedAuthentication', (msg) => {
-      this.errorMsg = msg;
-    });
-  },
-  beforeDestroy() {
-    EventBus.$off('failedRegistering');
-    EventBus.$off('failedAuthentication');
-  },
-};
-</script>
diff --git a/client/src/router/index.js b/client/src/router/index.js
index 456dec8..88b290b 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -2,7 +2,6 @@ import Vue from 'vue';
 import Router from 'vue-router';
 import ping from '@/components/ping';
 import chainetv from '@/components/chainetv';
-import login from '@/components/login';
 import store from '@/store';
 
 Vue.use(Router);
@@ -13,18 +12,13 @@ export default new Router({
       name: 'chaineTV',
       component: chainetv,
     },
-    {
-      path: '/login',
-      name: 'Login',
-      component: login,
-    },
     {
       path: '/ping',
       name: 'ping',
       component: ping,
       beforeEnter(to, from, next) {
         if (!store.getters.isAuthenticated) {
-          next('/login');
+          next('/');
         } else {
           next();
         }

From 316cb4d375f35a92e818c050c4cafc1adb84b289 Mon Sep 17 00:00:00 2001
From: vincent <vincent@ducamps.win>
Date: Fri, 10 May 2019 12:54:18 +0200
Subject: [PATCH 2/6] add modal componeent

---
 client/src/components/modalLogin.vue | 78 ++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 client/src/components/modalLogin.vue

diff --git a/client/src/components/modalLogin.vue b/client/src/components/modalLogin.vue
new file mode 100644
index 0000000..0d7bd7a
--- /dev/null
+++ b/client/src/components/modalLogin.vue
@@ -0,0 +1,78 @@
+<!-- components/Login.vue -->
+<template>
+  <div class="modal">
+    <div class="modal-background"></div>
+     <button class="modal-close is-large" aria-label="close"></button>
+    <div class="modal-content">
+    <section class="hero is-success">
+      <div class="hero-body">
+        <div class="container has-text-centered">
+          <h2 class="title">Login </h2>
+          <p class="subtitle error-msg">{{ errorMsg }}</p>
+        </div>
+      </div>
+    </section>
+    <section class="section">
+      <div class="container">
+        <div class="field">
+          <label class="label is-large" for="name">Name:</label>
+          <div class="control">
+            <input type="name" class="input is-large" id="email" v-model="name">
+          </div>
+        </div>
+        <div class="field">
+          <label class="label is-large" for="password">Password:</label>
+          <div class="control">
+            <input type="password" class="input is-large" id="password" v-model="password">
+          </div>
+        </div>
+
+        <div class="control">
+          <a class="button is-large is-success" @click="authenticate">Login</a>
+        </div>
+      </div>
+    </section>
+    </div>
+  </div>
+</template>
+
+<script>
+import { EventBus } from '../utils';
+
+export default {
+  data() {
+    return {
+      name: '',
+      password: '',
+      errorMsg: '',
+    };
+  },
+  methods: {
+    authenticate() {
+      this.$store.dispatch('login', { name: this.name, password: this.password })
+        .then(() => {
+          if (this.$store.getters.isAuthenticated) {
+            this.$router.push('/');
+          }
+        },
+        );
+    },
+    register() {
+      this.$store.dispatch('register', { name: this.name, password: this.password })
+        .then(() => this.$router.push('/'));
+    },
+  },
+  mounted() {
+    EventBus.$on('failedRegistering', (msg) => {
+      this.errorMsg = msg;
+    });
+    EventBus.$on('failedAuthentication', (msg) => {
+      this.errorMsg = msg;
+    });
+  },
+  beforeDestroy() {
+    EventBus.$off('failedRegistering');
+    EventBus.$off('failedAuthentication');
+  },
+};
+</script>

From d5d869c73838a11075a2351b126f9235b6e19e75 Mon Sep 17 00:00:00 2001
From: vincent <vincent@ducamps.win>
Date: Fri, 10 May 2019 13:55:36 +0200
Subject: [PATCH 3/6] add modal windows revues struct login

---
 client/src/components/chainetv.vue   | 16 ++++--
 client/src/components/modal.vue      | 16 ++++++
 client/src/components/modalLogin.vue | 77 +++++++++++++---------------
 client/src/router/index.js           |  2 +-
 4 files changed, 66 insertions(+), 45 deletions(-)
 create mode 100644 client/src/components/modal.vue

diff --git a/client/src/components/chainetv.vue b/client/src/components/chainetv.vue
index 5ac4e4d..5565507 100644
--- a/client/src/components/chainetv.vue
+++ b/client/src/components/chainetv.vue
@@ -74,28 +74,34 @@
       </div>
     </div>
     <modalLogin v-bind:class="{'is-active': showModalLogin}" @close="showModalLogin = false"/>
+    <modal v-bind:class="{'is-active': showModal}" @close="showModal = false">{{modalmessage}}</modal>
   </div>
 </template>
 
 <script>
 import { putparsechaine } from '../api';
 import modalLogin from './modalLogin'
+import modal from './modal'
 
 export default {
   name: 'chainetv',
   components: {
-    modalLogin
+    modalLogin,
+    modal,
   },
   data() {
     return {
       chaine: '',
       showModalLogin: false,
+      showModal: false,
+      modalmessage:''
     };
   },
   methods: {
     checkchaine() {
       if (this.chaine === '') {
-        alert('rentrer un numéro');
+        this.modalmessage='rentrer un numéro de chaine';
+        this.showModal=true;
         return;
       }
       this.$store.state.arrayresultchaines = [];
@@ -121,13 +127,15 @@ export default {
         return putparsechaine(this.$store.state.jwt.token)
           .then((res) => {
             if (res.data === 'OK') {
-              alert('update database OK');
+              this.modalmessage='update database OK';
+              this.showModal=true;
             }
           })
           .catch((error) => {
           // eslint-disable-next-line
             if (error.response) {
-              alert(error.response.data.message);
+              this.modalmessage=error.response.data.message;
+              this.showModal=true;
             } else {
               console.error(error);
             }
diff --git a/client/src/components/modal.vue b/client/src/components/modal.vue
new file mode 100644
index 0000000..c92d77d
--- /dev/null
+++ b/client/src/components/modal.vue
@@ -0,0 +1,16 @@
+<template>
+  <div class="modal">
+    <div class="modal-background"></div>
+     <button class="modal-close is-large" aria-label="close" @click="$emit('close')"></button>
+    <div class="modal-content box">
+         <slot></slot>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+
+};
+</script>
+
diff --git a/client/src/components/modalLogin.vue b/client/src/components/modalLogin.vue
index 0d7bd7a..762b291 100644
--- a/client/src/components/modalLogin.vue
+++ b/client/src/components/modalLogin.vue
@@ -2,77 +2,74 @@
 <template>
   <div class="modal">
     <div class="modal-background"></div>
-     <button class="modal-close is-large" aria-label="close"></button>
-    <div class="modal-content">
-    <section class="hero is-success">
-      <div class="hero-body">
-        <div class="container has-text-centered">
-          <h2 class="title">Login </h2>
+    <button class="modal-close is-large" aria-label="close" @click="$emit('close')"></button>
+    <div class="modal-content box">
+      <div class="section is-success">
+        <div class="has-text-centered">
+          <h2 class="title">Login</h2>
           <p class="subtitle error-msg">{{ errorMsg }}</p>
         </div>
       </div>
-    </section>
-    <section class="section">
-      <div class="container">
-        <div class="field">
-          <label class="label is-large" for="name">Name:</label>
-          <div class="control">
-            <input type="name" class="input is-large" id="email" v-model="name">
-          </div>
-        </div>
-        <div class="field">
-          <label class="label is-large" for="password">Password:</label>
-          <div class="control">
-            <input type="password" class="input is-large" id="password" v-model="password">
-          </div>
-        </div>
-
+      <section class="section">
+      <div class="field">
+        <label class="label" for="name">Name:</label>
         <div class="control">
-          <a class="button is-large is-success" @click="authenticate">Login</a>
+          <input type="name" class="input" id="email" v-model="name">
         </div>
       </div>
-    </section>
+      <div class="field">
+        <label class="label" for="password">Password:</label>
+        <div class="control">
+          <input type="password" class="input" id="password" v-model="password">
+        </div>
+      </div>
+
+      <div class="control">
+        <a class="button is-success is-large" @click="authenticate">Login</a>
+      </div>
+      </section>
     </div>
   </div>
 </template>
 
 <script>
-import { EventBus } from '../utils';
+import { EventBus } from "../utils";
 
 export default {
   data() {
     return {
-      name: '',
-      password: '',
-      errorMsg: '',
+      name: "",
+      password: "",
+      errorMsg: ""
     };
   },
   methods: {
     authenticate() {
-      this.$store.dispatch('login', { name: this.name, password: this.password })
+      this.$store
+        .dispatch("login", { name: this.name, password: this.password })
         .then(() => {
           if (this.$store.getters.isAuthenticated) {
-            this.$router.push('/');
+            this.$emit("close");
           }
-        },
-        );
+        });
     },
     register() {
-      this.$store.dispatch('register', { name: this.name, password: this.password })
-        .then(() => this.$router.push('/'));
-    },
+      this.$store
+        .dispatch("register", { name: this.name, password: this.password })
+        .then(() => this.$router.push("/"));
+    }
   },
   mounted() {
-    EventBus.$on('failedRegistering', (msg) => {
+    EventBus.$on("failedRegistering", msg => {
       this.errorMsg = msg;
     });
-    EventBus.$on('failedAuthentication', (msg) => {
+    EventBus.$on("failedAuthentication", msg => {
       this.errorMsg = msg;
     });
   },
   beforeDestroy() {
-    EventBus.$off('failedRegistering');
-    EventBus.$off('failedAuthentication');
-  },
+    EventBus.$off("failedRegistering");
+    EventBus.$off("failedAuthentication");
+  }
 };
 </script>
diff --git a/client/src/router/index.js b/client/src/router/index.js
index 88b290b..419f6b8 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -18,7 +18,7 @@ export default new Router({
       component: ping,
       beforeEnter(to, from, next) {
         if (!store.getters.isAuthenticated) {
-          next('/');
+          next('/')
         } else {
           next();
         }

From 314d787fda8bc2d7b9a61a22b76661b340ba937b Mon Sep 17 00:00:00 2001
From: vincent <vincent@ducamps.win>
Date: Fri, 10 May 2019 20:41:33 +0200
Subject: [PATCH 4/6] improvemodal

---
 client/src/components/chainetv.vue   |  4 ++--
 client/src/components/modal.vue      |  8 ++++++--
 client/src/components/modalLogin.vue | 22 ++++++++++++----------
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/client/src/components/chainetv.vue b/client/src/components/chainetv.vue
index 5565507..0bc7a70 100644
--- a/client/src/components/chainetv.vue
+++ b/client/src/components/chainetv.vue
@@ -73,8 +73,8 @@
         </div>
       </div>
     </div>
-    <modalLogin v-bind:class="{'is-active': showModalLogin}" @close="showModalLogin = false"/>
-    <modal v-bind:class="{'is-active': showModal}" @close="showModal = false">{{modalmessage}}</modal>
+    <modalLogin  v-bind:show="showModalLogin" @close="showModalLogin = false" />
+    <modal v-bind:show="showModal" @close="showModal = false">{{modalmessage}}</modal>
   </div>
 </template>
 
diff --git a/client/src/components/modal.vue b/client/src/components/modal.vue
index c92d77d..39d7580 100644
--- a/client/src/components/modal.vue
+++ b/client/src/components/modal.vue
@@ -1,16 +1,20 @@
 <template>
-  <div class="modal">
+<div>
+  <div v-bind:class="{'is-active':show}" class="modal">
     <div class="modal-background"></div>
      <button class="modal-close is-large" aria-label="close" @click="$emit('close')"></button>
     <div class="modal-content box">
          <slot></slot>
     </div>
   </div>
+  </div>
 </template>
 
 <script>
 export default {
-
+    props:{
+        show:false,
+    },
 };
 </script>
 
diff --git a/client/src/components/modalLogin.vue b/client/src/components/modalLogin.vue
index 762b291..c8274d3 100644
--- a/client/src/components/modalLogin.vue
+++ b/client/src/components/modalLogin.vue
@@ -1,11 +1,8 @@
 <!-- components/Login.vue -->
 <template>
-  <div class="modal">
-    <div class="modal-background"></div>
-    <button class="modal-close is-large" aria-label="close" @click="$emit('close')"></button>
-    <div class="modal-content box">
-      <div class="section is-success">
-        <div class="has-text-centered">
+  <modal v-bind:show="show" @close="$emit('close')">
+      <div class="hero is-success">
+        <div class="hero-body has-text-centered">
           <h2 class="title">Login</h2>
           <p class="subtitle error-msg">{{ errorMsg }}</p>
         </div>
@@ -28,14 +25,16 @@
         <a class="button is-success is-large" @click="authenticate">Login</a>
       </div>
       </section>
-    </div>
-  </div>
+  </modal>
 </template>
 
 <script>
-import { EventBus } from "../utils";
-
+import { EventBus } from '../utils';
+import modal from './modal'
 export default {
+  props:{
+    show:false,
+  },
   data() {
     return {
       name: "",
@@ -43,6 +42,9 @@ export default {
       errorMsg: ""
     };
   },
+  components: {
+    modal
+  },
   methods: {
     authenticate() {
       this.$store

From a0481fb8ebd0694706f220db6b56287e5fda4fcb Mon Sep 17 00:00:00 2001
From: vincent <vincent@ducamps.win>
Date: Sat, 11 May 2019 14:48:59 +0200
Subject: [PATCH 5/6] improve modal show autent for ping go to modal login

---
 client/src/components/chainetv.vue   | 10 ++++++++--
 client/src/components/modal.vue      |  6 ++----
 client/src/components/modalLogin.vue |  7 ++-----
 client/src/router/index.js           | 16 +++++++++++-----
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/client/src/components/chainetv.vue b/client/src/components/chainetv.vue
index 0bc7a70..84f9b4b 100644
--- a/client/src/components/chainetv.vue
+++ b/client/src/components/chainetv.vue
@@ -73,8 +73,8 @@
         </div>
       </div>
     </div>
-    <modalLogin  v-bind:show="showModalLogin" @close="showModalLogin = false" />
-    <modal v-bind:show="showModal" @close="showModal = false">{{modalmessage}}</modal>
+    <modalLogin  v-show="showModalLogin" @close="showModalLogin = false" />
+    <modal v-show="showModal" @close="showModal = false">{{modalmessage}}</modal>
   </div>
 </template>
 
@@ -82,6 +82,7 @@
 import { putparsechaine } from '../api';
 import modalLogin from './modalLogin'
 import modal from './modal'
+import { EventBus } from '../utils';
 
 export default {
   name: 'chainetv',
@@ -145,6 +146,11 @@ export default {
       return true;
     },
   },
+  mounted() {
+    EventBus.$on('showmodallogin',()=>{
+      this.showModalLogin=true;
+    })
+  },
 };
 </script>
 <style >
diff --git a/client/src/components/modal.vue b/client/src/components/modal.vue
index 39d7580..5024270 100644
--- a/client/src/components/modal.vue
+++ b/client/src/components/modal.vue
@@ -1,6 +1,6 @@
 <template>
 <div>
-  <div v-bind:class="{'is-active':show}" class="modal">
+  <div class="modal is-active">
     <div class="modal-background"></div>
      <button class="modal-close is-large" aria-label="close" @click="$emit('close')"></button>
     <div class="modal-content box">
@@ -12,9 +12,7 @@
 
 <script>
 export default {
-    props:{
-        show:false,
-    },
+
 };
 </script>
 
diff --git a/client/src/components/modalLogin.vue b/client/src/components/modalLogin.vue
index c8274d3..1b9773a 100644
--- a/client/src/components/modalLogin.vue
+++ b/client/src/components/modalLogin.vue
@@ -1,13 +1,13 @@
 <!-- components/Login.vue -->
 <template>
-  <modal v-bind:show="show" @close="$emit('close')">
+  <modal @close="$emit('close')">
       <div class="hero is-success">
         <div class="hero-body has-text-centered">
           <h2 class="title">Login</h2>
           <p class="subtitle error-msg">{{ errorMsg }}</p>
         </div>
       </div>
-      <section class="section">
+      <section v-on:keyup.enter="authenticate" class="section">
       <div class="field">
         <label class="label" for="name">Name:</label>
         <div class="control">
@@ -32,9 +32,6 @@
 import { EventBus } from '../utils';
 import modal from './modal'
 export default {
-  props:{
-    show:false,
-  },
   data() {
     return {
       name: "",
diff --git a/client/src/router/index.js b/client/src/router/index.js
index 419f6b8..d9fe735 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -3,6 +3,7 @@ import Router from 'vue-router';
 import ping from '@/components/ping';
 import chainetv from '@/components/chainetv';
 import store from '@/store';
+import { EventBus } from '../utils';
 
 Vue.use(Router);
 export default new Router({
@@ -17,12 +18,17 @@ export default new Router({
       name: 'ping',
       component: ping,
       beforeEnter(to, from, next) {
-        if (!store.getters.isAuthenticated) {
-          next('/')
-        } else {
-          next();
-        }
+          autent(to,from,next)
       },
     },
   ],
 });
+
+function autent(to,from,next) {
+  if (!store.getters.isAuthenticated) {
+    next('/')
+    EventBus.$emit("showmodallogin")
+  } else {
+    next();
+  }
+}
\ No newline at end of file

From 9f23a0db3e13c42ea5270268a2810d3ec2953640 Mon Sep 17 00:00:00 2001
From: vincent <vincent@ducamps.win>
Date: Sat, 11 May 2019 16:15:18 +0200
Subject: [PATCH 6/6] add button for modal

---
 client/src/components/chainetv.vue | 5 ++++-
 client/src/components/modal.vue    | 2 --
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/src/components/chainetv.vue b/client/src/components/chainetv.vue
index 84f9b4b..d9be39f 100644
--- a/client/src/components/chainetv.vue
+++ b/client/src/components/chainetv.vue
@@ -74,7 +74,10 @@
       </div>
     </div>
     <modalLogin  v-show="showModalLogin" @close="showModalLogin = false" />
-    <modal v-show="showModal" @close="showModal = false">{{modalmessage}}</modal>
+    <modal v-show="showModal" @close="showModal = false">
+      <p>{{modalmessage}}</p>
+      <button class="button is-success" @click="showModal = false">close</button>
+    </modal>
   </div>
 </template>
 
diff --git a/client/src/components/modal.vue b/client/src/components/modal.vue
index 5024270..5986b79 100644
--- a/client/src/components/modal.vue
+++ b/client/src/components/modal.vue
@@ -12,7 +12,5 @@
 
 <script>
 export default {
-
 };
 </script>
-