Created Test Environment test.freeplanet.app

and Server: /var/www/test.freeplanet_server

.env.development

@@ -1,7 +1,7 @@
-APP_VERSION="0.1.2"
+APP_VERSION="0.1.3"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="1"
-DIRECTORY_LOCAL="freeplanet"
+DIRECTORY_LOCAL="newfreeplanet"
 DIRECTORY_SERVER="freeplanet_serverside"
 SERVERDIR_WEBSITE=""
 SERVERPW_WEBSITE=""
@@ -11,7 +11,7 @@ PROVA_PAOLO="PROVA ENV FUNZIONA!"
 LANG_DEFAULT="it"
 PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF"
 MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T"
-MONGODB_HOST="http://localhost:3000"
+MONGODB_HOST="http://192.168.1.6:3000"
 LOGO_REG="freeplanet-logo-full.svg"
 TEST_NAME="Paolo"
 TEST_SURNAME="Arena"
@@ -25,4 +25,4 @@ DEBUG="1"
 TELEGRAM_SUPPORT=""
 PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a"
 TEST_CELL=""
-ISTEST=true
+ISTEST=1

.env.prod.bak

@@ -0,0 +1,28 @@
+APP_VERSION="0.1.3"
+SERVICE_WORKER_FILE="service-worker.js"
+APP_ID="1"
+DIRECTORY_LOCAL=newfreeplanet
+DIRECTORY_SERVER=freeplanet_serverside
+SERVERDIR_WEBSITE=www.freeplanet.app
+SERVERPW_WEBSITE=pwdadmin@1AOK
+APP_URL="https://www.freeplanet.app"
+URL_FACEBOOK="https://www.facebook.com/freeplanetapp"
+PROVA_PAOLO="PROVA ENV FUNZIONA!"
+LANG_DEFAULT="it"
+PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF"
+MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T"
+MONGODB_HOST="https://www.freeplanet.app:3000"
+LOGO_REG='freeplanet-logo-full.svg'
+TEST_NAME=""
+TEST_SURNAME=""
+TEST_EMAIL=""
+TEST_USERNAME=""
+TEST_PASSWORD=""
+TEST_APORTADOR="------"
+PUBLICKEY_PUSH="BNM-cEpTbPVc_ujXf3QOC8ggf7b-X44P44esfJUWqNOFq1XhWCoZJpOi71_cbXC5SnfO9HassQ6OouAYgtBA9Pw"
+IN_CONSTRUCTION="1"
+DEBUG="1"
+TELEGRAM_SUPPORT="https://t.me/freeplanet_supporto"
+PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a"
+TEST_CELL=""
+ISTEST=0

.env.production

@@ -1,7 +1,7 @@
-APP_VERSION="0.1.1"
+APP_VERSION="0.1.3"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="1"
-DIRECTORY_LOCAL=freeplanet
+DIRECTORY_LOCAL=newfreeplanet
 DIRECTORY_SERVER=freeplanet_serverside
 SERVERDIR_WEBSITE=www.freeplanet.app
 SERVERPW_WEBSITE=pwdadmin@1AOK
@@ -25,4 +25,4 @@ DEBUG="1"
 TELEGRAM_SUPPORT="https://t.me/freeplanet_supporto"
 PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a"
 TEST_CELL=""
-ISTEST=false
+ISTEST=0

.env.test

@@ -0,0 +1,28 @@
+APP_VERSION="0.1.3"
+SERVICE_WORKER_FILE="service-worker.js"
+APP_ID="1"
+DIRECTORY_LOCAL=newfreeplanet
+DIRECTORY_SERVER=test.freeplanet_serverside
+SERVERDIR_WEBSITE="test.freeplanet.app"
+SERVERPW_WEBSITE="pwdadmin@1AOK"
+APP_URL="https://test.freeplanet.app"
+URL_FACEBOOK="https://www.facebook.com/freeplanetapp"
+PROVA_PAOLO="PROVA ENV FUNZIONA!"
+LANG_DEFAULT="it"
+PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF"
+MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T"
+MONGODB_HOST="https://test.freeplanet.app:3001"
+LOGO_REG="freeplanet-logo-full.svg"
+TEST_NAME="Paolo"
+TEST_SURNAME="Arena"
+TEST_EMAIL="paolo@freeplanet.app"
+TEST_USERNAME="paoloar77"
+TEST_PASSWORD="passpao1fr@1A"
+TEST_APORTADOR=""
+PUBLICKEY_PUSH="BNM-cEpTbPVc_ujXf3QOC8ggf7b-X44P44esfJUWqNOFq1XhWCoZJpOi71_cbXC5SnfO9HassQ6OouAYgtBA9Pw"
+IN_CONSTRUCTION="0"
+DEBUG="1"
+TELEGRAM_SUPPORT=""
+PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a"
+TEST_CELL=""
+ISTEST=1

deploy_frontend.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+source ./.env.production
+
+msg="*** TUTTI I SERVER FRONTEND !!!  ****  SEI SICURO DI INVIARE GLI AGGIORNAMENTI FRONTEND - SU TUTTI SERVER ??? $DIRECTORY_LOCAL  (Y/N) ? "
+
+if [ "$1" = "" ]; then
+  read -p "$msg" risposta
+else
+  risposta=$1
+fi
+
+if [[ $risposta == "Y" || $risposta == "y" ]]; then
+  cd /home/paolo/myproject/$DIRECTORY_LOCAL/
+  ./deploy_on_production.sh $risposta
+  ./deploy_on_test_server.sh $risposta
+fi

deploy_on_test_server.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+source ./.env.test
+
+msg="*** Sincronizzazione ???  $DIRECTORY_LOCAL e $DIRECTORY_SERVER (Y/N) ? "
+
+if [ "$1" = "" ]; then
+  read -p "$msg" risposta
+else
+  risposta=$1
+fi
+
+cd /home/paolo/myproject/$DIRECTORY_LOCAL/
+cp .env.production .env.prod.bak
+cp .env.test .env.production
+
+sleep 1
+
+npm run buildpwa
+
+echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..."
+sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8822' -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
+
+cp .env.prod.bak .env.production
+
+sleep 1
+
+echo "Finito $SERVERDIR_WEBSITE"

package.json

@@ -2,7 +2,7 @@
   "name": "freeplanet",
   "version": "0.0.6",
   "description": "FreePlanet",
-  "productName": "First Proj",
+  "productName": "FreePlanet",
   "author": "Paolo Arena",
   "private": true,
   "keywords": [

public/icons/.directory

@@ -1,4 +0,0 @@
-[Dolphin]
-PreviewsShown=true
-Timestamp=2018,11,1,10,45,49
-Version=4

quasar.conf.js

@@ -17,7 +17,7 @@ const webpack = require('webpack')
 const helpers = require('./helpers')
 const envparser = require('./config/envparser')
 
-// const ESLintPlugin = require('eslint-webpack-plugin')
+const ESLintPlugin = require('eslint-webpack-plugin')
 
 module.exports = configure((ctx) => ({
   // https://v2.quasar.dev/quasar-cli/supporting-ts
@@ -276,24 +276,26 @@ module.exports = configure((ctx) => ({
     // for the custom service worker ONLY (/src-pwa/custom-service-worker.[js|ts])
     // if using workbox in InjectManifest mode
     chainWebpackCustomSW(chain) {
+      chain.plugin('eslint-webpack-plugin')
+        .use(ESLintPlugin, [{ extensions: ['js'] }])
     },
 
     manifest: {
-      name: 'First Proj',
+      name: 'FreePlanet',
-      short_name: 'First Proj',
+      short_name: 'FreePlanet',
-      description: 'A Quasar Framework app',
+      description: 'New Free Social',
       display: 'standalone',
       orientation: 'portrait',
       background_color: '#ffffff',
       theme_color: '#027be3',
       icons: [
         {
-          src: 'icons/android-chrome-192x192.png',
+          src: 'images/android-chrome-192x192.png',
           sizes: '384x384',
           type: 'image/png',
         },
         {
-          src: 'icons/android-chrome-512x512.png',
+          src: 'images/android-chrome-512x512.png',
           sizes: '512x512',
           type: 'image/png',
         },

send_to_test.sh

@@ -2,6 +2,10 @@
 
 source ./.env.test
 
+cp .env.test .env.production
+
 echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..."
-sshpass -p $SERVERPW_WEBSITE rsync -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
+sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8822' -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
 echo "Finito $SERVERDIR_WEBSITE"
+
+cp .env.prod.bak .env.production

src-pwa/custom-service-worker.js

@@ -16,7 +16,7 @@ import { CacheableResponsePlugin } from 'workbox-cacheable-response'
 import { ExpirationPlugin } from 'workbox-expiration'
 
 console.log(
-  '   [  VER-0.0.65 ] _---------________------  PAO: this is my custom service worker')
+  '   [  VER-0.1.2b ] _---------________------  PAO: this is my custom service worker')
 
 importScripts('js/idb.js')
 importScripts('js/storage.js')
@@ -92,7 +92,7 @@ if (workbox) {
   // cleanupOutdatedCaches()
 
   registerRoute(
-    new RegExp(/\.(?:png|gif|jpg|jpeg|svg)$/),
+    new RegExp(/\.(?:png|gif|jpg|jpeg)$/),
     new CacheFirst({
       cacheName: 'images',
       plugins: [
@@ -107,6 +107,22 @@ if (workbox) {
       ],
     }),
   )
+  registerRoute(
+    new RegExp(/\.(?:svg)$/),
+    new CacheFirst({
+      cacheName: 'svg',
+      plugins: [
+        // Ensure that only requests that result in a 200 status are cached
+        new CacheableResponsePlugin({
+          statuses: [200],
+        }),
+        new ExpirationPlugin({
+          maxEntries: 60,
+          maxAgeSeconds: 30 * 24 * 60 * 60, // 30 Days
+        }),
+      ],
+    }),
+  )
 
   // Per Articoli....
   const articleHandler = new NetworkFirst({
@@ -250,9 +266,9 @@ if (workbox) {
   )
 
   registerRoute(
-    new RegExp(/.*\/(?:statics\/icons).*$/),
+    new RegExp(/.*\/(?:icons).*$/),
     new CacheFirst({
-      cacheName: 'image-cache',
+      cacheName: 'icon-cache',
       plugins: [
         // Ensure that only requests that result in a 200 status are cached
         new CacheableResponsePlugin({
@@ -558,8 +574,8 @@ self.addEventListener('push', (event) => {
 
     const options = {
       body: data.content,
-      icon: '/public/icons/android-chrome-192x192.png',
+      icon: '/images/android-chrome-192x192.png',
-      badge: '/public/icons/android-chrome-192x192.png',
+      badge: '/images/android-chrome-192x192.png',
       data: {
         url: data.url,
       },

src/App.ts

@@ -7,6 +7,7 @@ import { useUserStore } from '@store/UserStore'
 import { Header } from '@/components/Header'
 import { computed } from 'vue'
 import { CProvaPao } from '@/components/CProvaPao'
+import { tools } from '@store/Modules/tools'
 
 export default {
   components: {
@@ -38,50 +39,59 @@ export default {
     }
 
     function created() {
-      if (process.env.DEV) {
+      try {
-        console.info('SESSIONE IN SVILUPPO ! (DEV)')
+        if (process.env.DEV) {
-        // console.info(process.env)
+          console.info('SESSIONE IN SVILUPPO ! (DEV)')
-      }
+          // console.info(process.env)
-      if (process.env.PROD) {
+        }
-        console.info('SESSIONE IN PRODUZIONE!')
+        if (tools.isTest()) {
-        // console.info(process.env)
+          console.info('SESSIONE IN TEST ! (TEST)')
-      }
+        } else {
-
+          if (process.env.PROD) {
-      // Make autologin only if some routing
+            console.info('SESSIONE IN PRODUZIONE!')
-
+            // console.info(process.env)
-      // console.log('window.location.href', window.location.href)
+          }
-
-      let chiamaautologin = true
-      listaRoutingNoLogin.forEach((mystr) => {
-        if (window.location.href.includes(mystr)) {
-          chiamaautologin = false
         }
-      })
-
-      if (chiamaautologin) {
-        // console.log('CHIAMA autologin_FromLocalStorage')
-        userStore.autologin_FromLocalStorage($router)
-          .then((loadstorage: any) => {
-            if (loadstorage) {
 
 
-              /*if (toolsext.getLocale() !== '') {
+        // Make autologin only if some routing
-                // console.log('SETLOCALE :', this.$i18n.locale)
+
-                $i18n.locale = toolsext.getLocale()    // Set Lang
+        // console.log('window.location.href', window.location.href)
-              } else {
+
-                userStore.setlang($router, this.$i18n.locale)
+        let chiamaautologin = true
-              }*/
+        listaRoutingNoLogin.forEach((mystr) => {
+          if (window.location.href.includes(mystr)) {
+            chiamaautologin = false
+          }
+        })
+
+        if (chiamaautologin) {
+          // console.log('CHIAMA autologin_FromLocalStorage')
+          userStore.autologin_FromLocalStorage($router)
+            .then((loadstorage: any) => {
+              if (loadstorage) {
 
 
-              // console.log('lang CARICATO:', this.$i18n.locale)
+                /*if (toolsext.getLocale() !== '') {
+                  // console.log('SETLOCALE :', this.$i18n.locale)
+                  $i18n.locale = toolsext.getLocale()    // Set Lang
+                } else {
+                  userStore.setlang($router, this.$i18n.locale)
+                }*/
 
-              //++Todo PWA:  globalroutines('loadapp', '')
 
-              // Create Subscription to Push Notification
+                // console.log('lang CARICATO:', this.$i18n.locale)
-              globalStore.createPushSubscription()
+
-            }
+                //++Todo PWA:  globalroutines('loadapp', '')
-          })
+
-      } else {
+                // Create Subscription to Push Notification
+                globalStore.createPushSubscription()
+              }
+            })
+        } else {
+          globalStore.finishLoading = true
+        }
+      } catch (e) {
         globalStore.finishLoading = true
       }
 

src/components/CCardCarousel/CCardCarousel.vue

@@ -71,7 +71,7 @@ dark color="white" v-model="globalStore.autoplaydisc" label="Auto Play" class="s
             <q-carousel-slide
               v-for="(myrec, index) in myarr"
               :key="index"
-                              :img-src="`statics/`+myrec.img_small"
+                              :img-src="`public/`+myrec.img_small"
                               :alt="myrec.label"
                               :name="index">
                 <div class="row q-ma-xs">

src/components/CMySingleEvent/CMySingleEvent.vue.off2

@@ -69,7 +69,7 @@ v-if="myevent.news" class="cltexth4 chipnews shadow-5 glossy text-right" color="
             <!-- Se c'è un link, allora -->
             <q-btn
 class="text-center boldhigh" v-if="myevent.linkpdf" size="md" type="a"
-                   :href="`../../statics/` + myevent.linkpdf"
+                   :href="`../../public/` + myevent.linkpdf"
                    target="_blank"
                    ripple rounded :label="myevent.title"
                    :color="myevent.bgcolor" text-color="white" glossy>
@@ -152,7 +152,7 @@ v-if="myevent.price && isShowPrice(myevent)" class="glossy" color="orange"
           <div class="row justify-start q-ma-md">
             <q-btn
 v-if="myevent.linkpdf"
-                   size="md" type="a" :href="`../../statics/` + myevent.linkpdf"
+                   size="md" type="a" :href="`../../public/` + myevent.linkpdf"
                    target="_blank" rounded outline
                    color="primary" icon="info"
                    :label="$t('cal.showpdf')">

src/components/COpenStreetMap/COpenStreetMap.vue

@@ -20,7 +20,7 @@
         - <a :href="urlmap" target="_blank" class="text-black">Apri Mappa</a>
       </p>
       <a :href="urlmap" target="_blank">
-        <q-img :src="`statics/` + imgmap" class="imgautosize" alt="my map">
+        <q-img :src="`public/` + imgmap" class="imgautosize" alt="my map">
         </q-img>
 
       </a>

src/components/CProductCard/CProductCard.vue

@@ -1,6 +1,6 @@
 <template>
   <q-card :class="getmycardcl" v-if="!!myproduct">
-    <q-img :src="`statics/` + myproduct.img" :alt="myproduct.name" :class="getclimg"></q-img>
+    <q-img :src="`public/` + myproduct.img" :alt="myproduct.name" :class="getclimg"></q-img>
 
     <q-card-section>
       <q-btn

src/components/Header/Header.scss

@@ -228,7 +228,7 @@ canvas {
 }
 
 .fa-facebook:before {
-  content: url('../../../public/icons/flag_it.svg');
+  content: url('../../../public/svg/flag_it.svg');
 }
 
 .clIconOnline {

src/components/Header/Header.ts

@@ -275,10 +275,10 @@ export default defineComponent({
       let strv = ''
       if (process.env.DEV) {
         strv = 'DEV '
-      } else if (process.env.TEST) {
+      } else if (tools.isTest()) {
         strv = 'TEST '
       }
-      return `[${strv}${process.env.APP_VERSION}]`
+      return `[${strv} ver. ${process.env.APP_VERSION}]`
     }
 
     function getLangAtt() {
@@ -344,7 +344,13 @@ export default defineComponent({
     }
 
     function getappname() {
-      return tools.getsuffisso() + tools.getappname(tools.isMobile())
+      let mystr = tools.getsuffisso() + tools.getappname(tools.isMobile())
+      //if (!tools.isMobile()) {
+        mystr += ' ' + getAppVersion()
+      //}
+
+      return mystr
+
     }
 
     function toggleanimation() {
@@ -474,6 +480,7 @@ export default defineComponent({
       getMsgText,
       paotest,
       logoutHandler,
+      isUserNotAuth,
     }
   },
 

src/components/Header/Header.vue

@@ -29,7 +29,6 @@
         </div>
 
         <q-btn
-          ripple
           size="md"
           id="newvers" v-if="isNewVersionAvailable()" color="secondary" rounded icon="refresh"
           class="btnNewVersShow" @click="RefreshApp()" :label="t('notification.newVersionAvailable')">
@@ -40,9 +39,6 @@
             <img :src="imglogo()" height="27" alt="Immagine Logo">
           </q-avatar>
           <div class="q-mx-sm titlesite">{{ getappname() }}</div>
-          <template v-slot:subtitle>
-            <div>{{ t('msg.myDescriz') }} {{ getAppVersion() }}</div>
-          </template>
         </q-toolbar-title>
 
         <!--

src/css/app.scss

@@ -573,24 +573,24 @@ $heightBtn: 100%;
 }
 
 .fa-flag-it:before {
-  content: url('../../public/icons/flag_it.svg');
+  content: url('../../public/svg/flag_it.svg');
 }
 
 .fa-flag-us:before {
-  content: url('../../public/icons/flag_us.svg');
+  content: url('../../public/svg/flag_us.svg');
 }
 
 
 .fa-flag-es:before {
-  content: url('../../public/icons/flag_es.svg');
+  content: url('../../public/svg/flag_es.svg');
 }
 
 .fa-flag-gb:before {
-  content: url('../../public/icons/flag_gb.svg');
+  content: url('../../public/svg/flag_gb.svg');
 }
 
 .fa-flag-de:before {
-  content: url('../../public/icons/flag_de.svg');
+  content: url('../../public/svg/flag_de.svg');
 }
 
 .animazione {

src/index.template.html

@@ -9,8 +9,8 @@
     <meta name="msapplication-tap-highlight" content="no">
     <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>">
 
-    <link rel="icon" type="image/png" sizes="32x32" href="icons/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="images/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="icons/favicon-16x16.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="images/favicon-16x16.png">
     <link rel="icon" type="image/ico" href="favicon.ico">
   </head>
   <body>

src/mixins/mixin-events.ts

@@ -12,9 +12,9 @@ import { useI18n } from '@/boot/i18n'
 export default function () {
   function getImgEvent(event: IEvents) {
     if (!!event.img)
-      return 'statics/' + event.img
+      return 'public/' + event.img
     else
-      return 'statics/images/noimg.png'
+      return 'public/images/noimg.png'
   }
 
   function getStyleByEvent(event: IEvents, visu: boolean) {

src/root/home/home.vue

@@ -96,9 +96,6 @@
                       </div>
                     </div>
 
-                    <div class="q-pt-md q-pl-sm">
-                      <div class="text-body2">Ver. {{ getenv('APP_VERSION') }}</div>
-                    </div>
                   </div>
                 </div>
               </div>
@@ -187,9 +184,6 @@
                       </div>
                     </div>
 
-                    <div class="q-pt-md q-pl-sm">
-                      <div class="text-body2">Ver. {{ getenv('APP_VERSION') }}</div>
-                    </div>
                   </div>
                 </div>
               </div>
@@ -281,10 +275,6 @@
 
                       </div>
                     </div>
-
-                    <div class="q-pt-md q-pl-sm">
-                      <div class="text-body2">Ver. {{ getenv('APP_VERSION') }}</div>
-                    </div>
                   </div>
                 </div>
               </div>

src/rootgen/admin/sendpushnotif/sendpushnotif.ts

@@ -90,13 +90,13 @@ export default defineComponent({
 
       if (actiontype.value === shared_consts.TypeMsg_Actions.YESNO) {
         param.actions = [
-          { action: 'confirm', title: 'Si', icon: '/statics/icons/opz1-icon-96x96.png' },
+          { action: 'confirm', title: 'Si', icon: '/public/images/opz1-icon-96x96.jpg' },
-          { action: 'cancel', title: 'No', icon: '/statics/icons/opz2-icon-96x96.png' }
+          { action: 'cancel', title: 'No', icon: '/public/images/opz2-icon-96x96.jpg' }
         ]
       } else if (actiontype.value === shared_consts.TypeMsg_Actions.OPZ1_2) {
         param.actions = [
-          { action: 'opz1', title: opz1.value, icon: '/statics/icons/opz1-icon-96x96.png' },
+          { action: 'opz1', title: opz1.value, icon: '/public/images/opz1-icon-96x96.jpg' },
-          { action: 'opz2', title: opz2.value, icon: '/statics/icons/opz2-icon-96x96.png' }
+          { action: 'opz2', title: opz2.value, icon: '/public/images/opz2-icon-96x96.jpg' }
         ]
       }
 

src/store/Modules/tools.ts

@@ -1456,7 +1456,7 @@ export const tools = {
       } else {
         this.showNotif($q, t('notification.denied'), { color: 'negative', icon: 'notifications' })
 
-        // displayConfirmNotification();
+        tools.displayConfirmNotification();
       }
     })
   },
@@ -2552,17 +2552,17 @@ export const tools = {
     if ('serviceWorker' in navigator) {
       options = {
         body: 'You successfully subscribed to our Notification service!',
-        icon: '/public/icons/app-icon-96x96.png',
+        icon: '/icons/app-icon-96x96.png',
-        image: '/public/images/sf-boat.jpg',
+        image: '/images/sf-boat.jpg',
         dir: 'ltr',
         lang: 'enUs', // BCP 47,
         vibrate: [100, 50, 200],
-        badge: '/public/icons/app-icon-96x96.png',
+        badge: '/icons/app-icon-96x96.png',
         tag: 'confirm-notification',
         renotify: true,  // if it's already sent, will Vibrate anyway
         actions: [
-          { action: 'confirm', title: 'Okay', icon: '/public/icons/app-icon-96x96.png' },
+          { action: 'confirm', title: 'Okay', icon: '/icons/app-icon-96x96.png' },
-          { action: 'cancel', title: 'Cancel', icon: '/public/icons/app-icon-96x96.png' },
+          { action: 'cancel', title: 'Cancel', icon: '/icons/app-icon-96x96.png' },
         ],
       }
 
@@ -2595,17 +2595,17 @@ export const tools = {
     if ('serviceWorker' in navigator) {
       options = {
         body: t('notification.subscribed'),
-        icon: '/public/icons/android-chrome-192x192.png',
+        icon: '/public/images/android-chrome-192x192.png',
         image: '/public/images/imglogonotif.png',
         dir: 'ltr',
         lang: 'enUs', // BCP 47,
         vibrate: [100, 50, 200],
-        badge: '/public/icons/android-chrome-192x192.png',
+        badge: '/public/images/android-chrome-192x192.png',
         tag: 'confirm-notification',
         renotify: true,  // if it's already sent, will Vibrate anyway
         actions: [
-          { action: 'confirm', title: t('dialog.ok'), icon: '/public/icons/android-chrome-192x192.png' },
+          { action: 'confirm', title: t('dialog.ok'), icon: '/public/images/android-chrome-192x192.png' },
-          // { action: 'cancel', title: 'Cancel', icon: '/statics/icons/android-chrome-192x192.png', }
+          // { action: 'cancel', title: 'Cancel', icon: '/statics/images/android-chrome-192x192.png', }
         ],
       }