versione 0.6.3

This reverts commit 701e1f1968.

.env.development

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

.env.example.production

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

.env.test.risosrv

@@ -1,4 +1,4 @@
-APP_VERSION="0.6.1"
+APP_VERSION="0.6.3"
 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.6.1"
+APP_VERSION="0.6.3"
 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.6.1"
+APP_VERSION="0.6.3"
 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.6.1"
+APP_VERSION="0.6.3"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="14"
 DIRECTORY_LOCAL="newfreeplanet"

deploy_on_production.sh

@@ -19,7 +19,7 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
   echo "Sincronizzazione in remoto..."
 
   echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..."
-  sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
+  sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
   echo "Finito $SERVERDIR_WEBSITE "
 
 fi

deploy_on_test_server.sh

@@ -19,7 +19,7 @@ sleep 1
 npm run buildpwa
 
 echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..."
-sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
+sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
 
 cp .env.prod.bak .env.production
 

deploy_risosrv_on_test_server.sh

@@ -18,7 +18,7 @@ sleep 1
 npm run buildpwa
 
 echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..."
-rsync -e 'ssh -p 5522' -a --exclude 'upload' dist/pwa/ root@risosrv:/home/$SERVERDIR_WEBSITE
+rsync -e 'ssh -p 5522' -a dist/pwa/ root@risosrv:/home/$SERVERDIR_WEBSITE
 
 cp .env.prod.bak .env.production
 

public/upload

@@ -1 +1 @@
-/Users/suryapaolo/backups/upload
+../../IMGS/upload

send_pwa_to_production.sh

@@ -9,6 +9,6 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
 
 
   echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..."
-  sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
+  sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
   echo "Finito $SERVERDIR_WEBSITE "
 fi

send_pwa_to_risotest.sh

@@ -5,7 +5,7 @@ source .env.test.risosrv
 cp .env.test.risosrv .env.production
 
 echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..."
-rsync -e 'ssh -p 5522' -a --exclude 'upload' dist/pwa/ root@risosrv:/home/$SERVERDIR_WEBSITE/
+rsync -e 'ssh -p 5522' -a dist/pwa/ root@risosrv:/home/$SERVERDIR_WEBSITE/
 echo "Finito $SERVERDIR_WEBSITE"
 
 cp .env.prod.bak .env.production

send_pwa_to_test.sh

@@ -5,7 +5,7 @@ source ./.env.test
 cp .env.test .env.production
 
 echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..."
-sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
+sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
 echo "Finito $SERVERDIR_WEBSITE"
 
 cp .env.prod.bak .env.production

send_spa_to_production.sh

@@ -9,6 +9,6 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
 
 
   echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..."
-  sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
+  sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
   echo "Finito $SERVERDIR_WEBSITE "
 fi

src-pwa/custom-service-worker.js

@@ -18,7 +18,7 @@ import { CacheableResponsePlugin } from 'workbox-cacheable-response'
 import { ExpirationPlugin } from 'workbox-expiration'
 
 console.log(
-  '   [  VER-0.6.1 ] _---------________------  PAO: this is my custom service worker')
+  '   [  VER-0.5.4 ] _---------________------  PAO: this is my custom service worker')
 
 importScripts('js/idb.js')
 importScripts('js/storage.js')
@@ -36,7 +36,7 @@ let port = 3000
 if (self.location.hostname.startsWith('test')) {
   port = 3001
 }
-console.log('SW- app ver 0.6.1')
+console.log('SW- app ver 0.5.4')
 
 const cfgenv = {
   serverweb: `${self.location.protocol}//${self.location.hostname}:${port}`,

src/common/shared_vuejs.ts

@@ -1556,7 +1556,7 @@ export const shared_consts = {
     return ['_id', 'username', 'group', 'email', 'name', 'surname', 'perm', 'date_reg', 'verified_email', 'notask_verif', 'verified_by_aportador', 'trust_modified', 'img', 'ipaddr', 'lasttimeonline', 'profile', 'news_on']
   },
 
-  getProjectForAll(proj_add: string) {
+  getProjectForAll(proj_add: any) {
     let proj = {
       idContribType: 1,
       idCity: 1,

src/components/CAccomodation/CAccomodation.ts

@@ -30,7 +30,7 @@ export default defineComponent({
     title: String,
     mylist: {
       type: [Array, String, undefined, null] as PropType<IAccomodation[] | string | undefined | null>,
-      required: false,
+      required: true,
     },
   },
   emits: ['showandsave'],
@@ -68,7 +68,7 @@ export default defineComponent({
     })
 
     function created() {
-      console.log('created CAccomodation', props.mylist)
+      // console.log('created CAccomodation', props.mylist)
       if (isValid(props.mylist)) {
         // @ts-ignore
         let myarr: any = props.mylist

src/components/CFinder/CFinder.ts

@@ -81,7 +81,6 @@ export default defineComponent({
     const myoptions = ref(<any>[])
 
 
-
     const col = ref(<IColGridTable>{})
 
     /*
@@ -150,7 +149,7 @@ export default defineComponent({
       else if (props.table === toolsext.TABUSER)
         return userStore.getMypaginationMembers()
       else if (shared_consts.TABLES_ORDER_DATE_UPDATED.includes(props.table))
-        return { sortBy: 'date_updated', descending: true, page: 1, rowsNumber: 0, rowsPerPage: 10 } // date_updated
+      return { sortBy: 'date_updated', descending: true, page: 1, rowsNumber: 0, rowsPerPage: 10 } // date_updated
       else if (shared_consts.TABLES_ORDER_DESCR.includes(props.table))
         return { sortBy: 'desc', descending: false, page: 1, rowsNumber: 0, rowsPerPage: 10 }
 
@@ -1187,7 +1186,7 @@ export default defineComponent({
               reported: 1,
               date_report: 1,
               username_who_report: 1,
-              }
+            }
           },
           lookup3: {
             lk_tab: 'sectorgoods',
@@ -1260,7 +1259,7 @@ export default defineComponent({
               reported: 1,
               date_report: 1,
               username_who_report: 1,
-              }
+            }
           },
           lookup3: {
             lk_tab: toolsext.TABSECTORS,
@@ -1329,7 +1328,7 @@ export default defineComponent({
               comune: 1,
               mycities: 1,
               'profile.img': 1,
-              }
+            }
           },
         }
 
@@ -1386,7 +1385,7 @@ export default defineComponent({
               reported: 1,
               date_report: 1,
               username_who_report: 1,
-              }
+            }
           },
           lookup3: {
             lk_tab: toolsext.TABSECTORS,

src/components/CGridTableRec/CGridTableRec.ts

@@ -36,7 +36,6 @@ import { costanti } from '@costanti'
 import translate from '@/globalroutines/util'
 import { toolsext } from '@store/Modules/toolsext'
 import { CMyCardPopup } from '@/components/CMyCardPopup'
-import { CMyCardGood } from '@/components/CMyCardGood'
 import { CMyCardService } from '@/components/CMyCardService'
 import { CMyCardGrpPopup } from '@/components/CMyCardGrpPopup'
 import { CMyCardCircuitPopup } from '@/components/CMyCardCircuitPopup'
@@ -289,7 +288,7 @@ export default defineComponent({
   components: {
     CMyPopupEdit, CTitleBanner, CMyFieldDb, CMySelect, CMyFriends, CMyGroups,
     CMyUser, CMyRecCard, CMyCardPopup, CMyRecGrpCard, CMyCardGrpPopup, CMyCardCircuitPopup,
-    CMyRecCircuitCard, CMyCardService, CMyCardGood
+    CMyRecCircuitCard, CMyCardService
   },
   setup(props, { emit }) {
     const $q = useQuasar()

src/components/CGridTableRec/CGridTableRec.vue

@@ -1088,7 +1088,6 @@
     <q-dialog
       v-model="visupagedialog"
       @hide="hidewindow"
-      class="q-ma-sm"
       :maximized="$q.screen.lt.sm"
     >
 

src/components/CMyCardGood/CMyCardGood.scss

@@ -1,127 +0,0 @@
-.profile {
-  width: 100%;
-  margin: 0 auto;
-  max-width: 450px;
-}
-
-.myrow{
-  display: flex;
-  @media (max-width: 600px) {
-    flex-flow: column;
-  }
-}
-
-.qualifica{
-  border: solid 2px #4198ef;
-  border-radius: 1rem;
-  padding: 5px;
-}
-
-
-.text-bacheca{
-  margin: 10px;
-  border: solid 2px #4198ef;
-  border-radius: 1rem;
-  padding: 10px;
-
-}
-
-.note-bacheca{
-  border: solid 2px #C10015;
-  border-radius: 1rem;
-  padding: 10px;
-
-}
-
-.img {
-  margin-left: auto;
-  margin-right: auto;
-
-  max-height: 500px;
-  max-width: 350px;
-  @media (max-width: 500px) {
-    max-height: 500px;
-    max-width: 400px;
-  }
-}
-
-$graytext: #555;
-.cal {
-  color: black;
-  font-size: 1rem;
-  font-weight: 400;
-  line-height: 1.25rem;
-  letter-spacing: 0.03333em;
-
-  &__title {
-    color: white;
-    font-weight: 700;
-    font-size: 1rem;
-    padding-bottom: 10px;
-  }
-
-  &__details {
-    color: black;
-  }
-
-  &__hours {
-    color: blue;
-    &-title {
-      color: $graytext;
-    }
-    &-content {
-      font-weight: 400;
-    }
-  }
-
-  &__where {
-    margin-top: 5px;
-    color: blue;
-
-    &-title {
-      color: $graytext;
-    }
-    &-content {
-      color: darkblue !important;
-    }
-  }
-
-  &__when {
-    margin-top: 5px;
-    color: blue;
-
-    &-title {
-      color: $graytext;
-    }
-    &-content {
-      color: darkblue !important;;
-    }
-  }
-
-  &__teacher {
-    margin-top: 5px;
-    &-title {
-      color: $graytext;
-    }
-    &-content {
-      color: darkblue !important;;
-    }
-  }
-
-  &__quota {
-    margin-top: 5px;
-    &-title {
-      color: $graytext;
-    }
-    &-content {
-
-    }
-  }
-
-  &__img {
-    width: 100px;
-    height: 100px;
-    padding: 10px;
-  }
-
-}

src/components/CMyCardGood/CMyCardGood.ts

@@ -1,136 +0,0 @@
-import { computed, defineComponent, onMounted, PropType, ref, watch } from 'vue'
-
-import { CMyFieldDb } from '@/components/CMyFieldDb'
-import { CTitleBanner } from '@/components/CTitleBanner'
-import { CProfile } from '@/components/CProfile'
-import { CDateTime } from '@/components/CDateTime'
-import { CMyPage } from '@/components/CMyPage'
-import { CMyFieldRec } from '@/components/CMyFieldRec'
-import { CMyUser } from '@/components/CMyUser'
-import { CGalleryImages } from '@/components/CGalleryImages'
-import { CAccomodation } from '@/components/CAccomodation'
-import { tools } from '@store/Modules/tools'
-import { useUserStore } from '@store/UserStore'
-import { useCalendarStore } from '@store/CalendarStore'
-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 { IColGridTable, IImgGallery, IUserFields } from 'model'
-import { shared_consts } from '@/common/shared_vuejs'
-import { colCitys, fieldsTable } from '@store/Modules/fieldsTable'
-import { useRoute } from 'vue-router'
-import { useNotifStore } from '@store/NotifStore'
-
-export default defineComponent({
-  name: 'CMyCardGood',
-  components: { CProfile, CTitleBanner,
-    CMyFieldDb, CDateTime, CMyPage, CMyFieldRec, CAccomodation,
-    CMyUser, CGalleryImages },
-  props: {
-    table: {
-      type: String,
-      required: true,
-    },
-    prop_myrec: {
-      type: Object as PropType<any>,
-      required: false,
-      default: null,
-    },
-    idRec: {
-      type: Number,
-      required: false,
-      default: 0
-    },
-    nopopup: {
-      type: Boolean,
-      required: false,
-      default: false
-    },
-  },
-  setup(props) {
-
-    const userStore = useUserStore()
-    const calendarStore = useCalendarStore()
-    const notifStore = useNotifStore()
-    const globalStore = useGlobalStore()
-    const $q = useQuasar()
-    const $route = useRoute()
-    const { t } = useI18n()
-
-    const showPic = ref(false)
-
-    const myrec = ref(<any>{})
-    const col = ref(<IColGridTable>{})
-
-    const idnotif = computed(() => $route.query.idnotif ? $route.query.idnotif.toString() : '')
-
-    function profile() {
-      return userStore.my.profile
-    }
-
-    function load() {
-      // Carica il profilo di quest'utente
-      if (props.idRec) {
-        userStore.loadGeneric(props.table, props.idRec, idnotif.value).then((ris) => {
-          myrec.value = ris
-          notifStore.setAsRead(idnotif.value)
-        })
-
-      } else {
-        myrec.value = props.prop_myrec
-      }
-
-      col.value = fieldsTable.getArrColsByTable(props.table)
-    }
-
-    watch(() => props.idRec, (to: any, from: any) => {
-      load()
-    })
-
-    function mounted() {
-      load()
-    }
-
-    function getlinkpage() {
-      return self.location.host + tools.getPathByTable(props.table, myrec.value._id)
-    }
-    function condividipag() {
-      const mystr = getlinkpage()
-      tools.copyStringToClipboard($q, mystr, true)
-      tools.sendMsgTelegramCmd($q, t, shared_consts.MsgTeleg.SHARE_TEXT, false, mystr)
-      return true
-    }
-
-    function showBadge() {
-      if (shared_consts.TABLES_SHOW_ADTYPE.includes(props.table)) {
-        return true
-      }
-
-      return false
-    }
-
-    onMounted(mounted)
-
-    return {
-      profile,
-      tools,
-      costanti,
-      myrec,
-      shared_consts,
-      globalStore,
-      showPic,
-      userStore,
-      t,
-      fieldsTable,
-      colCitys,
-      toolsext,
-      col,
-      condividipag,
-      showBadge,
-      getlinkpage,
-      calendarStore,
-    }
-  }
-})

src/components/CMyCardGood/CMyCardGood.vue

@@ -1,252 +0,0 @@
-<template>
-  <div v-if="myrec._id" class="fulldiv">
-    <div class="q-pa-sm row items-start q-gutter-sm full-height fulldiv">
-      <q-card class="my-card fulldiv" bordered>
-        <CGalleryImages
-          v-if="myrec.photos.length > 0"
-          :imgGallery="myrec.photos"
-          :directory="'upload/' + tools.getDirectoryGall(myrec, table, '')"
-        >
-        </CGalleryImages>
-
-        <q-card-actions align="right">
-          <q-btn
-            flat
-            round
-            :color="userStore.isFavorite(myrec._id, table) ? 'red' : ''"
-            icon="favorite"
-            @click="
-              userStore.setFavorite($q, t, myrec._id, toolsext.TABMYGOODS)
-            "
-          />
-          <q-btn
-            flat
-            round
-            :color="userStore.isBookmarked(myrec._id, table) ? 'teal' : ''"
-            icon="bookmark"
-            @click="
-              userStore.setBookmark($q, t, myrec._id, toolsext.TABMYGOODS)
-            "
-          />
-          <q-btn
-            flat
-            round
-            color="primary"
-            icon="share"
-            @click="tools.copyToClip($q, getlinkpage(), true)"
-          />
-        </q-card-actions>
-        <q-separator />
-
-        <q-list>
-          <q-item clickable>
-            <q-item-section avatar>
-              <div v-if="showBadge()" class="text-center">
-                <q-chip
-                  dense
-                  :color="fieldsTable.getColByAdType(myrec.adType)"
-                  text-color="white"
-                  >{{
-                    fieldsTable.getValByTabAndId(table, 'adType', myrec.adType)
-                  }}
-                </q-chip>
-              </div>
-            </q-item-section>
-
-            <q-item-section>
-              <q-item-label class="text-bold text-h7">{{
-                myrec.descr
-              }}</q-item-label>
-            </q-item-section>
-          </q-item>
-          <q-item>
-            <q-item-section avatar>
-              <q-icon color="blue" name="category" />
-            </q-item-section>
-
-            <q-item-section>
-              <q-item-label>
-                <q-chip
-                  v-if="myrec.sectorGood && myrec.sectorGood[0].descr"
-                  class="glossy"
-                  color="blue"
-                  text-color="white"
-                  dense
-                >
-                  <span class="cal__quota-content">{{
-                    myrec.sectorGood[0].descr
-                  }}</span>
-                </q-chip>
-                <q-chip
-                  v-if="myrec.recGood.length > 0 && myrec.recGood[0].descr"
-                  class="glossy"
-                  dense
-                  color="blue"
-                  text-color="white"
-                >
-                  <span class="cal__quota-content">{{
-                    myrec.recGood[0].descr
-                  }}</span>
-                </q-chip>
-              </q-item-label>
-            </q-item-section>
-          </q-item>
-          <q-item-label v-if="myrec.note"
-            ><div v-html="myrec.note" class="clBorderService"></div
-          ></q-item-label>
-
-          <q-card class="my-card clBorderUser" bordered>
-            <CMyUser
-              :mycontact="myrec"
-              :visu="costanti.FIND_PEOPLE"
-              @setCmd="tools.setCmd"
-            >
-            </CMyUser>
-          </q-card>
-          <q-item v-if="myrec.mycities[0].comune">
-            <q-item-section avatar>
-              <q-icon color="amber" name="fas fa-map-marker-alt" />
-            </q-item-section>
-            <q-item-section>
-              <q-item-label>
-                <span v-for="(city, index) in myrec.mycities" :key="index">
-                  <span v-if="city.comune">
-                    {{ city.comune }} ({{ city.prov }})</span
-                  ><span v-if="myrec.mycities.length > 1"> - </span>
-                </span>
-              </q-item-label>
-              <q-item-label v-if="myrec.profile.qualifica" caption>{{
-                myrec.biografia
-              }}</q-item-label>
-            </q-item-section>
-          </q-item>
-          <q-item clickable v-if="myrec.website">
-            <q-item-section avatar>
-              <q-icon color="blue" name="fas fa-globe" />
-            </q-item-section>
-
-            <q-item-section>
-              <q-item-label lines="1">
-                <span v-html="tools.getlinkhref(myrec.website, 'Visita il Sito Web')"
-              /></q-item-label>
-            </q-item-section>
-          </q-item>
-          <q-item v-if="myrec.idContribType && myrec.idContribType.length > 0">
-            <q-item-section avatar>
-              <q-icon color="green" name="fas fa-hand-holding" />
-            </q-item-section>
-
-            <q-item-section>
-              <q-item-label>
-                <span
-                  v-for="(reccontr, index) in myrec.idContribType"
-                  :key="index"
-                >
-                  <q-chip
-                    dense
-                    :color="calendarStore.getColByContribType(reccontr)"
-                    text-color="white"
-                  >
-                    {{ calendarStore.getContribtypeById(reccontr) }}
-                  </q-chip>
-                </span>
-              </q-item-label>
-            </q-item-section>
-          </q-item>
-          <q-item>
-            <q-item-section avatar>
-              <q-icon color="blue" name="far fa-edit" />
-            </q-item-section>
-
-            <q-item-section>
-              <q-item-label
-                ><span v-if="myrec.date_updated">{{
-                  tools.getstrDateMonthLong(myrec.date_updated)
-                }}</span
-                ><span v-else>{{
-                  tools.getstrDateMonthLong(myrec.date_created)
-                }}</span></q-item-label
-              >
-            </q-item-section>
-          </q-item>
-          <q-item clickable v-if="false">
-            <q-item-section avatar>
-              <q-icon color="red" name="local_gas_station" />
-            </q-item-section>
-
-            <q-item-section>
-              <q-item-label></q-item-label>
-              <q-item-label caption>Fill your gas tank.</q-item-label>
-            </q-item-section>
-          </q-item>
-        </q-list>
-        <q-separator />
-        <div class="q-mb-xl"></div>
-        <q-card-actions
-          v-if="$q.screen.gt.sm"
-          class="text-center justify-center"
-        >
-          <q-btn
-            v-if="myrec.profile.username_telegram"
-            :label="$t('dialog.contact')"
-            color="primary"
-            icon="far fa-comment"
-            target="_blank"
-            :type="tools.isUserOk() ? 'a' : 'btn'"
-            size="md"
-            rounded
-            :href="
-              tools.isUserOk()
-                ? tools.getHttpForTelegram(myrec.profile.username_telegram)
-                : null
-            "
-          />
-          <q-btn
-            rounded
-            outline
-            :label="$t('dialog.close')"
-            color="primary"
-            icon="close"
-            v-close-popup
-          />
-        </q-card-actions>
-      </q-card>
-      <div
-        v-if="!$q.screen.gt.sm"
-        class="row absolute-bottom text-shadow custom-caption q-px-md buttons_bottom"
-      >
-        <q-btn
-          v-if="myrec.profile.username_telegram"
-          :label="$t('dialog.contact')"
-          color="primary"
-          icon="far fa-comment"
-          target="_blank"
-          :type="tools.isUserOk() ? 'a' : 'btn'"
-          size="md"
-          rounded
-          :href="
-            tools.isUserOk()
-              ? tools.getHttpForTelegram(myrec.profile.username_telegram)
-              : null
-          "
-        />
-        <q-btn
-          rounded
-          outline
-          :label="$t('dialog.close')"
-          color="primary"
-          icon="close"
-          v-close-popup
-        />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script lang="ts" src="./CMyCardGood.ts">
-</script>
-
-<style lang="scss" scoped>
-@import './CMyCardGood.scss';
-</style>
-

src/components/CMyCardGood/index.ts

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

src/components/CMyCardService/CMyCardService.ts

@@ -137,10 +137,10 @@ export default defineComponent({
     }
 
     function clicca(tipo: any, set: any, title: string) {
-      if (set && tipo === costanti.TIPOFAVBOOK.FAVORITE) {
+      if (set && myrec.value.username !== userStore.my.username && tipo === costanti.TIPOFAVBOOK.FAVORITE) {
         userStore.setFavorite($q, t, myrec.value._id, props.table, myrec.value);
       }
-      if (set && tipo === costanti.TIPOFAVBOOK.BOOKMARK) {
+      if (set && myrec.value.username !== userStore.my.username && tipo === costanti.TIPOFAVBOOK.BOOKMARK) {
         userStore.setBookmark($q, t, myrec.value._id, props.table, myrec.value);
       }
 

src/css/app.scss

@@ -2,18 +2,11 @@ body {
   font-family: 'Source Sans Pro', 'Helvetica Neue', Arial, sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+  color: #333333;
   line-height: 1.5;
   //font-size: 1rem;
 }
 
-body.body--light {
-  color: #333333;
-}
-
-body.body--dark {
-  color: #AAAAAA;
-}
-
 .text-mycol {
   color: #333333 !important;
 }
@@ -330,8 +323,8 @@ h3 {
   min-width: 250px;
   padding: 1rem 1rem;
 
-  @media (max-width: 800px) {
+  @media (max-width: 500px) {
-    max-width: 600px;
+    max-width: 400px;
     min-width: 250px;
   }
 
@@ -691,7 +684,6 @@ h3 {
   font-size: 1rem;
   padding: 6px;
 }
-
 .clBorderUser {
   border-radius: 16px;
   font-size: 1rem;
@@ -828,8 +820,7 @@ h3 {
   border: solid 2px #49b502;
 }
 
-.bordo_stondato_pending,
+.bordo_stondato_pending, .bordo_quadrato_pending {
-.bordo_quadrato_pending {
   margin: 4px;
   padding-left: 14px;
   padding-right: 14px;
@@ -1026,8 +1017,7 @@ h3 {
   place-content: center;
 }
 
-.combowidth,
+.combowidth, .comboselector {
-.comboselector {
   min-width: 190px;
 
   @media (max-width: 450px) {
@@ -1399,7 +1389,6 @@ h3 {
 .anim_toBottom {
   animation: moveToBottom 2s ease-in-out;
 }
-
 .anim_toRight {
   animation: moveToRight 2s ease-in-out;
 }
@@ -1425,222 +1414,100 @@ h3 {
 }
 
 
-.film,
+.film, .effect {
-.effect {
+	width: 100%;
-  width: 100%;
+	height: 100%;
-  height: 100%;
+	filter: blur(0.45px) drop-shadow(0px 0px 0px #fff1);
-  filter: blur(0.45px) drop-shadow(0px 0px 0px #fff1);
 }
 
-.film:after,
+.film:after, .effect:after {
-.effect:after {
+	content: '';
-  content: '';
+	width: 120%;
-  width: 120%;
+	height: 100%;
-  height: 100%;
+	top: 0;
-  top: 0;
+	left: 0;
-  left: 0;
+	padding-left: 100px;
-  padding-left: 100px;
+	opacity: 0.5;
-  opacity: 0.5;
+	animation: film-scratch 0.45s steps(1) infinite;
-  animation: film-scratch 0.45s steps(1) infinite;
+	background: repeating-linear-gradient(90deg, #0002 0 2px, transparent 4px 37vmin);
-  background: repeating-linear-gradient(90deg, #0002 0 2px, transparent 4px 37vmin);
 }
 
 .effect:after {
-  left: 30%;
+	left: 30%;
-  animation: effect-scratch 2s infinite;
+	animation: effect-scratch 2s infinite;
 }
 
 .grain {
-  width: 100%;
+	width: 100%;
-  height: 100%;
+	height: 100%;
 }
 
 .grain:after {
-  content: '';
+	content: '';
-  width: 110%;
+	width: 110%;
-  height: 110%;
+	height: 110%;
-  top: -5%;
+	top: -5%;
-  left: -5%;
+	left: -5%;
-  opacity: .25;
+	opacity: .25;
-  background-image:
+	background-image:
-    repeating-conic-gradient(var(--black) 0%, transparent .00003%, transparent .0005%, transparent .00095%),
+		repeating-conic-gradient(var(--black) 0%, transparent .00003%, transparent .0005%, transparent .00095%),
-    repeating-conic-gradient(var(--black) 0%, transparent .00005%, transparent 0.00015%, transparent 0.0009%);
+		repeating-conic-gradient(var(--black) 0%, transparent .00005%, transparent 0.00015%, transparent 0.0009%);
-  animation: grain 0.5s steps(1) infinite;
+	animation: grain 0.5s steps(1) infinite;
-  filter: drop-shadow(0px 0px 1px black);
+	filter: drop-shadow(0px 0px 1px black);
 }
 
 @keyframes grain {
-
+	0%, 100% { transform: translate(0, 0); }
-  0%,
+	10% { transform: translate(-1%, -1%); }
-  100% {
+	20% { transform: translate(1%, 1%); }
-    transform: translate(0, 0);
+	30% { transform: translate(-2%, -2%); }
-  }
+	40% { transform: translate(3%, 3%); }
-
+	50% { transform: translate(-3%, -3%); }
-  10% {
+	60% { transform: translate(4%, 4%); }
-    transform: translate(-1%, -1%);
+	70% { transform: translate(-4%, -4%); }
-  }
+	80% { transform: translate(2%, 2%); }
-
+	90% { transform: translate(-3%, -3%); }
-  20% {
-    transform: translate(1%, 1%);
-  }
-
-  30% {
-    transform: translate(-2%, -2%);
-  }
-
-  40% {
-    transform: translate(3%, 3%);
-  }
-
-  50% {
-    transform: translate(-3%, -3%);
-  }
-
-  60% {
-    transform: translate(4%, 4%);
-  }
-
-  70% {
-    transform: translate(-4%, -4%);
-  }
-
-  80% {
-    transform: translate(2%, 2%);
-  }
-
-  90% {
-    transform: translate(-3%, -3%);
-  }
 }
 
 @keyframes film-scratch {
-
+	0%, 100% { transform: translateX(0); opacity: 0.5; }
-  0%,
+	10% { transform: translateX(-1%); }
-  100% {
+	20% { transform: translateX(1%); }
-    transform: translateX(0);
+	30% { transform: translateX(-2%); opacity: 0.75; }
-    opacity: 0.5;
+	40% { transform: translateX(3%); }
-  }
+	50% { transform: translateX(-3%); opacity: 0.5; }
-
+	60% { transform: translateX(8%); }
-  10% {
+	70% { transform: translateX(-3%); }
-    transform: translateX(-1%);
+	80% { transform: translateX(10%); opacity: 0.25; }
-  }
+	90% { transform: translateX(-2%); }
-
-  20% {
-    transform: translateX(1%);
-  }
-
-  30% {
-    transform: translateX(-2%);
-    opacity: 0.75;
-  }
-
-  40% {
-    transform: translateX(3%);
-  }
-
-  50% {
-    transform: translateX(-3%);
-    opacity: 0.5;
-  }
-
-  60% {
-    transform: translateX(8%);
-  }
-
-  70% {
-    transform: translateX(-3%);
-  }
-
-  80% {
-    transform: translateX(10%);
-    opacity: 0.25;
-  }
-
-  90% {
-    transform: translateX(-2%);
-  }
 }
 
 @keyframes effect-scratch {
-  0% {
+	0% { transform: translateX(0); opacity: 0.75; }
-    transform: translateX(0);
+	10% { transform: translateX(-1%); }
-    opacity: 0.75;
+	20% { transform: translateX(1%); }
-  }
+	30% { transform: translateX(-2%); }
-
+	40% { transform: translateX(3%); }
-  10% {
+	50% { transform: translateX(-3%); opacity: 0.5; }
-    transform: translateX(-1%);
+	60% { transform: translateX(8%); }
-  }
+	70% { transform: translateX(-3%); }
-
+	80% { transform: translateX(10%); opacity: 0.25; }
-  20% {
+	90% { transform: translateX(20%); }
-    transform: translateX(1%);
+	100% { transform: translateX(30%); }
-  }
-
-  30% {
-    transform: translateX(-2%);
-  }
-
-  40% {
-    transform: translateX(3%);
-  }
-
-  50% {
-    transform: translateX(-3%);
-    opacity: 0.5;
-  }
-
-  60% {
-    transform: translateX(8%);
-  }
-
-  70% {
-    transform: translateX(-3%);
-  }
-
-  80% {
-    transform: translateX(10%);
-    opacity: 0.25;
-  }
-
-  90% {
-    transform: translateX(20%);
-  }
-
-  100% {
-    transform: translateX(30%);
-  }
 }
 
 /**** OLD FILM EFFECT END ****/
 
 @keyframes zoomImg {
-  0% {
+	0% { transform: translate(-75%, 10%) scale(1.5); opacity: 0.6; }
-    transform: translate(-75%, 10%) scale(1.5);
+	20% { transform: translate(-15%, 10%) scale(1.5); opacity: 1; }
-    opacity: 0.6;
+	50% { transform: translate(-15%, 25%) scale(1.4); opacity: 1; }
-  }
+	80% { transform: translate(-65%, 25%) scale(1.4); opacity: 1; }
-
+	100% { transform: translate(-75%, 10%) scale(1.5); opacity: 0.6; }
-  20% {
-    transform: translate(-15%, 10%) scale(1.5);
-    opacity: 1;
-  }
-
-  50% {
-    transform: translate(-15%, 25%) scale(1.4);
-    opacity: 1;
-  }
-
-  80% {
-    transform: translate(-65%, 25%) scale(1.4);
-    opacity: 1;
-  }
-
-  100% {
-    transform: translate(-75%, 10%) scale(1.5);
-    opacity: 0.6;
-  }
 }
 
 .zoomImg {
-  animation: zoomImg 20s linear infinite;
+	animation: zoomImg 20s linear infinite;
 }
 
 .animate__animated.animate__slow3 {
@@ -1649,28 +1516,24 @@ h3 {
   -webkit-animation-duration: calc(var(--animate-duration) * 3);
   animation-duration: calc(var(--animate-duration) * 3);
 }
-
 .animate__animated.animate__slow4 {
   -webkit-animation-duration: calc(1s * 4);
   animation-duration: calc(1s * 4);
   -webkit-animation-duration: calc(var(--animate-duration) * 4);
   animation-duration: calc(var(--animate-duration) * 4);
 }
-
 .animate__animated.animate__slow5 {
   -webkit-animation-duration: calc(1s * 5);
   animation-duration: calc(1s * 5);
   -webkit-animation-duration: calc(var(--animate-duration) * 5);
   animation-duration: calc(var(--animate-duration) * 5);
 }
-
 .animate__animated.animate__slow10 {
   -webkit-animation-duration: calc(1s * 10);
   animation-duration: calc(1s * 10);
   -webkit-animation-duration: calc(var(--animate-duration) * 10);
   animation-duration: calc(var(--animate-duration) * 10);
 }
-
 .animate__animated.animate__slow20 {
   -webkit-animation-duration: calc(1s * 20);
   animation-duration: calc(1s * 20);
@@ -1681,19 +1544,15 @@ h3 {
 .animate__animated.animate__ease-in-out {
   transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
 }
-
 .animate__animated.animate__linear {
   transition-timing-function: linear;
 }
-
 .animate__animated.animate__ease-in {
   transition-timing-function: cubic-bezier(0.4, 0, 1, 1);
 }
-
 .animate__animated.animate__ease-out {
   transition-timing-function: cubic-bezier(0, 0, 0.2, 1);
 }
-
 .animate__animated.animate__ease {
   transition-timing-function: ease;
 }
@@ -1724,14 +1583,13 @@ h3 {
   height: auto;
 }
 
-.show_province_title {
+.show_province_title{
   font-size: 0.85rem;
   font-style: italic;
   text-align: right;
-  color: #A0A0A0;
+  color:#A0A0A0;
 }
-
+.show_province{
-.show_province {
   font-size: 0.85rem;
   font-style: italic;
   text-align: right;