Merge remote-tracking branch 'origin/development' into bhavpreet_browse_lp

Author: fangedShadow

public/index.css

@@ -171,13 +171,21 @@ body.bm-dashboard-dark .table {
 }
 
 body.dark-mode .table th,
-body.dark-mode .table td,
+body.dark-mode .table td {
+  color: #ffffff !important;
+  border-color: #3a506b;
+}
+
 body.bm-dashboard-dark .table th,
 body.bm-dashboard-dark .table td {
   color: #ffffff !important;
   border-color: #3a506b;
 }
 
+body.bm-dashboard-dark .table th{
+  background-color: #2e5061 !important;
+}
+
 body.dark-mode .table-striped > tbody > tr:nth-of-type(odd),
 body.bm-dashboard-dark .table-striped > tbody > tr:nth-of-type(odd) {
   background-color: rgba(46, 80, 97, 0.5);

src/actions/authActions.js

@@ -115,10 +115,40 @@ export const getHeaderData = userId => {
   };
 };
 
-export const logoutUser = () => dispatch => {
+export const logoutUser = (isCrossTabLogout = false) => dispatch => {
   // Clear any active force-logout timer before logging out
   dispatch(stopForceLogout());
+  
+  // Only signal other tabs if this is NOT a cross-tab logout
+  // (to prevent infinite loops when responding to storage events)
+  if (!isCrossTabLogout) {
+    // Set a flag to signal other tabs to log out
+    // This flag will trigger a storage event in other tabs
+    localStorage.setItem('logoutFlag', 'true');
+    
+    // Use BroadcastChannel API for more reliable cross-tab communication
+    if (typeof BroadcastChannel !== 'undefined') {
+      try {
+        const channel = new BroadcastChannel('auth_sync');
+        channel.postMessage({ type: 'logout', timestamp: Date.now() });
+        // Close the channel after sending
+        setTimeout(() => channel.close(), 100);
+      } catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn('BroadcastChannel not available:', error);
+      }
+    }
+    
+    // Clear the logout flag after a short delay to allow other tabs to detect it
+    // We use setTimeout to ensure the storage event fires first
+    setTimeout(() => {
+      localStorage.removeItem('logoutFlag');
+    }, 500);
+  }
+  
+  // Remove the token
   localStorage.removeItem(tokenKey);
+  
   httpService.setjwt(false);
   dispatch(setCurrentUser(null));
 };

src/actions/eventActions.js

@@ -0,0 +1,70 @@
+import axios from 'axios';
+import { ENDPOINTS } from '~/utils/URL';
+
+/**
+ * Fetch events with optional filtering
+ * @param {Object} params - Query parameters
+ * @param {string} params.type - Filter by event type
+ * @param {string} params.location - Filter by location
+ * @param {number} params.page - Page number
+ * @param {number} params.limit - Items per page
+ * @param {string} params.sortBy - Sort field
+ * @returns {Promise} API response
+ */
+export async function getEvents(params = {}) {
+  try {
+    const { type = '', location = '', page = 1, limit = 9, sortBy = 'date' } = params;
+    const queryParams = new URLSearchParams();
+    if (type) queryParams.append('type', type);
+    if (location) queryParams.append('location', location);
+    queryParams.append('page', page);
+    queryParams.append('limit', limit);
+    queryParams.append('sortBy', sortBy);
+
+    const url = `${ENDPOINTS.EVENTS}?${queryParams.toString()}`;
+    const response = await axios.get(url);
+    return Promise.resolve(response);
+  } catch (error) {
+    return {
+      message: error.response?.data?.error || error.message,
+      errorCode: error.response?.status,
+      status: error.response?.status || 500,
+    };
+  }
+}
+
+/**
+ * Fetch available event types
+ * @returns {Promise} API response
+ */
+export async function getEventTypes() {
+  try {
+    const url = ENDPOINTS.EVENT_TYPES;
+    const response = await axios.get(url);
+    return Promise.resolve(response);
+  } catch (error) {
+    return {
+      message: error.response?.data?.error || error.message,
+      errorCode: error.response?.status,
+      status: error.response?.status || 500,
+    };
+  }
+}
+
+/**
+ * Fetch available event locations
+ * @returns {Promise} API response
+ */
+export async function getEventLocations() {
+  try {
+    const url = ENDPOINTS.EVENT_LOCATIONS;
+    const response = await axios.get(url);
+    return Promise.resolve(response);
+  } catch (error) {
+    return {
+      message: error.response?.data?.error || error.message,
+      errorCode: error.response?.status,
+      status: error.response?.status || 500,
+    };
+  }
+}