Merge branch 'stable' into feature-dexie-performance

README.md

@@ -8,7 +8,7 @@
 ## Overview
 
 Pictalk is an open-source application designed to assist individuals with speech impediments communicate effectively using pictograms and pictures. This Nuxt.js project aims to make communication accessible and inclusive for everyone.
-You can use the application for free at [www.pictalk.org](https://www.pictalk.org)
+You can use the application for free at [application.pictalk.org](https://application.pictalk.org)
 
 ## Features
 

components/auth/account.vue

@@ -163,7 +163,7 @@
           <br />
           <div class="box">
             <b>{{
-              "https://www.pictalk.org?directsharer=" +
+              "https://application.pictalk.org?directsharer=" +
               $store.getters.getUser.username
               }}</b>
           </div>

components/pictos/deleteItem.vue

@@ -11,22 +11,20 @@
       <img class="image" :src="object.image" :alt="object.meaning" width="40%" crossorigin="anonymous" style="" />
       <br />
       <br />
-      <b-field :label="$t('PleaseType1') +
-        ' <' +
-        object.meaning[getUserLang] +
-        '> ' +
-        $t('PleaseType2')
-        ">
-        <b-input data-cy="delete-picto-meaning" v-model="meaningOrName" :placeholder="object.meaning[getUserLang]"
-          @keyup.native.enter="onSubmitted(meaningOrName)"></b-input>
+      {{ $t("PleaseType1") }} <strong style="font-size:large; margin: 0 1rem;">{{ name
+        }}</strong> {{
+          $t("PleaseType2") }}
+      <b-field>
+        <b-input data-cy="delete-picto-meaning" v-model="lowerCaseInput" :placeholder="name"
+          @keyup.native.enter="onSubmitted(lowerCaseInput)"></b-input>
       </b-field>
     </section>
     <footer class="modal-card-foot">
       <b-button class="button" type="button" @click="$parent.close()">{{
         $t("Close")
       }}</b-button>
       <b-button data-cy="delete-picto-button" class="button is-primary" :loading="loading"
-        @click="onSubmitted(meaningOrName)">{{ $t("Delete") }}</b-button>
+        @click="onSubmitted(lowerCaseInput)">{{ $t("Delete") }}</b-button>
     </footer>
   </div>
 </template>
@@ -40,16 +38,30 @@ export default {
       required: true,
     },
   },
+  computed: {
+    lowerCaseInput: {
+      get() {
+        return this.input;
+      },
+      set(value) {
+        this.input = value.trim().toLowerCase().replace(/\s/g, "-");
+      }
+    }
+  },
   data() {
     return {
-      meaningOrName: "",
+      input: "",
       loading: false,
+      name: ""
     };
   },
+  created() {
+    this.name = this.object.meaning[this.getUserLang].trim().toLowerCase().replace(/\s/g, "-");
+  },
   methods: {
-    async onSubmitted(name) {
+    async onSubmitted(input) {
       this.loading = true;
-      if (name == this.object.meaning[this.getUserLang]) {
+      if (input == this.name) {
         try {
           if (this.object.collection) {
             await this.$store.dispatch("removeCollection", {

nuxt.config.js

@@ -28,19 +28,19 @@ export default {
     link: [{
       rel: "icon",
       type: "image/x-icon",
-      href: "https://www.pictalk.org/favicon.ico"
+      href: "https://application.pictalk.org/favicon.ico"
     }, {
       rel: 'canonical',
-      href: 'https://www.pictalk.org'
+      href: 'https://application.pictalk.org'
     }],
     meta: [
       { hid: 'keywords', name: 'keywords', content: 'AAC,autism,pictograms,speech,text-to-speech,communication,online,translate,sentences,free,open-source' },
       { name: 'viewport', content: 'width=device-width, initial-scale=1' },
-      { hid: 'url', name: 'url', content: 'https://www.pictalk.org' },
-      { hid: 'image', name: 'image', content: 'https://www.pictalk.org/icon.png' },
+      { hid: 'url', name: 'url', content: 'https://application.pictalk.org' },
+      { hid: 'image', name: 'image', content: 'https://application.pictalk.org/icon.png' },
       { hid: 'og-type', property: 'og:type', content: 'website' },
-      { hid: 'og-url', property: 'og:url', content: 'https://www.pictalk.org' },
-      { hid: 'og-image', property: 'og:image', content: 'https://www.pictalk.org/icon.png' },
+      { hid: 'og-url', property: 'og:url', content: 'https://application.pictalk.org' },
+      { hid: 'og-image', property: 'og:image', content: 'https://application.pictalk.org/icon.png' },
     ]
   },
   /*
@@ -81,7 +81,7 @@ export default {
     format: 'webp',
   },
   sitemap: {
-    hostname: 'https://www.pictalk.org',
+    hostname: 'https://application.pictalk.org',
     gzip: false,
     i18n: true,
     trailingSlash: true,
@@ -98,7 +98,7 @@ export default {
     ],
   },
   i18n: {
-    baseURL: 'https://www.pictalk.org',
+    baseURL: 'https://application.pictalk.org',
     defaultLocale: 'en',
     detectBrowserLanguage: {
       useCookie: true,
@@ -197,11 +197,11 @@ export default {
       '/_nuxt/**',
       '/administration'
     ],
-    Sitemap: 'https://www.pictalk.org/sitemap.xml'
+    Sitemap: 'https://application.pictalk.org/sitemap.xml'
   },
   pwa: {
     icon: {
-      src: "https://www.pictalk.org/icon.png",
+      src: "https://application.pictalk.org/icon.png",
       sizes: [48, 72, 96, 120, 144, 152, 192, 384, 512],
       type: "image/png",
       purpose: ['maskable'],
@@ -229,39 +229,39 @@ export default {
       background_color: "#ffffff",
       display: 'standalone',
       icons: [{
-        src: "https://www.pictalk.org/icon.png",
+        src: "https://application.pictalk.org/icon.png",
         sizes: "512x512",
         type: "image/png",
         purpose: "any"
       }],
       screenshots: [
         {
-          src: "https://www.pictalk.org/screenshots/sentence.webp",
+          src: "https://application.pictalk.org/screenshots/sentence.webp",
           sizes: "488x1055",
           type: "image/webp"
         },
         {
-          src: "https://www.pictalk.org/screenshots/speak.webp",
+          src: "https://application.pictalk.org/screenshots/speak.webp",
           sizes: "488x1055",
           type: "image/webp"
         },
         {
-          src: "https://www.pictalk.org/screenshots/search.webp",
+          src: "https://application.pictalk.org/screenshots/search.webp",
           sizes: "488x1055",
           type: "image/webp"
         },
         {
-          src: "https://www.pictalk.org/screenshots/edition.webp",
+          src: "https://application.pictalk.org/screenshots/edition.webp",
           sizes: "488x1055",
           type: "image/webp"
         },
         {
-          src: "https://www.pictalk.org/screenshots/tutorial.webp",
+          src: "https://application.pictalk.org/screenshots/tutorial.webp",
           sizes: "488x1055",
           type: "image/webp"
         },
         {
-          src: "https://www.pictalk.org/_nuxt/img/whatsapp-320.webp",
+          src: "https://application.pictalk.org/_nuxt/img/whatsapp-320.webp",
           sizes: "320x698",
           type: "image/webp"
         },