@d-mok/quasar-app-extension-quasar-axe 2.1.41 → 2.1.43

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@d-mok/quasar-app-extension-quasar-axe",
-    "version": "2.1.41",
+    "version": "2.1.43",
     "description": "A Quasar App Extension",
     "author": "d-mok <49301824+d-mok@users.noreply.github.com>",
     "license": "MIT",

package/src/index.js

@@ -2,6 +2,8 @@ function extendQuasarConf(conf, prompts) {
     for (let b of ['AutoRoute', 'AutoReg', 'Interceptor'])
         conf.boot.unshift(`axe/${b}`)
     console.log('[QuasarAxe] Config pushed Boots')
+    conf.boot.unshift('axe/LoadStart')
+    conf.boot.push('axe/LoadEnd')
 
     conf.framework.plugins.push(
         'AppVisibility',

package/src/templates/src/boot/axe/LoadEnd.ts

@@ -0,0 +1,8 @@
+import { boot } from 'quasar/wrappers'
+import { qNotify } from '../../utils'
+
+console.log('[QuasarAxe] Run Boot LoadEnd')
+
+export default boot(({ app }) => {
+    qNotify.unload()
+})

package/src/templates/src/boot/axe/LoadStart.ts

@@ -0,0 +1,8 @@
+import { boot } from 'quasar/wrappers'
+import { qNotify } from '../../utils'
+
+console.log('[QuasarAxe] Run Boot LoadStart')
+
+export default boot(({ app }) => {
+    qNotify.load()
+})

package/src/templates/src/utils/gSheet.ts

@@ -9,7 +9,7 @@ async function fetchAPI(
     action: 'read' | 'insert' | 'delete',
     payload: object = {}
 ) {
-    let stopLoading = qNotify.load('Loading...')
+    qNotify.load('Loading...')
     const res = await fetch(
         appScriptRootUrl +
             new URLSearchParams({
@@ -19,7 +19,7 @@ async function fetchAPI(
                 payload: JSON.stringify(payload),
             })
     )
-    stopLoading()
+    qNotify.unload()
     const data = await res.json()
     console.dev('[gSheet]', action, id, sheet)
     console.dev(action === 'read' ? data : payload)
@@ -53,4 +53,4 @@ export async function deleteRow(
 ): Promise<void> {
     const data = await fetchAPI(id, sheet, 'delete', { field, value })
     if (data !== true) throw new Error('[gSheet] delete failed')
-}
+}

package/src/templates/src/utils/notify.ts

@@ -30,7 +30,7 @@ export function info(message: string): void {
 let loadingCount = 0
 let stopper: () => void = () => {}
 
-export function load(loadingMsg = 'Loading...'): () => void {
+export function load(loadingMsg = 'Loading...'): void {
     if (loadingCount === 0) {
         stopper = Notify.create({
             type: 'ongoing',
@@ -38,10 +38,9 @@ export function load(loadingMsg = 'Loading...'): () => void {
         })
     }
     loadingCount++
-    return () => {
-        if (loadingCount === 1) {
-            stopper()
-        }
-        loadingCount--
-    }
+}
+
+export function unload(): void {
+    if (loadingCount === 1) stopper()
+    loadingCount--
 }