Merge branch 'dev-adwaitha'

Author: Adwaitha31

.github/workflows/ci-cd-pipeline.yml

@@ -50,7 +50,7 @@ jobs:
             ${{ runner.os }}-pnpm-server-
 
       - name: Install dependencies
-        run: pnpm install --no-frozen-lockfile
+        run: pnpm install --frozen-lockfile
         working-directory: .
 
       - name: TypeScript compile check
@@ -59,10 +59,10 @@ jobs:
       - name: Run server tests
         run: npm test || true
         env:
-          SUPABASE_URL: ${{ secrets.SUPABASE_URL || 'https://placeholder.supabase.co' }}
-          SUPABASE_KEY: ${{ secrets.SUPABASE_KEY || 'placeholder-key' }}
-          SUPABASE_SERVICE_KEY: ${{ secrets.SUPABASE_SERVICE_KEY || 'placeholder-service-key' }}
-          JWT_SECRET: ${{ secrets.JWT_SECRET || 'ci-test-jwt-secret' }}
+          SUPABASE_URL: ${{ secrets.SUPABASE_URL }}
+          SUPABASE_KEY: ${{ secrets.SUPABASE_KEY }}
+          SUPABASE_SERVICE_KEY: ${{ secrets.SUPABASE_SERVICE_KEY }}
+          JWT_SECRET: ${{ secrets.JWT_SECRET }}
           NODE_ENV: test
 
   # ──────────────────────────────────────────────────────────
@@ -98,7 +98,7 @@ jobs:
             ${{ runner.os }}-pnpm-client-
 
       - name: Install dependencies
-        run: pnpm install --no-frozen-lockfile
+        run: pnpm install --frozen-lockfile
         working-directory: .
 
       - name: Lint
@@ -107,8 +107,8 @@ jobs:
       - name: Build (type check + bundle)
         run: npm run build
         env:
-          NEXT_PUBLIC_SUPABASE_URL: ${{ secrets.NEXT_PUBLIC_SUPABASE_URL || 'https://placeholder.supabase.co' }}
-          NEXT_PUBLIC_SUPABASE_ANON_KEY: ${{ secrets.NEXT_PUBLIC_SUPABASE_ANON_KEY || 'placeholder-anon-key' }}
+          NEXT_PUBLIC_SUPABASE_URL: ${{ secrets.NEXT_PUBLIC_SUPABASE_URL }}
+          NEXT_PUBLIC_SUPABASE_ANON_KEY: ${{ secrets.NEXT_PUBLIC_SUPABASE_ANON_KEY }}
           NEXT_PUBLIC_API_URL: http://localhost:5000/api
 
   # ──────────────────────────────────────────────────────────
@@ -133,7 +133,7 @@ jobs:
           version: 9
 
       - name: Install dependencies
-        run: pnpm install --no-frozen-lockfile
+        run: pnpm install --frozen-lockfile
 
       - name: Audit server dependencies
         run: cd server && pnpm audit --audit-level=high || true

client/src/hooks/useSocket.ts

@@ -50,8 +50,13 @@ interface UseSocketOptions {
 }
 
 export function useSocket(options: UseSocketOptions = {}) {
+  const defaultUrl = process.env.NEXT_PUBLIC_SOCKET_URL || "http://localhost:3001";
+  const dynamicUrl = typeof window !== 'undefined' && defaultUrl.includes('localhost') && window.location.hostname !== 'localhost'
+    ? defaultUrl.replace('localhost', window.location.hostname)
+    : defaultUrl;
+
   const {
-    url = process.env.NEXT_PUBLIC_SOCKET_URL || "http://localhost:3001",
+    url = dynamicUrl,
     autoConnect = true,
     reconnection = true,
     reconnectionAttempts = 5,

client/src/lib/api.ts

@@ -9,7 +9,15 @@
 import axios, { AxiosError, AxiosInstance } from 'axios';
 
 const getApiUrl = () => {
-  return process.env.NEXT_PUBLIC_API_URL || 'http://localhost:3001/api/v1';
+  const envUrl = process.env.NEXT_PUBLIC_API_URL || 'http://localhost:3001/api/v1';
+  
+  // If we're executing in the browser and accessing via a network IP,
+  // dynamically replace localhost with the actual hostname so mobile devices can reach the backend
+  if (typeof window !== 'undefined' && envUrl.includes('localhost') && window.location.hostname !== 'localhost') {
+    return envUrl.replace('localhost', window.location.hostname);
+  }
+  
+  return envUrl;
 };
 
 const API_URL = getApiUrl();

client/src/lib/dateUtils.ts

@@ -74,8 +74,12 @@ export function dateToApiFormat(date: Date): string {
  */
 export function getCurrentIST(): Date {
     const now = new Date();
-    // Shift by 5.5 hours to match server side
-    return new Date(now.getTime() + (5.5 * 60 * 60 * 1000));
+    // Shift by 5.5 hours to get the actual IST time footprint
+    const istTime = new Date(now.getTime() + (5.5 * 60 * 60 * 1000));
+    // Convert to ISO string to preserve the IST time values in UTC representation
+    const iso = istTime.toISOString();
+    // Strip the Z to parse as a local Date - aligns perfectly with utcToIstShifted
+    return new Date(iso.replace('Z', ''));
 }
 
 /**