+
-
+
-
+
join: {{ col.jointable }}
rec.description !== descr)
+ userStore.my.profile.myshares = userStore.my.profile.myshares.filter((rec: any) => rec.description !== descr)
const mydata = {
'profile.myshares': userStore.my.profile.myshares
@@ -222,7 +222,7 @@ export default defineComponent({
if (userStore.my.profile.myshares) {
if (userStore.my.profile.myshares.length === 0)
return false
- return userStore.my.profile.myshares.find((rec) => rec.description.toLowerCase() === descr.toLowerCase())
+ return userStore.my.profile.myshares.find((rec: any) => rec.description.toLowerCase() === descr.toLowerCase())
}
return null
}
diff --git a/src/components/CSignIn/CSignIn-validate.ts b/src/components/CSignIn/CSignIn-validate.ts
index 52f32587..391ed568 100755
--- a/src/components/CSignIn/CSignIn-validate.ts
+++ b/src/components/CSignIn/CSignIn-validate.ts
@@ -1,17 +1,20 @@
import { ISigninOptions } from 'model'
import { required, minLength } from '@vuelidate/validators'
+import { computed } from 'vue'
export type TSignin = { signin: ISigninOptions, validationGroup: string[] }
-export const validations = {
- signin: {
- password: {
- required,
- minLength: minLength(8),
+export const validations = computed(() => {
+ return {
+ signin: {
+ password: {
+ required,
+ minLength: minLength(8),
+ },
+ username: {
+ required,
+ minLength: minLength(6),
+ },
},
- username: {
- required,
- minLength: minLength(6),
- },
- },
-}
+ }
+})
diff --git a/src/components/CSignUp/CSignUp-validate.ts b/src/components/CSignUp/CSignUp-validate.ts
deleted file mode 100755
index bac28fe9..00000000
--- a/src/components/CSignUp/CSignUp-validate.ts
+++ /dev/null
@@ -1,41 +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 interface TSignup {
- signup: ISignupOptions,
- validationGroup: string[]
-}
-
-export const validations = {
- repeatPassword: {
- required,
- sameAsPassword: sameAs('password'),
- },
- password: {
- required,
- minLength: minLength(8),
- complexity,
- },
- username: {
- required,
- minLength: minLength(6),
- registereduser,
- },
- name: {
- required,
- },
- surname: {
- required,
- },
- email: {
- email,
- registeredemail,
- required,
- },
- terms: {
- required,
- },
-}
diff --git a/src/components/CSignUp/CSignUp.ts b/src/components/CSignUp/CSignUp.ts
index 3914ee52..436e7d07 100755
--- a/src/components/CSignUp/CSignUp.ts
+++ b/src/components/CSignUp/CSignUp.ts
@@ -1,7 +1,6 @@
import { tools } from '@store/Modules/tools'
import { ISignupOptions } from 'model'
-import { validations, TSignup } from './CSignUp-validate'
import { Logo } from '../../components/logo'
@@ -16,8 +15,11 @@ import { DefaultProfile, useUserStore } from '@store/UserStore'
import useValidate from '@vuelidate/core'
import useVuelidate from '@vuelidate/core'
-import 'vue3-tel-input/dist/vue3-tel-input.css'
+import { email, minLength, required, sameAs } from '@vuelidate/validators'
+// import { ValidationRuleset } from 'vuelidate'
+import { complexity, registeredemail, registereduser } from '../../validation'
+import 'vue3-tel-input/dist/vue3-tel-input.css'
// import {Loading, QSpinnerFacebook, QSpinnerGears} from 'quasar'
@@ -63,6 +65,39 @@ export default defineComponent({
aportador_solidario: '',
})
+ const validations: any = computed(() => {
+ return {
+ repeatPassword: {
+ required,
+ repeatPassword: sameAs(signup.password),
+ },
+ password: {
+ required,
+ minLength: minLength(8),
+ complexity,
+ },
+ username: {
+ required,
+ minLength: minLength(6),
+ registereduser,
+ },
+ name: {
+ required,
+ },
+ surname: {
+ required,
+ },
+ email: {
+ email,
+ registeredemail,
+ required,
+ },
+ terms: {
+ required,
+ },
+ }
+ })
+
// @ts-ignore
const v$ = useVuelidate(validations, signup)
diff --git a/src/components/CTitleBanner/CTitleBanner.vue b/src/components/CTitleBanner/CTitleBanner.vue
index 711e9f43..53be5661 100755
--- a/src/components/CTitleBanner/CTitleBanner.vue
+++ b/src/components/CTitleBanner/CTitleBanner.vue
@@ -3,7 +3,7 @@
@@ -12,7 +12,7 @@
-
+
{{ title }}
diff --git a/src/components/Header/Header.ts b/src/components/Header/Header.ts
index 8da307a2..bd49e52c 100755
--- a/src/components/Header/Header.ts
+++ b/src/components/Header/Header.ts
@@ -473,6 +473,7 @@ export default defineComponent({
getNumMsgUnread,
getMsgText,
paotest,
+ logoutHandler,
}
},
diff --git a/src/mixins/mixin-base.ts b/src/mixins/mixin-base.ts
index e7f09506..f385abb7 100755
--- a/src/mixins/mixin-base.ts
+++ b/src/mixins/mixin-base.ts
@@ -45,7 +45,7 @@ export default function () {
const $q = useQuasar()
const { t } = useI18n()
- // console.log('setValDb', key, value, serv, table, subkey)
+ console.log('setValDb', key, value, serv, table, subkey)
let mydatatosave: IDataPass | null = null
if (table === 'users') {
const myid = userStore.my._id
@@ -121,7 +121,7 @@ export default function () {
},
)
}
- // console.log('myrec', myrec)
+ console.log('myrec', myrec)
mydatatosave = {
// @ts-ignore
@@ -149,7 +149,7 @@ export default function () {
}
}
- // console.log('mydatatosave', mydatatosave)
+ console.log('mydatatosave', mydatatosave)
// @ts-ignore
globalStore.saveFieldValue(mydatatosave).then((esito) => {
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index 3993b6d2..79937064 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -345,7 +345,7 @@ const msg_it = {
you: 'Tu',
cancella_invitato: 'Elimina Invitato',
cancella_account: 'Elimina Profilo',
- cancellami: 'Sei sicuro di voler Eliminare completamente la tua Registrazione su {sitename}, uscendo così dal movimento? Non potrai piu\' accedere al sito tramite i tuoi dati, Perderai la tua POSIZIONE e i Tuoi Invitati verranno REGALATI a chi ti ha invitato.',
+ cancellami: 'Sei sicuro di voler Eliminare completamente la tua Registrazione ed i tuoi dati su {sitename}. Non potrai piu\' accedere al sito tramite le tue credenziali.',
cancellami_2: 'ULTIMO AVVISO! Vuoi uscire Definitivamente da {sitename} ?',
account_cancellato: 'Il tuo Profilo è stato cancellato correttamente',
regala_invitato: 'Regala Invitato',
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index f0368e71..1bdaa148 100644
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -4260,14 +4260,6 @@ export const tools = {
}
console.log('errorMsg', cosa, item)
- if (cosa === 'repeatpassword') {
- if (item.sameAsPassword) {
- if (item.sameAsPassword.$invalid) {
- return t('reg.err.sameaspassword')
- }
- }
- }
-
if (item.email) {
if (item.email.$invalid)
return t('reg.err.email')
@@ -4310,6 +4302,12 @@ export const tools = {
}
} else if ((cosa === 'name') || (cosa === 'surname')) {
// console.log(item);
+ } else if (cosa === 'repeatpassword') {
+ if (item.matchText) {
+ if (item.matchText.$invalid) {
+ return t('reg.err.sameaspassword')
+ }
+ }
}
return ''
diff --git a/src/store/Modules/toolsext.ts b/src/store/Modules/toolsext.ts
index 9fb2c93b..f797d888 100755
--- a/src/store/Modules/toolsext.ts
+++ b/src/store/Modules/toolsext.ts
@@ -141,10 +141,13 @@ export const toolsext = {
const globalStore = useGlobalStore()
if (table === 'users') {
if (keystr === 'profile') {
- if (subkey) { // @ts-ignore
+ if (subkey) {
+ console.log('userStore.my.profile', userStore.my.profile, 'subkey', subkey, )
+ // @ts-ignore
return userStore.my.profile[subkey]
}
} else if (keystr) { // @ts-ignore
+ // @ts-ignore
return userStore.my[keystr]
}
} else if (table === 'todos') {
diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts
index de4a8cdd..0cc9db20 100755
--- a/src/store/UserStore.ts
+++ b/src/store/UserStore.ts
@@ -108,28 +108,6 @@ export const useUserStore = defineStore('UserStore', {
getters: {
- getUserByUsername: (state: IUserState) => (username: string): IUserFields | null => {
- // Check if is this User!
- if (state.my.username === username) return state.my
-
- let trovato = null
- if (state.usersList) trovato = state.usersList.find((item) => item.username === username)
-
- return (trovato) || null
- },
-
- getImgByUsername: (state: IUserState) => (username: string): string => {
- if (username === '') return ''
- // Check if is this User!
- // @ts-ignore
- const myrec = this.getUserByUsername(username)
- // console.log('myrec', myrec)
- if (myrec && myrec.profile && !!myrec.profile.img && myrec.profile.img !== '' && myrec.profile.img !== 'undefined') {
- return myrec.profile.img
- }
- return ''
- },
-
isServerError(): boolean {
return (this.servercode === toolsext.ERR_SERVERFETCH)
},
@@ -137,21 +115,6 @@ export const useUserStore = defineStore('UserStore', {
getServerCode: (state: IUserState): number => (state.servercode ? state.servercode : 0),
getMsg: (state: IUserState): string => (state.msg ? state.msg : ''),
- getNameSurnameByUserId: (state: IUserState) => (userId: string): string => {
-
- // @ts-ignore
- const user = this.getUserByUserId(state, userId)
- if (user) return `${user.name} ${user.surname}`
- return `(${userId})`
- },
-
- getNameSurnameByUsername: (state: IUserState) => (username: string): string => {
- // @ts-ignore
- const user = this.getUserByUsername(state, username)
- if (user) return `${user.name} ${user.surname}`
- return `(${username})`
- },
-
getUsersList: (mystate: IUserState) => {
return mystate.usersList
},
@@ -169,17 +132,6 @@ export const useUserStore = defineStore('UserStore', {
},
- getUserByUserId: (state: IUserState) => (userId: string): IUserFields | null => {
- // Check if is this User!
- if (state.my._id === userId) return state.my
-
- let trovato = null
-
- if (state.usersList) trovato = state.usersList.find((item) => item._id === userId)
-
- return (trovato) || null
- },
-
isTokenInvalid: (state: IUserState) => {
try {
return (state.my.tokens!.length <= 0)
@@ -196,11 +148,60 @@ export const useUserStore = defineStore('UserStore', {
}
},
- getMsgError: (state: IUserState) => (err: number): string => {
+ },
+
+ actions: {
+ getUserByUsername(username: string): IUserFields | null {
+ // Check if is this User!
+ if (this.my.username === username) return this.my
+
+ let trovato = null
+ if (this.usersList) trovato = this.usersList.find((item: any) => item.username === username)
+
+ return (trovato) || null
+ },
+
+
+ getImgByUsername(username: string): string {
+ if (username === '') return ''
+ // Check if is this User!
+ const myrec = this.getUserByUsername(username)
+ // console.log('myrec', myrec)
+ if (myrec && myrec.profile && !!myrec.profile.img && myrec.profile.img !== '' && myrec.profile.img !== 'undefined') {
+ return myrec.profile.img
+ }
+ return ''
+ },
+
+ getNameSurnameByUserId(userId: string): string {
+
+ const user = this.getUserByUserId(userId)
+ if (user) return `${user.name} ${user.surname}`
+ return `(${userId})`
+ },
+
+ getNameSurnameByUsername(username: string): string {
+ const user = this.getUserByUsername(username)
+ if (user) return `${user.name} ${user.surname}`
+ return `(${username})`
+ },
+
+ getUserByUserId(userId: string): IUserFields | null {
+ // Check if is this User!
+ if (this.my._id === userId) return this.my
+
+ let trovato = null
+
+ if (this.usersList) trovato = this.usersList.find((item: any) => item._id === userId)
+
+ return (trovato) || null
+ },
+
+ getMsgError(err: number): string {
let msgerrore = ''
if (err !== tools.OK) {
- msgerrore = `Error [${state.servercode}]: `
- if (state.servercode === toolsext.ERR_SERVERFETCH) {
+ msgerrore = `Error [${this.servercode}]: `
+ if (this.servercode === toolsext.ERR_SERVERFETCH) {
msgerrore = translate('fetch.errore_server')
} else {
msgerrore = translate('fetch.errore_generico')
@@ -215,9 +216,7 @@ export const useUserStore = defineStore('UserStore', {
return msgerrore
},
- },
- actions: {
clearAuthData() {
this.my = DefaultUser
// resetArrToken(mystate.my.tokens)
@@ -232,18 +231,6 @@ export const useUserStore = defineStore('UserStore', {
return true
},
- setErrorCatch(axerr: Types.AxiosError) {
- try {
- if (this.servercode !== toolsext.ERR_SERVERFETCH) {
- this.servercode = axerr.getCode()
- }
- // this.msg = axerr.getMsg()
- console.log('Err catch: (servercode:', axerr.getCode(), axerr.getMsgError(), ')')
- } catch (e) {
- console.log('Err catch:', axerr)
- }
- },
-
async resetpwd(paramquery: any) {
const mydata = { ...paramquery }
@@ -265,6 +252,18 @@ export const useUserStore = defineStore('UserStore', {
},
+ setErrorCatch(axerr: Types.AxiosError) {
+ try {
+ if (this.servercode !== toolsext.ERR_SERVERFETCH) {
+ this.servercode = axerr.getCode()
+ }
+ // this.msg = axerr.getMsg()
+ console.log('Err catch: (servercode:', axerr.getCode(), axerr.getMsgError(), ')')
+ } catch (e) {
+ console.log('Err catch:', axerr)
+ }
+ },
+
async setLangServer() {
const mydata = {
username: this.my.username,
diff --git a/src/views/admin/dbop/dbop.vue b/src/views/admin/dbop/dbop.vue
index c45a6713..1ab23758 100755
--- a/src/views/admin/dbop/dbop.vue
+++ b/src/views/admin/dbop/dbop.vue
@@ -6,7 +6,7 @@
title="SITO_ONLINE"
mykey="SITO_ONLINE"
:serv="false"
- :type="tools.FieldType.boolean">
+ :type="costanti.FieldType.boolean">
@@ -14,7 +14,7 @@ title="SITO_ONLINE"
title="ABILITA CRONTAB (1 ora)"
mykey="CRONTAB"
:serv="false"
- :type="tools.FieldType.boolean">
+ :type="costanti.FieldType.boolean">
@@ -98,22 +98,22 @@ title="ABILITA CRONTAB (1 ora)"
+ :type="costanti.FieldType.number">
+ :type="costanti.FieldType.number">
+ :type="costanti.FieldType.boolean">
+ :type="costanti.FieldType.boolean">
diff --git a/src/views/email/unsubscribe/unsubscribe.ts b/src/views/email/unsubscribe/unsubscribe.ts
index 8be868d3..afb7bc46 100755
--- a/src/views/email/unsubscribe/unsubscribe.ts
+++ b/src/views/email/unsubscribe/unsubscribe.ts
@@ -59,7 +59,7 @@ export default defineComponent({
riscode.value = ris.code
risultato.value = ris.msg
- }).catch((err) => {
+ }).catch((err: any) => {
console.log('ERR = ' + err)
})
}
diff --git a/src/views/login/signup/signup-validate.ts b/src/views/login/signup/signup-validate.ts
deleted file mode 100755
index f8e3a58e..00000000
--- a/src/views/login/signup/signup-validate.ts
+++ /dev/null
@@ -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,
- },
- },
-}
diff --git a/src/views/login/signup/signup.vue b/src/views/login/signup/signup.vue
index 9afb8aad..497481ba 100755
--- a/src/views/login/signup/signup.vue
+++ b/src/views/login/signup/signup.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/src/views/login/vreg/vreg.vue b/src/views/login/vreg/vreg.vue
index f612d6ca..e4fce880 100755
--- a/src/views/login/vreg/vreg.vue
+++ b/src/views/login/vreg/vreg.vue
@@ -21,17 +21,17 @@
rounded
class="bg-warning text-black"
style="text-align: center;"
- v-if="giaverificato"
+ v-if="giaverificato()"
>
- {{ myrisultato }}
+ {{ myrisultato() }}
- {{ myrisultato }}
+ {{ myrisultato() }}
diff --git a/src/views/projects/proj-list/proj-list.vue.off b/src/views/projects/proj-list/proj-list.vue.off
index 0e868d5c..3f97497c 100755
--- a/src/views/projects/proj-list/proj-list.vue.off
+++ b/src/views/projects/proj-list/proj-list.vue.off
@@ -391,7 +391,7 @@
table="todos"
mykey="assignedToUsers"
@input="modifyfieldtodo('assignedToUsers')"
- :type="tools.FieldType.multiselect"
+ :type="costanti.FieldType.multiselect"
jointable="workers">
diff --git a/src/views/requestresetpwd/requestresetpwd.ts b/src/views/requestresetpwd/requestresetpwd.ts
index 524b7dda..7f03d6eb 100755
--- a/src/views/requestresetpwd/requestresetpwd.ts
+++ b/src/views/requestresetpwd/requestresetpwd.ts
@@ -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()
})
diff --git a/src/views/updatepassword/request-resetpwd-validate.ts b/src/views/updatepassword/request-resetpwd-validate.ts
deleted file mode 100755
index 4cfaa0a2..00000000
--- a/src/views/updatepassword/request-resetpwd-validate.ts
+++ /dev/null
@@ -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
- }
-}))
diff --git a/src/views/updatepassword/updatepassword.ts b/src/views/updatepassword/updatepassword.ts
index cd47f011..8bd35e11 100755
--- a/src/views/updatepassword/updatepassword.ts
+++ b/src/views/updatepassword/updatepassword.ts
@@ -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()
+ })
}
diff --git a/src/views/updatepassword/updatepassword.vue b/src/views/updatepassword/updatepassword.vue
index b136e874..97354c7f 100755
--- a/src/views/updatepassword/updatepassword.vue
+++ b/src/views/updatepassword/updatepassword.vue
@@ -61,6 +61,8 @@