+
diff --git a/src/constants.ts b/src/constants.ts
index 8416f4d..b0e77f0 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -1,6 +1,6 @@
import path from 'node:path';
import { app, nativeImage } from 'electron';
-const icon = require('./assets/icon.ico');
+import icon from './assets/icon.ico';
const ICON = nativeImage.createFromPath(path.join(__dirname, icon));
const CONFIG = path.join(app.getPath('userData'), 'config.json');
diff --git a/src/index.ts b/src/index.ts
index 9575f4b..63c1e5b 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -23,12 +23,12 @@ const createWindow = (): void => {
autoHideMenuBar: HIDE_MENU,
webPreferences: {
preload: MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY,
- //devTools: false,
+ devTools: !app.isPackaged,
},
});
const bulbHelper = new BulbHelper();
- createTray(mainWindow, app);
+ createTray(mainWindow, app, bulbHelper);
ipcMain.on('bulb-state-request', (event) => {
bulbHelper.getBulbState().then((res) => {
@@ -80,15 +80,36 @@ const createWindow = (): void => {
// and load the index.html of the app.
mainWindow.loadURL(MAIN_WINDOW_WEBPACK_ENTRY);
- // Open the DevTools.
- mainWindow.webContents.openDevTools();
+ mainWindow.on('close', () => {
+ bulbHelper.endConnection();
+ });
+
+ mainWindow.on('minimize', (event: Event) => {
+ event.preventDefault();
+ mainWindow.hide();
+ });
};
-// This method will be called when Electron has finished
-// initialization and is ready to create browser windows.
-// Some APIs can only be used after this event occurs.
-app.on('ready', createWindow);
-app.setName('WiZ App');
+const gotTheLock = app.requestSingleInstanceLock();
+if (!gotTheLock) {
+ app.quit();
+} else {
+ app.on('second-instance', () => {
+ const mainWindow = BrowserWindow.getAllWindows()[0];
+ if (mainWindow) {
+ if (mainWindow.isMinimized()) {
+ mainWindow.restore();
+ }
+ mainWindow.focus();
+ }
+ });
+
+ // This method will be called when Electron has finished
+ // initialization and is ready to create browser windows.
+ // Some APIs can only be used after this event occurs.
+ app.setName('WiZ App');
+ app.on('ready', createWindow);
+}
app.whenReady().then(() => {
installExtension(REACT_DEVELOPER_TOOLS)
diff --git a/src/react-app-env.d.ts b/src/react-app-env.d.ts
index a0993ed..617e679 100644
--- a/src/react-app-env.d.ts
+++ b/src/react-app-env.d.ts
@@ -1,4 +1,9 @@
declare module '*.png' {
- const value: any;
+ const value: never;
+ export = value;
+}
+
+declare module '*.ico' {
+ const value: never;
export = value;
}
diff --git a/src/tray.ts b/src/tray.ts
index fb8a853..3c18337 100644
--- a/src/tray.ts
+++ b/src/tray.ts
@@ -1,7 +1,8 @@
import { BrowserWindow, Menu, Tray } from 'electron';
import { ICON } from './constants';
+import BulbHelper from './bulbHelper';
-const createTray = (mainWindow: BrowserWindow, app: Electron.App) => {
+const createTray = (mainWindow: BrowserWindow, app: Electron.App, bulbHelper: BulbHelper) => {
const tray = new Tray(ICON);
const contextMenu = Menu.buildFromTemplate([
{
@@ -14,7 +15,7 @@ const createTray = (mainWindow: BrowserWindow, app: Electron.App) => {
{
label: 'Toggle Bulb',
click: () => {
- // TODO
+ bulbHelper.toggleBulb();
},
},
{ type: 'separator' },
-