Merge remote-tracking branch 'remotes/origin/master' into FunzProjects

src/App.vue

@@ -5,6 +5,10 @@
                 <app-header></app-header>
                 <q-ajax-bar></q-ajax-bar>
 
+                <CPreloadImages :arrimg="static_data.preLoadImages">
+                </CPreloadImages>
+
+
                 <q-page-container>
                     <transition name="fade" mode="out-in">
                         <router-view/>
@@ -12,6 +16,7 @@
                 </q-page-container>
             </q-layout>
         </div>
+        <BannerCookies urlInfo="/policy"></BannerCookies>
     </div>
 </template>
 <script lang="ts" src="./App.ts">

src/components/Header/Header.ts

@@ -320,7 +320,6 @@ export default class Header extends Vue {
   get mySurname() {
     return UserStore.state.surname
   }
-
   get Verificato() {
     return UserStore.state.verified_email
   }

src/components/Header/Header.vue

@@ -125,12 +125,12 @@
             <div id="profile">
                 <q-img class="absolute-top" src="../../statics/images/landing_first_section.png"
                        style="height: 150px">
-                    <div class="absolute-bottom bg-transparent text-black">
+                    <div class="absolute-bottom bg-transparent text-black center_img">
 
-                        <q-avatar class="q-mb-sm">
+                        <q-avatar class="q-mb-sm center_img">
                             <img src="../../statics/images/avatar-1.svg">
                         </q-avatar>
-                        <div v-if="Username" class="text-weight-bold">{{ Username }}</div>
+                        <div v-if="Username" class="text-weight-bold text-user">{{ Username }} - {{ Name }}</div>
                         <div v-else class="text-italic">{{ $t('user.loggati') }}</div>
 
                         <!--<span class="text-white" v-if="Verificato"> {{$t('reg.verificato')}} </span>-->

src/db/static_data.ts

@@ -266,11 +266,9 @@ const functionality: IFunctionality = {
   SHOW_NEWSLETTER: false,
   SHOW_ONLY_POLICY: false,
   BOOKING_EVENTS: false
-
 }
 
 export const static_data = {
-  routes,
   functionality,
   ds_operatori,
   lang_available,

src/root/home/home.scss

@@ -27,7 +27,7 @@ h4 {
 }
 
 .landing_background {
-  background: #000 url(../../statics/images/cover.jpg) no-repeat 50% fixed;
+  background: #000 url(../../statics/images/foto1.jpg) no-repeat 50% fixed;
   background-size: cover
 }
 
@@ -281,17 +281,17 @@ body.mobile .landing:before {
 }
 
 .homep-cover-img-1 {
-  background: #000 url(../../statics/images/cover.jpg) no-repeat 50% fixed;
+  background: #000 url(../../statics/images/foto1.jpg) no-repeat 50% fixed;
   //transition: background-image 1s ease-in-out;
 }
 
 .homep-cover-img-2 {
-  background: #000 url(../../statics/images/hand_people.jpg) no-repeat 50% fixed;
+  background: #000 url(../../statics/images/foto2.jpg) no-repeat 50% fixed;
   //transition: background-image 1s ease-in-out;
 }
 
 .homep-cover-img-3 {
-  background: #000 url(../../statics/images/cibo_sano.jpg) no-repeat 50% fixed;
+  background: #000 url(../../statics/images/foto3.jpg) no-repeat 50% fixed;
   //transition: background-image 1s ease-in-out;
 }