surya/salvato.newfreeplanet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- piuchebuono: possiblità di modificare l'immagine dalla scheda direttamente

Browse Source 
- migliorata di poco la grafica dell'immagine.
This commit is contained in:
Surya Paolo
2024-10-02 23:26:52 +02:00
parent e29de7e0f6
commit d09f4831cf
53 changed files with 1736 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.env.prod.gruppomacro
View File

@@ -2,8 +2,8 @@ APP_VERSION="1.1.0"
SERVICE_WORKER_FILE="service-worker_1.1.0.js" SERVICE_WORKER_FILE="service-worker_1.1.0.js"
APP_ID="18" APP_ID="18"
DIRECTORY_LOCAL=newfreeplanet DIRECTORY_LOCAL=newfreeplanet
DIRECTORY_SERVER=freeplanet_serverside DIRECTORY_SERVER=/var/www/freeplanet_serverside
SERVERDIR_WEBSITE="/var/customers/webs/paolouser/gruppomacro.app/" SERVERDIR_WEBSITE="/var/www/test.gruppomacro.app"
SERVERPW_WEBSITE=pwdadmin@1AOK SERVERPW_WEBSITE=pwdadmin@1AOK
APP_URL="https://gruppomacro.app" APP_URL="https://gruppomacro.app"
URL_FACEBOOK="" URL_FACEBOOK=""

6
.env.prod.pcb
View File

@@ -1,9 +1,9 @@
APP_VERSION="1.1.0" APP_VERSION="1.1.0"
SERVICE_WORKER_FILE="service-worker.js" SERVICE_WORKER_FILE="service-worker_1.1.0.js"
APP_ID="17" APP_ID="17"
DIRECTORY_LOCAL=newfreeplanet DIRECTORY_LOCAL=newfreeplanet
DIRECTORY_SERVER=freeplanet_serverside DIRECTORY_SERVER=/var/www/nodejs_piuchebuono_server
SERVERDIR_WEBSITE="/var/www/piuchebuono.app/" SERVERDIR_WEBSITE="/var/www/piuchebuono.app"
SERVERPW_WEBSITE=pwdadmin@1AOK SERVERPW_WEBSITE=pwdadmin@1AOK
APP_URL="https://piuchebuono.app" APP_URL="https://piuchebuono.app"
URL_FACEBOOK="" URL_FACEBOOK=""

2
.env.test.abitaregliiblei.it
View File

@@ -2,7 +2,7 @@ APP_VERSION="1.1.0"
SERVICE_WORKER_FILE="service-worker_1.1.0.js" SERVICE_WORKER_FILE="service-worker_1.1.0.js"
APP_ID="19" APP_ID="19"
DIRECTORY_LOCAL=newfreeplanet DIRECTORY_LOCAL=newfreeplanet
DIRECTORY_SERVER=test.freeplanet_serverside DIRECTORY_SERVER=/var/www/nodejs_test.riso_server
SERVERDIR_WEBSITE="/var/www/test.abitaregliiblei.it" SERVERDIR_WEBSITE="/var/www/test.abitaregliiblei.it"
SERVERPW_WEBSITE="pwdadmin@1AOK" SERVERPW_WEBSITE="pwdadmin@1AOK"
APP_URL="https://test.abitaregliiblei.it" APP_URL="https://test.abitaregliiblei.it"

4
.env.test.gruppomacro
View File

@@ -2,8 +2,8 @@ APP_VERSION="1.1.0"
SERVICE_WORKER_FILE="service-worker.js" SERVICE_WORKER_FILE="service-worker.js"
APP_ID="18" APP_ID="18"
DIRECTORY_LOCAL=newfreeplanet DIRECTORY_LOCAL=newfreeplanet
DIRECTORY_SERVER=test.freeplanet_serverside DIRECTORY_SERVER=/var/www/nodejs_test.piuchebuono_server
SERVERDIR_WEBSITE="/var/www/test.gruppomacro.app/" SERVERDIR_WEBSITE="/var/www/test.gruppomacro.app"
APP_URL="https://test.gruppomacro.app" APP_URL="https://test.gruppomacro.app"
URL_FACEBOOK="" URL_FACEBOOK=""
PROVA_PAOLO="" PROVA_PAOLO=""

4
.env.test.pcb
View File

@@ -2,8 +2,8 @@ APP_VERSION="1.1.0"
SERVICE_WORKER_FILE="service-worker_1.1.0.js" SERVICE_WORKER_FILE="service-worker_1.1.0.js"
APP_ID="17" APP_ID="17"
DIRECTORY_LOCAL=newfreeplanet DIRECTORY_LOCAL=newfreeplanet
DIRECTORY_SERVER=test.freeplanet_serverside DIRECTORY_SERVER=/var/www/nodejs_test.piuchebuono_server
SERVERDIR_WEBSITE="/var/www/test.piuchebuono.app/" SERVERDIR_WEBSITE="/var/www/test.piuchebuono.app"
APP_URL="https://test.piuchebuono.app" APP_URL="https://test.piuchebuono.app"
URL_FACEBOOK="" URL_FACEBOOK=""
PROVA_PAOLO="" PROVA_PAOLO=""

4
.env.test_riso.pcb
View File

@@ -2,8 +2,8 @@ APP_VERSION="1.1.0"
SERVICE_WORKER_FILE="service-worker_1.1.0.js" SERVICE_WORKER_FILE="service-worker_1.1.0.js"
APP_ID="13" APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet DIRECTORY_LOCAL=newfreeplanet
DIRECTORY_SERVER=test.freeplanet_serverside DIRECTORY_SERVER=/var/www/nodejs_test.riso_server
SERVERDIR_WEBSITE="/var/customers/webs/paolouser/test.piuchebuono.app/" SERVERDIR_WEBSITE="/var/www/test.piuchebuono.app"
APP_URL="https://testriso.piuchebuono.app" APP_URL="https://testriso.piuchebuono.app"
URL_FACEBOOK="" URL_FACEBOOK=""
PROVA_PAOLO="" PROVA_PAOLO=""

1
.gitignore vendored
View File

@@ -40,6 +40,7 @@ _ALL_SITES/kolibrilab.it/.env.development
_ALL_SITES/kolibrilab.it/.env.test _ALL_SITES/kolibrilab.it/.env.test
_ALL_SITES/arcadei.it/.env.development _ALL_SITES/arcadei.it/.env.development
public/upload/ public/upload/
upload/
._yarn.lock ._yarn.lock
.gitignore .gitignore
._upload ._upload

4
_ALL_SITES/piuchebuono.app/.env.test
View File

@@ -2,8 +2,8 @@ APP_VERSION="1.1.0"
SERVICE_WORKER_FILE="service-worker.js" SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13" APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet DIRECTORY_LOCAL=newfreeplanet
DIRECTORY_SERVER=test.freeplanet_serverside DIRECTORY_SERVER=/var/www/test.freeplanet_serverside
SERVERDIR_WEBSITE="test.riso.app" SERVERDIR_WEBSITE="/var/www/test.riso.app"
SERVERPW_WEBSITE="pwdadmin@1AOK" SERVERPW_WEBSITE="pwdadmin@1AOK"
APP_URL="https://test.riso.app" APP_URL="https://test.riso.app"
URL_FACEBOOK="" URL_FACEBOOK=""

446
_ALL_SITES/piuchebuono.app/root_spec/home_tdv/home_tdv.scss Executable file
View File

@@ -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;
}

78
_ALL_SITES/piuchebuono.app/root_spec/home_tdv/home_tdv.ts Executable file
View File

@@ -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,
}
},
})

220
_ALL_SITES/piuchebuono.app/root_spec/home_tdv/home_tdv.vue Executable file
View File

@@ -0,0 +1,220 @@
<template>
<q-page>
<CMyPage title="Home">
<div class="landing">
<section>
<div class="landing__hero maxwidth1200 text-white">
<q-carousel
animated
:autoplay="animare"
swipeable
infinite
navigation
transition-next="slide-left"
transition-prev="slide-right"
v-model="slide"
:height="getheightgallery()"
width="100%"
>
<q-carousel-slide name="first"
:img-src="getsrcbyimg(firstimagehome())">
<div class="landing__header"></div>
<div class="landing__hero-content row justify-center q-gutter-xs clgutter">
<div class="row">
&nbsp;
</div>
<div class="flex justify-end">
<div class="q-gutter-xs testo-banda clgutter">
<h1 class="text-h1 shadow-max">{{tools.getappname()}}</h1>
<div class="text-subtitle1 shadow text-italic q-pl-sm">
&nbsp;
</div>
<div class="text-subtitle1 shadow-max big text-italic q-pl-sm">
</div>
<div class="text-subtitle2 shadow text-italic q-pl-sm">
</div>
<div>
<br>
<br>
<div v-if="!tools.isLogged()" style="margin: 5px; padding: 5px;" class="home">
<br>
<br>
</div>
</div>
</div>
</div>
</div>
<div class="landing__arrow absolute-bottom text-center">
<i aria-hidden="true"
class="q-icon text-h2 text-white material-icons">expand_more</i>
</div>
</q-carousel-slide>
<q-carousel-slide name="second"
:img-src="getsrcbyimg('images/background2.jpg')" alt="">
<div class="landing__header"></div>
<div class="landing__hero2-content row justify-center q-gutter-xs clgutter">
<div class="row">
<logo></logo>
</div>
<div class="flex justify-end">
<div class="q-gutter-xs testo-banda clgutter">
<h1 class="text-h1 shadow-max">{{tools.getappname()}}</h1>
<h2 class="text-subtitle1 shadow text-italic q-pl-sm">
{{$t('msg.sottoTitoloApp')}}
</h2>
<h2 class="text-subtitle1 shadow-max big text-italic q-pl-sm">
<strong>{{$t('msg.sottoTitoloApp2')}}</strong>
</h2>
<h2 class="text-subtitle2 shadow text-italic q-pl-sm">
{{$t('msg.sottoTitoloApp3')}}
</h2>
</div>
</div>
</div>
<div class="landing__arrow absolute-bottom text-center">
<i aria-hidden="true"
class="q-icon text-h2 text-white material-icons">expand_more</i>
</div>
</q-carousel-slide>
<q-carousel-slide name="third"
:img-src="getsrcbyimg('images/background3.jpg')">
<div class="landing__header"></div>
<div class="landing__hero2-content row justify-center q-gutter-xs clgutter">
<div class="row">
<logo></logo>
</div>
<div class="flex justify-end">
<div class="q-gutter-xs testo-banda clgutter">
<div class="text-h1 shadow-max">{{tools.getappname()}}</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 class="text-subtitle3 shadow text-italic q-pl-sm ">
{{$t('msg.sottoTitoloApp4')}}
</div>
</div>
</div>
</div>
<div class="landing__arrow absolute-bottom text-center">
<!--<i aria-hidden="true"-->
<!--class="q-icon text-h2 text-white material-icons">expand_more</i>-->
</div>
</q-carousel-slide>
</q-carousel>
</div>
</section>
<div class="q-pa-md q-gutter-md">
<div v-if="isLogged && !isVerified" class="text-verified">{{
$t('components.authentication.email_verification.link_sent') }}
</div>
</div>
<CCardCarousel :myarr="getArrDisciplines()">
</CCardCarousel>
<CEventsCalendar :mysingleevent="null" :showfirstN="getValDb('SHOW_LAST_EVENTS', false, 3)">
</CEventsCalendar>
<div v-if="getValDb('VIDEO_HOME', false)" class="row justify-evenly items-center q-gutter-md ">
<div class="text-center">
<h4 class="subtitle text-blue" v-html="getValDb('VIDEO_TITLE', false)"></h4>
<div class="">
<video :width="tools.getwidthscale(mythis, 320, 800)"
:height="tools.getheightbywidth(mythis, 320, 180, 800)" controls>
<source :src="getValDb('VIDEO_HOME', false)" type="video/mp4">
</video>
</div>
<!--<q-video src="../../statics/video/Intervista_Cristina_Barattoni.mp4">-->
<!--</q-video>-->
</div>
</div>
<div v-if="getValDb('YT_VIDEO', false)" class="row justify-evenly items-center q-gutter-md ">
<div class="text-center">
<h4 class="subtitle text-blue" v-html="getValDb('YT_TITLE', false)"></h4>
<div class="">
<div class="">
<iframe
:width="tools.getwidthscale(mythis, getValDb('YT_W', false), 800)"
:height="tools.getheightbywidth(mythis, getValDb('YT_W', false), getValDb('YT_H', false), 800)"
:src="getValDb('YT_VIDEO', false)"
frameborder="0"
allowfullscreen
></iframe>
</div>
</div>
<!--<q-video src="../../statics/video/Intervista_Cristina_Barattoni.mp4">-->
<!--</q-video>-->
</div>
</div>
<section class="maxwidth padding_gallery bg-white text-grey-10 text-center" >
<q-carousel
swipeable
animated
:autoplay="8000"
v-model="slide2"
arrows
thumbnails
infinite
:height="tools.heightgallery()">
<q-carousel-slide v-for="(rec, index) in getImmagini" :key="index" :name="index"
:img-src="rec.img"
:alt="rec.alt"
class="carousel_slide">
<div class="absolute-bottom custom-caption" style="margin-bottom: 70px">
<div class="text-h5"><span
class="text-h6 text-grey-1 shadow-max">{{index + 1}}. </span><span
class="text-h6 text-grey-2 shadow">{{rec.title}}</span></div>
<div class="text-subtitle1"><span class="text-grey-4 shadow">{{rec.subtitle}}</span>
</div>
</div>
</q-carousel-slide>
</q-carousel>
</section>
<div v-if="!tools.isMobile()" style="margin: 60px 60px;"></div>
<COpenStreetMap :imgmap="getValDb('IMGMAP', false)" :urlmap="getValDb('URLMAP', false)" :title="getValDb('MAP_TITLE', false)"
:coordinates="getValDb('COORD_MAP_1', false)" :coord_big="getValDb('COORD_MAP_BIG', false)">
</COpenStreetMap>
<div class="q-ma-md"></div>
</div>
</CMyPage>
</q-page>
</template>
<script lang="ts" src="./home_tdv.ts">
</script>
<style lang="scss" scoped>
@import './home_tdv.scss';
</style>

2
_ALL_SITES/riso.app/.env.development
View File

@@ -1,5 +1,5 @@
APP_VERSION="1.1.0" APP_VERSION="1.1.0"
SERVICE_WORKER_FILE="service-worker.js" SERVICE_WORKER_FILE="service-worker_1.1.0.js"
APP_ID="13" APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet" DIRECTORY_LOCAL="newfreeplanet"
DIRECTORY_SERVER="freeplanet_serverside" DIRECTORY_SERVER="freeplanet_serverside"

6
_ALL_SITES/riso.app/db/lang/ws_it.js
View File

@@ -121,6 +121,12 @@ const msg_website_it = {
only_residenti: 'Solo Residenti', only_residenti: 'Solo Residenti',
only_consiglio: 'Solo Consiglieri', only_consiglio: 'Solo Consiglieri',
color: 'Colore', color: 'Colore',
mainMenu: 'Menu Principale',
subtitle: 'Sottotitolo',
lang: 'Lingua',
keywords: 'Parole Chiave',
desctiption: 'Descrizione',
heightimg: 'Altezza Immagine',
}, },
msg: { msg: {
myAppName: 'Riso', myAppName: 'Riso',

4
_ALL_SITES/riso.app/db/static_data.ts
View File

@@ -209,7 +209,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
meta: { requiresAuth: true, newpage: true }, meta: { requiresAuth: true, newpage: true },
inmenu: false, inmenu: false,
infooter: false, infooter: false,
}, },
{ {
active: true, active: true,
order: 137, order: 137,
@@ -276,7 +276,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
{ {
active: true, active: true,
order: 150, order: 150,
path: '/fundraising', path: '/sostieniilprogetto',
materialIcon: 'fas fa-hand-holding-heart', materialIcon: 'fas fa-hand-holding-heart',
name: 'pages.fundraising', name: 'pages.fundraising',
component: () => import('@src/root/fundraising/fundraising.vue'), component: () => import('@src/root/fundraising/fundraising.vue'),

2
_ALL_SITES/riso.app/quasar.conf.js
View File

@@ -251,6 +251,8 @@ module.exports = configure((ctx) => ({
'Cookies', 'Cookies',
'Loading', 'Loading',
'AppVisibility', 'AppVisibility',
'LocalStorage',
'SessionStorage',
], ],
get plugins_1() { get plugins_1() {
return this._plugins; return this._plugins;

446
_ALL_SITES/riso.app/root_spec/home_tdv/home_tdv.scss Executable file
View File

@@ -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;
}

78
_ALL_SITES/riso.app/root_spec/home_tdv/home_tdv.ts Executable file
View File

@@ -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,
}
},
})

220
_ALL_SITES/riso.app/root_spec/home_tdv/home_tdv.vue Executable file
View File

@@ -0,0 +1,220 @@
<template>
<q-page>
<CMyPage title="Home">
<div class="landing">
<section>
<div class="landing__hero maxwidth1200 text-white">
<q-carousel
animated
:autoplay="animare"
swipeable
infinite
navigation
transition-next="slide-left"
transition-prev="slide-right"
v-model="slide"
:height="getheightgallery()"
width="100%"
>
<q-carousel-slide name="first"
:img-src="getsrcbyimg(firstimagehome())">
<div class="landing__header"></div>
<div class="landing__hero-content row justify-center q-gutter-xs clgutter">
<div class="row">
&nbsp;
</div>
<div class="flex justify-end">
<div class="q-gutter-xs testo-banda clgutter">
<h1 class="text-h1 shadow-max">{{tools.getappname()}}</h1>
<div class="text-subtitle1 shadow text-italic q-pl-sm">
&nbsp;
</div>
<div class="text-subtitle1 shadow-max big text-italic q-pl-sm">
</div>
<div class="text-subtitle2 shadow text-italic q-pl-sm">
</div>
<div>
<br>
<br>
<div v-if="!tools.isLogged()" style="margin: 5px; padding: 5px;" class="home">
<br>
<br>
</div>
</div>
</div>
</div>
</div>
<div class="landing__arrow absolute-bottom text-center">
<i aria-hidden="true"
class="q-icon text-h2 text-white material-icons">expand_more</i>
</div>
</q-carousel-slide>
<q-carousel-slide name="second"
:img-src="getsrcbyimg('images/background2.jpg')" alt="">
<div class="landing__header"></div>
<div class="landing__hero2-content row justify-center q-gutter-xs clgutter">
<div class="row">
<logo></logo>
</div>
<div class="flex justify-end">
<div class="q-gutter-xs testo-banda clgutter">
<h1 class="text-h1 shadow-max">{{tools.getappname()}}</h1>
<h2 class="text-subtitle1 shadow text-italic q-pl-sm">
{{$t('msg.sottoTitoloApp')}}
</h2>
<h2 class="text-subtitle1 shadow-max big text-italic q-pl-sm">
<strong>{{$t('msg.sottoTitoloApp2')}}</strong>
</h2>
<h2 class="text-subtitle2 shadow text-italic q-pl-sm">
{{$t('msg.sottoTitoloApp3')}}
</h2>
</div>
</div>
</div>
<div class="landing__arrow absolute-bottom text-center">
<i aria-hidden="true"
class="q-icon text-h2 text-white material-icons">expand_more</i>
</div>
</q-carousel-slide>
<q-carousel-slide name="third"
:img-src="getsrcbyimg('images/background3.jpg')">
<div class="landing__header"></div>
<div class="landing__hero2-content row justify-center q-gutter-xs clgutter">
<div class="row">
<logo></logo>
</div>
<div class="flex justify-end">
<div class="q-gutter-xs testo-banda clgutter">
<div class="text-h1 shadow-max">{{tools.getappname()}}</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 class="text-subtitle3 shadow text-italic q-pl-sm ">
{{$t('msg.sottoTitoloApp4')}}
</div>
</div>
</div>
</div>
<div class="landing__arrow absolute-bottom text-center">
<!--<i aria-hidden="true"-->
<!--class="q-icon text-h2 text-white material-icons">expand_more</i>-->
</div>
</q-carousel-slide>
</q-carousel>
</div>
</section>
<div class="q-pa-md q-gutter-md">
<div v-if="isLogged && !isVerified" class="text-verified">{{
$t('components.authentication.email_verification.link_sent') }}
</div>
</div>
<CCardCarousel :myarr="getArrDisciplines()">
</CCardCarousel>
<CEventsCalendar :mysingleevent="null" :showfirstN="getValDb('SHOW_LAST_EVENTS', false, 3)">
</CEventsCalendar>
<div v-if="getValDb('VIDEO_HOME', false)" class="row justify-evenly items-center q-gutter-md ">
<div class="text-center">
<h4 class="subtitle text-blue" v-html="getValDb('VIDEO_TITLE', false)"></h4>
<div class="">
<video :width="tools.getwidthscale(mythis, 320, 800)"
:height="tools.getheightbywidth(mythis, 320, 180, 800)" controls>
<source :src="getValDb('VIDEO_HOME', false)" type="video/mp4">
</video>
</div>
<!--<q-video src="../../statics/video/Intervista_Cristina_Barattoni.mp4">-->
<!--</q-video>-->
</div>
</div>
<div v-if="getValDb('YT_VIDEO', false)" class="row justify-evenly items-center q-gutter-md ">
<div class="text-center">
<h4 class="subtitle text-blue" v-html="getValDb('YT_TITLE', false)"></h4>
<div class="">
<div class="">
<iframe
:width="tools.getwidthscale(mythis, getValDb('YT_W', false), 800)"
:height="tools.getheightbywidth(mythis, getValDb('YT_W', false), getValDb('YT_H', false), 800)"
:src="getValDb('YT_VIDEO', false)"
frameborder="0"
allowfullscreen
></iframe>
</div>
</div>
<!--<q-video src="../../statics/video/Intervista_Cristina_Barattoni.mp4">-->
<!--</q-video>-->
</div>
</div>
<section class="maxwidth padding_gallery bg-white text-grey-10 text-center" >
<q-carousel
swipeable
animated
:autoplay="8000"
v-model="slide2"
arrows
thumbnails
infinite
:height="tools.heightgallery()">
<q-carousel-slide v-for="(rec, index) in getImmagini" :key="index" :name="index"
:img-src="rec.img"
:alt="rec.alt"
class="carousel_slide">
<div class="absolute-bottom custom-caption" style="margin-bottom: 70px">
<div class="text-h5"><span
class="text-h6 text-grey-1 shadow-max">{{index + 1}}. </span><span
class="text-h6 text-grey-2 shadow">{{rec.title}}</span></div>
<div class="text-subtitle1"><span class="text-grey-4 shadow">{{rec.subtitle}}</span>
</div>
</div>
</q-carousel-slide>
</q-carousel>
</section>
<div v-if="!tools.isMobile()" style="margin: 60px 60px;"></div>
<COpenStreetMap :imgmap="getValDb('IMGMAP', false)" :urlmap="getValDb('URLMAP', false)" :title="getValDb('MAP_TITLE', false)"
:coordinates="getValDb('COORD_MAP_1', false)" :coord_big="getValDb('COORD_MAP_BIG', false)">
</COpenStreetMap>
<div class="q-ma-md"></div>
</div>
</CMyPage>
</q-page>
</template>
<script lang="ts" src="./home_tdv.ts">
</script>
<style lang="scss" scoped>
@import './home_tdv.scss';
</style>

2
deploy_on_prod_pcb.sh
View File

@@ -19,7 +19,7 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
npm run buildpwa npm run buildpwa
echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." 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 " echo "Finito $SERVERDIR_WEBSITE "

6
deploy_on_production.sh
View File

@@ -19,9 +19,9 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
echo "Sincronizzazione in remoto..." echo "Sincronizzazione in remoto..."
echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." 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' -a --exclude 'upload' dist/pwa/ suryapaolo@servereng:$SERVERDIR_WEBSITE/
#rsync -e 'ssh -p 8855' -av --delete dist/pwa/js/ suryapaolo@servereng:/var/www/$SERVERDIR_WEBSITE/js #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:/var/www/$SERVERDIR_WEBSITE/js rsync -e 'ssh -p 8855' -a dist/pwa/js/ suryapaolo@servereng:$SERVERDIR_WEBSITE/js
echo "Finito $SERVERDIR_WEBSITE " echo "Finito $SERVERDIR_WEBSITE "
fi fi

4
deploy_on_test2_server.sh
View File

@@ -18,8 +18,8 @@ sleep 1
npm run buildpwa npm run buildpwa
echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." 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/ 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:/var/www/$SERVERDIR_WEBSITE/js rsync -e 'ssh -p 8855' -av --delete dist/pwa/js/ suryapaolo@servereng:$SERVERDIR_WEBSITE/js
cp .env.prod.bak .env.production cp .env.prod.bak .env.production

2
deploy_on_test_abitaregliiblei.it.sh
View File

@@ -18,7 +18,7 @@ sleep 1
npm run buildpwa npm run buildpwa
echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." 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' -av --delete dist/pwa/js/ pcbuser@pcb:$SERVERDIR_WEBSITE/js
rsync -e 'ssh -p 8822' -a dist/pwa/js/ pcbuser@pcb:$SERVERDIR_WEBSITE/js rsync -e 'ssh -p 8822' -a dist/pwa/js/ pcbuser@pcb:$SERVERDIR_WEBSITE/js

2
deploy_on_test_gruppomacro.app.sh
View File

@@ -18,7 +18,7 @@ sleep 1
npm run buildpwa npm run buildpwa
echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." 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' -av --delete dist/pwa/js/ pcbuser@pcb:$SERVERDIR_WEBSITE/js
cp .env.prod.bak .env.production cp .env.prod.bak .env.production

2
deploy_on_test_pcb.sh
View File

@@ -18,7 +18,7 @@ sleep 1
npm run buildpwa npm run buildpwa
echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." 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 rsync -e 'ssh -p 8822' -a dist/pwa/js/ pcbuser@pcb:$SERVERDIR_WEBSITE/js
cp .env.prod.bak .env.production cp .env.prod.bak .env.production

4
deploy_on_test_server.sh
View File

@@ -19,8 +19,8 @@ sleep 1
npm run buildpwa npm run buildpwa
echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." 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/ 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:/var/www/$SERVERDIR_WEBSITE/js rsync -e 'ssh -p 8855' -av --delete dist/pwa/js/ ftpadmin@servereng:$SERVERDIR_WEBSITE/js
cp .env.prod.bak .env.production cp .env.prod.bak .env.production

2
deploy_riso_on_pcb_server.sh
View File

@@ -18,7 +18,7 @@ sleep 1
npm run buildpwa npm run buildpwa
echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." 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 rsync -e 'ssh -p 8822' -a dist/pwa/js/ pcbuser@pcb:$SERVERDIR_WEBSITE/js
cp .env.prod.bak .env.production cp .env.prod.bak .env.production

2
deploy_risosrv_on_test_server.sh
View File

@@ -18,7 +18,7 @@ sleep 1
npm run buildpwa npm run buildpwa
echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." 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 rsync -e 'ssh -p 8822' -a dist/pwa/js/ pcbuser@pcb:$SERVERDIR_WEBSITE/js

2
deploy_spa_on_production.sh
View File

@@ -19,7 +19,7 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
echo "Sincronizzazione in remoto..." echo "Sincronizzazione in remoto..."
echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." 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 " echo "Finito $SERVERDIR_WEBSITE "
fi fi

4
deploy_spa_test_server.sh
View File

@@ -19,8 +19,8 @@ sleep 1
npm run buildspa npm run buildspa
echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." 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/ 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:/var/www/$SERVERDIR_WEBSITE/js rsync -e 'ssh -p 8855' -av --delete dist/spa/js/ ftpadmin@servereng:$SERVERDIR_WEBSITE/js
cp .env.prod.bak .env.production cp .env.prod.bak .env.production

2
now.txt
View File

@@ -1 +1 @@
TERMINA DI LAVORARE SU abitaregliiblei.it: (Sovrascrivo !) TERMINA DI LAVORARE SU piuchebuono.app: (Sovrascrivo !)

4
send_pwa_to_pcb.sh
View File

@@ -1,8 +1,8 @@
#!/bin/bash #!/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 ..." echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..."
rsync -e 'ssh -p 8822' -a --exclude 'upload' dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE rsync -e 'ssh -p 8822' -a --exclude 'upload' dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE

2
send_pwa_to_production.sh
View File

@@ -9,6 +9,6 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." 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 " echo "Finito $SERVERDIR_WEBSITE "
fi fi

2
send_pwa_to_test.sh
View File

@@ -5,7 +5,7 @@ source ./.env.test
cp .env.test .env.production cp .env.test .env.production
echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." 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" echo "Finito $SERVERDIR_WEBSITE"
cp .env.prod.bak .env.production cp .env.prod.bak .env.production

4
send_pwa_to_test2.sh
View File

@@ -5,8 +5,8 @@ source ./.env.test2
cp .env.test2 .env.production cp .env.test2 .env.production
echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." 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' -a --exclude 'upload' dist/pwa/ suryapaolo@servereng:$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' dist/pwa/index.html suryapaolo@servereng:$SERVERDIR_WEBSITE/
echo "Finito $SERVERDIR_WEBSITE" echo "Finito $SERVERDIR_WEBSITE"
cp .env.prod.bak .env.production cp .env.prod.bak .env.production

2
send_spa_to_production.sh
View File

@@ -9,6 +9,6 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." 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 " echo "Finito $SERVERDIR_WEBSITE "
fi fi

2
send_spa_to_test.sh
View File

@@ -5,7 +5,7 @@ source ./.env.test
cp .env.test .env.production cp .env.test .env.production
echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." 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" echo "Finito $SERVERDIR_WEBSITE"
cp .env.prod.bak .env.production cp .env.prod.bak .env.production

3
src/common/shared_vuejs.ts
View File

@@ -328,6 +328,7 @@ export const shared_consts = {
TABLES_DIRECTORY_A_PARTE: ['mygroups'], TABLES_DIRECTORY_A_PARTE: ['mygroups'],
TABLES_WITH_ADMINS: ['mygroups', 'circuits'], TABLES_WITH_ADMINS: ['mygroups', 'circuits'],
TABLES_DIRECTORY_SINGLE_IMG: ['circuits'], TABLES_DIRECTORY_SINGLE_IMG: ['circuits'],
TABLES_IMAGEFILE_SINGOLO: ['productInfos'],
TABLES_VISU_MAP: 'attivitas', TABLES_VISU_MAP: 'attivitas',
@@ -2198,6 +2199,8 @@ export const shared_consts = {
MOBI: 106, MOBI: 106,
PDF: 107, PDF: 107,
STREAMING: 108, STREAMING: 108,
PRODUCT: 1000,
}, },
VERSIONI_PRODOTTO: [ VERSIONI_PRODOTTO: [

8
src/components/CCatalogoCard/CCatalogoCard.vue
View File

@@ -45,8 +45,8 @@
> >
<q-img <q-img
:src=" :src="
myproduct.productInfo.img myproduct.productInfo.imagefile
? `` + myproduct.productInfo.img ? `` + myproduct.productInfo.imagefile
: myproduct.productInfo.image_link : myproduct.productInfo.image_link
" "
:alt="myproduct.productInfo.name" :alt="myproduct.productInfo.name"
@@ -543,8 +543,8 @@
> >
<q-img <q-img
:src=" :src="
myproduct.productInfo.img myproduct.productInfo.imagefile
? `` + myproduct.productInfo.img ? `` + myproduct.productInfo.imagefile
: myproduct.productInfo.image_link : myproduct.productInfo.image_link
" "
:alt="myproduct.productInfo.name" :alt="myproduct.productInfo.name"

2
src/components/CMyCardService/CMyCardService.vue
View File

@@ -34,7 +34,7 @@
v-if="myrec.photos.length > 0" v-if="myrec.photos.length > 0"
:imgGallery="myrec.photos" :imgGallery="myrec.photos"
:directory=" :directory="
'upload/' + tools.getDirectoryGall(myrec, table, '') costanti.DIR_UPLOAD + tools.getDirectoryGall(myrec, table, '')
" "
> >
</CGalleryImages> </CGalleryImages>

2
src/components/CMyElem/CMyElem.vue
View File

@@ -325,7 +325,7 @@
:key="index" :key="index"
:name="index" :name="index"
:img-src=" :img-src="
getsrcbyimg(`upload/pages/` + myel.path + `/` + rec.imagefile) getsrcbyimg(costanti.DIR_UPLOAD + `pages/` + myel.path + `/` + rec.imagefile)
" "
:alt="rec.alt" :alt="rec.alt"
class="carousel_slide" class="carousel_slide"

5
src/components/CMyValueDb/CMyValueDb.ts
View File

@@ -128,6 +128,11 @@ export default defineComponent({
required: false, required: false,
default: '', default: '',
}, },
path: {
type: String,
required: false,
default: '',
},
pickup: { pickup: {
type: Boolean, type: Boolean,
required: false, required: false,

1
src/components/CMyValueDb/CMyValueDb.vue
View File

@@ -71,6 +71,7 @@
minuteinterval="1" minuteinterval="1"
@showandsave="showandsave" @showandsave="showandsave"
@save="save" @save="save"
:path="path"
> >
</CMyPopupEdit> </CMyPopupEdit>
</div> </div>

53
src/components/CProductCard/CProductCard.scss
View File

@@ -12,6 +12,7 @@
.prod_price { .prod_price {
font-size: 1.25rem; font-size: 1.25rem;
@media (max-width: 718px) { @media (max-width: 718px) {
font-size: 1.15rem; font-size: 1.15rem;
} }
@@ -20,14 +21,16 @@
.prod_disp { .prod_disp {
font-size: 1.2rem; font-size: 1.2rem;
@media (max-width: 718px) { @media (max-width: 718px) {
font-size: 1rem; font-size: 1rem;
} }
} }
.prod_preorder{ .prod_preorder {
font-size: 1.2rem; font-size: 1.2rem;
@media (max-width: 718px) { @media (max-width: 718px) {
font-size: 1rem; font-size: 1rem;
} }
@@ -53,22 +56,25 @@
font-size: 0.75rem; font-size: 0.75rem;
color: gray; color: gray;
} }
.subcat { .subcat {
font-size: 1rem; font-size: 1rem;
@media (max-width: 718px) { @media (max-width: 718px) {
font-size: 0.85rem; font-size: 0.85rem;
} }
} }
.subcat_color { .subcat_color {
color: green; color: green;
} }
.label-qta{ .label-qta {
font-size: 1.15rem; font-size: 1.15rem;
font-weight: bold; font-weight: bold;
} }
.countdown_scadenza{ .countdown_scadenza {
font-size: 1.15rem; font-size: 1.15rem;
font-weight: bold; font-weight: bold;
} }
@@ -77,8 +83,9 @@
font-style: italic; font-style: italic;
} }
.icone_prod{ .icone_prod {
font-size: 1.25rem; font-size: 1.25rem;
@media (max-width: 718px) { @media (max-width: 718px) {
font-size: 1.15rem; font-size: 1.15rem;
} }
@@ -106,37 +113,49 @@
max-height: 100%; max-height: 100%;
} }
.titolo_prod{ .titolo_prod {
cursor: pointer; cursor: pointer;
} }
.image-section { .image-section {
justify-content: center; justify-content: center;
} }
.card_titolo_prod{ .card_titolo_prod {
text-align: center; text-align: center;
padding: 4px 4px 4px 4px; padding: 4px 4px 4px 4px;
height: 70px; height: 70px;
} }
.image-container { .image-container {
width: 300px; width: 316px;
height: 300px; height: 316px;
position: relative; position: relative;
overflow: hidden; overflow: auto;
@media (max-width: 718px) { @media (max-width: 718px) {
width: 200px; width: 200px;
height: 200px; height: 200px;
} }
} }
.img-pic { .img-pic {
width: 100%; width: 98%;
height: 100%; height: 98%;
object-fit: cover; 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{ .img-pic:hover {
padding: 4px; 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;
}

7
src/components/CProductCard/CProductCard.ts
View File

@@ -7,6 +7,7 @@ import { useQuasar } from 'quasar'
import { CTitleBanner } from '../CTitleBanner' import { CTitleBanner } from '../CTitleBanner'
import { CCardState } from '../CCardState' import { CCardState } from '../CCardState'
import { CCopyBtn } from '../CCopyBtn' import { CCopyBtn } from '../CCopyBtn'
import { CMyFieldRec } from '../CMyFieldRec'
import { CMyValueDb } from '../CMyValueDb' import { CMyValueDb } from '../CMyValueDb'
import { func_tools, toolsext } from '@store/Modules/toolsext' import { func_tools, toolsext } from '@store/Modules/toolsext'
@@ -49,7 +50,7 @@ export default defineComponent({
default: false, default: false,
}, },
}, },
components: { CTitleBanner, CCardState, CCopyBtn, CMyValueDb, VuePdfApp }, components: { CTitleBanner, CCardState, CCopyBtn, CMyFieldRec, CMyValueDb, VuePdfApp },
setup(props, { emit }) { setup(props, { emit }) {
const $q = useQuasar() const $q = useQuasar()
const { t } = useI18n() const { t } = useI18n()
@@ -429,8 +430,8 @@ export default defineComponent({
return false; return false;
} }
const { img, image_link } = myproduct.value.productInfo; const { imagefile, image_link } = myproduct.value.productInfo;
return ((!!img && img !== '') || (!!image_link && image_link !== '')) return ((!!imagefile && imagefile !== '') || (!!image_link && image_link !== ''))
} }
onMounted(mounted) onMounted(mounted)

111
src/components/CProductCard/CProductCard.vue
View File

@@ -28,7 +28,11 @@
<q-card-section horizontal :class="'image-section'"> <q-card-section horizontal :class="'image-section'">
<div v-if="hasImage()" :class="hasImage() ? 'image-container' : ''"> <div v-if="hasImage()" :class="hasImage() ? 'image-container' : ''">
<q-img <q-img
:src="myproduct.productInfo.img ? `` + myproduct.productInfo.img : myproduct.productInfo.image_link" :src="
myproduct.productInfo.imagefile
? tools.getFullFileNameByImageFile(myproduct.productInfo.imagefile, 'productInfos')
: myproduct.productInfo.image_link
"
:alt="myproduct.productInfo.name" :alt="myproduct.productInfo.name"
class="cursor-pointer img-pic" class="cursor-pointer img-pic"
@click=" @click="
@@ -41,10 +45,11 @@
color="primary" color="primary"
round round
icon="fas fa-eye" icon="fas fa-eye"
class="absolute semi-transparent" class="absolute semi-transparent"
size="md" size="md"
@click="toggleFullScreen" @click="toggleFullScreen"
style="bottom: -10px; right: 0px; transform: translateY(-50%)" style="bottom: -10px; right: 0px; transform: translateY(-50%); z-index: 2"
/> />
</div> </div>
@@ -120,6 +125,7 @@
:clickable="tools.isManager()" :clickable="tools.isManager()"
@click=" @click="
tools.isManager() && tools.isManager() &&
!editOn &&
myproduct.QuantitaOrdinateInAttesa && myproduct.QuantitaOrdinateInAttesa &&
myproduct.QuantitaOrdinateInAttesa > 0 myproduct.QuantitaOrdinateInAttesa > 0
? visuListDisponibili() ? visuListDisponibili()
@@ -217,8 +223,17 @@
<div class="product_code"> <div class="product_code">
&nbsp; {{ t('ecomm.codice') }}: {{ myproduct.productInfo.code }} &nbsp; {{ t('ecomm.codice') }}: {{ myproduct.productInfo.code }}
</div> </div>
<div v-if="myproduct.productInfo.subcatprods && myproduct.productInfo.subcatprods.length > 0" class="subcat"> <div
<span style="color: #333333;">{{ t('ecomm.subcat') }}:</span> <span class="subcat_color">{{ myproduct.productInfo.subcatprods[0].name }}</span> v-if="
myproduct.productInfo.subcatprods &&
myproduct.productInfo.subcatprods.length > 0
"
class="subcat"
>
<span style="color: #333333">{{ t('ecomm.subcat') }}:</span>
<span class="subcat_color">{{
myproduct.productInfo.subcatprods[0].name
}}</span>
</div> </div>
</div> </div>
</q-card-section> </q-card-section>
@@ -302,9 +317,7 @@
</div> </div>
</div> </div>
</q-card-section> </q-card-section>
<q-card-section <q-card-section v-if="complete && myproduct.producer">
v-if="complete && myproduct.producer"
>
<div v-if="myproduct.producer.city"> <div v-if="myproduct.producer.city">
<div class="text-grey text-title row items-center q-mt-sm"> <div class="text-grey text-title row items-center q-mt-sm">
<q-icon name="map" class="q-mr-xs" /> <q-icon name="map" class="q-mr-xs" />
@@ -349,12 +362,53 @@
:type="costanti.FieldType.string" :type="costanti.FieldType.string"
> >
</CMyValueDb> </CMyValueDb>
<div v-if="!editOn" v-html="myproduct.productInfo.note"> <div v-if="!editOn" v-html="myproduct.productInfo.note"></div>
</div>
</q-item-label> </q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
</q-card-section> </q-card-section>
<q-card-section
v-if="
editOn &&
(!!myproduct.productInfo.imagefile || myproduct.productInfo.imagefile === '')
"
>
<div class="text-center">
<div class="col">
<strong>Scegli l'Immagine:</strong>
</div>
<div class="row justify-center">
<CMyValueDb
v-if="editOn"
:editOn="editOn"
:title="t('products.imagefile')"
table="productinfos"
:id="myproduct.productInfo._id"
:rec="myproduct.productInfo"
mykey="imagefile"
debounce="1000"
:save="updateproductmodif()"
:type="costanti.FieldType.image"
>
</CMyValueDb>
</div>
{{ myproduct.productInfo.imagefile }}
</div>
<!--<CMyFieldRec
title="Immagine:"
table="myelems"
:id="myproduct.productInfo._id"
:rec="myproduct.productInfo"
field="imagefile"
@update:model-value="modifElem"
:canEdit="true"
:canModify="true"
:fieldtype="costanti.FieldType.image"
>
</CMyFieldRec>-->
</q-card-section>
<q-card-section v-if="isOrdGas()"> <q-card-section v-if="isOrdGas()">
<q-item <q-item
v-if=" v-if="
@@ -367,6 +421,7 @@
:clickable="tools.isManager()" :clickable="tools.isManager()"
@click=" @click="
tools.isManager() && tools.isManager() &&
!editOn &&
myproduct.QuantitaPrenotateInAttesa && myproduct.QuantitaPrenotateInAttesa &&
myproduct.QuantitaPrenotateInAttesa > 0 myproduct.QuantitaPrenotateInAttesa > 0
? visuListBookable() ? visuListBookable()
@@ -511,7 +566,8 @@
<q-item-label class="subtit_prod text-blue text-bold"> <q-item-label class="subtit_prod text-blue text-bold">
<span v-if="getpercqtaraggiunta() >= 1">{{ <span v-if="getpercqtaraggiunta() >= 1">{{
t('ecomm.offerta_gas_raggiunta', { t('ecomm.offerta_gas_raggiunta', {
qta: myproduct.qtyToReachForGas * myproduct.productInfo.weight, qta:
myproduct.qtyToReachForGas * myproduct.productInfo.weight,
unit: tools.getUnitsMeasure( unit: tools.getUnitsMeasure(
myproduct.productInfo.unit, myproduct.productInfo.unit,
true, true,
@@ -521,7 +577,8 @@
}}</span> }}</span>
<span v-else>{{ <span v-else>{{
t('ecomm.offerta_gas', { t('ecomm.offerta_gas', {
qta: myproduct.qtyToReachForGas * myproduct.productInfo.weight, qta:
myproduct.qtyToReachForGas * myproduct.productInfo.weight,
unit: tools.getUnitsMeasure( unit: tools.getUnitsMeasure(
myproduct.productInfo.unit, myproduct.productInfo.unit,
true, true,
@@ -562,8 +619,12 @@
<span class="prod_disp"> <span class="prod_disp">
{{ {{
t('ecomm.bookedGASQtyOrdered_str', { t('ecomm.bookedGASQtyOrdered_str', {
qta: (myproduct.bookableGASBloccatiQty + myproduct.QuantitaPrenotateInAttesa) * myproduct.productInfo.weight, qta:
qtatot: myproduct.qtyToReachForGas * myproduct.productInfo.weight, (myproduct.bookableGASBloccatiQty +
myproduct.QuantitaPrenotateInAttesa) *
myproduct.productInfo.weight,
qtatot:
myproduct.qtyToReachForGas * myproduct.productInfo.weight,
}) })
}} }}
<q-linear-progress size="10px" :value="getpercqtaraggiunta()" /> <q-linear-progress size="10px" :value="getpercqtaraggiunta()" />
@@ -643,7 +704,7 @@
</q-item-label> </q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item <q-item
v-if=" v-if="
myproduct.gasordine && myproduct.gasordine &&
@@ -923,8 +984,11 @@
</q-dialog> </q-dialog>
<q-dialog <q-dialog
v-if="true && v-if="
myproduct && myproduct.productInfo && myproduct.productInfo.link_scheda true &&
myproduct &&
myproduct.productInfo &&
myproduct.productInfo.link_scheda
" "
v-model="apriSchedaPDF" v-model="apriSchedaPDF"
maximized maximized
@@ -958,8 +1022,11 @@
</q-dialog> </q-dialog>
<q-dialog <q-dialog
v-if="false && v-if="
myproduct && myproduct.productInfo && myproduct.productInfo.link_scheda false &&
myproduct &&
myproduct.productInfo &&
myproduct.productInfo.link_scheda
" "
v-model="apriSchedaPDF" v-model="apriSchedaPDF"
fullscreen fullscreen
@@ -980,7 +1047,7 @@
<q-card-section> <q-card-section>
<vue-pdf-app <vue-pdf-app
:pdf="myproduct.productInfo.link_scheda" :pdf="myproduct.productInfo.link_scheda"
style="height: 100vh;" style="height: 100vh"
></vue-pdf-app> ></vue-pdf-app>
</q-card-section> </q-card-section>
</q-dialog> </q-dialog>
@@ -998,7 +1065,11 @@
@click="toggleFullScreen" @click="toggleFullScreen"
> >
<q-img <q-img
:src="myproduct.productInfo.img ? `` + myproduct.productInfo.img : myproduct.productInfo.image_link" :src="
myproduct.productInfo.imagefile
? tools.getFullFileNameByImageFile(myproduct.productInfo.imagefile, 'productInfos')
: myproduct.productInfo.image_link
"
:alt="myproduct.productInfo.name" :alt="myproduct.productInfo.name"
:fit="tools.isMobile() ? 'fill' : 'cover'" :fit="tools.isMobile() ? 'fill' : 'cover'"
class="fullscreen-image" class="fullscreen-image"

4
src/components/CSingleCart/CSingleCart.vue
View File

@@ -10,9 +10,9 @@
v-if=" v-if="
order.product && order.product &&
order.product.productInfo && order.product.productInfo &&
order.product.productInfo.img order.product.productInfo.imagefile
" "
:src="`` + order.product.productInfo.img" :src="`` + order.product.productInfo.imagefile"
:alt="order.product.productInfo.name" :alt="order.product.productInfo.name"
:class="myimgclass()" :class="myimgclass()"
/> />

2
src/model/Products.ts
View File

@@ -22,7 +22,7 @@ export interface IProductInfo {
stars?: number stars?: number
date?: Date date?: Date
icon?: string icon?: string
img?: string imagefile?: string
img2?: string img2?: string
img3?: string img3?: string
img4?: string img4?: string

2
src/store/Modules/costanti.ts
View File

@@ -307,7 +307,7 @@ export const costanti = {
VISUTABLE_USER_TABCIRCUIT: -5, VISUTABLE_USER_TABCIRCUIT: -5,
VISUTABLE_GROUP_CIRCUIT: -6, VISUTABLE_GROUP_CIRCUIT: -6,
DIR_UPLOAD: 'upload/', // upload/ DIR_UPLOAD: 'upload/',
FRIENDS: 1, FRIENDS: 1,
ASK_TRUST: 2, ASK_TRUST: 2,

2
src/store/Modules/fieldsTable.ts
View File

@@ -2220,7 +2220,7 @@ export const colTableProductInfos = [
AddCol({ name: 'name', label_trans: 'products.name' }), AddCol({ name: 'name', label_trans: 'products.name' }),
AddCol({ name: 'description', label_trans: 'products.description', fieldtype: costanti.FieldType.html }), AddCol({ name: 'description', label_trans: 'products.description', fieldtype: costanti.FieldType.html }),
AddCol({ name: 'icon', label_trans: 'products.icon' }), 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({ AddCol({
name: 'department', name: 'department',
label_trans: 'products.department', label_trans: 'products.department',

21
src/store/Modules/tools.ts
View File

@@ -7340,18 +7340,25 @@ export const tools = {
// console.log('arrimage', arrimage) // console.log('arrimage', arrimage)
if (shared_consts.TABLES_DIRECTORY_A_PARTE.includes(table)) { 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)) { } 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 { } else {
// console.log('username', username, 'table', table) // console.log('username', username, 'table', table)
if (arrimage && arrimage.length > 0) { if (arrimage && arrimage.length > 0) {
return `upload/profile/${username}/${table}/` + arrimage[0].imagefile return costanti.DIR_UPLOAD + `profile/${username}/${table}/` + arrimage[0].imagefile
} else { } else {
return '' 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) { canModifyThisRec(rec: any, tablesel: string) {
// console.log('rec', rec) // console.log('rec', rec)
@@ -7921,7 +7928,7 @@ export const tools = {
}, },
getImgFileByFilename(elem: IMyElem, filename: string) { getImgFileByFilename(elem: IMyElem, filename: string) {
return 'upload/pages/' + elem.path + '/' + filename return costanti.DIR_UPLOAD + 'pages/' + elem.path + '/' + filename
}, },
getImgFileByElem(elem: IMyElem, reccard?: IMyCard) { getImgFileByElem(elem: IMyElem, reccard?: IMyCard) {
@@ -7938,13 +7945,13 @@ export const tools = {
addtourl = '?v=' + reccard.vers_img addtourl = '?v=' + reccard.vers_img
} }
return 'upload/pages/' + elem.path + '/' + reccard.imagefile + addtourl return costanti.DIR_UPLOAD + 'pages/' + elem.path + '/' + reccard.imagefile + addtourl
} else } else
return '' return ''
} else if (elem.type === shared_consts.ELEMTYPE.IMAGE) { } 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 { } else {
return 'upload/pages/' + elem.path + '/' + elem.image + addtourl return costanti.DIR_UPLOAD + 'pages/' + elem.path + '/' + elem.image + addtourl
} }
} }
}, },

5
src/views/admin/dbop/dbop.vue
View File

@@ -533,6 +533,11 @@
color="primary" color="primary"
@click="EseguiFunz('correggiProductTypes', '', '')" @click="EseguiFunz('correggiProductTypes', '', '')"
></q-btn> ></q-btn>
<br /><q-btn
label="Sostituisci i 'img' in 'imagefile"
color="primary"
@click="EseguiFunz('replaceProductImgToImageFile', '', '')"
></q-btn>
<br /> <br />
</div> </div>
<div class="row"> <div class="row">

24
src/views/user/myservice/myservice.vue
View File

@@ -17,30 +17,6 @@
<CCheckIfIsLogged></CCheckIfIsLogged> <CCheckIfIsLogged></CCheckIfIsLogged>
</div> </div>
<!--
<div class="q-ma-sm q-gutter-sm q-pa-xs">
<div v-if="!!myskill.note" v-html="myskill.note"></div>
<div v-for="(photo, index) in myskill.photos" :key="index">
<div v-if="!!photo.imagefile" class="text-center">
<q-img :src="'upload/profile/'+myskill.username+'/myskills/'+photo.imagefile" class="img"></q-img>
</div>
</div>
<div class="row justify-evenly">
<CSkill
:table="table"
:filtercustom="filtroutente"
:visuinpage="true"
>
</CSkill>
</div>
</div>
-->
<br /> <br />
<br /> <br />
</CMyPage> </CMyPage>

27
upload_cartella_imgs_from_pcb.sh Executable file
View File

@@ -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"