diff --git a/.env.development b/.env.development index fcf535bd..b9e9f538 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.41" +APP_VERSION="0.5.42" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index f03fc0b7..cb055412 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.41" +APP_VERSION="0.5.42" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index fcf535bd..b9e9f538 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.41" +APP_VERSION="0.5.42" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.production b/_ALL_SITES/riso.app/.env.production index ed230916..5586c01a 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.41" +APP_VERSION="0.5.42" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/terradellavisione.app/.env.development b/_ALL_SITES/terradellavisione.app/.env.development index 4a845f71..ac270570 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.41" +APP_VERSION="0.5.42" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL="newfreeplanet" diff --git a/src/App.ts b/src/App.ts index 09a1359f..f8d21983 100755 --- a/src/App.ts +++ b/src/App.ts @@ -78,13 +78,20 @@ export default { let displayMode = 'browser'; const mqStandAlone = '(display-mode: standalone)'; + if (navigator) + console.log('navigator') + // @ts-ignore + if (navigator && navigator.standalone) + console.log('navigator.standalone') // @ts-ignore if (((navigator && (navigator.standalone))) || - (window.matchMedia(mqStandAlone).matches)) { + (window.matchMedia(mqStandAlone).matches)) { + console.log('navigator.standalone') displayMode = 'standalone' } globalStore.isAppRunning = displayMode === 'standalone'; + console.log('isapp running = ', globalStore.isAppRunning) } function mounted() { diff --git a/src/components/CEventsCalendar/CEventsCalendar.vue b/src/components/CEventsCalendar/CEventsCalendar.vue index 8ddfa6fe..1c0ff341 100755 --- a/src/components/CEventsCalendar/CEventsCalendar.vue +++ b/src/components/CEventsCalendar/CEventsCalendar.vue @@ -1401,6 +1401,7 @@
- +
diff --git a/src/components/CMyCircuits/CMyCircuits.ts b/src/components/CMyCircuits/CMyCircuits.ts index ccc1a976..994428bc 100755 --- a/src/components/CMyCircuits/CMyCircuits.ts +++ b/src/components/CMyCircuits/CMyCircuits.ts @@ -31,6 +31,11 @@ export default defineComponent({ required: false, default: true, }, + showBarSelection: { + type: Boolean, + required: false, + default: true, + }, circuit: { type: Object as PropType, required: false, diff --git a/src/components/CMyCircuits/CMyCircuits.vue b/src/components/CMyCircuits/CMyCircuits.vue index 74821f3b..100fc231 100755 --- a/src/components/CMyCircuits/CMyCircuits.vue +++ b/src/components/CMyCircuits/CMyCircuits.vue @@ -16,7 +16,12 @@ />
-
+
@@ -26,24 +31,24 @@ --> - - - - - - + + + + + +
- - - - + + +
diff --git a/src/components/CMyElem/CMyElem.vue b/src/components/CMyElem/CMyElem.vue index d8df3eb1..ae81739d 100755 --- a/src/components/CMyElem/CMyElem.vue +++ b/src/components/CMyElem/CMyElem.vue @@ -442,7 +442,7 @@
Registrazione
-
+
diff --git a/src/components/CMyGroups/CMyGroups.ts b/src/components/CMyGroups/CMyGroups.ts index 6a472c0a..9976947e 100755 --- a/src/components/CMyGroups/CMyGroups.ts +++ b/src/components/CMyGroups/CMyGroups.ts @@ -24,6 +24,11 @@ export default defineComponent({ type: Boolean, required: true, }, + showBarSelection: { + type: Boolean, + required: false, + default: true, + }, mygrp: { type: Object as PropType, required: false, diff --git a/src/components/CMyGroups/CMyGroups.vue b/src/components/CMyGroups/CMyGroups.vue index 82a07826..9f419cbf 100755 --- a/src/components/CMyGroups/CMyGroups.vue +++ b/src/components/CMyGroups/CMyGroups.vue @@ -20,24 +20,23 @@
- - - - - - + + + + +
- - - - + + +
diff --git a/src/components/CMyRecCard/CMyRecCard.vue b/src/components/CMyRecCard/CMyRecCard.vue index b0921c34..bdb639f9 100755 --- a/src/components/CMyRecCard/CMyRecCard.vue +++ b/src/components/CMyRecCard/CMyRecCard.vue @@ -50,7 +50,7 @@ {{ myrec.descr }}
 - {{ getNameToShow(myrec) }} - + {{ tools.getNameToShow(myrec) }} - , {{ rec.comune }} ({{ rec.prov }}) diff --git a/src/components/CMyRecGrpCard/CMyRecGrpCard.vue b/src/components/CMyRecGrpCard/CMyRecGrpCard.vue index 32f5d157..756b1c0d 100755 --- a/src/components/CMyRecGrpCard/CMyRecGrpCard.vue +++ b/src/components/CMyRecGrpCard/CMyRecGrpCard.vue @@ -41,7 +41,7 @@ - {{ getNameToShow(myrec) }} - + {{ tools.getNameToShow(myrec) }} - , {{ rec.comune }} diff --git a/src/components/CPresentazione/CPresentazione.vue b/src/components/CPresentazione/CPresentazione.vue index 6585bcac..f67ca870 100755 --- a/src/components/CPresentazione/CPresentazione.vue +++ b/src/components/CPresentazione/CPresentazione.vue @@ -141,10 +141,6 @@
- - diff --git a/src/components/CRegistration/CRegistration.ts b/src/components/CRegistration/CRegistration.ts index 1fa709b5..0cbe7a33 100755 --- a/src/components/CRegistration/CRegistration.ts +++ b/src/components/CRegistration/CRegistration.ts @@ -23,6 +23,11 @@ export default defineComponent({ required: false, default: '', }, + signupform: { + type: Boolean, + required: false, + default: false, + }, }, setup(props, { emit }) { @@ -59,7 +64,11 @@ export default defineComponent({ } function regEventEmail() { - emit('regEventEmail', props.invited) + if (props.signupform) { + emit('regEventEmail', props.invited) + } else { + $router.push('/signup') + } } onMounted(mounted) diff --git a/src/components/CRegistration/CRegistration.vue b/src/components/CRegistration/CRegistration.vue index 8fd5ac08..c02d2957 100755 --- a/src/components/CRegistration/CRegistration.vue +++ b/src/components/CRegistration/CRegistration.vue @@ -28,7 +28,7 @@ :class="`text-white bg-primary shadow-1 rounded-borders`" > - +
{{ $t('reg.invitante') }} @@ -91,8 +91,8 @@ gruppo.
-
- +
+ {{ $t('reg.page_title') }} @@ -108,19 +108,18 @@ ` text-h7` " >Chiedi alla persona che ti ha invitato su RISO il suo - Username e poi :Username
null) + const inputUsername = ref(null) + const inputPassword = ref(null) + const inputPassword2 = ref(null) + + const checkifDisabled = computed(() => { + let ret = true + if (slide.value === '1') { + // Invitante + Email + ret = !signup.email || !v$.value.aportador_solidario || v$.value.aportador_solidario.$invalid || (inputEmail.value && inputEmail.value.hasError) + } else if (slide.value === '2') { + // Username + ret = !signup.username || (inputUsername.value && inputUsername.value.hasError) + } else if (slide.value === '3') { + // Password + ret = !signup.password || (!inputPassword.value && inputPassword.value.hasError) || (!inputPassword2.value && inputPassword2.value.hasError) + } + + return ret + }) const typePassword = ref('password') @@ -253,9 +274,6 @@ export default defineComponent({ countryname.value = name } - function inputUsername(value: string) { - signup.username = value.trim() - } async function created() { @@ -308,11 +326,16 @@ export default defineComponent({ // --> content is NOT valid, no error message // resolve(error_message) // --> content is NOT valid, we have error message - tools.registeredemail(val).then((ris) => { - let risp = !!ris || t('reg.err.duplicate_email') - if (ris) { + tools.registeredemail(val).then((emailOk) => { + let risp = !!emailOk || t('reg.err.duplicate_email') + if (emailOk) { risp = tools.isEmail(val) || t('reg.err.invalid_email') + emailOk = emailOk && tools.isEmail(val) } + if (emailOk) { + risp = !tools.isEmailNoMicroZozz(val) || t('reg.err.invalid_email_micro') + } + resolve(risp) }) @@ -330,7 +353,8 @@ export default defineComponent({ typePassword.value = typePassword.value === 'password' ? 'text' : 'password' } - function regEventEmail() { + function regEventEmail(invited: boolean) { + console.log('EVENT RECEIVED: regEventEmail', invited) // reg visubuttBOT.value = false needTelegram.value = false @@ -343,7 +367,6 @@ export default defineComponent({ changeemail, changeusername, submitOk, - inputUsername, selectcountry, intcode_change, tools, @@ -364,6 +387,12 @@ export default defineComponent({ ap_iniziale, regEventEmail, needTelegram, + slide, + checkifDisabled, + inputEmail, + inputUsername, + inputPassword, + inputPassword2, } }, }) diff --git a/src/components/CSignUp/CSignUp.vue b/src/components/CSignUp/CSignUp.vue index 9a500219..04b1621b 100755 --- a/src/components/CSignUp/CSignUp.vue +++ b/src/components/CSignUp/CSignUp.vue @@ -44,36 +44,14 @@
- -
- - - -
-
- +
+ +
@@ -94,202 +72,235 @@

- - - - - - - - - - - - - - -
- - - - - - - -
- - - - - + +
+ + + +
- - - - + + - - - + + - -
- -
- - - - - Privacy Policy +
- - - + + + + + Privacy Policy + + + + + + + + + + + + + + + +
+
+
+ +
+ - - - - + +
+
+ + + - - - - - - -
-
+
+
- -
- - -
-
- Già registrato? - -


diff --git a/src/components/CTitlePage/CTitlePage.ts b/src/components/CTitlePage/CTitlePage.ts index 646b9968..d499b27e 100755 --- a/src/components/CTitlePage/CTitlePage.ts +++ b/src/components/CTitlePage/CTitlePage.ts @@ -24,6 +24,11 @@ export default defineComponent({ type: String, required: false }, + showBarSelection: { + type: Boolean, + required: false, + default: true + }, }, setup(props, { emit }) { diff --git a/src/components/CTitlePage/CTitlePage.vue b/src/components/CTitlePage/CTitlePage.vue index 9503e716..30d25c43 100755 --- a/src/components/CTitlePage/CTitlePage.vue +++ b/src/components/CTitlePage/CTitlePage.vue @@ -16,6 +16,7 @@ v-else > {{ num_notifs_unread }} - - diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index 897a4f5e..8b3b2f02 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -521,6 +521,8 @@ const msg_it = { surname: 'Cognome', surname_opt: 'Cognome (facoltativo)', username_login: 'Username o email', + scegli_username: 'Inserisci un nome utente per il tuo Profilo:', + scegli_password: 'Inserisci una Nuova password per accedere alla piattaforma:', password: 'Password', password_reg: 'Scegli una nuova Password', repeatPassword: 'Ripeti password', @@ -599,6 +601,7 @@ const msg_it = { code_resetpwd_error: 'Il codice inserito non è corretto.', duplicate_email: 'l\'Email è già stata registrata', invalid_email: 'l\'Email non è valida', + invalid_email_micro: 'Questa tipo di email non è funzionante sui nostri server. Si consiglia di usare Gmail o altra casella.', user_already_exist: 'La registrazione con questi dati (nome, cognome e cellulare) è stata già effettuata. Per accedere al sito, cliccare sul bottone LOGIN dalla HomePage.', user_extralist_not_found: 'Utente in archivio non trovato, inserire il Nome, Cognome e numero di cellulare comunicato nella lista nel 2019. Se questa è una nuova registrazione, dovete registrarvi tramite il LINK di chi vi sta invitando.', user_aportador_not_valid: 'Il link di registrazione non sembra risultare valido.', @@ -802,6 +805,7 @@ const msg_it = { message: 'Messaggio', messages: 'Messaggi', nomessage: 'Nessun Messaggio', + send_email: 'Invia Email', }, notifs: { all: 'Tutte', @@ -1171,12 +1175,10 @@ const msg_it = { durata_deper: 'Durata Dep.', img_logo: 'NomeFile Logo', regulation: 'Regolamento', - disclaimer: 'Questo Strumento vuole essere un\'aiuto per contabilizzare gli scambi tra utenti. ' + - 'Consigliamo vivamente di scaricarsi con frequenza la lista dei movimenti degli utenti (bottone "Esporta"), per ogni possibile evento imprevisto ' + - '(Server inaccessibile, ecc..) declinando così il creatore della APP da ogni responsabilità su come' + - 'verrà utilizzata dal gruppo. ', + disclaimer: 'Lo scopo di questo strumento è quello di aiutare a contabilizzare gli scambi tra i vari gruppi territoriali. ' + + 'La responsabilità di come verrà utilizzato, sarà di ognuno di noi.', acceptregulation: 'Accetta il Regolamento', - domanda_ask: 'Chiedere l\'invito al Circuito {circuitname} accettando il suo Regolamento?', + domanda_ask: 'Confermi di voler entrare nel Circuito {circuitname} accettando il suo Regolamento?', domanda_revoke: 'Revocare la richiesta al Circuito {circuitname}?', askedto: 'Chiesto l\'invito al Circuito {circuitname}', revoketo: 'Revocato la richiesta d\'invito al Circuito {circuitname}', diff --git a/src/store/Modules/costanti.ts b/src/store/Modules/costanti.ts index b67a01ca..7484e793 100755 --- a/src/store/Modules/costanti.ts +++ b/src/store/Modules/costanti.ts @@ -188,7 +188,7 @@ export const costanti = { }, { visible: false, - title: 'Gruppi', + title: 'Gruppi', // ! IND_MYGROUPS to: '/groups', table: 'mygroups', icon: 'fas fa-users', @@ -199,7 +199,7 @@ export const costanti = { visuonstat: true, }, { - visible: false, + visible: false, // ! IND_CIRCUIT: 11, title: 'Circuiti', to: '/circuits', table: 'circuits', @@ -212,6 +212,10 @@ export const costanti = { }, ], + + IND_CIRCUIT: 11, + IND_MYGROUPS: 10, + BINARY_CHECK: 1, VISUTABLE_LISTA: 2, diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index cda7e26c..570eb934 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -5382,6 +5382,7 @@ export const tools = { return res.status !== PayloadMessageTypes.statusfound } + console.log('registeredemail', email) return Axios.post(VALIDATE_USER_URL, { idapp: process.env.APP_ID, email, key: process.env.PAO_APP_ID }) .then(onSuccess) .catch((err) => { @@ -5392,6 +5393,7 @@ export const tools = { async registeredusername(username: string) { + console.log('registeredusername', username) const VALIDATE_USER_URL = tools.getServerHost() + '' let onSuccess = (res: AxiosResponse) => { @@ -7368,6 +7370,14 @@ export const tools = { return name }, + isEmailNoMicroZozz(myemail: string) { + + return myemail.search(/hotmail/i) !== -1 + || myemail.search(/yahoo/i) !== -1 + || myemail.search(/outlook/i) !== -1 + || myemail.search(/live.it/i) !== -1 + || myemail.search(/microsoft/i) !== -1 + }, getoptionsMainCards(only: boolean) { let myarr = [] diff --git a/src/validation/aportadorexist.ts b/src/validation/aportadorexist.ts index f64b29d1..374ee962 100755 --- a/src/validation/aportadorexist.ts +++ b/src/validation/aportadorexist.ts @@ -3,10 +3,15 @@ import { default as Axios, AxiosResponse } from 'axios' import { GlobalConfig, PayloadMessageTypes } from '../common' import { tools } from '../store/Modules/tools' +import { helpers } from '@vuelidate/validators' +const { withAsync } = helpers + // const SITE_URL = GlobalConfig.uri.site const VALIDATE_USER_URL = process.env.MONGODB_HOST + '/users/' -export function aportadorexist(userName: string) { +export const aportadorexist = withAsync(_aportadorexist) + +export function _aportadorexist(userName: string) { if (userName === tools.APORTADOR_NONE) return true diff --git a/src/views/user/mycircuit/mycircuit.vue b/src/views/user/mycircuit/mycircuit.vue index 44b7cc31..133fec4c 100755 --- a/src/views/user/mycircuit/mycircuit.vue +++ b/src/views/user/mycircuit/mycircuit.vue @@ -696,23 +696,10 @@ - - Disclaimer:
-
- - Regolamento interno:
- +
Regolamento:
 @@ -732,10 +719,8 @@ " /> diff --git a/src/views/user/mycircuits/mycircuits.vue b/src/views/user/mycircuits/mycircuits.vue index dcf3c4e9..5620445b 100755 --- a/src/views/user/mycircuits/mycircuits.vue +++ b/src/views/user/mycircuits/mycircuits.vue @@ -4,12 +4,15 @@ + :showfinder="true" + :showBarSelection="true" +> diff --git a/src/views/user/myprofile/myprofile.vue b/src/views/user/myprofile/myprofile.vue index 30471973..08f73b74 100755 --- a/src/views/user/myprofile/myprofile.vue +++ b/src/views/user/myprofile/myprofile.vue @@ -266,6 +266,27 @@ target="__blank" > +
+ + + + +