fix isAppRunning

This commit is contained in:
Surya Paolo
2022-12-20 10:58:55 +01:00
parent 3aaa94c33e
commit 2a97456c0f
17 changed files with 57 additions and 36 deletions

View File

@@ -1,4 +1,4 @@
import { defineComponent, ref, computed, PropType, toRef } from 'vue'
import { defineComponent, ref, computed, PropType, toRef, onMounted } from 'vue'
import { useUserStore } from '@store/UserStore'
import { useRouter } from 'vue-router'
import { useGlobalStore } from '@store/globalStore'
@@ -19,36 +19,41 @@ export default defineComponent({
const globalStore = useGlobalStore()
const { t } = useI18n()
const deferredPrompt = ref(<any>null)
const isAppRunning = computed(() => globalStore.isAppRunning )
const finishLoading = computed(() => globalStore.finishLoading)
const deferredPrompt = computed(() => globalStore.deferredPrompt)
function initprompt() {
window.addEventListener('beforeinstallprompt', (event) => {
event.preventDefault()
console.log('beforeinstallprompt !')
// Stash the event so it can be triggered later.
deferredPrompt.value = event
globalStore.deferredPrompt = event
})
}
function installApp() {
if (deferredPrompt.value)
deferredPrompt.value.prompt()
if (globalStore.deferredPrompt)
globalStore.deferredPrompt.prompt()
}
initprompt()
function mounted() {
initprompt()
tools.checkApp()
}
onMounted(mounted)
return {
userStore,
tools,
costanti,
finishLoading,
deferredPrompt,
installApp,
isAppRunning,
deferredPrompt,
}
}
})

View File

@@ -103,6 +103,8 @@ export default defineComponent({
userStore.signin($router, signin.value)
.then((riscode: any) => {
console.log('signin FINITO CALL: riscode=', riscode)
tools.checkApp()
if ($q.screen.lt.sm) {
globalStore.setleftDrawerOpen(false)
}

View File

@@ -87,6 +87,7 @@ export default defineComponent({
const isalreadyReg = ref(false)
const needTelegram = ref(false)
const slide = ref('1')
const inputAportador = ref(<any>null)
const inputEmail = ref(<any>null)
const inputUsername = ref(<any>null)
const inputName = ref(<any>null)
@@ -98,7 +99,7 @@ export default defineComponent({
let ret = true
if (slide.value === '1') {
// Invitante + Email
ret = !signup.email || !v$.value.aportador_solidario || v$.value.aportador_solidario.$invalid || (inputEmail.value && inputEmail.value.hasError)
ret = !signup.email || !signup.aportador_solidario || inputAportador.value.hasError || (inputEmail.value && inputEmail.value.hasError)
} else if (slide.value === '2') {
// Username
ret = !signup.username || (inputUsername.value && inputUsername.value.hasError)
@@ -391,6 +392,7 @@ export default defineComponent({
needTelegram,
slide,
checkifDisabled,
inputAportador,
inputEmail,
inputUsername,
inputName,

View File

@@ -113,6 +113,7 @@
showaportador &&
signup.aportador_solidario !== tools.APORTADOR_NONE
"
ref="inputAportador"
bg-color="lightblue"
:readonly="!!ap_iniziale"
v-model="signup.aportador_solidario"

View File

@@ -156,6 +156,7 @@ export default defineComponent({
comune: 1,
userId: 1,
username: 1,
name: 1,
surname: 1,
lasttimeonline: 1,
mycities: 1,