From f3eb099e18906233a795c868835d947db7f56c71 Mon Sep 17 00:00:00 2001
From: BhagwanSingh <bhagwan.r@hicglobalsolutions.com>
Date: Thu, 13 Nov 2025 15:48:25 +0530
Subject: [PATCH] a

---
 src/electron/api/axiosClient.ts        |  2 +-
 src/electron/utils/utilityFunctions.ts |  2 +-
 src/ui/layout/DashboardLayout.tsx      | 24 ++++++++++++++----------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/electron/api/axiosClient.ts b/src/electron/api/axiosClient.ts
index 18d5805..8cc330e 100644
--- a/src/electron/api/axiosClient.ts
+++ b/src/electron/api/axiosClient.ts
@@ -6,7 +6,7 @@ import chalk from "chalk";
 const TOKEN_KEY = 'ACCESS_TOKEN';
 
 const api: AxiosInstance = axios.create({
-    baseURL: 'https://dreadingly-unfighting-pandora.ngrok-free.dev/api/v1/va', // 🔁 your backend
+    baseURL: 'https://wired-terminally-muskrat.ngrok-free.app/api/v1/va', // 🔁 your backend
     // timeout: 10000,
 });
 
diff --git a/src/electron/utils/utilityFunctions.ts b/src/electron/utils/utilityFunctions.ts
index ab0ed15..3ef1b6e 100644
--- a/src/electron/utils/utilityFunctions.ts
+++ b/src/electron/utils/utilityFunctions.ts
@@ -57,7 +57,7 @@ export const handleLogin = async (credentials: { email: string, password: string
         try {
             console.log("➡️ Calling API...");
             const response = await axios.post(
-                'https://dreadingly-unfighting-pandora.ngrok-free.dev/api/v1/va/login',
+                'https://wired-terminally-muskrat.ngrok-free.app/api/v1/va/login',
                 { userDetails: { ...credentials } },
                 { headers: { "ngrok-skip-browser-warning": 69420 } }
             );
diff --git a/src/ui/layout/DashboardLayout.tsx b/src/ui/layout/DashboardLayout.tsx
index c8cb145..41f5e40 100644
--- a/src/ui/layout/DashboardLayout.tsx
+++ b/src/ui/layout/DashboardLayout.tsx
@@ -219,19 +219,23 @@ const DashboardLayout: React.FC<DashboardLayoutProps> = ({ setUser }) => {
   };
 
   // Connect and start sending
-  const handleConnect = () => {
+  const handleConnect = async () => {
+
+    const token = await window.electron.getToken("ACCESS_TOKEN");
+
     if (socketRef.current) {
       console.warn("Already connected");
       return;
     }
-    if(!selectedProject?.id) return
+    if(!selectedProject?.projectId) return
     
-    console.log(selectedProject?.id, "SelectedProject ID")
-    socketRef.current = io("http://localhost:3000", {
+    console.log(selectedProject?.projectId, "SelectedProject ID")
+    socketRef.current = io("https://wired-terminally-muskrat.ngrok-free.app", {
       transports: ["websocket"],
+      secure: true,
       auth: {
-        token: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjY5MGIzMjhkMDkxMDFmNzRjZjUyNGMwNyIsImVtYWlsIjoiYmhhZ3dhbi5yQGhpY2dsb2JhbHNvbHV0aW9ucy5jb20iLCJuYW1lIjoiUm9oaXQiLCJpYXQiOjE3NjI4NTgxOTMsImV4cCI6MTc2Mjk0NDU5M30.UlHy3RU9W5LOid7smG7WzyNT7dnqhQT4qqzRrN1axmU",
-        projectId: selectedProject?.id,
+        token: token,
+        projectId: selectedProject?.projectId,
         userType: "va"
       },
     });
@@ -243,7 +247,7 @@ const DashboardLayout: React.FC<DashboardLayoutProps> = ({ setUser }) => {
       // Start sending every 5 seconds
       intervalRef.current = setInterval(async () => {
         const apps = await window.electron.getRunningApps()
-        socketRef.current?.emit("getVisibleApps", { token: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjY5MGIzMjhkMDkxMDFmNzRjZjUyNGMwNyIsImVtYWlsIjoiYmhhZ3dhbi5yQGhpY2dsb2JhbHNvbHV0aW9ucy5jb20iLCJuYW1lIjoiUm9oaXQiLCJpYXQiOjE3NjI4NTgxOTMsImV4cCI6MTc2Mjk0NDU5M30.UlHy3RU9W5LOid7smG7WzyNT7dnqhQT4qqzRrN1axmU", apps });
+        socketRef.current?.emit("getVisibleApps", { token: await token, apps });
 
         // const base64String = await window.electron.captureAppScreenShot("Screen 1");
         // if (base64String) {
@@ -258,7 +262,7 @@ const DashboardLayout: React.FC<DashboardLayoutProps> = ({ setUser }) => {
       const base64String = await window.electron.captureAppScreenShot(appTitle);
       if (base64String && socketRef.current) {
         socketRef.current.emit("sendImage", {
-          token: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjY5MGIzMjhkMDkxMDFmNzRjZjUyNGMwNyIsImVtYWlsIjoiYmhhZ3dhbi5yQGhpY2dsb2JhbHNvbHV0aW9ucy5jb20iLCJuYW1lIjoiUm9oaXQiLCJpYXQiOjE3NjI4NTgxOTMsImV4cCI6MTc2Mjk0NDU5M30.UlHy3RU9W5LOid7smG7WzyNT7dnqhQT4qqzRrN1axmU",
+          token: token,
           image: base64String,
           title: appTitle
         });
@@ -652,9 +656,9 @@ const DashboardLayout: React.FC<DashboardLayoutProps> = ({ setUser }) => {
       {/* Layout Body */}
       <div className={`flex ${!isTracking ? "max-h-screen" : " h-[calc(100vh-3rem)]"} bg-base-200 overflow-hidden`}>
         {/* Sidebar */}
-        <aside className="w-20 bg-base-100 border-r border-base-300 flex-shrink-0 flex flex-col items-center py-4 space-y-4">
+        <aside className="w-20 bg-base-100 border-r border-base-300 flex flex-col items-center py-4 space-y-4">
           {menuItems.map((item) => (
-            <div className="tooltip z-100 tooltip-right" data-tip={item.label}>
+            <div className="tooltip z-100 tooltip-right" key={item.label} data-tip={item.label}>
               <NavLink
                 key={item.label}
                 to={item.path}