dashdata api removed

src/components/AuthPages/Login/index2.jsx

@@ -16,9 +16,6 @@ import { updateUserDetails } from "../../../store/UserDetails";
 
 import ReCAPTCHA from "react-google-recaptcha";
 
-import GoogleDownload from '../../../assets/images/download/andriod.jpg'
-import IOSDownload from '../../../assets/images/download/apple.jpg'
-
 export default function Login() {
   // eslint-disable-next-line no-restricted-globals
   const queryParams = new URLSearchParams(location?.search);
@@ -529,43 +526,40 @@ export default function Login() {
               {/* APP DOWNLOAD STORE */}
               <div className="w-full mt-4">
                 <div className="w-full flex justify-center items-center gap-4">
-                  <div className="w-32 lg:w-48">
+                  <div className="w-28 lg:w-32">
                     <a
-                      // className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
+                      className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
                       target="_blank"
                       rel="noreferrer"
                       href={process.env.REACT_APP_APPLE_APP}
                     >
-                      {/* <i className="fa-brands fa-apple text-3xl"></i>
+                      <i className="fa-brands fa-apple text-3xl"></i>
                       <div className="flex flex-col">
                         <span className="text-[11px]">Available on the</span>
                         <span className="text-[12px] lg:text-base">
                           App Store
                         </span>
-                      </div> */}
+                      </div>
-                      <img src={IOSDownload} className='w-full h-auto' alt='IOS Download' />
                     </a>
                   </div>
-                  <div className="w-32 lg:w-48">
+                  <div className="w-28 lg:w-32">
                     <a
-                      // className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
+                      className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
                       target="_blank"
                       rel="noreferrer"
                       href={process.env.REACT_APP_ANDROID_APP}
                     >
-                      {/* <i className="fa-brands fa-google-play text-2xl"></i>
+                      <i className="fa-brands fa-google-play text-2xl"></i>
                       <div className="flex flex-col">
                         <span className="text-[11px]">Available on the</span>
                         <span className="text-[12px] lg:text-base">
                           Google Play
                         </span>
-                      </div> */}
+                      </div>
-                      <img src={GoogleDownload} className='w-full h-auto' alt='IOS Download' />
                     </a>
                   </div>
                 </div>
               </div>
-
               {loginType == "full" && (
                 <>
                   <div className="pt-5 text-[#181c32] text-center font-semibold text-[13.975px] leading-[20.9625px]">

src/components/AuthPages/Promo/Promo.jsx

@@ -179,10 +179,10 @@ export default function Promo() {
                   </div>
                 </div>
 
-              {/* APP DOWNLOAD STORE */}
+                              {/* APP DOWNLOAD STORE */}
               <div className="w-full mt-4">
-                <div className="w-full flex justify-center items-center gap-4">
+                <div className="w-full flex justify-between items-center gap-10 sm:gap-32">
-                  <div className="w-32 lg:w-48">
+                  <div className="w-full">
                     <a
                       // className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
                       target="_blank"
@@ -199,7 +199,7 @@ export default function Promo() {
                       <img src={IOSDownload} className='w-full h-auto' alt='IOS Download' />
                     </a>
                   </div>
-                  <div className="w-32 lg:w-48">
+                  <div className="w-full">
                     <a
                       // className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
                       target="_blank"

src/components/AuthPages/SignUp/index2.jsx

@@ -5,9 +5,6 @@ import usersService from "../../../services/UsersService";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import AuthLayout from "../AuthLayout2";
 
-import GoogleDownload from '../../../assets/images/download/andriod.jpg'
-import IOSDownload from '../../../assets/images/download/apple.jpg'
-
 export default function SignUp() {
   // eslint-disable-next-line no-restricted-globals
   const queryParams = new URLSearchParams(location?.search);
@@ -350,38 +347,36 @@ export default function SignUp() {
                 {/* APP DOWNLOAD STORE */}
                 <div className="w-full mt-4">
                   <div className="w-full flex justify-center items-center gap-4">
-                    <div className="w-32 lg:w-48">
+                    <div className="w-28 lg:w-32">
                       <a
-                        // className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
+                        className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
                         target="_blank"
-                        rel="noreferrer"
                         href={process.env.REACT_APP_APPLE_APP}
+                        rel="noreferrer"
                       >
-                        {/* <i className="fa-brands fa-apple text-3xl"></i>
+                        <i className="fa-brands fa-apple text-3xl"></i>
                         <div className="flex flex-col">
                           <span className="text-[11px]">Available on the</span>
                           <span className="text-[12px] lg:text-base">
                             App Store
                           </span>
-                        </div> */}
+                        </div>
-                        <img src={IOSDownload} className='w-full h-auto' alt='IOS Download' />
                       </a>
                     </div>
-                    <div className="w-32 lg:w-48">
+                    <div className="w-28 lg:w-32">
                       <a
-                        // className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
+                        className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
                         target="_blank"
-                        rel="noreferrer"
                         href={process.env.REACT_APP_ANDROID_APP}
+                        rel="noreferrer"
                       >
-                        {/* <i className="fa-brands fa-google-play text-2xl"></i>
+                        <i className="fa-brands fa-google-play text-2xl"></i>
                         <div className="flex flex-col">
                           <span className="text-[11px]">Available on the</span>
                           <span className="text-[12px] lg:text-base">
                             Google Play
                           </span>
-                        </div> */}
+                        </div>
-                        <img src={GoogleDownload} className='w-full h-auto' alt='IOS Download' />
                       </a>
                     </div>
                   </div>

src/components/Dashboards/FamilyParentDashboard.jsx

@@ -5,7 +5,6 @@ import { useSelector } from "react-redux";
 export default function FamilyParentDashboard({
   className,
   bannerList,
-  nextDueTask,
 }) {
   const { userDetails } = useSelector((state) => state?.userDetails);
 

src/components/Dashboards/HomeDashboard.jsx

@@ -2,7 +2,7 @@ import React from "react";
 // import HomeSliders from "./HomeSliders";
 import { useSelector } from "react-redux";
 
-export default function HomeDashboard({ className, bannerList, nextDueTask }) {
+export default function HomeDashboard({ className, bannerList }) {
   const { userDetails } = useSelector((state) => state?.userDetails);
 
   let loginDate = userDetails?.last_login.split(" ")[0];

src/components/Dashboards/JobOwnerDashboard.jsx

@@ -5,7 +5,6 @@ import { useSelector } from "react-redux";
 export default function JobOwnerDashboard({
   className,
   bannerList,
-  nextDueTask,
 }) {
   const { userDetails } = useSelector((state) => state?.userDetails);
 

src/components/Dashboards/WorkerDashboard.jsx

@@ -5,7 +5,6 @@ import { useSelector } from "react-redux";
 export default function WorkerDashboard({
   className,
   bannerList,
-  nextDueTask,
 }) {
   const { userDetails } = useSelector((state) => state?.userDetails);
 

src/components/Home/FullAccountDash.jsx

@@ -22,7 +22,6 @@ export default function FullAccountDash(props) {
             className="mb-4"
             data={userDetails}
             bannerList={props.bannerList}
-            nextDueTask={props.nextDueTask}
           />
         );
       case "FAMILY_PARENT_DASH":
@@ -31,7 +30,6 @@ export default function FullAccountDash(props) {
             className="mb-4"
             data={userDetails}
             bannerList={props.bannerList}
-            nextDueTask={props.nextDueTask}
           />
         );
       case "WORKER_HOME_DASH":
@@ -40,7 +38,6 @@ export default function FullAccountDash(props) {
             className="mb-4"
             data={userDetails}
             bannerList={props.bannerList}
-            nextDueTask={props.nextDueTask}
           />
         );
       case "JOBOWNER_HOME_DASH":
@@ -49,7 +46,6 @@ export default function FullAccountDash(props) {
             className="mb-4"
             data={userDetails}
             bannerList={props.bannerList}
-            nextDueTask={props.nextDueTask}
           />
         );
       default:

src/components/Home/index.jsx

@@ -12,14 +12,9 @@ export default function Home(props) {
   const userApi = new usersService();
   const { commonHeadBanner } = useSelector((state) => state.commonHeadBanner);
 
-  let [nextDueTask, setNextDueTask] = useState({});
-
-  // const [MyOffersList, setMyOffersList] = useState({loading: true, data: []});
-
   const { userDetails } = useSelector((state) => state?.userDetails);
 
   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
     try {
@@ -34,19 +29,19 @@ export default function Home(props) {
   };
 
   // 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 () => {
   //   try {
@@ -59,11 +54,8 @@ export default function Home(props) {
   // };
 
   useEffect(() => {
-    const fetchData = async () => {
-      await Promise.all([getHomeDate(), getMyActiveJobList()]);
-    };
     if(userDetails?.account_type == 'FULL'){
-      fetchData();
+      getMyActiveJobList();
     }
   }, []);
 
@@ -83,7 +75,6 @@ export default function Home(props) {
           />
         ) : userDetails && userDetails?.account_type == "FULL" ? (
           <FullAccountDash
-            nextDueTask={nextDueTask}
             bannerList={props.bannerList}
             dashTypes={props.dashTypes}
             // offersList={MyOffersList}