up

arkitektio · Nov 27, 2024 · 132cab2 · 132cab2
1 parent d77f9fe
commit 132cab2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/electron/main/index.ts b/electron/main/index.ts
@@ -154,6 +154,10 @@ function openSecondaryWindow(path): void {
     show: false,
     autoHideMenuBar: true,
     ...(process.platform === "linux" ? { icon } : {}),
+    webPreferences: {
+      preload: join(__dirname, "../preload/index.js"),
+      sandbox: false,
+    },
   });
 
   secondaryWindow.on("ready-to-show", () => {
@@ -168,11 +172,15 @@ function openSecondaryWindow(path): void {
   // HMR for renderer base on electron-vite cli.
   // Load the remote URL for development or the local html file for production.
   if (is.dev && process.env["ELECTRON_RENDERER_URL"]) {
-    secondaryWindow.loadURL(process.env["ELECTRON_RENDERER_URL"] + "#" + path);
+    secondaryWindow.loadURL(process.env["ELECTRON_RENDERER_URL"] + path);
   } else {
-    secondaryWindow.loadFile(
-      join(__dirname, "../renderer/index.html", "#" + path),
-    );
+    secondaryWindow
+      .loadFile(join(__dirname, "../renderer/index.html"))
+      .then(() => {
+        secondaryWindow.webContents.executeJavaScript(
+          `window.location = '${path}'`,
+        );
+      });
   }
 }
 

diff --git a/src/components/layout/PageLayout.tsx b/src/components/layout/PageLayout.tsx
@@ -44,7 +44,6 @@ export const PageLayout = ({
   const location = useLocation();
 
   const popOut = useCallback(() => {
-    console.log(location.pathname);
     window.api.openSecondWindow(location.pathname);
   }, []);