fix: resolving merge conflicts and now pushing the code for the final merge

Author: TaariqMansurie

index.html

@@ -37,6 +37,8 @@
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
     <script type="module" src="/src/index.jsx"></script>
-    <a class="top" href="#">Back to Top ↑</a>
+    <a class="back-to-top" href="#" aria-label="Back to top">
+      ↑
+    </a>
   </body>
 </html>

package-lock.json

@@ -29,7 +29,7 @@
     "@react-leaflet/core": "^2.1.0",
     "@reduxjs/toolkit": "^2.4.0",
     "@sentry/browser": "^9.15.0",
-    "@tanstack/react-query": "^5.90.3",
+    "@tanstack/react-query": "^5.90.16",
     "@tinymce/miniature": "^6.0.0",
     "@tinymce/tinymce-react": "^6.1.0",
     "ajv": "^8.0.0",
@@ -54,7 +54,7 @@
     "date-fns": "^2.14.0",
     "date-fns-tz": "^2.0.1",
     "dayjs": "^1.11.13",
-    "diff": "^5.0.0",
+    "diff": "^8.0.3",
     "dompurify": "^3.2.5",
     "elliptic": "^6.6.1",
     "font-awesome": "^4.7.0",
@@ -65,7 +65,7 @@
     "html2canvas": "^1.4.1",
     "jest": "^30.2.0",
     "jquery": "^3.7.1",
-    "jspdf": "^3.0.3",
+    "jspdf": "^4.0.0",
     "jwt-decode": "^2.2.0",
     "leaflet": "^1.9.4",
     "leaflet.heat": "^0.2.0",
@@ -206,4 +206,4 @@
     ],
     "**/*.{css,scss,sass}": "stylelint"
   }
-}
+}

package.json

@@ -242,10 +242,6 @@ body.bm-dashboard-dark .nav-link {
   color: #ffffff !important;
 }
 
-body.dark-mode .navbar,
-body.bm-dashboard-dark .navbar {
-  background-color: #1b2a41 !important;
-}
 
 body.dark-mode .navbar-brand,
 body.bm-dashboard-dark .navbar-brand {
@@ -329,11 +325,33 @@ body.bm-dashboard-dark .page-item.active .page-link {
 }
 
 /* Fix the position of the header at the top */
-.top {
-    position: fixed;
-    right: 10px;
-    bottom: 10px;
-  }
+.back-to-top {
+  position: fixed;
+  bottom: 24px;
+  right: 24px;
+
+  width: 48px;
+  height: 48px;
+
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  background-color: #2A1B3D;
+  color: #ffffff;
+
+  border-radius: 50%;
+  font-size: 22px;
+  text-decoration: none;
+
+  box-shadow: 0 6px 16px rgba(0, 0, 0, 0.25);
+  z-index: 1000;
+}
+
+.back-to-top:hover {
+  transform: translateY(-4px);
+  opacity: 0.9;
+}
 
   /* Allow the page content to scroll horizontally */
   .container-fluid {
@@ -343,4 +361,9 @@ body.bm-dashboard-dark .page-item.active .page-link {
   /* Hide the horizontal scrollbar */
   .container-fluid::-webkit-scrollbar {
     display: none;
-  }
+  }
+
+  .tab-content {
+  background-color: transparent;
+  border: none;
+}

public/index.css

@@ -14,7 +14,7 @@ const mockStore = configureMockStore(middlewares);
 
 describe('User Management Actions', () => {
   let store;
-  
+
   beforeEach(() => {
     store = mockStore({});
     vi.clearAllMocks();
@@ -46,7 +46,7 @@ describe('User Management Actions', () => {
 
     it('should update user to active status', async () => {
       const reactivationDate = null;
-      
+
       axios.patch.mockResolvedValueOnce({ data: {} });
 
       await store.dispatch(actions.updateUserStatus(mockUser, UserStatus.Active, reactivationDate));
@@ -143,7 +143,7 @@ describe('User Management Actions', () => {
       );
     });
 
-    
+
   });
 
   describe('updateUserFinalDayStatus', () => {
@@ -205,6 +205,7 @@ describe('User Management Actions', () => {
         { id: 1, name: 'John Doe', email: 'john@example.com' },
         { id: 2, name: 'Jane Smith', email: 'jane@example.com' }
       ];
+      const mockSource = 'Report';
 
       axios.get.mockResolvedValueOnce({ data: mockBasicInfo });
 
@@ -213,20 +214,20 @@ describe('User Management Actions', () => {
         { type: 'RECEIVE_USER_PROFILE_BASIC_INFO', payload: mockBasicInfo }
       ];
 
-      await store.dispatch(actions.getUserProfileBasicInfo());
+      await store.dispatch(actions.getUserProfileBasicInfo({source: mockSource}));
       expect(store.getActions()).toEqual(expectedActions);
-      expect(axios.get).toHaveBeenCalledWith(ENDPOINTS.USER_PROFILE_BASIC_INFO);
+      expect(axios.get).toHaveBeenCalledWith(ENDPOINTS.USER_PROFILE_BASIC_INFO(mockSource));
     });
 
     it('should handle errors when fetching basic info', async () => {
       axios.get.mockRejectedValueOnce(new Error('Network error'));
-
+      const mockSource = '';
       const expectedActions = [
         { type: 'FETCH_USER_PROFILE_BASIC_INFO' },
         { type: 'FETCH_USER_PROFILE_BASIC_INFO_ERROR' }
       ];
 
-      await store.dispatch(actions.getUserProfileBasicInfo());
+      await store.dispatch(actions.getUserProfileBasicInfo({ source: mockSource }));
       expect(store.getActions()).toEqual(expectedActions);
     });
   });
@@ -276,4 +277,4 @@ describe('User Management Actions', () => {
       expect(store.getActions()).toContainEqual(expectedAction);
     });
   });
-});
+});

src/actions/__tests__/userManagement.test.js

@@ -2,7 +2,7 @@ import jwtDecode from 'jwt-decode';
 import axios from 'axios';
 import httpService from '../services/httpService';
 import config from '../config.json';
-import { ENDPOINTS } from '~/utils/URL';
+import { ENDPOINTS } from '../utils/URL';
 import { GET_ERRORS } from '../constants/errors';
 import {
   SET_CURRENT_USER,

src/actions/authActions.js

@@ -30,3 +30,11 @@ export const fetchBMProjects = () => {
       });
   };
 };
+
+export const getProjectGlobalDistribution = async (payload) => {
+  const url = ENDPOINTS.PROJECT_GLOBAL_DISTRIBUTION
+
+  const res = await axios.get(url, {params: payload});
+  
+  return res.data
+  };