IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-01-20 20:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix lint, fix test, fix merge

Browse Source
This commit is contained in:
ogerly 2021-07-22 13:28:34 +02:00
parent 3ec8906ad6
commit 212b567662
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/components/Inputs/InputPasswordConfirmation.vue
View File

@ -12,9 +12,9 @@
}"
:label="register ? $t('form.password') : $t('form.password_new')"
:showAllErrors="true"
:immediate="true"
:immediate="true"
:name="createId(register ? $t('form.password') : $t('form.password_new'))"
:placeholder="register ? $t('form.password') : $t('form.password_new')"
:placeholder="register ? $t('form.password') : $t('form.password_new')"
v-model="password"
></input-password>
</b-col>
@ -22,6 +22,7 @@
<b-row class="mb-2">
<b-col>
<input-password
:rules="{ samePassword: value.password }"
:label="register ? $t('form.passwordRepeat') : $t('form.password_new_repeat')"
:name="createId(register ? $t('form.passwordRepeat') : $t('form.password_new_repeat'))"
:placeholder="register ? $t('form.passwordRepeat') : $t('form.password_new_repeat')"
@ -47,7 +48,7 @@ export default {
register: {
type: Boolean,
required: false,
}
},
},
data() {
return {

4
frontend/src/views/Pages/Register.spec.js
View File

@ -65,11 +65,11 @@ describe('Register', () => {
})
it('has password input fields', () => {
expect(wrapper.find('input[name="form.password_new"]').exists()).toBeTruthy()
expect(wrapper.find('input[name="form.password"]').exists()).toBeTruthy()
})
it('has password repeat input fields', () => {
expect(wrapper.find('input[name="form.password_new_repeat"]').exists()).toBeTruthy()
expect(wrapper.find('input[name="form.passwordRepeat"]').exists()).toBeTruthy()
})
it('has 1 checkbox input fields', () => {

16
frontend/src/views/Pages/Register.vue
View File

@ -76,10 +76,10 @@
</b-form-group>
</validation-provider>
<input-email v-model="form.email" ></input-email>
<input-email v-model="form.email"></input-email>
<hr />
<input-password-confirmation
<input-password-confirmation
v-model="form.password"
:register="register"
></input-password-confirmation>
@ -180,15 +180,21 @@ export default {
this.form.password.password,
)
if (result.success) {
this.$store.dispatch('login', {
/* this.$store.dispatch('login', {
sessionId: result.result.data.session_id,
email: this.form.email,
user: {
email: this.form.email,
firstName: this.form.firstname,
lastName: this.form.lastname
}
})
*/
this.form.email = ''
this.form.firstname = ''
this.form.lastname = ''
this.form.password.password = ''
this.$router.push('/thx/register')
} else {
this.showError = true

2
frontend/src/views/Pages/ResetPassword.vue
View File

@ -26,7 +26,7 @@
<b-card-body class="p-4">
<validation-observer ref="observer" v-slot="{ handleSubmit }">
<b-form role="form" @submit.prevent="handleSubmit(onSubmit)">
<input-password-confirmation v-model="form" :register="register"/>
<input-password-confirmation v-model="form" :register="register" />
<div class="text-center">
<b-button type="submit" variant="primary" class="mt-4">
{{ $t('reset') }}

2
frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
View File

@ -28,7 +28,7 @@
></input-password>
</b-col>
</b-row>
<input-password-confirmation v-model="form.newPassword" :register="register"/>
<input-password-confirmation v-model="form.newPassword" :register="register" />
<b-row class="text-right">
<b-col>
<div class="text-right">