Updated riso.app with Site Configuration Parameter

2022-11-29 00:16:25 +01:00
parent 58dc1dfdcc
commit 9d32f92589
107 changed files with 738 additions and 1851 deletions
--- a/src/App.ts
+++ b/src/App.ts
@@ -36,7 +36,7 @@ export default {
    const site = computed(() => globalStore.site)

    watch(() => finishLoading.value, (newval: boolean, oldval: boolean) => {
-      console.log('watch finished', newval)
+      // console.log('watch finished', newval)
      if (newval) {
        tools.updateFonts()

--- a/src/components/CCopyBtn/CCopyBtn.vue
+++ b/src/components/CCopyBtn/CCopyBtn.vue
@@ -1,6 +1,6 @@
 <template>
  <div class="q-ma-sm">
-    <div class="bg-white column cursor-pointer" @click="copytoclip">
+    <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"/>
--- a/src/components/CEventsCalendar/CEventsCalendar.scss
+++ b/src/components/CEventsCalendar/CEventsCalendar.scss
@@ -22,7 +22,6 @@ $graytext: #555;
 }

 .flex-container {
-  background-color: #ccc;
  padding: 10px;
  display: flex;
  flex-direction: row;
@@ -33,12 +32,12 @@ $graytext: #555;
  background-color: #9f9f9f;
  padding: 10px;
  margin: 10px;
-  color: #fff;
+  // color: #fff;
  font-size: 1rem;
 }

 .cal {
-  color: black;
+  // color: black;
  font-size: 0.75rem;
  font-weight: 400;
  line-height: 1.25rem;
@@ -118,14 +117,12 @@ $graytext: #555;
 }

 .listaev {
-  color: black;
  font-size: 0.75rem;
  font-weight: 400;
  line-height: 1.25rem;
  letter-spacing: 0.03333em;

  &__date {
-    color: #061220;
    font-size: 1rem;
  }

@@ -139,6 +136,10 @@ $graytext: #555;
    color: black;
  }

+  &__details_darktheme {
+    color: white;
+  }
+
  &__tdimg {
    width: 150px;
    height: 150px;
@@ -164,7 +165,7 @@ $graytext: #555;
  }

  &__table tr:hover {
-    background-color: #deecef;
+    // background-color: #deecef;
  }

  &__align_center_mobile {
@@ -287,7 +288,7 @@ $graytext: #555;
 }

 .mysel {
-  color: white;
+  color: skyblue;
 }

 .myflex {
--- a/src/components/CEventsCalendar/CEventsCalendar.ts
+++ b/src/components/CEventsCalendar/CEventsCalendar.ts
@@ -1021,6 +1021,7 @@ export default defineComponent({
      editEvent,
      EState,
      CancelBookingEvent,
+      site: globalStore.site,
    }
  }
 })
--- a/src/components/CEventsCalendar/CEventsCalendar.vue
+++ b/src/components/CEventsCalendar/CEventsCalendar.vue
@@ -62,7 +62,7 @@
                class="shadow-5 q-mb-md" dense>
                {{ myevent.title }}
              </q-chip>
-              <div class="cal__details" v-html="myevent.details"></div>
+              <div :class="`cal__details`+ ($q.dark.isActive ? `_darktheme`: ``)" v-html="myevent.details"></div>
              <div v-if="myevent.teacher" class="cal__teacher">
                            <span class="cal__teacher-title">{{ $t('cal.teacher') }}: <span
                              class="margin_with"></span></span>
@@ -820,7 +820,7 @@

                  <div style="margin: 10px;"></div>

-                  <p class="listaev__details" v-html="event.details"></p>
+                  <p :class="`listaev__details` + $q.dark.isActive ? `_darktheme`: ``" v-html="event.details"></p>
                  <div v-if="event.teacher" class="">
                                    <span class="cal__teacher-title">{{ $t('cal.teacher') }}: <span
                                      class="margin_with"></span></span>
--- a/src/components/CGallery/CGallery.vue
+++ b/src/components/CGallery/CGallery.vue
@@ -145,13 +145,13 @@
        <q-space/>

        <q-btn dense flat icon="minimize" @click="maximizedToggle = false" :disable="!maximizedToggle">
-          <q-tooltip v-if="maximizedToggle" class="bg-white text-primary">Minimize</q-tooltip>
+          <q-tooltip v-if="maximizedToggle" :class="($q.dark.isActive ? `bg-black` : `bg-white`) + ` text-primary`">Minimize</q-tooltip>
        </q-btn>
        <q-btn dense flat icon="crop_square" @click="maximizedToggle = true" :disable="maximizedToggle">
-          <q-tooltip v-if="!maximizedToggle" class="bg-white text-primary">Maximize</q-tooltip>
+          <q-tooltip v-if="!maximizedToggle" :class="($q.dark.isActive ? `bg-black` : `bg-white`) + ` text-primary`">Maximize</q-tooltip>
        </q-btn>
        <q-btn dense flat icon="close" v-close-popup>
-          <q-tooltip class="bg-white text-primary">Close</q-tooltip>
+          <q-tooltip :class="($q.dark.isActive ? `bg-black` : `bg-white`) + ` text-primary`">Close</q-tooltip>
        </q-btn>
      </q-bar>

--- a/src/components/CGridTableRec/CGridTableRec.ts
+++ b/src/components/CGridTableRec/CGridTableRec.ts
@@ -520,7 +520,7 @@ export default defineComponent({
        }
      }

-      console.log('sortBy', sortBy)
+      // console.log('sortBy', sortBy)

      const filtersearch: any[] = []
      const filtersearch2: any[] = []
@@ -563,7 +563,7 @@ export default defineComponent({
      if (searchList.value) {
        recSkill = searchList.value.find((item: ISearchList) => item.table === toolsext.TABSKILLS)
        idSkill = recSkill ? recSkill.value : 0
-        console.log('recSkill', idSkill)
+        // console.log('recSkill', idSkill)
      }


@@ -993,7 +993,7 @@ export default defineComponent({
      if (startsearch.value)
        return false

-      console.log('REFRESH!')
+      // console.log('REFRESH!')

      startsearch.value = true

@@ -1065,9 +1065,7 @@ export default defineComponent({
    }

    function tableClass() {
-      if (dark) {
-        return 'bg-black'
-      }
+      return ($q.dark.isActive ? 'bg-black' : 'bg-white')
    }

    function selItem(item: any, col: IColGridTable, inmodif?: boolean) {
@@ -1476,7 +1474,7 @@ export default defineComponent({
    }

    function changeTable(mysel: any) {
-      console.log('changeTable', tablesel.value)
+      // console.log('changeTable', tablesel.value)
      changetable.value = true
      if (tablesel.value === undefined || tablesel.value === '')
        return
@@ -1576,12 +1574,12 @@ export default defineComponent({
        }
      }

-      console.log('REFRR - changetable')
+      // console.log('REFRR - changetable')
      refresh()
    }

    function doSearch() {
-      console.log('REFRR - doSearch')
+      //  console.log('REFRR - doSearch')
      refresh()
    }

@@ -1916,7 +1914,7 @@ export default defineComponent({

    function onLoadScroll (index: number, done: any) {
      if (index > 1) {
-        console.log('onLoadScroll', index, 'RECLOAD', numRecLoaded.value, 'ROWS: ', pagination.value.rowsNumber)
+        // console.log('onLoadScroll', index, 'RECLOAD', numRecLoaded.value, 'ROWS: ', pagination.value.rowsNumber)
        if (numRecLoaded.value < pagination.value.rowsNumber || (pagination.value.rowsNumber <= 0 && clickbuttsearch.value)) {
          if (pagination.value.rowsNumber === 0) {
            pagination.value.page = 0
--- a/src/components/CGridTableRec/CGridTableRec.vue
+++ b/src/components/CGridTableRec/CGridTableRec.vue
@@ -782,7 +782,7 @@
        <div v-if="showColCheck(mycol, tools.TIPOVIS_SHOW_RECORD, false)">
          <div class="row items-center justify-center q-gutter-md q-ma-xs">
            <div class="q-ma-xs">
-              <q-field rounded outlined :bg-color="$q.dark.isActive ? '' : 'orange-3'" dense>
+              <q-field rounded outlined :bg-color="($q.dark.isActive ? '' : 'orange-3')" dense>
                <template v-slot:control>
                  <div class="self-center full-width no-outline" tabindex="0">{{ mycol.label }}</div>
                </template>
--- a/src/components/CImgText/CImgText.vue
+++ b/src/components/CImgText/CImgText.vue
@@ -1,6 +1,6 @@
 <template>
  <div>
-    <section class="padding_testo bg-white text-grey-10 text-justify">  <!-- v-scroll-reveal.reset -->
+    <section :class="`padding_testo ` + ($q.dark.isActive ? `bg-black`: `bg-white`) + ` text-grey-10 text-justify`">  <!-- v-scroll-reveal.reset -->
      <div :class="myclass">
        <div :class="clrowcol + ` q-px-xs`">
          <q-img v-if="src" :src="src" class="" :style="style1" :alt="alt1"></q-img>
--- a/src/components/CKeyAndValue/CKeyAndValue.vue
+++ b/src/components/CKeyAndValue/CKeyAndValue.vue
@@ -3,7 +3,7 @@
    <div class="row items-center justify-center q-gutter-md q-ma-xs">

      <div class="q-ma-xs">
-        <q-field rounded outlined :bg-color="$q.dark.isActive ? '' : 'blue-4'" dense style="min-width:110px;">
+        <q-field rounded outlined :bg-color="($q.dark.isActive ? '' : 'blue-4')" dense style="min-width:110px;">
          <template v-slot:control>
            <div class="centermydiv">
              <div class="self-center full-width no-outline text-center" tabindex="0">{{ mykey }}</div>
--- a/src/components/CMyCardCircuitPopup/CMyCardCircuitPopup.vue
+++ b/src/components/CMyCardCircuitPopup/CMyCardCircuitPopup.vue
@@ -5,7 +5,7 @@

  <q-card class="dialog_card q-mb-lg" v-if="myrec">
    <q-footer
-      class="bg-white small-screen-only text-center"
+      :class="($q.dark.isActive ? `bg-black` : `bg-white`) + ` small-screen-only text-center`"
      bordered
    >
      <q-btn push rounded color="primary" icon="close" label="Chiudi" v-close-popup></q-btn>
--- a/src/components/CMyCardPopup/CMyCardPopup.vue
+++ b/src/components/CMyCardPopup/CMyCardPopup.vue
@@ -4,7 +4,7 @@

    <q-footer
      v-if="!nopopup"
-      class="bg-white small-screen-only text-center"
+      :class="($q.dark.isActive ? `bg-black` : `bg-white`) + ` small-screen-only text-center`"
      bordered
    >
      <q-btn push rounded color="primary" icon="close" label="Chiudi" v-close-popup></q-btn>
--- a/src/components/CMyCircuits/CMyCircuits.ts
+++ b/src/components/CMyCircuits/CMyCircuits.ts
@@ -58,7 +58,7 @@ export default defineComponent({
    const filtroutente = ref(<any[]>[])

    const listcircuitsfiltered = computed(() => {
-      console.log('list modif')
+      // console.log('list modif')
      return updateListCircuit()
    })

--- a/src/components/CMyElem/CMyElem.vue
+++ b/src/components/CMyElem/CMyElem.vue
@@ -287,7 +287,7 @@
        </div>
      </div>
      <div v-else-if="myel.type === shared_consts.ELEMTYPE.CAROUSEL_IMGS">
-        <section class="padding_gallery bg-white text-grey-10 text-center">
+        <section :class="($q.dark.isActive ? `bg-black text-white` : `bg-white text-grey-10`) + ` padding_gallery text-center`">
          <div
            :class="myel.class + (editOn ? ` clEdit` : ``) + getClass()"
            @click="clickOnElem"
--- a/src/components/CMyFieldDb/CMyFieldDb.vue
+++ b/src/components/CMyFieldDb/CMyFieldDb.vue
@@ -3,7 +3,7 @@
    <div class="row items-center justify-center q-gutter-md q-ma-xs">

      <div v-if="title" class="q-ma-xs">
-        <q-field rounded outlined :bg-color="$q.dark.isActive ? '' : 'blue-4'" dense style="min-width:110px;">
+        <q-field rounded outlined :bg-color="($q.dark.isActive ? '' : 'blue-4')" dense style="min-width:110px;">
          <template v-slot:control>
            <div class="centermydiv">
              <div v-if="myimg" class="text-center">
--- a/src/components/CMyFieldRec/CMyFieldRec.ts
+++ b/src/components/CMyFieldRec/CMyFieldRec.ts
@@ -171,7 +171,7 @@ export default defineComponent({
        if (arrk.length > 2)
          mysubsubkey.value = arrk[2]
      }
-      console.log('### table', props.table, 'col.value', col.value, 'field', props.field, 'mykey', mykey.value)
+      // console.log('### table', props.table, 'col.value', col.value, 'field', props.field, 'mykey', mykey.value)

    }

--- a/src/components/CMyFieldRec/CMyFieldRec.vue
+++ b/src/components/CMyFieldRec/CMyFieldRec.vue
@@ -1,7 +1,7 @@
 <template>
  <div v-if="visuElem()" :class="mytitle ? `row items-center justify-center q-ma-xs text-center` : ``">
    <div v-if="mytitle" class="q-ma-xs">
-      <q-field rounded outlined :bg-color="$q.dark.isActive ? '' : 'blue-4'" dense style="min-width:110px;">
+      <q-field rounded outlined :bg-color="($q.dark.isActive ? '' : 'blue-4')" dense style="min-width:110px;">
        <template v-slot:control>
          <div class="centermydiv">
            <div v-if="myimg" class="text-center">
--- a/src/components/CMyPopupEdit/CMyPopupEdit.ts
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.ts
@@ -203,8 +203,10 @@ export default defineComponent({
      default: '',
    },
  },
-  components: { CMyChipList, CDateTime, CDate, CMyToggleList, CMySelect, CMyEditor, CGallery,
-    CCurrencyValue, CLabel, CAccomodation, CSelectImage },
+  components: {
+    CMyChipList, CDateTime, CDate, CMyToggleList, CMySelect, CMyEditor, CGallery,
+    CCurrencyValue, CLabel, CAccomodation, CSelectImage
+  },
  setup(props, { emit }) {
    const $q = useQuasar()
    const { t } = useI18n()
@@ -244,10 +246,10 @@ export default defineComponent({

    const myrow = ref(<any>null)

-/*     const myrow = computed(() => {
-      return props.rec && props.isrec ? props.rec : props.row
-    })
- */
+    /*     const myrow = computed(() => {
+          return props.rec && props.isrec ? props.rec : props.row
+        })
+     */
    function crea() {
      // console.log('crea', isFieldDb(), 'props.mycol', props.mycol)

@@ -398,7 +400,7 @@ export default defineComponent({

    function mounted() {

-      myrow.value = props.rec && props.isrec ? {...props.rec} : {...props.row}
+      myrow.value = props.rec && props.isrec ? { ...props.rec } : { ...props.row }

      try {

@@ -496,6 +498,20 @@ export default defineComponent({

      console.log('SaveValueInt', newVal, valinitial)

+      if (props.tablesel) {
+        if (true) {
+
+          let mystrcol = '_id'
+          const mycol = fieldsTable.getColByTable(props.tablesel, mystrcol);
+
+          if (mycol) {
+            if (newVal)
+              newVal = newVal[mystrcol]
+          }
+        }
+      }
+
+
      if (isFieldDb()) {
        savefield(newVal, valinitial, $q)
      } else {
@@ -515,11 +531,12 @@ export default defineComponent({

          }
        }
-
      }
+
      emit('save', newVal, valinitial)
    }

+
    function savefield(value: any, initialval: any, myq: any) {
      if (!props.insertMode) {
        myvalue.value = value
@@ -694,7 +711,7 @@ export default defineComponent({
      }
    }

-    function selectcountry({ name, iso2, dialCode }: {name: string, iso2: string, dialCode: string}) {
+    function selectcountry({ name, iso2, dialCode }: { name: string, iso2: string, dialCode: string }) {
      // console.log(name, iso2, dialCode)
      myvalueprec.value = myvalue.value
      myvalue.value = iso2
--- a/src/components/CMyRecCard/CMyRecCard.vue
+++ b/src/components/CMyRecCard/CMyRecCard.vue
@@ -2,7 +2,8 @@
 <template>
  <div class="q-py-xs centermydiv cardrec"
       :style="`max-width: `+ (tools.getwidth($q) - 20) +`px; ` + ($q.screen.lt.sm ? (`min-width: `+ (tools.getwidth($q) - 20) +`px;`) : ``)">
-    <q-item v-if="myrec" clickable v-ripple class="shadow-2 q-btn--rounded bg-teal-1">
+    <q-item v-if="myrec" clickable v-ripple :class="`shadow-2 q-btn--rounded ` + ($q.dark.isActive ? `bg-black`: `bg-teal-1`)">
+


      <q-item-section v-if="(shared_consts.TABLES_VISU_IMG.includes(table)) && (myrec.photos && myrec.photos.length > 0)" avatar
--- a/src/components/CMyRecCircuitCard/CMyRecCircuitCard.vue
+++ b/src/components/CMyRecCircuitCard/CMyRecCircuitCard.vue
@@ -2,7 +2,7 @@
  <div class="q-py-xs centermydiv cardrec"
       :style="`max-width: `+ (tools.getwidth($q) - 20) +`px; ` + ($q.screen.lt.sm ? (`min-width: `+ (tools.getwidth($q) - 20) +`px;`) : ``)">

-    <q-item v-if="circuit" clickable v-ripple class="shadow-2 q-btn--rounded bg-teal-1">
+    <q-item v-if="circuit" clickable v-ripple :class="`shadow-2 q-btn--rounded ` + ($q.dark.isActive ? `bg-black`: `bg-teal-1`)">

      <q-item-section v-if="circuit.photos" avatar
                      @click="cmdExt(costanti.CMD_OPEN_PAGE, circuit)">
--- a/src/components/CMyRecGrpCard/CMyRecGrpCard.vue
+++ b/src/components/CMyRecGrpCard/CMyRecGrpCard.vue
@@ -2,7 +2,7 @@
  <div class="q-py-xs centermydiv cardrec"
       :style="`max-width: `+ (tools.getwidth($q) - 20) +`px; ` + ($q.screen.lt.sm ? (`min-width: `+ (tools.getwidth($q) - 20) +`px;`) : ``)">

-    <q-item v-if="myrec" clickable v-ripple class="shadow-2 q-btn--rounded bg-teal-1">
+    <q-item v-if="myrec" clickable v-ripple :class="`shadow-2 q-btn--rounded `+ ($q.dark.isActive ? `bg-black`: `bg-teal-1`)">

      <q-item-section v-if="(shared_consts.TABLES_VISU_IMG.includes(table)) && (myrec.photos && myrec.photos.length > 0)" avatar
                      @click="cmdExt(costanti.CMD_OPEN_PAGE, myrec)">
--- a/src/components/CMySingleEvent/CMySingleEvent.scss
+++ b/src/components/CMySingleEvent/CMySingleEvent.scss
@@ -22,6 +22,10 @@ $graytext: #555;
    color: black;
  }

+  &__details_darktheme {
+    color: white;
+  }
+
  &__tdimg {
    width: 150px;
    height: 150px;
@@ -107,6 +111,10 @@ $graytext: #555;
    color: black;
  }

+  &__details_darktheme {
+    color: white;
+  }
+
  &__hours {
    color: blue;
    &-title {
--- a/src/components/CMySingleEvent/CMySingleEvent.vue
+++ b/src/components/CMySingleEvent/CMySingleEvent.vue
@@ -92,9 +92,8 @@

          <div style="margin: 10px;"></div>

-          <p v-if="myevent.bodytext" class="listaev__details text-left q-mb-md" v-html="myevent.bodytext"></p>
-          <p v-else class="listaev__details" v-html="myevent.details"></p>
-
+          <p v-if="myevent.bodytext" :class="`listaev__details`+ ($q.dark.isActive ? '_darktheme' : ``) + ` text-left q-mb-md`" v-html="myevent.bodytext"></p>
+          <p v-else :class="`listaev__details`+ ($q.dark.isActive ? '_darktheme' : ``)" v-html="myevent.details"></p>

          <div v-for="(mypage, index) in myevent.pagefooter" :key="index">
            <CMyPage v-if="!!mypage" :mypath="`/`+ mypage">
--- a/src/components/CPresentazione/CPresentazione.ts
+++ b/src/components/CPresentazione/CPresentazione.ts
@@ -25,6 +25,8 @@ export default defineComponent({
    const slide = ref('first')
    const animare = ref(0)

+    const globalStore = useGlobalStore()
+
    function initprompt() {
      window.addEventListener('beforeinstallprompt', (event) => {
        // console.log('********************************   beforeinstallprompt fired')
@@ -127,6 +129,7 @@ export default defineComponent({
      tools,
      static_data,
      animare,
+      site: globalStore.site,
    }
  },
 })
--- a/src/components/CPresentazione/CPresentazione.vue
+++ b/src/components/CPresentazione/CPresentazione.vue
@@ -1,5 +1,5 @@
 <template>
-  <q-page class="text-blue-6">
+  <q-page :class="`text-white`">

    <div class="landing">
      <section>
@@ -24,16 +24,16 @@
                </div>
                <div class="flex justify-end">
                  <div class="q-gutter-xs testo-banda clgutter">
-                    <div class="text-h1"><span class="shadow-3 bg-white">{{ t('msg.myAppName') }}</span></div>
+                    <div class="text-h1"><span :class="`shadow-3 `+ $q.dark.isActive ? `bg-black` : `bg-white`">{{ t('msg.myAppName') }}</span></div>
                    <div class="text-subtitle1 text-italic q-pl-sm">
-                      <span class="shadow-3 bg-white">{{ t('msg.sottoTitoloApp') }}</span>
+                      <span :class="`shadow-3 `+ $q.dark.isActive ? `bg-black` : `bg-white`">{{ t('msg.sottoTitoloApp') }}</span>
                    </div>
                    <div class="text-subtitle1 big text-italic q-pl-sm background-white"><strong>
-                      <span class="shadow-3 bg-white">{{t('msg.sottoTitoloApp2')}}</span>
+                      <span :class="`shadow-3 `+ $q.dark.isActive ? `bg-black` : `bg-white`">{{t('msg.sottoTitoloApp2')}}</span>
                      </strong>
                    </div>
                    <div class="text-subtitle2 text-italic q-pl-sm">
-                      <span class="shadow-3 bg-white">{{ t('msg.sottoTitoloApp3') }}</span>
+                      <span :class="`shadow-3 `+ $q.dark.isActive ? `bg-black` : `bg-white`">{{ t('msg.sottoTitoloApp3') }}</span>
                    </div>

                    <div>
@@ -99,16 +99,13 @@
                </div>
                <div class="flex justify-end">
                  <div class="q-gutter-xs testo-banda clgutter">
-                    <div class="text-h1 shadow-max">{{ t('msg.myAppName') }}</div>
+                    <div class="text-h1 shadow-max"></div>
                    <div class="text-subtitle1 shadow text-italic q-pl-sm">
-                      <span class="shadow-3 bg-white">{{ t('msg.sottoTitoloApp') }}</span>
+
                    </div>
-                    <div class="text-subtitle1 shadow-max big text-italic q-pl-sm"><strong>
-                      <span class="shadow-3 bg-white">{{t('msg.sottoTitoloApp2')}}</span>
-                      </strong>
+                    <div class="text-subtitle1 shadow-max big text-italic q-pl-sm">
                    </div>
                    <div class="text-subtitle2 shadow text-italic q-pl-sm">
-                      <span class="shadow-3 bg-white">{{ t('msg.sottoTitoloApp3') }}</span>
                    </div>

                    <div>
@@ -174,16 +171,13 @@
                </div>
                <div class="flex justify-end">
                  <div class="q-gutter-xs testo-banda clgutter">
-                    <div class="text-h1 shadow-max">{{ t('msg.myAppName') }}</div>
+                    <div class="text-h1 shadow-max"></div>
                    <div class="text-subtitle1 shadow text-italic q-pl-sm">
-                      {{ t('msg.sottoTitoloApp') }}
                    </div>
                    <div class="text-subtitle1 shadow-max big text-italic q-pl-sm"><strong>{{
-                        t('msg.sottoTitoloApp2')
                      }}</strong>
                    </div>
                    <div class="text-subtitle2 shadow text-italic q-pl-sm">
-                      {{ t('msg.sottoTitoloApp3') }}
                    </div>

                    <div>
@@ -244,7 +238,7 @@
        </div>
      </section>

-      <section class="padding bg-white text-grey-10 text-center">
+      <section :class="`padding `+ ($q.dark.isActive ? `text-white bg-black ` : `text-grey-10 bg-white`) + ` text-center`">
        <div class="landing__features row items-start q-col-gutter-sm">
          <div class="col-12 text-center">
            <div class="feature-item q-mx-md">
--- a/src/components/CSelectImage/CSelectImage.vue
+++ b/src/components/CSelectImage/CSelectImage.vue
@@ -144,13 +144,13 @@
        <q-space/>

        <q-btn dense flat icon="minimize" @click="maximizedToggle = false" :disable="!maximizedToggle">
-          <q-tooltip v-if="maximizedToggle" class="bg-white text-primary">Minimize</q-tooltip>
+          <q-tooltip v-if="maximizedToggle" :class="($q.dark.isActive ? `bg-black` : `bg-white`) + ` text-primary`">Minimize</q-tooltip>
        </q-btn>
        <q-btn dense flat icon="crop_square" @click="maximizedToggle = true" :disable="maximizedToggle">
-          <q-tooltip v-if="!maximizedToggle" class="bg-white text-primary">Maximize</q-tooltip>
+          <q-tooltip v-if="!maximizedToggle" :class="($q.dark.isActive ? `bg-black` : `bg-white`) + ` text-primary`">Maximize</q-tooltip>
        </q-btn>
        <q-btn dense flat icon="close" v-close-popup>
-          <q-tooltip class="bg-white text-primary">Close</q-tooltip>
+          <q-tooltip :class="($q.dark.isActive ? `bg-black` : `bg-white`) + ` text-primary`">Close</q-tooltip>
        </q-btn>
      </q-bar>

--- a/src/components/CSingleCart/CSingleCart.vue
+++ b/src/components/CSingleCart/CSingleCart.vue
@@ -22,7 +22,7 @@
              <div class="self-center no-outline" tabindex="0" >{{ order.quantity }}</div>
            </template>
          </q-field>-->
-          <div class="q-mx-sm text-blue-14">{{ order.quantity }}</div>
+          <div :class="`q-mx-sm text-blue-14`">{{ order.quantity }}</div>
          <q-btn
            v-if="showall && !nomodif" round size="xs" text-color="grey" icon="fas fa-plus"
            @click="addsubqty(true, false)"></q-btn>
--- a/src/components/MyFooter/MyFooter.vue
+++ b/src/components/MyFooter/MyFooter.vue
@@ -1,15 +1,15 @@
 <template>
  <q-footer
-    v-if="tools.isUserOk() && site"
-    class="bg-white small-screen-only"
+    v-if="tools.isUserOk() && site && site.confpages"
+    :class="($q.dark.isActive ? `bg-black` : `bg-white`) +  `small-screen-only`"
    bordered
  >
    <q-tabs
      dense
-      class="text-grey-10 mylabfooter mysmalltabs"
+      :class="($q.dark.isActive ? `text-white bg-black` : `text-grey-10 bg-white`) + ` mylabfooter mysmalltabs`"
      style="padding: 0px !important;"
      content-class="mysmalltabs"
-      active-color="primary"
+      :active-color="$q.dark.isActive ? `primary`: `primary`"
      no-caps
      indicator-color="transparent"
    >
--- a/src/components/MyHeader/MyHeader.ts
+++ b/src/components/MyHeader/MyHeader.ts
@@ -281,7 +281,7 @@ export default defineComponent({
    const lang = computed({
      get: () => $q.lang.isoName,
      set: mylang => {
-        console.log('set lang', $q.lang.getLocale(), 'passato', mylang)
+        // console.log('set lang', $q.lang.getLocale(), 'passato', mylang)
        $q.lang.set(snakeToCamel(mylang))
        // tools.showNotif($q, 'IMPOSTA LANG= ' + $i18n.locale)
        // console.log('IMPOSTA LANG= ' + $i18n.locale)
--- a/src/components/MyHeader/MyHeader.vue
+++ b/src/components/MyHeader/MyHeader.vue
@@ -1,6 +1,7 @@
 <template>
  <div>
    <q-header
+      v-if="site"
      reveal
      elevated
      :class="getClassColorHeader"
@@ -67,13 +68,13 @@
                        </div>
        -->

-        <div v-if="site.confpages.show_darkopt" class="text-h7">
+        <div v-if="site.confpages && site.confpages.show_darkopt" class="text-h7">
          <q-toggle :icon="'fas fa-moon'" v-model="dark"> </q-toggle>
        </div>
        <q-btn
          v-if="
            !isonline() &&
-            site.confpages.showConnected
+            site.confpages && site.confpages.showConnected
          "
          flat
          dense
@@ -109,13 +110,13 @@
          </q-list>
        </q-btn-dropdown>

-        <div v-if="site.confpages.showMsgs">
+        <div v-if="site.confpages && site.confpages.showMsgs">
          <message-popover></message-popover>
        </div>
-        <div v-if="site.confpages.showCoins">
+        <div v-if="site.confpages && site.confpages.showCoins">
          <coinsPopover v-model="rightCoinsOpen"></coinsPopover>
        </div>
-        <div v-if="site.confpages.showNotif">
+        <div v-if="site.confpages && site.confpages.showNotif">
          <notifPopover v-model="rightNotifOpen"></notifPopover>
        </div>

@@ -128,7 +129,7 @@

        <q-btn
          class="q-mx-xs"
-          v-if="site.confpages.enableEcommerce && tools.isLogged()"
+          v-if="site.confpages && site.confpages.enableEcommerce && tools.isLogged()"
          round
          dense
          flat
@@ -148,7 +149,7 @@
        <q-btn
          class="q-mx-xs"
          v-if="
-            site.confpages.enableEcommerce &&
+            site.confpages && site.confpages.enableEcommerce &&
            tools.isLogged() &&
            getnumOrdersCart() > 0
          "
@@ -170,7 +171,7 @@

        <q-btn
          class="q-mx-xs"
-          v-if="site.confpages.showUserMenu && !tools.isLogged()"
+          v-if="site.confpages && site.confpages.showUserMenu && !tools.isLogged()"
          dense
          flat
          round
@@ -180,7 +181,7 @@
        </q-btn>
        <q-avatar
          v-else-if="
-            site.confpages.showUserMenu &&
+            site.confpages && site.confpages.showUserMenu &&
            tools.isLogged() &&
            getMyImg()
          "
@@ -226,7 +227,7 @@

    <!-- USER BAR -->
    <q-drawer
-      v-if="site.confpages.enableEcommerce"
+      v-if="site.confpages && site.confpages.enableEcommerce"
      v-model="rightCartOpen"
      side="right"
      elevated
@@ -248,7 +249,7 @@
    </q-drawer>
    <!-- USER BAR -->
    <q-drawer
-      v-if="site.confpages.showUserMenu"
+      v-if="site.confpages && site.confpages.showUserMenu"
      v-model="rightDrawerOpen"
      side="right"
      elevated
@@ -387,7 +388,7 @@
        <div v-show="!tools.isLogged()">
          <div class="q-ma-md" style="">
            <CSigninNoreg
-              :showregbutt="site.confpages.showRegButton"
+              :showregbutt="site.confpages && site.confpages.showRegButton"
            >
            </CSigninNoreg>
          </div>
--- a/src/db/lang/ws_de.js
+++ b/src/db/lang/ws_de.js
@@ -15,6 +15,7 @@ const msg_website_de = {
    SignUp: 'Nuova Registrazione',
    SignUp_alreadylista: 'Registrazione per quelli che erano già nella lista di Notevole (del 2019) !',
    SignUp2: 'Registrazione',
+    SignUp4: 'Reg',
    SignIn: 'Login',
    status: 'Statistiche',
    nextzoom: 'Conferenze',
--- a/src/db/lang/ws_it.js
+++ b/src/db/lang/ws_it.js
@@ -1,9 +1,9 @@
 const msg_website_it = {
  ws: {
-    sitename: 'KolibriLab',
-    siteshortname: 'KolibriLab',
-    description: '',
-    keywords: '',
+    sitename: 'Riso',
+    siteshortname: '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.',
+    keywords: 'riso, piattaforma di scambio, rete italiana scambio orizzontale, riso app, riso piattaforma, scambio e baratto, momenta RIS',
  },
  products: {
    quantity: 'Quantità',
@@ -54,10 +54,9 @@ const msg_website_it = {
    need_Telegram: 'Per poter utilizzare la Piattaforma occorre avere <a href="https://play.google.com/store/apps/details?id=org.telegram.messenger" target="_blank">Telegram</a> installato<br>',
    Registrazione_Con_Bot: '1) Copia questo username cliccandoci sopra:',
    SignUpIscrizione: 'Diventa Socio CNM',
-    SignUpArcadei: 'Aderisci ad Arcadei',
    SignUp_alreadylista: 'Registrazione per quelli che erano già nella lista di Notevole (del 2019) !',
    SignUp2: 'Registrazione',
-    SignUp4: 'Reg',
+    SignUp3: 'Reg',
    SignUpBot: 'Registrati',
    SignIn: 'Login',
    status: 'Statistiche',
@@ -115,10 +114,8 @@ const msg_website_it = {
    hours: 'Ore',
    department: 'Uffici',
    title: 'Titolo',
-    subtitle: 'SottoTitolo',
    path: 'Percorso',
    img1: 'Immagine 1',
-    imgsize: 'ImgSize',
    contentfield: 'Testo 1',
    video1: 'Video 1',
    ratio1: 'Ratio 1',
@@ -145,8 +142,8 @@ const msg_website_it = {
    color: 'Colore',
  },
  msg: {
-    myAppName: 'Arcadei',
-    myAppDescription: 'Modello Comunitario',
+    myAppName: 'Riso',
+    myAppDescription: 'Il primo Vero Social Libero, Equo e Solidale, dove Vive Consapevolezza e Aiuto Comunitario. Gratuito',
    underconstruction: 'App in costruzione...',
    myDescriz: '',
    sottoTitoloApp: 'Il primo Vero Social',
@@ -161,37 +158,32 @@ const msg_website_it = {
      + ' che intere popolazioni antiche conoscevano bene.',
    descrapp_pag2: 'E\' giunta l\'ora di utilizzare i nuovi strumenti <strong>Tecnologici</strong> a nostro <strong>favore</strong>, per <strong>Liberarci</strong> '
      + 'così piano piano dalla <strong>schiavitù</strong> del <strong>"Lavoro per generare Denaro"</strong> e trasformando le nostre <strong>Capacitá</strong> in '
-      + '<strong>Risorse Umane</strong> per poterci sostenere e vivere in <strong>Armonia</strong> con gli altri.',
+      + '<strong>Risorse Umane</strong> per poterci sostenere e vivere in <strong>Armonia</strong> con gli altri.<br>' +
+      '<br><strong>R.I.S.O.</strong><br>' +
+      '<em>Siamo una rete di comunità consapevoli, basata sul sostegno reciproco, la fiducia, la condivisione e l\'ascolto. \n' +
+      'Coltiviamo terreno fertile per creare, in armonia con la natura, un mondo di collettività libere e autosufficienti, attraverso un circuito di scambio di esperienze umane, beni e servizi.<br>' +
+      'Partecipa al cambiamento. RISO sei anche tu!</em>',
    freesocial: {
      title: 'Social',
      descr: 'Una Community organizzata per <strong>Categorie</strong>, dove potrai unirti a <strong>Gruppi Tematici</strong>, '
        + 'Condividere <strong>Esperienze</strong> e unire Competenze per organizzare e sostenere <strong>Progetti Innovativi</strong> per il Popolo.<br><br>'
        + 'Verranno evidenziati sviluppi <strong>Etici</strong> come l\'<strong>Auto-Produzione</strong>, la <strong>Sostenibilitá</strong>, '
        + 'la Buona <strong>Salute Naturale</strong> e il <strong>Rispetto per l\'Ambiente</strong> e per tutti gli <strong>Esseri Viventi</strong> di questo '
-        + '<strong>Pianeta</strong>. Chiunque potrá esprimere il proprio <strong>Consenso o Dissenso</strong> partecipando a <strong>Sondaggi Interattivi</strong>'
-        + ' e realizzare insieme i <strong>Cambiamenti</strong> necessari alla nostra Società.',
+        + '<strong>Pianeta</strong>.',
    },
    freetalent: {
      title: 'Beni e Servizi',
      descr: 'Condividi i tuoi <strong>Talenti</strong> e <strong>Abilità</strong>, '
        + 'Nel Dare e Ricevere, si creeranno così legami di <strong>Amicizia, Solidarietà, Cooperazione e Divertimento</strong><br><br>' +
-        'Favoriamo lo scambio locale di <strong>Beni e Servizi</strong> grazie ad un sistema di baratto organizzato, in cui la comunità stessa si pone come garante.'
+        'Favoriamo lo scambio locale di <strong>Beni e Servizi</strong> dove potrai scegliere cosa chiedere in cambio (Dono, Offerta Libera, Baratto, Monete Alternative, ecc...).'
    },
    coin: {
      title: 'RIS - Credito Alternativo',
-      descr: '<strong>Stiamo lavorando</strong> anche per creare una sorta di "moneta alternativa" per conteggiare gli scambi che avvengono tra di noi, quando il semplice baratto risulta non applicabile.<br>' +
-        'Partendo dalle basi del <strong>Si.Cre.Na.C.C - Sistema di Credito Naturale a Copertura Certa</strong>.<br>' +
-        '<em>Ciascun operatore potrà creare moneta all\'occorrenza, se il saldo del suo conto non sarà sufficiente a coprire la spesa. Potrà quindi mandare il suo conto in "scoperto", accollandosi il conseguente' +
-        ' Debito, accreditando l\'equivalente somma all\'operatore ricevente, il quale la annovera nel suo conto in qualità di Credito. ' +
-        'L\'equilibrio tra il credito dell\'uno ed il debito dell\'altro ha come conseguenza che il debitore dovrà lavorare per rifondere il debito, mentre il ricevente potrà usare il credito come moneta.</em><br>' +
-        'Per maggiori informazioni consultare il libro gratuito <a href="https://sicrenacc.info/" target="_blank">cliccando qui</a>.'
-
-
    },
    freeliving: {
      title: 'Gruppi Territoriali',
-      descr: 'Questo progetto vuole diffondere la creazione di Gruppi Territoriali Provinciali,'
-        + 'per poter favorire progetti condivisi in ambito territoriale e creare così una <strong>Rete di Fiducia</strong> fino al vicinato, come giá viene praticato in piccolo, in numerosi <strong>Ecovillaggi</strong> e Comunità del mondo.',
+      descr: 'Questo progetto vuole diffondere la creazione di Gruppi Territoriali Provinciali, '
+        + 'per poter favorire progetti condivisi in ambito territoriale e creare così una <strong>Rete di Fiducia</strong> fino al <strong>vicinato</strong>, come giá viene praticato in piccolo, in numerosi <strong>Ecovillaggi</strong> e Comunità del mondo.',

    },
    freecollabora: {
@@ -239,9 +231,9 @@ const msg_website_it = {
    },
    multiplatform: {
      title: 'Multi-piattaforma',
-      descr: 'E\' compatibile con Google Chrome, Firefox, Opera, Safari, iPhone, Android e PC. L\'Applicazione s\'installa facilmente, senza passare dallo store. '
+      descr: 'E\' compatibile con Google Chrome, Firefox, Opera, Safari, iPhone, Android e PC. L\'Applicazione s\'installa facilmente, senza dover passare dallo store. '
        + 'basta entrare sul sito <strong>www.riso.app</strong>.<br>'
-        + 'Dopo la registrazione chiederà di aggiungerlo allo schermo (o cliccare sul menu del browser "Installa APP")',
+        + 'Dopo la registrazione chiederà di aggiungerlo alla <strong>Schermata Home</strong> (oppure cliccare sul menu "..." del browser e scegliere "<strong>Installa APP</strong>")',
    },
    free: {
      title: 'Gratuita, Open Source e Niente Pubblicità',
--- a/src/db/static_data.ts
+++ b/src/db/static_data.ts
@@ -4,6 +4,32 @@ import {
  IPreloadImages,
  ISites,
 } from '@model'
+import { func } from '@store/Modules/fieldsTable'
+
+
+// const SHOW_PROJINTHEMENU = false
+//
+// let arrlistafavourite = []
+// let arrlistaprojtutti = []
+// let arrlistaprojmiei = []
+// if (SHOW_PROJINTHEMENU) {
+//   arrlistaprojtutti = Projects.getters.listaprojects(RouteNames.projectsall)
+//   arrlistaprojmiei = Projects.getters.listaprojects(RouteNames.myprojects)
+//   arrlistafavourite = Projects.getters.listaprojects(RouteNames.favouriteprojects)
+// }
+// PROGETTI -> FAVORITI :
+
+// if (arrlistafavourite.length > 0) {
+//   arrMenu.push({
+//     icon: 'favorite_border',
+//     nametranslate: 'pages.' + RouteNames.favouriteprojects,
+//     urlroute: RouteNames.favouriteprojects,
+//     level_parent: 0.0,
+//     level_child: 0.5,
+//     routes2: arrlistafavourite,
+//     idelem: ''
+//   })
+// }

 const firstPage = {
  active: true,
@@ -11,7 +37,7 @@ const firstPage = {
  path: '/',
  materialIcon: 'home',
  name: 'pages.home',
-  component: () => import('@src/root/home/home.vue'),
+  component: () => import('@src/root/mainview/mainview.vue'),
  reqauth: false,
  inmenu: true,
  infooter: true,
@@ -20,7 +46,94 @@ const firstPage = {
 function getDynamicPages(site: ISites): IListRoutes[] {

  const baseroutes: IListRoutes[] = [
-    firstPage,
+    {
+      active: true,
+      order: 5,
+      path: '/',
+      materialIcon: 'home',
+      name: 'pages.home',
+      component: () => import('@src/root/mainview/mainview.vue'),
+      reqauth: false,
+      inmenu: true,
+      infooter: true,
+    },
+    {
+      active: true,
+      order: 12,
+      path: '/goods',
+      materialIcon: 'fas fa-tshirt',
+      name: 'mypages.goods',
+      component: () => import('@/root/goods/goods.vue'),
+      meta: { requiresAuth: true },
+      inmenu: true,
+      infooter: true,
+    },
+    {
+      active: true,
+      order: 15,
+      path: '/services',
+      materialIcon: 'fas fa-house-user',
+      name: 'mypages.services',
+      component: () => import('@/root/services/services.vue'),
+      meta: { requiresAuth: true },
+      inmenu: true,
+      infooter: true,
+    },
+    {
+      active: true,
+      order: 15,
+      path: '/provapao',
+      materialIcon: 'fas fa-house-user',
+      name: 'mypages.provapao',
+      component: () => import('@/root/provapao/provapao.vue'),
+      meta: { requiresAuth: true },
+      inmenu: false,
+      infooter: false,
+    },
+    {
+      active: true,
+      order: 15,
+      path: '/hosps',
+      materialIcon: 'fas fa-bed',
+      name: 'mypages.hosp',
+      component: () => import('@/root/hosp/hosp.vue'),
+      meta: { requiresAuth: true },
+      inmenu: true,
+      infooter: true,
+    },
+    {
+      active: true,
+      order: 20,
+      path: '/events',
+      materialIcon: 'fas fa-bullhorn',
+      name: 'mypages.events',
+      component: () => import('@/root/eventi/eventi.vue'),
+      meta: { requiresAuth: true },
+      inmenu: true,
+      infooter: true,
+    },
+    {
+      active: true,
+      order: 100,
+      path: '/presentazione',
+      materialIcon: 'fas fa-info',
+      name: 'pages.presentazione',
+      component: () => import('@src/root/presentazione/presentazione.vue'),
+      reqauth: false,
+      inmenu: true,
+      infooter: true,
+    },
+    {
+      active: true,
+      order: 120,
+      path: '/myprofile',
+      materialIcon: 'fas fa-user',
+      name: 'pages.profile',
+      component: () => import('@/views/user/myprofile/myprofile.vue'),
+      meta: { requiresAuth: true },
+      inmenu: true,
+      infooter: true,
+    },
    {
      active: true,
      order: 120,
@@ -32,6 +145,39 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      inmenu: false,
      infooter: false,
    },
+    {
+      active: true,
+      order: 130,
+      path: '/friends',
+      materialIcon: 'fas fa-user-friends',
+      name: 'mypages.friends',
+      component: () => import('@/views/user/myfriends/myfriends.vue'),
+      meta: { requiresAuth: true },
+      inmenu: true,
+      infooter: true,
+    },
+    {
+      active: site.confpages && site.confpages.enableGroups,
+      order: 132,
+      path: '/groups',
+      materialIcon: 'fas fa-users',
+      name: 'mypages.groups',
+      component: () => import('@/views/user/mygroups/mygroups.vue'),
+      meta: { requiresAuth: true },
+      inmenu: true,
+      infooter: true,
+    },
+    {
+      active: site.confpages && site.confpages.enableCircuits,
+      order: 133,
+      path: '/circuits',
+      materialIcon: 'fas fa-coins',
+      name: 'mypages.circuits',
+      component: () => import('@/views/user/mycircuits/mycircuits.vue'),
+      meta: { requiresAuth: true },
+      inmenu: true,
+      infooter: true,
+    },
    {
      active: true,
      order: 135,
@@ -43,6 +189,92 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      inmenu: false,
      infooter: false,
    },
+    {
+      active: true,
+      order: 136,
+      path: '/grp/:groupname',
+      materialIcon: 'fas fa-user',
+      name: 'proj.group2',
+      component: () => import('@/views/user/mygroup/mygroup.vue'),
+      meta: { requiresAuth: true, newpage: true },
+      inmenu: false,
+      infooter: false,
+    }, {
+      active: true,
+      order: 137,
+      path: '/circuit/:path',
+      materialIcon: 'fas fa-user',
+      name: 'proj.circuit2',
+      component: () => import('@/views/user/mycircuit/mycircuit.vue'),
+      meta: { requiresAuth: true, newpage: true },
+      inmenu: false,
+      infooter: false,
+    },
+    {
+      active: true,
+      order: 130,
+      path: '/mypage/:idBacheca',
+      materialIcon: 'fas fa-user',
+      name: 'pages.mypage2',
+      component: () => import('@/views/user/mypagebacheca/mypagebacheca.vue'),
+      meta: { requiresAuth: true, newpage: true },
+      inmenu: false,
+      infooter: false,
+    },
+    {
+      active: true,
+      order: 130,
+      path: '/myservice/:idSkill',
+      materialIcon: '',
+      name: 'pages.myservice2',
+      component: () => import('@/views/user/myservice/myservice.vue'),
+      meta: { requiresAuth: true, newpage: true },
+      inmenu: false,
+      infooter: false,
+    },
+    {
+      active: true,
+      order: 135,
+      path: '/myhosps/:idHosp',
+      materialIcon: '',
+      name: 'pages.myhosps2',
+      component: () => import('@/views/user/mypagehosp/mypagehosp.vue'),
+      meta: { requiresAuth: true, newpage: true },
+      inmenu: false,
+      infooter: false,
+    },
+    {
+      active: true,
+      order: 132,
+      path: '/mygood/:idGood',
+      materialIcon: '',
+      name: 'pages.mygood2',
+      component: () => import('@/views/user/mypagegood/mypagegood.vue'),
+      meta: { requiresAuth: true, newpage: true },
+      inmenu: false,
+      infooter: false,
+    },
+    {
+      active: true,
+      order: 150,
+      path: '/fundraising',
+      materialIcon: 'fas fa-hand-holding-heart',
+      name: 'pages.fundraising',
+      component: () => import('@src/root/fundraising/fundraising.vue'),
+      inmenu: true,
+      infooter: true,
+    },
+    {
+      active: true,
+      order: 80,
+      path: '/calendario-eventi',
+      materialIcon: 'event',
+      name: 'ris.calendario_eventi_riso',
+      component: () => import('@/root/calendarioeventi/calendarioeventi.vue'),
+      extraclass: 'isCalendar',
+      inmenu: true,
+      infooter: true
+    },
  ]

  return baseroutes
--- a/src/globalroutines/indexdb.ts
+++ b/src/globalroutines/indexdb.ts
@@ -99,7 +99,7 @@ export default async (cmd: string, table: string, datakey: any = null, id: any =
    if (cmd === 'readall') {
      if (globalStore) {
        globalStore.connData.downloading_indexeddb = 1
-        console.log('getalldata table', table)
+        // console.log('getalldata table', table)
      }
      return await storage.getalldata(table)
    }
--- a/src/layouts/toolbar/coinsPopover/coinsPopover.ts
+++ b/src/layouts/toolbar/coinsPopover/coinsPopover.ts
@@ -129,7 +129,7 @@ export default defineComponent({

        if (!!username) {
          notifsel.value.dest = ''
-          console.log('refreshdata')
+          // console.log('refreshdata')
          loading.value = true

          return notifStore.updateNotifDataFromServer({
--- a/src/layouts/toolbar/notifPopover/notifPopover.ts
+++ b/src/layouts/toolbar/notifPopover/notifPopover.ts
@@ -86,10 +86,10 @@ export default defineComponent({
    }

    function checkifpolling() {
-      console.log('checkifpolling')
+      // console.log('checkifpolling')
      if (eseguipolling.value) {
        if (!polling.value) {
-          console.log('esegui POLLING 2....')
+          // console.log('esegui POLLING 2....')
          polling.value = setInterval(() => {
            checkIfArrivedSomeNotif()
          }, 2000)
@@ -167,7 +167,7 @@ export default defineComponent({

          if (!!username) {
            notifsel.value.dest = ''
-            console.log('refreshdata')
+            // console.log('refreshdata')
            loading.value = true

            return notifStore.updateNotifDataFromServer({
--- a/src/mixins/mixin-metatags.ts
+++ b/src/mixins/mixin-metatags.ts
@@ -11,7 +11,7 @@ export default function () {

  function setmeta(mym: IMetaTags) {
    // cancellarlo...
-    return true
+    return
  }

  function getMeta(mym: IMetaTags, t: any) {
--- a/src/model/GlobalStore.ts
+++ b/src/model/GlobalStore.ts
@@ -212,34 +212,34 @@ export interface IOption {

 export interface IConfPages {
  font?: string
-  col_toolbar?: string
-  col_bgfooter?: string
-  show_darkopt?: boolean
-  showButtHome?: boolean
-  showProfile?: boolean
-  showUserMenu?: boolean
-  showRegButton?: boolean
-  enableReg?: boolean
-  showNL?: boolean
-  showMsgs?: boolean
-  showNotif?: boolean
-  showCoins?: boolean
-  showNameSurname?: boolean
-  showCompetenze?: boolean
-  showConnected?: boolean
-  bookingEvents?: boolean
-  enableEcommerce?: boolean
-  enableGroups?: boolean
-  enableCircuits?: boolean
-  enableProj?: boolean
-  enableTodos?: boolean
-  enableRegByBot?: boolean
-  enabledRegNeedTelegram?: boolean
-  showViewGroups?: boolean
-  showViewUsers?: boolean
-  showViewProfile?: boolean
-  enablePwa?: boolean
-  lang?: number
+  col_toolbar: string
+  col_bgfooter: string
+  show_darkopt: boolean
+  showButtHome: boolean
+  showProfile: boolean
+  showUserMenu: boolean
+  showRegButton: boolean
+  enableReg: boolean
+  showNL: boolean
+  showMsgs: boolean
+  showNotif: boolean
+  showCoins: boolean
+  showNameSurname: boolean
+  showCompetenze: boolean
+  showConnected: boolean
+  bookingEvents: boolean
+  enableEcommerce: boolean
+  enableGroups: boolean
+  enableCircuits: boolean
+  enableProj: boolean
+  enableTodos: boolean
+  enableRegByBot: boolean
+  enabledRegNeedTelegram: boolean
+  showViewGroups: boolean
+  showViewUsers: boolean
+  showViewProfile: boolean
+  enablePwa: boolean
+  lang: number
 }
 export interface IContacts {
  facebook: string
--- a/src/model/UserStore.ts
+++ b/src/model/UserStore.ts
@@ -120,6 +120,7 @@ export interface IUserAport {

 export interface IUserFields {
  _id: string
+  idapp?: string
  ind_order?: number
  email?: string
  username: string
--- a/src/root/evento/evento.scss
+++ b/src/root/evento/evento.scss
@@ -21,6 +21,10 @@
    color: black;
  }

+  &__details_darktheme {
+    color: white;
+  }
+
  &__tdimg {
    width: 150px;
    height: 150px;
--- a/src/root/fundraising/fundraising.vue
+++ b/src/root/fundraising/fundraising.vue
@@ -1,6 +1,6 @@
 <template>
-  <q-page class="text-black">
-    <section class="bg-white">
+  <q-page :class="$q.dark.isActive ? `text-white` : `text-black`">
+    <section :class="$q.dark.isActive ? `bg-black` : `bg-white`">
      <div class=" row justify-between items-start q-col-gutter-sm">
        <div class="col-12">
          <div class="feature-item" style="margin-top: 0px !important;">
--- a/src/root_spec/home_arcadei/home_arcadei.vue
+++ b/src/root_spec/home_arcadei/home_arcadei.vue
@@ -174,7 +174,7 @@
                </div>


-                <section class="maxwidth padding_gallery bg-white text-grey-10 text-center" >
+                <section :class="`maxwidth padding_gallery `+ ($q.dark.isActive ? `bg-black` : `bg-white`) + ` text-grey-10 text-center`" >

                    <q-carousel
                            swipeable
--- a/src/root_spec/home_tdv/home_tdv.scss
+++ b/src/root_spec/home_tdv/home_tdv.scss
@@ -412,12 +412,6 @@ body.mobile .landing:before {
    font-size: 0.6rem;
  }

-  .carousel_img_3 {
-    //background-image: url(../../public/images/cibo_sano.jpg);
-    background-size: 620px 620px !important;
-    background-position: 50% top !important;
-    background-repeat: no-repeat !important;
-  }

 }

--- a/src/rootgen/admin/eventlist/eventlist.scss
+++ b/src/rootgen/admin/eventlist/eventlist.scss
@@ -21,6 +21,10 @@
    color: black;
  }

+  &__details_darktheme {
+    color: white;
+  }
+
  &__tdimg {
    width: 150px;
    height: 150px;
--- a/src/rootgen/admin/newsletter/newsletter.ts
+++ b/src/rootgen/admin/newsletter/newsletter.ts
@@ -72,7 +72,7 @@ export default defineComponent({
      if (eseguipolling.value) {
        // Is Still sending email, so, every minutes, check the status
        if (!polling.value) {
-          console.log('esegui POLLING....')
+          // console.log('esegui POLLING....')
          polling.value = setInterval(() => {
            load()
          }, 15000)
--- a/src/router/routesAdmin.ts
+++ b/src/router/routesAdmin.ts
@@ -165,14 +165,14 @@ function getRoutesAd(site: ISites) {

  const routes_manager: IListRoutes[] = [
    {
-      active: site.confpages?.bookingEvents,
+      active: site.confpages && site.confpages?.bookingEvents,
      order: 70,
      path: '/admin/usereventlist',
      materialIcon: 'edit',
      name: 'otherpages.admin.usereventlist',
      component: () => import('@/rootgen/admin/eventlist/eventlist.vue'),
-      inmenu: site.confpages.bookingEvents,
-      submenu: site.confpages.bookingEvents,
+      inmenu: site.confpages && site.confpages.bookingEvents,
+      submenu: site.confpages && site.confpages.bookingEvents,
      level_parent: 0,
      level_child: 0.5,
      infooter: false,
@@ -513,17 +513,17 @@ function getRoutesAd(site: ISites) {
      infooter: true
    },
    {
-      active: site.confpages.enableRegByBot,
+      active: site.confpages && site.confpages.enableRegByBot,
      order: 1000,
      path: '/bot',
      materialIcon: 'how_to_reg',
      name: 'pages.SignUpBot',
-      inmenu: site.confpages.enableRegByBot,
-      infooter: site.confpages.enableRegByBot,
+      inmenu: site.confpages && site.confpages.enableRegByBot,
+      infooter: site.confpages && site.confpages.enableRegByBot,
      separator: false
    },
    {
-      active: site.confpages.enableReg && !site.confpages.enabledRegNeedTelegram,
+      active: site.confpages && site.confpages.enableReg && !site.confpages.enabledRegNeedTelegram,
      order: 1000,
      path: '/signup',
      materialIcon: 'how_to_reg',
@@ -545,7 +545,7 @@ function getRoutesAd(site: ISites) {
      separator: false
    },
    {
-      active: site.confpages.enableReg,
+      active: site.confpages && site.confpages.enableReg,
      order: 2000,
      path: '/regok',
      materialIcon: 'how_to_reg',
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -451,6 +451,7 @@ const msg_it = {
      page_title: 'Registrazione',
      made_gift: 'Dono',
      note: 'Note',
+      detailsPage: 'Pagina Dettagliata sul Gruppo',
      incorso: 'Registrazione in corso...',
      iscrizioneincorso: 'Iscrizione in corso...',
      richiesto: 'Campo Richiesto',
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -760,8 +760,8 @@ export const colmyUserGroup = [
    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist
  }),
  AddCol({
-    name: 'note', label_trans: 'proj.longdescr', fieldtype: costanti.FieldType.html,
-    titlepopupedit: 'Dettagli', field_extra1: 'groupname', subfield_extra1: ''
+    name: 'note', label_trans: 'reg.detailsPage', fieldtype: costanti.FieldType.html,
+    titlepopupedit: 'detailsPage', field_extra1: 'groupname', subfield_extra1: ''
  }),
  AddCol(ModifRec),
  AddCol(DeleteRec),
@@ -2960,9 +2960,9 @@ export const fieldsTable = {

    const tablerec: any = this.tablesList.find((rec) => rec.value === mytable)
    if (tablerec) {
-      console.log('tablerec', tablerec.columns)
+      // console.log('tablerec', tablerec.columns)
      const mycol = tablerec.columns.find((col: any) => col.name === namecol)
-      console.log('mycol = ', mycol)
+      // console.log('mycol = ', mycol)
      return mycol
    } else
      return null
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -2748,7 +2748,7 @@ export const tools = {
      }


-      console.log('static_data.arrLangUsed', static_data.arrLangUsed, 'mylang', mylang)
+      // console.log('static_data.arrLangUsed', static_data.arrLangUsed, 'mylang', mylang)
      if (!(static_data.arrLangUsed.includes(mylang))) {
        // console.log('non incluso ', mylang)
        // mylang = static_data.arrLangUsed[0]
@@ -5485,7 +5485,7 @@ export const tools = {
    // console.log('OUT', res)

    if (res && res.userprofile) {
-      console.log('updateMyData')
+      // console.log('updateMyData')
      userStore.my.profile = res.userprofile

      if (res.listcircuits) {
@@ -6711,14 +6711,14 @@ export const tools = {
  },

  getFullFileName(arrimage: IImgGallery[], table: string, username: string, groupname: string) {
-    console.log('arrimage', arrimage)
+    // console.log('arrimage', arrimage)

    if (shared_consts.TABLES_DIRECTORY_A_PARTE.includes(table)) {
      return `upload/${table}/` + groupname + '/' + arrimage[0].imagefile
    } else if (shared_consts.TABLES_DIRECTORY_SINGLE_IMG.includes(table)) {
      return `upload/${table}/` + groupname + '/' + arrimage[0].imagefile
    } else {
-      console.log('username', username, 'table', table)
+      // console.log('username', username, 'table', table)
      if (arrimage && arrimage.length > 0) {
        return `upload/profile/${username}/${table}` + arrimage[0].imagefile
      } else {
--- a/src/store/Modules/toolsext.ts
+++ b/src/store/Modules/toolsext.ts
@@ -266,7 +266,7 @@ export const toolsext = {
      }


-      console.log('static_data.arrLangUsed', static_data.arrLangUsed, 'mylang', mylang)
+      // console.log('static_data.arrLangUsed', static_data.arrLangUsed, 'mylang', mylang)

      if (!(static_data.arrLangUsed.includes(mylang))) {
        // console.log('non incluso ', mylang)
--- a/src/store/NotifStore.ts
+++ b/src/store/NotifStore.ts
@@ -179,7 +179,7 @@ export const useNotifStore = defineStore('NotifStore', {
    },

    async updateNotifDataFromServer({ username, lastdataread }: {username: string, lastdataread: Date}) {
-      console.log('updateNotifDataFromServer', username, lastdataread)
+      // console.log('updateNotifDataFromServer', username, lastdataread)

      return Api.SendReq(`/sendnotif/${username}/${lastdataread}/${process.env.APP_ID}`, 'GET', null)
        .then((res) => {
--- a/src/store/UserStore.ts
+++ b/src/store/UserStore.ts
@@ -634,6 +634,7 @@ export const useUserStore = defineStore('UserStore', {
    authUser(data: IUserFields) {
      try {
        this.my = { ...data }
+        // console.log('**** my', this.my)
        if (!this.my.profile) {
          this.my.profile = DefaultProfile

@@ -1030,7 +1031,7 @@ export const useUserStore = defineStore('UserStore', {

        return await this.setGlobal($router, isLogged)
          .then((loadstorage: any) => {
-            console.log('RISULT setGlobal:', loadstorage)
+            // console.log('RISULT setGlobal:', loadstorage)
            if (loadstorage) {

              globalroutines('loadapp', '')
--- a/src/store/globalStore.ts
+++ b/src/store/globalStore.ts
@@ -142,7 +142,34 @@ export const useGlobalStore = defineStore('GlobalStore', {
      },
      confpages: {
        font: '',
-        show_darkopt: false,
+        col_toolbar: '',
+        col_bgfooter: '',
+        show_darkopt: true,
+        showProfile: false,
+        showUserMenu: true,
+        showRegButton: false,
+        enableReg: false,
+        showNL: false,
+        showMsgs: false,
+        showNotif: false,
+        showCoins: false,
+        showNameSurname: false,
+        showCompetenze: false,
+        showConnected: false,
+        bookingEvents: false,
+        enableEcommerce: false,
+        enableGroups: false,
+        enableCircuits: false,
+        enableProj: false,
+        enableTodos: false,
+        enableRegByBot: false,
+        enabledRegNeedTelegram: false,
+        showButtHome: false,
+        showViewGroups: false,
+        showViewUsers: false,
+        showViewProfile: false,
+        enablePwa: false,
+        lang: costanti.Lang.IT,
      },
    },
    provinces: [],
@@ -628,7 +655,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
      // }


-      if (!this.site.confpages.enablePwa)
+      if (!this.site.confpages || !this.site.confpages.enablePwa)
        return

      if (!('serviceWorker' in navigator)) {
@@ -816,7 +843,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
    },

    async checkUpdates() {
-      console.log('checkUpdates')
+      // console.log('checkUpdates')

      const userStore = useUserStore()

@@ -1485,7 +1512,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
            console.log('isLogged', isLogged)

            // calendarStore.editable = userStore.isAdmin || userStore.isManager || userStore.isFacilitatore
-            if (res.data.myuser === null) {
+            if (res.data.myuser === null || (res.data.myuser.idapp !== process.env.APP_ID)) {
              if (isLogged) {
                // Fai Logout
                console.log('Fai Logout', 'isLogged', isLogged)
--- a/src/views/user/editprofile/editprofile.ts
+++ b/src/views/user/editprofile/editprofile.ts
@@ -82,6 +82,7 @@ export default defineComponent({
      // Carica il profilo di quest'utente
      userStore.loadUserProfile({username: userStore.my.username}).then((ris) => {
        myuser.value = ris
+        console.log('myuser._id', ris)
      })
    }

@@ -105,6 +106,7 @@ export default defineComponent({
      filtroutente,
      myuser,
      t,
+      site: globalStore.site,
    }
  }
 })
--- a/src/views/user/editprofile/editprofile.vue
+++ b/src/views/user/editprofile/editprofile.vue
@@ -179,6 +179,19 @@
        >
        </CMyFieldRec>

+         <CMyFieldDb
+          :title="$t('reg.born_city')"
+          table="users"
+          :id="myuser._id"
+          :rec="myuser"
+          tablesel="cities"
+          mykey="profile"
+          mysubkey="born_city_id"
+          jointable="cities"
+          :type="costanti.FieldType.select_by_server"
+        >
+        </CMyFieldDb>
+
        <CMyFieldDb
          :title="$t('reg.dateofbirth')"
          table="users"
--- a/src/views/user/myprofile/myprofile.vue
+++ b/src/views/user/myprofile/myprofile.vue
@@ -134,7 +134,8 @@

          <q-btn
            v-if="myuser.username === myusername()" icon="fas fa-pencil-alt"
-            color="blue"
+            :color="$q.dark.isActive ? `black`: `white`"
+            :text-color="$q.dark.isActive ? `white`: `black`"
            size="md"
            :label="$t('otherpages.modifprof')"
            to="/editprofile">