Merge branch 'main' into Inuka

.github/workflows/node.js.yml

@@ -61,3 +61,4 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         GH_TOKEN: ${{ secrets.GH_TOKEN }}
+

Dockerfile

@@ -0,0 +1,30 @@
+# Use a base image with Node.js and Chromium installed
+FROM node:18
+
+# Set the working directory inside the container
+WORKDIR /app
+
+# Copy package.json and package-lock.json to the working directory
+COPY package*.json ./
+
+# Install dependencies
+RUN yarn
+
+COPY Frontend/package*.json ./
+
+RUN cd Frontend && yarn
+
+COPY Backend/package*.json ./
+
+RUN cd Backend && yarn
+
+RUN yarn upgrade
+
+RUN yarn electron:build
+
+# Copy the Electron application source code into the container
+COPY . .
+
+EXPOSE 8080
+
+CMD ["npm", "electron:serve"]

Electron/main.js

@@ -11,7 +11,6 @@ const {
   shell,
   session
 } = require("electron");
-const isDev = false;
 const windowStateKeeper = require("electron-window-state");
 const path = require("path");
 const {
@@ -40,6 +39,8 @@ function createWindow() {
   const primaryDisplay = screen.getPrimaryDisplay();
   const primaryDisplayBounds = primaryDisplay.bounds;
 
+  const isDev = app.isPackaged ? false : true;
+
   const win = new BrowserWindow({
     x: mainWindowState.x,
     y: mainWindowState.y,
@@ -81,6 +82,61 @@ function createWindow() {
     },
   });
 
+  const template = [
+    {
+      label: 'SYNK',
+      submenu: [
+        {
+          label: 'About SYNK',
+          click() {
+            dialog.showMessageBox(win, {
+              type: 'info',
+              icon: path.join(__dirname, 'icon.png'),
+              message: 'SYNK',
+              detail: 'v0.1.0 \n\n©2024 Clueless Jellybeans',
+              buttons: ['Ok'],
+              defaultId: 0
+            })
+          }
+        },
+        {
+          type: 'separator'
+        },
+        {
+          label: 'Hide SYNK',
+          click() {
+            win.hide()
+          },
+        },
+        {
+          type: 'separator'
+        },
+
+        {
+          label: 'Show SYNK',
+          click() {
+            win.show()
+          },
+        },
+        {
+          type: 'separator'
+        },
+
+        {
+          label: 'Quit SYNK',
+          click() {
+            win.close()
+          }
+        },
+      ]
+    }
+  ];
+
+if(!isDev) {
+    const menu = Menu.buildFromTemplate(template);
+    Menu.setApplicationMenu(menu);
+}
+
   splashScreen.loadFile(
     isDev
       ? './Frontend/public/preload.html'

package.json

@@ -11,6 +11,7 @@
     "chart.js": "^4.4.2",
     "child_process": "^1.0.2",
     "chokidar": "^3.6.0",
+    "electron-is-dev": "^3.0.1",
     "electron-packager": "^17.1.2",
     "electron-tray-window": "^1.2.7",
     "electron-window-state": "^5.0.3",

yarn.lock

@@ -4818,6 +4818,11 @@ electron-download@^4.1.0:
     semver "^5.4.1"
     sumchecker "^2.0.2"
 
+electron-is-dev@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-3.0.1.tgz#1cbc79b1dd046787903acd357efdfab6549dc17a"
+  integrity sha512-8TjjAh8Ec51hUi3o4TaU0mD3GMTOESi866oRNavj9A3IQJ7pmv+MJVmdZBFGw4GFT36X7bkqnuDNYvkQgvyI8Q==
+
 electron-packager@^17.1.2:
   version "17.1.2"
   resolved "https://registry.yarnpkg.com/electron-packager/-/electron-packager-17.1.2.tgz#18030b28024d242b706d0a8a67ed4cd1a57311aa"