diff --git a/.DS_Store b/.DS_Store index 96841df..3e643fe 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Electron/main.js b/Electron/main.js index bb2f6f3..15a0c76 100644 --- a/Electron/main.js +++ b/Electron/main.js @@ -11,7 +11,6 @@ const { shell, session } = require("electron"); -const isDev = true; 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' diff --git a/Frontend/src/index.js b/Frontend/src/index.js index e04e646..9f57761 100644 --- a/Frontend/src/index.js +++ b/Frontend/src/index.js @@ -4,18 +4,18 @@ import './index.css'; import App from './App'; import reportWebVitals from './reportWebVitals'; -// const root = ReactDOM.createRoot(document.getElementById('root')); -// root.render( -// -// -// -// ); - -ReactDOM.render( +const root = ReactDOM.createRoot(document.getElementById('root')); +root.render( - , - document.getElementById('root') + ); +// ReactDOM.render( +// +// +// , +// document.getElementById('root') +// ); + reportWebVitals(); diff --git a/package.json b/package.json index aa181c6..e9f838d 100644 --- a/package.json +++ b/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", diff --git a/yarn.lock b/yarn.lock index 367d4c0..1c5fad2 100644 --- a/yarn.lock +++ b/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"