diff --git a/frontend/src/apis/loginAPI.js b/frontend/src/apis/loginAPI.js index 799ff25bc..5f4e72807 100644 --- a/frontend/src/apis/loginAPI.js +++ b/frontend/src/apis/loginAPI.js @@ -99,26 +99,6 @@ const loginAPI = { return apiPost(CONFIG.LOGIN_API_URL + 'updateUserInfos', payload) }, - // `POST http://localhost/login_api/getUserInfos` - // - // with: - // - // ```json - // { - // "session_id": -127182, - // "email": "max.musterman@gmail.de", - // "ask": [ - // "EmailVerificationCode.Register", - // "loginServer.path", - // "user.pubkeyhex", - // "user.first_name", - // "user.last_name", - // "user.disabled", - // "user.email_checked", - // "user.language" - // ] - // } - changePassword: async (sessionId, email, password) => { const payload = { session_id: sessionId, @@ -129,7 +109,7 @@ const loginAPI = { } return apiPost(CONFIG.LOGIN_API_URL + 'updateUserInfos', payload) }, - changePasswordProfil: async (sessionId, email, password, passwordNew) => { + changePasswordProfile: async (sessionId, email, password, passwordNew) => { const payload = { session_id: sessionId, email, @@ -140,7 +120,7 @@ const loginAPI = { } return apiPost(CONFIG.LOGIN_API_URL + 'updateUserInfos', payload) }, - changeUsernameProfil: async (sessionId, email, usernameNew) => { + changeUsernameProfile: async (sessionId, email, usernameNew) => { const payload = { session_id: sessionId, email, diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 3781e87d0..5a499b7f4 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -105,9 +105,6 @@ "add_work":"neuer Gemeinschaftsbeitrag" }, "profil": { - "edit": { - - }, "activity": { "chart":"Gemeinschaftsstunden Chart", "new":"Neue Gemeinschaftsstunden eintragen", diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue index 723a5cee9..87490dfab 100644 --- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue +++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue @@ -28,7 +28,7 @@ {{ userdata.first_name }} - + @@ -39,7 +39,7 @@ {{ userdata.last_name }} - + @@ -67,11 +67,11 @@ export default { data() { return { edit_userdata: true, - sessionId: null, + sessionId: this.$store.state.sessionId, email: null, form: { - first_name: this.userdata.first_name, - last_name: this.userdata.last_name, + firstName: this.userdata.first_name, + lastName: this.userdata.last_name, desc: this.UserProfileTestData.desc, }, } diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserMail.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUserMail.vue index 524a1d8e2..c41ba367c 100644 --- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserMail.vue +++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserMail.vue @@ -25,7 +25,7 @@ {{ $store.state.email }} - + @@ -39,16 +39,16 @@ export default { data() { return { edit_email: true, + newEmail: '', } }, methods: { async onSubmit() { // console.log(this.data) const result = await loginAPI.changeEmailProfil( - this.sessionId, + this.$store.state.sessionId, this.email, - this.password, - this.passwordNew, + this.newEmail, ) if (result.success) { alert('changePassword success') diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue index 1affed191..e1ade4ae0 100644 --- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue +++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue @@ -68,7 +68,6 @@ export default { data() { return { edit_pwd: true, - sessionId: null, email: null, password: '', passwordNew: '', @@ -78,8 +77,8 @@ export default { methods: { async onSubmit() { // console.log(this.data) - const result = await loginAPI.changePasswordProfil( - this.sessionId, + const result = await loginAPI.changePasswordProfile( + this.$store.state.sessionId, this.email, this.password, this.passwordNew, diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.vue index 7d073ec0e..b195f6ef6 100644 --- a/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.vue +++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.vue @@ -54,7 +54,7 @@ export default { methods: { async onSubmit() { // console.log(this.data) - const result = await loginAPI.changeUsernameProfil(this.username) + const result = await loginAPI.changeUsernameProfile(this.username) if (result.success) { alert('changeUsername success') } else {