diff --git a/src/common/Header.jsx b/src/common/Header.jsx
index 131dcdd5..72e166a6 100644
--- a/src/common/Header.jsx
+++ b/src/common/Header.jsx
@@ -208,7 +208,7 @@ const Header = () => {
<>
isActive
? `${classes.highlightedMenu} organizations`
@@ -220,7 +220,7 @@ const Header = () => {
isActive
? `${classes.highlightedMenu} task-list`
diff --git a/src/common/MobileNavbar.jsx b/src/common/MobileNavbar.jsx
index ba0aa175..937ef17d 100644
--- a/src/common/MobileNavbar.jsx
+++ b/src/common/MobileNavbar.jsx
@@ -30,14 +30,14 @@ function MobileNavbar({ UserMenu, SettingsMenu, userData }) {
{
name: "Organizations",
onClick: () => {
- navigate(`/my-organization/${userData?.organization?.id}`);
+ navigate(`/my-organization/${localStorage.getItem("id")}`);
setOpenDrawer(false);
},
},
{
name: "Tasks",
onClick: () => {
- navigate(`/task-list`);
+ navigate(`/task-list/${localStorage.getItem("id")}`);
setOpenDrawer(false);
},
},
diff --git a/src/containers/Organization/MyOrganization.jsx b/src/containers/Organization/MyOrganization.jsx
index dde348e6..9149d96d 100644
--- a/src/containers/Organization/MyOrganization.jsx
+++ b/src/containers/Organization/MyOrganization.jsx
@@ -17,8 +17,6 @@ import {
//Styles
import { DatasetStyle } from "styles";
-
-//Components
import {
Box,
Card,
@@ -76,6 +74,7 @@ const MyOrganization = () => {
const organizationDetails = useSelector(
(state) => state.getOrganizationDetails.data
);
+ localStorage.setItem("id",id)
const projectList = useSelector((state) => state.getProjectList.data);
const userData = useSelector((state) => state.getLoggedInUserDetails.data);
const usersList = useSelector((state) => state.getOrganizatioUsers.data);
diff --git a/src/containers/Organization/OrgLevelTaskList.jsx b/src/containers/Organization/OrgLevelTaskList.jsx
index 75964686..391a49e7 100644
--- a/src/containers/Organization/OrgLevelTaskList.jsx
+++ b/src/containers/Organization/OrgLevelTaskList.jsx
@@ -155,7 +155,6 @@ const OrgLevelTaskList = () => {
const [bulkSubtitleAlert, setBulkSubtitleAlert] = useState(false);
const [bulkSubtitleAlertData, setBulkSubtitleAlertData] = useState({});
- //Server Side Pagination States
const [offset, setOffset] = useState(0);
const [limit, setLimit] = useState(10);
const [searchAnchor, setSearchAnchor] = useState(null);
@@ -175,7 +174,6 @@ const OrgLevelTaskList = () => {
const apiStatus = useSelector((state) => state.apiStatus);
- //Fiters and Search
const orgSelectedFilters = useSelector(
(state) => state.orgTaskFilters.orgSelectedFilters
);
@@ -352,7 +350,7 @@ const OrgLevelTaskList = () => {
}, {});
const apiObj = new FetchPaginatedOrgTaskListAPI(
- orgId,
+ localStorage.getItem("id"),
offset + 1,
limit,
searchRequest,
diff --git a/src/containers/Organization/Video/RightPanel.jsx b/src/containers/Organization/Video/RightPanel.jsx
index 0dbee263..d610ec62 100644
--- a/src/containers/Organization/Video/RightPanel.jsx
+++ b/src/containers/Organization/Video/RightPanel.jsx
@@ -73,8 +73,7 @@ const RightPanel = ({ currentIndex, currentSubs,setCurrentIndex, showTimeline, s
const [selection, setselection] = useState(false);
const taskData = useSelector((state) => state.getTaskDetails.data);
- const assignedOrgId = JSON.parse(localStorage.getItem("userData"))
- ?.organization?.id;
+ const assignedOrgId = JSON.parse(localStorage.getItem("id"))
const subtitles = useSelector((state) => state.commonReducer.subtitles);
const player = useSelector((state) => state.commonReducer.player);
const totalPages = useSelector((state) => state.commonReducer.totalPages);
diff --git a/src/containers/Organization/Video/TranslationRightPanel.jsx b/src/containers/Organization/Video/TranslationRightPanel.jsx
index 152aaaaf..86397ccc 100644
--- a/src/containers/Organization/Video/TranslationRightPanel.jsx
+++ b/src/containers/Organization/Video/TranslationRightPanel.jsx
@@ -63,8 +63,7 @@ const TranslationRightPanel = ({ currentIndex, currentSubs,setCurrentIndex, show
const textboxes = useRef([]);
const taskData = useSelector((state) => state.getTaskDetails.data);
- const assignedOrgId = JSON.parse(localStorage.getItem("userData"))
- ?.organization?.id;
+ const assignedOrgId = JSON.parse(localStorage.getItem("id"));
const subtitles = useSelector((state) => state.commonReducer.subtitles);
const player = useSelector((state) => state.commonReducer.player);
const totalPages = useSelector((state) => state.commonReducer.totalPages);
diff --git a/src/containers/Organization/Video/VoiceOverRightPanel.jsx b/src/containers/Organization/Video/VoiceOverRightPanel.jsx
index 0a1dfe72..e9fe7d9e 100644
--- a/src/containers/Organization/Video/VoiceOverRightPanel.jsx
+++ b/src/containers/Organization/Video/VoiceOverRightPanel.jsx
@@ -61,8 +61,7 @@ const VoiceOverRightPanel = ({ setCurrentIndex }) => {
const $audioRef = useRef([]);
const taskData = useSelector((state) => state.getTaskDetails.data);
- const assignedOrgId = JSON.parse(localStorage.getItem("userData"))
- ?.organization?.id;
+ const assignedOrgId = JSON.parse(localStorage.getItem("id"))
const subtitles = useSelector((state) => state.commonReducer.subtitles);
const player = useSelector((state) => state.commonReducer.player);
const subtitlesForCheck = useSelector(
diff --git a/src/containers/Organization/Video/VoiceOverRightPanel1.jsx b/src/containers/Organization/Video/VoiceOverRightPanel1.jsx
index bbfa38a3..9794a19d 100644
--- a/src/containers/Organization/Video/VoiceOverRightPanel1.jsx
+++ b/src/containers/Organization/Video/VoiceOverRightPanel1.jsx
@@ -74,8 +74,7 @@ const VoiceOverRightPanel1 = ({ currentIndex, setCurrentIndex, showTimeline, seg
const $audioRef = useRef([]);
const taskData = useSelector((state) => state.getTaskDetails.data);
- const assignedOrgId = JSON.parse(localStorage.getItem("userData"))
- ?.organization?.id;
+ const assignedOrgId = JSON.parse(localStorage.getItem("id"))
const subtitles = useSelector((state) => state.commonReducer.subtitles);
const player = useSelector((state) => state.commonReducer.player);
const subtitlesForCheck = useSelector(
diff --git a/src/utils/userDetails.js b/src/utils/userDetails.js
index 39000fd4..72f326be 100644
--- a/src/utils/userDetails.js
+++ b/src/utils/userDetails.js
@@ -1,4 +1,4 @@
-import ganavi from "../assets/profileImages/Ganavi.png";
+// import ganavi from "../assets/profileImages/Ganavi.png";
const teamDetails = [
// {
diff --git a/src/web.route.js b/src/web.route.js
index b3bf8b1e..37363997 100644
--- a/src/web.route.js
+++ b/src/web.route.js
@@ -84,7 +84,7 @@ const RootRouter = () => {
)}
/>
} />
)}