- fixed added meta tags "title, keywords and description"

- fixed height images in gallery

quasar.conf.js

@@ -65,7 +65,7 @@ module.exports = function (ctx) {
       store: 'src/store/index.ts'
     },
     // app plugins (/src/plugins)
-    boot: ['vue-i18n', 'axios', 'vee-validate', 'myconfig', 'local-storage', 'error-handler', 'globalroutines', 'vue-idb', 'dragula', 'guard'],
+    boot: ['vue-i18n', 'vue-meta', 'axios', 'vee-validate', 'myconfig', 'local-storage', 'error-handler', 'globalroutines', 'vue-idb', 'dragula', 'guard'],
     css: [
       'app.styl'
     ],

src/App.ts

@@ -27,12 +27,10 @@ export default class App extends Vue {
 
   public meta() {
     return {
-      keywords: { name: 'keywords', content: 'WebSite' },
+      title: this.$t('msg.myAppName'),
-      // meta tags
+      keywords: [{ name: 'keywords', content: 'associazione shen, centro olistico lugo' },
-      meta: {
+        { name: 'description', content: this.$t('msg.myAppDescription') }]
-        keywords: { name: 'keywords', content: 'MyKeywords' },
+      //   equiv: { 'http-equiv': 'Content-Type', 'content': 'text/html; charset=UTF-8' }
-        mykey: { name: 'mykey', content: 'Key 1' }
-      }
     }
   }
 

src/boot/vue-meta.ts

@@ -0,0 +1,6 @@
+import Component from 'vue-class-component'
+
+// Register the meta hook
+Component.registerHooks([
+  'meta'
+])

src/common/pattern.ts

@@ -4,16 +4,16 @@ export class Patterns {
     /**
      * Alphanumeric, spaces and dashes allowed. Min 2 characters length.
      */
-    public static DisplayName: RegExp = /^[0-9a-zA-Z\s\-]{2,}/i;
+    public static DisplayName: RegExp = /^[0-9a-zA-Z\s\-]{2,}/i
 
     /**
-     * Same pattern used by JQuery userName validation 
+     * Same pattern used by JQuery userName validation
     */
-    public static Email: RegExp = /^((“[\w-\s]+”)|([\w-]+(?:\.[\w-]+)*)|(“[\w-\s]+”)([\w-]+(?:\.[\w-]+)*))(@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$)|(@\[?((25[0-5]\.|2[0-4][0-9]\.|1[0-9]{2}\.|[0-9]{1,2}\.))((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[0-9]{1,2})\.){2}(25[0-5]|2[0-4][0-9]|1[0-9]{2}[0-9];{1,2})\]?$)/i;
+    public static Email: RegExp = /^((“[\w-\s]+”)|([\w-]+(?:\.[\w-]+)*)|(“[\w-\s]+”)([\w-]+(?:\.[\w-]+)*))(@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$)|(@\[?((25[0-5]\.|2[0-4][0-9]\.|1[0-9]{2}\.|[0-9]{1,2}\.))((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[0-9]{1,2})\.){2}(25[0-5]|2[0-4][0-9]|1[0-9]{2}[0-9];{1,2})\]?$)/i
 
     /**
      *  6 to 20 characters string with at least one digit, one upper case letter, one lower case letter and one special symbol
     */
-    public static Password: RegExp = /^((?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[@#$%]).{6,20})/i;
+    public static Password: RegExp = /^((?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[@#$%!\-]).{6,20})/i
 
-}
+}

src/components/CImgText/CImgText.scss

@@ -31,32 +31,8 @@
   }
 }
 
-@media (max-width: 1600px) {
-  .myclimg {
-    max-height: 550px !important;
-    width: 100%;
-  }
-}
-
-@media (max-width: 1000px) {
-  .myclimg {
-    max-height: 450px !important;
-    width: 100%;
-  }
-}
-
-@media (max-width: 800px) {
-  .myclimg {
-    max-height: 400px !important;
-    width: 100%;
-  }
-}
-
 
 @media (max-width: 400px) {
-  .myclimg {
-    // height: inherit !important;
-  }
 
   // PER VERSIONE MOBILE
   .landing > section.padding_testo {

src/components/CImgTitle/CImgTitle.scss

@@ -31,30 +31,6 @@
   }
 }
 
-@media (max-width: 2500px) {
-  .myclimg {
-    height: 550px !important;
-  }
-}
-
-@media (max-width: 1600px) {
-  .myclimg {
-    height: 550px !important;
-  }
-}
-
-@media (max-width: 1000px) {
-  .myclimg {
-    height: 450px !important;
-  }
-}
-
-@media (max-width: 800px) {
-  .myclimg {
-    height: 400px !important;
-  }
-}
-
 
 @media (max-width: 718px) {
   // PER VERSIONE MOBILE

src/components/logo/logo.ts

@@ -12,6 +12,6 @@ export default class Logo extends Vue {
   }
 
   get logoalt() {
-    return process.env.APP_NAME
+    return this.$t('msg.myAppName')
   }
 }

src/db/i18n_website.js

@@ -23,6 +23,7 @@ const msg_website = {
     msg: {
       hello: 'Buongiorno',
       myAppName: 'FreePlanet',
+      myAppDescription: 'Il primo Vero Social Libero, Equo e Solidale, dove Vive Consapevolezza e Aiuto Comunitario. Gratuito e senza Pubblicità',
       underconstruction: 'App in costruzione...',
       myDescriz: '',
       sottoTitoloApp: 'Il primo Vero Social',
@@ -144,6 +145,7 @@ const msg_website = {
     msg: {
       hello: 'Buenos Días',
       myAppName: 'FreePlanet',
+      myAppDescription: 'El primer Verdadero Social Libre, justo y Solidario Donde vive Conciencia y Ayuda comunitaria, Gratis y sin publicidad',
       underconstruction: 'App en construcción...',
       myDescriz: '',
       sottoTitoloApp: 'El primer Verdadero Social',
@@ -266,6 +268,7 @@ const msg_website = {
     msg: {
       hello: 'Hello!',
       myAppName: 'FreePlanet',
+      myAppDescription: 'The first Real Social Free, Fair and Equitable Where the conscience and community help live. Free and without advertising',
       underconstruction: 'App in construction...',
       myDescriz: '',
       sottoTitoloApp: 'The first Real Social',

src/index.template.html

@@ -1,8 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title><%= htmlWebpackPlugin.options.appName %></title>
-
     <meta charset="utf-8">
     <meta name="description" content="<%= htmlWebpackPlugin.options.appDescription %>">
     <meta name="format-detection" content="telephone=no">

src/root/home/home.ts

@@ -60,7 +60,7 @@ export default class Home extends Vue {
   }
 
   get appname() {
-    return process.env.APP_NAME
+    return this.$t('msg.myAppName')
   }
 
   public beforeDestroy() {

src/root/home/home.vue

@@ -201,7 +201,7 @@
                                 </div>
                                 <div class="flex justify-end">
                                     <div class="q-gutter-xs testo-banda clgutter">
-                                        <div class="text-h1 shadow-max">{{getenv('APP_NAME')}}</div>
+                                        <div class="text-h1 shadow-max">{{$t('msg.myAppName')}}</div>
                                         <div class="text-subtitle1 shadow text-italic q-pl-sm">
                                             {{$t('msg.sottoTitoloApp')}}
                                         </div>

src/statics/i18n.js

@@ -97,7 +97,7 @@ const msgglobal = {
         email: 'inserire una email valida',
         errore_generico: 'Si prega di compilare correttamente i campi',
         atleast: 'dev\'essere lungo almeno di',
-        complexity: 'deve contenere almeno 1 minuscola, 1 maiuscola, 1 cifra e 1 carattere speciale',
+        complexity: 'deve contenere almeno 1 minuscola, 1 maiuscola, 1 cifra e 1 carattere speciale (!,$,#,%,-) ',
         notmore: 'non dev\'essere lungo più di',
         char: 'caratteri',
         terms: 'Devi accettare le condizioni, per continuare.',
@@ -330,7 +330,7 @@ const msgglobal = {
         email: 'Debe ser una email válida.',
         errore_generico: 'Por favor, rellene los campos correctamente',
         atleast: 'debe ser al menos largo',
-        complexity: 'debe contener al menos 1 minúscula, 1 mayúscula, 1 dígito y 1 caractér especial',
+        complexity: 'debe contener al menos 1 minúscula, 1 mayúscula, 1 dígito y 1 caractér especial (!,$,#,%,-)',
         notmore: 'no tiene que ser más largo que',
         char: 'caracteres',
         terms: 'Debes aceptar las condiciones, para continuar..',
@@ -556,7 +556,7 @@ const msgglobal = {
         email: 'Ce doit être un email valide.',
         errore_generico: 'S\'il vous plaît remplir les champs correctement',
         atleast: 'ça doit être au moins long',
-        complexity: 'doit contenir au moins 1 minuscule, 1 majuscule, 1 chiffre et 1 caractère spécial',
+        complexity: 'doit contenir au moins 1 minuscule, 1 majuscule, 1 chiffre et 1 caractère spécial (!,$,#,%,-)',
         notmore: 'il ne doit pas être plus long que',
         char: 'caractères',
         terms: 'Vous devez accepter les conditions, pour continuer..',
@@ -782,7 +782,7 @@ const msgglobal = {
         email: 'must be a valid email',
         errore_generico: 'Please review fields again',
         atleast: 'must be at least',
-        complexity: 'must contains at least 1 lowercase letter, 1 uppercase letter, 1 digit and one special symbol',
+        complexity: 'must contains at least 1 lowercase letter, 1 uppercase letter, 1 digit and one special symbol (!,$,#,%,-)',
         notmore: 'must not be more than',
         char: 'characters long',
         terms: 'You need to agree with the terms & conditions.',
@@ -1008,7 +1008,7 @@ const msgglobal = {
         email: 'must be a valid email',
         errore_generico: 'Please review fields again',
         atleast: 'must be at least',
-        complexity: 'must contains at least 1 lowercase letter, 1 uppercase letter, 1 digit and one special symbol',
+        complexity: 'must contains at least 1 lowercase letter, 1 uppercase letter, 1 digit and one special symbol (!,$,#,%,-)',
         notmore: 'must not be more than',
         char: 'characters long',
         terms: 'You need to agree with the terms & conditions.',

src/store/Modules/GlobalStore.ts

@@ -297,10 +297,6 @@ namespace Actions {
     //   return
     // }
 
-    // if (!static_data.functionality.PWA) {
-    //   return
-    // }
-
     if (!static_data.functionality.PWA)
       return
 

src/store/Modules/tools.ts

@@ -1845,12 +1845,16 @@ export const tools = {
       maxh2 = 350
     } else if (Screen.width < 600) {
       maxh2 = 400
-    } else if (Screen.width < 800) {
+    } else if (Screen.width < 700) {
       maxh2 = 450
+    } else if (Screen.width < 800) {
+      maxh2 = 550
     } else if (Screen.width < 1000) {
-      maxh2 = 500
+      maxh2 = 650
+    } else if (Screen.width < 1200) {
+      maxh2 = 700
     } else {
-      maxh2 = 600
+      maxh2 = 750
     }
 
     return maxh2