IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor ResetPassword to remove thx page, a start

Browse Source
This commit is contained in:
Wolfgang Huß 2022-04-29 11:41:32 +02:00
parent 5c89fe545d
commit 28f85cce87
1 changed files with 72 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
frontend/src/pages/ResetPassword.vue
View File

@ -1,5 +1,6 @@
<template> <template>
<div class="resetpwd-form"> <div class="resetpwd-form">
<div v-if="!showPageMessage">
<b-container> <b-container>
<div class="header p-4" ref="header"> <div class="header p-4" ref="header">
<div class="header-body text-center mb-7"> <div class="header-body text-center mb-7">
@ -45,11 +46,21 @@
</b-row> </b-row>
</b-container> </b-container>
</div> </div>
<div v-else>
<message
:headline="$t('site.thx.errorTitle')"
:subtitle="errorMessage"
:buttonText="$t('settings.password.reset')"
linkTo="/forgot-password/resetPassword"
/>
</div>
</div>
</template> </template>
<script> <script>
import InputPasswordConfirmation from '@/components/Inputs/InputPasswordConfirmation'
import { setPassword } from '@/graphql/mutations' import { setPassword } from '@/graphql/mutations'
import { queryOptIn } from '@/graphql/queries' import { queryOptIn } from '@/graphql/queries'
import InputPasswordConfirmation from '@/components/Inputs/InputPasswordConfirmation'
import Message from '@/components/Message/Message'
const textFields = { const textFields = {
reset: { reset: {
@ -64,9 +75,10 @@ const textFields = {
button: 'settings.password.set', button: 'settings.password.set',
linkTo: '/login', linkTo: '/login',
}, },
// Wolle: seems unused
login: { login: {
headline: 'site.thx.errorTitle', headline: 'site.thx.errorTitle',
subtitle: 'site.thx.activateEmail', subtitle: 'site.thx.activateEmail', // Wolle: error.backend.ERR_EMAIL_NOT_VALIDATED
}, },
} }
@ -74,6 +86,7 @@ export default {
name: 'ResetPassword', name: 'ResetPassword',
components: { components: {
InputPasswordConfirmation, InputPasswordConfirmation,
Message,
}, },
data() { data() {
return { return {
@ -82,6 +95,8 @@ export default {
passwordRepeat: '', passwordRepeat: '',
}, },
displaySetup: {}, displaySetup: {},
showPageMessage: false,
errorMessage: '',
} }
}, },
methods: { methods: {
@ -107,13 +122,21 @@ export default {
} }
}) })
.catch((error) => { .catch((error) => {
this.toastError(error.message) let errorMessage
// Wolle: how to solve this with error codes?
if ( if (
error.message.match( error.message.match(
/email was sent more than ([0-9]+ hours)?( and )?([0-9]+ minutes)? ago/, /email was sent more than ([0-9]+ hours)?( and )?([0-9]+ minutes)? ago/,
) )
) ) {
this.$router.push('/forgot-password/resetPassword') // Wolle: this.$router.push('/forgot-password/resetPassword')
errorMessage = error.message
} else {
errorMessage = error.message
}
this.showPageMessage = true
this.toastError(errorMessage)
this.errorSubtitle = errorMessage
}) })
}, },
checkOptInCode() { checkOptInCode() {
@ -126,6 +149,7 @@ export default {
}) })
.then() .then()
.catch((error) => { .catch((error) => {
// Wolle: show message as well?
this.toastError(error.message) this.toastError(error.message)
this.$router.push('/forgot-password/resetPassword') this.$router.push('/forgot-password/resetPassword')
}) })