++ diffusori

fixed user chip

.env.development

@@ -1,4 +1,4 @@
-APP_VERSION="0.5.32"
+APP_VERSION="0.5.33"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"

.env.example.production

@@ -1,4 +1,4 @@
-APP_VERSION="0.5.32"
+APP_VERSION="0.5.33"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/riso.app/.env.development

@@ -1,4 +1,4 @@
-APP_VERSION="0.5.32"
+APP_VERSION="0.5.33"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"

_ALL_SITES/riso.app/.env.production

@@ -1,4 +1,4 @@
-APP_VERSION="0.5.32"
+APP_VERSION="0.5.33"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/riso.app/.env.test

@@ -1,4 +1,4 @@
-APP_VERSION="0.5.32"
+APP_VERSION="0.5.33"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="16"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/terradellavisione.app/.env.development

@@ -1,4 +1,4 @@
-APP_VERSION="0.5.32"
+APP_VERSION="0.5.33"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="14"
 DIRECTORY_LOCAL="newfreeplanet"

src/components/CBarSelection/CBarSelection.vue

@@ -31,6 +31,7 @@
                   <q-select
                     v-model="tablesel"
                     :options="optionsMainCards"
+                    dark
                     emit-value
                     borderless
                     map-options
@@ -93,6 +94,7 @@
                     label-color="white"
                     myclass="comboselector"
                     color="primary"
+                    dark
                     :dense="true"
                     :icon_alternative="item.icon"
                     :optval="fieldsTable.getKeyByTable(item.table)"
@@ -123,6 +125,7 @@
                     @update:arrvalue="searchval(item.arrvalue, item.table)"
                     :addall="item.addall"
                     :addnone="item.addnone"
+                    dark
                     :addlast="true"
                     :tablesel="item.tablesel"
                     :pickup="true"
@@ -147,6 +150,7 @@
                     :label="labelcombo(item)"
                     @update:model-value="searchval(item.arrvalue, item.table)"
                     rounded
+                    dark
                     dense
                     outlined
                     multiple

src/components/CMyElem/CMyElem.vue

@@ -535,8 +535,7 @@
             />
           </template>
           <span class="mybanner"
-            >Per Aggiornare alla nuova versione, chiudere e riaprire la APP (o
+            >Aggiornamento APP in corso ... Se dopo 1 minuto non dovesse scomparire questo messaggio, chiudere e riaprire la pagina.</span
-            il browser)</span
           >
         </q-banner>
       </div>

src/components/CMyPopupEdit/CMyPopupEdit.vue

@@ -85,6 +85,7 @@
                 <span class="extrafield">{{ $t(col.extrafield) }}</span>
               </span>
 
+
               <div
                 v-if="
                   (col.tipovisu === costanti.TipoVisu.LINK ||
@@ -106,14 +107,14 @@
                 >
                   <q-item-section avatar>
                     <q-avatar round size="48px">
-                      <img :src="userStore.getImgByProfile(row)" />
+                      <img :src="userStore.getImgByProfile(row, true, col)" />
-                      <q-badge v-if="tools.isUserOnline(row)" align="top" floating color="green">online</q-badge>
+                      <q-badge v-if="tools.isUserOnline(row, col)" align="top" floating color="green">online</q-badge>
                     </q-avatar>
                   </q-item-section>
                   <q-item-section class="">
-                    <q-item-label>{{ tools.getNameToShow(row) }}</q-item-label>
+                    <q-item-label>{{ tools.getNameToShow(row, col) }}</q-item-label>
                     <q-item-label caption>{{
-                      tools.getUserNameOnlyIfToShow(row)
+                      tools.getUserNameOnlyIfToShow(row, col)
                     }}</q-item-label>
                   </q-item-section>
                   <q-item-section side></q-item-section>

src/components/CSaldo/CSaldo.vue

@@ -20,14 +20,14 @@
   </CCurrencyValue>
 
 
-  <div v-if="!small && account && account.notifspending && account.notifspending.length > 0" :class="`text-h5 bordo_stondato_stretto full-width`"
+  <div v-if="!small && account && account.notifspending && account.notifspending.length > 0" :class="`text-h5 full-width`"
        :style="(!$q.screen.lt.sm ? `min-width: 250px; ` : ``) + (color_border ? `border-color: ` + color_border + `!important;`: '')">
     <div class="text-center text-h7-dense text-italic text-grey-14">
       {{ t('movement.pendingtransaction') }}
     </div>
 
     <div v-for="(myrec, index) in account.notifspending" :key="myrec._id">
-      <div class="row justify-evenly items-center bordo_stondato_pending">
+      <q-card class="row justify-evenly items-center">
         <span v-for="(mycol, indcol) of colTableNotifCoins" :key="indcol">
           <div
             class="col"
@@ -46,7 +46,7 @@
             </CMyFieldRec>
           </div>
         </span>
-      </div>
+      </q-card>
     </div>
   </div>
 

src/components/CStatusReg/CStatusReg.scss

@@ -0,0 +1,3 @@
+.index_diffusore {
+    font-size: 1rem;
+}

src/components/CStatusReg/CStatusReg.ts

@@ -60,6 +60,7 @@ export default defineComponent({
       num_teleg_pending: 0,
       lastsreg: [],
       lastsonline: [],
+      diffusorilist: [],
       checkuser: { verified_email: false }
     })
 
@@ -81,6 +82,9 @@ export default defineComponent({
     const lastsonline = computed(() => {
       return datastat.value.lastsonline
     })
+    const diffusorilist = computed(() => {
+      return datastat.value.diffusorilist
+    })
 
     watch(() => $q.appVisible, (value: any, oldval: any) => {
       // console.log('visible', value)
@@ -197,6 +201,7 @@ export default defineComponent({
       emailnonverif,
       lastsreg,
       lastsonline,
+      diffusorilist,
       datastat,
       tools,
       costanti,

src/components/CStatusReg/CStatusReg.vue

@@ -54,8 +54,21 @@
 
           <div class="column animazione">
             <q-tabs v-model="mytab" class="text-blue">
-              <q-tab name="reg" :label="$t('pages.statusreg.newreg')" />
+              <q-tab
-              <q-tab name="online" :label="$t('pages.statusreg.onlineusers')" />
+                name="reg"
+                :label="$t('pages.statusreg.newreg')"
+                icon="fas fa-user-plus"
+              />
+              <q-tab
+                name="online"
+                :label="$t('pages.statusreg.onlineusers')"
+                icon="fas fa-wifi"
+              />
+              <q-tab
+                name="diffusori"
+                :label="$t('pages.statusreg.diffusori')"
+                icon="fas fa-medal"
+              />
             </q-tabs>
 
             <q-tab-panels v-model="mytab" animated>
@@ -142,6 +155,60 @@
                   </q-list>
                 </div>
               </q-tab-panel>
+              <q-tab-panel name="diffusori">
+                <div class="q-pa-md" style="max-width: 300px">
+                <div class="text-center text-bold text-h6">I Migliori Invitanti su RISO:</div>
+                <div class="text-center"> Indica il numero di persone registrate tramite il link d'invito personale.
+                </div>
+                  <q-list bordered>
+                    <transition-group
+                      name="fade"
+                      mode="out-in"
+                      appear
+                      enter-active-class="animazione fadeIn"
+                      leave-active-class="animazione fadeOut"
+                    >
+                      <q-item
+                        v-for="(user, index) in diffusorilist"
+                        :key="index"
+                        class="animated chip_shadow q-ma-sm"
+                        clickable
+                        v-ripple
+                        @click="gotoPage(`/my/${user.username}`)"
+                      >
+                        <q-item-section avatar>
+                          <q-avatar round size="48px">
+                            <img :src="userStore.getImgByProfile(user)" />
+                            <q-badge
+                              v-if="tools.isUserOnline(user)"
+                              align="top"
+                              floating
+                              color="green"
+                              >online</q-badge
+                            >
+                          </q-avatar>
+                        </q-item-section>
+                        <q-item-section class="">
+                          <q-item-label overline>
+                            <div class="index_diffusore">{{ index + 1 }}°</div>
+                          </q-item-label>
+                          <q-item-label>
+                            {{ tools.getNameToShow(user) }}</q-item-label
+                          >
+                          <q-item-label caption>{{
+                            tools.getUserNameOnlyIfToShow(user)
+                          }}</q-item-label>
+                        </q-item-section>
+                        <q-item-section side
+                          ><span class="text-h6 q-mr-sm">{{
+                            user.count
+                          }}</span></q-item-section
+                        >
+                      </q-item>
+                    </transition-group>
+                  </q-list>
+                </div>
+              </q-tab-panel>
             </q-tab-panels>
           </div>
 

src/components/CUserNonVerif/CUserNonVerif.vue

@@ -6,7 +6,7 @@
     </CVerifyTelegram>
     -->
 
-    <div v-if="site.confpages.enableRegMultiChoice">
+    <div v-if="tools.isLogged() && site.confpages.enableRegMultiChoice">
       <CVerifyEmail v-if="!tools.isEmailVerified() && !tools.TelegVerificato()">
       </CVerifyEmail>
     </div>

src/css/app.scss

@@ -818,9 +818,8 @@ h3 {
   border: solid 2px #49b502;
 }
 
-.bordo_stondato_pending {
+.bordo_stondato_pending, .bordo_quadrato_pending {
   margin: 4px;
-  border-radius: 3rem;
   padding-left: 14px;
   padding-right: 14px;
   padding-top: 0px;
@@ -828,6 +827,10 @@ h3 {
   border: solid 1px #4a6598;
 }
 
+.bordo_stondato_pending {
+  border-radius: 3rem;
+}
+
 .bordo_stondato_circuiti {
   margin: 4px;
   border-radius: 1.15rem;
@@ -1311,6 +1314,7 @@ h3 {
 .last_access {
   opacity: 0.7;
   margin-top: -10px;
+  color: white;
   z-index: 1000;
   margin-bottom: 5px;
   padding: 5px;

src/db/lang/ws_it.js

@@ -99,8 +99,9 @@ const msg_website_it = {
       autorizzare: 'In attesa di Abilitazione',
       passeggeri: 'Passeggeri Navi',
       giainlista: 'Gia in Lista',
-      newreg: 'Ultimi Registrati',
+      newreg: 'Registrati',
-      onlineusers: 'Utenti OnLine',
+      onlineusers: 'OnLine',
+      diffusori: 'Diffusori',
       nationality: 'Nazionalità',
       nationality_born: 'Nazione di Nascita',
       verified: 'Verificata',

src/model/GlobalStore.ts

@@ -33,6 +33,7 @@ export interface INotData {
   arr_nations?: string
   lastsreg?: IUserFields[]
   lastsonline?: IUserFields[]
+  diffusorilist?: IUserFields[]
   checkuser?: ICheckUser | any
   numreg_untilday?: number
   reg_daily?: string

src/store/Modules/tools.ts

@@ -3614,7 +3614,7 @@ export const tools = {
     return date.addToDate(mydate, { days })
   },
 
-  isUserOnline(user: IUserFields) {
+  isUserOnline(user: IUserFields, col: any = null) {
     const dateonline = tools.addDays(tools.getDateNow(), -1)
     return user.lasttimeonline && new Date(user.lasttimeonline).getTime() > dateonline.getTime()
   },
@@ -7344,18 +7344,18 @@ export const tools = {
     return ''
   },
 
-  getNameToShow(user: IUserFields): string {
+  getNameToShow(user: IUserFields, col: any = null): string {
     const userStore = useUserStore()
 
-    let name = userStore.getNameToShow(user)
+    let name = userStore.getNameToShow(user, col)
 
     return name
   },
 
-  getUserNameOnlyIfToShow(user: IUserFields): string {
+  getUserNameOnlyIfToShow(user: IUserFields, col: any = null): string {
     const userStore = useUserStore()
 
-    let name = userStore.getUserNameOnlyIfToShow(user)
+    let name = userStore.getUserNameOnlyIfToShow(user, col)
 
     return name
   },

src/store/UserStore.ts

@@ -304,16 +304,20 @@ export const useUserStore = defineStore('UserStore', {
       return img ? img : 'images/noimg-user.svg'
     },
 
-    getImgByProfile(userparam: IUserFields, reale: any = false): string {
+    getImgByProfile(userparam: any, reale: any = false, col: any = null): string {
       try {
-        if (userparam.profile && userparam.profile.img) {
+        let myrec = this.getRecByCol(userparam, col)
-          return costanti.DIR_UPLOAD + 'profile/' + userparam.username + '/' + userparam.profile.img
+
+        if (myrec.profile && myrec.profile.img) {
+          return costanti.DIR_UPLOAD + 'profile/' + myrec.username + '/' + myrec.profile.img
+        } else {
+          return 'images/noimg-user.svg'
         }
       } catch (e) {
         //
       }
       if (!reale)
-        return 'images/noimg.png'
+        return 'images/noimg-user.svg'
       else
         return ''
     },
@@ -426,24 +430,40 @@ export const useUserStore = defineStore('UserStore', {
       return `(${username})`
     },
 
-    getNameToShow(user: IUserFields): string {
+    getRecByCol(user: any, col: any = null) {
+      let myrec = user
+      if (col && col.field === 'userto')
+        myrec = user.userto
+      if (col && col.field === 'userfrom')
+        myrec = user.userfrom
+
+      return myrec
+    },
+
+    getNameToShow(user: any, col: any = null): string {
       let name = ''
-      if (!!user.name)
+      let myrec = this.getRecByCol(user, col)
-        name = user.name
+
-      if (!!user.surname)
+      if (!!myrec.name)
-        name += ' ' + user.surname
+        name = myrec.name
+      if (!!myrec.surname)
+        name += ' ' + myrec.surname
 
       if (!name) {
-        name = user.username
+        name = myrec.username
+      }
+      if (col && col.field === 'extrarec' && !name) {
+        name = myrec.dest
       }
 
       return name
     },
 
-    getUserNameOnlyIfToShow(user: IUserFields): string {
+    getUserNameOnlyIfToShow(user: any, col: any = null): string {
+      let myrec = this.getRecByCol(user, col)
 
-      if (user.name || user.surname) {
+      if (myrec.name || myrec.surname) {
-        return user.username
+        return myrec.username
       }
 
       return ''

src/views/requestresetpwd/requestresetpwd.ts

@@ -25,7 +25,8 @@ export default defineComponent({
     const emailsent = ref(false)
     const form = reactive({
       email: '',
-      tokenforgot: ''
+      tokenforgot: '',
+      tokenforgot_code: ''
     })
 
     // @ts-ignore