fix(desktop): google api calls

desktop/index.ts

@@ -24,7 +24,7 @@ function createWindow () {
     webPreferences: {
       contextIsolation: false,
       enableRemoteModule: false,
-      webSecurity: true,
+      webSecurity: false,
       nodeIntegration: true
     }
   })
@@ -45,6 +45,21 @@ function createWindow () {
   mainWindow.once('ready-to-show', () => {
     mainWindow?.show()
   })
+
+  /*
+  mainWindow.webContents.on('will-navigate', function (event: any, newUrl: string) {
+    console.log(newUrl);
+    // More complex code to handle tokens goes here
+  });
+
+  mainWindow.webContents.on('did-get-redirect-request', function(
+    event: any,
+    oldUrl: string,
+    newUrl: string
+  ) {
+    console.log(newUrl);
+  });
+  */
 }
 
 

package.json

@@ -16,6 +16,7 @@
     "desktop:dev": "concurrently -k \"cross-env BROWSER=none yarn dev\" \"yarn desktop:set\"",
     "desktop:start": "cross-env NODE_ENV=development electron dist/main/index.js",
     "desktop:build": "cross-env NODE_ENV=production tsc desktop/index.ts --moduleResolution Node --removeComments -t esnext --outDir dist/main && yarn build && electron-builder",
+    "desktop:view": "yarn desktop:build && yarn desktop:dev",
     "lint": "eslint --ext .js,.vue --ignore-path .gitignore --fix src && yarn format",
     "format": "prettier src/**/*.{vue,css,ts} --write",
     "test": "jest",

src/use/google/fonts.ts

@@ -31,13 +31,6 @@ export const useFonts = () => {
   }
 
   const get = async () => {
-    if (isElectron()) {
-      const normalize = {}
-      const names: Array<any> = []
-
-      return { normalize, names }
-    }
-
     let normalize: Record<string, any> = {}
     const names: Array<string> = []
 

src/use/pdf.ts

@@ -506,8 +506,8 @@ export const usePDF = () => {
     if (store.state.pdf.normalize['Roboto'])
       set['Roboto'] = store.state.pdf.normalize['Roboto']
 
-      // @ts-ignore
-    ;(<any>pdfMake).fonts = set
+    // @ts-ignore
+    // ;(<any>pdfMake).fonts = set
   }
 
   const create = (): void => {

src/use/start.ts

@@ -8,6 +8,7 @@ import { useToast } from 'vue-toastification'
 import { useEnv } from './env'
 import i18n from '@/lang'
 import isElectron from 'is-electron'
+import { useUtils } from './utils'
 
 export const useStart: Callback<void> = () => {
   const store = useStore()
@@ -17,6 +18,7 @@ export const useStart: Callback<void> = () => {
   const pdf = usePDF()
   const env = useEnv()
   const format = useFormat()
+  const utils = useUtils()
   const { t } = i18n.global
 
   const global = () => {
@@ -135,13 +137,12 @@ export const useStart: Callback<void> = () => {
   const init = () => {
     dark()
     lang()
+    auth()
+    pdf.init()
+    initial()
 
     if (isElectron()) return
-
-    initial()
     global()
-    auth()
-    pdf.init()
   }
 
   return { init }

src/use/utils.ts

@@ -18,5 +18,11 @@ export const useUtils = () => {
     return { insert }
   }
 
-  return { delay, prevent, array }
+  const join = (parts: any, sep?: any): string => {
+    var separator = sep || '/'
+    var replace = new RegExp(separator + '{1,}', 'g')
+    return parts.join(separator).replace(replace, separator)
+  }
+
+  return { delay, prevent, array, join }
 }