ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2026-04-06 01:25:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix lint

Browse Source
This commit is contained in:
Wolfgang Huß 2021-02-25 20:58:25 +01:00
parent b747c1ca42
commit 68f4c271af
3 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
webapp/components/Registration/RegistrationItemEnterEmail.vue
View File

@ -159,19 +159,27 @@ export default {
if ( if (
!this.sliderData.sliders[this.sliderIndex].data.request || !this.sliderData.sliders[this.sliderIndex].data.request ||
!this.sliderData.sliders[this.sliderIndex].data.request.variables || !this.sliderData.sliders[this.sliderIndex].data.request.variables ||
(this.sliderData.sliders[this.sliderIndex].data.request && this.sliderData.sliders[this.sliderIndex].data.request.variables && (this.sliderData.sliders[this.sliderIndex].data.request &&
this.sliderData.sliders[this.sliderIndex].data.request.variables &&
!this.sliderData.sliders[this.sliderIndex].data.request.variables.is(variables)) !this.sliderData.sliders[this.sliderIndex].data.request.variables.is(variables))
) ) {
{ this.sliderData.sliders[this.sliderIndex].data = {
this.sliderData.sliders[this.sliderIndex].data = {...this.sliderData.sliders[this.sliderIndex].data, request: { variables }} ...this.sliderData.sliders[this.sliderIndex].data,
request: { variables },
}
try { try {
const response = await this.$apollo.mutate({ mutation, variables }) // e-mail is send in emailMiddleware of backend const response = await this.$apollo.mutate({ mutation, variables }) // e-mail is send in emailMiddleware of backend
this.sliderData.sliders[this.sliderIndex].data = {...this.sliderData.sliders[this.sliderIndex].data, response: response.data} this.sliderData.sliders[this.sliderIndex].data = {
...this.sliderData.sliders[this.sliderIndex].data,
response: response.data,
}
if (this.sliderData.sliders[this.sliderIndex].data.response) { if (this.sliderData.sliders[this.sliderIndex].data.response) {
this.sliderData.collectedInputData.emailSend = true this.sliderData.collectedInputData.emailSend = true
const {email: respnseEmail} = this.sliderData.sliders[this.sliderIndex].data.response.Signup || this.sliderData.sliders[this.sliderIndex].data.response.SignupByInvitation const { email: respnseEmail } =
this.sliderData.sliders[this.sliderIndex].data.response.Signup ||
this.sliderData.sliders[this.sliderIndex].data.response.SignupByInvitation
this.$toast.success( this.$toast.success(
this.$t('components.registration.email.form.success', { email: respnseEmail }), this.$t('components.registration.email.form.success', { email: respnseEmail }),
) )

10
webapp/components/Registration/RegistrationItemEnterInvite.vue
View File

@ -91,7 +91,8 @@ export default {
if ( if (
!this.sliderData.sliders[this.sliderIndex].data.request || !this.sliderData.sliders[this.sliderIndex].data.request ||
!this.sliderData.sliders[this.sliderIndex].data.request.variables || !this.sliderData.sliders[this.sliderIndex].data.request.variables ||
(this.sliderData.sliders[this.sliderIndex].data.request && this.sliderData.sliders[this.sliderIndex].data.request.variables && (this.sliderData.sliders[this.sliderIndex].data.request &&
this.sliderData.sliders[this.sliderIndex].data.request.variables &&
!this.sliderData.sliders[this.sliderIndex].data.request.variables.is(variables)) !this.sliderData.sliders[this.sliderIndex].data.request.variables.is(variables))
) { ) {
// this.sliderData.sliders[this.sliderIndex].data.request.variables = variables // this.sliderData.sliders[this.sliderIndex].data.request.variables = variables
@ -101,14 +102,17 @@ export default {
const response = await this.$apollo.query({ query: isValidInviteCodeQuery, variables }) const response = await this.$apollo.query({ query: isValidInviteCodeQuery, variables })
this.sliderData.sliders[this.sliderIndex].data.response = response.data this.sliderData.sliders[this.sliderIndex].data.response = response.data
if (this.sliderData.sliders[this.sliderIndex].data.response && this.sliderData.sliders[this.sliderIndex].data.response.isValidInviteCode) { if (
this.sliderData.sliders[this.sliderIndex].data.response &&
this.sliderData.sliders[this.sliderIndex].data.response.isValidInviteCode
) {
this.$toast.success( this.$toast.success(
this.$t('components.registration.invite-code.form.success', { inviteCode }), this.$t('components.registration.invite-code.form.success', { inviteCode }),
) )
} }
} catch (err) { } catch (err) {
this.sliderData.sliders[this.sliderIndex].data.response = { isValidInviteCode: false } this.sliderData.sliders[this.sliderIndex].data.response = { isValidInviteCode: false }
const { message } = err const { message } = err
this.$toast.error(message) this.$toast.error(message)
} }

10
webapp/components/Registration/RegistrationSlider.vue
View File

@ -24,7 +24,11 @@
> >
<!-- Wolle !!! may create same source with 'webapp/pages/registration/signup.vue' --> <!-- Wolle !!! may create same source with 'webapp/pages/registration/signup.vue' -->
<!-- <signup v-if="publicRegistration" :invitation="false" @submit="handleSubmitted"> --> <!-- <signup v-if="publicRegistration" :invitation="false" @submit="handleSubmitted"> -->
<registration-item-enter-email ref="RegistrationItemEnterEmail" :sliderData="sliderData" :invitation="false" /> <registration-item-enter-email
ref="RegistrationItemEnterEmail"
:sliderData="sliderData"
:invitation="false"
/>
</template> </template>
<template <template
@ -201,7 +205,9 @@ export default {
buttonCallback() { buttonCallback() {
if (this.sliderData.sliders[this.sliderIndex].name === 'enter-email') { if (this.sliderData.sliders[this.sliderIndex].name === 'enter-email') {
this.$refs.RegistrationItemEnterEmail.handleSubmitVerify() this.$refs.RegistrationItemEnterEmail.handleSubmitVerify()
this.sliderData.sliders[this.sliderIndex].button.title = this.enterEmailButtonTitle(this.sliderData.collectedInputData.emailSend) this.sliderData.sliders[this.sliderIndex].button.title = this.enterEmailButtonTitle(
this.sliderData.collectedInputData.emailSend,
)
} }
if (this.sliderIndex === this.sliderData.sliders.length - 1) { if (this.sliderIndex === this.sliderData.sliders.length - 1) {