diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 28669abef..38fb24619 100755 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -25,18 +25,21 @@ export default { console.log("created") // console.log(" $cookies.get('gdd_session_id') ", $cookies.get("gdd_session_id") ) - console.log("app.vue $cookies.isKey('gdd_session_id') ", $cookies.isKey("gdd_session_id") ) - const isSession = $cookies.isKey("gdd_session_id") - // const getSession = $cookies.get("gdd_session_id") - // console.log("this.isSession ", this.isSession ) - console.log("xx", ( isSession == true)) + // console.log("app.vue $cookies.isKey('gdd_session_id') ", $cookies.isKey("gdd_session_id") ) + // const isSession = $cookies.isKey("gdd_session_id") + // const getSession = $cookies.get("gdd_session_id") + // console.log("this.isSession ", this.isSession ) + // console.log("xx", ( isSession == true)) if ( $cookies.isKey("gdd_session_id") == true) { //this.$store.state.email = this.$cookies.get('gdd_u') + console.log("cookies to store.state") + this.$store.commit('session_id', $cookies.get("gdd_session_id")) + this.$store.commit('email', $cookies.get("gdd_u")) console.log("app to overview") this.$router.push("overview") }else { - console.log("router to LOGIN") - //this.$router.push("/login") + console.log("app.vue to LOout") + this.$store.dispatch('logout') } }, data() { diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js index 4fdb4d201..f87db8347 100644 --- a/frontend/src/store/store.js +++ b/frontend/src/store/store.js @@ -154,8 +154,8 @@ export const store = new Vuex.Store({ console.log('action: dispatch', dispatch) console.log('action: state.session_id', state.session_id) console.log(" action: $cookies.get('gdd_session_id') ", $cookies.get("gdd_session_id") ) - commit('session_id', $cookies.get("gdd_session_id")) - commit('email', $cookies.get("gdd_u")) + // commit('session_id', $cookies.get("gdd_session_id")) + // commit('email', $cookies.get("gdd_u")) const result = await communityAPI.balance($cookies.get("gdd_session_id")) console.log("accountBalance result", result) if(result.success) { diff --git a/frontend/src/views/Layout/DashboardNavbar.vue b/frontend/src/views/Layout/DashboardNavbar.vue index a736e45d2..4c6f9f6c0 100755 --- a/frontend/src/views/Layout/DashboardNavbar.vue +++ b/frontend/src/views/Layout/DashboardNavbar.vue @@ -4,7 +4,9 @@ class="navbar-top navbar-expand" :class="{'navbar-dark': type === 'default'}" > - {{$route.name}} + + {{$route.name}} + diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue index 9550e5466..71c1616f6 100755 --- a/frontend/src/views/Pages/Login.vue +++ b/frontend/src/views/Pages/Login.vue @@ -6,8 +6,8 @@ - Gradido Wallet - {{ $t('site.login.community')}} + Gradido Wallet + {{ $t('site.login.community')}} @@ -82,18 +82,6 @@ onSubmit() { this.$store.dispatch('login', {"email": this.model.email, "password": this.model.password}) } - }, - created () { - console.log("login.vue created") - - if ( $cookies.isKey("gdd_session_id")) { - //this.$store.state.email = this.$cookies.get('gdd_u') - console.log("login to overview") - this.$router.push("/overview") - }else { - console.log("login to LOGIN") - //this.$router.push("/login") - } - }, + } } diff --git a/frontend/src/views/Pages/Password.vue b/frontend/src/views/Pages/Password.vue index af1dc5bc2..dc18a1cc7 100644 --- a/frontend/src/views/Pages/Password.vue +++ b/frontend/src/views/Pages/Password.vue @@ -5,8 +5,8 @@ - {{ $t('site.password.title')}} - {{ $t('site.password.subtitle')}} + {{ $t('site.password.title')}} + {{ $t('site.password.subtitle')}} diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index e3eb84805..d6592addd 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -6,8 +6,8 @@ - {{ $t('site.signup.title')}} - {{ $t('site.signup.subtitle')}} + {{ $t('site.signup.title')}} + {{ $t('site.signup.subtitle')}}
{{ $t('site.login.community')}}
{{ $t('site.password.subtitle')}}
{{ $t('site.signup.subtitle')}}