Merge branch 'new-window-v2' of http://git.hicglobalsolutions.in/BhawanSingh/va-tracker - new window v2 jai merge 18 Dec

resources/wireguard/windows/wg0.conf

@@ -9,3 +9,4 @@ PublicKey = jG+7H5thEiNjxY1XqI1R9oyMAMTIegLwE3tZkS1Rj2U=
 Endpoint = 35.95.209.161:51820
 AllowedIPs = 10.0.0.0/24
 PersistentKeepalive = 25
+

src/ui/pages/Dashboard.tsx

@@ -152,6 +152,14 @@ const Dashboard: React.FC = () => {
           })
         );
 
+        // FIX: Check if we have any projects
+        if (res.data.length === 0) {
+          // No projects available, clear selected project
+          dispatch(setSelectedProjectSlice(null));
+          // fetchProfile();
+          return;
+        }
+
         // Check if we already have a selected project that's being tracked
         const currentlySelected = selectedProject;
         const currentlyTracking = isTracking;
@@ -208,9 +216,13 @@ const Dashboard: React.FC = () => {
         fetchProfile();
       } else {
         console.warn("⚠️ Unexpected response:", res);
+        // FIX: Also clear selected project on unexpected response
+        dispatch(setSelectedProjectSlice(null));
       }
     } catch (err) {
       console.error("❌ Error fetching projects:", err);
+      // FIX: Clear selected project on error
+      dispatch(setSelectedProjectSlice(null));
     } finally {
       setIsRefreshing(false);
     }
@@ -218,6 +230,7 @@ const Dashboard: React.FC = () => {
 
   useEffect(() => {
     fetchProjects();
+    fetchProfile()
   }, []);
 
   const handleRefresh = async () => {
@@ -285,6 +298,7 @@ const Dashboard: React.FC = () => {
         <h1 className="text-md font-bold">Dashboard</h1>
       </div>
       {/* Tracking Section */}
+      {/* Tracking Section */}
       <div className="w-full mb-4">
         <div className="card bg-base-100 border border-base-200 shadow-sm card-sm">
           <div className="card-body">
@@ -305,11 +319,6 @@ const Dashboard: React.FC = () => {
                     <p className="text-lg font-extrabold text-success">
                       {formatTime(displayTime)}
                     </p>
-
-                    {/* <p className={`text-lg font-extrabold ${isLimitReached ? 'text-error' : 'text-success'}`}>
-                      {formatTime(displayTime)}
-                      {isLimitReached && " ⚠️"}
-                    </p> */}
                     <div>
                       <span className="text-base-content/70">Project:</span>{" "}
                       <span className="font-semibold">
@@ -356,7 +365,9 @@ const Dashboard: React.FC = () => {
               </>
             ) : (
               <p className="text-sm text-base-content/60 text-center">
-                Select a project below to start tracking.
+                {projectsData.length === 0
+                  ? "No projects available."
+                  : "Select a project below to start tracking."}
               </p>
             )}
           </div>
@@ -369,15 +380,15 @@ const Dashboard: React.FC = () => {
         <div className="sticky top-0 z-20 bg-base-100 border-b border-base-content/10 p-3 flex justify-between items-center">
           <p className="text-md font-bold">Projects</p>
           {!selectedData?.isTracking &&
-          <button
+            <button
-            onClick={handleRefresh}
+              onClick={handleRefresh}
-            disabled={isRefreshing }
+              disabled={isRefreshing}
-            className="btn btn-xs btn-ghost gap-1 text-warning"
+              className="btn btn-xs btn-ghost gap-1 text-warning"
-            title="Refresh projects"
+              title="Refresh projects"
-          >
+            >
-            <RefreshCw className={`w-3 h-3 text-warning ${isRefreshing ? 'animate-spin' : ''}`} />
+              <RefreshCw className={`w-3 h-3 text-warning ${isRefreshing ? 'animate-spin' : ''}`} />
-            Refresh
+              Refresh
-          </button>}
+            </button>}
         </div>
 
         {/* 🔹 Table or Empty State or Skeleton */}

src/ui/pages/PaySlips/PaysSlips.tsx

@@ -9,6 +9,8 @@ const PaysSlips = () => {
     const [error, setError] = useState<string | null>(null);
     const [rows, setRows] = useState<any[]>([]);
 
+    
+
     useEffect(() => {
     if (!projectSummary?.vaId) return; 
 

src/ui/pages/Timesheets/Timesheets.tsx

@@ -64,13 +64,11 @@ const Timesheets: React.FC = () => {
   const [lastRefreshed, setLastRefreshed] = useState<Date | null>(null);
   const [initialLoading, setInitialLoading] = useState(true);
   const [tick, setTick] = useState(0);
-  const { selectedProject } =
+  const { selectedProject } = useSelector((state: any) => state.projects);
-    useSelector((state: any) => state.projects);
+  const selectedProjectId = selectedProject?.projectId ?? null;
 
   const activeProjects = projectsData.filter(p => p.status === "ACTIVE");
 
-  console.log("selectedProject", selectedProject.projectId)
-
 
   useEffect(() => {
     const interval = setInterval(() => {
@@ -225,13 +223,13 @@ const Timesheets: React.FC = () => {
                   <td>{formatWorkTime(entry.totalWorkTime)}</td>
                   <td>
                     <button
-                      disabled={(formatWorkTime(entry.totalWorkTime) === "0h 0m" || (isTracking && entry.projectId === selectedProject.projectId))}
+                      disabled={(formatWorkTime(entry.totalWorkTime) === "0h 0m" || (isTracking && entry.projectId === selectedProjectId))}
                       onClick={() =>
                         handleViewLogs(entry.projectId, entry.projectName)
                       }
                       className="btn btn-ghost btn-xs"
                     >
-                      {(formatWorkTime(entry.totalWorkTime) === "0h 0m" || (isTracking && entry.projectId === selectedProject.projectId)) ? (
+                      {(formatWorkTime(entry.totalWorkTime) === "0h 0m" || (isTracking && entry.projectId === selectedProjectId)) ? (
                         <EyeOff size={16} />
                       ) : (
                         <Eye size={16} />

src/ui/pages/Vpn/VpnGuard.tsx

@@ -7,7 +7,7 @@ interface Props {
 
 const VpnGuard: React.FC<Props> = ({ children }) => {
 
-    const VPN_API = "http://10.0.0.1:3000";
+    const VPN_API = "http://10.0.0.1";
     const DEFAULT_API = "https://portal-sf.docva.com"
 
     const [checking, setChecking] = useState(true);
@@ -66,6 +66,7 @@ const VpnGuard: React.FC<Props> = ({ children }) => {
             console.log("vpnRes", vpnRes);
 
             if (vpnRes) {
+                
                 // Run VPN check again AFTER URL changes
                 await checkVPN();
             } else {