Update Password + Signup

This commit is contained in:
Paolo Arena
2021-09-19 02:59:24 +02:00
parent d1eb9a9733
commit 622bd6943d
32 changed files with 987 additions and 1145 deletions

View File

@@ -6,7 +6,7 @@
title="SITO_ONLINE"
mykey="SITO_ONLINE"
:serv="false"
:type="tools.FieldType.boolean">
:type="costanti.FieldType.boolean">
</CMyFieldDb>
<br>
@@ -14,7 +14,7 @@ title="SITO_ONLINE"
title="ABILITA CRONTAB (1 ora)"
mykey="CRONTAB"
:serv="false"
:type="tools.FieldType.boolean">
:type="costanti.FieldType.boolean">
</CMyFieldDb>
<br>
@@ -98,22 +98,22 @@ title="ABILITA CRONTAB (1 ora)"
<CMyFieldDb title="Riga"
mykey="riga"
:serv="false"
:type="tools.FieldType.number">
:type="costanti.FieldType.number">
</CMyFieldDb>
<CMyFieldDb title="Col"
mykey="col"
:serv="false"
:type="tools.FieldType.number">
:type="costanti.FieldType.number">
</CMyFieldDb>
<CMyFieldDb title="Visu_TEST"
mykey="VISU_TEST"
:serv="false"
:type="tools.FieldType.boolean">
:type="costanti.FieldType.boolean">
</CMyFieldDb>
<CMyFieldDb title="VISU_NAVE_BOT"
mykey="VISU_NAVE_BOT"
:serv="false"
:type="tools.FieldType.boolean">
:type="costanti.FieldType.boolean">
</CMyFieldDb>
</div>

View File

@@ -59,7 +59,7 @@ export default defineComponent({
riscode.value = ris.code
risultato.value = ris.msg
}).catch((err) => {
}).catch((err: any) => {
console.log('ERR = ' + err)
})
}

View File

@@ -1,37 +0,0 @@
import { ISignupOptions } from 'model'
import { email, minLength, required, sameAs } from '@vuelidate/validators'
import { complexity, registeredemail, registereduser } from '@src/validation'
// import { ValidationRuleset } from 'vuelidate'
export interface TSignup { signup: ISignupOptions, validationGroup: string[] }
export const validations = {
signup: {
repeatPassword: {
required,
sameAsPassword: sameAs('password'),
},
password: {
complexity,
required,
},
username: {
registereduser,
required,
},
name: {
required,
},
surname: {
required,
},
email: {
email,
registeredemail,
required,
},
terms: {
required,
},
},
}

View File

@@ -1,6 +1,6 @@
<template>
<q-page padding class="signup">
<CSignUp :showcell="true">
<CSignUp :showcell="false">
</CSignUp>
</q-page>

View File

@@ -21,17 +21,17 @@
rounded
class="bg-warning text-black"
style="text-align: center;"
v-if="giaverificato"
v-if="giaverificato()"
>
<span class="mybanner">{{ myrisultato }}</span>
<span class="mybanner">{{ myrisultato() }}</span>
</q-banner>
<q-banner
class="bg-positive text-white"
style="text-align: center;"
rounded
v-if="verificatook"
v-if="verificatook()"
>
<span class="mybanner">{{ myrisultato }}</span>
<span class="mybanner">{{ myrisultato() }}</span>
</q-banner>
</div>
</transition>

View File

@@ -391,7 +391,7 @@
table="todos"
mykey="assignedToUsers"
@input="modifyfieldtodo('assignedToUsers')"
:type="tools.FieldType.multiselect"
:type="costanti.FieldType.multiselect"
jointable="workers">
</CMyFieldDb>
</div>

View File

@@ -67,7 +67,7 @@ export default defineComponent({
else if (ris.code === serv_constants.RIS_CODE_EMAIL_NOT_EXIST)
tools.showNegativeNotif($q, t('reg.err.email_not_exist'))
$q.loading.hide()
}).catch((err) => {
}).catch((err: any) => {
console.log('ERROR = ' + err.error)
$q.loading.hide()
})

View File

@@ -1,17 +0,0 @@
import { ISignupOptions } from 'model'
import { email, minLength, required, sameAs } from '@vuelidate/validators'
// import { ValidationRuleset } from 'vuelidate'
import { complexity, registeredemail, registereduser, aportadorexist } from '../../validation'
import { computed } from 'vue'
export const validations = computed(() => ({
repeatPassword: {
required,
sameAsPassword: sameAs('password')
},
password: {
required,
minLength: minLength(8),
complexity
}
}))

View File

@@ -3,7 +3,6 @@ import { serv_constants } from '@store/Modules/serv_constants'
import { tools } from '@store/Modules/tools'
import { Logo } from '../../components/logo'
import { CTitleBanner } from '../../components/CTitleBanner'
import { validations } from './request-resetpwd-validate'
import { defineComponent, ref, reactive } from 'vue'
import { useI18n } from '@src/boot/i18n'
@@ -13,6 +12,11 @@ import { useQuasar } from 'quasar'
import useVuelidate from '@vuelidate/core'
import { useRoute, useRouter } from 'vue-router'
import { minLength, required, sameAs } from '@vuelidate/validators'
import { computed } from 'vue'
import { complexity } from '../../validation'
export default defineComponent({
name: 'Updatepassword',
components: { Logo, CTitleBanner },
@@ -33,6 +37,20 @@ export default defineComponent({
idapp: ''
})
const validations: any = computed(() => {
return {
password: {
required,
minLength: minLength(8),
complexity,
},
repeatPassword: {
required,
repeatPassword: sameAs(form.password),
}
}
})
// @ts-ignore
const v$ = useVuelidate(validations, form)
@@ -57,7 +75,7 @@ export default defineComponent({
console.log(form)
userStore.resetpwd(form)
.then((ris) => {
.then((ris: any) => {
console.log('ris', ris)
if (ris.code === serv_constants.RIS_CODE_OK)
$router.push('/signin')
@@ -67,10 +85,11 @@ export default defineComponent({
tools.showNegativeNotif($q, t('fetch.errore_server'))
$q.loading.hide()
}).catch(error => {
console.log('ERROR = ' + error)
$q.loading.hide()
})
})
.catch(e => {
console.log('ERROR = ' + e)
$q.loading.hide()
})
}

View File

@@ -61,6 +61,8 @@
</div>
</div>
<pre>{{ v$.$errors }}</pre>
</div>
<div v-else>
<q-banner

View File

@@ -9,6 +9,7 @@ import { useGlobalStore } from '@store/globalStore'
import { useI18n } from '@/boot/i18n'
import { toolsext } from '@store/Modules/toolsext'
import { useQuasar } from 'quasar'
import { costanti } from '@costanti'
export default defineComponent({
@@ -74,6 +75,7 @@ export default defineComponent({
profile,
getpayment,
tools,
costanti,
}
}
})

View File

@@ -1,5 +1,14 @@
<template xmlns:v-slot="http://www.w3.org/1999/XSL/Transform">
<div class="q-gutter-sm q-pa-xs q-pb-md">
<CMyFieldDb
:title="$t('reg.name')"
table="users"
mykey="name"
:type="costanti.FieldType.string">
</CMyFieldDb>
<!--
<CTitleBanner
class="q-pa-xs" :title="$t('pages.profile')" bgcolor="bg-primary" clcolor="text-white"
myclass="myshad" :canopen="true">
@@ -11,13 +20,13 @@
:title="$t('reg.name')"
table="users"
mykey="name"
:type="tools.FieldType.string">
:type="costanti.FieldType.string">
</CMyFieldDb>
<CMyFieldDb
:title="$t('reg.surname')"
table="users"
mykey="surname"
:type="tools.FieldType.string">
:type="costanti.FieldType.string">
</CMyFieldDb>
</div>
<div class="row">
@@ -25,15 +34,15 @@
:title="$t('reg.username')"
table="users"
mykey="username"
disable="true"
:type="tools.FieldType.string">
:disable="true"
:type="costanti.FieldType.string">
</CMyFieldDb>
<CMyFieldDb
:title="$t('reg.email')"
table="users"
mykey="email"
disable="true"
:type="tools.FieldType.string">
:disable="true"
:type="costanti.FieldType.string">
</CMyFieldDb>
</div>
<CMyFieldDb
@@ -41,7 +50,7 @@
table="users"
mykey="profile"
mysubkey="nationality"
:type="tools.FieldType.nationality">
:type="costanti.FieldType.nationality">
</CMyFieldDb>
<div class="row">
<CMyFieldDb
@@ -49,29 +58,16 @@
table="users"
mykey="profile"
mysubkey="intcode_cell"
:type="tools.FieldType.intcode">
:type="costanti.FieldType.intcode">
</CMyFieldDb>
<CMyFieldDb
:title="$t('reg.cell')"
table="users"
mykey="profile"
mysubkey="cell"
:type="tools.FieldType.string">
:type="costanti.FieldType.string">
</CMyFieldDb>
</div>
<!--<CMyFieldDb :title="$t('reg.username_telegram')"
table="users"
mykey="profile"
mysubkey="username_telegram"
:type="tools.FieldType.string">
</CMyFieldDb>-->
<!--<CMyFieldDb title="Telegram Id"
table="users"
:readonly="true"
mykey="profile"
mysubkey="teleg_id"
:type="tools.FieldType.number">
</CMyFieldDb>-->
<br/>
<div class="row justify-center">
@@ -100,7 +96,7 @@
table="users"
mykey="profile"
mysubkey="motivazioni"
:type="tools.FieldType.string">
:type="costanti.FieldType.string">
</CMyFieldDb>
</div>
<div class="row">
@@ -109,7 +105,7 @@
table="users"
mykey="profile"
mysubkey="competenze_professionalita"
:type="tools.FieldType.string">
:type="costanti.FieldType.string">
</CMyFieldDb>
</div>
<div class="row">
@@ -118,7 +114,7 @@
table="users"
mykey="profile"
mysubkey="cosa_offrire"
:type="tools.FieldType.string">
:type="costanti.FieldType.string">
</CMyFieldDb>
</div>
<div class="row">
@@ -127,7 +123,7 @@
table="users"
mykey="profile"
mysubkey="cosa_ricevere"
:type="tools.FieldType.string">
:type="costanti.FieldType.string">
</CMyFieldDb>
</div>
<div class="row">
@@ -136,7 +132,7 @@
table="users"
mykey="profile"
mysubkey="altre_comunicazioni"
:type="tools.FieldType.string">
:type="costanti.FieldType.string">
</CMyFieldDb>
</div>
<div class="row">
@@ -145,69 +141,72 @@
table="users"
mykey="profile"
mysubkey="come_ci_hai_conosciuto"
:type="tools.FieldType.string">
:type="costanti.FieldType.string">
</CMyFieldDb>
</div>
</div>
</CTitleBanner>
-->
<!--
<CTitleBanner class="q-pa-xs" :title="$t('pages.payment')" bgcolor="bg-primary" clcolor="text-white"
myclass="myshad" :canopen="true">
<div class="row fa-border justify-center items-center">
<CMyFieldDb v-if="tools.isselectPayeer()"
<CMyFieldDb v-if="costanti.isselectPayeer()"
:title="$t('reg.payeer_id')"
table="users"
mykey="profile"
myimg="statics/images/payeer.jpg"
mysubkey="payeer_id"
:type="tools.FieldType.string">
:type="costanti.FieldType.string">
</CMyFieldDb>
<CMyFieldDb v-if="tools.isselectAdvCash()"
<CMyFieldDb v-if="costanti.isselectAdvCash()"
:title="$t('reg.advcash_id')"
table="users"
mykey="profile"
mysubkey="advcash_id"
myimg="statics/images/advcash.jpg"
:type="tools.FieldType.string">
:type="costanti.FieldType.string">
</CMyFieldDb>
<CMyFieldDb v-if="tools.isselectRevolut()"
<CMyFieldDb v-if="costanti.isselectRevolut()"
:title="$t('reg.revolut')"
table="users"
mykey="profile"
mysubkey="revolut"
myimg="statics/images/revolut.jpg"
:type="tools.FieldType.string">
:type="costanti.FieldType.string">
</CMyFieldDb>
<CMyFieldDb v-if="tools.isselectPaypal()"
<CMyFieldDb v-if="costanti.isselectPaypal()"
:title="$t('reg.email_paypal')"
table="users"
mykey="profile"
mysubkey="email_paypal"
myimg="statics/images/paypal.jpg"
:type="tools.FieldType.string">
:type="costanti.FieldType.string">
</CMyFieldDb>
<CMyFieldDb v-if="tools.isselectPaypal()"
<CMyFieldDb v-if="costanti.isselectPaypal()"
:title="$t('reg.link_payment')"
table="users"
mykey="profile"
mysubkey="link_payment"
:type="tools.FieldType.string">
:type="costanti.FieldType.string">
</CMyFieldDb>
<CMyFieldDb :title="$t('reg.country_pay')"
table="users"
mykey="profile"
mysubkey="country_pay"
:type="tools.FieldType.nationality">
:type="costanti.FieldType.nationality">
</CMyFieldDb>
<CMyFieldDb :title="$t('reg.note_payment')"
table="users"
mykey="profile"
mysubkey="note_payment"
:type="tools.FieldType.string">
:type="costanti.FieldType.string">
</CMyFieldDb>
</div>
@@ -216,7 +215,7 @@
table="users"
mykey="profile"
mysubkey="paymenttypes"
:type="tools.FieldType.multiselect"
:type="costanti.FieldType.multiselect"
jointable="paymenttypes">
</CMyFieldDb>
@@ -238,3 +237,18 @@
<style lang="scss" scoped>
@import './profile.scss';
</style>
<!--<CMyFieldDb :title="$t('reg.username_telegram')"
table="users"
mykey="profile"
mysubkey="username_telegram"
:type="costanti.FieldType.string">
</CMyFieldDb>-->
<!--<CMyFieldDb title="Telegram Id"
table="users"
:readonly="true"
mykey="profile"
mysubkey="teleg_id"
:type="costanti.FieldType.number">
</CMyFieldDb>-->