Lista Friends

src/components/CMyPopupEdit/CMyPopupEdit.vue

@@ -28,6 +28,7 @@
                 v-model="myvalue"
                 autogrow
                 :disable="disable"
+                :readonly="disable"
                 @keyup.enter.stop
                 @update:model-value="changevalRec"
                 autofocus
@@ -38,12 +39,12 @@
 
               <q-btn v-if="col.tipovisu === costanti.TipoVisu.LINK && myvalue" type="a" rounded dense size="sm"
                      color="white" text-color="blue" icon="person" :to="col.link.replace(col.name, myvalue)">
-                {{ myvalue }}
+                <span :class="{disabled: disable }">{{ myvalue }}</span>
               </q-btn>
               <q-btn v-else-if="col.tipovisu === costanti.TipoVisu.BUTTON && myvalue" rounded dense size="sm"
                      color="primary" icon="person" :to="col.link.replace(col.name, myvalue)">{{ myvalue }}
               </q-btn>
-              <span v-else v-html="visuValByType(myvalue, col, row)"></span>
+              <span v-else :class="{disabled: disable }" v-html="visuValByType(myvalue, col, row)"></span>
             </div>
           </div>
           <div v-else-if="col.fieldtype === costanti.FieldType.number">
@@ -383,7 +384,8 @@
           <q-popup-edit
             v-if="(!isInModif && canEdit && noPopupeditByCol(col))"
             v-model="myvalue"
-            :disable="col.disable"
+            :disable="col.disable || disable"
+            :readonly="col.disable || disable"
             :title="col.title ? col.title : col.titlepopupedit"
             buttons
             persistent

src/components/CSignUp/CSignUp.ts

@@ -15,10 +15,10 @@ import { DefaultProfile, useUserStore } from '@store/UserStore'
 import useValidate from '@vuelidate/core'
 import useVuelidate from '@vuelidate/core'
 
-import { email, minLength, required, sameAs } from '@vuelidate/validators'
+import { minLength, required, sameAs } from '@vuelidate/validators'
 
 // import { ValidationRuleset } from 'vuelidate'
-import { complexity, registeredemail, registereduser, aportadorexist } from '../../validation'
+import { complexity, registereduser, aportadorexist } from '../../validation'
 
 // import 'vue3-tel-input/dist/vue3-tel-input.css'
 import { useRoute, useRouter } from 'vue-router'
@@ -96,11 +96,6 @@ export default defineComponent({
         surname: {
           required,
         },
-        email: {
-          email,
-          registeredemail,
-          required,
-        },
         terms: {
           required,
         },
@@ -235,6 +230,33 @@ export default defineComponent({
       console.log('signup.aportador_solidario', signup.aportador_solidario)
     }
 
+    function myRuleEmail(val: string) {
+
+      return new Promise((resolve, reject) => {
+        // call
+        //  resolve(true)
+        //     --> content is valid
+        //  resolve(false)
+        //     --> 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) {
+            risp = tools.isEmail(val) || t('reg.err.invalid_email')
+          }
+          resolve(risp)
+
+        })
+
+        // calling reject(...) will also mark the input
+        // as having an error, but there will not be any
+        // error message displayed below the input
+        // (only in browser console)
+      })
+
+    }
+
     created()
 
     return {
@@ -250,6 +272,7 @@ export default defineComponent({
       iamadult,
       v$,
       allowSubmit,
+      myRuleEmail,
     }
   },
 })

src/components/CSignUp/CSignUp.vue

@@ -28,15 +28,31 @@
 
       </q-input>
 
-      <q-input
+      <!--<q-input
         v-model="signup.email"
         rounded outlined
         @blur="v$.email.$touch"
         @update:model-value="changeemail()"
-        :error="v$.email.$error"
+        :error="v$.email.$invalid"
         :error-message="tools.errorMsg( 'email', v$.email)"
         maxlength="50"
+        debounce="2000"
+        :label="$t('reg.email')">
+
+        <template v-slot:prepend>
+          <q-icon name="email"/>
+        </template>
+
+      </q-input> -->
+
+      <q-input
+        v-model="signup.email"
+        rounded outlined
+        @update:model-value="changeemail()"
+        maxlength="50"
         debounce="3000"
+        :rules="[ myRuleEmail ]"
+        lazy-rules
         :label="$t('reg.email')">
 
         <template v-slot:prepend>

src/db/static_data.ts

@@ -387,6 +387,17 @@ const baseroutes: IListRoutes[] = [
     inmenu: true,
     infooter: true,
   },
+  {
+    active: true,
+    order: 130,
+    path: '/friends',
+    materialIcon: 'fas fa-users',
+    name: 'mypages.friends',
+    component: () => import('@/views/user/myfriends/myfriends.vue'),
+    meta: { requiresAuth: true },
+    inmenu: true,
+    infooter: true,
+  },
   {
     active: true,
     order: 130,
@@ -398,50 +409,6 @@ const baseroutes: IListRoutes[] = [
     inmenu: false,
     infooter: false,
   },
-  {
-    active: true,
-    order: 120,
-    path: '/test',
-    materialIcon: 'fas fa-user',
-    name: 'pages.test',
-    component: () => import('@/views/user/test/test.vue'),
-    meta: { requiresAuth: true },
-    inmenu: true,
-    infooter: true,
-  },
-  /*{
-    active: true,
-    order: 6,
-    path: '/b',
-    faIcon: 'fa fa-list-alt',
-    materialIcon: 'format_list_numbered',
-    name: 'pages.Todo',
-    routes2: routes_todo,
-    level_parent: 0,
-    level_child: 0.5,
-    inmenu: true,
-    solotitle: true,
-    infooter: true,
-  },
-
-   */
-
-  /*
-  <{
-    active: true,
-    order: 7,
-    path: '/c',
-    faIcon: 'fa fa-list-alt',
-    materialIcon: 'next_week',
-    name: 'pages.projects',
-    // routes2: routes_projects,
-    level_parent: 0,
-    level_child: 0.5,
-    inmenu: true,
-    solotitle: true,
-    infooter: true,
-  },
-  */
   {
     active: true,
     order: 2000,

src/modules/validators.ts

@@ -9,8 +9,10 @@ export default function useValidators() {
   }
 
   const isEmail = (fieldName: string, fieldValue: string) => {
-    let re = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
-    return !re.test(fieldValue) ? 'The input is not a valid ' + fieldName + ' address' : '';
+    const res = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+    return !res.test(String(fieldValue).toLowerCase()) ? 'The input is not a valid ' + fieldName + ' address' : '';
+    // let re = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+    // return !re.test(fieldValue) ? 'The input is not a valid ' + fieldName + ' address' : '';
   }
   return { isEmpty, minLength, isEmail }
 }

src/rootgen/admin/newsletter/newsletter.ts

@@ -80,8 +80,8 @@ export default defineComponent({
       }
     }
 
-    watch(() => idparam, (newval, oldval) => {
-      tab.value = idparam.value
+    watch(() => idparam.value, (newval, oldval) => {
+      tab.value = newval
     })
 
     async function createNewsletter(minuti: number, loading: boolean) {

src/statics/lang/it.js

@@ -474,6 +474,7 @@ const msg_it = {
         terms: 'Devi accettare le condizioni, per continuare.',
         email_not_exist: 'l\'Email non è presente in archivio, verificare se è corretta',
         duplicate_email: 'l\'Email è già stata registrata',
+        invalid_email: 'l\'Email non è valida',
         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_not_this_aportador: 'Stai utilizzando un link di una persona diversa dal tuo invitato originale.',
@@ -771,6 +772,7 @@ const msg_it = {
       telegram_key_test: 'Chiave Bot Test',
       telegram_bot_name_test: 'BotName Test',
       pathreg_add: 'Suffisso',
+      ask_to_verify_reg: 'Chiedi Verif. Reg',
     },
     skill: {
       name: 'Competenza',
@@ -809,6 +811,11 @@ const msg_it = {
       visibility: 'Visibilità',
       date_updated: 'Ult. Aggiornamento',
     },
+    mypages: {
+      friends: 'Amici',
+      request_trust: 'Richieste di Fiducia',
+      trusted: 'Accettati',
+    }
   },
 
 };

src/store/Modules/costanti.ts

@@ -8,6 +8,10 @@ export const costanti = {
   CONFIG_ID_STATE_CONN: '2',
   CONFIG_ID_SHOW_TYPE_TODOS: '3',
 
+  FRIENDS: 1,
+  ASK_TRUST: 2,
+  TRUSTED: 3,
+
   FILTER_TUTTI: -100,
 
   FuncDialog: {

src/store/Modules/fieldsTable.ts

@@ -472,6 +472,7 @@ export const colTableSites = [
   AddCol({ name: 'telegram_key_test', label_trans: 'sites.telegram_key_test', fieldtype: costanti.FieldType.string }),
   AddCol({ name: 'telegram_bot_name_test', label_trans: 'sites.telegram_bot_name_test', fieldtype: costanti.FieldType.string }),
   AddCol({ name: 'pathreg_add', label_trans: 'sites.pathreg_add', fieldtype: costanti.FieldType.string }),
+  AddCol({ name: 'ask_to_verify_reg', label_trans: 'sites.ask_to_verify_reg', fieldtype: costanti.FieldType.boolean }),
   AddCol({ name: 'who', label_trans: 'sites.who', fieldtype: costanti.FieldType.string }),
   AddCol({ name: 'status', label_trans: 'sites.status', fieldtype: costanti.FieldType.string }),
   AddCol({ name: 'note', label_trans: 'sites.note', fieldtype: costanti.FieldType.string }),

src/store/Modules/tools.ts

@@ -35,6 +35,8 @@ import { useTodoStore } from '@store/Todos'
 import { useUserStore } from '@store/UserStore'
 import { useCalendarStore } from '@store/CalendarStore'
 import { Router } from 'vue-router'
+import { AxiosResponse, default as Axios } from 'axios'
+import { PayloadMessageTypes } from '@/common'
 
 export interface INotify {
   color?: string | 'primary'
@@ -4305,9 +4307,6 @@ export const tools = {
       if (cosa === 'email') {
         // console.log("EMAIL " + item.isUnique);
         // console.log(item);
-        if (item.registeredemail.$invalid) {
-          return t('reg.err.duplicate_email')
-        }
       } else if (cosa === 'username') {
         if (item.registereduser.$invalid) {
           return t('reg.err.duplicate_username')
@@ -4370,6 +4369,28 @@ export const tools = {
     return thePath.substring(thePath.lastIndexOf('/') + 1)
   },
 
+  async registeredemail(email: string) {
+
+    const VALIDATE_USER_URL = process.env.MONGODB_HOST + '/email/ck'
+
+    let onSuccess = (res: AxiosResponse) => {
+      return res.status !== PayloadMessageTypes.statusfound
+    }
+
+    return Axios.post(VALIDATE_USER_URL, {idapp: process.env.APP_ID, email, key: process.env.PAO_APP_ID})
+      .then(onSuccess)
+      .catch((err) => {
+        return true
+      })
+
+  },
+
+  isEmail(email: string) {
+    const res = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+    return res.test(String(email).toLowerCase())
+  },
+
+
 // getLocale() {
   //   if (navigator.languages && navigator.languages.length > 0) {
   //     return navigator.languages[0]

src/store/UserStore.ts

@@ -828,6 +828,16 @@ export const useUserStore = defineStore('UserStore', {
           return {}
         })
 
+    },
+
+    async loadFriends(username: string) {
+      return Api.SendReq('/users/friends', 'POST', null)
+        .then((res) => {
+          return res.data
+        }).catch((error) => {
+          return {}
+        })
+
     }
   },
 })

src/validation/email.ts

@@ -0,0 +1,12 @@
+
+const isEmail = (email: string) => {
+  const res = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+  return res.test(String(email).toLowerCase())
+  // let re = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+  // return !re.test(fieldValue) ? 'The input is not a valid ' + fieldName + ' address' : '';
+}
+export function email(email: string) {
+
+  return isEmail(email)
+
+}

src/validation/index.ts

@@ -4,3 +4,4 @@ export { aportadorexist } from './aportadorexist'
 export { registeredemail } from './registeredemail'
 export { complexity } from './complexity'
 export { alfanum } from './alfanum'
+export { email } from './email'

src/validation/registeredemail.ts

@@ -5,7 +5,7 @@ import { helpers } from '@vuelidate/validators'
 const { withAsync } = helpers
 
 // const SITE_URL = GlobalConfig.uri.site
-const VALIDATE_USER_URL = process.env.MONGODB_HOST + '/email/'
+const VALIDATE_USER_URL = process.env.MONGODB_HOST + '/email/ck'
 
 export const registeredemail = withAsync(_registeredemail)
 
@@ -15,7 +15,7 @@ export function _registeredemail(email: string) {
     return res.status !== PayloadMessageTypes.statusfound
   }
 
-  return Axios.get(VALIDATE_USER_URL + process.env.APP_ID + '/' + email)
+  return Axios.post(VALIDATE_USER_URL, {idapp: process.env.APP_ID, email, key: process.env.PAO_APP_ID})
     .then(onSuccess)
     .catch((err) => {
       return true

src/views/user/myfriends/myfriends.ts

@@ -0,0 +1,101 @@
+import { CMyFieldDb } from '@/components/CMyFieldDb'
+import { CTitleBanner } from '@/components/CTitleBanner'
+import { CProfile } from '@/components/CProfile'
+import { CSkill } from '@/components/CSkill'
+import { CDateTime } from '@/components/CDateTime'
+import { tools } from '@store/Modules/tools'
+import { computed, defineComponent, onMounted, ref, watch } from 'vue'
+import { useUserStore } from '@store/UserStore'
+import { useRoute, useRouter } from 'vue-router'
+import { useGlobalStore } from '@store/globalStore'
+import { useI18n } from '@/boot/i18n'
+import { toolsext } from '@store/Modules/toolsext'
+import { useQuasar } from 'quasar'
+import { costanti } from '@costanti'
+import { IUserFields, IUserProfile } from 'model'
+
+
+export default defineComponent({
+  name: 'myuser',
+  components: { CProfile, CTitleBanner, CMyFieldDb, CSkill, CDateTime },
+  props: {},
+  setup() {
+    const userStore = useUserStore()
+    const $route = useRoute()
+    const { t } = useI18n()
+
+    const username = ref('')
+    const filter = ref(costanti.FRIENDS)
+    const listFriends = ref([])
+    const listTrusted = ref([])
+
+    const filtroutente = ref(<any[]>[])
+
+    const listfriendsfiltered = computed(() => {
+      let arr: any[] = []
+      if (filter.value === costanti.FRIENDS) {
+        arr = listFriends.value
+      }else if (filter.value === costanti.ASK_TRUST) {
+        arr = listTrusted.value.filter((user: IUserFields) => !user.verified_by_aportador)
+      }else if (filter.value === costanti.TRUSTED) {
+        arr = listTrusted.value.filter((user: IUserFields) => !user.verified_by_aportador)
+      }
+
+      return arr
+    })
+
+    const numFriends = computed(() => {
+      const arr = listFriends.value
+      return (arr) ? arr.length : 0
+    })
+
+    const numAskTrust = computed(() => {
+      const arr = listTrusted.value.filter((user: IUserFields) => !user.verified_by_aportador)
+      return (arr) ? arr.length : 0
+    })
+
+    const numAskTrusted = computed(() => {
+      const arr = listTrusted.value.filter((user: IUserFields) => user.verified_by_aportador)
+      return (arr) ? arr.length : 0
+    })
+
+    function loadFriends() {
+      // Carica il profilo di quest'utente
+      if (username.value) {
+        userStore.loadFriends(username.value).then((ris) => {
+          console.log('ris', ris)
+          if (ris) {
+            listFriends.value = ris.listFriends
+            listTrusted.value = ris.listTrusted
+            filtroutente.value = [{ userId: userStore.my._id }]
+          }
+        })
+
+      }
+    }
+
+    function mounted() {
+      username.value = userStore.my.username
+      loadFriends()
+    }
+
+    function getImgUser(profile: IUserFields) {
+      return userStore.getImgByProfile(profile)
+    }
+
+    onMounted(mounted)
+
+    return {
+      listfriends: listFriends,
+      tools,
+      costanti,
+      getImgUser,
+      filtroutente,
+      filter,
+      listfriendsfiltered,
+      numFriends,
+      numAskTrust,
+      numAskTrusted,
+    }
+  }
+})

src/views/user/myfriends/myfriends.vue

@@ -0,0 +1,49 @@
+<template>
+  <div class="q-gutter-sm q-pa-sm q-pb-md">
+    <div>
+      <q-btn-toggle
+        v-model="filter"
+        class="my-custom-toggle"
+        no-caps
+        rounded
+        unelevated
+        toggle-color="primary"
+        color="white"
+        text-color="primary"
+        :options="[
+          {label: $t('mypages.friends') + ' (' + numFriends + ')', value: costanti.FRIENDS},
+          {label: $t('mypages.request_trust') + ' (' + numAskTrust + ')', value: costanti.ASK_TRUST},
+          {label: $t('mypages.trusted') + ' (' + numAskTrusted + ')', value: costanti.TRUSTED}
+        ]"
+      />
+    </div>
+
+    <q-list bordered>
+      <q-item v-for="(contact, index) in listfriendsfiltered" :key="index" class="q-my-sm" clickable v-ripple>
+        <q-item-section avatar>
+          <q-avatar>
+            <img :src="getImgUser(contact)" :alt="contact.username">
+          </q-avatar>
+        </q-item-section>
+
+        <q-item-section>
+          <q-item-label>{{ contact.name }} {{ contact.surname }}</q-item-label>
+          <q-item-label caption lines="1">{{ contact.email }}</q-item-label>
+        </q-item-section>
+
+        <q-item-section side>
+          <q-icon name="chat_bubble" color="green" />
+        </q-item-section>
+      </q-item>
+    </q-list>
+
+  </div>
+</template>
+
+<script lang="ts" src="./myfriends.ts">
+</script>
+
+<style lang="scss" scoped>
+@import './myfriends.scss';
+</style>
+