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] 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