Merge branch 'development' of https://github.com/OneCommunityGlobal/HighestGoodNetworkApp into anjali-email-fix-separate

Author: jeyanthi-sm

package.json

@@ -30,13 +30,13 @@
     "ajv": "^8.0.0",
     "ajv-keywords": "^5.1.0",
     "assert": "^2.1.0",
-    "axios": "^1.9.0",
+    "axios": "^1.11.0",
     "axios-mock-adapter": "^1.22.0",
     "bootstrap": "^4.5.3",
     "braces": "^3.0.3",
     "buffer": "^6.0.3",
     "canvas-confetti": "^1.9.3",
-    "chart.js": "^4.1.1",
+    "chart.js": "^4.5.0",
     "chartjs-plugin-datalabels": "^2.2.0",
     "classnames": "^2.2.6",
     "clsx": "^2.1.1",
@@ -89,7 +89,7 @@
     "react-router": "^5.3.4",
     "react-router-dom": "^5.2.0",
     "react-router-hash-link": "^2.3.1",
-    "react-select": "^5.10.1",
+    "react-select": "^5.10.2",
     "react-spinners": "^0.15.0",
     "react-sticky": "^6.0.3",
     "react-table": "^7.8.0",

src/actions/userManagement.js

@@ -286,10 +286,14 @@ export const updateUserFinalDayStatusIsSet = (user, status, finalDayDate, isSet)
 /**
  * fetching all user profiles basic info
  */
-export const getUserProfileBasicInfo = () => {
+export const getUserProfileBasicInfo = (userId) => {
   // API request to fetch basic user profile information
-  const userProfileBasicInfoPromise = axios.get(ENDPOINTS.USER_PROFILE_BASIC_INFO);
-
+ let userProfileBasicInfoPromise;
+ if (userId)
+    userProfileBasicInfoPromise = axios.get(`${ENDPOINTS.USER_PROFILE_BASIC_INFO}?userId=${userId}`);
+ else
+    userProfileBasicInfoPromise = axios.get(ENDPOINTS.USER_PROFILE_BASIC_INFO);
+  
   return async dispatch => {
     // Dispatch action indicating the start of the fetch process
     await dispatch(userProfilesBasicInfoFetchStartAction());

src/actions/userSkillsActions.js

@@ -0,0 +1,37 @@
+import axios from 'axios';
+import { ENDPOINTS } from '../utils/URL';
+import {toast} from 'react-toastify';
+
+// eslint-disable-next-line import/prefer-default-export
+export const updateFollowUpFields = (userId,formData) => async (dispatch) => {
+
+  try {
+    // eslint-disable-next-line no-console
+    console.log("{ENDPOINTS.HGN_FORM_UPDATE_USER_SKILLS_FOLLOWUP_SUBMIT}/{userId}");    
+    // eslint-disable-next-line no-console
+    console.log(`${ENDPOINTS.HGN_FORM_UPDATE_USER_SKILLS_FOLLOWUP_SUBMIT}${userId}`);
+    const response = await axios.put(`${ENDPOINTS.HGN_FORM_UPDATE_USER_SKILLS_FOLLOWUP_SUBMIT}${userId}`, formData);
+
+    dispatch({
+      type: 'UPDATE_USER_SKILLS_PROFILE_DATA_FOLLOWUP_FIELDS_SUCCESS',
+      payload: response.data, // You can also use formData directly
+    });
+
+              if (response.status === 200 || response.status === 201) 
+                toast.success('Work Experience and Additional Information updated successfully!');
+              }
+            catch(error) {
+                toast.error('Error updating the details. Please try again.');
+            dispatch({ type: 'UPDATE_USER_SKILLS_PROFILE_DATA_FOLLOWUP_FIELDS_FAIL' });
+              
+   
+               if (error.response?.status === 500) {
+      toast.error('Error updating the details. Please try again.');
+    }
+  }
+    
+
+
+  
+};
+

src/components/BMDashboard/Issues/issueChart.css

@@ -0,0 +1,67 @@
+/* issueChart.module.css */
+
+.issueChartEventContainer {
+  max-width: 900px;
+  margin: 0 auto;
+  padding: 20px;
+  background: #f9f9f9;
+  border-radius: 8px;
+  box-shadow: 0px 4px 6px rgba(0, 0, 0, 0.1);
+}
+
+.issueChartEventContainerDark {
+  background: #121212;
+  box-shadow: 0 4px 12px rgba(0,0,0,0.9);
+  color: #ccd1dc;
+}
+
+.issueChartEventTitle {
+  text-align: center;
+  font-size: 24px;
+  color: #333;
+}
+
+.issueChartEventTitleDark {
+  color: #fff;
+}
+
+.chartWrapper {
+  padding: 20px;
+  background: #fff;
+  border-radius: 8px;
+  box-shadow: 0px 4px 6px rgba(0, 0, 0, 0.1);
+}
+
+.chartWrapperDark {
+  background: #1e1e1e;
+  box-shadow: 0 0 15px rgba(0,0,0,0.9);
+  color: #ccd1dc;
+}
+
+.issueChartLabel {
+  font-size: 16px;
+  color: #555;
+}
+
+.issueChartLabelDark {
+  color: #fff;
+}
+
+.issueChartSelect {
+  padding: 2px 10px;
+  font-size: 16px;
+  border-radius: 4px;
+  border: 1px solid #ccc;
+  background-color: #fff;
+  color: #333;
+  cursor: pointer;
+  transition: border-color 0.3s ease;
+  outline: none;
+  margin-bottom: 20px;
+}
+
+.issueChartSelectDark {
+  border-color: #3d444d;
+  background-color: #22272e;
+  color: #cfd7e3;
+}