From d09f4831cf3b6d059d925ce005331fc9ddb5552e Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Wed, 2 Oct 2024 23:26:52 +0200 Subject: [PATCH] =?UTF-8?q?-=20piuchebuono:=20possiblit=C3=A0=20di=20modif?= =?UTF-8?q?icare=20l'immagine=20dalla=20scheda=20direttamente=20-=20miglio?= =?UTF-8?q?rata=20di=20poco=20la=20grafica=20dell'immagine.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.prod.gruppomacro | 4 +- .env.prod.pcb | 6 +- .env.test.abitaregliiblei.it | 2 +- .env.test.gruppomacro | 4 +- .env.test.pcb | 4 +- .env.test_riso.pcb | 4 +- .gitignore | 1 + _ALL_SITES/piuchebuono.app/.env.test | 4 +- .../root_spec/home_tdv/home_tdv.scss | 446 ++++++++++++++++++ .../root_spec/home_tdv/home_tdv.ts | 78 +++ .../root_spec/home_tdv/home_tdv.vue | 220 +++++++++ _ALL_SITES/riso.app/.env.development | 2 +- _ALL_SITES/riso.app/db/lang/ws_it.js | 6 + _ALL_SITES/riso.app/db/static_data.ts | 4 +- _ALL_SITES/riso.app/quasar.conf.js | 2 + .../riso.app/root_spec/home_tdv/home_tdv.scss | 446 ++++++++++++++++++ .../riso.app/root_spec/home_tdv/home_tdv.ts | 78 +++ .../riso.app/root_spec/home_tdv/home_tdv.vue | 220 +++++++++ deploy_on_prod_pcb.sh | 2 +- deploy_on_production.sh | 6 +- deploy_on_test2_server.sh | 4 +- deploy_on_test_abitaregliiblei.it.sh | 2 +- deploy_on_test_gruppomacro.app.sh | 2 +- deploy_on_test_pcb.sh | 2 +- deploy_on_test_server.sh | 4 +- deploy_riso_on_pcb_server.sh | 2 +- deploy_risosrv_on_test_server.sh | 2 +- deploy_spa_on_production.sh | 2 +- deploy_spa_test_server.sh | 4 +- now.txt | 2 +- send_pwa_to_pcb.sh | 4 +- send_pwa_to_production.sh | 2 +- send_pwa_to_test.sh | 2 +- send_pwa_to_test2.sh | 4 +- send_spa_to_production.sh | 2 +- send_spa_to_test.sh | 2 +- src/common/shared_vuejs.ts | 3 + .../CCatalogoCard/CCatalogoCard.vue | 8 +- .../CMyCardService/CMyCardService.vue | 2 +- src/components/CMyElem/CMyElem.vue | 2 +- src/components/CMyValueDb/CMyValueDb.ts | 5 + src/components/CMyValueDb/CMyValueDb.vue | 1 + src/components/CProductCard/CProductCard.scss | 53 ++- src/components/CProductCard/CProductCard.ts | 7 +- src/components/CProductCard/CProductCard.vue | 111 ++++- src/components/CSingleCart/CSingleCart.vue | 4 +- src/model/Products.ts | 2 +- src/store/Modules/costanti.ts | 2 +- src/store/Modules/fieldsTable.ts | 2 +- src/store/Modules/tools.ts | 21 +- src/views/admin/dbop/dbop.vue | 5 + src/views/user/myservice/myservice.vue | 24 - upload_cartella_imgs_from_pcb.sh | 27 ++ 53 files changed, 1736 insertions(+), 124 deletions(-) create mode 100755 _ALL_SITES/piuchebuono.app/root_spec/home_tdv/home_tdv.scss create mode 100755 _ALL_SITES/piuchebuono.app/root_spec/home_tdv/home_tdv.ts create mode 100755 _ALL_SITES/piuchebuono.app/root_spec/home_tdv/home_tdv.vue create mode 100755 _ALL_SITES/riso.app/root_spec/home_tdv/home_tdv.scss create mode 100755 _ALL_SITES/riso.app/root_spec/home_tdv/home_tdv.ts create mode 100755 _ALL_SITES/riso.app/root_spec/home_tdv/home_tdv.vue create mode 100755 upload_cartella_imgs_from_pcb.sh diff --git a/.env.prod.gruppomacro b/.env.prod.gruppomacro index a894fc8e..ca49c829 100644 --- a/.env.prod.gruppomacro +++ b/.env.prod.gruppomacro @@ -2,8 +2,8 @@ APP_VERSION="1.1.0" SERVICE_WORKER_FILE="service-worker_1.1.0.js" APP_ID="18" DIRECTORY_LOCAL=newfreeplanet -DIRECTORY_SERVER=freeplanet_serverside -SERVERDIR_WEBSITE="/var/customers/webs/paolouser/gruppomacro.app/" +DIRECTORY_SERVER=/var/www/freeplanet_serverside +SERVERDIR_WEBSITE="/var/www/test.gruppomacro.app" SERVERPW_WEBSITE=pwdadmin@1AOK APP_URL="https://gruppomacro.app" URL_FACEBOOK="" diff --git a/.env.prod.pcb b/.env.prod.pcb index 95b7d0ec..4efe5034 100644 --- a/.env.prod.pcb +++ b/.env.prod.pcb @@ -1,9 +1,9 @@ APP_VERSION="1.1.0" -SERVICE_WORKER_FILE="service-worker.js" +SERVICE_WORKER_FILE="service-worker_1.1.0.js" APP_ID="17" DIRECTORY_LOCAL=newfreeplanet -DIRECTORY_SERVER=freeplanet_serverside -SERVERDIR_WEBSITE="/var/www/piuchebuono.app/" +DIRECTORY_SERVER=/var/www/nodejs_piuchebuono_server +SERVERDIR_WEBSITE="/var/www/piuchebuono.app" SERVERPW_WEBSITE=pwdadmin@1AOK APP_URL="https://piuchebuono.app" URL_FACEBOOK="" diff --git a/.env.test.abitaregliiblei.it b/.env.test.abitaregliiblei.it index 95570e52..f8c7b6f8 100755 --- a/.env.test.abitaregliiblei.it +++ b/.env.test.abitaregliiblei.it @@ -2,7 +2,7 @@ APP_VERSION="1.1.0" SERVICE_WORKER_FILE="service-worker_1.1.0.js" APP_ID="19" DIRECTORY_LOCAL=newfreeplanet -DIRECTORY_SERVER=test.freeplanet_serverside +DIRECTORY_SERVER=/var/www/nodejs_test.riso_server SERVERDIR_WEBSITE="/var/www/test.abitaregliiblei.it" SERVERPW_WEBSITE="pwdadmin@1AOK" APP_URL="https://test.abitaregliiblei.it" diff --git a/.env.test.gruppomacro b/.env.test.gruppomacro index c6e91fc1..a19da854 100755 --- a/.env.test.gruppomacro +++ b/.env.test.gruppomacro @@ -2,8 +2,8 @@ APP_VERSION="1.1.0" SERVICE_WORKER_FILE="service-worker.js" APP_ID="18" DIRECTORY_LOCAL=newfreeplanet -DIRECTORY_SERVER=test.freeplanet_serverside -SERVERDIR_WEBSITE="/var/www/test.gruppomacro.app/" +DIRECTORY_SERVER=/var/www/nodejs_test.piuchebuono_server +SERVERDIR_WEBSITE="/var/www/test.gruppomacro.app" APP_URL="https://test.gruppomacro.app" URL_FACEBOOK="" PROVA_PAOLO="" diff --git a/.env.test.pcb b/.env.test.pcb index b15146d3..42cdf025 100755 --- a/.env.test.pcb +++ b/.env.test.pcb @@ -2,8 +2,8 @@ APP_VERSION="1.1.0" SERVICE_WORKER_FILE="service-worker_1.1.0.js" APP_ID="17" DIRECTORY_LOCAL=newfreeplanet -DIRECTORY_SERVER=test.freeplanet_serverside -SERVERDIR_WEBSITE="/var/www/test.piuchebuono.app/" +DIRECTORY_SERVER=/var/www/nodejs_test.piuchebuono_server +SERVERDIR_WEBSITE="/var/www/test.piuchebuono.app" APP_URL="https://test.piuchebuono.app" URL_FACEBOOK="" PROVA_PAOLO="" diff --git a/.env.test_riso.pcb b/.env.test_riso.pcb index f3405c91..0ba1b5dd 100755 --- a/.env.test_riso.pcb +++ b/.env.test_riso.pcb @@ -2,8 +2,8 @@ APP_VERSION="1.1.0" SERVICE_WORKER_FILE="service-worker_1.1.0.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet -DIRECTORY_SERVER=test.freeplanet_serverside -SERVERDIR_WEBSITE="/var/customers/webs/paolouser/test.piuchebuono.app/" +DIRECTORY_SERVER=/var/www/nodejs_test.riso_server +SERVERDIR_WEBSITE="/var/www/test.piuchebuono.app" APP_URL="https://testriso.piuchebuono.app" URL_FACEBOOK="" PROVA_PAOLO="" diff --git a/.gitignore b/.gitignore index fe9ad3bf..5bfa4553 100755 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,7 @@ _ALL_SITES/kolibrilab.it/.env.development _ALL_SITES/kolibrilab.it/.env.test _ALL_SITES/arcadei.it/.env.development public/upload/ +upload/ ._yarn.lock .gitignore ._upload diff --git a/_ALL_SITES/piuchebuono.app/.env.test b/_ALL_SITES/piuchebuono.app/.env.test index 49c1c330..2bba94e8 100755 --- a/_ALL_SITES/piuchebuono.app/.env.test +++ b/_ALL_SITES/piuchebuono.app/.env.test @@ -2,8 +2,8 @@ APP_VERSION="1.1.0" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet -DIRECTORY_SERVER=test.freeplanet_serverside -SERVERDIR_WEBSITE="test.riso.app" +DIRECTORY_SERVER=/var/www/test.freeplanet_serverside +SERVERDIR_WEBSITE="/var/www/test.riso.app" SERVERPW_WEBSITE="pwdadmin@1AOK" APP_URL="https://test.riso.app" URL_FACEBOOK="" diff --git a/_ALL_SITES/piuchebuono.app/root_spec/home_tdv/home_tdv.scss b/_ALL_SITES/piuchebuono.app/root_spec/home_tdv/home_tdv.scss new file mode 100755 index 00000000..221fef3e --- /dev/null +++ b/_ALL_SITES/piuchebuono.app/root_spec/home_tdv/home_tdv.scss @@ -0,0 +1,446 @@ + +.testo-banda { + //background: -webkit-gradient(linear, left top, left bottom, from(#3144f0), to(transparent)); + //background: linear-gradient(180deg, #3144f0, transparent); + //background: rgba(0, 0, 0, .6) +} + +$grayshadow: #555; + +$textcol: blue; +$textcol_scuro: darkblue; + +p { + margin: 0 0 1.25rem; + //text-shadow: .125rem .125rem .25rem $grayshadow; +} + +h4 { + font-size: 1.25rem; +} + +.mycard { + visibility: hidden; +} + +.landing { +} + +.landing_background { + background: #000 url(../../../public/images/foto1.jpg) no-repeat 50% fixed; + background-size: cover +} + +.landing > section { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; + //padding: 0 16px +} + +.intro { + display: flex; + justify-content: space-between; + align-items: stretch; + /* flex-flow: row nowrap; */ + + padding: 1.25rem 0 1.25rem 0; + margin: .125rem; + + * { + width: 100%; + flex: 1; + margin-left: auto; + margin-right: auto; + } + + &__associazione { + min-width: 350px; + } + + &__comeassociarsi { + min-width: 350px; + } +} + +.subtitle { + font-weight: 600; + text-align: center; + letter-spacing: 0.125rem; + text-transform: uppercase; + font-size: 1rem; +} + +.landing > section.padding { + padding: 5.62rem 1rem; +} + +.landing > section.padding_testo { + padding-top: 1.25rem; + padding-bottom: 1rem; +} + +.landing > section.padding_gallery { + padding-top: 3.125rem; + padding-bottom: 5.625rem; +} + +.landing > section > div { + position: relative; + width: 100% +} + +.maxwidth1200 { + max-width: 1200px; +} + +.landing__toolbar { + background: -webkit-gradient(linear, left top, left bottom, from(#000), to(transparent)); + background: linear-gradient(180deg, #000, transparent); + padding: 0 !important +} + +.landing__toolbar .q-btn { + border-radius: 0 0 .315rem .315rem; + -ms-flex-item-align: stretch; + align-self: stretch +} + +.landing__hero { + min-height: 50vh +} + +.landing__header { + height: 18vh +} + +.landing__arrow { + bottom: 1.5rem; + opacity: .4 +} + +.landing__front { + background: -webkit-gradient(linear, left top, left bottom, from(transparent), color-stop(15%, rgba(0, 0, 0, .6))); + background: linear-gradient(180deg, transparent, rgba(0, 0, 0, .6) 15%) +} + +.landing__logo { + width: 9.40rem; + height: 9.40rem; + margin-top: 1.315rem; + //-webkit-animation: logo-rotate 240s linear infinite; + //animation: logo-rotate 240s linear infinite +} + +.landing__features .q-icon { + font-size: 4rem +} + +h4 { + line-height: 1.5; + text-shadow: .25rem .25rem .5rem $grayshadow; +} + +.landing__features h4, .landing__features h6 { + margin: 1rem 0 +} + +.landing__features p { + opacity: .7; + font-size: 1rem; + line-height: 1.5; +} + +.landing__footer { + //background: -webkit-gradient(linear, left top, left bottom, color-stop(65%, rgba(0, 0, 0, .1)), to(#000)); + background: linear-gradient(180deg, rgba(0, 0, 0, .8) 95%, #FFF); + padding-top: 4.5rem !important; + padding-bottom: 4.5rem !important; + padding-left: 1.25rem; + padding-right: 1.25rem; + color: #9f9f9f; +} + +.icon_contact:hover { + color: blue; + border-color: white; + border-width: .0625rem; +} + +.landing__footer .doc-link { + color: $textcol; +} + +.landing__footer .doc-link:hover { + opacity: .8 +} + +.landing__swirl-bg { + background-repeat: no-repeat !important; + background-position: top; + background-size: contain !important; + background-image: url(../../../public/images/landing_first_section.png) !important +} + +.feat-descr { + font-size: 1.15rem; +} + +.feat-descr:hover { + transition: opacity 0.5s ease-in-out; + opacity: 0.9; +} + +.q-col-gutter-sm { + padding: 3.125rem 3.125rem; + //margin-left: -48px +} + +body.mobile .landing { + //background: unset +} + +body.mobile .landing:before { + content: ""; + position: fixed; + top: 0; + height: 100vh; + left: 0; + right: 0; + bottom: 0; + z-index: -1; + //background: #000 url(../../public/images/cover.jpg) 50%; + + background-size: cover +} + +/* +@-webkit-keyframes logo-rotate { + to { + -webkit-transform: rotate(-1turn); + transform: rotate(-1turn) + } +} + +@keyframes logo-rotate { + to { + -webkit-transform: rotate(-1turn); + transform: rotate(-1turn) + } +} +*/ + +.home { + //background-color: rgb(250, 250, 250); + padding: 3.125rem; + display: flex; + //flex-wrap: nowrap; + flex-direction: column; + align-items: center; + justify-content: space-between; +} + +.btn-start { + margin: 3.125rem; +} + +.shadow { + //color: white; + text-shadow: 0.125rem 0.125rem 0.25rem $grayshadow; +} + +.text-h1, h1 { + font-size: 3rem; + font-weight: bold; + line-height: 3rem; + letter-spacing: -.01562em; + margin-bottom: 8px !important; +} + +.text-h2 { + font-size: 3.75rem; + font-weight: 300; + line-height: 3.75rem; + letter-spacing: -.00833em; +} + +.text-weight-bold { + font-weight: 700; +} + +.text-vers { + font-size: 0.75rem; + font-weight: 400; + line-height: 1.75rem; + letter-spacing: .00937em; + text-shadow: .25rem .25rem .5rem $grayshadow; +} + +.homep-cover-img-1 { + background: #000 url(../../../public/images/foto1.jpg) no-repeat 50% fixed; + //transition: background-image 1s ease-in-out; +} + +.homep-cover-img-2 { + background: #000 url(../../../public/images/foto2.jpg) no-repeat 50% fixed; + //transition: background-image 1s ease-in-out; +} + +.homep-cover-img-3 { + background: #000 url(../../../public/images/foto3.jpg) no-repeat 50% fixed; + //transition: background-image 1s ease-in-out; +} + +.homep-cover-img.hide-filter:before { + opacity: 0 +} + +.landing__footer-icons { + font-size: 1.75rem +} + +.landing__footer-icons a { + margin: 0 .5rem .5rem; + text-decoration: none; + outline: 0; + color: $textcol; + transition: color .28s +} + +.landing__footer-icons a:hover { + color: $textcol_scuro; +} + +.doc-img { + max-width: 100%; +} + +.mylist { + background: #3fdaff; + padding-left: 1.25rem; +} + +.clgutter { + margin-top: 1.25rem; + padding: .62rem; +} + +.carousel_img_3 { + //background-image: url(../../public/images/cibo_sano.jpg); + background-size: cover !important; + background-position: 50% center !important; + background-repeat: no-repeat !important; +} + +@media (max-width: 718px) { + // PER VERSIONE MOBILE + + .landing__hero { + text-align: center + } + .landing__header { + height: 7vh + } + .clgutter { + margin-top: 0; + padding: 0; + } + .landing__hero .text-h1, h1 { + font-size: 2rem; + line-height: 2.05rem; + margin-bottom: 1.25rem + } + + .landing > section.padding { + padding: 2.5rem 1rem; + } + + .landing > section.padding_testo { + padding-top: 1.25rem; + padding-bottom: 1rem; + } + + .landing > section.padding_gallery { + padding-top: 3.125rem; + padding-bottom: 5.625rem; + + max-width: 800px; + } + + .landing > section.padding_gallery > div { + padding-top: 3.125rem; + padding-bottom: 5.625rem; + + } + + .landing__features h4, .landing__features h6 { + margin: 1.25rem 0 + } + + h4 { + line-height: 1.4; + text-shadow: 0.25rem 0.25rem 0.5rem $grayshadow; + } + + .landing .feature-item { + text-align: center; + margin-top: 1.25rem; + } + .landing__hero-content { + padding-bottom: 11.25rem; + } + .landing__hero2-content { + padding-bottom: 7.25rem; + } + .landing__hero-btns { + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center + } + + .q-col-gutter-sm { + padding: .625rem .315rem; + } + + .text-subtitle1 { + font-size: 1.25rem; + } + .text-vers { + font-size: 0.6rem; + } + + +} + +.custom-caption { + text-align: center; + padding: .75rem; + color: $textcol; + background-color: rgba(0, 0, 0, .3); +} + +.sfondo-grigio { + padding: 1rem; + color: $textcol; + background-color: rgba(0, 0, 0, .35); +} + +.mycontacts { + color: gray; + letter-spacing: 0.078rem; +} + +.mycontacts_title { + text-shadow: 0.125rem 0.125rem 0.125rem #555; + font-weight: bold; + color: #999; + letter-spacing: 0.125rem; +} + +.mycontacts_text { + color: #999; + letter-spacing: 0.093rem; +} diff --git a/_ALL_SITES/piuchebuono.app/root_spec/home_tdv/home_tdv.ts b/_ALL_SITES/piuchebuono.app/root_spec/home_tdv/home_tdv.ts new file mode 100755 index 00000000..a636bdb8 --- /dev/null +++ b/_ALL_SITES/piuchebuono.app/root_spec/home_tdv/home_tdv.ts @@ -0,0 +1,78 @@ +import { defineComponent, ref, onMounted, watch, computed } from 'vue' + +import { useGlobalStore } from '@store/globalStore' +import { useRoute } from 'vue-router' +import { useUserStore } from '@store/UserStore' + +import { Logo } from '../../components/logo' + +import { LandingFooter } from '../../components/LandingFooter' +import { CMyPage } from '../../components/CMyPage/index' + +import { tools } from '@src/store/Modules/tools' +import { static_data } from '@src/db/static_data' +import { toolsext } from '@src/store/Modules/toolsext' +import { Screen } from 'quasar' +import { CCardCarousel, CEventsCalendar, COpenStreetMap } from '@components' +import MixinBase from '@src/mixins/mixin-base' +import { firstimagehome } from '@src/db/static_data' +import MixinMetaTags from '@/mixins/mixin-metatags' + +export default defineComponent({ + name: 'Home_tdv', + components: { Logo, LandingFooter, CMyPage, CCardCarousel, CEventsCalendar, COpenStreetMap }, + + setup() { + const animare = ref(0) + const slide = ref('first') + const slide2 = ref(1) + + const getImmagini = ref([ + { + title: '', subtitle: '', + alt: 'Elisa e Cristina insieme', + img: '../../statics/images/eventi_esterni/IMG_6035.jpg' + }, + ]) + + const userStore = useUserStore() + const globalStore = useGlobalStore() + + const { setValDb, getValDb } = MixinBase() + const { setmeta, getsrcbyimg } = MixinMetaTags() + + function getheightgallery() { + if (tools.isMobile()) + return '400px' + else + return '600px' + } + + function created() { + // + } + + function getArrDisciplines() { + return globalStore.disciplines.filter((rec: any) => rec.showinhome) + } + + created() + + return { + tools, + toolsext, + static_data, + animare, + slide, + slide2, + getheightgallery, + getArrDisciplines, + getImmagini, + getValDb, + firstimagehome, + getsrcbyimg, + setmeta, + } + }, +}) + diff --git a/_ALL_SITES/piuchebuono.app/root_spec/home_tdv/home_tdv.vue b/_ALL_SITES/piuchebuono.app/root_spec/home_tdv/home_tdv.vue new file mode 100755 index 00000000..d0710b3a --- /dev/null +++ b/_ALL_SITES/piuchebuono.app/root_spec/home_tdv/home_tdv.vue @@ -0,0 +1,220 @@ + + + + + diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index 69d87479..9b7cd317 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,5 +1,5 @@ APP_VERSION="1.1.0" -SERVICE_WORKER_FILE="service-worker.js" +SERVICE_WORKER_FILE="service-worker_1.1.0.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" DIRECTORY_SERVER="freeplanet_serverside" diff --git a/_ALL_SITES/riso.app/db/lang/ws_it.js b/_ALL_SITES/riso.app/db/lang/ws_it.js index c7366e95..9cd59a3d 100755 --- a/_ALL_SITES/riso.app/db/lang/ws_it.js +++ b/_ALL_SITES/riso.app/db/lang/ws_it.js @@ -121,6 +121,12 @@ const msg_website_it = { only_residenti: 'Solo Residenti', only_consiglio: 'Solo Consiglieri', color: 'Colore', + mainMenu: 'Menu Principale', + subtitle: 'Sottotitolo', + lang: 'Lingua', + keywords: 'Parole Chiave', + desctiption: 'Descrizione', + heightimg: 'Altezza Immagine', }, msg: { myAppName: 'Riso', diff --git a/_ALL_SITES/riso.app/db/static_data.ts b/_ALL_SITES/riso.app/db/static_data.ts index 2efff3dd..a5950655 100755 --- a/_ALL_SITES/riso.app/db/static_data.ts +++ b/_ALL_SITES/riso.app/db/static_data.ts @@ -209,7 +209,7 @@ function getDynamicPages(site: ISites): IListRoutes[] { meta: { requiresAuth: true, newpage: true }, inmenu: false, infooter: false, - }, + }, { active: true, order: 137, @@ -276,7 +276,7 @@ function getDynamicPages(site: ISites): IListRoutes[] { { active: true, order: 150, - path: '/fundraising', + path: '/sostieniilprogetto', materialIcon: 'fas fa-hand-holding-heart', name: 'pages.fundraising', component: () => import('@src/root/fundraising/fundraising.vue'), diff --git a/_ALL_SITES/riso.app/quasar.conf.js b/_ALL_SITES/riso.app/quasar.conf.js index b5ea96fb..652989b2 100755 --- a/_ALL_SITES/riso.app/quasar.conf.js +++ b/_ALL_SITES/riso.app/quasar.conf.js @@ -251,6 +251,8 @@ module.exports = configure((ctx) => ({ 'Cookies', 'Loading', 'AppVisibility', + 'LocalStorage', + 'SessionStorage', ], get plugins_1() { return this._plugins; diff --git a/_ALL_SITES/riso.app/root_spec/home_tdv/home_tdv.scss b/_ALL_SITES/riso.app/root_spec/home_tdv/home_tdv.scss new file mode 100755 index 00000000..221fef3e --- /dev/null +++ b/_ALL_SITES/riso.app/root_spec/home_tdv/home_tdv.scss @@ -0,0 +1,446 @@ + +.testo-banda { + //background: -webkit-gradient(linear, left top, left bottom, from(#3144f0), to(transparent)); + //background: linear-gradient(180deg, #3144f0, transparent); + //background: rgba(0, 0, 0, .6) +} + +$grayshadow: #555; + +$textcol: blue; +$textcol_scuro: darkblue; + +p { + margin: 0 0 1.25rem; + //text-shadow: .125rem .125rem .25rem $grayshadow; +} + +h4 { + font-size: 1.25rem; +} + +.mycard { + visibility: hidden; +} + +.landing { +} + +.landing_background { + background: #000 url(../../../public/images/foto1.jpg) no-repeat 50% fixed; + background-size: cover +} + +.landing > section { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; + //padding: 0 16px +} + +.intro { + display: flex; + justify-content: space-between; + align-items: stretch; + /* flex-flow: row nowrap; */ + + padding: 1.25rem 0 1.25rem 0; + margin: .125rem; + + * { + width: 100%; + flex: 1; + margin-left: auto; + margin-right: auto; + } + + &__associazione { + min-width: 350px; + } + + &__comeassociarsi { + min-width: 350px; + } +} + +.subtitle { + font-weight: 600; + text-align: center; + letter-spacing: 0.125rem; + text-transform: uppercase; + font-size: 1rem; +} + +.landing > section.padding { + padding: 5.62rem 1rem; +} + +.landing > section.padding_testo { + padding-top: 1.25rem; + padding-bottom: 1rem; +} + +.landing > section.padding_gallery { + padding-top: 3.125rem; + padding-bottom: 5.625rem; +} + +.landing > section > div { + position: relative; + width: 100% +} + +.maxwidth1200 { + max-width: 1200px; +} + +.landing__toolbar { + background: -webkit-gradient(linear, left top, left bottom, from(#000), to(transparent)); + background: linear-gradient(180deg, #000, transparent); + padding: 0 !important +} + +.landing__toolbar .q-btn { + border-radius: 0 0 .315rem .315rem; + -ms-flex-item-align: stretch; + align-self: stretch +} + +.landing__hero { + min-height: 50vh +} + +.landing__header { + height: 18vh +} + +.landing__arrow { + bottom: 1.5rem; + opacity: .4 +} + +.landing__front { + background: -webkit-gradient(linear, left top, left bottom, from(transparent), color-stop(15%, rgba(0, 0, 0, .6))); + background: linear-gradient(180deg, transparent, rgba(0, 0, 0, .6) 15%) +} + +.landing__logo { + width: 9.40rem; + height: 9.40rem; + margin-top: 1.315rem; + //-webkit-animation: logo-rotate 240s linear infinite; + //animation: logo-rotate 240s linear infinite +} + +.landing__features .q-icon { + font-size: 4rem +} + +h4 { + line-height: 1.5; + text-shadow: .25rem .25rem .5rem $grayshadow; +} + +.landing__features h4, .landing__features h6 { + margin: 1rem 0 +} + +.landing__features p { + opacity: .7; + font-size: 1rem; + line-height: 1.5; +} + +.landing__footer { + //background: -webkit-gradient(linear, left top, left bottom, color-stop(65%, rgba(0, 0, 0, .1)), to(#000)); + background: linear-gradient(180deg, rgba(0, 0, 0, .8) 95%, #FFF); + padding-top: 4.5rem !important; + padding-bottom: 4.5rem !important; + padding-left: 1.25rem; + padding-right: 1.25rem; + color: #9f9f9f; +} + +.icon_contact:hover { + color: blue; + border-color: white; + border-width: .0625rem; +} + +.landing__footer .doc-link { + color: $textcol; +} + +.landing__footer .doc-link:hover { + opacity: .8 +} + +.landing__swirl-bg { + background-repeat: no-repeat !important; + background-position: top; + background-size: contain !important; + background-image: url(../../../public/images/landing_first_section.png) !important +} + +.feat-descr { + font-size: 1.15rem; +} + +.feat-descr:hover { + transition: opacity 0.5s ease-in-out; + opacity: 0.9; +} + +.q-col-gutter-sm { + padding: 3.125rem 3.125rem; + //margin-left: -48px +} + +body.mobile .landing { + //background: unset +} + +body.mobile .landing:before { + content: ""; + position: fixed; + top: 0; + height: 100vh; + left: 0; + right: 0; + bottom: 0; + z-index: -1; + //background: #000 url(../../public/images/cover.jpg) 50%; + + background-size: cover +} + +/* +@-webkit-keyframes logo-rotate { + to { + -webkit-transform: rotate(-1turn); + transform: rotate(-1turn) + } +} + +@keyframes logo-rotate { + to { + -webkit-transform: rotate(-1turn); + transform: rotate(-1turn) + } +} +*/ + +.home { + //background-color: rgb(250, 250, 250); + padding: 3.125rem; + display: flex; + //flex-wrap: nowrap; + flex-direction: column; + align-items: center; + justify-content: space-between; +} + +.btn-start { + margin: 3.125rem; +} + +.shadow { + //color: white; + text-shadow: 0.125rem 0.125rem 0.25rem $grayshadow; +} + +.text-h1, h1 { + font-size: 3rem; + font-weight: bold; + line-height: 3rem; + letter-spacing: -.01562em; + margin-bottom: 8px !important; +} + +.text-h2 { + font-size: 3.75rem; + font-weight: 300; + line-height: 3.75rem; + letter-spacing: -.00833em; +} + +.text-weight-bold { + font-weight: 700; +} + +.text-vers { + font-size: 0.75rem; + font-weight: 400; + line-height: 1.75rem; + letter-spacing: .00937em; + text-shadow: .25rem .25rem .5rem $grayshadow; +} + +.homep-cover-img-1 { + background: #000 url(../../../public/images/foto1.jpg) no-repeat 50% fixed; + //transition: background-image 1s ease-in-out; +} + +.homep-cover-img-2 { + background: #000 url(../../../public/images/foto2.jpg) no-repeat 50% fixed; + //transition: background-image 1s ease-in-out; +} + +.homep-cover-img-3 { + background: #000 url(../../../public/images/foto3.jpg) no-repeat 50% fixed; + //transition: background-image 1s ease-in-out; +} + +.homep-cover-img.hide-filter:before { + opacity: 0 +} + +.landing__footer-icons { + font-size: 1.75rem +} + +.landing__footer-icons a { + margin: 0 .5rem .5rem; + text-decoration: none; + outline: 0; + color: $textcol; + transition: color .28s +} + +.landing__footer-icons a:hover { + color: $textcol_scuro; +} + +.doc-img { + max-width: 100%; +} + +.mylist { + background: #3fdaff; + padding-left: 1.25rem; +} + +.clgutter { + margin-top: 1.25rem; + padding: .62rem; +} + +.carousel_img_3 { + //background-image: url(../../public/images/cibo_sano.jpg); + background-size: cover !important; + background-position: 50% center !important; + background-repeat: no-repeat !important; +} + +@media (max-width: 718px) { + // PER VERSIONE MOBILE + + .landing__hero { + text-align: center + } + .landing__header { + height: 7vh + } + .clgutter { + margin-top: 0; + padding: 0; + } + .landing__hero .text-h1, h1 { + font-size: 2rem; + line-height: 2.05rem; + margin-bottom: 1.25rem + } + + .landing > section.padding { + padding: 2.5rem 1rem; + } + + .landing > section.padding_testo { + padding-top: 1.25rem; + padding-bottom: 1rem; + } + + .landing > section.padding_gallery { + padding-top: 3.125rem; + padding-bottom: 5.625rem; + + max-width: 800px; + } + + .landing > section.padding_gallery > div { + padding-top: 3.125rem; + padding-bottom: 5.625rem; + + } + + .landing__features h4, .landing__features h6 { + margin: 1.25rem 0 + } + + h4 { + line-height: 1.4; + text-shadow: 0.25rem 0.25rem 0.5rem $grayshadow; + } + + .landing .feature-item { + text-align: center; + margin-top: 1.25rem; + } + .landing__hero-content { + padding-bottom: 11.25rem; + } + .landing__hero2-content { + padding-bottom: 7.25rem; + } + .landing__hero-btns { + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center + } + + .q-col-gutter-sm { + padding: .625rem .315rem; + } + + .text-subtitle1 { + font-size: 1.25rem; + } + .text-vers { + font-size: 0.6rem; + } + + +} + +.custom-caption { + text-align: center; + padding: .75rem; + color: $textcol; + background-color: rgba(0, 0, 0, .3); +} + +.sfondo-grigio { + padding: 1rem; + color: $textcol; + background-color: rgba(0, 0, 0, .35); +} + +.mycontacts { + color: gray; + letter-spacing: 0.078rem; +} + +.mycontacts_title { + text-shadow: 0.125rem 0.125rem 0.125rem #555; + font-weight: bold; + color: #999; + letter-spacing: 0.125rem; +} + +.mycontacts_text { + color: #999; + letter-spacing: 0.093rem; +} diff --git a/_ALL_SITES/riso.app/root_spec/home_tdv/home_tdv.ts b/_ALL_SITES/riso.app/root_spec/home_tdv/home_tdv.ts new file mode 100755 index 00000000..a636bdb8 --- /dev/null +++ b/_ALL_SITES/riso.app/root_spec/home_tdv/home_tdv.ts @@ -0,0 +1,78 @@ +import { defineComponent, ref, onMounted, watch, computed } from 'vue' + +import { useGlobalStore } from '@store/globalStore' +import { useRoute } from 'vue-router' +import { useUserStore } from '@store/UserStore' + +import { Logo } from '../../components/logo' + +import { LandingFooter } from '../../components/LandingFooter' +import { CMyPage } from '../../components/CMyPage/index' + +import { tools } from '@src/store/Modules/tools' +import { static_data } from '@src/db/static_data' +import { toolsext } from '@src/store/Modules/toolsext' +import { Screen } from 'quasar' +import { CCardCarousel, CEventsCalendar, COpenStreetMap } from '@components' +import MixinBase from '@src/mixins/mixin-base' +import { firstimagehome } from '@src/db/static_data' +import MixinMetaTags from '@/mixins/mixin-metatags' + +export default defineComponent({ + name: 'Home_tdv', + components: { Logo, LandingFooter, CMyPage, CCardCarousel, CEventsCalendar, COpenStreetMap }, + + setup() { + const animare = ref(0) + const slide = ref('first') + const slide2 = ref(1) + + const getImmagini = ref([ + { + title: '', subtitle: '', + alt: 'Elisa e Cristina insieme', + img: '../../statics/images/eventi_esterni/IMG_6035.jpg' + }, + ]) + + const userStore = useUserStore() + const globalStore = useGlobalStore() + + const { setValDb, getValDb } = MixinBase() + const { setmeta, getsrcbyimg } = MixinMetaTags() + + function getheightgallery() { + if (tools.isMobile()) + return '400px' + else + return '600px' + } + + function created() { + // + } + + function getArrDisciplines() { + return globalStore.disciplines.filter((rec: any) => rec.showinhome) + } + + created() + + return { + tools, + toolsext, + static_data, + animare, + slide, + slide2, + getheightgallery, + getArrDisciplines, + getImmagini, + getValDb, + firstimagehome, + getsrcbyimg, + setmeta, + } + }, +}) + diff --git a/_ALL_SITES/riso.app/root_spec/home_tdv/home_tdv.vue b/_ALL_SITES/riso.app/root_spec/home_tdv/home_tdv.vue new file mode 100755 index 00000000..d0710b3a --- /dev/null +++ b/_ALL_SITES/riso.app/root_spec/home_tdv/home_tdv.vue @@ -0,0 +1,220 @@ + + + + + diff --git a/deploy_on_prod_pcb.sh b/deploy_on_prod_pcb.sh index 1eaec88a..d91662cd 100755 --- a/deploy_on_prod_pcb.sh +++ b/deploy_on_prod_pcb.sh @@ -19,7 +19,7 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then npm run buildpwa echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." - rsync -e 'ssh -p 8822' -a dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE + rsync -e 'ssh -p 8822' -a --exclude 'upload' dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE echo "Finito $SERVERDIR_WEBSITE " diff --git a/deploy_on_production.sh b/deploy_on_production.sh index 86fe84c3..f914cabe 100755 --- a/deploy_on_production.sh +++ b/deploy_on_production.sh @@ -19,9 +19,9 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then echo "Sincronizzazione in remoto..." echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." - sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ suryapaolo@servereng:/var/www/$SERVERDIR_WEBSITE/ - #rsync -e 'ssh -p 8855' -av --delete dist/pwa/js/ suryapaolo@servereng:/var/www/$SERVERDIR_WEBSITE/js - rsync -e 'ssh -p 8855' -a dist/pwa/js/ suryapaolo@servereng:/var/www/$SERVERDIR_WEBSITE/js + sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ suryapaolo@servereng:$SERVERDIR_WEBSITE/ + #rsync -e 'ssh -p 8855' -av --delete dist/pwa/js/ suryapaolo@servereng:$SERVERDIR_WEBSITE/js + rsync -e 'ssh -p 8855' -a dist/pwa/js/ suryapaolo@servereng:$SERVERDIR_WEBSITE/js echo "Finito $SERVERDIR_WEBSITE " fi diff --git a/deploy_on_test2_server.sh b/deploy_on_test2_server.sh index fd0ba077..f79ea29b 100755 --- a/deploy_on_test2_server.sh +++ b/deploy_on_test2_server.sh @@ -18,8 +18,8 @@ sleep 1 npm run buildpwa echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." -sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ suryapaolo@servereng:/var/www/$SERVERDIR_WEBSITE/ -rsync -e 'ssh -p 8855' -av --delete dist/pwa/js/ suryapaolo@servereng:/var/www/$SERVERDIR_WEBSITE/js +sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ suryapaolo@servereng:$SERVERDIR_WEBSITE/ +rsync -e 'ssh -p 8855' -av --delete dist/pwa/js/ suryapaolo@servereng:$SERVERDIR_WEBSITE/js cp .env.prod.bak .env.production diff --git a/deploy_on_test_abitaregliiblei.it.sh b/deploy_on_test_abitaregliiblei.it.sh index 6c68e145..149370c9 100755 --- a/deploy_on_test_abitaregliiblei.it.sh +++ b/deploy_on_test_abitaregliiblei.it.sh @@ -18,7 +18,7 @@ sleep 1 npm run buildpwa echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." -rsync -e 'ssh -p 8822' -a dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE +rsync -e 'ssh -p 8822' -a --exclude 'upload' dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE #rsync -e 'ssh -p 8822' -av --delete dist/pwa/js/ pcbuser@pcb:$SERVERDIR_WEBSITE/js rsync -e 'ssh -p 8822' -a dist/pwa/js/ pcbuser@pcb:$SERVERDIR_WEBSITE/js diff --git a/deploy_on_test_gruppomacro.app.sh b/deploy_on_test_gruppomacro.app.sh index c14d713b..298fdb43 100755 --- a/deploy_on_test_gruppomacro.app.sh +++ b/deploy_on_test_gruppomacro.app.sh @@ -18,7 +18,7 @@ sleep 1 npm run buildpwa echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." -rsync -e 'ssh -p 8822' -a dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE +rsync -e 'ssh -p 8822' -a --exclude 'upload' dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE rsync -e 'ssh -p 8822' -av --delete dist/pwa/js/ pcbuser@pcb:$SERVERDIR_WEBSITE/js cp .env.prod.bak .env.production diff --git a/deploy_on_test_pcb.sh b/deploy_on_test_pcb.sh index 161fc6a2..ed1b1bc1 100755 --- a/deploy_on_test_pcb.sh +++ b/deploy_on_test_pcb.sh @@ -18,7 +18,7 @@ sleep 1 npm run buildpwa echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." -rsync -e 'ssh -p 8822' -a dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE +rsync -e 'ssh -p 8822' -a --exclude 'upload' dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE rsync -e 'ssh -p 8822' -a dist/pwa/js/ pcbuser@pcb:$SERVERDIR_WEBSITE/js cp .env.prod.bak .env.production diff --git a/deploy_on_test_server.sh b/deploy_on_test_server.sh index 62d8c0d2..8b77d679 100755 --- a/deploy_on_test_server.sh +++ b/deploy_on_test_server.sh @@ -19,8 +19,8 @@ sleep 1 npm run buildpwa echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." -sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ -rsync -e 'ssh -p 8855' -av --delete dist/pwa/js/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/js +sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ ftpadmin@servereng:$SERVERDIR_WEBSITE/ +rsync -e 'ssh -p 8855' -av --delete dist/pwa/js/ ftpadmin@servereng:$SERVERDIR_WEBSITE/js cp .env.prod.bak .env.production diff --git a/deploy_riso_on_pcb_server.sh b/deploy_riso_on_pcb_server.sh index 161fc6a2..4daddb10 100755 --- a/deploy_riso_on_pcb_server.sh +++ b/deploy_riso_on_pcb_server.sh @@ -18,7 +18,7 @@ sleep 1 npm run buildpwa echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." -rsync -e 'ssh -p 8822' -a dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE +rsync -e 'ssh -p 8822' -a --exclude 'upload' dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE rsync -e 'ssh -p 8822' -a dist/pwa/js/ pcbuser@pcb:$SERVERDIR_WEBSITE/js cp .env.prod.bak .env.production diff --git a/deploy_risosrv_on_test_server.sh b/deploy_risosrv_on_test_server.sh index 29cf12aa..812eca67 100755 --- a/deploy_risosrv_on_test_server.sh +++ b/deploy_risosrv_on_test_server.sh @@ -18,7 +18,7 @@ sleep 1 npm run buildpwa echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." -rsync -e 'ssh -p 8822' -a dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE +rsync -e 'ssh -p 8822' -a --exclude 'upload' dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE rsync -e 'ssh -p 8822' -a dist/pwa/js/ pcbuser@pcb:$SERVERDIR_WEBSITE/js diff --git a/deploy_spa_on_production.sh b/deploy_spa_on_production.sh index 148b657c..2f45fe8a 100755 --- a/deploy_spa_on_production.sh +++ b/deploy_spa_on_production.sh @@ -19,7 +19,7 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then echo "Sincronizzazione in remoto..." echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." - sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ + sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/spa/ ftpadmin@servereng:$SERVERDIR_WEBSITE/ echo "Finito $SERVERDIR_WEBSITE " fi diff --git a/deploy_spa_test_server.sh b/deploy_spa_test_server.sh index 1fe5b052..c782df4c 100755 --- a/deploy_spa_test_server.sh +++ b/deploy_spa_test_server.sh @@ -19,8 +19,8 @@ sleep 1 npm run buildspa echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." -sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ -rsync -e 'ssh -p 8855' -av --delete dist/spa/js/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/js +sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/spa/ ftpadmin@servereng:$SERVERDIR_WEBSITE/ +rsync -e 'ssh -p 8855' -av --delete dist/spa/js/ ftpadmin@servereng:$SERVERDIR_WEBSITE/js cp .env.prod.bak .env.production diff --git a/now.txt b/now.txt index d59a86e1..9bc58f3e 100644 --- a/now.txt +++ b/now.txt @@ -1 +1 @@ -TERMINA DI LAVORARE SU abitaregliiblei.it: (Sovrascrivo !) +TERMINA DI LAVORARE SU piuchebuono.app: (Sovrascrivo !) diff --git a/send_pwa_to_pcb.sh b/send_pwa_to_pcb.sh index 5eb017d1..57af49c1 100755 --- a/send_pwa_to_pcb.sh +++ b/send_pwa_to_pcb.sh @@ -1,8 +1,8 @@ #!/bin/bash -source .env.test.pcb +source .env.prod.pcb -cp .env.test.pcb .env.production +cp .env.prod.pcb .env.production echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." rsync -e 'ssh -p 8822' -a --exclude 'upload' dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE diff --git a/send_pwa_to_production.sh b/send_pwa_to_production.sh index 4007b6ee..d890d094 100755 --- a/send_pwa_to_production.sh +++ b/send_pwa_to_production.sh @@ -9,6 +9,6 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." - sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -avv --exclude 'upload' dist/pwa/ suryapaolo@servereng:/var/www/$SERVERDIR_WEBSITE/ + sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ suryapaolo@servereng:$SERVERDIR_WEBSITE/ echo "Finito $SERVERDIR_WEBSITE " fi diff --git a/send_pwa_to_test.sh b/send_pwa_to_test.sh index 130a9976..16c12bd5 100755 --- a/send_pwa_to_test.sh +++ b/send_pwa_to_test.sh @@ -5,7 +5,7 @@ source ./.env.test cp .env.test .env.production echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." -sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ +sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ ftpadmin@servereng:$SERVERDIR_WEBSITE/ echo "Finito $SERVERDIR_WEBSITE" cp .env.prod.bak .env.production diff --git a/send_pwa_to_test2.sh b/send_pwa_to_test2.sh index 128b7d74..477323b7 100755 --- a/send_pwa_to_test2.sh +++ b/send_pwa_to_test2.sh @@ -5,8 +5,8 @@ source ./.env.test2 cp .env.test2 .env.production echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." -sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ suryapaolo@servereng:/var/www/$SERVERDIR_WEBSITE/ -sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' dist/pwa/index.html suryapaolo@servereng:/var/www/$SERVERDIR_WEBSITE/ +sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ suryapaolo@servereng:$SERVERDIR_WEBSITE/ +sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' dist/pwa/index.html suryapaolo@servereng:$SERVERDIR_WEBSITE/ echo "Finito $SERVERDIR_WEBSITE" cp .env.prod.bak .env.production diff --git a/send_spa_to_production.sh b/send_spa_to_production.sh index 80f4baac..62341862 100755 --- a/send_spa_to_production.sh +++ b/send_spa_to_production.sh @@ -9,6 +9,6 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." - sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ + sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/spa/ ftpadmin@servereng:$SERVERDIR_WEBSITE/ echo "Finito $SERVERDIR_WEBSITE " fi diff --git a/send_spa_to_test.sh b/send_spa_to_test.sh index 7964dce9..57d01527 100755 --- a/send_spa_to_test.sh +++ b/send_spa_to_test.sh @@ -5,7 +5,7 @@ source ./.env.test cp .env.test .env.production echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." -sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ +sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/spa/ ftpadmin@servereng:$SERVERDIR_WEBSITE/ echo "Finito $SERVERDIR_WEBSITE" cp .env.prod.bak .env.production diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index 47592857..a5fc1375 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -328,6 +328,7 @@ export const shared_consts = { TABLES_DIRECTORY_A_PARTE: ['mygroups'], TABLES_WITH_ADMINS: ['mygroups', 'circuits'], TABLES_DIRECTORY_SINGLE_IMG: ['circuits'], + TABLES_IMAGEFILE_SINGOLO: ['productInfos'], TABLES_VISU_MAP: 'attivitas', @@ -2198,6 +2199,8 @@ export const shared_consts = { MOBI: 106, PDF: 107, STREAMING: 108, + + PRODUCT: 1000, }, VERSIONI_PRODOTTO: [ diff --git a/src/components/CCatalogoCard/CCatalogoCard.vue b/src/components/CCatalogoCard/CCatalogoCard.vue index a5f2060f..83ceafa5 100755 --- a/src/components/CCatalogoCard/CCatalogoCard.vue +++ b/src/components/CCatalogoCard/CCatalogoCard.vue @@ -45,8 +45,8 @@ > diff --git a/src/components/CMyElem/CMyElem.vue b/src/components/CMyElem/CMyElem.vue index a79c95ea..c2e30b0c 100755 --- a/src/components/CMyElem/CMyElem.vue +++ b/src/components/CMyElem/CMyElem.vue @@ -325,7 +325,7 @@ :key="index" :name="index" :img-src=" - getsrcbyimg(`upload/pages/` + myel.path + `/` + rec.imagefile) + getsrcbyimg(costanti.DIR_UPLOAD + `pages/` + myel.path + `/` + rec.imagefile) " :alt="rec.alt" class="carousel_slide" diff --git a/src/components/CMyValueDb/CMyValueDb.ts b/src/components/CMyValueDb/CMyValueDb.ts index 25daecf1..f492ff9a 100755 --- a/src/components/CMyValueDb/CMyValueDb.ts +++ b/src/components/CMyValueDb/CMyValueDb.ts @@ -128,6 +128,11 @@ export default defineComponent({ required: false, default: '', }, + path: { + type: String, + required: false, + default: '', + }, pickup: { type: Boolean, required: false, diff --git a/src/components/CMyValueDb/CMyValueDb.vue b/src/components/CMyValueDb/CMyValueDb.vue index 4b8481aa..39e117ce 100755 --- a/src/components/CMyValueDb/CMyValueDb.vue +++ b/src/components/CMyValueDb/CMyValueDb.vue @@ -71,6 +71,7 @@ minuteinterval="1" @showandsave="showandsave" @save="save" + :path="path" > diff --git a/src/components/CProductCard/CProductCard.scss b/src/components/CProductCard/CProductCard.scss index 9704253a..316ed9da 100755 --- a/src/components/CProductCard/CProductCard.scss +++ b/src/components/CProductCard/CProductCard.scss @@ -12,6 +12,7 @@ .prod_price { font-size: 1.25rem; + @media (max-width: 718px) { font-size: 1.15rem; } @@ -20,14 +21,16 @@ .prod_disp { font-size: 1.2rem; + @media (max-width: 718px) { font-size: 1rem; } } -.prod_preorder{ +.prod_preorder { font-size: 1.2rem; + @media (max-width: 718px) { font-size: 1rem; } @@ -53,22 +56,25 @@ font-size: 0.75rem; color: gray; } + .subcat { font-size: 1rem; + @media (max-width: 718px) { font-size: 0.85rem; } } + .subcat_color { color: green; } -.label-qta{ +.label-qta { font-size: 1.15rem; font-weight: bold; } -.countdown_scadenza{ +.countdown_scadenza { font-size: 1.15rem; font-weight: bold; } @@ -77,8 +83,9 @@ font-style: italic; } -.icone_prod{ +.icone_prod { font-size: 1.25rem; + @media (max-width: 718px) { font-size: 1.15rem; } @@ -106,37 +113,49 @@ max-height: 100%; } -.titolo_prod{ - cursor: pointer; +.titolo_prod { + cursor: pointer; } .image-section { justify-content: center; } -.card_titolo_prod{ +.card_titolo_prod { text-align: center; padding: 4px 4px 4px 4px; height: 70px; } .image-container { - width: 300px; - height: 300px; + width: 316px; + height: 316px; position: relative; - overflow: hidden; + overflow: auto; + @media (max-width: 718px) { - width: 200px; - height: 200px; - } + width: 200px; + height: 200px; + } + } .img-pic { - width: 100%; - height: 100%; + width: 98%; + height: 98%; object-fit: cover; + padding: 0px; + border-radius: 15px; + box-shadow: 0 8px 15px rgba(0, 0, 0, 0.2), 0 6px 20px rgba(0, 0, 0, 0.19); + transition: transform 0.3s ease, box-shadow 0.3s ease; + z-index: 2; } -.q-card__section--vert{ - padding: 4px; +.img-pic:hover { + transform: scale(1.5); + box-shadow: 0 12px 24px rgba(0, 0, 0, 0.25), 0 8px 30px rgba(0, 0, 0, 0.22); } + +.q-card__section--vert { + padding: 4px; +} \ No newline at end of file diff --git a/src/components/CProductCard/CProductCard.ts b/src/components/CProductCard/CProductCard.ts index 1afc7b32..25ab5d61 100755 --- a/src/components/CProductCard/CProductCard.ts +++ b/src/components/CProductCard/CProductCard.ts @@ -7,6 +7,7 @@ import { useQuasar } from 'quasar' import { CTitleBanner } from '../CTitleBanner' import { CCardState } from '../CCardState' import { CCopyBtn } from '../CCopyBtn' +import { CMyFieldRec } from '../CMyFieldRec' import { CMyValueDb } from '../CMyValueDb' import { func_tools, toolsext } from '@store/Modules/toolsext' @@ -49,7 +50,7 @@ export default defineComponent({ default: false, }, }, - components: { CTitleBanner, CCardState, CCopyBtn, CMyValueDb, VuePdfApp }, + components: { CTitleBanner, CCardState, CCopyBtn, CMyFieldRec, CMyValueDb, VuePdfApp }, setup(props, { emit }) { const $q = useQuasar() const { t } = useI18n() @@ -429,8 +430,8 @@ export default defineComponent({ return false; } - const { img, image_link } = myproduct.value.productInfo; - return ((!!img && img !== '') || (!!image_link && image_link !== '')) + const { imagefile, image_link } = myproduct.value.productInfo; + return ((!!imagefile && imagefile !== '') || (!!image_link && image_link !== '')) } onMounted(mounted) diff --git a/src/components/CProductCard/CProductCard.vue b/src/components/CProductCard/CProductCard.vue index dbe0babf..008205e8 100755 --- a/src/components/CProductCard/CProductCard.vue +++ b/src/components/CProductCard/CProductCard.vue @@ -28,7 +28,11 @@
@@ -120,6 +125,7 @@ :clickable="tools.isManager()" @click=" tools.isManager() && + !editOn && myproduct.QuantitaOrdinateInAttesa && myproduct.QuantitaOrdinateInAttesa > 0 ? visuListDisponibili() @@ -217,8 +223,17 @@
  {{ t('ecomm.codice') }}: {{ myproduct.productInfo.code }}
-
- {{ t('ecomm.subcat') }}: {{ myproduct.productInfo.subcatprods[0].name }} +
+ {{ t('ecomm.subcat') }}: + {{ + myproduct.productInfo.subcatprods[0].name + }}
@@ -302,9 +317,7 @@ - +
@@ -349,12 +362,53 @@ :type="costanti.FieldType.string" > -
-
+
+ +
+
+ Scegli l'Immagine: +
+ +
+ + +
+ {{ myproduct.productInfo.imagefile }} +
+ + + {{ t('ecomm.offerta_gas_raggiunta', { - qta: myproduct.qtyToReachForGas * myproduct.productInfo.weight, + qta: + myproduct.qtyToReachForGas * myproduct.productInfo.weight, unit: tools.getUnitsMeasure( myproduct.productInfo.unit, true, @@ -521,7 +577,8 @@ }} {{ t('ecomm.offerta_gas', { - qta: myproduct.qtyToReachForGas * myproduct.productInfo.weight, + qta: + myproduct.qtyToReachForGas * myproduct.productInfo.weight, unit: tools.getUnitsMeasure( myproduct.productInfo.unit, true, @@ -562,8 +619,12 @@ {{ t('ecomm.bookedGASQtyOrdered_str', { - qta: (myproduct.bookableGASBloccatiQty + myproduct.QuantitaPrenotateInAttesa) * myproduct.productInfo.weight, - qtatot: myproduct.qtyToReachForGas * myproduct.productInfo.weight, + qta: + (myproduct.bookableGASBloccatiQty + + myproduct.QuantitaPrenotateInAttesa) * + myproduct.productInfo.weight, + qtatot: + myproduct.qtyToReachForGas * myproduct.productInfo.weight, }) }} @@ -643,7 +704,7 @@ - + @@ -998,7 +1065,11 @@ @click="toggleFullScreen" > diff --git a/src/model/Products.ts b/src/model/Products.ts index 07a4ec79..22bd18c3 100755 --- a/src/model/Products.ts +++ b/src/model/Products.ts @@ -22,7 +22,7 @@ export interface IProductInfo { stars?: number date?: Date icon?: string - img?: string + imagefile?: string img2?: string img3?: string img4?: string diff --git a/src/store/Modules/costanti.ts b/src/store/Modules/costanti.ts index c5774878..1c17505b 100755 --- a/src/store/Modules/costanti.ts +++ b/src/store/Modules/costanti.ts @@ -307,7 +307,7 @@ export const costanti = { VISUTABLE_USER_TABCIRCUIT: -5, VISUTABLE_GROUP_CIRCUIT: -6, - DIR_UPLOAD: 'upload/', // upload/ + DIR_UPLOAD: 'upload/', FRIENDS: 1, ASK_TRUST: 2, diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts index efe68fec..74529c1d 100755 --- a/src/store/Modules/fieldsTable.ts +++ b/src/store/Modules/fieldsTable.ts @@ -2220,7 +2220,7 @@ export const colTableProductInfos = [ AddCol({ name: 'name', label_trans: 'products.name' }), AddCol({ name: 'description', label_trans: 'products.description', fieldtype: costanti.FieldType.html }), AddCol({ name: 'icon', label_trans: 'products.icon' }), - AddCol({ name: 'img', label_trans: 'products.img', fieldtype: costanti.FieldType.image_and_filename, path: 'upload/products/' }), + AddCol({ name: 'imagefile', label_trans: 'products.img', fieldtype: costanti.FieldType.image_and_filename, path: costanti.DIR_UPLOAD + 'products/' }), AddCol({ name: 'department', label_trans: 'products.department', diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index b36f2391..98581a75 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -7340,18 +7340,25 @@ export const tools = { // console.log('arrimage', arrimage) if (shared_consts.TABLES_DIRECTORY_A_PARTE.includes(table)) { - return `upload/${table}/` + groupname + '/' + arrimage[0].imagefile + return costanti.DIR_UPLOAD + `${table}/` + groupname + '/' + arrimage[0].imagefile } else if (shared_consts.TABLES_DIRECTORY_SINGLE_IMG.includes(table)) { - return `upload/${table}/` + groupname + '/' + arrimage[0].imagefile + return costanti.DIR_UPLOAD + `${table}/` + groupname + '/' + arrimage[0].imagefile } else { // console.log('username', username, 'table', table) if (arrimage && arrimage.length > 0) { - return `upload/profile/${username}/${table}/` + arrimage[0].imagefile + return costanti.DIR_UPLOAD + `profile/${username}/${table}/` + arrimage[0].imagefile } else { return '' } } }, + getFullFileNameByImageFile(imagefile: string, table: string) { + // console.log('arrimage', arrimage) + + if (shared_consts.TABLES_IMAGEFILE_SINGOLO.includes(table)) { + return costanti.DIR_UPLOAD + `products/` + imagefile + } + }, canModifyThisRec(rec: any, tablesel: string) { // console.log('rec', rec) @@ -7921,7 +7928,7 @@ export const tools = { }, getImgFileByFilename(elem: IMyElem, filename: string) { - return 'upload/pages/' + elem.path + '/' + filename + return costanti.DIR_UPLOAD + 'pages/' + elem.path + '/' + filename }, getImgFileByElem(elem: IMyElem, reccard?: IMyCard) { @@ -7938,13 +7945,13 @@ export const tools = { addtourl = '?v=' + reccard.vers_img } - return 'upload/pages/' + elem.path + '/' + reccard.imagefile + addtourl + return costanti.DIR_UPLOAD + 'pages/' + elem.path + '/' + reccard.imagefile + addtourl } else return '' } else if (elem.type === shared_consts.ELEMTYPE.IMAGE) { - return 'upload/pages/' + elem.path + '/' + elem.container + addtourl + return costanti.DIR_UPLOAD + 'pages/' + elem.path + '/' + elem.container + addtourl } else { - return 'upload/pages/' + elem.path + '/' + elem.image + addtourl + return costanti.DIR_UPLOAD + 'pages/' + elem.path + '/' + elem.image + addtourl } } }, diff --git a/src/views/admin/dbop/dbop.vue b/src/views/admin/dbop/dbop.vue index 61c9c761..5c4e31e2 100755 --- a/src/views/admin/dbop/dbop.vue +++ b/src/views/admin/dbop/dbop.vue @@ -533,6 +533,11 @@ color="primary" @click="EseguiFunz('correggiProductTypes', '', '')" > +

diff --git a/src/views/user/myservice/myservice.vue b/src/views/user/myservice/myservice.vue index 5f6670cf..35b67a4f 100755 --- a/src/views/user/myservice/myservice.vue +++ b/src/views/user/myservice/myservice.vue @@ -17,30 +17,6 @@
- -

diff --git a/upload_cartella_imgs_from_pcb.sh b/upload_cartella_imgs_from_pcb.sh new file mode 100755 index 00000000..4be5b093 --- /dev/null +++ b/upload_cartella_imgs_from_pcb.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +source ./.env.prod.pcb + +msg="*** Sincronizza la Cartella UPLOAD dal Server $SERVERDIR_WEBSITE in LOCALE (Y/N) ? " + +if [ "$1" = "" ]; then + read -p "$msg" risposta +else + risposta=$1 +fi + +cp .env.production .env.prod.bak +cp .env.prod.pcb .env.production + +sleep 1 + + +echo "Sincronizzazione $SERVERDIR_WEBSITE/upload ..." +rsync -avz -e 'ssh -p 8822' pcbuser@pcb:$SERVERDIR_WEBSITE/upload/ upload/ +rsync -avz -e 'ssh -p 8822' pcbuser@pcb:$SERVERDIR_WEBSITE/upload/ public/upload/ + +cp .env.prod.bak .env.production + +sleep 1 + +echo "Finito $SERVERDIR_WEBSITE"