Merge branch 'development' into Koushica_Dark_Mode

OneCommunityGlobal · Feb 3, 2025 · f46027c · f46027c
2 parents a33ee12 + ff1e16b
commit f46027c
Show file tree

Hide file tree

Showing 38 changed files with 963 additions and 649 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -14,7 +14,7 @@ jobs:
           command: 'sudo npm install'
       - run:
           name: Run react build
-          command: 'sudo REACT_APP_APIENDPOINT=$APIENDPOINT_PROD REACT_APP_DEF_PWD=$REACT_APP_DEF_PWD REACT_APP_SENTRY_URL=$SENTRY_URL_PROD SKIP_PREFLIGHT_CHECK=true NODE_OPTIONS=$NODE_OPTIONS npm run build && sudo mv build/index.html build/200.html'
+          command: 'sudo REACT_APP_APIENDPOINT=$APIENDPOINT_PROD REACT_APP_DEF_PWD=$REACT_APP_DEF_PWD REACT_APP_SENTRY_URL=$SENTRY_URL_PROD SKIP_PREFLIGHT_CHECK=true NODE_OPTIONS="$NODE_OPTIONS --max_old_space_size=4096" npm run build --prod && sudo mv build/index.html build/200.html'
       - run:
           name: Export error log if 'Build the React client' failed
           command: |
@@ -62,7 +62,7 @@ jobs:
           command: npm install
       - run:
           name: Build the React client
-          command: export REACT_APP_APIENDPOINT=$APIENDPOINT_DEV REACT_APP_DEF_PWD=$REACT_APP_DEF_PWD REACT_APP_SENTRY_URL=$SENTRY_URL_DEV SKIP_PREFLIGHT_CHECK=true NODE_OPTIONS=$NODE_OPTIONS && npm run build
+          command: export REACT_APP_APIENDPOINT=$APIENDPOINT_DEV REACT_APP_DEF_PWD=$REACT_APP_DEF_PWD REACT_APP_SENTRY_URL=$SENTRY_URL_DEV SKIP_PREFLIGHT_CHECK=true NODE_OPTIONS="$NODE_OPTIONS --max_old_space_size=4096" && npm run build --prod
       - run:
           name: Export error log if 'Build the React client' failed
           command: |
@@ -84,7 +84,7 @@ jobs:
           name: Deploy compiled app to surge.sh on $SURGE_DOMAIN_DEV
           command: ./node_modules/.bin/surge --domain $SURGE_DOMAIN_DEV --project ./build
       - run:
-          name: Deploy compiled app to surge.sh on $SURGE_DOMAIN_DEV
+          name: Deploy compiled app to surge.sh on $SURGE_DOMAIN_DEV1
           command: ./node_modules/.bin/surge --domain $SURGE_DOMAIN_DEV1 --project ./build
       - save_cache:
           key: v1.1-dependencies-{{ checksum "package-lock.json" }}
@@ -106,7 +106,7 @@ jobs:
           command: npm install
       - run:
           name: Build the React client
-          command: export REACT_APP_APIENDPOINT=$APIENDPOINT_BETA REACT_APP_DEF_PWD=$REACT_APP_DEF_PWD SKIP_PREFLIGHT_CHECK=true NODE_OPTIONS=$NODE_OPTIONS && npm run build
+          command: export REACT_APP_APIENDPOINT=$APIENDPOINT_BETA REACT_APP_DEF_PWD=$REACT_APP_DEF_PWD SKIP_PREFLIGHT_CHECK=true NODE_OPTIONS="$NODE_OPTIONS --max_old_space_size=4096" && npm run build --prod
       - run:
           name: Export error log if 'Build the React client' failed
           command: |

diff --git a/.eslintignore b/.eslintignore
@@ -26,7 +26,6 @@ src/components/TaskEditSuggestions/**
 src/components/TeamMemberTasks/**
 src/components/Teams/**
 src/components/TeamLocations/**
-src/components/Timelog/**
 src/components/UserManagement/**
 src/components/UserProfile/**
 src/components/Announcements/**

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -11,10 +11,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '14'
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,10 +10,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '14'
 
@@ -25,7 +25,7 @@ jobs:
 
       - name: Upload test results
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-results
           path: test-results # Adjust the path to your test results if necessary
diff --git a/.prettierignore b/.prettierignore
@@ -27,7 +27,6 @@ src/components/TaskEditSuggestions/**
 src/components/TeamLocations/**
 src/components/TeamMemberTasks/**
 src/components/Teams/**
-src/components/Timelog/**
 src/components/UserManagement/**
 src/components/UserProfile/**
 src/components/Announcements/**
diff --git a/src/components/Badge/BadgeHistory.jsx b/src/components/Badge/BadgeHistory.jsx
@@ -3,21 +3,26 @@ import { WEEK_DIFF } from '../../constants/badge';
 
 function BadgeHistory({ badges, personalBestMaxHrs }) {
   const filterBadges = allBadges => {
-    const filteredList = allBadges.filter(
-      value => Date.now() - new Date(value.lastModified).getTime() > WEEK_DIFF,
+    if (!Array.isArray(allBadges)) return [];
+
+    const filteredList = allBadges.filter(value => 
+      value && value.lastModified && 
+      (Date.now() - new Date(value.lastModified).getTime() > WEEK_DIFF)
     );
 
     filteredList.sort((a, b) => {
-      if (a.badge.ranking === 0) return 1;
-      if (b.badge.ranking === 0) return -1;
-      if (a.badge.ranking > b.badge.ranking) return 1;
-      if (a.badge.ranking < b.badge.ranking) return -1;
-      if (a.badge.badgeName > b.badge.badgeName) return 1;
-      if (a.badge.badgeName < b.badge.badgeName) return -1;
-
-      // If all conditions fail, return 0 to indicate that elements are equal
-      return 0;
+      const rankingA = a?.badge?.ranking ?? Infinity;
+      const rankingB = b?.badge?.ranking ?? Infinity;
+      const nameA = a?.badge?.badgeName ?? '';
+      const nameB = b?.badge?.badgeName ?? '';
+
+      if (rankingA === 0) return 1;
+      if (rankingB === 0) return -1;
+      if (rankingA > rankingB) return 1;
+      if (rankingA < rankingB) return -1;
+      return nameA.localeCompare(nameB);
     });
+
     return filteredList;
   };
 
@@ -26,17 +31,19 @@ function BadgeHistory({ badges, personalBestMaxHrs }) {
   return (
     <div className="badge_history_container">
       {filteredBadges.map((value, index) => (
-        <BadgeImage
-          personalBestMaxHrs={personalBestMaxHrs}
-          time="old"
-          count={value.count}
-          badgeData={value.badge}
-          index={index}
-          key={index}
-        />
+        value && value.badge ? (
+          <BadgeImage
+            personalBestMaxHrs={personalBestMaxHrs}
+            time="old"
+            count={value.count}
+            badgeData={value.badge}
+            index={index}
+            key={value.badge._id || index}
+          />
+        ) : null
       ))}
     </div>
   );
 }
 
-export default BadgeHistory;
+export default BadgeHistory;
diff --git a/src/components/Header/Header.css b/src/components/Header/Header.css
@@ -3,15 +3,15 @@
   width: clamp(100vw, 0.1rem + 1vw, 100%);
 }
 
-.close-button {
+close-button {
   position: absolute;
   top: 0;
   left: 0;
-  padding: 12px; 
+  padding: 12px; /* Add some padding for easier clicking */
 }
 
 .card-content {
-  padding: 5px; 
+  padding: 5px; /* Add padding around the card content */
   padding-left: 40px;
   padding-right: 40px;
   white-space: pre-line;
@@ -20,7 +20,7 @@
 }
 
 .navbar {
-  z-index: 100;
+  /* z-index: 100; */
   white-space: nowrap;
   /* margin-bottom: 20px; */
 }
@@ -59,12 +59,12 @@
   align-items: center;
 }
 
-.dropdown-item-hover:hover{
+.dropdown-item-hover:hover {
   background-color: #2f4157 !important;
 }
 
 @media (max-width: 1400px) {
-  .nav-links{
+  .nav-links {
     flex-direction: column !important;
   }
 }
@@ -98,7 +98,7 @@
 }
 
 @media screen and (max-width: 769px) {
-  .responsive-spacing{
+  .responsive-spacing {
     margin-right: 5px;
   }
 }

diff --git a/src/components/LBDashboard/Auth/Auth.css b/src/components/LBDashboard/Auth/Auth.css
@@ -20,7 +20,7 @@
     min-width: 250px;
   }
 
-  .form-container {
+  .lb-auth-page .form-container {
     background-color: white;
     border: 1px solid #ccc;
     border-radius: 8px;
@@ -68,7 +68,7 @@
     min-width: 140px;
   }
 
-  form {
+  .lb-auth-page form {
     display: flex;
     flex-direction: column;
     width: 100%;

diff --git a/src/components/LBDashboard/Auth/Login.jsx b/src/components/LBDashboard/Auth/Login.jsx
@@ -59,7 +59,7 @@ function Login() {
   };
 
   return (
-    <div className="auth-page">
+    <div className="auth-page lb-auth-page">
       <div className="logo-container">
         <img src={logo} alt="One Community Logo" />
       </div>

diff --git a/src/components/LBDashboard/Auth/Register.jsx b/src/components/LBDashboard/Auth/Register.jsx
@@ -65,7 +65,7 @@ function Register() {
   };
 
   return (
-    <div className="auth-page">
+    <div className="auth-page lb-auth-page">
       <div className="logo-container">
         <img src={logo} alt="One Community Logo" />
       </div>

diff --git a/src/components/Projects/WBS/WBSDetail/WBSTasks.jsx b/src/components/Projects/WBS/WBSDetail/WBSTasks.jsx
@@ -195,10 +195,8 @@ function WBSTasks(props) {
           </ol>
         </nav>
         <div
-          className='mb-2 button-group' // Grouping the buttons
+          className='mb-2 wbs-button-group' // Group the buttons
           style={{
-            // display: 'flex',
-            // justifyContent: 'space-between'
           }}>
           {/* <span> */}
           {canPostTask ? (

diff --git a/src/components/Projects/WBS/WBSDetail/wbs.css b/src/components/Projects/WBS/WBSDetail/wbs.css
@@ -265,9 +265,18 @@
 .tasks-detail-actions {  /* action column width reduced */
   width: 6%; 
 }
-@media (max-width: 768px) { /* arranging the buttons */
-  .button-group button {
-    margin-bottom: 10px;
-  }
+.wbs-button-group {
+  justify-content: flex-start;
+  gap: 10px;
+  margin-top: 20px;
 }
 
+@media (max-width: 968px) {
+  .wbs-button-group {
+    align-items: flex-start;
+    margin-bottom: 10px;
+  }
+  .wbs-button-group button {
+    margin-bottom: 10px;
+  }
+}
diff --git a/src/components/Reports/BadgeSummaryViz.jsx b/src/components/Reports/BadgeSummaryViz.jsx
@@ -33,21 +33,28 @@ function BadgeSummaryViz({ authId, userId, badges, dashboard }) {
   useEffect(() => {
     try {
       if (badges && badges.length) {
-        const sortBadges = [...badges].sort((a, b) => {
-          if (a?.badge?.ranking === 0) return 1;
-          if (b?.badge?.ranking === 0) return -1;
-          if (a?.badge?.ranking > b?.badge?.ranking) return 1;
-          if (a?.badge?.ranking < b?.badge?.ranking) return -1;
-          if (a?.badge?.badgeName > b?.badge?.badgeName) return 1;
-          if (a?.badge?.badgeName < b?.badge?.badgeName) return -1;
-          return 0;
-        });
+        const sortBadges = badges
+          .filter(badge => badge && badge.badge) // Filter out null or undefined badges
+          .sort((a, b) => {
+            const rankingA = a.badge?.ranking ?? Infinity;
+            const rankingB = b.badge?.ranking ?? Infinity;
+            const nameA = a.badge?.badgeName ?? '';
+            const nameB = b.badge?.badgeName ?? '';
+
+            if (rankingA === 0) return 1;
+            if (rankingB === 0) return -1;
+            if (rankingA > rankingB) return 1;
+            if (rankingA < rankingB) return -1;
+            return nameA.localeCompare(nameB);
+          });
         setSortedBadges(sortBadges);
+      } else {
+        setSortedBadges([]);
       }
     } catch (error) {
-       console.log(error);
+      console.error("Error sorting badges:", error);
+      setSortedBadges([]);
     }
-
   }, [badges]);
 
   const toggle = () => setIsOpen(prev => !prev);
@@ -81,15 +88,16 @@ function BadgeSummaryViz({ authId, userId, badges, dashboard }) {
                   <tbody>
                     {badges && badges.length>0 ? (
                       sortedBadges &&
-                      sortedBadges.map(value => value &&(
-                        <tr key={value.badge._id}>
+                      sortedBadges.map(value => value && value.badge && (
+                        <tr key={value.badge._id || value._id}>
                           <td className="badge_image_sm">
-                            {' '}
-                            <img
-                              src={value.badge.imageUrl}
-                              id={`popover_${value.badge._id}`}
-                              alt="badge"
-                            />
+                            {value.badge.imageUrl && (
+                              <img
+                                src={value.badge.imageUrl}
+                                id={`popover_${value.badge._id || value._id}`}
+                                alt="badge"
+                              />
+                            )}
                           </td>
                           <UncontrolledPopover
                             trigger="hover"
@@ -181,16 +189,18 @@ function BadgeSummaryViz({ authId, userId, badges, dashboard }) {
                   <tbody>
                     {badges && badges.length ? (
                       sortedBadges &&
-                      sortedBadges.map(value => value &&(
-                        <tr key={value._id}>
+                      sortedBadges.map(value => value && value.badge && (
+                        <tr key={value.badge._id || value._id}>
                           <td className="badge_image_sm">
-                            {' '}
-                            <img
-                              src={value?.badge.imageUrl}
-                              id={`popover_${value._id}`}
-                              alt="badge"
-                            />
+                            {value.badge.imageUrl && (
+                              <img
+                                src={value.badge.imageUrl}
+                                id={`popover_${value.badge._id || value._id}`}
+                                alt="badge"
+                              />
+                            )}
                           </td>
+                          // ... rest of the code
                           <UncontrolledPopover trigger="hover" target={`popover_${value._id}`}>
                             <Card className="text-center">
                               <CardImg className="badge_image_lg" src={value?.badge?.imageUrl} />