update BASE_REST_API in environment files and refactor useClosePreloadWindow hook usage

Author: trae-op

.env

@@ -1,2 +1,2 @@
 LOCALHOST_ELECTRON_SERVER_PORT="8844"
-BASE_REST_API="https://localhost:10000"
+BASE_REST_API="https://gp-api-w36p.onrender.com"

.env.production

@@ -1,2 +1 @@
-BASE_REST_API="https://gp-api-w36p.onrender.com"
-GH_TOKEN="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"
+BASE_REST_API="https://gp-api-w36p.onrender.com"

src/main/app/window.ts

@@ -71,11 +71,10 @@ export class AppWindow implements TWindowManager {
 
   private async checkAuthenticated(window: BrowserWindow) {
     const result = this.authService.checkAuthenticated(window);
-    if (result !== undefined && result.isAuthenticated !== undefined) {
-      ipcWebContentsSend("authSocialNetwork", window.webContents, {
-        isAuthenticated: result.isAuthenticated,
-      });
-    }
+    ipcWebContentsSend("authSocialNetwork", window.webContents, {
+      isAuthenticated:
+        result !== undefined && result.isAuthenticated !== undefined,
+    });
   }
 
   private buildTray(window: BrowserWindow): void {

src/main/resources/windows/add.ts

@@ -5,7 +5,6 @@ import { TWindowManager } from "../../@core/types/window-manager.js";
   hash: "window/resource/add",
   isCache: true,
   options: {
-    alwaysOnTop: true,
     width: 400,
     height: 500,
   },

src/main/resources/windows/delete.ts

@@ -6,7 +6,6 @@ import { TWindowManager } from "../../@core/types/window-manager.js";
   hash: "window/resource/delete",
   isCache: true,
   options: {
-    alwaysOnTop: true,
     width: 350,
     height: 190,
   },

src/main/resources/windows/update.ts

@@ -6,7 +6,6 @@ import { TWindowManager } from "../../@core/types/window-manager.js";
   hash: "window/resource/update",
   isCache: true,
   options: {
-    alwaysOnTop: true,
     width: 400,
     height: 500,
   },

src/renderer/hooks/closePreloadWindow/useClosePreloadWindow.ts

@@ -1,7 +1,16 @@
 import { useEffect } from "react";
+import { useLocation } from "react-router-dom";
+
+export const useClosePreloadWindow = (currentPathname: string) => {
+  const { pathname } = useLocation();
 
-export const useClosePreloadWindow = () => {
   useEffect(() => {
-    window.electron.send.closePreloadWindow();
-  }, []);
+    const normalizedParam = currentPathname.startsWith("/")
+      ? currentPathname
+      : `/${currentPathname}`;
+
+    if (normalizedParam === pathname) {
+      window.electron.send.closePreloadWindow();
+    }
+  }, [currentPathname, pathname]);
 };

src/renderer/layouts/Main.tsx

@@ -28,7 +28,7 @@ const theme = createTheme({
 });
 
 export const MainLayout = () => {
-  useClosePreloadWindow();
+  useClosePreloadWindow("sign-in");
 
   return (
     <ThemeProvider theme={theme}>

src/renderer/windows/home/components/Home.tsx

@@ -7,11 +7,13 @@ import {
 } from "@ui-business/MasterKey";
 import { Provider as ProviderSync } from "@ui-business/Sync";
 import { LoadingSpinner } from "@components/LoadingSpinner";
+import { useClosePreloadWindow } from "@hooks/closePreloadWindow";
 
 const LazyTopPanel = lazy(() => import("./TopPanel"));
 const LazyResources = lazy(() => import("./Resources"));
 
 const Home = () => {
+  useClosePreloadWindow("window:main");
   useIpcMasterKey();
   const { isMasterKey } = useControlContextMasterKey();