- other committ

src/components/CImgText/CImgText.ts

@@ -25,6 +25,7 @@ import { Screen } from 'quasar'
 })
 export default class CImgText extends Vue {
   @Prop({ required: false, default: '' }) public src: string
+  @Prop({ required: false, default: '' }) public src2: string
   @Prop({ required: false, default: 'myclimg' }) public class1: string
   @Prop({ required: false, default: '' }) public style1: string
 }

src/components/CImgText/CImgText.vue

@@ -4,6 +4,7 @@
             <div class="row items-start q-col-gutter-xs imgtext">
                 <div class="imgtext__img">
                     <img v-if="src" :src="src" class="myclimg" :style="style1">
+                    <img v-if="src2" :src="src2" class="myclimg" :style="style1">
                     <div class="section_text">
                     <slot></slot>
                     </div>

src/components/Footer/Footer.vue

@@ -10,7 +10,7 @@
                     <!--</span>-->
 
 
-                    <FormNewsletter v-if="static_data.SHOW_NEWSLETTER" :idwebsite="tools.appid()"
+                    <FormNewsletter v-if="static_data.functionality.SHOW_NEWSLETTER" :idwebsite="tools.appid()"
                                     :locale="tools.getLocale()">
                     </FormNewsletter>
 
@@ -52,7 +52,7 @@
                     </div>
 
                     <p class="text-center">
-                        <router-link v-if="static_data.SHOW_ONLY_POLICY" to="/policy"><span class="footer_link">{{$t('privacy_policy')}}</span></router-link>
+                        <router-link v-if="static_data.functionality.SHOW_ONLY_POLICY" to="/policy"><span class="footer_link">{{$t('privacy_policy')}}</span></router-link>
                     </p>
 
                 </div>

src/components/FormNewsletter/FormNewsletter.vue

@@ -41,7 +41,7 @@
 
                 </q-input>
 
-                <router-link to="/policy"><span class="news_link">$t('newsletter.acceptlicense')</span></router-link>
+                <router-link to="/policy"><span class="news_link">{{$t('privacy_policy')}}</span></router-link>
 
                 <q-toggle dark v-model="accept" :label="$t('newsletter.acceptlicense')"/>
 

src/components/Header/Header.scss

@@ -286,3 +286,12 @@ canvas {
   display: inline-block;
   padding: 4px 2px;
 }
+
+.text-user {
+  text-shadow: .05rem .05rem .15rem #fff;
+  background-color: limegreen;
+  border-radius: 1rem !important;
+  text-align: center;
+  margin: 1px;
+  margin-bottom: 5px;
+}

src/components/Header/Header.ts

@@ -68,12 +68,12 @@ export default class Header extends Vue {
   }
 
   // -------------------------------------------------------------------------
-  // QUASAR Example using event to open drawer from another component or page
+  // QUASAR Example using myevent to open drawer from another component or page
   // -------------------------------------------------------------------------
   // (1) This code is inside layout file that have a drawer
   //     if this.leftDrawerOpen is true, drawer is displayed
 
-  // (2) Listen for an event in created
+  // (2) Listen for an myevent in created
   /*    created(){
         this.$root.$on("openLeftDrawer", this.openLeftDrawercb);
       },
@@ -85,7 +85,7 @@ export default class Header extends Vue {
       }
     }
 
-    // (4) In another component or page, emit the event!
+    // (4) In another component or page, emit the myevent!
     //     Call the method when clicking button etc.
     methods: {
       openLeftDrawer() {
@@ -160,7 +160,7 @@ export default class Header extends Vue {
 
       const color = (value === 'online') ? 'positive' : 'warning'
 
-      if (this.static_data.SHOW_IF_IS_SERVER_CONNECTION) {
+      if (this.static_data.functionality.SHOW_IF_IS_SERVER_CONNECTION) {
 
         if (!!oldValue) {
           tools.showNotif(this.$q, this.$t('connection') + ` ${value}`, {
@@ -314,6 +314,12 @@ export default class Header extends Vue {
   get Username() {
     return UserStore.state.username
   }
+  get myName() {
+    return UserStore.state.name
+  }
+  get mySurname() {
+    return UserStore.state.surname
+  }
 
   get Verificato() {
     return UserStore.state.verified_email
@@ -339,4 +345,8 @@ export default class Header extends Vue {
   get static_data(){
     return static_data
   }
+
+  get isLogged() {
+    return UserStore.state.isLogged
+  }
 }

src/components/Header/Header.vue

@@ -58,7 +58,7 @@
                 -->
 
                 <q-btn
-                        v-if="!isonline && static_data.SHOW_IF_IS_SERVER_CONNECTION"
+                        v-if="!isonline && static_data.functionality.SHOW_IF_IS_SERVER_CONNECTION"
                         flat
                         dense
                         round
@@ -102,7 +102,7 @@
                     <label>{{ $t('msg.hello') }}</label> <span v-model="prova"></span> !
                 </div>-->
 
-                <q-btn v-if="static_data.SHOW_USER_MENU" dense flat round icon="menu" @click="right = !right">
+                <q-btn v-if="static_data.functionality.SHOW_USER_MENU" dense flat round icon="menu" @click="right = !right">
                 </q-btn>
 
             </q-toolbar>
@@ -121,7 +121,7 @@
 
         </q-drawer>
 
-        <q-drawer v-if="static_data.SHOW_USER_MENU" v-model="right" side="right" overlay bordered>
+        <q-drawer v-if="static_data.functionality.SHOW_USER_MENU" v-model="right" side="right" overlay bordered>
             <div id="profile">
                 <q-img class="absolute-top" src="../../statics/images/landing_first_section.png"
                        style="height: 150px">