Merge pull request #150 from nigeljacob/Nigel

Fixed small issues and bugs
nigeljacob · Mar 23, 2024 · 385adf3 · 385adf3
2 parents f9aa15c + c5e36dd
commit 385adf3
Show file tree

Hide file tree

Showing 26 changed files with 3,244 additions and 404 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Backend/src/ProgressTrackerFunctions.js b/Backend/src/ProgressTrackerFunctions.js
@@ -7,7 +7,7 @@ const axios = require('axios');
 const FormData = require('form-data');
 const { WritableStreamBuffer } = require('stream-buffers');
 // import { activeWindow, type } from '@miniben90/x-win';
-const { activeWindow } = require('@miniben90/x-win');
+const { activeWindow, openWindows } = require('@miniben90/x-win');
 const { uIOhook, UiohookKey } = require('uiohook-napi')
 
 
@@ -25,6 +25,10 @@ function getActiveWindowMac() {
     });
 }
 
+function getRunningWindowsMac() {
+    return openWindows()
+}
+
 // to get currently active app on mac
 function checkActiveApplication() {
     getActiveWindowMac()
@@ -301,4 +305,4 @@ function getDateTime() {
 
 
 
-module.exports = { checkActiveApplication, getCurrentlyActiveApplication, openFileDialog, createZipAndUpload, getFocusedWindow, idleDetection, getDateTime};
+module.exports = { checkActiveApplication, getCurrentlyActiveApplication, openFileDialog, createZipAndUpload, getFocusedWindow, idleDetection, getDateTime, getRunningWindowsMac};
diff --git a/Backend/src/viewTaskFunctions.js b/Backend/src/viewTaskFunctions.js
@@ -3,7 +3,7 @@ var fs = require('fs');
 const os = require('node:os')
 const { exec } = require('child_process');
 // const helloModule = require('./testing.js');
-const {getCurrentlyActiveApplication} = require('./ProgressTrackerFunctions')
+const {getCurrentlyActiveApplication, getRunningWindowsMac} = require('./ProgressTrackerFunctions')
 
 const {getInstalledApps} = require('get-installed-apps')
 
@@ -60,6 +60,15 @@ const {getInstalledApps} = require('get-installed-apps')
                 for(let i = 0; i < activeAppList.length; i++) {
                     let dict = {name: activeAppList[i], iconData: "data:image/png;base64,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"}
 
+                    if(!appsList.some((item) => item.name === dict.name)) {
+                        appsList.push(dict)
+                    }
+                }
+            } else {
+                const applicationsList = getRunningWindowsMac();
+
+                for(let i = 0; i < applicationsList.length; i++) {
+                    let dict = {name: applicationsList[i].info.name, iconData: "../../assets/images/defaultIconMac.png"}
                     if(!appsList.some((item) => item.name === dict.name)) {
                         appsList.push(dict)
                     }

diff --git a/Electron/main.js b/Electron/main.js
@@ -4,12 +4,14 @@ const {
   BrowserWindow,
   Menu,
   ipcMain,
-  Notification,
   dialog,
   screen,
-  nativeImage
+  Notification,
+  nativeImage,
+  shell,
+  session
 } = require("electron");
-const isDev = false
+const isDev = true;
 const windowStateKeeper = require("electron-window-state");
 const path = require("path");
 const {
@@ -25,6 +27,8 @@ const {
 } = require("../Backend/src/ProgressTrackerFunctions");
 const chokidar = require('chokidar');
 const trayWindow = require("electron-tray-window");
+const { systemPreferences } = require('electron')
+const { exec } = require('child_process');
 
 function createWindow() {
   let mainWindowState = windowStateKeeper({
@@ -153,6 +157,40 @@ function createWindow() {
       });
   });
 
+
+  if(os.platform() == "darwin") {
+    setTimeout(() => {
+    const permission = ""
+
+    session.defaultSession.setPermissionRequestHandler((webContents, permission, callback) => {
+      return callback(false);
+    })
+
+    systemPreferences.isTrustedAccessibilityClient(true)
+
+    win.webContents
+    .executeJavaScript('localStorage.getItem("notificationPermission");', true)
+    .then(result => {
+      if(result == null) {
+      dialog.showMessageBox(win, {
+        type: 'warning',
+        icon: path.join(__dirname, 'icon.png'),
+        message: 'Notification permissions denied',
+        detail: 'To enable notifications, please go to your system settings. Click "Notifications" and enable notifications for SYNK.',
+        buttons: ['Open Settings', 'Deny'],
+        defaultId: 0
+      }).then(({ response }) => {
+        if (response === 0) {
+         shell.openExternal('x-apple.systempreferences:com.apple.preference.notifications')
+         win.webContents
+          .executeJavaScript('localStorage.setItem("notificationPermission", true);', true)
+        }
+      });
+    }
+    });
+  }, 10000)
+  }
+
   ipcMain.on("notification", (event, notification) => {
     const NOTIFICATION_TITLE = notification[0];
     const NOTIFICATION_BODY = notification[1];
@@ -539,16 +577,51 @@ win.on("close", (e) => {
     }, 900000)
 
     appTrackingInterval = setInterval(() => {
-      let currentWindow = getFocusedWindow();
+
+      let currentWindow;
+
+      try{
+        currentWindow = getFocusedWindow();
+      } catch(e) {
+            dialog.showMessageBox(win, {
+              type: 'error',
+              icon: path.join(__dirname, 'icon.png'),
+              message: 'Tracking Permission denied',
+              detail: 'Accept the permission to allow SYNK to track your task activity. Start the task again after successfull permission.',
+              buttons: ['Ok'],
+              defaultId: 0
+            })
+            clearInterval(idleTrackingInterval)
+            clearInterval(appTrackingInterval)
+            clearInterval(lastModifiedInterval)
+
+            win.webContents.send("sendIntervalsPaused", {...TaskDetails, trackedApplications: trackedApplications})
+      }
         if(!idleDetected) {
-          idleDetection("start", (data) => {
+          try{
+            idleDetection("start", (data) => {
             console.log("detected");
             idleDetected = true
             if(idlePopupShown) {
               idlePopup.destroy()
               idlePopupShown = false
             }
           })
+          } catch(e) {
+            dialog.showMessageBox(win, {
+              type: 'error',
+              icon: path.join(__dirname, 'icon.png'),
+              message: 'Tracking Permission denied',
+              detail: 'Accept the permission to allow SYNK to track your task activity. Start the task again after successfull permission.',
+              buttons: ['Ok'],
+              defaultId: 0
+            })
+            clearInterval(idleTrackingInterval)
+            clearInterval(appTrackingInterval)
+            clearInterval(lastModifiedInterval)
+
+            win.webContents.send("sendIntervalsPaused", {...TaskDetails, trackedApplications: trackedApplications})
+          }
         } else {
           idleDetection("stop", (data) => {
             // console.log("stopped")
@@ -733,6 +806,8 @@ ipcMain.on("idleCloseClicked", (event, data) => {
   }
 });
 
+app.setAccessibilitySupportEnabled(true)
+
 }
 
 app.on("ready", createWindow);

diff --git a/Frontend/src/App.css b/Frontend/src/App.css
@@ -23,6 +23,7 @@ body {
     rgba(30, 30, 30, 1) 100%
   );
   background-repeat: none;
+  scroll-behavior: smooth;
 }
 
 *::-webkit-scrollbar {