diff --git a/.env.development b/.env.development deleted file mode 100755 index c58c5099..00000000 --- a/.env.development +++ /dev/null @@ -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" diff --git a/_ALL_SITES/arcadei.it/db/static_data.ts b/_ALL_SITES/arcadei.it/db/static_data.ts index 2bac9546..e815e597 100755 --- a/_ALL_SITES/arcadei.it/db/static_data.ts +++ b/_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, diff --git a/_ALL_SITES/riso.app/favicon.ico b/_ALL_SITES/riso.app/favicon.ico new file mode 100644 index 00000000..06be8648 Binary files /dev/null and b/_ALL_SITES/riso.app/favicon.ico differ diff --git a/_ALL_SITES/riso.app/images/favicon-16x16.png b/_ALL_SITES/riso.app/images/favicon-16x16.png new file mode 100644 index 00000000..18de7b25 Binary files /dev/null and b/_ALL_SITES/riso.app/images/favicon-16x16.png differ diff --git a/_ALL_SITES/riso.app/images/favicon-32x32.png b/_ALL_SITES/riso.app/images/favicon-32x32.png new file mode 100644 index 00000000..6045a0f4 Binary files /dev/null and b/_ALL_SITES/riso.app/images/favicon-32x32.png differ diff --git a/_ALL_SITES/riso.app/images/favicon.ico b/_ALL_SITES/riso.app/images/favicon.ico new file mode 100644 index 00000000..06be8648 Binary files /dev/null and b/_ALL_SITES/riso.app/images/favicon.ico differ diff --git a/_ALL_SITES/riso.app/images/riso-android-icon-144x144.png b/_ALL_SITES/riso.app/images/riso-android-icon-144x144.png new file mode 100644 index 00000000..c5050b30 Binary files /dev/null and b/_ALL_SITES/riso.app/images/riso-android-icon-144x144.png differ diff --git a/_ALL_SITES/riso.app/images/riso-android-icon-192x192.png b/_ALL_SITES/riso.app/images/riso-android-icon-192x192.png new file mode 100644 index 00000000..c4d15612 Binary files /dev/null and b/_ALL_SITES/riso.app/images/riso-android-icon-192x192.png differ diff --git a/_ALL_SITES/riso.app/images/riso-android-icon-384x384.png b/_ALL_SITES/riso.app/images/riso-android-icon-384x384.png new file mode 100644 index 00000000..43db963d Binary files /dev/null and b/_ALL_SITES/riso.app/images/riso-android-icon-384x384.png differ diff --git a/_ALL_SITES/riso.app/images/riso-android-icon-48x48.png b/_ALL_SITES/riso.app/images/riso-android-icon-48x48.png new file mode 100644 index 00000000..ec317d16 Binary files /dev/null and b/_ALL_SITES/riso.app/images/riso-android-icon-48x48.png differ diff --git a/_ALL_SITES/riso.app/images/riso-android-icon-512x512.png b/_ALL_SITES/riso.app/images/riso-android-icon-512x512.png new file mode 100644 index 00000000..72c2b9c7 Binary files /dev/null and b/_ALL_SITES/riso.app/images/riso-android-icon-512x512.png differ diff --git a/_ALL_SITES/riso.app/images/riso-android-icon-96x96.png b/_ALL_SITES/riso.app/images/riso-android-icon-96x96.png new file mode 100644 index 00000000..7f9197ca Binary files /dev/null and b/_ALL_SITES/riso.app/images/riso-android-icon-96x96.png differ diff --git a/_ALL_SITES/riso.app/images/riso-apple-icon-114x114.png b/_ALL_SITES/riso.app/images/riso-apple-icon-114x114.png new file mode 100644 index 00000000..474d31a1 Binary files /dev/null and b/_ALL_SITES/riso.app/images/riso-apple-icon-114x114.png differ diff --git a/_ALL_SITES/riso.app/images/riso-apple-icon-120x120.png b/_ALL_SITES/riso.app/images/riso-apple-icon-120x120.png new file mode 100644 index 00000000..b943abce Binary files /dev/null and b/_ALL_SITES/riso.app/images/riso-apple-icon-120x120.png differ diff --git a/_ALL_SITES/riso.app/images/riso-apple-icon-144x144.png b/_ALL_SITES/riso.app/images/riso-apple-icon-144x144.png new file mode 100644 index 00000000..c5050b30 Binary files /dev/null and b/_ALL_SITES/riso.app/images/riso-apple-icon-144x144.png differ diff --git a/_ALL_SITES/riso.app/images/riso-apple-icon-152x152.png b/_ALL_SITES/riso.app/images/riso-apple-icon-152x152.png new file mode 100644 index 00000000..26804e4a Binary files /dev/null and b/_ALL_SITES/riso.app/images/riso-apple-icon-152x152.png differ diff --git a/_ALL_SITES/riso.app/images/riso-apple-icon-180x180.png b/_ALL_SITES/riso.app/images/riso-apple-icon-180x180.png new file mode 100644 index 00000000..0334ed85 Binary files /dev/null and b/_ALL_SITES/riso.app/images/riso-apple-icon-180x180.png differ diff --git a/_ALL_SITES/riso.app/images/riso-apple-icon-57x57.png b/_ALL_SITES/riso.app/images/riso-apple-icon-57x57.png new file mode 100644 index 00000000..16ef4430 Binary files /dev/null and b/_ALL_SITES/riso.app/images/riso-apple-icon-57x57.png differ diff --git a/_ALL_SITES/riso.app/images/riso-logo-full.png b/_ALL_SITES/riso.app/images/riso-logo-full.png new file mode 100644 index 00000000..35c8271f Binary files /dev/null and b/_ALL_SITES/riso.app/images/riso-logo-full.png differ diff --git a/__inizia.sh b/__inizia.sh index b15a9b02..62ee2992 100644 --- a/__inizia.sh +++ b/__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 diff --git a/__termine.sh b/__termine.sh index 75d666b8..45f0ba58 100644 --- a/__termine.sh +++ b/__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/ diff --git a/inizia_arcadei.it b/inizia_arcadei.it deleted file mode 100755 index 4905c5dc..00000000 --- a/inizia_arcadei.it +++ /dev/null @@ -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 diff --git a/inizia_riso.app b/inizia_riso.app deleted file mode 100755 index 3682b542..00000000 --- a/inizia_riso.app +++ /dev/null @@ -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 diff --git a/public/images/arcadei/borgovivo.png b/public/images/arcadei/borgovivo.png new file mode 100644 index 00000000..de6d475f Binary files /dev/null and b/public/images/arcadei/borgovivo.png differ diff --git a/public/images/arcadei/boscovivo.png b/public/images/arcadei/boscovivo.png new file mode 100644 index 00000000..0af031a9 Binary files /dev/null and b/public/images/arcadei/boscovivo.png differ diff --git a/public/images/arcadei/ortovivo-gsa.png b/public/images/arcadei/ortovivo-gsa.png new file mode 100644 index 00000000..4cb7eea8 Binary files /dev/null and b/public/images/arcadei/ortovivo-gsa.png differ diff --git a/public/images/arcadei/pandeldia.png b/public/images/arcadei/pandeldia.png new file mode 100644 index 00000000..9ff66ff1 Binary files /dev/null and b/public/images/arcadei/pandeldia.png differ diff --git a/public/images/arcadei/prospera.png b/public/images/arcadei/prospera.png new file mode 100644 index 00000000..1f3712f9 Binary files /dev/null and b/public/images/arcadei/prospera.png differ diff --git a/public/images/arcadei/saluteviva.png b/public/images/arcadei/saluteviva.png new file mode 100644 index 00000000..1dc7ba16 Binary files /dev/null and b/public/images/arcadei/saluteviva.png differ diff --git a/public/images/arcadei/scuolaviva.png b/public/images/arcadei/scuolaviva.png new file mode 100644 index 00000000..b6e0c1a2 Binary files /dev/null and b/public/images/arcadei/scuolaviva.png differ diff --git a/src/db/lang/ws_it.js b/src/db/lang/ws_it.js index 6b7d5d05..5d7960d9 100755 --- a/src/db/lang/ws_it.js +++ b/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', diff --git a/src/db/static_data.ts b/src/db/static_data.ts index e815e597..7001f8d7 100755 --- a/src/db/static_data.ts +++ b/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: --- diff --git a/src/globalroutines/util.ts b/src/globalroutines/util.ts index d0dedc6e..ebea8759 100755 --- a/src/globalroutines/util.ts +++ b/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() diff --git a/src/layouts/menuone/menuOne.scss b/src/layouts/menuone/menuOne.scss index d0a32370..ad4378d0 100755 --- a/src/layouts/menuone/menuOne.scss +++ b/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; +} diff --git a/src/layouts/menuone/menuOne.ts b/src/layouts/menuone/menuOne.ts index 01b77b93..9aafb793 100755 --- a/src/layouts/menuone/menuOne.ts +++ b/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, + } }, }) diff --git a/src/layouts/menuone/menuOne.vue b/src/layouts/menuone/menuOne.vue index 10d40e84..48725d04 100755 --- a/src/layouts/menuone/menuOne.vue +++ b/src/layouts/menuone/menuOne.vue @@ -1,5 +1,5 @@