From faed0d8754999038db6f63c62d1f129ac639e979 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Tue, 2 Apr 2024 22:13:10 +0200 Subject: [PATCH] use location hash to set log mode --- packages/gui/src/main/index.js | 10 ++++++++-- packages/gui/src/renderer/src/App.jsx | 3 +-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/gui/src/main/index.js b/packages/gui/src/main/index.js index 42bd7c2..7af50cb 100644 --- a/packages/gui/src/main/index.js +++ b/packages/gui/src/main/index.js @@ -44,9 +44,11 @@ class LogsViewer { }) if (is.dev && process.env["ELECTRON_RENDERER_URL"]) { - this.window.loadURL(`${process.env["ELECTRON_RENDERER_URL"]}/logs`) + this.window.loadURL(`${process.env["ELECTRON_RENDERER_URL"]}/#logs`) } else { - this.window.loadFile(path.join(__dirname, "../renderer/index.html")) + this.window.loadFile(path.join(__dirname, "../renderer/index.html"), { + hash: "#logs", + }) } await new Promise((resolve) => this.window.once("ready-to-show", resolve)) @@ -99,6 +101,10 @@ class ElectronApp { this.adapter.attachLogger(loggerWindow) + loggerWindow.on("closed", () => { + this.adapter.detachLogger() + }) + loggerWindow.webContents.send("logger:new", { timestamp: new Date().getTime(), message: "Logger opened, starting watching logs", diff --git a/packages/gui/src/renderer/src/App.jsx b/packages/gui/src/renderer/src/App.jsx index 02f26ee..ee7464a 100644 --- a/packages/gui/src/renderer/src/App.jsx +++ b/packages/gui/src/renderer/src/App.jsx @@ -103,8 +103,7 @@ class App extends React.Component { console.log(`React version > ${versions["react"]}`) console.log(`DOMRouter version > ${versions["react-router-dom"]}`) - //check if path is /logs - if (window.location.pathname === "/logs") { + if (window.location.hash === "#logs") { return await this.setState({ initializing: false, no_layout: true,