Mostrare Bottone Telegram per tutti

Visualizzazione Cellulare sul Profilo

.env.development

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

_ALL_SITES/freeplanet.app/.env.development

@@ -1,4 +1,4 @@
-APP_VERSION="0.2.9"
+APP_VERSION="0.2.10"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="1"
 DIRECTORY_LOCAL="newfreeplanet"

_ALL_SITES/insiemesipuo.app/.env.development

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

_ALL_SITES/insiemesipuo.app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "insiemesipuo",
-  "version": "0.1.0",
+  "version": "0.2.10",
   "description": "Insieme Si Puo",
   "productName": "Insieme Si Puo",
   "author": "Paolo Arena",

_ALL_SITES/popolodelnuovomondo.app/.env.development

@@ -1,4 +1,4 @@
-APP_VERSION="0.2.9"
+APP_VERSION="0.2.10"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="12"
 DIRECTORY_LOCAL="newfreeplanet"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "insiemesipuo",
-  "version": "0.1.0",
+  "version": "0.2.10",
   "description": "Insieme Si Puo",
   "productName": "Insieme Si Puo",
   "author": "Paolo Arena",

src/components/CLabel/CLabel.ts

@@ -0,0 +1,37 @@
+import { defineComponent, ref, toRef, watch } from 'vue'
+import { tools } from '@src/store/Modules/tools'
+
+import {  useQuasar } from 'quasar'
+import { useI18n } from '@/boot/i18n'
+import { toolsext } from '@store/Modules/toolsext'
+
+export default defineComponent({
+  name: 'CLabel',
+  props: {
+    value: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    label: {
+      type: String,
+      required: true,
+      default: '',
+    },
+  },
+  components: {},
+  setup(props, { emit }) {
+    const $q = useQuasar()
+    const { t } = useI18n();
+
+    function copytoclip() {
+      tools.copyStringToClipboard($q, props.value, true)
+    }
+
+    return {
+      tools,
+      toolsext,
+      copytoclip,
+    }
+  },
+})

src/components/CLabel/CLabel.vue

@@ -0,0 +1,27 @@
+<template>
+  <div>
+    <q-field
+      :label="label"
+      stack-label
+      outlined
+      color="blue-6"
+      >
+
+      <template v-slot:prepend>
+        <q-btn round dense flat icon="far fa-copy" @click="copytoclip"/>
+      </template>
+      <template v-slot:control>
+        <div class="self-center full-width no-outline" tabindex="0">
+          {{ value }}
+        </div>
+      </template>
+    </q-field>
+  </div>
+</template>
+
+<script lang="ts" src="./CLabel.ts">
+</script>
+
+<style lang="scss" scoped>
+@import './CLabel.scss';
+</style>

src/components/CLabel/index.ts

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

src/components/CMyFieldRec/CMyFieldRec.ts

@@ -116,7 +116,7 @@ export default defineComponent({
       let columns = fieldsTable.getArrColsByTable(props.table)
 
       if (columns) {
-        col.value = columns.find((col: any) => col.field === props.field)
+        col.value = columns.find((col: any) => col.name === props.field)
       } else {
         col.value = fieldsTable.getColByTable(props.table, props.field)
       }
@@ -177,6 +177,7 @@ export default defineComponent({
     }
 
     function visuElem() {
+
       if (col.value) {
         return !!col.value.name && (props.canEdit || (!props.canEdit && getValue()))
       } else {

src/components/CMyFieldRec/CMyFieldRec.vue

@@ -1,7 +1,5 @@
 <template>
-  <div class="text-center">
+  <div v-if="visuElem()" :class="mytitle ? `row items-center justify-center q-ma-xs text-center` : ``">
-    <div v-if="visuElem()"  class="row items-center justify-center q-ma-xs">
-
     <div v-if="mytitle" class="q-ma-xs">
       <q-field rounded outlined bg-color="blue-1" dense style="min-width:110px;">
         <template v-slot:control>
@@ -51,7 +49,6 @@
     </div>
     <slot></slot>
   </div>
-  </div>
 </template>
 
 <script lang="ts" src="./CMyFieldRec.ts">

src/components/CMyPopupEdit/CMyPopupEdit.ts

@@ -7,6 +7,7 @@ import { IColGridTable, IImgGallery } from 'model'
 import { CMyChipList } from '../CMyChipList'
 import { CDate } from '../CDate'
 import { CDateTime } from '../CDateTime'
+import { CLabel } from '../CLabel'
 import { CMyToggleList } from '../CMyToggleList'
 import { CMySelect } from '../CMySelect'
 import { CMyEditor } from '../CMyEditor'
@@ -173,7 +174,7 @@ export default defineComponent({
       default: false,
     },
   },
-  components: { CMyChipList, CDateTime, CDate, CMyToggleList, CMySelect, CMyEditor, CGallery },
+  components: { CMyChipList, CDateTime, CDate, CMyToggleList, CMySelect, CMyEditor, CGallery, CLabel },
   setup(props, { emit }) {
     const $q = useQuasar()
     const { t } = useI18n()

src/components/CMyPopupEdit/CMyPopupEdit.vue

@@ -82,7 +82,7 @@
             </div>
           </div>
           <div v-else-if="col.fieldtype === costanti.FieldType.string || col.fieldtype === costanti.FieldType.crypted">
-            <div v-if="visulabel || isInModif" :class="{ flex: !isInModif}">
+            <div v-if="isInModif" :class="{ flex: !isInModif}">
               <q-input
                 v-bind="$attrs"
                 v-model="myvalue"
@@ -99,8 +99,14 @@
                 :label="col.label">
               </q-input>
             </div>
+            <div v-else-if="col.tipovisu === costanti.TipoVisu.TESTO" :class="{ flex: !isInModif}">
+              <CLabel
+                v-bind="$attrs"
+                :value="myvalue"
+                :label="t(col.label_trans)"
+              />
+            </div>
             <div v-else>
-
               <q-btn v-if="col.tipovisu === costanti.TipoVisu.LINK && myvalue"
                      type="a" rounded size="md"
                      :class="{disabled: disable }"
@@ -126,7 +132,7 @@
                 v-model="myvalue"
                 :maxlength="col.maxlength ? col.maxlength : undefined"
                 @update:model-value="Savedb"
-                :label="visulabel ? col.label : ''"
+                :label="visulabel ? t(col.label_trans) : ''"
                 type="number"
                 autofocus>
 
@@ -219,7 +225,7 @@
                 :type_out="col.field_outtype"
                 :col="col"
                 :row="row"
-                :label="col.label"
+                :label="col.label ? col.label : t(col.label_trans)"
                 v-model:value="myvalue"
                 @update:value="changevalRec"
                 :tablesel="tablesel"
@@ -240,7 +246,7 @@
                 :type_out="col.field_outtype"
                 :col="col"
                 :row="row"
-                :label="col.label"
+                :label="col.label ? col.label : t(col.label_trans)"
                 v-model:value="myvalue"
                 @update:value="changevalRec"
                 :tablesel="tablesel"
@@ -258,7 +264,7 @@
           <div v-else-if="col.fieldtype === costanti.FieldType.date">
             <div v-if="myvalue">
               <CDateTime
-                :label="col.label"
+                :label="col.label ? col.label : t(col.label_trans)"
                 class="cursor-pointer"
                 v-model:value="myvalue"
                 :readonly="false"
@@ -279,7 +285,7 @@
           </div>
           <div v-else-if="col.fieldtype === costanti.FieldType.onlydate">
             <CDateTime
-              :label="col.label"
+              :label="col.label ? col.label : t(col.label_trans)"
               class="cursor-pointer"
               :valueDate="myvalue"
               v-model:value="myvalue"
@@ -295,7 +301,7 @@
           <div v-else-if="col.fieldtype === costanti.FieldType.binary">
             <div v-if="isInModif">
               <span v-if="insertMode">
-                {{ col.label }}:
+                {{ col.label ? col.label : t(col.label_trans) }}:
               </span>
               <CMyToggleList
                 :label="col.titlepopupedit"
@@ -328,7 +334,7 @@
                 :row="row"
                 :multiple="true"
                 :withToggle="true"
-                :label="col.label"
+                :label="col.label ? col.label : t(col.label_trans)"
                 :filter_table="col.filter_table"
                 :filter_field="col.filter_field"
                 :value_extra="value_extra"
@@ -396,7 +402,7 @@
                 :type_out="col.field_outtype"
                 :col="col"
                 :row="row"
-                :label="col.label"
+                :label="col.label ? col.label : t(col.label_trans)"
                 v-model:value="myvalue"
                 :pickup="col.fieldtype === costanti.FieldType.select_by_server"
                 :tablesel="col.fieldtype === costanti.FieldType.select_by_server ? tablesel : ''"
@@ -444,7 +450,7 @@
               :col="col"
               :row="row"
               :multiselect_by_server="true"
-              :label="col.label"
+              :label="col.label ? col.label : t(col.label_trans)"
               v-model:arrvalue="myvalue"
               @update:arrvalue="changevalRec"
               :addall="false"
@@ -469,7 +475,7 @@
                 :type_out="col.field_outtype"
                 :col="col"
                 :row="row"
-                :label="col.label"
+                :label="col.label ? col.label : t(col.label_trans)"
                 v-model:value="myvalue"
                 @update:value="changevalRec"
                 :filter_table="col.filter_table"
@@ -635,7 +641,7 @@
                   autofocus
                   @update:model-value="changevalRec"
                   style="max-width: 100px;"
-                  :label="col.label">
+                  :label="col.label ? col.label : t(col.label_trans)">
                 </q-input>
               </div>
               <div v-if="isFieldDb()">
@@ -668,7 +674,7 @@
                 :type_out="col.field_outtype"
                 :col="col"
                 :row="row"
-                :label="col.label"
+                :label="col.label ? col.label : t(col.label_trans)"
                 v-model:value="scope.value"
                 :pickup="col.fieldtype === costanti.FieldType.select_by_server"
                 :tablesel="col.fieldtype === costanti.FieldType.select_by_server ? tablesel : ''"
@@ -688,7 +694,7 @@
                 :col="col"
                 :row="row"
                 :multiselect_by_server="true"
-                :label="col.label"
+                :label="col.label ? col.label : t(col.label_trans)"
                 v-model:arrvalue="scope.value"
                 @update:arrvalue="changevalRec"
                 :addall="false"
@@ -744,7 +750,7 @@
                   :type_out="col.field_outtype"
                   :col="col"
                   :row="row"
-                  :label="col.label"
+                  :label="col.label ? col.label : t(col.label_trans)"
                   v-model:value="scope.value"
                   @update:value="changevalRec"
                   :tablesel="tablesel"
@@ -765,7 +771,7 @@
                   :type_out="col.field_outtype"
                   :col="col"
                   :row="row"
-                  :label="col.label"
+                  :label="col.label ? col.label : t(col.label_trans)"
                   v-model:value="scope.value"
                   @update:value="changevalRec"
                   :tablesel="tablesel"
@@ -779,7 +785,7 @@
             </div>
             <div v-else-if="col.fieldtype === costanti.FieldType.date">
               <CDateTime
-                :label="col.label"
+                :label="col.label ? col.label : t(col.label_trans)"
                 class="cursor-pointer"
                 v-model:value="myvalue"
                 :readonly="false"
@@ -792,7 +798,7 @@
             </div>
             <div v-else-if="col.fieldtype === costanti.FieldType.onlydate">
               <CDateTime
-                :label="col.label"
+                :label="col.label ? col.label : t(col.label_trans)"
                 class="cursor-pointer"
                 :valueDate="myvalue"
                 v-model:value="myvalue"
@@ -820,7 +826,7 @@
                 :type_out="col.field_outtype"
                 :col="col"
                 :row="row"
-                :label="col.label"
+                :label="col.label ? col.label : t(col.label_trans)"
                 v-model:value="scope.value"
                 :optval="fieldsTable.getKeyByTable(col.jointable)"
                 :optlab="fieldsTable.getLabelByTable(col.jointable)"

src/components/CSignUp/CSignUp.ts

@@ -23,6 +23,7 @@ import { complexity, complexityUser, registereduser, aportadorexist } from '../.
 // import 'vue3-tel-input/dist/vue3-tel-input.css'
 import { useRoute, useRouter } from 'vue-router'
 import { static_data } from '@/db/static_data'
+import { useGlobalStore } from '@store/globalStore'
 
 // import {Loading, QSpinnerFacebook, QSpinnerGears} from 'quasar'
 
@@ -68,6 +69,9 @@ export default defineComponent({
     const duplicate_email = ref(false)
     const duplicate_username = ref(false)
 
+
+    const globalStore = useGlobalStore()
+
     const signup = reactive(<ISignupOptions>{
       email: process.env.TEST_EMAIL || '',
       username: process.env.TEST_USERNAME || '',
@@ -137,7 +141,7 @@ export default defineComponent({
 
     function allowSubmit() {
 
-      let error = v$.value.$error || v$.value.$invalid
+      let error = v$.value.$error || v$.value.$invalid || globalStore.serverError
 
       if (props.showadultcheck)
         error = error || !iamadult.value

src/components/CUserNonVerif/CUserNonVerif.ts

@@ -8,10 +8,15 @@ import { useI18n } from '../../boot/i18n'
 import { CTitleBanner } from '@/components/CTitleBanner'
 import { tools } from '@store/Modules/tools'
 
+import { CVerifyEmail } from '@src/components/CVerifyEmail'
+import { CVerifyTelegram } from '@src/components/CVerifyTelegram'
+import MixinUsers from '@/mixins/mixin-users'
+
+
 export default defineComponent({
   name: 'CUserNonVerif',
   components: {
-    CTitleBanner
+    CTitleBanner, CVerifyTelegram, CVerifyEmail,
   },
   props: {
   },
@@ -22,9 +27,13 @@ export default defineComponent({
     const globalStore = useGlobalStore()
     const { t } = useI18n();
 
+    const { isEmailVerified, TelegVerificato } = MixinUsers()
+
     return {
       userStore,
       tools,
+      isEmailVerified,
+      TelegVerificato
     }
   },
 })

src/components/CUserNonVerif/CUserNonVerif.vue

@@ -1,5 +1,12 @@
 <template>
   <div class="q-ma-md">
+    <CVerifyTelegram v-if="!TelegVerificato()">
+
+    </CVerifyTelegram>
+
+    <CVerifyEmail v-if="!isEmailVerified() && !TelegVerificato()">
+
+    </CVerifyEmail>
     <div v-if="tools.isTelegOk()">
       <q-banner inline-actions rounded class="bg-orange text-black">
         <template v-slot:avatar>

src/components/CVerifyTelegram/CVerifyTelegram.vue

@@ -23,8 +23,8 @@
       </div>
       <strong>{{ $t('components.authentication.telegram.ifclose', {botname: getBotNameTelegram() })}}</strong>
       <div class="q-my-sm">
-        <q-img src="statics/images/ayni_bot.jpg" class="" :alt="$t('ws.sitename')" style="height: 100px; width: 250px;">
+        <!--<q-img src="images/ayni_bot.jpg" class="" :alt="$t('ws.sitename')" style="height: 100px; width: 250px;">
-        </q-img>
+        </q-img>-->
       </div>
     </div>
 

src/components/index.ts

@@ -42,6 +42,7 @@ export * from './CMyFriends'
 export * from './CMyGroups'
 export * from './CDashboard'
 export * from './CMainView'
+export * from './CLabel'
 export * from './CBigBtn'
 export * from './CMyRecCard'
 // export * from './CPreloadImages'

src/db/static_data.ts

@@ -655,8 +655,8 @@ const baseroutes: IListRoutes[] = [
     name: 'pages.calendarioeventi',
     component: () => import('@/root/calendarioeventi/calendarioeventi.vue'),
     extraclass: 'isCalendar',
-    inmenu: true,
+    inmenu: false,
-    infooter: true
+    infooter: false
   },
   {
     active: true,

src/root/mainview/mainview.ts

@@ -10,8 +10,6 @@ import { CChartMap } from '@src/components/CChartMap'
 import { CUserNonVerif } from '@/components/CUserNonVerif'
 import { CCopyBtn } from '@/components/CCopyBtn'
 import { CMapsEsempio } from '@src/components/CMapsEsempio'
-import { CVerifyEmail } from '@src/components/CVerifyEmail'
-import { CVerifyTelegram } from '@src/components/CVerifyTelegram'
 import { useGlobalStore } from '@store/globalStore'
 import { useUserStore } from '@store/UserStore'
 import { static_data } from '@/db/static_data'
@@ -21,19 +19,14 @@ import MixinUsers from '@/mixins/mixin-users'
 
 export default defineComponent({
   name: 'mainview',
-  components: { CSkill, CChartMap, CMapsEsempio, CVerifyEmail, CVerifyTelegram, CDashboard, CUserNonVerif, CMainView, CCopyBtn },
+  components: { CSkill, CChartMap, CMapsEsempio, CDashboard, CUserNonVerif, CMainView, CCopyBtn },
   setup() {
     const globalStore = useGlobalStore()
     const userStore = useUserStore()
     const { getValDb } = MixinBase()
-    const { isEmailVerified, TelegVerificato } = MixinUsers()
 
     const { getRefLink } = MixinUsers()
 
-    function TelegCode() {
-      return userStore.my.profile.teleg_checkcode
-    }
-
     function openrighttoolbar() {
       globalStore.rightDrawerOpen = true
     }
@@ -56,9 +49,6 @@ export default defineComponent({
     return {
       tools,
       static_data,
-      isEmailVerified,
-      TelegCode,
-      TelegVerificato,
       isLogged,
       openrighttoolbar,
       isUserOk,

src/root/mainview/mainview.vue

@@ -13,16 +13,10 @@
 
 
     <div v-if="isLogged()">
-      <CVerifyTelegram v-if="!TelegVerificato()">
+      <div v-if="!isUserOk()">
-
+        <CUserNonVerif></CUserNonVerif>
-      </CVerifyTelegram>
+      </div>
-
+      <div v-else>
-      <CVerifyEmail v-if="!isEmailVerified() && !TelegVerificato()">
-
-      </CVerifyEmail>
-
-      <div v-if="isUserOk()">
-
         <CMainView></CMainView>
 
         <CDashboard></CDashboard>
@@ -34,9 +28,6 @@
         <div>Versione: {{tools.getvers()}}</div>
 
       </div>
-      <div v-else>
-        <CUserNonVerif></CUserNonVerif>
-      </div>
 
     </div>
     <div v-else>

src/store/Modules/fieldsTable.ts

@@ -621,6 +621,7 @@ export const colmyGoods = [
     remote_table: 'mycities',
     remote_key: '_id',
     remote_field: 'comune',
+    required: true,
   }),
   AddCol({
     name: 'adType',

src/views/user/myprofile/myprofile.ts

@@ -2,6 +2,7 @@ import { CMyFieldDb } from '@/components/CMyFieldDb'
 import { CMyFieldRec } from '@/components/CMyFieldRec'
 import { CTitleBanner } from '@/components/CTitleBanner'
 import { CProfile } from '@/components/CProfile'
+import { CLabel } from '@/components/CLabel'
 import { CCopyBtn } from '@/components/CCopyBtn'
 import { CSkill } from '@/components/CSkill'
 import { CDateTime } from '@/components/CDateTime'
@@ -24,7 +25,7 @@ import MixinUsers from '@/mixins/mixin-users'
 
 export default defineComponent({
   name: 'myprofile',
-  components: { CProfile, CTitleBanner, CMyFieldDb, CSkill, CDateTime, CCopyBtn, CUserNonVerif, CMyFieldRec },
+  components: { CProfile, CTitleBanner, CMyFieldDb, CSkill, CDateTime, CCopyBtn, CUserNonVerif, CMyFieldRec, CLabel },
   props: {},
   setup() {
     const userStore = useUserStore()

src/views/user/myprofile/myprofile.vue

@@ -99,7 +99,7 @@
           to="/editprofile">
         </q-btn>
 
-        <div v-if="myuser._id" class="myrow justify-evenly items-center q-pa-sm q-ma-sm">
+        <div class="myrow justify-evenly items-center q-pa-sm q-ma-sm">
 
           <div class="col-md-6 col-sm-6 q-ma-xs col-xs-12">
             <q-btn
@@ -112,7 +112,7 @@
             </q-btn>
 
           </div>
-          <div class="col-md-6 col-sm-6 q-ma-xs col-xs-12">
+          <div v-if="myuser._id" class="col-md-6 col-sm-6 q-ma-xs col-xs-12">
             <q-btn
               v-if="getLinkWebSite()" icon="fas fa-globe"
               color="blue" type="a"
@@ -176,13 +176,33 @@
 
           <div v-if="myuser.profile" class="fit column no-wrap justify-evenly content-start">
 
-            <div class="col-6 text-h6">
+            <div class="col-md-6 col-sm-6 q-ma-xs col-xs-12">
+
               <CDateTime
                 v-if="checkifShow('profile.dateofbirth') && !!myuser.profile.dateofbirth"
                 v-model:value="myuser.profile.dateofbirth"
                 :label="$t('reg.dateofbirth')"
                 :canEdit="false">
               </CDateTime>
+              <CLabel
+                v-bind="$attrs"
+                :value="myuser.profile.intcode_cell + myuser.profile.cell"
+                label="Cellulare"
+              />
+
+              <!--
+              <CMyFieldRec
+                table="users"
+                :id="myuser._id"
+                :rec="myuser"
+                field="profile.cell"
+                class="cursor-pointer"
+                :canEdit="false"
+                :disable="true"
+                :canModify="false">
+              </CMyFieldRec>
+              -->
+
 
             </div>