surya/myprojplanet_vite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

regNameSurnameMandatory

Browse Source 
askUSernameTelegramToTheReg
@ davanti all'username
This commit is contained in:
Surya Paolo
2024-01-19 23:38:15 +01:00
parent 1ea2ef1ea3
commit fbebd925b1
8 changed files with 53 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/CSignUp/CSignUp.ts
View File

@@ -18,6 +18,8 @@ import { DefaultProfile, useUserStore } from '@store/UserStore'
import useValidate from '@vuelidate/core'
import useVuelidate from '@vuelidate/core'
import { shared_consts } from '@/common/shared_vuejs'
import { minLength, required, sameAs } from '@vuelidate/validators'
// import { ValidationRuleset } from 'vuelidate'
@@ -118,6 +120,11 @@ export default defineComponent({
} else if (slide.value === '2') {
// Username
ret = !signup.username || (inputUsername.value && inputUsername.value.hasError)
if (tools.getConfSiteOptionEnabled(shared_consts.ConfSite.regNameSurnameMandatory)) {
ret = ret || (!signup.name || (inputName.value && inputName.value.hasError))
ret = ret || (!signup.surname || (inputSurname.value && inputSurname.value.hasError))
}
} else if (slide.value === '3') {
// Password
ret = !signup.password || (!inputPassword.value || (inputPassword.value && inputPassword.value.hasError)) || (!inputPassword2.value || (inputPassword2.value && inputPassword2.value.hasError))
@@ -163,7 +170,10 @@ export default defineComponent({
registereduser,
},
name: {
required: props.collettivo ? true : false,
required: (props.collettivo || tools.getConfSiteOptionEnabled(shared_consts.ConfSite.regNameSurnameMandatory)) ? true : false,
},
surname: {
required: (tools.getConfSiteOptionEnabled(shared_consts.ConfSite.regNameSurnameMandatory)) ? true : false,
},
terms: {
required,
@@ -432,6 +442,8 @@ export default defineComponent({
inputSurname,
inputPassword,
inputPassword2,
shared_consts,
}
},
})

11
src/components/CSignUp/CSignUp.vue
View File

@@ -13,6 +13,7 @@
</span>
</q-banner>
<div class="row q-ma-sm q-pa-sm justify-center">
<q-btn
class="q-ma-sm"
@@ -157,7 +158,7 @@
tools.errorMsg('username', v$.username) ||
(isalreadyReg ? 'L\'Username è gia stato registrato!' : '')
"
:label="$t('reg.username_reg')"
:label="tools.getConfSiteOptionEnabled(shared_consts.ConfSite.askUSernameTelegramToTheReg) ? $t('reg.username_telegram') : $t('reg.username_reg')"
>
<template v-slot:prepend>
<q-icon name="person" />
@@ -198,7 +199,7 @@
debounce="1000"
@keyup.enter="$refs.inputSurname.focus()"
:error-message="tools.errorMsg('name', v$.name)"
:label="$t('reg.name_opt')"
:label="tools.getConfSiteOptionEnabled(shared_consts.ConfSite.regNameSurnameMandatory) ? $t('reg.name') : $t('reg.name_opt')"
>
<template v-slot:prepend>
<q-icon name="person" />
@@ -427,7 +428,7 @@
tools.errorMsg('username', v$.username) ||
(isalreadyReg ? 'L\'Username è gia stato registrato!' : '')
"
:label="collettivo ? $t('reg.username_reg_collettivo') : $t('reg.username_reg')"
:label="collettivo ? $t('reg.username_reg_collettivo') : (tools.getConfSiteOptionEnabled(shared_consts.ConfSite.askUSernameTelegramToTheReg) ? $t('reg.username_telegram') : $t('reg.username_reg'))"
>
<template v-slot:prepend>
<q-icon name="person" />
@@ -468,7 +469,7 @@
debounce="1000"
@keyup.enter="$refs.inputSurname.focus()"
:error-message="tools.errorMsg('name', v$.name)"
:label="$t('reg.name_opt')"
:label="tools.getConfSiteOptionEnabled(shared_consts.ConfSite.regNameSurnameMandatory) ? $t('reg.name') : $t('reg.name_opt')"
>
<template v-slot:prepend>
<q-icon name="person" />
@@ -488,7 +489,7 @@
!checkifDisabled ? $refs.carousel.next() : null
"
:error-message="tools.errorMsg('surname', v$.surname)"
:label="$t('reg.surname_opt')"
:label="tools.getConfSiteOptionEnabled(shared_consts.ConfSite.regNameSurnameMandatory) ? $t('reg.surname') : $t('reg.surname_opt')"
>
<template v-slot:prepend>
<q-icon name="person" />