From e58f7249a689af253dbbbfe8387083dff6da4b31 Mon Sep 17 00:00:00 2001
From: Surya Paolo <paolo.arena77@gmail.com>
Date: Wed, 25 Jan 2023 11:55:06 +0100
Subject: [PATCH] Sulla foto della notifica il click non funziona check App

---
 quasar.conf.js                                       | 1 +
 src/App.ts                                           | 8 +++++---
 src/components/CCheckAppRunning/CCheckAppRunning.vue | 9 +++++++--
 src/components/CSignIn/CSignIn.ts                    | 8 ++++++--
 src/components/CSignIn/CSignIn.vue                   | 1 +
 src/layouts/toolbar/coinsPopover/coinsPopover.vue    | 2 +-
 src/layouts/toolbar/notifPopover/notifPopover.vue    | 2 +-
 src/statics/lang/it.js                               | 2 +-
 src/store/Modules/tools.ts                           | 2 ++
 9 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/quasar.conf.js b/quasar.conf.js
index 939c6cdd..d67628ce 100755
--- a/quasar.conf.js
+++ b/quasar.conf.js
@@ -312,6 +312,7 @@ module.exports = configure((ctx) => ({
       orientation: 'portrait',
       background_color: '#ffffff',
       theme_color: '#027be3',
+      start_url: '/',
       icons: [
         {
           src: 'images/riso-android-icon-512x512.png',
diff --git a/src/App.ts b/src/App.ts
index a735ffc9..6acd3444 100755
--- a/src/App.ts
+++ b/src/App.ts
@@ -79,17 +79,19 @@ export default {
 
 
     function mounted() {
+      console.log('app mounted')
       darkcookie.value = tools.getCookie('darkmode', false, false, false) === '-1'
 
       scroll()
-      tools.initprompt()
-
-      tools.checkApp()
     }
 
 
 
     async function created() {
+      tools.initprompt()
+
+      tools.checkApp()
+
       try {
         if (process.env.DEV) {
           console.info('SESSIONE IN SVILUPPO ! (DEV)')
diff --git a/src/components/CCheckAppRunning/CCheckAppRunning.vue b/src/components/CCheckAppRunning/CCheckAppRunning.vue
index 02f94f31..e477a586 100755
--- a/src/components/CCheckAppRunning/CCheckAppRunning.vue
+++ b/src/components/CCheckAppRunning/CCheckAppRunning.vue
@@ -1,4 +1,9 @@
 <template>
+  <div v-if="tools.isDebugOn()" class="bg-red text-white">
+    <span> isAppRunning: {{isAppRunning}} - </span>
+    <span> deferredPrompt: {{deferredPrompt}} - </span>
+    <span> finishLoading: {{finishLoading}} - </span>
+  </div>
   <div v-if="finishLoading && !isAppRunning && deferredPrompt" class="row justify-center">
 
     <q-btn
@@ -7,8 +12,8 @@
       label="Installa App"
       @click="installApp"
       icon="fas fa-mobile-alt"
-      color="white"
-      text-color="green"
+      color="green"
+      text-color="white"
     />
   </div>
   <!--<div class="row justify-center">
diff --git a/src/components/CSignIn/CSignIn.ts b/src/components/CSignIn/CSignIn.ts
index 1d37177a..aedde91e 100755
--- a/src/components/CSignIn/CSignIn.ts
+++ b/src/components/CSignIn/CSignIn.ts
@@ -1,4 +1,4 @@
-import { defineComponent, PropType, ref } from 'vue'
+import { defineComponent, PropType, ref, computed } from 'vue'
 import { useI18n } from '@src/boot/i18n'
 import { useUserStore } from '@store/UserStore'
 import { useGlobalStore } from '@store/globalStore'
@@ -6,6 +6,7 @@ import { useQuasar } from 'quasar'
 
 import { validationMixin } from 'vuelidate'
 import { Logo } from '../logo'
+import { CCheckAppRunning } from '../CCheckAppRunning'
 import { static_data } from '@/db/static_data'
 import { tools } from '@store/Modules/tools'
 import { ISigninOptions } from 'model'
@@ -16,7 +17,7 @@ import { useRouter } from 'vue-router'
 
 export default defineComponent({
   name: 'CSignIn',
-  components: { Logo },
+  components: { Logo, CCheckAppRunning },
   props: {
     showregbutt: {
       type: Boolean,
@@ -31,6 +32,8 @@ export default defineComponent({
     const $router = useRouter()
     const globalStore = useGlobalStore()
 
+    const enablePwa = computed(() => globalStore.site.confpages.enablePwa)
+
     const refUsername = ref(<any>null)
     const refPassword = ref(null)
 
@@ -166,6 +169,7 @@ export default defineComponent({
       site,
       showPassword,
       typePassword,
+      enablePwa,
     }
   },
 })
diff --git a/src/components/CSignIn/CSignIn.vue b/src/components/CSignIn/CSignIn.vue
index ee6a233c..bdf8af8c 100755
--- a/src/components/CSignIn/CSignIn.vue
+++ b/src/components/CSignIn/CSignIn.vue
@@ -1,5 +1,6 @@
 <template>
   <div>
+    <div v-if="enablePwa"><CCheckAppRunning /></div>
     <div class="text-center">
       <p>
         <logo></logo>
diff --git a/src/layouts/toolbar/coinsPopover/coinsPopover.vue b/src/layouts/toolbar/coinsPopover/coinsPopover.vue
index 809d5bf8..07eda487 100755
--- a/src/layouts/toolbar/coinsPopover/coinsPopover.vue
+++ b/src/layouts/toolbar/coinsPopover/coinsPopover.vue
@@ -93,7 +93,7 @@
               </q-item-section>-->
 
               <q-item-section avatar>
-                <q-avatar>
+                <q-avatar >
                   <img :src="notif.myimgsender" :alt="notif.sender">
                 </q-avatar>
               </q-item-section>
diff --git a/src/layouts/toolbar/notifPopover/notifPopover.vue b/src/layouts/toolbar/notifPopover/notifPopover.vue
index 7b1c33b6..326fe2f6 100755
--- a/src/layouts/toolbar/notifPopover/notifPopover.vue
+++ b/src/layouts/toolbar/notifPopover/notifPopover.vue
@@ -83,7 +83,7 @@
             </q-item-section>-->
 
             <q-item-section avatar>
-              <q-avatar>
+              <q-avatar @click="clickNotif(notif)">
                 <img :src="notif.myimgsender" :alt="notif.sender">
               </q-avatar>
             </q-item-section>
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index c1e91316..dd6a3305 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -507,7 +507,7 @@ const msg_it = {
       click_per_copiare: 'Cliccaci sopra per copiarlo sugli appunti',
       invitante: 'Ti ha invitato qualcuno a far parte di RISO?',
       link_reg: 'Clicca per copiare il link da condividere agli Amici',
-      link_reg_and_msg: 'Copia Link Registrazione',
+      link_reg_and_msg: 'Invita un Amico',
       copia_messaggio: 'Copia Messaggio',
       teleg_torna_sul_bot: '1) Copia il codice cliccando sul bottone qui sopra<br>2) torna su {botname} cliccando qui sotto 👇 ed incolla (o scrivi) il codice',
       teleg_checkcode: 'Codice Telegram',
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index 50685483..320c010e 100644
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -7554,6 +7554,7 @@ export const tools = {
   },
 
   checkApp() {
+    console.log('checkApp')
     const globalStore = useGlobalStore()
 
     try {
@@ -7575,6 +7576,7 @@ export const tools = {
 
   },
   initprompt() {
+    console.log('initprompt')
     const globalStore = useGlobalStore()
 
     window.addEventListener('beforeinstallprompt', (event) => {