market popout height fixed

src/Routers.jsx

@@ -31,50 +31,50 @@ import InviteRefer from './views/InviteRefer';
 import MyRefer from './views/MyRefer';
 
 
-import HomePages from "./views/HomePages"
+const HomePages = lazy(() => import("./views/HomePages"));
-import ScrollToTop from "./components/Helpers/ScrollToTop"
+const ScrollToTop = lazy(() => import("./components/Helpers/ScrollToTop"));
-import StartJob from "./components/MyJobs/StartJob"
+const StartJob = lazy(() => import("./components/MyJobs/StartJob"));
-import Notification from "./components/Notification"
+const Notification = lazy(() => import("./components/Notification"));
-import AuthRoute from "./middleware/AuthRoute"
+const AuthRoute = lazy(() => import("./middleware/AuthRoute"));
-import AuthProfilePage from "./views/AuthProfilePage"
+const AuthProfilePage = lazy(() => import("./views/AuthProfilePage"));
-import BlogPage from "./views/BlogPage"
+const BlogPage = lazy(() => import("./views/BlogPage"));
-import FamilyManagePage from "./views/FamilyManagePage"
+const FamilyManagePage = lazy(() => import("./views/FamilyManagePage"));
-import FamilyMarketPage from "./views/FamilyMarketPage"
+const FamilyMarketPage = lazy(() => import("./views/FamilyMarketPage"));
 
-import HistoryPage from "./views/HistoryPage"
+const HistoryPage = lazy(()=> import("./views/HistoryPage"));
-import JobGroupsPage from "./views/JobGroupsPage"
+const JobGroupsPage = lazy(()=> import("./views/JobGroupsPage"));
-import ManageActiveJobs from "./views/ManageActiveJobs"
+const ManageActiveJobs = lazy(()=> import("./views/ManageActiveJobs"));
-import ManageInterestOfferPage from "./views/ManageInterestOfferPage"
+const ManageInterestOfferPage = lazy(()=> import("./views/ManageInterestOfferPage"));
-import MarketPlacePage from "./views/MarketPlacePage"
+const MarketPlacePage = lazy(()=> import("./views/MarketPlacePage"));
-import MyActiveJobsPage from "./views/MyActiveJobsPage"
+const MyActiveJobsPage = lazy(()=> import("./views/MyActiveJobsPage"));
-import MyCouponPage from "./views/MyCouponPage"
+const MyCouponPage = lazy(()=> import("./views/MyCouponPage"));
-import MyJobsPage from "./views/MyJobsPage"
+const MyJobsPage = lazy(()=> import("./views/MyJobsPage"));
-import MyOffersPage from "./views/MyOffersPage"
+const MyOffersPage = lazy(()=> import("./views/MyOffersPage"));
-import MyPastDueJobsPage from "./views/MyPastDueJobsPage"
+const MyPastDueJobsPage = lazy(()=> import("./views/MyPastDueJobsPage"));
-import MyReviewDueJobsPage from "./views/MyReviewDueJobsPage"
+const MyReviewDueJobsPage = lazy(()=> import("./views/MyReviewDueJobsPage"));
-import MyTaskPage from "./views/MyTaskPage"
+const MyTaskPage = lazy(()=> import("./views/MyTaskPage"));
-import MyWaitingJobsPage from "./views/MyWaitingJobsPage"
+const MyWaitingJobsPage = lazy(()=> import("./views/MyWaitingJobsPage"));
-import MyWalletPage from "./views/MyWalletPage"
+const MyWalletPage = lazy(()=> import("./views/MyWalletPage"));
-import OffersInterestPage from "./views/OffersInterestPage"
+const OffersInterestPage = lazy(()=> import("./views/OffersInterestPage"));
-import ReferralPage from "./views/ReferralPage"
+const ReferralPage = lazy(()=> import("./views/ReferralPage"));
-import RemindersPage from "./views/RemindersPage"
+const RemindersPage = lazy(()=> import("./views/RemindersPage"));
-import ResourcePage from "./views/ResourcePage"
+const ResourcePage = lazy(()=> import("./views/ResourcePage"));
-import SettingsPage from "./views/SettingsPage"
+const SettingsPage = lazy(()=> import("./views/SettingsPage"));
-import TrackingPage from "./views/TrackingPage"
+const TrackingPage = lazy(()=> import("./views/TrackingPage"));
-import UploadProductPage from "./views/UploadProductPage"
+const UploadProductPage = lazy(()=> import("./views/UploadProductPage"));
-import UserProfilePage from "./views/UserProfilePage"
+const UserProfilePage = lazy(()=> import("./views/UserProfilePage"));
-import YourPages from "./views/YourPage_"
+const YourPages = lazy(()=> import("./views/YourPage_"));
-import ParentWaitingPage from "./views/ParentWaitingPage"
+const ParentWaitingPage = lazy(()=> import("./views/ParentWaitingPage"));
-import FamilyPendingOfferPage from "./views/FamilyPendingOfferPage"
+const FamilyPendingOfferPage = lazy(()=> import("./views/FamilyPendingOfferPage"));
-import FamBlogPage from "./views/FamBlogPage"
+const FamBlogPage = lazy(()=> import("./views/FamBlogPage"));
-import FamAIQuestionPage from "./views/FamAIQuestionPage"
+const FamAIQuestionPage = lazy(()=> import("./views/FamAIQuestionPage"));
-import FamMyFilesPage from "./views/FamMyFilesPage"
+const FamMyFilesPage = lazy(()=> import("./views/FamMyFilesPage"));
-import FamWorkInProgressPage from "./views/FamWorkInProgressPage"
+const FamWorkInProgressPage = lazy(()=> import("./views/FamWorkInProgressPage"));
-import MyPastDueTasksPage from "./views/MyPastDueTasksPage"
+const MyPastDueTasksPage = lazy(()=> import("./views/MyPastDueTasksPage"));
-import FamilyWalletPage from "./views/FamilyWalletPage"
+const FamilyWalletPage = lazy(()=> import("./views/FamilyWalletPage"));
-import LearnMorePage from "./views/LearnMorePage"
+const LearnMorePage = lazy(()=> import("./views/LearnMorePage"));
-import FamGamesPage from "./views/FamGamesPage"
+const FamGamesPage = lazy(()=> import("./views/FamGamesPage"));
-import FamilyRoutesPage from "./views/FamilyRoutesPage"
+const FamilyRoutesPage = lazy(()=> import("./views/FamilyRoutesPage"));
 
 export default function Routers() {
   return (

src/components/AuthPages/Login/index2.jsx

@@ -526,8 +526,8 @@ export default function Login() {
                 )
                 // END of family login compoenent
               }
-              <div className='w-full text-center'>
+              <div className='mt-4 w-full flex justify-center items-center text-center'>
-                <Link className='text-center block font-semibold text-lg pt-3 tracking-wide' to='/login'>Return</Link>
+                <Link className='px-4 py-2 rounded-full text-xl text-white bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center text-[15px]' to='/login'>Return</Link>
               </div>
               {/* END of login component */}
 
@@ -621,7 +621,7 @@ const BrandBtn = ({
           className="w-full border border-light-purple rounded-[0.475rem] h-[48px] flex justify-center bg-[#FAFAFA] hover:bg-[#eff2f5] hover:text-[#7e8299] transition duration-300 items-center font-medium cursor-pointer"
         >
           <img className="mr-3 h-6" src={imgSrc} alt="logo-icon(s)" />
-          <span className="text-lg text-thin-light-gray font-normal text-[15px]">
+          <span className="text-thin-light-gray font-normal text-sm">
             Continue with {brand}
           </span>
         </a>
@@ -632,7 +632,7 @@ const BrandBtn = ({
           className="w-full border border-light-purple  rounded-[0.475rem] h-[48px] flex justify-center bg-[#FAFAFA] hover:bg-[#eff2f5] hover:text-[#7e8299] transition duration-300  items-center font-medium cursor-pointer"
         >
           <img className="mr-3 h-6" src={imgSrc} alt="logo-icon(s)" />
-          <span className="text-lg text-thin-light-gray font-normal text-[15px]">
+          <span className="text-thin-light-gray font-normal text-sm">
             Continue with {brand}
           </span>
         </button>

src/components/AuthPages/SignUp/index2.jsx

@@ -282,16 +282,17 @@ export default function SignUp({refer_link, details}) {
                       )}
                     </button>
                     <span
-                      onClick={rememberMe}
+                      // onClick={rememberMe}
                       className="cursor-default text-gray-400 font-medium text-[16.25px] leading-[24.375px] group-checked:text-white transition-all duration-200 group-checked:cursor-default"
                     >
                       I agree with all
-                      <Link
+                      <a
-                        href="#"
+                        target='_blank'
+                        href={process.env.REACT_APP_TERMS_LINK}
                         className="font-semibold text-[#4687ba] hover:text-[#009ef7] transition mx-1 inline-block"
                       >
                         terms and condition
-                      </Link>
+                      </a>
                     </span>
                   </div>
                 </div>

src/components/Dashboards/AccountDashboard.jsx

@@ -78,25 +78,7 @@ const AccountDashboard = ({ className, bannerList, offersList, imageServer }) =>
         {/* for flat banner section */}
         <div className="w-full grid-cols-1 md:grid-cols-2 2xl:grid-cols-3 grid items-center justify-center gap-2 md:gap-4">    
           {/* OFFER LIST DISPLAY */}
-          {/* <>
+
-            {(offersList && offersList?.length > 0) &&
-              offersList.map((item, index) => {
-                let thePrice = PriceFormatter(
-                  item?.price * 0.01,
-                  item?.currency_code,
-                  item?.currency
-                );
-              
-                let image = `${imageServer}${localStorage.getItem("session_token")}/job/${item.job_uid}`
-                if(index >= 3) {
-                    return(
-                    <div key={item.offer_uid}>
-                        <NewOfferCardFlat datas={item} image={image} price={thePrice} setOfferPopout={setOfferPopout} />
-                    </div>
-                    )
-                }
-            })}
-          </> */}
           {getLowerBanner?.map((props, idx) => {
             let image = getImage(props);
 
@@ -150,15 +132,15 @@ const TopBanner = ({ image, title = "", desc = "", btn, link_path, key }) => {
       </Link>
       <div className="rounded-b-xl bg-white dark:bg-dark-white">
         <div className="border-b border-slate-300 px-2 py-1 h-[5.4rem] flex flex-col gap-2 dark:text-white">
-          <Link to={link_path} className="font-bold text-lg line-clamp-1">
+          <Link to={link_path} className="font-bold text-xl line-clamp-1">
             {title}
           </Link>
-          <Link to={link_path} className="text-sm">
+          <Link to={link_path} className="text-base line-clamp-1">
             {desc}
           </Link>
         </div>
         <div className="flex justify-between w-full p-1 items-center">
-          <Link to={link_path} className="text-slate-300 font-semibold text-sm">
+          <Link to={link_path} className="text-slate-300 font-semibold text-base">
             {btn}
           </Link>
           <button className="flex items-center justify-center gap-2">
@@ -201,7 +183,7 @@ const NewOfferCard = ({ datas, hidden = false, price, setOfferPopout, image }) =
       </div>
       <div className="rounded-b-xl bg-transparent dark:bg-dark-transparent">
         <div className="border-b border-slate-300 px-2 py-1 h-[5.4rem] flex flex-col gap-2 dark:text-white">
-          <h1 className="font-bold text-lg line-clamp-1 text-center">
+          <h1 className="font-bold text-xl line-clamp-1 text-center">
             {datas?.title}
           </h1>
           <div className="card-buttons flex justify-center items-center space-x-2">
@@ -210,7 +192,7 @@ const NewOfferCard = ({ datas, hidden = false, price, setOfferPopout, image }) =
               onClick={() =>
                 setOfferPopout({ show: true, data: { ...datas, image } })
               }
-              className="btn-shine w-2/3 h-[40px] text-white rounded-full text-sm bg-pink flex justify-center items-center"
+              className="btn-shine w-2/3 h-[40px] text-white rounded-full text-base bg-pink flex justify-center items-center"
             >
               Start Now
             </button>
@@ -240,7 +222,7 @@ const NewOfferCardFlat = ({ datas, hidden = false, price, setOfferPopout, image
       <div className="w-full xxs:flex justify-between items-center border-b border-slate-300 p-2">
         <div className="min-h-[130px] sm:min-h-[100px] flex justify-between items-center">
           <div className="px-2 flex flex-col gap-2 dark:text-white">
-            <h1 className="font-bold text-lg line-clamp-1 text-center">
+            <h1 className="font-bold text-xl line-clamp-1 text-center">
               {datas?.title}
             </h1>
             <div className="card-buttons flex items-center space-x-2">
@@ -249,7 +231,7 @@ const NewOfferCardFlat = ({ datas, hidden = false, price, setOfferPopout, image
                 onClick={() =>
                   setOfferPopout({ show: true, data: { ...datas, image } })
                 }
-                className="btn-shine w-28 h-[40px] text-white rounded-full text-sm bg-pink flex justify-center items-center"
+                className="btn-shine w-28 h-[40px] text-white rounded-full text-base bg-pink flex justify-center items-center"
               >
                 Start Now
               </button>
@@ -301,10 +283,10 @@ const LowerBanner = ({ image, title = "", desc = "", btn, link_path, card_type,
       <div className="w-full xxs:flex justify-between items-center border-b border-slate-300 p-2">
         <div className="min-h-[130px] sm:min-h-[100px] flex justify-between items-center">
           <div className="px-2 flex flex-col gap-2 dark:text-white">
-            <Link to={newLinkPath} className="text-lg font-bold">
+            <Link to={newLinkPath} className="text-xl font-bold line-clamp-1">
               {title}
             </Link>
-            <p to={newLinkPath} className="text-sm">
+            <p to={newLinkPath} className="text-base line-clamp-1">
               {desc}
             </p>
           </div>
@@ -319,7 +301,7 @@ const LowerBanner = ({ image, title = "", desc = "", btn, link_path, card_type,
         </Link>
       </div>
       <div className="flex justify-between w-full p-1 items-center">
-        <Link to={newLinkPath} className="text-slate-300 font-semibold text-sm">
+        <Link to={newLinkPath} className="text-slate-300 font-semibold text-base">
           {btn}
         </Link>
         <button className="flex items-center justify-center gap-2">
@@ -370,10 +352,10 @@ const BannerSection = ({ banners, variant }) => {
               }`}
             >
               <div className="border-b border-slate-300 px-2 py-1 h-[5.4rem] flex flex-col gap-2">
-                <Link to={link_path} className="font-bold text-lg">
+                <Link to={link_path} className="font-bold text-xl">
                   {short_title}
                 </Link>
-                <Link to={link_path} className="text-sm">
+                <Link to={link_path} className="text-base">
                   {short_description}
                 </Link>
               </div>

src/components/Home/FamilyDash.jsx

@@ -22,22 +22,6 @@ export default function FamilyDash() {
 
   const { userDetails } = useSelector((state) => state?.userDetails);
 
-  // let [reloadBanner, setReloadBanner] = useState(0)
-
-  // useEffect(()=>{
-  //   if(reloadBanner >= 2){
-  //     dispatch(tableReload({ type: "FAMILYBANNERSLIST" })); // RELOAD FAMILY BANNERS LIST EVERY 10 MINS
-  //     setReloadBanner(0)
-  //   }
-  //   const timer = setInterval(()=>{
-  //     setReloadBanner(prev => prev+1)
-  //   },300000)
-
-  //   return ()=>{
-  //     clearInterval(timer)
-  //   }
-  // },[reloadBanner])
-
   return (
     <>
       <div>
@@ -46,13 +30,13 @@ export default function FamilyDash() {
           <div className="text-white mb-4 min-h-[3rem] px-2 w-full flex justify-between items-center rounded-xl bg-family-header-bg">
             <div className="w-full">
               <div className="w-full flex flex-wrap gap-x-4 ">
-                <p className="text-lg font-normal leading-5">Welcome</p>
+                <p className="text-xl font-normal leading-5">Welcome</p>
                 <div className="">
-                  <h1 className="text-lg font-normal leading-5">{`${userDetails?.firstname} ${userDetails?.lastname}`}</h1>
+                  <h1 className="text-xl font-normal leading-5">{`${userDetails?.firstname} ${userDetails?.lastname}`}</h1>
                 </div>
               </div>
             </div>
-            <div className="py-1 w-full text-sm text-right self-end">
+            <div className="py-1 w-full text-base text-right self-end">
               <p className="leading-4">Last Login: {`${userDetails?.last_login.split(' ')[0]}`}</p>
             </div>
           </div>
@@ -76,8 +60,8 @@ export default function FamilyDash() {
                         <img className="w-full h-[10rem] object-cover rounded-t-xl" src={content.banner.image} alt='banner image' />
                         <div className="flex flex-col justify-between">
                           <div className="px-2 py-2 border-b border-transparent min-h-[4rem] flex flex-col gap-1">
-                            <h1 className="text-lg text-[#083e21] dark:text-white font-bold tracking-wide">{content.banner.text}</h1>
+                            <h1 className="text-xl text-[#083e21] dark:text-white font-bold tracking-wide">{content.banner.text}</h1>
-                            <p className="text-sm text-black dark:text-white">{content.banner.description}</p>
+                            <p className="text-base text-black dark:text-white">{content.banner.description}</p>
                           </div>
                         </div>
                       </div>
@@ -104,7 +88,7 @@ export default function FamilyDash() {
                         </div>
                         <div className="flex flex-col justify-between">
                           <div className="px-2 py-1 border-b border-transparent min-h-[2rem] flex justify-between items-center gap-1">
-                            <h1 className="text-lg text-[#083e21] dark:text-white font-bold tracking-wide">{item?.content}</h1>
+                            <h1 className="text-xl text-[#083e21] dark:text-white font-bold tracking-wide">{item?.content}</h1>
                             <div className="flex justify-center gap-1">
                               <div className="w-1 h-1 bg-slate-400 rounded-full"></div>
                               <div className="w-1 h-1 bg-slate-400 rounded-full"></div>
@@ -121,22 +105,6 @@ export default function FamilyDash() {
             }
           </>
           }
-
-          {/* {familyOffers?.result_list && familyOffers?.result_list.length > 0 && (
-            <MyOffersFamilyTable
-              familyOffers={familyOffers?.result_list}
-              image_server={familyOffers?.session_image_server}
-              className="mb-10"
-            />
-          )} */}
-
-          {/* {trending && trending.length > 0 && (
-            <FamilyActiveLSlde
-              trending={trending}
-              className="mb-10"
-              image_server={serverImg}
-            />
-          )} */}
         </div>
       </div>
 

src/components/Home/index.jsx

@@ -1,4 +1,5 @@
 import React, { useState, useEffect } from "react";
+import {Navigate} from 'react-router-dom'
 import datas from "../../data/product_data.json";
 import Layout from "../Partials/Layout";
 import usersService from "../../services/UsersService";
@@ -43,9 +44,10 @@ export default function Home(props) {
               }
           </>
         ) : (
-          <div>
+          // <div>
-            You are not logged in or your account type is not supported.
+          //   You are not logged in or your account type is not supported.
-          </div>
+          // </div>
+          <Navigate to='/login' />
         )}
         </>
       </div>

src/components/MarketPlace/PopUp/MarketPopUp.jsx

@@ -133,11 +133,7 @@ const MarketPopUp = ({ details, onClose, situation, marketInt, marketPlaceProduc
   // let addedIntDate = marketInt?.added?.split(" ")[0];
   // let expireIntDate = marketInt?.expire?.split(" ")[0];
 
-  let cleanedText = details?.job_description
+  let cleanedText = details?.job_description?.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&amp;/g, "&");
-    ?.replace(/&lt;/g, "<")
-    .replace(/&gt;/g, ">")
-    .replace(/&quot;/g, '"')
-    .replace(/&amp;/g, "&");
 
   return (
     <ModalCom action={onClose} situation={situation}>
@@ -197,8 +193,8 @@ const MarketPopUp = ({ details, onClose, situation, marketInt, marketPlaceProduc
                     <div
                       className={`w-full p-2 md:w-3/4 text-slate-900 dark:text-white market-pop rounded-2xl ${
                         name == "Description"
-                          ? "min-h-[150px] max-h-[150px] h-full overflow-y-auto break-words bg-slate-50"
+                          ? "min-h-[100px] max-h-[100px] h-full overflow-y-auto break-words bg-slate-50"
-                          : name == "Delivery Detail" ? " overflow-y-auto h-full min-h-[150px] max-h-[150px] bg-slate-50"
+                          : name == "Delivery Detail" ? " overflow-y-auto h-full min-h-[200px] max-h-[200px] bg-slate-50"
                           : "h-full flex items-center"
                       }`}
                     >

src/components/Partials/Header.jsx

@@ -480,7 +480,7 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
                           {/* end Language list items*/}
                         </li>
                         <li className="content-item my-2 hover:bg-slate-100 transition duration-500 rounded-lg">
-                          <Link to="#" className="notifications">
+                          <Link to="/settings" className="notifications">
                             <div className="name">
                               <p className="text-sm py-2 px-4 text-dark-gray dark:text-white hover:text-sky-blue transition font-medium">
                                 Account Settings

src/index.css

@@ -1,6 +1,6 @@
 /* Regular Weight */
 @font-face {
-  font-family: "Product Sans";
+  font-family: Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif,"Product Sans";
   src: url("./assets/fonts/Product Sans Regular.ttf");
 }
 .nft-main-container {
@@ -8,7 +8,7 @@
 }
 /* Bold Weight */
 @font-face {
-  font-family: "Product Sans";
+  font-family: Roboto,"Product Sans";
   src: url("./assets/fonts/Product Sans Bold.ttf");
 }
 .SENDER {

src/middleware/AuthRoute.jsx

@@ -90,7 +90,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
         apiCall
           .loadProfile()
           .then((res) => {
-            if (res?.data?.internal_return < 0) {
+            if (!res?.data?.internal_return || res?.data?.internal_return < 0) {
               setIsLogin({ loading: false, status: false });
               return;
             }

src/services/UsersService.js

@@ -1674,7 +1674,7 @@ class usersService {
   }
 
   postAuxEnd(uri, reqData, uploadPost=false) {
-    const endPoint = uploadPost ? process.env.REACT_APP_MEDIA_LINK + uri : 'https://apigate.orion.g1.wrenchboard.com/en/wrench/api/v1' + uri;
+    const endPoint = uploadPost ? process.env.REACT_APP_MEDIA_LINK + uri : process.env.REACT_APP_USERS_ENDPOINT + uri;
     const session_token = localStorage.getItem("session_token");
     // session_token = session_token !=null ?session_token : '';
     //   'Authorization': `Basic ${(session_token !=null) ?session_token : ''}`,
@@ -1695,7 +1695,7 @@ class usersService {
     if(localStorage && localStorage.getItem('myloc')){
       reqData.loc = localStorage.getItem('myloc')
     }
-    return Axios.post(endPoint, reqData)
+    return Axios.post(endPoint, reqData,{timeout: 7000 })
         .then((response) => {
           // console.log(response);
           // console.log("~~~~~~~ WrenchBoard::POST ~~~~~~~~");