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

package.json

@@ -28,7 +28,7 @@
   "dependencies": {
     "@babel/plugin-transform-runtime": "^7.4.0",
     "@babel/runtime": "^7.0.0",
-    "@quasar/extras": "^1.3.1",
+    "@quasar/extras": "^1.3.2",
     "@types/vuelidate": "^0.7.0",
     "@vue/eslint-config-standard": "^4.0.0",
     "acorn": "^6.0.0",
@@ -50,7 +50,7 @@
     "normalize.css": "^8.0.0",
     "npm": "^6.10.1",
     "nprogress": "^0.2.0",
-    "quasar": "^1.1.0",
+    "quasar": "^1.1.6",
     "quasar-extras": "^2.0.8",
     "register-service-worker": "^1.0.0",
     "vee-validate": "^2.1.2",
@@ -85,7 +85,8 @@
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/plugin-syntax-import-meta": "^7.2.0",
     "@babel/preset-env": "^7.4.2",
-    "@quasar/app": "^1.0.6",
+    "@quasar/app": "^1.1.2",
+    "@quasar/quasar-app-extension-colorize": "^1.0.0-alpha.1",
     "@quasar/quasar-app-extension-typescript": "^1.0.0-alpha.11",
     "@types/dotenv": "^4.0.3",
     "@types/jest": "^23.1.4",

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

tslint.json

@@ -1,72 +0,0 @@
-{
-  "defaultSeverity": "error",
-  "extends": [
-    "tslint:recommended"
-  ],
-  "jsRules": {},
-  "rules": {
-    "no-console": false,
-    "curly": [false],
-    "object-literal-sort-keys": false,
-//    "no-restricted-syntax": [
-//      "error",
-//      {
-//        "selector": "CallExpression[callee.object.nametranslate='console'][callee.property.nametranslate!=/^(log|warn|error|info|trace)$/]",
-//        "message": "Unexpected property on console object was called"
-//      }
-//    ],
-    "class-name": true,
-    "comment-format": [
-      true,
-      "check-space"
-    ],
-    "indent": [
-      true,
-      "spaces"
-    ],
-    "ordered-imports": false,
-    "no-duplicate-variable": true,
-    "no-eval": true,
-    "no-internal-module": false,
-    "no-trailing-whitespace": false,
-    "no-var-keyword": true,
-    "max-line-length": false,
-    "one-line": [
-      true,
-      "check-open-brace",
-      "check-whitespace"
-    ],
-    "quotemark": [
-      true,
-      "single"
-    ],
-    "semicolon": [true, "never"],
-    "trailing-comma": [true, {"multiline": "never", "singleline": "never"}],
-    "triple-equals": [
-      true,
-      "allow-null-check"
-    ],
-    "typedef-whitespace": [
-      true,
-      {
-        "call-signature": "nospace",
-        "index-signature": "nospace",
-        "parameter": "nospace",
-        "property-declaration": "nospace",
-        "variable-declaration": "nospace"
-      }
-    ],
-    "variable-name": [
-      true,
-      "ban-keywords"
-    ],
-    "whitespace": [
-      true,
-      "check-branch",
-      "check-decl",
-      "check-operator",
-      "check-separator",
-      "check-type"
-    ]
-  }
-}