- Invia e Ricevi RIS (grafica aggiornata)

- Visualizzazione Movimenti (ultimi e successivi), per singolo e di tutti

.env.development

@@ -1,18 +1,17 @@
 APP_VERSION="1.1.3"
 SERVICE_WORKER_FILE="service-worker.js"
-APP_ID="17"
+APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"
 DIRECTORY_SERVER="freeplanet_serverside"
 SERVERDIR_WEBSITE=""
 SERVERPW_WEBSITE=""
 APP_URL="https://localhost"
 URL_FACEBOOK="https://www.facebook.com/freeplanetapp"
-PROVA_PAOLO="PROVA ENV FUNZIONA!"
 LANG_DEFAULT="it"
 PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF"
 MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T"
 MONGODB_HOST="https://localhost:3000"
-LOGO_REG='piuchebuono-logo-full.png'
+LOGO_REG='riso-logo-full.png'
 TEST_NAME="Paolo"
 TEST_SURNAME="Arena"
 TEST_EMAIL=""
@@ -25,6 +24,5 @@ DEBUG="1"
 TELEGRAM_SUPPORT=""
 PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a"
 TEST_CELL=""
-ISTEST=1
-INLOCALE=1
-BAK_MONGODB_HOST="http://192.168.0.200:3000"
+ISTEST="1"
+INLOCALE="1"

now.txt

@@ -1 +1 @@
-TERMINA DI LAVORARE SU riso.app: (Sovrascrivo !)
+TERMINA DI LAVORARE SU piuchebuono.app: (Sovrascrivo !)

package.json

@@ -1,8 +1,8 @@
 {
-  "name": "piuchebuono",
+  "name": "riso",
   "version": "1.1.3",
-  "description": "PiuCheBuono",
-  "productName": "PiuCheBuono",
+  "description": "Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.",
+  "productName": "Riso",
   "author": "Paolo Arena",
   "private": true,
   "keywords": [],
@@ -65,6 +65,7 @@
     "npm": "^10.8.3",
     "nprogress": "^0.2.0",
     "pinia": "^2.2.4",
+    "qrcode-vue3": "^1.7.1",
     "quasar": "^2.17.0",
     "quasar-extras": "^2.0.9",
     "register-service-worker": "^1.7.2",
@@ -86,6 +87,7 @@
     "vue-timeago3": "^2.3.2",
     "vue2-dragula": "^2.5.5",
     "vue3-pdf-app": "^1.0.3",
+    "vue3-qr-reader": "^1.0.0",
     "vuex": "^4.1.0",
     "vuex-router-sync": "^6.0.0-rc.1"
   },

quasar.conf.js

@@ -152,7 +152,7 @@ module.exports = configure((ctx) => ({
   },
   devServer: {
     https: false,
-    port: 8088,
+    port: 8084,
     open: false, // opens browser window automatically
     hot: true, // Disable hot module replacement
     headers: {
@@ -313,9 +313,9 @@ module.exports = configure((ctx) => ({
     },
 
     manifest: {
-      name: 'Più che Buono',
-      short_name: 'PiuCheBuono',
-      description: 'PiuCheBuono è un GAS e Bottega',
+      name: 'Riso',
+      short_name: 'Riso',
+      description: 'Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.',
       display: 'standalone',
       orientation: 'portrait',
       background_color: '#fff',
@@ -325,54 +325,54 @@ module.exports = configure((ctx) => ({
       start_url: "/?homescreen=1",
       icons: [
         {
-          src: 'images/pcb-android-icon-512x512.png',
+          src: 'images/riso-android-icon-512x512.png',
           sizes: '512x512',
           type: 'image/png',
         },
         {
-          src: 'images/pcb-android-icon-384x384.png',
+          src: 'images/riso-android-icon-384x384.png',
           sizes: '384x384',
           type: 'image/png',
         },
         {
-          src: 'images/pcb-android-icon-192x192.png',
+          src: 'images/riso-android-icon-192x192.png',
           sizes: '192x192',
           type: 'image/png',
         },
         {
-          src: 'images/pcb-android-icon-144x144.png',
+          src: 'images/riso-android-icon-144x144.png',
           sizes: '144x144',
           type: 'image/png',
         },
         {
-          src: 'images/pcb-android-icon-96x96.png',
+          src: 'images/riso-android-icon-96x96.png',
           sizes: '96x96',
           type: 'image/png',
         },
         {
-          src: 'images/pcb-apple-icon-120x120.png',
+          src: 'images/riso-apple-icon-120x120.png',
           sizes: '120x120',
           type: 'image/png',
         },
         {
-          src: 'images/pcb-apple-icon-144x144.png',
+          src: 'images/riso-apple-icon-144x144.png',
           sizes: '144x144',
           type: 'image/png',
         },
         {
-          src: 'images/pcb-apple-icon-152x152.png',
+          src: 'images/riso-apple-icon-152x152.png',
           sizes: '152x152',
           type: 'image/png',
         },
         {
-          src: 'images/pcb-apple-icon-180x180.png',
+          src: 'images/riso-apple-icon-180x180.png',
           sizes: '180x180',
           type: 'image/png',
         },
       ],
       related_applications: [{
         "platform": "webapp",
-        "url": "https://www.piuchebuono.app/manifest.json"
+        "url": "https://www.riso.app/manifest.json"
       }]
     },
   },
@@ -407,7 +407,7 @@ module.exports = configure((ctx) => ({
     builder: {
       // https://www.electron.build/configuration/configuration
 
-      appId: 'PiuCheBuono',
+      appId: 'Riso',
     },
 
     // "chain" is a webpack-chain object https://github.com/neutrinojs/webpack-chain

src/components/CCheckCircuitsEnabled/CCheckCircuitsEnabled.vue

@@ -27,6 +27,7 @@
         {{ $t('circuit.destin_non_ha_circuito_naz') }}
         <br />
       </q-banner>
+        <br />
 
       <div class="text-center" v-if="to_user">
         <q-btn

src/components/CContactUser/CContactUser.ts

@@ -24,7 +24,12 @@ export default defineComponent({
       type: String,
       required: false,
       default: '',
-    }
+    },
+    causalDest: {
+      type: String,
+      required: false,
+      default: '',
+    },
   },
   components: { CLabel, CSendCoins },
   setup(props) {

src/components/CContactUser/CContactUser.vue

@@ -1,26 +1,9 @@
 <template>
-  <div class="row justify-evenly items-center q-pa-sm q-ma-sm">
+  <div v-if="(getLinkUserTelegram() && tools.isUserOk()) || showBtnActivities"
+  class="row justify-evenly items-center q-pa-sm q-ma-sm">
     <q-inner-loading id="spinner" :showing="loading">
       <q-spinner-tail color="primary" size="4em"> </q-spinner-tail>
     </q-inner-loading>
-    <div>
-      <q-btn
-        v-if="
-          tools.isUserOk() &&
-          userStore.showButtonSendCoin(myuser) &&
-          (myuser.username !== userStore.my.username ||
-            userStore.hoContiCollettiviDaAmministrare() ||
-            userStore.hoContiComunitariDaAmministrare())
-        "
-        icon-right="img: images/1ris_rosso_100.png"
-        color="green"
-        size="md"
-        rounded
-        :label="$t('circuit.sendcoins')"
-        @click="clickOpenSendCoin"
-      >
-      </q-btn>
-    </div>
     <div v-if="showBtnActivities">
       <q-btn
         v-if="site.confpages && site.confpages.showCompetenze"
@@ -76,6 +59,7 @@
       :showprop="showsendCoinTo"
       :to_user="myuser"
       :sendRIS="sendRIS"
+      :causalDest="causalDest"
       @close="showsendCoinTo = false; loading = false"
       @showed="loading = false"
     >

src/components/CCopyBtn/CCopyBtn.scss

@@ -40,3 +40,8 @@ $grayshadow: #555;
   height: 100px;
   padding: 0.5rem 0.5rem;
 }
+
+.wrapword {
+  max-width: 100%; /* Assicurati che il wrapping non superi il contenitore */
+  overflow: hidden; /* Nasconde eventuali overflow */
+}

src/components/CCopyBtn/CCopyBtn.ts

@@ -17,6 +17,11 @@ export default defineComponent({
       required: false,
       default: '',
     },
+    small: {
+      type: Boolean,
+      required: false,
+      default: false,
+    }
   },
   components: {},
   setup(props) {
@@ -26,9 +31,18 @@ export default defineComponent({
       tools.copyStringToClipboard($q, props.texttocopy, true)
     }
 
+    function getclass() {
+      if (props.small) {
+        return 'text-h7'
+      } else {
+        return 'text-h5'
+      }
+    }
+
     return {
       copytoclip,
       tools,
+      getclass, 
     }
   },
 })

src/components/CCopyBtn/CCopyBtn.vue

@@ -1,21 +1,52 @@
 <template>
   <div class="q-ma-sm">
-    <div :class="($q.dark.isActive ? `bg-black` : `bg-white`) + ` column cursor-pointer`" @click="copytoclip">
-      <q-field outlined :label="title" stack-label class="text-center cursor-pointer" label-color="blue">
-        <template v-slot:prepend v-if="!tools.isMobile()">
-          <q-btn round dense flat icon="far fa-copy"/>
+    <div
+      :class="[
+        $q.dark.isActive ? `bg-black text-white` : `bg-white text-black`,
+        'column cursor-pointer',
+      ]"
+      @click="copytoclip"
+      style="max-width: 100%; width: auto; overflow: hidden"
+    >
+      <q-field
+        outlined
+        :label="title"
+        stack-label
+        class="text-center"
+        style="max-width: 100%"
+        label-color="blue"
+      >
+        <template v-slot:prepend>
+          <q-btn v-if="!$q.platform.is.mobile" round dense flat icon="far fa-copy" />
         </template>
 
         <template v-slot:control>
-          <div class="self-center full-width no-outline text-center wrapword text-h5" tabindex="0">{{tools.firstchars(texttocopy, 300)}}</div>
+          <div
+            class="self-center q-my-xs no-outline text-center wrapword"
+            :class="getclass()"
+            style="
+              overflow-wrap: break-word;
+              word-wrap: break-word;
+              white-space: normal;
+              max-width: 100%; /* Assicurati di limitare la larghezza */
+            "
+          >
+            {{ tools.firstchars(texttocopy, 300) }}
+          </div>
         </template>
       </q-field>
+      <div class="row justify-center">
+        <q-btn 
+        rounded 
+        label="Copia il link" color="primary" @click="copytoclip" 
+        >
+        </q-btn>
+      </div>
     </div>
   </div>
 </template>
 
-<script lang="ts" src="./CCopyBtn.ts">
-</script>
+<script lang="ts" src="./CCopyBtn.ts"></script>
 
 <style lang="scss" scoped>
 @import './CCopyBtn.scss';

src/components/CCopyBtnSmall/CCopyBtnSmall.scss

@@ -0,0 +1,9 @@
+.my-custom-container {
+  max-width: 100%;  /* Imposta la larghezza massima per il contenitore */
+}
+
+.wrapword {
+  overflow: hidden; /* Nasconde il contenuto in eccesso */
+  white-space: nowrap; /* Impedisce il wrapping del testo */
+  text-overflow: ellipsis; /* Mostra "..." se il testo è troppo lungo */
+}

src/components/CCopyBtnSmall/CCopyBtnSmall.ts

@@ -0,0 +1,56 @@
+import { tools } from '../../store/Modules/tools'
+import { useQuasar } from 'quasar'
+import { useI18n } from '@src/boot/i18n'
+import { useUserStore } from '@store/UserStore'
+import { useGlobalStore } from '@store/globalStore'
+import { defineComponent } from 'vue'
+import { shared_consts } from '@/common/shared_vuejs'
+
+export default defineComponent({
+  name: 'CCopyBtnSmall',
+  props: {
+    texttocopy: {
+      type: String,
+      required: true,
+    },
+    title: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    small: {
+      type: Boolean,
+      required: false,
+      default: false,
+    }
+  },
+  components: {},
+  setup(props) {
+    const $q = useQuasar()
+    const { t } = useI18n()
+
+    async function copytoclipandsend() {
+      tools.copyStringToClipboard($q, props.texttocopy, true)
+
+      let msg = 'Questo è il link che puoi condividere per farti inviare i RIS:<br><br>👉🏻 ' + props.texttocopy
+
+      tools.sendMsgTelegramCmd($q, t, shared_consts.MsgTeleg.SHARE_TEXT, false, msg)
+
+    }
+
+    function getclass() {
+      if (props.small) {
+        return 'text-h7'
+      } else {
+        return 'text-h5'
+      }
+    }
+
+    return {
+      copytoclipandsend,
+      tools,
+      getclass,
+      t,
+    }
+  },
+})

src/components/CCopyBtnSmall/CCopyBtnSmall.vue

@@ -0,0 +1,16 @@
+<template>
+  <div class="" style="width: 100%; overflow: hidden;">
+    <div class="row justify-center">
+      {{ tools.firstchars(texttocopy, 80) }}
+    </div>
+    <div class="row justify-center q-mt-sm">
+      <q-btn rounded label="Condividi link" color="primary" @click="copytoclipandsend" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" src="./CCopyBtnSmall.ts"></script>
+
+<style lang="scss" scoped>
+@import './CCopyBtnSmall.scss';
+</style>

src/components/CCopyBtnSmall/index.ts

@@ -0,0 +1 @@
+export {default as CCopyBtnSmall} from './CCopyBtnSmall.vue'

src/components/CFindUsers/CFindUsers.scss

@@ -0,0 +1,6 @@
+.my-custom-border {
+    border: 1px solid #ccc; /* Imposta il colore del bordo (puoi personalizzare) */
+
+    background-color: #fff; /* Colore sfondo per il contenitore (puoi personalizzare) */
+    border-radius: 10px;
+  }

src/components/CFindUsers/CFindUsers.ts

@@ -0,0 +1,222 @@
+import { computed, defineComponent, onMounted, PropType, ref, watch, reactive, toRefs } from 'vue'
+
+import { ICalcStat, IOperators, ISearchList } from '../../model'
+import { useUserStore } from '../../store/UserStore'
+import { useRouter } from 'vue-router'
+import { useGlobalStore } from '../../store/globalStore'
+import { useCircuitStore } from '../../store/CircuitStore'
+import { useI18n } from '../../boot/i18n'
+
+import { shared_consts } from '@src/common/shared_vuejs'
+import { costanti, IMainCard } from '@store/Modules/costanti'
+
+import { CMyUser } from '../CMyUser'
+import { CTitleBanner } from '../CTitleBanner'
+import { CMyGroup } from '../CMyGroup'
+import { CQRCode } from '../CQRCode'
+import { CCopyBtnSmall } from '../CCopyBtnSmall'
+import { CContactUser } from '../CContactUser'
+import { CGridTableRec } from '../CGridTableRec'
+import { CUserInfoAccount } from '../CUserInfoAccount'
+import { tools } from '@store/Modules/tools'
+import { useQuasar } from 'quasar'
+
+import { colmyUserPeople } from '@store/Modules/fieldsTable'
+
+export default defineComponent({
+  name: 'CFindUsers',
+  props: {
+    actionType: {
+      type: Number,
+      required: false,
+      default: costanti.ACTIONTYPE.SEND_RIS,
+    },
+    sendRIS: {
+      type: String,
+      required: false,
+      default: '',
+    },
+  },
+  components: {
+    CMyUser, CMyGroup, CUserInfoAccount, CCopyBtnSmall,
+    CTitleBanner, CContactUser, CGridTableRec, CQRCode
+  },
+  setup(props) {
+
+    const userStore = useUserStore()
+    const globalStore = useGlobalStore()
+    const circuitStore = useCircuitStore()
+    const { t } = useI18n()
+    const $q = useQuasar()
+    const $router = useRouter()
+
+    const receiveRislist = computed(() => globalStore.datastat ? globalStore.datastat.receiveRislist : [])
+    const receiveRislistgroup = computed(() => globalStore.datastat ? globalStore.datastat.receiveRislistgroup : [])
+
+    const arrfilterand: any = ref([])
+    const filtercustom: any = ref([])
+    const searchList = ref(<ISearchList[]>[])
+
+    const filter = ref(costanti.FIND_PEOPLE)
+
+    const loading = ref(false)
+    const tipoConto = ref(0)
+
+    const contact = computed(() => userStore.my)
+
+    const searchType = ref('username')
+
+    const usersList = ref(<any>{ show: false, title: '', list: [], listgroup: [] })
+
+    const options = ref([
+      {
+        label: 'Cerca per Nome o Username',
+        value: 'username'
+      },
+      {
+        label: 'Lista dei Riceventi di oggi',
+        value: 'receivers'
+      },
+      {
+        label: 'Scansiona il QRCode del Destinatario',
+        value: 'qrcode'
+      },
+    ])
+
+    const arrTypesAccounts = ref(<any>[
+      {
+        label: t('circuit.user'),
+        value: shared_consts.AccountType.USER,
+      },
+      {
+        label: t('circuit.conticollettivi'),
+        value: shared_consts.AccountType.COLLECTIVE_ACCOUNT,
+      }
+    ])
+
+
+    function getFilterProvinceByRegion(recProvince: any, index: number, arr: any) {
+      const recreg: any = searchList.value.find((rec) => rec.table === 'regions')
+      if (recreg) {
+        return recProvince.reg === recreg.value
+      } else {
+        return true
+      }
+    }
+
+    function mounted() {
+
+      searchList.value = [
+        {
+          label: 'Regione',
+          table: 'regions',
+          key: 'idReg',
+          type: costanti.FieldType.select,
+          value: tools.getCookie(tools.COOK_SEARCH + 'regions_fr', costanti.FILTER_TUTTI),
+          keycookie: '_fr',
+          addall: true,
+          arrvalue: [],
+          filter: null,
+          useinput: false,
+          icon: 'fas fa-globe-europe'
+        },
+        {
+          label: 'Provincia',
+          table: 'provinces',
+          key: 'profile.resid_province',
+          type: costanti.FieldType.select,
+          value: tools.getCookie(tools.COOK_SEARCH + 'provinces_fr', costanti.FILTER_TUTTI),
+          keycookie: '_fr',
+          addall: true,
+          arrvalue: [],
+          filter: getFilterProvinceByRegion,
+          useinput: true,
+          icon: 'flag',
+          tablesel: 'provinces',
+        },
+      ]
+
+      filtercustom.value = []
+      arrfilterand.value = []
+
+      const filt_loaded = tools.getCookie(tools.COOK_SEARCH + tools.FRIENDS_SEARCH, costanti.FIND_PEOPLE, true)
+      filter.value = filt_loaded ? filt_loaded : costanti.FIND_PEOPLE
+
+      updateUserListRIS()
+
+      sendCoinsToClick()
+    }
+
+    function extraparams() {
+
+      return {
+        lookup1: {
+          lk_tab: 'provinces',
+          lk_LF: 'profile.resid_province',
+          lk_FF: 'prov',
+          lk_as: 'mycities',
+          lk_proj: {
+            username: 1,
+            name: 1,
+            surname: 1,
+            verified_by_aportador: 1,
+            'profile.handshake': 1,
+            'profile.img': 1,
+            'profile.mygroups': 1,
+            'profile.qualifica': 1,
+            'profile.resid_province': 1,
+            'mycities.reg': 1,
+          }
+        },
+
+      }
+    }
+
+
+    onMounted(mounted)
+
+    async function updateUserListRIS() {
+      const userStore = useUserStore()
+
+      loading.value = true
+
+      await globalStore.getStatSite()
+
+      usersList.value.list = receiveRislist
+      usersList.value.listgroup = receiveRislistgroup
+
+      loading.value = false
+    }
+
+    async function sendCoinsToClick() {
+
+      usersList.value.show = true;
+      usersList.value.title = t('circuit.sendcoins');
+      usersList.value.list = receiveRislist
+      usersList.value.listgroup = receiveRislistgroup
+    }
+
+
+    return {
+      userStore,
+      tools,
+      costanti,
+      shared_consts,
+      arrTypesAccounts,
+      loading,
+      contact,
+      t,
+      extraparams,
+      colmyUserPeople,
+      searchList,
+      options,
+      searchType,
+      updateUserListRIS,
+      usersList,
+      receiveRislist,
+      receiveRislistgroup,
+      tipoConto,
+      CQRCode,
+    }
+  },
+})

src/components/CFindUsers/CFindUsers.vue

@@ -0,0 +1,116 @@
+<template>
+  <q-option-group
+    class="q-ma-xs"
+    style="text-align: left !important"
+    v-model="searchType"
+    :options="options"
+    color="primary"
+  />
+  <q-tab-panels v-model="searchType" animated class="shadow-2 rounded-borders">
+    <q-tab-panel name="username">
+      <CGridTableRec
+        prop_mytable="users"
+        prop_mytitle=""
+        subtitle=""
+        :prop_mycolumns="colmyUserPeople"
+        prop_colkey="_id"
+        col_title="username"
+        :vertical="costanti.VISUTABLE_LISTA"
+        nodataLabel=" "
+        :prop_search="true"
+        :prop_showfilter="true"
+        hint="Cerca il nome o Username"
+        :hintinbtnsearch="true"
+        :findByDebounce="true"
+        :showSearchOnTop="false"
+        :finder="true"
+        :choose_visutype="false"
+        :finder_noNull="false"
+        :finder_noNullFilters="true"
+        :options="shared_consts.OPTIONS_SEARCH_USER_ALL_WORDS"
+        :butt_modif_new="false"
+        noresultLabel="Username, Nome o Cognome non trovato"
+        :arrfilters="arrfilterand"
+        :filtercustom="filtercustom"
+        :prop_searchList="searchList"
+        :showType="costanti.SHOW_USERINFO"
+        :showCol="false"
+        :extraparams="extraparams()"
+        :actionType="actionType"
+      >
+      </CGridTableRec>
+    </q-tab-panel>
+    <q-tab-panel name="receivers">
+      <div class="row centeritems">
+        <q-btn-toggle
+          v-if="arrTypesAccounts.length > 0"
+          v-model="tipoConto"
+          class="my-custom-toggle"
+          no-caps
+          rounded
+          unelevated
+          toggle-color="primary"
+          color="white"
+          text-color="primary"
+          :options="arrTypesAccounts"
+        />
+
+        <div v-if="tipoConto === shared_consts.AccountType.USER">
+          <div v-for="(rec, i) in usersList.list" :key="i">
+            <div class="q-pa-xs q-ma-xs q-border q-rounded my-custom-border">
+              <CMyUser
+                :mycontact="rec"
+                :visu="costanti.FIND_PEOPLE"
+                @setCmd="tools.setCmd"
+                :actionType="actionType"
+              >
+              </CMyUser>
+              <CContactUser
+                :myuser="rec"
+                :showBtnActivities="false"
+                :sendRIS="tools.isUserOk() ? sendRIS : false"
+                :actionType="actionType"
+              />
+            </div>
+          </div>
+        </div>
+        <div
+          v-else-if="tipoConto === shared_consts.AccountType.COLLECTIVE_ACCOUNT"
+        >
+          <div v-for="(grp, i) in usersList.listgroup" :key="i">
+            <CMyGroup :mygrp="grp" :visu="costanti.USER_GROUPS" :noaut="true">
+            </CMyGroup>
+          </div>
+        </div>
+      </div>
+      <br />
+      <div class="row centeritems justify-evenly items-center">
+        <q-btn
+          icon="autorenew"
+          rounded
+          glossy
+          dense
+          color="primary"
+          :label="$t('dialog.update_receivers')"
+          :disable="loading"
+          @click="updateUserListRIS()"
+        >
+        </q-btn>
+
+        <q-spinner-radio v-if="loading" class="q-ma-sm" color="brown" />
+        <div class="q-ma-sm">&nbsp;</div>
+        <br>
+      </div>
+    </q-tab-panel>
+    <q-tab-panel name="qrcode">
+      <CQRCode :read="true"></CQRCode>
+    </q-tab-panel>
+  </q-tab-panels>
+</template>
+
+<script lang="ts" src="./CFindUsers.ts">
+</script>
+
+<style lang="scss" scoped>
+@import './CFindUsers.scss';
+</style>

src/components/CFindUsers/index.ts

@@ -0,0 +1 @@
+export {default as CFindUsers} from './CFindUsers.vue'

src/components/CGridTableRec/CGridTableRec.ts

@@ -90,6 +90,21 @@ export default defineComponent({
       required: false,
       default: false,
     },
+    hintinbtnsearch: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+    findByDebounce: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+    showSearchOnTop: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
     hint: {
       type: String,
       required: false,
@@ -145,6 +160,11 @@ export default defineComponent({
       required: false,
       default: '',
     },
+    actionType: {
+      type: Number,
+      required: false,
+      default: 0,
+    },
     /*    keyMain: {
           type: String,
           required: false,
@@ -1339,7 +1359,7 @@ export default defineComponent({
       serverData.value = []
       numRecLoaded.value = 0
       pagination.value.page = 0
-      search.value = search.value.trim()
+      search.value = search.value ? search.value.trim() : ''
 
       // console.log('refresh')
       // console.log('search', search)

src/components/CGridTableRec/CGridTableRec.vue

@@ -2,7 +2,7 @@
   <div v-if="tools.isDebugOn()"></div>
   <div :class="$q.screen.lt.sm ? `` : `q-pa-xs`" v-if="isfinishLoading">
     <q-toggle
-      v-if="tools.isManager() && !showMap"
+      v-if="tools.isManager() && !showMap && editOn"
       v-model="editOn"
       color="green"
       icon="fas fa-pencil-alt"
@@ -241,21 +241,17 @@
         </div>
       </q-slide-transition>
 
-      <div v-if="prop_search || canEdit">
-        <div
-          v-if="searchList && finder"
-          class="row justify-between q-mb-sm q-mx-sm"
-        >
+      <div v-if="prop_search || canEdit" class="q-gutter-sm">
+        <div v-if="searchList && finder" class="row items-start">
           <q-btn
-            class=""
-            dense
-            :label="
-              !showfilter ? $t('grid.openfilter') : $t('grid.closefilter')
-            "
+            v-if="searchList && searchList.length > 0"
+            :dense="search"
+            class="q-mx-xs"
             color="positive"
             :icon="!showfilter ? 'fas fa-filter' : 'fas fa-arrow-up'"
             @click="showfilter = !showfilter"
-            ><q-badge
+          >
+            <q-badge
               v-if="getNumFilterSelected()"
               color="red"
               floating
@@ -264,34 +260,53 @@
               {{ getNumFilterSelected() }}
             </q-badge>
           </q-btn>
-          <q-btn
-            v-if="prop_search"
-            class=""
+
+          <q-input
+            v-model="search"
+            filled
             dense
-            :label="t('grid.search')"
+            type="search"
+            debounce="500"
+            :hint="!hintinbtnsearch ? hint: ''"
+            :error-message="noresultLabel"
+            :error="(getNumRecFromQuery() === 0 && !startsearch) && myfilter !== ''"
+            :label="hintinbtnsearch ? hint : $t('grid.search')"
+            @keyup.enter="doSearch"
+            @clear="myfilter = ''; doSearch()"
+            @update:model-value="findByDebounce ? doSearch() : null"
+            :clearable="!!myfilter"
+            class="col q-mx-xs"
+            style="max-width: 400px"
+          >
+            <template v-if="!search" v-slot:prepend>
+              <q-icon name="search" />
+            </template>
+          </q-input>
+
+          <q-btn
+            v-if="prop_search && myfilter || search"
             color="primary"
             icon="fas fa-search"
-            @click="showSearchDialog = true"
-          >
-          </q-btn>
+            @click="showSearchOnTop ? showSearchDialog = true : doSearch()"
+          />
+
           <q-btn-toggle
             v-if="shared_consts.TABLES_VISU_MAP.includes(mytable)"
             v-model="showMap"
-            push
-            glossy
             dense
+            spread
+            no-caps
             toggle-color="secondary"
             :options="[
               {
-                label: t('grid.showmap'),
+                label: $t('grid.showmap'),
                 value: true,
                 icon: 'fas fa-map-marked-alt',
               },
-              { label: t('grid.showlist'), value: false, icon: 'fas fa-list' },
+              { label: $t('grid.showlist'), value: false, icon: 'fas fa-list' },
             ]"
           />
         </div>
-
         <q-space></q-space>
         <q-select
           :behavior="$q.platform.is.ios === true ? 'dialog' : 'menu'"
@@ -448,6 +463,7 @@
                 :visu="visufind"
                 :groupname="extrafield"
                 :circuitname="circuitname"
+                :actionType="actionType"
                 :labelextra="col_title ? row[col_title] : ''"
                 :labelFooter="
                   col_footer

src/components/CMovements/CMovements.ts

@@ -26,6 +26,11 @@ export default defineComponent({
       required: false,
       default: ''
     },
+    showbuttolastmov: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
   },
   emits: ['loaded'],
   setup(props, { emit }) {
@@ -35,10 +40,12 @@ export default defineComponent({
     const globalStore = useGlobalStore()
     const { t } = useI18n();
 
+    const loadingvalues = ref(false)
     const numtransaz = ref(0)
     const prectransaz = ref(0)
 
     const tab = ref('tutti')
+    const nummovTodownload = ref(5)
 
     const mylist = computed(() => {
       if (globalStore.datastat || userStore.my.profile) {
@@ -128,6 +135,13 @@ export default defineComponent({
       mounted()
     })
 
+    async function addlastmov() {
+      nummovTodownload.value += 5
+
+      loadingvalues.value = true
+      await globalStore.loadLastMovements(nummovTodownload.value)
+      loadingvalues.value = false
+    }
 
     return {
       userStore,
@@ -140,6 +154,8 @@ export default defineComponent({
       navigabyMov,
       numtransaz,
       tab,
+      loadingvalues,
+      addlastmov,
     }
   }
 })

src/components/CMovements/CMovements.vue

@@ -70,6 +70,19 @@
     >
     </c-single-movement>
   </q-list>
+  <q-inner-loading id="spinner" :showing="loadingvalues">
+    <q-spinner-tail size="3em" color="primary" />
+  </q-inner-loading>
+  <div v-if="showbuttolastmov" class="row justify-center">
+    <q-btn
+      rounded
+      dense
+      class="text-center"
+      color="primary"
+      :label="t('circuit.show_next_mov')"
+      @click="addlastmov()"
+    />
+  </div>
 </template>
 
 <script lang="ts" src="./CMovements.ts">

src/components/CMyCardPopup/CMyCardPopup.ts

@@ -94,6 +94,7 @@ export default defineComponent({
       const mystr = getlinkpage()
       tools.copyStringToClipboard($q, mystr, true)
       tools.sendMsgTelegramCmd($q, t, shared_consts.MsgTeleg.SHARE_TEXT, false, mystr)
+      
       return true
     }
 

src/components/CMyCircuits/CMyCircuits.vue

@@ -46,7 +46,7 @@
           :small="true"
           :open="false"
         >
-          <CMovements @loaded="movcaricati" :username="username">
+          <CMovements @loaded="movcaricati" :username="username" :showbuttolastmov="false">
             <div class="row justify-center"><q-btn
               rounded
               dense

src/components/CMyElem/CMyElem.vue

@@ -476,7 +476,7 @@
       </div>
       <div v-else-if="myel.type === shared_consts.ELEMTYPE.MOVEMENTS">
         <div v-if="editOn" class="elemEdit">Lista Movimenti</div>
-        <CMovements></CMovements>
+        <CMovements :showbuttolastmov="true"></CMovements>
       </div>
       <div v-else-if="myel.type === shared_consts.ELEMTYPE.CSENDRISTO">
         <div v-if="editOn" class="elemEdit">CSendRISTo</div>

src/components/CMyFriends/CMyFriends.ts

@@ -115,8 +115,8 @@ export default defineComponent({
 
       if (numAskTrust.value > 0 || props.modelValue === costanti.ASK_TRUST)
         mybutt.push({ label: t('mypages.request_trust') + ' (' + numAskTrust.value + ')', value: costanti.ASK_TRUST })
-      if (numTrusted.value > 0 || props.modelValue === costanti.TRUSTED)
-        mybutt.push({ label: t('mypages.trusted') + ' (' + numTrusted.value + ')', value: costanti.TRUSTED })
+      //if (numTrusted.value > 0 || props.modelValue === costanti.TRUSTED)
+      //  mybutt.push({ label: t('mypages.trusted') + ' (' + numTrusted.value + ')', value: costanti.TRUSTED })
       if (numRejected.value > 0 || props.modelValue === costanti.REJECTED)
         mybutt.push({ label: t('mypages.rejected') + ' (' + numRejected.value + ')', value: costanti.REJECTED })
 

src/components/CMyUser/CMyUser.ts

@@ -22,6 +22,11 @@ export default defineComponent({
       required: false,
       default: null,
     },
+    actionType: {
+      type: Number,
+      required: false,
+      default: costanti.ACTIONTYPE.NONE,
+    },
     myusername: {
       type: String,
       required: false,

src/components/CMyUser/CMyUser.vue

@@ -12,7 +12,7 @@
         </q-avatar>
       </q-item-section>
 
-      <q-item-section @click="naviga(`/my/` + contact.username)">
+      <q-item-section @click="actionType === costanti.ACTIONTYPE.SEND_RIS ? naviga(`/my/` + contact.username + '?sr=0') : naviga(`/my/` + contact.username)">
         <q-item-label v-if="labelextra && labelextra !== contact.username"
           ><strong>{{ labelextra }}</strong></q-item-label
         >
@@ -422,10 +422,13 @@
                   clickable
                   v-close-popup
                   dense
-                  @click="naviga(`/my/` + contact.username + '?sendris=0')"
+                  @click="naviga(`/my/` + contact.username + '?sr=0')"
                 >
                   <q-item-section avatar>
-                    <q-icon color="positive" name="img: images/1ris_rosso_100.png" />
+                    <q-icon
+                      color="positive"
+                      name="img: images/1ris_rosso_100.png"
+                    />
                   </q-item-section>
                   <q-item-section>{{ $t('circuit.sendcoins') }}</q-item-section>
                 </q-item>
@@ -454,7 +457,10 @@
                   "
                 >
                   <q-item-section avatar>
-                    <q-icon color="positive" name="img: images/1ris_rosso_100.png" />
+                    <q-icon
+                      color="positive"
+                      name="img: images/1ris_rosso_100.png"
+                    />
                   </q-item-section>
                   <q-item-section>
                     {{ $t('circuit.enablefido') }}
@@ -787,6 +793,13 @@
         side
         v-else-if="visu === costanti.FIND_PEOPLE || visu === costanti.HANDSHAKE"
       >
+        <div v-if="actionType === costanti.ACTIONTYPE.SEND_RIS">
+          <q-icon
+            name="img: images/1ris_rosso_100.png"
+            :size="`lg`"
+          />
+        </div>
+        <div v-else>
           <q-item-label>
             <q-btn
               v-if="contact.username !== userStore.my.username"
@@ -811,12 +824,17 @@
                     clickable
                     v-close-popup
                     dense
-                  @click="naviga(`/my/` + contact.username + '?sendris=0')"
+                    @click="naviga(`/my/` + contact.username + '?sr=0')"
                   >
                     <q-item-section avatar>
-                    <q-icon color="positive" name="img: images/1ris_rosso_100.png" />
+                      <q-icon
+                        color="positive"
+                        name="img: images/1ris_rosso_100.png"
+                      />
                     </q-item-section>
-                  <q-item-section>{{ $t('circuit.sendcoins') }}</q-item-section>
+                    <q-item-section>{{
+                      $t('circuit.sendcoins')
+                    }}</q-item-section>
                   </q-item>
                   <q-item
                     clickable
@@ -984,6 +1002,7 @@
               </q-menu>
             </q-btn>
           </q-item-label>
+        </div>
       </q-item-section>
       <q-item-section side v-else-if="visu === costanti.REJECTED">
         <q-item-label>

src/components/CQRCode/CQRCode.scss

@@ -0,0 +1,17 @@
+
+.button_download{
+    display: inline-block !important;
+    padding: 10px 20px !important;
+    font-size: 16px !important;
+    font-weight: 500;
+    color: #ffffff !important;
+    background-color: #027be3 !important;
+    /* Colore primario di Quasar */
+    border: none !important;
+    border-radius: 4px !important;
+    cursor: pointer;
+    text-align: center;
+    text-decoration: none;
+    transition: background-color 0.3s, box-shadow 0.3s;
+
+}

src/components/CQRCode/CQRCode.ts

@@ -0,0 +1,87 @@
+import {
+  computed,
+  provide, defineComponent, onBeforeMount, onBeforeUnmount, onMounted, ref, toRef, toRefs, watch, reactive
+} from 'vue'
+
+import { tools } from '@store/Modules/tools'
+import { costanti } from '@costanti'
+import { useGlobalStore } from '@store/globalStore'
+import { useUserStore } from '@store/UserStore'
+
+import { shared_consts } from '@/common/shared_vuejs'
+import { useI18n } from '@/boot/i18n'
+import { toolsext } from '@store/Modules/toolsext'
+import { useQuasar } from 'quasar'
+
+import QrcodeVue from 'qrcode-vue3'
+
+import { QrStream, QrCapture, QrDropzone } from 'vue3-qr-reader'
+import { useRouter } from 'vue-router'
+
+
+export default defineComponent({
+  name: 'CQRCode',
+  emits: [''],
+  props: {
+    link: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    textlink: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    read: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+  },
+  components: {
+    QrcodeVue, QrStream,
+    QrCapture,
+    QrDropzone
+  },
+  setup(props, { attrs, slots, emit }) {
+    const { t } = useI18n()
+    const $q = useQuasar()
+    const globalStore = useGlobalStore()
+    const userStore = useUserStore()
+    const $router = useRouter()
+
+    const state = reactive({
+      data: null
+    })
+
+    function onDecode(data: any) {
+      if (data)
+        state.data = data
+    }
+
+    const text = ref('');
+
+    function naviga(path: string) {
+      $router.push(path)
+    }
+
+    onMounted(mounted)
+
+    function mounted() {
+      // ...
+    }
+
+    return {
+      t,
+      tools,
+      costanti,
+      toolsext,
+      text,
+      userStore,
+      ...toRefs(state),
+      onDecode,
+      naviga,
+    }
+  },
+})

src/components/CQRCode/CQRCode.vue

@@ -0,0 +1,70 @@
+<template>
+  <div>
+    <div v-if="read">
+      <div class="stream">
+        <qr-stream @decode="onDecode" class="mb">
+          <div style="color: red" class="frame"></div>
+        </qr-stream>
+
+        <br />
+        <qr-capture @decode="onDecode" class="mb"></qr-capture>
+      </div>
+      <div class="row justify-center q-ma-sm">
+        <q-btn
+          v-if="data && data.startsWith('http')"
+          class="q-ma-sm"
+          dense
+          color="positive"
+          @click="tools.openUrl(data)"
+          label="APRI PAGINA"
+        >
+        </q-btn>
+        <br />
+        <div v-if="data && data.startsWith('http')" class="result">
+          Link: {{ data }}
+        </div>
+      </div>
+    </div>
+    <div v-else>
+      <div class="q-ma-sm">
+        {{textlink}}<br>
+        {{link}}
+      </div>
+      <qrcode-vue
+        :width="250"
+        :height="250"
+        :qrOptions="{ typeNumber: 0, mode: 'Byte', errorCorrectionLevel: 'H' }"
+        :imageOptions="{ hideBackgroundDots: true, imageSize: 0.4, margin: 0 }"
+        :dotsOptions="{
+          type: 'dots',
+          color: '#26249a',
+          gradient: {
+            type: 'linear',
+            rotation: 0,
+            colorStops: [
+              { offset: 0, color: '#26249a' },
+              { offset: 1, color: '#26249a' },
+            ],
+          },
+        }"
+        :image="tools.getimglogo()"
+        :cornersSquareOptions="{ type: 'dot', color: '#000000' }"
+        :cornersDotOptions="{ type: undefined, color: '#000000' }"
+          fileExt="png"
+        :download="true"
+        :value="link"
+        downloadButton="button_download"
+        :downloadOptions="{
+          name: 'qrcode-riso-' + userStore.my.username,
+          extension: 'png',
+        }"
+      />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" src="./CQRCode.ts">
+</script>
+<style lang="scss" scoped>
+@import './CQRCode.scss';
+</style>

src/components/CQRCode/index.ts

@@ -0,0 +1 @@
+export { default as CQRCode } from './CQRCode.vue'