Update Main Branch

.gitignore

@@ -30,3 +30,7 @@ npm-debug.log*
 /platforms
 /plugins
 /www
+
+_environment.prod.ts
+electron/electron-builder.env
+src/environments/_environment.prod.ts

TODO.md

@@ -0,0 +1,5 @@
+## Semaphore:
+
+1. [ ]  Change from the default daily semaphore to custom semaphore, setting by default two semaphores per day. This will allow us to have better control over the semaphore and to be able to set the semaphore to be used in the future.
+Ideally with be good to use a priority or set to store the semaphores and remove any semaphore that was used or is in the past.
+

electron/.gitignore

@@ -6,4 +6,5 @@ node_modules
 build
 dist
 logs
-out
+out
+*.env

electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unicef-pdca",
-  "version": "1.0.4",
+  "version": "1.0.10",
   "description": "Unicef Project Connect Daily Check App",
   "author": {
     "name": "Unicef"
@@ -18,7 +18,8 @@
     "electron:start-live": "node ./live-runner.js",
     "electron:start": "npm run build && electron --inspect=5858 ./",
     "electron:pack": "npm run build && electron-builder build --dir -c ./electron-builder.config.json",
-    "electron:make": "npm run build && electron-builder build -c ./electron-builder.config.json -p always --x64 --ia32"
+    "electron:make": "npm run build && electron-builder build -c ./electron-builder.config.json -p always --x64 --ia32",
+    "electron:make-not-publish": "npm run build && electron-builder build -c ./electron-builder.config.json always --x64 --ia32"
   },
   "dependencies": {
     "@capacitor-community/electron": "^4.1.0",
@@ -42,4 +43,4 @@
     "capacitor",
     "electron"
   ]
-}
+}

electron/src/index.ts

@@ -22,10 +22,7 @@ unhandled({
   }
 });
 
-Sentry.init({ dsn: "https://9a70105db9fb49e3ab0a9bdbd585ce8a@o4504957350445056.ingest.sentry.io/4504957357981696" });
-
-//New ICTD Sentry
-//Sentry.init({dsn: 'https://[email protected]/47'});
+Sentry.init({ dsn: "https://[email protected]/47" });
 
 let isQuiting = false;
 let mainWindow = null;
@@ -131,9 +128,9 @@ if (!gotTheLock) {
     if (!isDownloaded) {
       isDownloaded = true;
       try {
-       // autoUpdater.quitAndInstall(true, true)
+        // autoUpdater.quitAndInstall(true, true)
 
-       //for auto update comment the below codes, and uncomment the above line of code
+        //for auto update comment the below codes, and uncomment the above line of code
 
 
         const dialogOpts = {
@@ -148,7 +145,7 @@ if (!gotTheLock) {
         })
 
 
-       //throw new Error("opps there is unexpected error")
+        //throw new Error("opps there is unexpected error")
       } catch (error) {
         console.error('Error during update installation:', error);
         const dialogOpts = {
@@ -168,24 +165,24 @@ if (!gotTheLock) {
 
 
   });
-/*
-  autoUpdater.on('error', (error) => {
-    console.error('Update Error:', error);
+  /*
+    autoUpdater.on('error', (error) => {
+      console.error('Update Error:', error);
+
+      const dialogOpts = {
+        type: 'info',
+        buttons: ['Restart / Reinicie / Перезапустить', 'Later / Después / Позже'],
+        title: 'PCDC Update',
+
+        message:  `A new version of PCDC has been downloaded. Restart the application to apply the updates.\n\nUna nueva version de PCDC ha sido descargada. Reinicie la aplicación para aplicar los cambios.\n\nБыла загружена новая версия PCDC. Перезапустите приложение, чтобы применить обновления.`
+      };
+      dialog.showMessageBox(dialogOpts).then((returnValue) => {
+        if (returnValue.response === 0) autoUpdater.quitAndInstall(false, true)
+      })
 
-    const dialogOpts = {
-      type: 'info',
-      buttons: ['Restart / Reinicie / Перезапустить', 'Later / Después / Позже'],
-      title: 'PCDC Update',
-
-      message:  `A new version of PCDC has been downloaded. Restart the application to apply the updates.\n\nUna nueva version de PCDC ha sido descargada. Reinicie la aplicación para aplicar los cambios.\n\nБыла загружена новая версия PCDC. Перезапустите приложение, чтобы применить обновления.`
-    };
-    dialog.showMessageBox(dialogOpts).then((returnValue) => {
-      if (returnValue.response === 0) autoUpdater.quitAndInstall(false, true)
-    })
-
-  });
-
-*/
+    });
+
+  */
 
 
 

electron/src/setup.ts

@@ -51,15 +51,17 @@ export class ElectronCapacitorApp {
   private TrayIcon: Tray | null = null;
   private CapacitorFileConfig: CapacitorElectronConfig;
   private TrayMenuTemplate: (MenuItem | MenuItemConstructorOptions)[] = [
-    new MenuItem({ label: 'Open', click:  function(){
-          this.MainWindow.show();
-        } 
+    new MenuItem({
+      label: 'Open', click: function () {
+        this.MainWindow.show();
+      }
     }),
-    new MenuItem({ label: 'Quit App', click: function(){
+    new MenuItem({
+      label: 'Quit App', click: function () {
         isQuiting = true;
         app.quit();
         this.MainWindow.close();
-      }  
+      }
     }),
   ];
   private AppMenuBarMenuTemplate: (MenuItem | MenuItemConstructorOptions)[] = [
@@ -93,7 +95,7 @@ export class ElectronCapacitorApp {
       scheme: this.customScheme,
     });
   }
-  
+
 
   // Helper function to load in the app.
   private async loadMainWindow(thisRef: any) {
@@ -130,8 +132,8 @@ export class ElectronCapacitorApp {
       // titleBarOverlay: true,
       maximizable: false,
       minimizable: false,
-      resizable: false,
-      transparent: true, 
+      resizable: true,
+      transparent: true,
       webPreferences: {
         nodeIntegration: true,
         contextIsolation: true,
@@ -140,6 +142,7 @@ export class ElectronCapacitorApp {
         preload: preloadPath,
       },
     });
+    this.MainWindow.setSize(376, 550);
     this.mainWindowState.manage(this.MainWindow);
 
     if (this.CapacitorFileConfig.backgroundColor) {
@@ -152,8 +155,6 @@ export class ElectronCapacitorApp {
         this.SplashScreen.getSplashWindow().close();
       }
     });
-
-
     // When the tray icon is enabled, setup the options.
     if (this.CapacitorFileConfig.electron?.trayIconAndMenuEnabled) {
       this.TrayIcon = new Tray(icon);
@@ -239,6 +240,7 @@ export class ElectronCapacitorApp {
       setTimeout(() => {
         if (this.CapacitorFileConfig.electron?.electronIsDev) {
           this.MainWindow.webContents.openDevTools();
+          this.MainWindow.setSize(800, 600);
         }
         CapElectronEventEmitter.emit('CAPELECTRON_DeeplinkListenerInitialized', '');
       }, 400);
@@ -254,7 +256,7 @@ export class ElectronCapacitorApp {
             this.MainWindow.restore();
           } else {
             this.MainWindow.show();
-          }        
+          }
           this.MainWindow.focus();
         }
       });
@@ -266,16 +268,16 @@ export class ElectronCapacitorApp {
     });
 
     measureAppAutoLuncher.enable();
-    measureAppAutoLuncher.isEnabled().then(function(isEnabled){
-      if(isEnabled){
-          return;
+    measureAppAutoLuncher.isEnabled().then(function (isEnabled) {
+      if (isEnabled) {
+        return;
       }
       measureAppAutoLuncher.enable();
     })
-    .catch(function(err){
+      .catch(function (err) {
         // handle error
         console.log(err)
-    });
+      });
     // End of Auto lunching code
 
   }