Update window handling

HASEL-UZH · Feb 21, 2024 · d0ef026 · d0ef026
1 parent 6de1e50
commit d0ef026
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 39 deletions.
diff --git a/src/electron/electron/main/index.ts b/src/electron/electron/main/index.ts
@@ -55,29 +55,6 @@ log.initialize();
 const LOG = getLogger('Main', true);
 LOG.info('Log from the main process');
 
-let win: BrowserWindow | null = null;
-const preload = join(__dirname, '../preload/index.mjs');
-const url = process.env.VITE_DEV_SERVER_URL;
-const indexHtml = join(process.env.DIST, 'index.html');
-
-async function createWindow() {
-  win = new BrowserWindow({
-    title: 'Main window',
-    icon: join(process.env.VITE_PUBLIC, 'favicon.ico'),
-    webPreferences: {
-      preload
-    }
-  });
-
-  if (process.env.VITE_DEV_SERVER_URL) {
-    // electron-vite-vue#298
-    win.loadURL(url);
-    win.webContents.openDevTools();
-  } else {
-    win.loadFile(indexHtml);
-  }
-}
-
 app.whenReady().then(async () => {
   app.setAppUserModelId('ch.ifi.hasel.personal-analytics');
 
@@ -136,19 +113,3 @@ app.whenReady().then(async () => {
     );
   }
 });
-
-app.on('window-all-closed', () => {
-  win = null;
-  if (process.platform !== 'darwin') {
-    app.quit();
-  }
-});
-
-app.on('activate', () => {
-  const allWindows = BrowserWindow.getAllWindows();
-  if (allWindows.length) {
-    allWindows[0].focus();
-  } else {
-    createWindow();
-  }
-});
diff --git a/src/electron/electron/main/services/WindowService.ts b/src/electron/electron/main/services/WindowService.ts
@@ -36,6 +36,7 @@ export class WindowService {
 
   public async createExperienceSamplingWindow() {
     this.experienceSamplingWindow?.close();
+    this.experienceSamplingWindow = null;
 
     const __filename = fileURLToPath(import.meta.url);
     const __dirname = dirname(__filename);