Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0440b36f24 | |||
| de56fb601a |
@@ -5,7 +5,6 @@ import { useSelector } from "react-redux";
|
|||||||
export default function FamilyParentDashboard({
|
export default function FamilyParentDashboard({
|
||||||
className,
|
className,
|
||||||
bannerList,
|
bannerList,
|
||||||
nextDueTask,
|
|
||||||
}) {
|
}) {
|
||||||
const { userDetails } = useSelector((state) => state?.userDetails);
|
const { userDetails } = useSelector((state) => state?.userDetails);
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import React from "react";
|
|||||||
// import HomeSliders from "./HomeSliders";
|
// import HomeSliders from "./HomeSliders";
|
||||||
import { useSelector } from "react-redux";
|
import { useSelector } from "react-redux";
|
||||||
|
|
||||||
export default function HomeDashboard({ className, bannerList, nextDueTask }) {
|
export default function HomeDashboard({ className, bannerList }) {
|
||||||
const { userDetails } = useSelector((state) => state?.userDetails);
|
const { userDetails } = useSelector((state) => state?.userDetails);
|
||||||
|
|
||||||
let loginDate = userDetails?.last_login.split(" ")[0];
|
let loginDate = userDetails?.last_login.split(" ")[0];
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import { useSelector } from "react-redux";
|
|||||||
export default function JobOwnerDashboard({
|
export default function JobOwnerDashboard({
|
||||||
className,
|
className,
|
||||||
bannerList,
|
bannerList,
|
||||||
nextDueTask,
|
|
||||||
}) {
|
}) {
|
||||||
const { userDetails } = useSelector((state) => state?.userDetails);
|
const { userDetails } = useSelector((state) => state?.userDetails);
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import { useSelector } from "react-redux";
|
|||||||
export default function WorkerDashboard({
|
export default function WorkerDashboard({
|
||||||
className,
|
className,
|
||||||
bannerList,
|
bannerList,
|
||||||
nextDueTask,
|
|
||||||
}) {
|
}) {
|
||||||
const { userDetails } = useSelector((state) => state?.userDetails);
|
const { userDetails } = useSelector((state) => state?.userDetails);
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ export default function FullAccountDash(props) {
|
|||||||
className="mb-4"
|
className="mb-4"
|
||||||
data={userDetails}
|
data={userDetails}
|
||||||
bannerList={props.bannerList}
|
bannerList={props.bannerList}
|
||||||
nextDueTask={props.nextDueTask}
|
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
case "FAMILY_PARENT_DASH":
|
case "FAMILY_PARENT_DASH":
|
||||||
@@ -31,7 +30,6 @@ export default function FullAccountDash(props) {
|
|||||||
className="mb-4"
|
className="mb-4"
|
||||||
data={userDetails}
|
data={userDetails}
|
||||||
bannerList={props.bannerList}
|
bannerList={props.bannerList}
|
||||||
nextDueTask={props.nextDueTask}
|
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
case "WORKER_HOME_DASH":
|
case "WORKER_HOME_DASH":
|
||||||
@@ -40,7 +38,6 @@ export default function FullAccountDash(props) {
|
|||||||
className="mb-4"
|
className="mb-4"
|
||||||
data={userDetails}
|
data={userDetails}
|
||||||
bannerList={props.bannerList}
|
bannerList={props.bannerList}
|
||||||
nextDueTask={props.nextDueTask}
|
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
case "JOBOWNER_HOME_DASH":
|
case "JOBOWNER_HOME_DASH":
|
||||||
@@ -49,7 +46,6 @@ export default function FullAccountDash(props) {
|
|||||||
className="mb-4"
|
className="mb-4"
|
||||||
data={userDetails}
|
data={userDetails}
|
||||||
bannerList={props.bannerList}
|
bannerList={props.bannerList}
|
||||||
nextDueTask={props.nextDueTask}
|
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -12,14 +12,9 @@ export default function Home(props) {
|
|||||||
const userApi = new usersService();
|
const userApi = new usersService();
|
||||||
const { commonHeadBanner } = useSelector((state) => state.commonHeadBanner);
|
const { commonHeadBanner } = useSelector((state) => state.commonHeadBanner);
|
||||||
|
|
||||||
let [nextDueTask, setNextDueTask] = useState({});
|
|
||||||
|
|
||||||
// const [MyOffersList, setMyOffersList] = useState({loading: true, data: []});
|
|
||||||
|
|
||||||
const { userDetails } = useSelector((state) => state?.userDetails);
|
const { userDetails } = useSelector((state) => state?.userDetails);
|
||||||
|
|
||||||
const [MyActiveJobList, setMyActiveJobList] = useState({loading:true, data:[]}); // STATE TO HOLD ACTIVE/CURRENT TASKS
|
const [MyActiveJobList, setMyActiveJobList] = useState({loading:true, data:[]}); // STATE TO HOLD ACTIVE/CURRENT TASKS
|
||||||
// const [MyActiveJobList, setMyActiveJobList] = useState([]); // STATE TO HOLD ACTIVE/CURRENT TASKS
|
|
||||||
|
|
||||||
const getMyActiveJobList = async () => { // FUNCTION TO POPULATE ACTIVE/CURRENT TASK LIST
|
const getMyActiveJobList = async () => { // FUNCTION TO POPULATE ACTIVE/CURRENT TASK LIST
|
||||||
try {
|
try {
|
||||||
@@ -34,19 +29,19 @@ export default function Home(props) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// FUNCTION TO GET DASH DATA TO DETERMINE CURRENT TASK DUE TIME
|
// FUNCTION TO GET DASH DATA TO DETERMINE CURRENT TASK DUE TIME
|
||||||
const getHomeDate = () => {
|
// const getHomeDate = () => {
|
||||||
userApi
|
// userApi
|
||||||
.getHomeDate()
|
// .getHomeDate()
|
||||||
.then((res) => {
|
// .then((res) => {
|
||||||
if (res.status != 200 || res.internal_return < 0) {
|
// if (res.status != 200 || res.internal_return < 0) {
|
||||||
return;
|
// return;
|
||||||
}
|
// }
|
||||||
setNextDueTask(res.data);
|
// setNextDueTask(res.data);
|
||||||
})
|
// })
|
||||||
.catch((error) => {
|
// .catch((error) => {
|
||||||
console.log(error);
|
// console.log(error);
|
||||||
});
|
// });
|
||||||
};
|
// };
|
||||||
|
|
||||||
// const getMyOffersList = async () => {
|
// const getMyOffersList = async () => {
|
||||||
// try {
|
// try {
|
||||||
@@ -59,11 +54,8 @@ export default function Home(props) {
|
|||||||
// };
|
// };
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const fetchData = async () => {
|
|
||||||
await Promise.all([getHomeDate(), getMyActiveJobList()]);
|
|
||||||
};
|
|
||||||
if(userDetails?.account_type == 'FULL'){
|
if(userDetails?.account_type == 'FULL'){
|
||||||
fetchData();
|
getMyActiveJobList();
|
||||||
}
|
}
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
@@ -83,7 +75,6 @@ export default function Home(props) {
|
|||||||
/>
|
/>
|
||||||
) : userDetails && userDetails?.account_type == "FULL" ? (
|
) : userDetails && userDetails?.account_type == "FULL" ? (
|
||||||
<FullAccountDash
|
<FullAccountDash
|
||||||
nextDueTask={nextDueTask}
|
|
||||||
bannerList={props.bannerList}
|
bannerList={props.bannerList}
|
||||||
dashTypes={props.dashTypes}
|
dashTypes={props.dashTypes}
|
||||||
// offersList={MyOffersList}
|
// offersList={MyOffersList}
|
||||||
|
|||||||
Reference in New Issue
Block a user