- Info sul Conto Collettivo

- HomePage

.env.development

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

.env.example.production

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

.env.test.risosrv

@@ -1,4 +1,4 @@
-APP_VERSION="0.5.66"
+APP_VERSION="0.5.67"
 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.66"
+APP_VERSION="0.5.67"
 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.66"
+APP_VERSION="0.5.67"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/terradellavisione.app/.env.development

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

src/components/CDashboard/CDashboard.scss

@@ -20,7 +20,7 @@
 }
 
 .progress-base {
-  height: 8px;
+  height: 3px;
   border-radius: 3px;
   background-color: #e9ecef;
 }

src/components/CDashboard/CDashboard.vue

@@ -1,6 +1,9 @@
 <template>
-  <div class="q-ma-md">
+  <div class="q-ma-xs">
-    <div class="row q-my-md shadow" style="border-radius: 4px;border: 1px solid rgba(0, 0, 0, 0.12);">
+    <div
+      class="row q-my-sm shadow"
+      style="border-radius: 4px; border: 1px solid rgba(0, 0, 0, 0.12)"
+    >
       <!--<div class="col-md-3 col-lg-3 col-sm-12 col-xs-12 box_4" style="border-left: 1px solid #efefef;"
            v-bind:class="{'border-top': $q.platform.is.mobile}">
         <q-card class="no-shadow q-pa-sm">
@@ -28,53 +31,112 @@
         </q-card>
       </div>-->
 
-      <div v-for="(rec, index) of visustat" :class="`col-md-3 col-lg-3 col-sm-6 col-xs-6 text-` + rec.color"
+      <div
-           style="border-left: 1px solid #efefef;" :key="index"
+        v-for="(rec, index) of visustat"
+        :class="`col-md-3 col-lg-3 col-sm-6 col-xs-6 text-` + rec.color"
+        style="border-left: 1px solid #efefef"
+        :key="index"
       >
-        <q-card class="no-shadow q-pa-sm">
+        <q-card class="no-shadow q-pa-xs">
           <q-item class="q-pb-none q-pt-xs cursor-pointer" :to="rec.to">
             <q-item-section>
-              <q-item-label class="text-h4" style="font-weight: 500;letter-spacing: 3px;">
+              <q-item-label
-                {{ calcstat.numByTab[rec.table] }}
+                :class="
-              </q-item-label>
+                  (!$q.dark.isActive ? 'text-grey-5' : 'text-white') +
-              <q-item-label :class="(!$q.dark.isActive? 'text-grey-7':'text-white') + ` title_view_shadow`" style="letter-spacing: 1px;">
+                  ` title_view_shadow`
+                "
+                style="letter-spacing: 1px"
+              >
                 {{ rec.title }}
               </q-item-label>
+              <q-item-label
+                v-if="rec.subtitle"
+                :class="
+                  (!$q.dark.isActive ? 'text-grey-5' : 'text-white') +
+                  ` title_view_subtitle_shadow`
+                "
+              >
+                <span v-html="rec.subtitle"></span>
+              </q-item-label>
+              <q-item-label class="text-h9" style="letter-spacing: 2px">
+                <!--{{ calcstat.numByTab[rec.table] }}-->
+              </q-item-label>
             </q-item-section>
 
             <q-item-section side>
-              <q-icon :name="rec.icon" :class="`text-` + rec.color" size="50px"></q-icon>
+              <q-img v-if="rec.image" :src="rec.image" style="width: 35px;"></q-img>
+              <q-icon
+                v-else
+                :name="rec.icon"
+                :class="`text-` + rec.color"
+                size="35px"
+              ></q-icon>
             </q-item-section>
           </q-item>
           <q-item class="q-py-xs" style="min-height: unset">
             <q-item-section>
               <div class="progress-base q-my-sm">
-                <div class="progress-base" :style="tools.getbackgroundGradient(rec.color, 45)"></div>
+                <div
+                  class="progress-base"
+                  :style="tools.getbackgroundGradient(rec.color, 45)"
+                ></div>
               </div>
             </q-item-section>
           </q-item>
         </q-card>
       </div>
     </div>
-    <div class="row q-my-md shadow" style="border-radius: 4px;border: 1px solid rgba(0, 0, 0, 0.12);">
+
-      <div v-for="(rec, index) of visulinks" :class="`col-md-3 col-lg-3 col-sm-6 col-xs-6 text-` + rec.color"
+    <div class="row" style="margin-top: 4px important; font-size: 0.75rem">
-           style="border-left: 1px solid #efefef;" :key="index"
+      &nbsp;
+    </div>
+
+    <div
+      class="row q-my-md shadow"
+      style="border-radius: 4px; border: 1px solid rgba(0, 0, 0, 0.12)"
+    >
+      <div
+        v-for="(rec, index) of visulinks"
+        :class="`col-md-3 col-lg-3 col-sm-6 col-xs-6 text-` + rec.color"
+        style="border-left: 1px solid #efefef"
+        :key="index"
       >
-        <q-card class="no-shadow q-pa-sm">
+        <q-card class="no-shadow q-pa-xxs">
           <q-item class="q-pb-none q-pt-xs cursor-pointer" :to="rec.to">
             <q-item-section>
-              <q-item-label :class="(!$q.dark.isActive? 'text-grey-7':'text-white') + ` title_view_shadow`" style="letter-spacing: 0.5px;">
+              <q-item-label
+                :class="
+                  (!$q.dark.isActive ? 'text-grey-7' : 'text-white') +
+                  ` title_view_small_shadow`
+                "
+                style="letter-spacing: 0.5px"
+              >
                 {{ rec.title }}
               </q-item-label>
+              <q-item-label
+                v-if="rec.subtitle"
+                :class="
+                  (!$q.dark.isActive ? 'text-grey-7' : 'text-white') +
+                  ` title_view_subtitle_shadow`
+                "
+                style="letter-spacing: 0.2px"
+              >
+                <span v-html="rec.subtitle"></span>
+              </q-item-label>
             </q-item-section>
 
             <q-item-section side>
-              <q-icon :name="rec.icon" :class="`text-` + rec.color" size="50px"></q-icon>
+              <q-img v-if="rec.image" :src="rec.image" style="width: 35px">IMAGE</q-img>
+              <q-icon
+                v-else
+                :name="rec.icon"
+                :class="`text-` + rec.color"
+                size="25px"
+              ></q-icon>
             </q-item-section>
           </q-item>
         </q-card>
       </div>
-
     </div>
   </div>
 </template>

src/components/CEventsCalendar/CEventsCalendar.vue

@@ -1062,7 +1062,7 @@
 
       <div class="q-mt-md">
         <div v-if="!mysingleevent && getNumEvents() > 0">
-          <p class="text-subtitle1 text-red bg-amber text-center">
+          <p class="text-subtitle1 text-white bg-primary text-center">
             LISTA PROSSIMI
             <span v-if="showfirstN > 0">{{ showfirstN }}</span> EVENTI:
           </p>

src/components/CMyElem/CMyElem.vue

@@ -577,7 +577,7 @@
           rounded
           size="md"
           color="primary"
-          to="/signup"
+          to="/registrati"
           :label="$t('reg.submit')"
         >
         </q-btn>

src/components/CMyGroup/CMyGroup.scss

@@ -2,3 +2,24 @@
   display: flex;
   flex: 1;
 }
+
+.container{
+  vertical-align: center;
+  padding: 5px;
+  font-size: 1.15rem;
+}
+
+.element{
+  font-weight: bold;
+  vertical-align: center;
+  padding: 5px;
+  font-size: 1.15rem;
+}
+
+
+.title_param{
+  font-size: 1.25rem;
+}
+.iconcirc {
+  margin-right: 4px;
+}

src/components/CMyGroup/CMyGroup.ts

@@ -11,12 +11,13 @@ import { CUserNonVerif } from '@/components/CUserNonVerif'
 import { toolsext } from '@store/Modules/toolsext'
 import { CSaldo } from '@/components/CSaldo'
 import { CSendCoins } from '@/components/CSendCoins'
+import { CCurrencyValue } from '@/components/CCurrencyValue'
 import { useCircuitStore } from '@store/CircuitStore'
 
 export default defineComponent({
   name: 'CMyGroup',
   emits: ['setCmd'],
-  components: {CUserNonVerif, CSaldo, CSendCoins},
+  components: {CUserNonVerif, CSaldo, CSendCoins, CCurrencyValue },
   props: {
     mygrp: {
       type: Object as PropType<IMyGroup | null>,
@@ -57,6 +58,7 @@ export default defineComponent({
     const circuitStore = useCircuitStore()
 
     const showsendCoinTo = ref(false)
+    const showAccountInfo = ref(false)
 
     const grp = ref(<IMyGroup | null>null)
 
@@ -114,7 +116,10 @@ export default defineComponent({
       table,
       myusername,
       circuit,
+      circuitStore,
       showsendCoinTo,
+      showAccountInfo,
+      t,
     }
   },
 })

src/components/CMyGroup/CMyGroup.vue

@@ -118,6 +118,26 @@
               </q-menu>
             </q-btn>
           </q-item-label>
+          <q-item-label v-if="visu === costanti.REQ_ADD_USER_TO_CIRCUIT">
+            <q-btn rounded icon="fas fa-ellipsis-h">
+              <q-menu>
+                <q-list style="min-width: 150px">
+                  <q-item
+                    clickable
+                    v-close-popup
+                    @click="showAccountInfo = true"
+                  >
+                    <q-item-section avatar>
+                      <q-icon name="fas fa-info" />
+                    </q-item-section>
+                    <q-item-section>{{
+                      $t('groups.infoaccount')
+                    }}</q-item-section>
+                  </q-item>
+                </q-list>
+              </q-menu>
+            </q-btn>
+          </q-item-label>
           <q-item-label v-else-if="visu === costanti.USER_GROUPS">
             <q-btn
               rounded
@@ -485,7 +505,12 @@
                     clickable
                     v-close-popup
                     @click="
-                      tools.refuseReqCircuit($q, myusername(), circuitname, grp.groupname)
+                      tools.refuseReqCircuit(
+                        $q,
+                        myusername(),
+                        circuitname,
+                        grp.groupname
+                      )
                     "
                   >
                     <q-item-section avatar>
@@ -500,7 +525,12 @@
                     clickable
                     v-close-popup
                     @click="
-                      tools.cancelReqCircuit($q, myusername(), circuitname, grp.groupname)
+                      tools.cancelReqCircuit(
+                        $q,
+                        myusername(),
+                        circuitname,
+                        grp.groupname
+                      )
                     "
                   >
                     <q-item-section avatar>
@@ -531,6 +561,98 @@
     >
     </CSendCoins>
   </div>
+  <q-dialog v-model="showAccountInfo" full-height full-width>
+    <q-card>
+      <q-toolbar class="bg-primary text-white">
+        <q-toolbar-title>
+          {{ grp.title }}
+        </q-toolbar-title>
+        <q-btn flat round color="white" icon="close" v-close-popup></q-btn>
+      </q-toolbar>
+      <q-card-section>
+        <div class="text-h6">{{ t('groups.infoaccount') }}</div>
+      </q-card-section>
+
+      <q-separator />
+
+      <CSaldo
+        v-if="tools.isUserOk() && grp.account"
+        :account="grp.account"
+        :symbol="circuit.symbol"
+        :color="circuit.color"
+        :saldo="grp.account.saldo"
+        :qtarem="
+          grp.account ? circuitStore.getRemainingCoinsToSend(grp.account) : 0
+        "
+      >
+      </CSaldo>
+
+      <q-card-section>
+        <div v-if="grp.account.date_created" class="container">
+          <q-icon name="fas fa-lightbulb" class="iconcirc"></q-icon>
+          {{
+            $t('shared.createddate', {
+              date: tools.getstrDateYY(grp.account.date_created),
+            })
+          }}
+        </div>
+        <div
+          v-if="
+            !!grp.account.date_updated &&
+            tools.getstrDate(grp.account.date_updated) !==
+              tools.getstrDate(grp.account.date_created)
+          "
+          class="container"
+        >
+          <q-icon name="fas fa-pencil-alt" class="iconcirc"></q-icon>
+          <span class="element">{{
+            $t('shared.lastmodify', {
+              date: tools.getstrDateYY(grp.account.date_updated),
+            })
+          }}</span>
+        </div>
+
+        <div :class="$q.screen.lt.sm ? '' : 'row'">
+          <div class="sezioni">
+            <CCurrencyValue
+              :symbol="tools.getSymbolByCircuit(circuit)"
+              :color="tools.getColorByCircuit(circuit)"
+              color_border="red"
+              :value="grp.account.fidoConcesso"
+              icon="fas fa-battery-quarter"
+              :label="t('circuit.fido_scoperto_default')"
+              :tips="t('circuit.fido_scoperto_default_tips')"
+            >
+            </CCurrencyValue>
+          </div>
+          <div class="sezioni">
+            <CCurrencyValue
+              :symbol="tools.getSymbolByCircuit(circuit)"
+              :color="tools.getColorByCircuit(circuit)"
+              color_border="green"
+              :value="grp.account.qta_maxConcessa"
+              icon="fas fa-battery-quarter"
+              :label="t('circuit.qta_max_default')"
+              :tips="t('circuit.qta_max_default_tips')"
+            >
+            </CCurrencyValue>
+          </div>
+          <div v-if="grp.account.totTransato" class="sezioni">
+            <CCurrencyValue
+              :symbol="tools.getSymbolByCircuit(circuit)"
+              :color="tools.getColorByCircuit(circuit)"
+              color_border="blue"
+              :value="grp.account.totTransato"
+              icon="fas fa-battery-quarter"
+              :label="t('circuit.totTransato')"
+              :tips="t('circuit.totTransato_tips')"
+            >
+            </CCurrencyValue>
+          </div>
+        </div>
+      </q-card-section>
+    </q-card>
+  </q-dialog>
 </template>
 
 <script lang="ts" src="./CMyGroup.ts">

src/components/CMyGroups/CMyGroups.ts

@@ -117,7 +117,9 @@ export default defineComponent({
 
     function mounted() {
       username.value = userStore.my.username
-      loadGroups()
+
+      if (props.finder)
+        loadGroups()
 
     }
 

src/components/CPhotosGallery/CPhotosGallery.ts

@@ -143,7 +143,7 @@ export default defineComponent({
     }
 
     function PagReg() {
-      $router.replace('/signup')
+      $router.replace('/registrati')
     }
 
     function openCreatePostModal() {

src/components/CPresentazione/CPresentazione.ts

@@ -86,7 +86,7 @@ export default defineComponent({
     }
 
     function PagReg() {
-      $router.replace('/signup')
+      $router.replace('/registrati')
     }
 
     function openCreatePostModal() {

src/components/CRegistration/CRegistration.ts

@@ -50,7 +50,7 @@ export default defineComponent({
       if (site.value.confpages.enableRegByBot) {
         $router.push('/bot')
       } else {
-        $router.push('/signup')
+        $router.push('/registrati')
       }
 
     }
@@ -67,7 +67,7 @@ export default defineComponent({
       if (props.signupform) {
         emit('regEventEmail', props.invited)
       } else {
-        $router.push('/signup')
+        $router.push('/registrati')
       }
     }
 

src/components/CSignIn/CSignIn.vue

@@ -109,7 +109,7 @@
             rounded
             size="md"
             color="primary"
-            to="/signup"
+            to="/registrati"
             :label="$t('reg.submit')"
           >
           </q-btn>

src/css/app.scss

@@ -1200,11 +1200,25 @@ h3 {
 
 .title_view_shadow {
   font-family: WalterTurncoat, handwriting, Arial, sans-serif;
-  font-size: 0.85rem;
+  font-size: 1.15rem;
   text-shadow: .05rem .05rem .05rem $grayshadow;
   letter-spacing: 0.25px;
 }
 
+.title_view_small_shadow {
+  font-family: WalterTurncoat, handwriting, Arial, sans-serif;
+  font-size: 0.75rem;
+  text-shadow: .05rem .05rem .05rem $grayshadow;
+  letter-spacing: 0.25px;
+}
+
+.title_view_subtitle_shadow {
+  font-family: Arial, sans-serif;
+  font-size: 0.7rem;
+  text-shadow: .05rem .05rem .05rem $grayshadow;
+  letter-spacing: 0.15px;
+}
+
 
 .text-normal {
   font-family: 'Open Sans', Arial, sans-serif;

src/db/lang/ws_it.js

@@ -64,6 +64,7 @@ const msg_website_it = {
     SignUp5: 'Reg',
     SignUp6: 'Registrati',
     SignUp7: 'Registra',
+    SignUp11: 'Registra',
     SignUpBot: 'Registrati con Telegram',
     SignIn: 'Login',
     status: 'Statistiche',

src/router/routesAdmin.ts

@@ -646,7 +646,18 @@ function getRoutesAd(site: ISites) {
     {
       active: site.confpages && site.confpages.enableReg && site.confpages.enabledRegNeedTelegram,
       order: 1000,
-      path: '/signup/:invited/:usernameteleg/:idteleg',
+      path: '/registrati/:invited/:usernameteleg/:idteleg/:regexpire',
+      materialIcon: 'how_to_reg',
+      name: 'pages.SignUp11',
+      component: () => import('@/views/login/signup/signup.vue'),
+      inmenu: false,
+      infooter: false,
+      separator: false
+    },
+    {
+      active: site.confpages && site.confpages.enableReg && site.confpages.enabledRegNeedTelegram,
+      order: 1000,
+      path: '/registrati/:invited/:usernameteleg/:idteleg',
       materialIcon: 'how_to_reg',
       name: 'pages.SignUp4',
       component: () => import('@/views/login/signup/signup.vue'),

src/statics/lang/it.js

@@ -1115,10 +1115,12 @@ const msg_it = {
       admin: 'amministratore',
       admins: 'Amministratori',
       createdby: 'Creato da {username} in data {date}',
+      createddate: 'Creato in data {date}',
       lastmodify: 'Ultima modifica {date}',
     },
     groups: {
       info: 'Informazioni su questo gruppo',
+      infoaccount: 'Informazioni sul Conto',
       accepted: 'Ingresso Accettato',
       refused: 'Ingresso Rifiutato',
       deleted: 'Cancellato',

src/store/Modules/costanti.ts

@@ -75,6 +75,7 @@ export const costanti = {
     {
       visible: true,
       title: ' Beni ',
+      subtitle: 'Autoproduzioni, artigianato, cibo, abbigliamento ...',
       strsingolo: 'Bene',
       to: '/goods',
       icon: 'fas fa-tshirt',
@@ -88,6 +89,7 @@ export const costanti = {
       visible: true,
       strsingolo: 'Servizio',
       title: 'Servizi',
+      subtitle: 'Competenze, formazione, aiuti, benessere, comunità',
       to: '/services',
       icon: 'fas fa-house-user',
       color: 'red-6',
@@ -99,6 +101,7 @@ export const costanti = {
     {
       visible: true,
       title: 'Ospitalità',
+      subtitle: 'Conosci persone, ospita viaggiatori, esplora nuovi paesi',
       strsingolo: 'Ospitalità',
       to: '/hosps',
       icon: 'fas fa-bed',
@@ -126,6 +129,7 @@ export const costanti = {
       visible: true,
       title: 'Eventi',
       strsingolo: 'Evento',
+      subtitle: 'Mercatini, incontri, corsi, feste',
       to: '/events',
       icon: 'event',
       color: 'green-6',
@@ -174,7 +178,7 @@ export const costanti = {
     },
     {
       visible: true,
-      title: 'Help (Faq)',
+      title: 'Assistenza',
       to: '/faq',
       icon: 'fas fa-question',
       color: 'yellow',
@@ -198,6 +202,7 @@ export const costanti = {
     {
       visible: false,
       title: 'Gruppi',  // ! IND_MYGROUPS
+      subtitle: 'Conosci gruppi, associazioni, progetti, comunità',
       to: '/groups',
       table: 'mygroups',
       icon: 'fas fa-users',
@@ -209,10 +214,12 @@ export const costanti = {
     },
     {
       visible: false,   //  ! IND_CIRCUIT: 11,
-      title: 'Circuiti',
+      title: 'Circuiti RIS',
+      subtitle: 'Entra nel territorio e <strong>Invia e Ricevi monete</strong>',
       to: '/circuits',
       table: 'circuits',
       icon: 'fas fa-coins',
+      image: 'images/1ris_rosso_100.png',
       color: 'orange-6',
       hint: '',
       disable: true,

src/store/UserStore.ts

@@ -533,7 +533,7 @@ export const useUserStore = defineStore('UserStore', {
     getRefLink(username: string): string {
       if (username === '')
         username = this.my.username
-      return tools.getUrlSite() + '/signup/' + username
+      return tools.getUrlSite() + '/registrati/' + username
     },
 
     isUserOk(): boolean {

src/views/user/mycircuit/mycircuit.vue

@@ -387,7 +387,7 @@
                     extraparams=""
                     :visufind="
                       tools.iAmAdminCircuit(circuit.name)
-                        ? costanti.REQ_REMOVE_USER_TO_CIRCUIT
+                        ? costanti.REQ_ADD_USER_TO_CIRCUIT
                         : costanti.FIND_PEOPLE
                     "
                   >
@@ -878,7 +878,7 @@
                     :extraparams="extraparams()"
                     :visufind="
                       tools.iAmAdminCircuit(circuit.name)
-                        ? costanti.REQ_REMOVE_USER_TO_CIRCUIT
+                        ? costanti.REQ_ADD_USER_TO_CIRCUIT
                         : costanti.FIND_PEOPLE
                     "
                   >

src/views/user/mygroup/mygroup.vue

@@ -80,6 +80,7 @@
               <q-menu>
                 <q-list v-if="true" style="min-width: 150px">
                   <q-item
+                    v-if="userStore.IsMyGroupByGroupname(mygrp.groupname)"
                     clickable
                     v-close-popup
                     @click="
@@ -101,9 +102,11 @@
                     }}</q-item-section>
                   </q-item>
 
-
                   <q-list
-                    v-if="tools.iAmAdminGroup(mygrp.groupname)"
+                    v-if="
+                      userStore.IsMyGroupByGroupname(mygrp.groupname) &&
+                      tools.iAmAdminGroup(mygrp.groupname)
+                    "
                     style="min-width: 200px"
                   >
                     <q-item