Resolve merging conflict

Author: JuliaHa0902

.eslintignore

@@ -11,14 +11,9 @@
 /build/
 
 # Ignore test files inside /src/components
-src/components/BMDashboard/_tests_/BMDashboard.test.jsx
-src/components/Reports/PeopleReport/components/PeopleTasksPieChart.test.jsx
 
 # Ignore folders in /src
 src/components/Badge/**
 src/components/Dashboard/**
 src/components/Projects/**
-src/components/TeamMemberTasks/**
-src/components/Teams/TeamMembersPopup.jsx
-src/components/UserManagement/**
 src/components/UserProfile/**

.github/workflows/test.yml

@@ -0,0 +1,31 @@
+name: Test React App
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '14'
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Run tests
+        run: npm test
+
+      - name: Upload test results
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-results
+          path: test-results # Adjust the path to your test results if necessary

.husky/pre-commit .husky-disabled/pre-commit.husky/pre-commit renamed to .husky-disabled/pre-commit

@@ -19,7 +19,6 @@ src/components/Memberships/**
 src/components/Projects/**
 src/components/Reports/**
 src/components/SummaryManagement/**
-src/components/TeamMemberTasks/**
 src/components/Timelog/**
 src/components/UserManagement/**
 src/components/UserProfile/**

.prettierignore

@@ -23,7 +23,7 @@ module.exports = {
   },
 
   // The paths to modules that run some code to configure or set up the testing environment before each test
-  setupFiles: ['<rootDir>src/setupTests.js'],
+  setupFiles: ['<rootDir>/src/setupTests.js'],
 
   // The test environment that will be used for testing
   testEnvironment: 'jsdom',

jest.config.js

@@ -7,26 +7,34 @@
   },
   "private": true,
   "dependencies": {
+    "@date-io/dayjs": "^3.2.0",
+    "@emotion/react": "^11.14.0",
+    "@emotion/styled": "^11.14.0",
     "@fortawesome/fontawesome-svg-core": "^1.2.36",
-    "@fortawesome/free-regular-svg-icons": "^5.12.1",
+    "@fortawesome/free-regular-svg-icons": "^5.15.4",
     "@fortawesome/free-solid-svg-icons": "^5.15.4",
     "@fortawesome/react-fontawesome": "^0.1.19",
+    "@mui/lab": "^7.0.0-beta.12",
+    "@mui/material": "^7.1.0",
+    "@mui/x-date-pickers": "^8.5.0",
     "@react-leaflet/core": ">=1.0.0 <1.1.0",
     "@react-pdf/renderer": "^4.3.0",
     "@reduxjs/toolkit": "^2.4.0",
     "@sentry/browser": "^4.6.6",
     "@tinymce/tinymce-react": "^3.14.0",
-    "axios": "^0.21.2",
+    "axios": "^0.30.0",
     "axios-mock-adapter": "^1.22.0",
     "bootstrap": "^4.5.3",
+    "canvas-confetti": "^1.9.3",
     "chart.js": "^3.9.1",
     "chartjs-plugin-datalabels": "^2.2.0",
     "classnames": "^2.2.6",
     "d3": "^7.8.5",
     "date-fns": "^2.14.0",
     "date-fns-tz": "^2.0.1",
+    "dayjs": "^1.11.13",
     "diff": "^5.0.0",
-    "dompurify": "^3.1.7",
+    "dompurify": "^3.2.5",
     "font-awesome": "^4.7.0",
     "fs-extra": "^11.2.0",
     "history": "^4.10.1",
@@ -36,7 +44,7 @@
     "joi": "^14.0.6",
     "jspdf": "^3.0.1",
     "jwt-decode": "^2.2.0",
-    "leaflet": "1.7.1",
+    "leaflet": "^1.9.4",
     "leaflet.heat": "^0.2.0",
     "lodash": "^4.17.21",
     "lucide-react": "^0.484.0",
@@ -49,6 +57,7 @@
     "react-autosuggest": "^10.1.0",
     "react-beautiful-dnd": "^13.1.1",
     "react-bootstrap": "^1.0.1",
+    "react-calendar": "^5.1.0",
     "react-chartjs-2": "^5.2.0",
     "react-circular-progressbar": "^2.1.0",
     "react-collapsible": "^2.10.0",
@@ -79,7 +88,7 @@
     "reactjs-popup": "^2.0.5",
     "reactstrap": "^8.4.1",
     "read-excel-file": "^5.5.3",
-    "recharts": "^2.15.2",
+    "recharts": "^2.1.9",
     "redux": "^4.0.5",
     "redux-actions": "^2.6.5",
     "redux-concatenate-reducers": "^1.0.0",
@@ -140,6 +149,6 @@
     "react-error-overlay": "^6.0.9",
     "redux-mock-store": "^1.5.4",
     "sinon": "^7.3.2",
-    "surge": "^0.21.6"
+    "surge": "^0.24.6"
   }
 }