From b0d296e0079ddbf67795fb23dc9611bbe3e6d032 Mon Sep 17 00:00:00 2001 From: BhagwanSingh Date: Thu, 18 Dec 2025 15:35:24 +0530 Subject: [PATCH] Logs TIme Issue Solved --- resources/wireguard/windows/wg0.conf | 7 +++---- src/electron/api/axiosClient.ts | 2 +- src/electron/api/baseURL.ts | 4 ++-- src/electron/ipc/ipcHandler.ts | 2 ++ src/electron/main.ts | 4 ++++ src/ui/hooks/useActiveAppTracker.tsx | 2 +- src/ui/layout/DashboardLayout.tsx | 2 +- src/ui/main.tsx | 16 ++++++++-------- src/ui/pages/Vpn/VpnGuard.tsx | 6 +++--- 9 files changed, 25 insertions(+), 20 deletions(-) diff --git a/resources/wireguard/windows/wg0.conf b/resources/wireguard/windows/wg0.conf index c5a6248..f5bffdd 100644 --- a/resources/wireguard/windows/wg0.conf +++ b/resources/wireguard/windows/wg0.conf @@ -1,12 +1,11 @@ [Interface] -PrivateKey = EA2j6mOQB17w497cZS4B91m/xDzEcGz9lU3jKtc1wU8= -Address = 10.0.0.27/32 +PrivateKey = GKXyqCZfS9r2yWzqHJ43L24dnW13VJNilER9jwkyREE= +Address = 10.0.0.95/32 DNS = 1.1.1.1 [Peer] PublicKey = jG+7H5thEiNjxY1XqI1R9oyMAMTIegLwE3tZkS1Rj2U= -AllowedIPs = 10.0.0.0/24 Endpoint = 35.95.209.161:51820 AllowedIPs = 10.0.0.0/24 -PersistentKeepalive = 25 \ No newline at end of file +PersistentKeepalive = 25 diff --git a/src/electron/api/axiosClient.ts b/src/electron/api/axiosClient.ts index 3cd6426..bb23df0 100644 --- a/src/electron/api/axiosClient.ts +++ b/src/electron/api/axiosClient.ts @@ -18,7 +18,7 @@ const httpsAgent = new https.Agent({ console.log('Base_URL$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$' ,Base_URL) const api: AxiosInstance = axios.create({ - // baseURL: 'https://portal-sf.docva.com/api/v1/va', // 🔁 your backend + // baseURL: 'https://quality-friendly-goldfish.ngrok-free.app/api/v1/va', // 🔁 your backend baseURL: `${Base_URL}/api/v1/va`, httpsAgent // timeout: 10000, diff --git a/src/electron/api/baseURL.ts b/src/electron/api/baseURL.ts index 2a33d5a..67478cd 100644 --- a/src/electron/api/baseURL.ts +++ b/src/electron/api/baseURL.ts @@ -1,5 +1,5 @@ -// let CURRENT_BASE_URL = "https://portal-sf.docva.com/api/v1/va"; -let CURRENT_BASE_URL = "https://portal-sf.docva.com"; +// let CURRENT_BASE_URL = "https://quality-friendly-goldfish.ngrok-free.app/api/v1/va"; +let CURRENT_BASE_URL = "https://quality-friendly-goldfish.ngrok-free.app"; export const getBaseURL = () => CURRENT_BASE_URL; export const setBaseURL = (url: string) => { diff --git a/src/electron/ipc/ipcHandler.ts b/src/electron/ipc/ipcHandler.ts index f13f3d4..fe3cc2d 100644 --- a/src/electron/ipc/ipcHandler.ts +++ b/src/electron/ipc/ipcHandler.ts @@ -21,6 +21,8 @@ export const registerIPCHandlers = (mainWindow: BrowserWindow) => { // UPDATE Base URL ipcMain.handle("UPDATE_BASE_URL", (event, url: string) => { setBaseURL(url); + api.defaults.baseURL = `${url}/api/v1/va`; + console.log("Base URL updated to:", api.defaults.baseURL); return { updated: true, baseURL: url diff --git a/src/electron/main.ts b/src/electron/main.ts index 9dbe4d0..3fa2016 100644 --- a/src/electron/main.ts +++ b/src/electron/main.ts @@ -197,6 +197,10 @@ app.on('browser-window-focus', () => { // globalShortcut.unregisterAll(); // }); +app.on("window-all-closed", () => { + app.quit(); +}); + // --------------------------- // CUSTOM CLOSE BEHAVIOR diff --git a/src/ui/hooks/useActiveAppTracker.tsx b/src/ui/hooks/useActiveAppTracker.tsx index 2993c5e..d66fb60 100644 --- a/src/ui/hooks/useActiveAppTracker.tsx +++ b/src/ui/hooks/useActiveAppTracker.tsx @@ -132,7 +132,7 @@ const finalizeAndSendLogs = useCallback( // } : null, // }); - let res = window.electron.trackingTabsOpeningClosing(payload); + let res = await window.electron.trackingTabsOpeningClosing(payload); console.log("Tracking response:", res); dispatch(clearProjectLogs({ projectId })); diff --git a/src/ui/layout/DashboardLayout.tsx b/src/ui/layout/DashboardLayout.tsx index 2c45e1e..d066022 100644 --- a/src/ui/layout/DashboardLayout.tsx +++ b/src/ui/layout/DashboardLayout.tsx @@ -592,7 +592,7 @@ const DashboardLayout = () => { if (!selectedProject?.projectId) return console.log(selectedProject?.projectId, "SelectedProject ID") - socketRef.current = io("https://portal-sf.docva.com", { + socketRef.current = io("https://quality-friendly-goldfish.ngrok-free.app", { transports: ["websocket"], secure: true, rejectUnauthorized: false, diff --git a/src/ui/main.tsx b/src/ui/main.tsx index 4ec36b4..5f1d991 100644 --- a/src/ui/main.tsx +++ b/src/ui/main.tsx @@ -7,15 +7,15 @@ import { store } from "./store"; import { ToastProvider } from './helper/ToastContext'; // renderer only -window.addEventListener("online", (e) => { - console.log("Network online (ignored)"); - e.preventDefault(); -}); +// window.addEventListener("online", (e) => { +// console.log("Network online (ignored)"); +// e.preventDefault(); +// }); -window.addEventListener("offline", (e) => { - console.log("Network offline (ignored)"); - e.preventDefault(); -}); +// window.addEventListener("offline", (e) => { +// console.log("Network offline (ignored)"); +// e.preventDefault(); +// }); // Extra safety window.onbeforeunload = () => false; diff --git a/src/ui/pages/Vpn/VpnGuard.tsx b/src/ui/pages/Vpn/VpnGuard.tsx index 5100825..9f01e0e 100644 --- a/src/ui/pages/Vpn/VpnGuard.tsx +++ b/src/ui/pages/Vpn/VpnGuard.tsx @@ -8,7 +8,7 @@ interface Props { const VpnGuard: React.FC = ({ children }) => { const VPN_API = "http://10.0.0.1:3000"; - const DEFAULT_API = "https://portal-sf.docva.com" + const DEFAULT_API = "https://quality-friendly-goldfish.ngrok-free.app" const [checking, setChecking] = useState(true); const [vpnConnected, setVpnConnected] = useState(true); @@ -166,14 +166,14 @@ const VpnGuard: React.FC = ({ children }) => { {/* Disconnect VPN (Disabled when NOT connected) */} - + */}