Arcadei ...

.env.development

@@ -1,30 +0,0 @@
-APP_VERSION="0.5.24"
-SERVICE_WORKER_FILE="service-worker.js"
-APP_ID="15"
-DIRECTORY_LOCAL="newfreeplanet"
-DIRECTORY_SERVER="freeplanet_serverside"
-SERVERDIR_WEBSITE=""
-SERVERPW_WEBSITE=""
-APP_URL="https://localhost"
-URL_FACEBOOK="https://www.facebook.com/freeplanetapp"
-PROVA_PAOLO="PROVA ENV FUNZIONA!"
-LANG_DEFAULT="it"
-PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF"
-MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T"
-MONGODB_HOST="https://localhost:3000"
-LOGO_REG='arcadei-logo-full.png'
-TEST_NAME="Surya"
-TEST_SURNAME="Paolo"
-TEST_EMAIL=""
-TEST_USERNAME=""
-TEST_PASSWORD=""
-TEST_APORTADOR=""
-PUBLICKEY_PUSH='BDncvMiUZmjaCG2Kr1V9N0_33hOG-AuNSbHSvL24y2dzBiUjAxKm02emx5SeJvz2IGmtRf6YqCgopeQwCwUmZw8'
-IN_CONSTRUCTION="0"
-DEBUG="1"
-TELEGRAM_SUPPORT=""
-PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a"
-TEST_CELL=""
-ISTEST=1
-INLOCALE=1
-BAK_MONGODB_HOST="http://192.168.0.200:3000"

_ALL_SITES/arcadei.it/db/static_data.ts

@@ -693,17 +693,6 @@ const baseroutes: IListRoutes[] = [
     inmenu: false,
     infooter: true
   },
-  {
-    active: functionality.ENABLE_REGISTRATION && functionality.ENABLE_REG_NEED_TELEGRAM,
-    order: 1000,
-    path: '/signup/:invited/:usernameteleg/:idteleg',
-    materialIcon: 'how_to_reg',
-    name: 'pages.SignUp',
-    component: () => import('@/views/login/signup/signup.vue'),
-    inmenu: false,
-    infooter: false,
-    separator: false
-  },
   {
     active: functionality.ENABLE_REG_BY_BOT,
     order: 1000,
@@ -714,17 +703,17 @@ const baseroutes: IListRoutes[] = [
     infooter: functionality.ENABLE_REG_BY_BOT,
     separator: false
   },
-  /*{
+  {
     active: functionality.ENABLE_REGISTRATION && !functionality.ENABLE_REG_NEED_TELEGRAM,
     order: 1000,
     path: '/signup',
     materialIcon: 'how_to_reg',
     name: 'pages.SignUp',
-    component: () => import('@/views/login/signup/signup_noteleg.vue'),
+    component: () => import('@/views/login/signup_noteleg/signup_noteleg.vue'),
     inmenu: false,
     infooter: false,
     separator: false
-  },*/
+  },
   {
     active: true,
     order: 1001,

__inizia.sh

@@ -23,5 +23,6 @@ else
   cp -R _ALL_SITES/$site/.env.production .
   cp -R _ALL_SITES/$site/.env.test .
   cp -R _ALL_SITES/$site/images/* ./public/images/
+  cp -R _ALL_SITES/$site/favicon.ico ./public/
 
 fi

__termine.sh

@@ -10,6 +10,7 @@ else
   cp -R _ALL_SITES/$site _BAK/4/
 
   cp -R src/db _ALL_SITES/$site/
+  cp -R public/favicon.ico _ALL_SITES/$site/
   cp -R src/root_spec _ALL_SITES/$site/
   cp -R ./quasar.conf.js _ALL_SITES/$site/
   cp -R ./package.json _ALL_SITES/$site/

inizia_arcadei.it

@@ -1,26 +0,0 @@
-#!/bin/bash
-
-site=arcadei.it
-
-if [ -d "__freeplanet.app" ]; then
-  rmdir __freeplanet.app
-fi
-
-if [ -d "__riso.app" ]; then
-  rmdir __riso.app
-fi
-
-if [ -d "__arcadei.it" ]; then
-  rmdir __arcadei.it
-fi
-
-if [ -d "__popolodelnuovomondo.app" ]; then
-  rmdir __popolodelnuovomondo.app
-fi
-
-if [ -d "__terradellavisione.app" ]; then
-  rmdir __terradellavisione.app
-fi
-
-
-source __inizia.sh

inizia_riso.app

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-site=riso.app
-
-if [ -d "__freeplanet.app" ]; then
-  rmdir __freeplanet.app
-fi
-
-if [ -d "__riso.app" ]; then
-  rmdir __riso.app
-fi
-
-if [ -d "__popolodelnuovomondo.app" ]; then
-  rmdir __popolodelnuovomondo.app
-fi
-
-if [ -d "__terradellavisione.app" ]; then
-  rmdir __terradellavisione.app
-fi
-
-
-source __inizia.sh

src/db/lang/ws_it.js

@@ -113,8 +113,10 @@ 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',

src/db/static_data.ts

@@ -481,7 +481,7 @@ const baseroutes: IListRoutes[] = [
     inmenu: true,
     infooter: true,
   },
-  {
+  /*{
     active: true,
     order: 120,
     path: '/myprofile',
@@ -491,7 +491,7 @@ const baseroutes: IListRoutes[] = [
     meta: { requiresAuth: true },
     inmenu: true,
     infooter: true,
-  },
+  },*/
   {
     active: true,
     order: 120,
@@ -743,7 +743,7 @@ const baseroutes: IListRoutes[] = [
     materialIcon: 'account_circle',
     name: 'pages.SignIn',
     component: () => import('@/views/login/signin_noreg/signin_noreg.vue'),
-    inmenu: true,
+    inmenu: false,
     infooter: true
   },
   // --- NOT IN MENU: ---

src/globalroutines/util.ts

@@ -3,6 +3,9 @@ import { tools } from '@src/store/Modules/tools'
 import messages from '../statics/i18n'
 
 function translate(params: any) {
+  if (!params)
+    return ''
+
   const msg = params.split('.')
   const lang = toolsext.getLocale()
 

src/layouts/menuone/menuOne.scss

@@ -63,7 +63,7 @@
 }
 
 .isCalendar {
-  color: #fff241;
+
 }
 
 .isManager {
@@ -132,3 +132,11 @@
 }
 */
 
+.bigmenu {
+  font-size: 1.25rem;
+  font-weight: bold;
+  text-shadow: 0.0512rem 0.052rem .01rem #555;
+}
+.subtitle {
+  font-style: italic;
+}

src/layouts/menuone/menuOne.ts

@@ -94,9 +94,23 @@ export default defineComponent({
 
       if (elem.extraclass) menu += ` ${elem.extraclass}`
 
+      console.log('menu', menu)
       return menu
     }
 
+    function getimgiconclass(elem: IListRoutes) {
+      if (elem.extraclass)
+        return elem.extraclass
+      else
+        return 'imgicon'
+    }
+    function getimgiconclass2(elem: IListRoutes) {
+      if (elem.extraclass)
+        return elem.extraclass
+      else
+        return 'clBase'
+    }
+
     myroutes.value = static_data.routes
 
     return {
@@ -108,6 +122,9 @@ export default defineComponent({
       tools,
       getroutes,
       myroutes,
+      getimgiconclass,
+      getimgiconclass2,
+
     }
   },
 })

src/layouts/menuone/menuOne.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="no-border" v-if="finishLoading">
+  <div v-if="finishLoading" class="no-border">
     <q-list class="rounded-borders text-primary">
       <div v-for="ind1 in getmenu" :key="ind1">
         <!--<div class="q-list-header">{{replaceUnderlineToSpace(index)}}</div>-->
@@ -11,14 +11,15 @@
                 <q-separator></q-separator>
               </span>
               <span v-else>
+
                 <q-expansion-item
-                  :header-inset-level="myitemmenu.level_parent"
                   :content-inset-level="myitemmenu.level_parent"
-                  :label="tools.getLabelByItem(myitemmenu)"
-                  :icon="myitemmenu.materialIcon"
-                  expand-icon-class="my-menu-separat"
                   :header-class="getmymenuclass(myitemmenu)"
-                  active-class="my-menu-active">
+                  :header-inset-level="myitemmenu.level_parent"
+                  :icon="myitemmenu.materialIcon"
+                  :label="tools.getLabelByItem(myitemmenu)"
+                  active-class="my-menu-active"
+                  expand-icon-class="my-menu-separat">
 
                     <div v-for="(child2, index) in myitemmenu.routes2" :key="index">
                       <div v-if="child2.active && tools.visumenu(child2)">
@@ -26,26 +27,27 @@
                           <q-separator></q-separator>
                         </span>
                         <span v-else>
+
                           <q-expansion-item
                             v-if="!child2.routes2"
-                            :to="getroute(child2)"
-                            :header-inset-level="child2.level_child"
-                            :duration="300"
-                            :icon="child2.materialIcon"
-                            expand-icon="none"
-                            active-class="my-menu-active"
-                            expand-icon-class="my-menu-icon-none"
                             :class="`item item-link drawer-closer cursor-pointer ` + clBase"
-                            :label="tools.getLabelByItem(child2)">
+                            :duration="300"
+                            :header-inset-level="child2.level_child"
+                            :icon="child2.materialIcon"
+                            :label="tools.getLabelByItem(child2)"
+                            :to="getroute(child2)"
+                            active-class="my-menu-active"
+                            expand-icon="none"
+                            expand-icon-class="my-menu-icon-none">
 
                              <q-item-section avatar>
-
                                <q-avatar v-if="child2.img">
-                                 <div :icon="`img:`+child2.img" class="imgicon" style="font-size:2rem;"></div>
+                                 <div :class="getimgiconclass(child2)" :icon="`img:`+child2.img" style="font-size:2rem;"></div>
                                </q-avatar>
                                <div v-else>
                                 <q-avatar
-                                  :icon="child2.materialIcon" color="primary" class="clicon"
+                                  :icon="child2.materialIcon" :size="child2.iconsize" class="clicon"
+                                  color="primary"
                                   text-color="white">
                                 </q-avatar>
                                </div>
@@ -58,38 +60,40 @@
                           </q-expansion-item>
                           <q-expansion-item
                             v-else
-                            :header-inset-level="child2.level_parent"
                             :content-inset-level="child2.level_parent"
-                            :label="tools.getLabelByItem(child2)"
-                            :icon="child2.materialIcon"
-                            expand-icon-class="my-menu-separat"
                             :header-class="getmymenuclass(child2)"
-                            active-class="my-menu-active">
+                            :header-inset-level="child2.level_parent"
+                            :icon="child2.materialIcon"
+                            :label="tools.getLabelByItem(child2)"
+                            active-class="my-menu-active"
+                            expand-icon-class="my-menu-separat">
 
                               <div v-for="(child3, index) in child2.routes2" :key="index">
                                 <div v-if="child3.active">
+
                                   <q-expansion-item
-                                    :to="getroute(child3)"
-                                    :header-inset-level="child3.level_child"
-                                    :duration="300"
-                                    :icon="child3.materialIcon"
-                                    active-class="my-menu-active"
-                                    expand-icon-class="my-menu-icon-none"
                                     :class="`item item-link drawer-closer cursor-pointer ` + clBase"
-                                    :label="tools.getLabelByItem(child3)">
+                                    :duration="300"
+                                    :header-inset-level="child3.level_child"
+                                    :icon="child3.materialIcon"
+                                    :label="tools.getLabelByItem(child3)"
+                                    :to="getroute(child3)"
+                                    active-class="my-menu-active"
+                                    expand-icon-class="my-menu-icon-none">
                                     <div v-for="(child4, index) in child3.routes2" :key="index">
+
                                       <q-expansion-item
                                         v-if="!!child3.routes2 && child3.active"
                                         :key="index"
-                                        :to="getroute(child4)"
-                                        :header-inset-level="child4.level_child"
-                                        :duration="300"
-                                        :icon="child4.materialIcon"
-                                        :expand-icon="child4.icon"
-                                        expand-icon-class="my-menu-separat"
-                                        active-class="my-menu-active"
                                         :class="`item item-link drawer-closer cursor-pointer ` + clBase"
-                                        :label="tools.getLabelByItem(child4)">
+                                        :duration="300"
+                                        :expand-icon="child4.icon"
+                                        :header-inset-level="child4.level_child"
+                                        :icon="child4.materialIcon"
+                                        :label="tools.getLabelByItem(child4)"
+                                        :to="getroute(child4)"
+                                        active-class="my-menu-active"
+                                        expand-icon-class="my-menu-separat">
                                       </q-expansion-item>
                                     </div>
                                   </q-expansion-item>
@@ -110,16 +114,31 @@
                     <q-separator inset></q-separator>
                   </span>
                     <span v-else>
-                    <q-expansion-item
-                      :to="getroute(myitemmenu)"
-                      :header-inset-level="myitemmenu.level_parent"
+                    <q-list>
+                      <q-item clickable
                               :content-inset-level="myitemmenu.level_parent"
-                      :label="tools.getLabelByItem(myitemmenu)"
-                      :icon="myitemmenu.materialIcon"
-                      expand-icon="none"
-                      :header-class="clBase"
-                      active-class="my-menu-active">
-                    </q-expansion-item>
+                              :header-inset-level="myitemmenu.level_parent"
+                              :to="getroute(myitemmenu)"
+                              active-class="my-menu-active"
+                              expand-icon="none">
+
+                          <q-item-section thumbnail>
+                            <q-avatar
+                              :icon="myitemmenu.materialIcon" :size="!!myitemmenu.iconsize ? myitemmenu.iconsize: '2.5rem'" :font-size="!!myitemmenu.iconsize ? myitemmenu.iconsize: '2.5rem'"
+                              text-color="primary"
+                              style="margin-left: 4px"
+                              square
+                              rounded>
+                            </q-avatar>
+                          </q-item-section>
+
+                          <q-item-section>
+                            <span :class="myitemmenu.extraclass">{{ tools.getLabelByItem(myitemmenu) }}</span>
+                            <span v-if="myitemmenu.subtitle" class="subtitle">{{ myitemmenu.subtitle }}</span>
+                          </q-item-section>
+
+                        </q-item>
+                      </q-list>
                   </span>
                   </div>
                 </q-slide-transition>

src/model/GlobalStore.ts

@@ -111,12 +111,26 @@ export interface IMyBot {
   date_updated?: Date
 }
 
+export interface IMyElem {
+  _id?: string
+  type?: string
+  title?: string
+  container?: string
+  size?: string
+  order?: string
+  height?: string
+  active?: boolean
+
+}
+
 export interface IMyPage {
   _id?: string
   author_username?: string
   lang?: string
   title?: string
+  subtitle?: string
   icon?: string
+  iconsize?: string
   order?: number
   path?: string
   keywords?: string
@@ -145,6 +159,7 @@ export interface IMyPage {
   l_child?: number,
   infooter?: boolean
   internalpage?: boolean
+  extraclass?: string
 }
 
 export interface IOption {
@@ -342,8 +357,10 @@ export interface IListRoutes {
   order: number
   path: string
   name: string
+  subtitle?: string
   lang?: string
   materialIcon?: string
+  iconsize?: string
   component?: any
   children?: any
   reqauth?: boolean

src/store/Modules/fieldsTable.ts

@@ -142,6 +142,7 @@ export const colmsg_templates = [
 
 export const colmypage = [
   AddCol({ name: 'title', label_trans: 'pages.title' }),
+  AddCol({ name: 'subtitle', label_trans: 'pages.subtitle' }),
   AddCol({ name: 'path', label_trans: 'pages.path' }),
   AddCol({ name: 'img1', label_trans: 'pages.img1' }),
   AddCol({ name: 'content', label_trans: 'pages.contentfield', fieldtype: costanti.FieldType.html }),
@@ -174,6 +175,8 @@ export const colmypage = [
   AddCol({ name: 'l_child', label_trans: 'pages.l_child', fieldtype: costanti.FieldType.number }),
   AddCol({ name: 'infooter', label_trans: 'pages.infooter', fieldtype: costanti.FieldType.boolean }),
   AddCol({ name: 'internalpage', label_trans: 'pages.internalpage', fieldtype: costanti.FieldType.boolean }),
+  AddCol({ name: 'iconsize', label_trans: 'pages.iconsize', fieldtype: costanti.FieldType.string }),
+  AddCol({ name: 'extraclass', label_trans: 'pages.extraclass', fieldtype: costanti.FieldType.string }),
   AddCol(DeleteRec),
   AddCol(DuplicateRec),
 ]

src/store/Modules/tools.ts

@@ -3878,6 +3878,9 @@ export const tools = {
   },
 
   translate(params: string, options?: any) {
+    if (!params)
+      return ''
+
     const msg = params.split('.')
     const lang = toolsext.getLocale()
 

src/store/globalStore.ts

@@ -357,7 +357,9 @@ export const useGlobalStore = defineStore('GlobalStore', {
               path: `/${page.path}`,
               name: '',
               text: page.title,
+              subtitle: page.subtitle,
               materialIcon: page.icon,
+              iconsize: page.iconsize,
               component: () => import('@src/root/mypage/mypage.vue'),
               inmenu: page.inmenu,
               onlySocioResidente: page.only_residenti,
@@ -368,6 +370,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
               level_child: page.l_child,
               level_parent: page.l_par,
               submenu: page.submenu,
+              extraclass: page.extraclass,
             })
           }
         }
@@ -475,7 +478,6 @@ export const useGlobalStore = defineStore('GlobalStore', {
     },
 
     saveConfig(data: IConfig) {
-      let dataout
       // this.$set(dataout, data.value, {'value': 'default value'})
       return globalroutines('write', 'config', { _id: data._id, value: data.value })
     },

termina_arcadei.it

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-site=arcadei.it
-
-if [ -d "__freeplanet.app" ]; then
-  rmdir __freeplanet.app
-fi
-
-if [ -d "__insiemesipuo.app" ]; then
-  rmdir __insiemesipuo.app
-fi
-
-if [ -d "__popolodelnuovomondo.app" ]; then
-  rmdir __popolodelnuovomondo.app
-fi
-
-
-source __termine.sh

termina_riso.app

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-site=riso.app
-
-if [ -d "__freeplanet.app" ]; then
-  rmdir __freeplanet.app
-fi
-
-if [ -d "__insiemesipuo.app" ]; then
-  rmdir __insiemesipuo.app
-fi
-
-if [ -d "__popolodelnuovomondo.app" ]; then
-  rmdir __popolodelnuovomondo.app
-fi
-
-
-source __termine.sh