resolved conflicts

package.json

@@ -13,7 +13,9 @@
   "dependencies": {
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@mui/icons-material": "^5.14.18",
+    "@material-ui/core": "^4.12.4",
+    "@material-ui/icons": "^4.11.3",
+    "@mui/icons-material": "^5.15.5",
     "@mui/material": "^5.14.18",
     "@mui/styles": "^5.14.18",
     "@mui/x-date-pickers-pro": "^6.18.4",
@@ -28,7 +30,8 @@
     "react": "^18",
     "react-date-range": "^2.0.0-alpha.4",
     "react-dom": "^18",
-    "react-redux": "^9.0.4"
+    "react-redux": "^9.0.4",
+    "react-router-dom": "^6.21.2"
   },
   "devDependencies": {
     "autoprefixer": "^10.4.16",

src/app/change-password/page.js

@@ -5,6 +5,7 @@ import {
   ThemeProvider,
   Typography,
   InputAdornment,
+  IconButton
 } from "@mui/material";
 import React, { useEffect, useState } from "react";
 import themeDefault from "../../themes/theme";
@@ -18,7 +19,6 @@ import ChangePasswordAPI from "../actions/api/user/ChangePasswordAPI"
 import Spinner from "../../components/common/Spinner";
 import CustomizedSnackbars from "../../components/common/Snackbar";
 import VpnKeyOutlinedIcon from '@mui/icons-material/VpnKeyOutlined';
-import IconButton from "@material-ui/core/IconButton";
 import Visibility from "@material-ui/icons/Visibility";
 import VisibilityOff from "@material-ui/icons/VisibilityOff";
 import CustomButton from "../../components/common/Button";

src/app/forgot-password/page.js

@@ -7,7 +7,7 @@ import OutlinedTextField from "../../components/common/OutlinedTextField";
 // import { translate } from "../../../config/localisation";
 import LoginStyle from "../../styles/loginStyle";
 import themeDefault from "../../themes/theme";
-import { useNavigate } from "react-router-dom";
+// import { useNavigate } from "react-router-dom";
 import AppInfo from "../../components/user/AppInfo";
 import ForgotPasswordAPI from "../../app/actions/api/user/ForgotPasswordAPI";
 // import APITransport from "../../../../redux/actions/apitransport/apitransport";

src/app/login/page.js

@@ -8,8 +8,8 @@ import OutlinedTextField from "../../components/common/OutlinedTextField";
 import { useEffect, useState } from "react";
 import InputAdornment from "@material-ui/core/InputAdornment";
 import IconButton from "@material-ui/core/IconButton";
-import { Visibility } from "@material-ui/icons";
-import VisibilityOff from "@material-ui/icons/VisibilityOff";
+import { Visibility } from "@mui/icons-material";
+import VisibilityOff from "@mui/icons-material/VisibilityOff";
 import {useDispatch,useSelector} from "react-redux"
 import CustomButton from "../../components/common/Button";
 import APITransport from "@/Lib/apiTransport/apitransport";

src/app/organizations/page.js

@@ -1,14 +1,14 @@
 'use client';
 import DetailsViewPage from "../workspace/DetailsViewPage";
 import componentType from "../../config/PageType";
-// import { useSelector } from "react-redux";
+import { useSelector } from "react-redux";
 
 const MyOrganization = () => {
-    // const organizationDetails = useSelector(state=>state.fetchLoggedInUserData.data.organization);
+    const organizationDetails = useSelector(state=>state.getLoggedInData?.data.organization);
     return (
         <DetailsViewPage
-            // title={organizationDetails && organizationDetails.title}
-            // createdBy={organizationDetails && organizationDetails.created_by && organizationDetails.created_by.username}
+            title={organizationDetails && organizationDetails.title}
+            createdBy={organizationDetails && organizationDetails.created_by && organizationDetails.created_by.username}
             pageType={componentType.Type_Organization}
         />
     )

src/components/Tabs/MyProgress.jsx

@@ -34,7 +34,7 @@ import {
   import GetProjectDomainsAPI from "@/app/actions/api/workspace/GetProjectDomainsAPI";
   import ColumnList from "../common/ColumnList";
   import CustomizedSnackbars from "../common/Snackbar";
-  import { isSameDay, format } from 'date-fns/esm';
+  import { isSameDay, format } from 'date-fns';
   import { DateRangePicker, defaultStaticRanges } from "react-date-range";
   import ArrowDropDownIcon from "@mui/icons-material/ArrowDropDown";
   import ArrowRightIcon from "@mui/icons-material/ArrowRight";

src/components/common/AddUsersDialog.jsx

@@ -8,7 +8,7 @@ import { fetchOrganizationUsers } from "@/Lib/Features/getOrganizationUsers";
 import { fetchWorkspaceDetails } from "@/Lib/Features/getWorkspaceDetails";
 import { fetchWorkspacesAnnotatorsData } from "@/Lib/Features/getWorkspacesAnnotatorsData";
 import { fetchProjectDetails } from "@/Lib/Features/projects/getProjectDetails";
-import { Add } from "@material-ui/icons";
+import { Add } from "@mui/icons-material";
 import { useDispatch, useSelector } from 'react-redux';
 import {
   Autocomplete,

src/components/common/WorkspaceReports.jsx

@@ -27,7 +27,7 @@ import FetchLanguagesAPI from "../../app/actions/api/workspace/FetchLanguagesAPI
 import GetWorkspaceDetailedProjectReportsAPI from "../../app/actions/api/workspace/GetWorkspaceDetailedProjectReportsAPI";
 import DatasetStyle from "../../styles/Dataset";
 import ColumnList from "../common/ColumnList";
-import { isSameDay, format } from 'date-fns/esm';
+import { isSameDay, format } from 'date-fns';
 import { DateRangePicker, defaultStaticRanges } from "react-date-range";
 import ArrowDropDownIcon from "@mui/icons-material/ArrowDropDown";
 import ArrowRightIcon from "@mui/icons-material/ArrowRight";