diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 52976cf65..28669abef 100755
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -20,23 +20,24 @@ export default {
},
mounted() {
console.log("mounted")
- console.log(" $cookies.get('gdd_session_id') ", $cookies.get("gdd_session_id") )
- console.log(" $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 )
-
- if ( $cookies.isKey("gdd_session_id")) {
- //this.$store.state.email = this.$cookies.get('gdd_u')
- console.log("router to overview")
- this.$router.push("/overview")
- }else {
- console.log("router to LOGIN")
- //this.$router.push("/login")
- }
},
created () {
- console.log("created")
+ 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))
+ if ( $cookies.isKey("gdd_session_id") == true) {
+ //this.$store.state.email = this.$cookies.get('gdd_u')
+ console.log("app to overview")
+ this.$router.push("overview")
+ }else {
+ console.log("router to LOGIN")
+ //this.$router.push("/login")
+ }
},
data() {
return {
diff --git a/frontend/src/apis/communityAPI.js b/frontend/src/apis/communityAPI.js
index a1da31707..b88bd6c26 100644
--- a/frontend/src/apis/communityAPI.js
+++ b/frontend/src/apis/communityAPI.js
@@ -3,7 +3,9 @@ import CONFIG from '../config'
const apiGet = async (url) => {
try {
+ console.log("comm api url",url)
const result = await axios.get(url);
+ console.log("comm api result",result)
if(result.status !== 200){
throw new Error('HTTP Status Error '+result.status)
}
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index 35731a213..4fdb4d201 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -5,7 +5,7 @@ import router from '../routes/router.js'
import loginAPI from '../apis/loginAPI'
import communityAPI from '../apis/communityAPI'
import axios from 'axios'
-import CONFIG from '../config'
+//import CONFIG from '../config'
export const store = new Vuex.Store({
@@ -68,9 +68,7 @@ export const store = new Vuex.Store({
actions: {
login: async ({ dispatch, commit }, data) => {
console.log('action: login')
- console.log('action: data', data.email)
- //console.log('action: CONFIG.LOGIN_API_URL', CONFIG.LOGIN_API_URL)
-
+
axios.post("http://localhost/login_api/unsecureLogin/",
{"email": data.email, "password":data.password }).then((result) => {
console.log("store login result", result)
@@ -80,7 +78,7 @@ export const store = new Vuex.Store({
console.log('result.data.session_id',result.data.session_id)
- if( result.data.state ){
+ if( result.data.state == "success"){
commit('session_id', result.data.session_id)
commit('email', data.email)
$cookies.set('gdd_session_id', result.data.session_id);
@@ -88,6 +86,7 @@ export const store = new Vuex.Store({
router.push('/overview')
} else {
// Register failed, we perform a logout
+ console.log('action login to logout start')
dispatch('logout')
}
}, (error) => {
@@ -113,6 +112,7 @@ export const store = new Vuex.Store({
router.push('/overview')
} else {
// Register failed, we perform a logout
+ console.log('action createUser to logout start')
dispatch('logout')
}
},
@@ -150,12 +150,18 @@ export const store = new Vuex.Store({
// const result = await communityAPI.transactions(state.session_id)
},
accountBalance: async ({ commit, dispatch, state }) => {
- //console.log('action: accountBalance')
- const result = await communityAPI.balance(state.session_id)
- //console.log(result)
+ console.log('action: accountBalance')
+ 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"))
+ const result = await communityAPI.balance($cookies.get("gdd_session_id"))
+ console.log("accountBalance result", result)
if(result.success) {
commit('user_balance', result.result.data.balance)
} else {
+ console.log('action accountBalance to logout start')
dispatch('logout')
}
}
diff --git a/frontend/src/views/KontoOverview.vue b/frontend/src/views/KontoOverview.vue
index fdc6ef5aa..85886da4a 100644
--- a/frontend/src/views/KontoOverview.vue
+++ b/frontend/src/views/KontoOverview.vue
@@ -25,11 +25,10 @@
diff --git a/frontend/src/views/Layout/AuthLayout_gdd.vue b/frontend/src/views/Layout/AuthLayout_gdd.vue
index 1c7885849..b53eb676f 100644
--- a/frontend/src/views/Layout/AuthLayout_gdd.vue
+++ b/frontend/src/views/Layout/AuthLayout_gdd.vue
@@ -41,25 +41,10 @@
diff --git a/frontend/src/views/Layout/DashboardNavbar.vue b/frontend/src/views/Layout/DashboardNavbar.vue
index 806afc6c5..a736e45d2 100755
--- a/frontend/src/views/Layout/DashboardNavbar.vue
+++ b/frontend/src/views/Layout/DashboardNavbar.vue
@@ -15,19 +15,7 @@
-
-
+
{{this.$store.state.email}}
diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index cf7427415..9550e5466 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -82,6 +82,18 @@
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/UserProfile/UserCard.vue b/frontend/src/views/Pages/UserProfile/UserCard.vue
index e698844a9..e55a9f1f5 100755
--- a/frontend/src/views/Pages/UserProfile/UserCard.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard.vue
@@ -4,7 +4,7 @@