From e124b3bf2022fd7228497e3160b8326e9b1801a5 Mon Sep 17 00:00:00 2001 From: vincent Date: Fri, 10 May 2019 10:49:43 +0200 Subject: [PATCH 1/9] fix bug casting is null --- client/src/components/chainetv.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/chainetv.vue b/client/src/components/chainetv.vue index 987c522..4e72ef1 100644 --- a/client/src/components/chainetv.vue +++ b/client/src/components/chainetv.vue @@ -49,7 +49,7 @@
  • {{result.emission.synopsis}}

  • -
    +

    casting:

    +
    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 Date: Fri, 10 May 2019 12:54:18 +0200 Subject: [PATCH 4/9] 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 @@ + + + + From d5d869c73838a11075a2351b126f9235b6e19e75 Mon Sep 17 00:00:00 2001 From: vincent Date: Fri, 10 May 2019 13:55:36 +0200 Subject: [PATCH 5/9] 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 @@
    + {{modalmessage}} + 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 @@ 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 Date: Fri, 10 May 2019 20:41:33 +0200 Subject: [PATCH 6/9] 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 @@ - - {{modalmessage}} + + {{modalmessage}} 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 @@ 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 @@