Add Log and Fix icon path

forge.config.js

@@ -4,9 +4,10 @@ const package = require('./package.json');
 
 module.exports = {
   packagerConfig: {
-    asar: true,
+    asar: false,
     executableName: 'controlpad',
     appCopyright: `Copyright (C) ${new Date().getFullYear()} KlutzyBubbles`,
+    extraResource: path.resolve(rootDir, 'assets', 'icon.ico'),
   },
   makers: [
     {

package.json

@@ -74,6 +74,7 @@
     "@mui/material": "^5.3.1",
     "@mui/styles": "^5.3.0",
     "@nut-tree/nut-js": "^2.0.1",
+    "electron-log": "^4.4.5",
     "electron-squirrel-startup": "^1.0.0",
     "electron-store": "^8.0.1",
     "fast-deep-equal": "^3.1.3",

src/main/App.ts

@@ -1,22 +1,44 @@
 import { app, BrowserWindow } from 'electron';
 import { createAppWindow } from './AppWindow';
+// import log from 'electron-log';
 
-if (require('electron-squirrel-startup')) {
-  app.quit();
-}
-
-app.on('ready', () => {
-  createAppWindow();
-});
 
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createAppWindow();
+var handleStartupEvent = () => {
+  if (process.platform !== 'win32') {
+    return false;
   }
-});
 
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit();
+  var squirrelCommand = process.argv[1];
+  switch (squirrelCommand) {
+    case '--squirrel-install':
+    case '--squirrel-updated':
+      setTimeout(app.quit, 2000);
+      return true;
+    case '--squirrel-uninstall':
+      setTimeout(app.quit, 2000);
+      return true;
+    case '--squirrel-obsolete':
+      setTimeout(app.quit, 2000);
+      return true;
   }
-});
+};
+
+if (!handleStartupEvent()) {
+  app.on('ready', () => {
+    createAppWindow();
+  });
+
+  app.on('activate', () => {
+    if (BrowserWindow.getAllWindows().length === 0) {
+      createAppWindow();
+    }
+  });
+
+  app.on('window-all-closed', () => {
+    if (process.platform !== 'darwin') {
+      app.quit();
+    }
+  });
+}
+
+

src/main/AppWindow.ts

@@ -3,11 +3,12 @@ import path from 'path';
 import { registerTitlebarIpc } from '@main/ipc/TitlebarIPC';
 import registerConfigIPC from './ipc/ConfigIPC';
 import registerKeyboardIPC from './ipc/KeyboardIPC';
+// import log from 'electron-log';
 
 declare const APP_WINDOW_WEBPACK_ENTRY: string;
 declare const APP_WINDOW_PRELOAD_WEBPACK_ENTRY: string;
 
-const iconPath = path.resolve('assets/icon.ico');
+const iconPath = app.isPackaged ? path.resolve('./resources/icon.ico') : path.resolve('./assets/icon.ico');
 let appWindow: BrowserWindow;
 let appTray: Tray;
 

src/renderer/Preload.tsx

@@ -1,5 +1,6 @@
 import '@src/window/WindowPreload';
 import './preload/config/ConfigPreload';
 import './preload/keyboard/KeyboardPreload';
+import './preload/log/LogPreload';
 
 console.log('[CP] : Preload execution started');

src/renderer/components/App.tsx

@@ -24,6 +24,7 @@ import Launchpad from '@common/Launchpad';
 import Chip from '@mui/material/Chip';
 import Paper from '@mui/material/Paper';
 import { hasKeyCombo } from '@common/Utils';
+// import logContext from '@preload/log/LogContextApi';
 
 export interface SelectedButton {
   section: Section;

src/renderer/preload/log/ElectronLog.ts

@@ -0,0 +1,7 @@
+import log from 'electron-log';
+
+const electronLog = {
+  log: log.functions,
+}
+
+export default electronLog;

src/renderer/preload/log/LogContextApi.ts

@@ -0,0 +1,12 @@
+import electronLog from './ElectronLog';
+import log from 'electron-log';
+
+type AddedProps = {
+  electron_log: typeof electronLog;
+}
+
+type CombinedWindow = typeof window & AddedProps;
+
+const context: typeof log.functions = (window as CombinedWindow).electron_log.log;
+
+export default context;

src/renderer/preload/log/LogPreload.ts

@@ -0,0 +1,6 @@
+import { contextBridge } from 'electron';
+import log from 'electron-log';
+
+contextBridge.exposeInMainWorld('electron_log', {
+  log: log.functions,
+});