qa-media

.env

@@ -1,4 +1,5 @@
 SKIP_PREFLIGHT_CHECK=true 
+REACT_APP_NODE_ENV="development"
 
 REACT_APP_FACEBOOK="https://www.facebook.com/profile.php?id=100066498622246"
 REACT_APP_TWITTER="https://twitter.com/fluxtra"
@@ -17,12 +18,12 @@ REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api
 REACT_APP_ENDPOINT_KEY="WRENCH-BOARD-2024"
 
 #SOCKETS ENDS
-REACT_APP_PRIMARY_SOCKET="https://socket-dev.wrenchboard.com"
+REACT_APP_PRIMARY_SOCKET="https://socket-qa.wrenchboard.com"
 
 #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
 
 REACT_APP_SESSION_EXPIRE_MINUTES=600000
-REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY=600000
+REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY=1800000
 REACT_APP_SESSION_EXPIRE_CHECKER=60000
 
 REACT_APP_LOGIN_ERROR_TIMEOUT=7000
@@ -119,7 +120,7 @@ REACT_APP_SHOW_ACCOUNT_DASH=1
 REACT_APP_SHOW_SLIDER_BANNERS=0
 
 # FOR MEDIA LINK
-REACT_APP_MEDIA_LINK='https://dev-media.wrenchboard.com'
+REACT_APP_MEDIA_LINK='https://qa-media.wrenchboard.com'
 
 # FOR FAMILY GAME LINK
 REACT_APP_FAM_GAME_LINK='https://games.wrenchboard.com'
@@ -128,4 +129,10 @@ REACT_APP_FAM_GAME_LINK='https://games.wrenchboard.com'
 REACT_APP_CUSTOMTIMER=90
 
 #SHOW OR HIDE MY PAGE LINK ROUTE
-REACT_APP_SHOW_USER_PAGE=1
+REACT_APP_SHOW_USER_PAGE=1
+
+# login footer links
+REACT_APP_HOME_LINK='https://dev-www.wrenchboard.com/'
+REACT_APP_ABOUT_LINK='https://dev-www.wrenchboard.com/about-us'
+REACT_APP_CONTACTS_LINK='https://dev-www.wrenchboard.com/contact'
+REACT_APP_TERMS_LINK='https://dev-www.wrenchboard.com/terms'

.env.development

@@ -1,4 +1,5 @@
 SKIP_PREFLIGHT_CHECK=true 
+REACT_APP_NODE_ENV="development"
 
 REACT_APP_FACEBOOK="https://www.facebook.com/profile.php?id=100066498622246"
 REACT_APP_TWITTER="https://twitter.com/fluxtra"
@@ -9,20 +10,20 @@ REACT_APP_APPSITE="https://myfitapp.mermsemr.com"
 
 # REACT_APP_AUX_ENDPOINT="http://10.20.30.32:9083/svs/user"
 # REACT_APP_USERS_ENDPOINT="http://10.20.30.32:9083/svs/user"
-#REACT_APP_AUX_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/svs/user"
-#REACT_APP_USERS_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/svs/user"
+# REACT_APP_AUX_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/svs/user"
+# REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/svs/user"
 
-REACT_APP_AUX_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/en/wrench/api/v1"
-REACT_APP_USERS_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/en/wrench/api/v1"
+REACT_APP_AUX_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
+REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
 REACT_APP_ENDPOINT_KEY="WRENCH-BOARD-2024"
 
 #SOCKETS ENDS
-REACT_APP_PRIMARY_SOCKET="https://socket.wrenchboard.com"
+REACT_APP_PRIMARY_SOCKET="https://socket-qa.wrenchboard.com"
 
 #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
 
 REACT_APP_SESSION_EXPIRE_MINUTES=600000
-REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY=600000
+REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY=1800000
 REACT_APP_SESSION_EXPIRE_CHECKER=60000
 
 REACT_APP_LOGIN_ERROR_TIMEOUT=7000
@@ -35,20 +36,13 @@ REACT_APP_RESET_START_ERROR_TIMEOUT=3000
 #NUMBER OF ITEMS PER PAGE
 REACT_APP_ITEM_PER_PAGE=5
 
-#apigate.orion.g1.wrenchboard.com:76.209.103.227
+#apigate.lotus.g1.wrenchboard.com:76.209.103.227
 #apigate.orion.g1.wrenchboard.com:76.209.103.227
 
 REACT_APP_GOOGLE_CLIENT_ID=817021856543-ad9nsjgdpsu2s2jrl63j3ihrv7lbf6ma.apps.googleusercontent.com
 REACT_APP_GOOGLE_CLIENT_SECRET=aozK_2G8UjaCmLgPPkv9abIm
 REACT_APP_GOOGLE_CLIENT_SCOPE="https://www.googleapis.com/auth/plus.login https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile"
-REACT_APP_GOOGLE_REDIRECT_URL=https://users.wrenchboard.com/login/auth/
-
-REACT_APP_FACEBOOK_CLIENT_ID2=390204307987009
-REACT_APP_FACEBOOK_CLIENT_SECRET2=19f778e312f2ab96d147bacb612910c2
-REACT_APP_FACEBOOK_CLIENT_SCOPE="email,public_profile"
-REACT_APP_FACEBOOK_REDIRECT_URL="https://users.wrenchboard.com/login/auth/flogin"
-
-DISABLE_ESLINT_PLUGIN=true
+REACT_APP_GOOGLE_REDIRECT_URL=http://localhost:9082/login/auth/
 
 #File Handling
 REACT_APP_MAX_FILE_SIZE=1048576
@@ -56,6 +50,7 @@ REACT_APP_MAX_VIDEO_FILE_SIZE=31457280
 REACT_APP_TOTAL_NUM_FILE=4
 
 REACT_APP_LOGOUT_TEXT="Sign Out"
+
 REACT_APP_APPLE_SOCIAL_LOGIN=0
 REACT_APP_LINKEDIN_SOCIAL_LOGIN=0
 
@@ -94,7 +89,7 @@ REACT_APP_SHOW_ACCOUNT_DASH=1
 REACT_APP_SHOW_SLIDER_BANNERS=0
 
 # FOR MEDIA LINK
-REACT_APP_MEDIA_LINK='https://media.wrenchboard.com'
+REACT_APP_MEDIA_LINK='https://qa-media.wrenchboard.com'
 
 # FOR FAMILY GAME LINK
 REACT_APP_FAM_GAME_LINK='https://games.wrenchboard.com'
@@ -103,4 +98,10 @@ REACT_APP_FAM_GAME_LINK='https://games.wrenchboard.com'
 REACT_APP_CUSTOMTIMER=90
 
 #SHOW OR HIDE MY PAGE LINK ROUTE
-REACT_APP_SHOW_USER_PAGE=0
+REACT_APP_SHOW_USER_PAGE=1
+
+# login footer links
+REACT_APP_HOME_LINK='https://dev-www.wrenchboard.com/'
+REACT_APP_ABOUT_LINK='https://dev-www.wrenchboard.com/about-us'
+REACT_APP_CONTACTS_LINK='https://dev-www.wrenchboard.com/contact'
+REACT_APP_TERMS_LINK='https://dev-www.wrenchboard.com/terms'

.env.production

@@ -1,4 +1,5 @@
 SKIP_PREFLIGHT_CHECK=true 
+REACT_APP_NODE_ENV="production"
 
 REACT_APP_FACEBOOK="https://www.facebook.com/profile.php?id=100066498622246"
 REACT_APP_TWITTER="https://twitter.com/fluxtra"
@@ -22,7 +23,7 @@ REACT_APP_PRIMARY_SOCKET="https://socket.wrenchboard.com"
 #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
 
 REACT_APP_SESSION_EXPIRE_MINUTES=600000
-REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY=600000
+REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY=1800000
 REACT_APP_SESSION_EXPIRE_CHECKER=60000
 
 REACT_APP_LOGIN_ERROR_TIMEOUT=7000
@@ -103,4 +104,10 @@ REACT_APP_FAM_GAME_LINK='https://games.wrenchboard.com'
 REACT_APP_CUSTOMTIMER=90
 
 #SHOW OR HIDE MY PAGE LINK ROUTE
-REACT_APP_SHOW_USER_PAGE=0
+REACT_APP_SHOW_USER_PAGE=0
+
+# login footer links
+REACT_APP_HOME_LINK='https://www.wrenchboard.com/'
+REACT_APP_ABOUT_LINK='https://www.wrenchboard.com/about-us'
+REACT_APP_CONTACTS_LINK='https://www.wrenchboard.com/contact'
+REACT_APP_TERMS_LINK='https://www.wrenchboard.com/terms'

Dockerfile

@@ -1,5 +1,8 @@
 # pull the base image
-FROM node:alpine
+#FROM node:alpine
+FROM node:20.11.0-alpine
+
+
 
 # Build args
 ARG NODE_ENV
@@ -26,7 +29,7 @@ COPY nginx.conf ./
 
 COPY run.sh ./
 
-RUN npm install --legacy-peer-deps
+# RUN npm install --legacy-peer-deps
 
 # add app
 COPY . ./

docker-compose.yml

@@ -25,8 +25,9 @@ services:
       - apigate.orion.g1.wrenchboard.com:10.10.33.15
       - socket-dev.wrenchboard.com:10.10.33.15
       - socket.wrenchboard.com:10.10.33.15
-      - apigateway.wrenchboard.app.dev.fluxtra.net:10.20.30.19
-      - apigateway.wrenchboard.app.lotus.fluxtra.net:172.31.4.19
+      - media.wrenchboard.com:10.10.33.15
+      - www.wrenchboard.com:10.10.33.15
+      - blog.wrenchboard.com:10.10.33.15
     environment:
       - CHOKIDAR_USEPOLLING=true
       - NODE_ENV=${NODE_ENV:-production}

package.json

@@ -3,6 +3,7 @@
   "version": "0.2.0",
   "private": true,
   "dependencies": {
+    "@fvilers/disable-react-devtools": "^1.3.0",
     "@react-oauth/google": "^0.11.0",
     "@reduxjs/toolkit": "^1.8.2",
     "@tailwindcss/line-clamp": "^0.3.1",
@@ -36,8 +37,8 @@
     "yup": "^1.1.1"
   },
   "scripts": {
-    "start": "react-scripts start -e .env.production",
-    "build": "react-scripts build -e .env.production",
+    "start": "react-scripts start -e .env.development",
+    "build": "GENERATE_SOURCEMAP=false react-scripts build -e .env.production",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
   },

public/index.html

@@ -19,9 +19,7 @@
             content="Empower families to reward accomplishment, set goals, and encourage kids to understand goals, earning, and the benefit of savings – in one app experience."
     />
     <link rel="manifest" href="/manifest.json"/>
-    <script>
-      !function(e,a,t,n,g,c,o){e.GoogleAnalyticsObject=g,e.ga=e.ga||function(){(e.ga.q=e.ga.q||[]).push(arguments)},e.ga.l=1*new Date,c=a.createElement(t),o=a.getElementsByTagName(t)[0],c.async=1,c.src="https://www.google-analytics.com/analytics.js",o.parentNode.insertBefore(c,o)}(window,document,"script",0,"ga"),ga("create","UA-54829827-4","auto"),ga("send","pageview")</script><script defer="defer" src="/static/js/main.787e423f.js"></script><link href="/static/css/main.418eaf65.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body><script>var LHC_API=LHC_API||{};LHC_API.args={mode:"widget",lhc_base_url:"//chat.live.wrenchboard.com/",wheight:450,wwidth:350,pheight:520,pwidth:500,leaveamessage:!0,check_messages:!1},function(){var e=document.createElement("script");e.type="text/javascript",e.setAttribute("crossorigin","anonymous"),e.async=!0;var t=new Date;e.src="//chat.live.wrenchboard.com/design/defaulttheme/js/widgetv2/index.js?"+t.getFullYear()+t.getMonth()+t.getDate();var a=document.getElementsByTagName("script")[0];a.parentNode.insertBefore(e,a)}()
-    </script>
+
 
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />

public/manifest.json

@@ -1,6 +1,6 @@
 {
-  "short_name": "React App",
-  "name": "Create React App Sample",
+  "short_name": "WrenchBoard App",
+  "name": "WrenchBoard User Web",
   "icons": [],
   "start_url": ".",
   "display": "standalone",

run.sh

@@ -13,8 +13,9 @@ else
   # build the app and serve it via nginx
   echo "Production build"
   npm install --legacy-peer-deps
-  #npm run build
-  npm start
+  npm run build
+  # Testing sometimes
+  # npm run start
   nginx -g 'daemon off;' -c /usr/src/app/nginx.conf
   nginx -c /usr/src/app/nginx.conf
 fi

src/App.jsx

@@ -1,23 +1,33 @@
+import {Suspense, lazy} from 'react'
 import { Navigate, useLocation } from "react-router-dom";
-import Routers from "./Routers";
+// import Routers from "./Routers";
+// import SocketIOContextProvider from "./components/Contexts/SocketIOContext";
 import Toaster from "./components/Helpers/Toaster";
 import Default from "./components/Partials/Default";
-import SocketIOContextProvider from "./components/Contexts/SocketIOContext";
 
+import { disableReactDevTools } from '@fvilers/disable-react-devtools';
+import LoadingSpinner from './components/Spinners/LoadingSpinner';
+
+if (process.env.REACT_APP_NODE_ENV === 'production') {
+    disableReactDevTools();
+}
+const Routers = lazy(()=>import('./Routers'))
 function App() {
   const { pathname } = useLocation();
   return (
     <Default>
-      <SocketIOContextProvider>
+      {/* <SocketIOContextProvider> */}
         <>
           {pathname.startsWith("/@") ? (
             <Navigate to="/app" replace={true} />
           ) : (
-            <Routers />
+            <Suspense fallback={<LoadingSpinner size="32" color="sky-blue" height="h-screen" />}>
+              <Routers />
+            </Suspense>
           )}
           <Toaster />
         </>
-      </SocketIOContextProvider>
+      {/* </SocketIOContextProvider> */}
     </Default>
   );
 }

src/Routers.jsx

@@ -1,83 +1,87 @@
 import { Route, Routes } from "react-router-dom";
-import FourZeroFour from "./components/FourZeroFour";
-import ScrollToTop from "./components/Helpers/ScrollToTop";
-import StartJob from "./components/MyJobs/StartJob";
-import Notification from "./components/Notification";
-import AuthRoute from "./middleware/AuthRoute";
-import AppDownloadPage from "./views/AppDownloadPage";
-import AppleRedirectPage from "./views/AppleRedirectPage";
-import AuthProfilePage from "./views/AuthProfilePage";
-import AuthRedirect from "./views/AuthRedirect";
-import BlogPage from "./views/BlogPage";
-import CalendarPage from "./views/CalendarPage";
-import CollectionItemPage from "./views/CollectionItemPage";
-import FacebookRedirect from "./views/FacebookRedirect";
-import FamilyAccPage from "./views/FamilyAccPage";
-import FamilyManagePage from "./views/FamilyManagePage";
-import FamilyMarketPage from "./views/FamilyMarketPage";
-import FamilySettingsPage from "./views/FamilySettingsPage";
-import ForgotPasswordPages from "./views/ForgotPasswordPages";
-import ForgotPasswordPagesTwo from "./views/ForgotPasswordPagesTwo";
-import HistoryPage from "./views/HistoryPage";
-import HomePages from "./views/HomePages";
-import JobGroupsPage from "./views/JobGroupsPage";
-import LndPage from "./views/LndPage";
+import { lazy } from "react";
+
+import SocketConnection from "./middleware/SocketConnection";
+
+// AUTH PAGES
+import LoginLandingPage from './views/LoginLandingPage';
 import LoginPage from "./views/LoginPage";
 import LoginPageTwo from "./views/LoginPageTwo";
-import LoginLandingPage from './views/LoginLandingPage'
-import ManageActiveJobs from "./views/ManageActiveJobs";
-import ManageInterestOfferPage from "./views/ManageInterestOfferPage";
-import MarketPlacePage from "./views/MarketPlacePage";
-import MyActiveJobsPage from "./views/MyActiveJobsPage";
-import MyCouponPage from "./views/MyCouponPage";
-import MyJobsPage from "./views/MyJobsPage";
-import MyOffersPage from "./views/MyOffersPage";
-import MyPastDueJobsPage from "./views/MyPastDueJobsPage";
-import MyReviewDueJobsPage from "./views/MyReviewDueJobsPage";
-import MyTaskPage from "./views/MyTaskPage";
-import MyWaitingJobsPage from "./views/MyWaitingJobsPage";
-import MyWalletPage from "./views/MyWalletPage";
-import OffersInterestPage from "./views/OffersInterestPage";
-import ReferralPage from "./views/ReferralPage";
-import RemindersPage from "./views/RemindersPage";
-import ResourcePage from "./views/ResourcePage";
-import SavedPage from "./views/SavedPage";
-import SellPage from "./views/SellPage";
-import SettingsPage from "./views/SettingsPage";
+import FourZeroFour from "./components/FourZeroFour";
+import AppDownloadPage from "./views/AppDownloadPage";
+import AppleRedirectPage from "./views/AppleRedirectPage";
+import AuthRedirect from "./views/AuthRedirect";
+import ForgotPasswordPages from "./views/ForgotPasswordPages";
+import ForgotPasswordPagesTwo from "./views/ForgotPasswordPagesTwo";
+import LndPage from "./views/LndPage";
 import SignupPage from "./views/SignupPage";
 import SignupPageTwo from "./views/SignupPageTwo";
-import TrackingPage from "./views/TrackingPage";
 import UpdatePasswordPages from "./views/UpdatePasswordPages";
 import UpdatePasswordPagesTwo from "./views/UpdatePasswordPagesTwo";
-import UploadProductPage from "./views/UploadProductPage";
-import UserProfilePage from "./views/UserProfilePage";
 import VerifyLinkPages from "./views/VerifyLinkPages";
 import VerifyLinkPagesTwo from "./views/VerifyLinkPagesTwo";
 import VerifyPasswordPages from "./views/VerifyPasswordPages";
 import VerifyPasswordPagesTwo from "./views/VerifyPasswordPagesTwo";
 import VerifyYouPages from "./views/VerifyYouPages";
 import VerifyYouPagesTwo from "./views/VerifyYouPagesTwo";
-import YourPages from "./views/YourPage_";
-import ParentWaitingPage from "./views/ParentWaitingPage";
-import FamilyPendingOfferPage from "./views/FamilyPendingOfferPage";
-import FamBlogPage from "./views/FamBlogPage"
-import FamAIQuestionPage from "./views/FamAIQuestionPage"
-import FamMyFilesPage from "./views/FamMyFilesPage"
-import FamWorkInProgressPage from "./views/FamWorkInProgressPage";
-import MyPastDueTasksPage from "./views/MyPastDueTasksPage";
-import FamilyWalletPage from "./views/FamilyWalletPage";
-import FamilyActivitiesPage from "./views/FamilyActivitiesPage";
-import FamGamesPage from "./views/FamGamesPage";
-import FamilyRoutesPage from "./views/FamilyRoutesPage";
+import FacebookRedirect from "./views/FacebookRedirect";
 import PromoPage from "./views/PromoPage";
-import LearnMorePage from "./views/LearnMorePage";
+import PromoRefer from './views/PromoRefer';
+import InviteRefer from './views/InviteRefer';
+import MyRefer from './views/MyRefer';
+
+
+const HomePages = lazy(() => import("./views/HomePages"));
+const ScrollToTop = lazy(() => import("./components/Helpers/ScrollToTop"));
+const StartJob = lazy(() => import("./components/MyJobs/StartJob"));
+const Notification = lazy(() => import("./components/Notification"));
+const AuthRoute = lazy(() => import("./middleware/AuthRoute"));
+const AuthProfilePage = lazy(() => import("./views/AuthProfilePage"));
+const BlogPage = lazy(() => import("./views/BlogPage"));
+const FamilyManagePage = lazy(() => import("./views/FamilyManagePage"));
+const FamilyMarketPage = lazy(() => import("./views/FamilyMarketPage"));
+
+const HistoryPage = lazy(()=> import("./views/HistoryPage"));
+const JobGroupsPage = lazy(()=> import("./views/JobGroupsPage"));
+const ManageActiveJobs = lazy(()=> import("./views/ManageActiveJobs"));
+const ManageInterestOfferPage = lazy(()=> import("./views/ManageInterestOfferPage"));
+const MarketPlacePage = lazy(()=> import("./views/MarketPlacePage"));
+const MyActiveJobsPage = lazy(()=> import("./views/MyActiveJobsPage"));
+const MyCouponPage = lazy(()=> import("./views/MyCouponPage"));
+const MyJobsPage = lazy(()=> import("./views/MyJobsPage"));
+const MyOffersPage = lazy(()=> import("./views/MyOffersPage"));
+const MyPastDueJobsPage = lazy(()=> import("./views/MyPastDueJobsPage"));
+const MyReviewDueJobsPage = lazy(()=> import("./views/MyReviewDueJobsPage"));
+const MyTaskPage = lazy(()=> import("./views/MyTaskPage"));
+const MyWaitingJobsPage = lazy(()=> import("./views/MyWaitingJobsPage"));
+const MyWalletPage = lazy(()=> import("./views/MyWalletPage"));
+const OffersInterestPage = lazy(()=> import("./views/OffersInterestPage"));
+const ReferralPage = lazy(()=> import("./views/ReferralPage"));
+const RemindersPage = lazy(()=> import("./views/RemindersPage"));
+const ResourcePage = lazy(()=> import("./views/ResourcePage"));
+const SettingsPage = lazy(()=> import("./views/SettingsPage"));
+const TrackingPage = lazy(()=> import("./views/TrackingPage"));
+const UploadProductPage = lazy(()=> import("./views/UploadProductPage"));
+const UserProfilePage = lazy(()=> import("./views/UserProfilePage"));
+const YourPages = lazy(()=> import("./views/YourPage_"));
+const ParentWaitingPage = lazy(()=> import("./views/ParentWaitingPage"));
+const FamilyPendingOfferPage = lazy(()=> import("./views/FamilyPendingOfferPage"));
+const FamBlogPage = lazy(()=> import("./views/FamBlogPage"));
+const FamAIQuestionPage = lazy(()=> import("./views/FamAIQuestionPage"));
+const FamMyFilesPage = lazy(()=> import("./views/FamMyFilesPage"));
+const FamWorkInProgressPage = lazy(()=> import("./views/FamWorkInProgressPage"));
+const MyPastDueTasksPage = lazy(()=> import("./views/MyPastDueTasksPage"));
+const FamilyWalletPage = lazy(()=> import("./views/FamilyWalletPage"));
+const LearnMorePage = lazy(()=> import("./views/LearnMorePage"));
+const FamGamesPage = lazy(()=> import("./views/FamGamesPage"));
+const FamilyRoutesPage = lazy(()=> import("./views/FamilyRoutesPage"));
 
 export default function Routers() {
   return (
     <ScrollToTop>
       <Routes>
         {/* guest routes */}
-        {process.env.REACT_APP_NEW_LOGIN_LAYOUT == 1 ? (
+        {Number(process.env.REACT_APP_NEW_LOGIN_LAYOUT) === 1 ? (
           <>
             <Route exact path="/login" element={<LoginLandingPage />} />
             <Route exact path="/login/:type" element={<LoginPageTwo />} />
@@ -96,8 +100,10 @@ export default function Routers() {
             <Route path="/complereset" element={<VerifyPasswordPagesTwo />} />
             <Route exact path="/outmessage" element={<VerifyYouPagesTwo />} />
             <Route exact path="/eoffer" element={<LoginPageTwo />} />
-            <Route exact path="/invite" element={<LoginPageTwo />} />
             <Route exact path="/promo/:name/:id" element={<PromoPage />} />
+            <Route exact path="/promoref" element={<PromoRefer />} />
+            <Route exact path="/invite" element={<InviteRefer />} />
+            <Route exact path="/myrefer/:refer_link" element={<MyRefer />} />
           </>
         ) : (
           <>
@@ -127,94 +133,76 @@ export default function Routers() {
         <Route exact path="/app" element={<AppDownloadPage />} />
 
         {/* private route */}
-        <Route element={<AuthRoute />}>
-          <Route exact path="/" element={<HomePages />} />
-          {/*  <Route exact path="/active-bids" element={<AcitveBidsPage />} />
-          <Route exact path="/notification" element={<Notification />} />
-          <Route exact path="/market-place" element={<MarketPlacePage />} />
-          <Route exact path="/shop-details" element={<ShopDetailsPage />} />
-        <Route exact path="/my-collection" element={<MyCollection />} />*/}
-          <Route exact path="/reminders" element={<RemindersPage />} />
-          <Route exact path="/tracking" element={<TrackingPage />} />
-          <Route exact path="/calendar" element={<CalendarPage />} />
-          <Route exact path="/resources" element={<ResourcePage />} />
-          <Route exact path="/my-wallet/*" element={<MyWalletPage />} />
-          <Route exact path="/family-wallet" element={<FamilyWalletPage />} />
-          <Route exact path="/my-coupon" element={<MyCouponPage />} />
-          <Route exact path="/notification" element={<Notification />} />
-          <Route exact path="/market-place" element={<MarketPlacePage />} />
-          <Route exact path="/market" element={<MarketPlacePage />} />
-          <Route exact path="/familymarket" element={<FamilyMarketPage />} />
-          <Route exact path="/suggested" element={<ParentWaitingPage />} />
-          <Route exact path="/parentwaiting" element={<ParentWaitingPage />} />
-          <Route exact path="/pending" element={<FamilyPendingOfferPage />} />
-          <Route exact path="/fam-blog" element={<FamBlogPage />} />
-          <Route exact path="/ai-question" element={<FamAIQuestionPage />} />
-          <Route exact path="/myfiles" element={<FamMyFilesPage />} />
-          <Route exact path="/ai-lab" element={<FamAIQuestionPage />} />
-          <Route exact path="/fam-games" element={<FamGamesPage />} />
-          <Route exact path="/work-in-progress" element={<FamWorkInProgressPage />} />
+        <Route element={<SocketConnection />}>
+          <Route element={<AuthRoute />}>
+            <Route exact path="/" element={<HomePages />} />
+            <Route exact path="/reminders" element={<RemindersPage />} />
+            <Route exact path="/tracking" element={<TrackingPage />} />
+            <Route exact path="/resources" element={<ResourcePage />} />
+            <Route exact path="/my-wallet/*" element={<MyWalletPage />} />
+            <Route exact path="/family-wallet" element={<FamilyWalletPage />} />
+            <Route exact path="/my-coupon" element={<MyCouponPage />} />
+            <Route exact path="/notification" element={<Notification />} />
+            <Route exact path="/market-place" element={<MarketPlacePage />} />
+            <Route exact path="/market" element={<MarketPlacePage />} />
+            <Route exact path="/familymarket" element={<FamilyMarketPage />} />
+            <Route exact path="/suggested" element={<ParentWaitingPage />} />
+            <Route exact path="/parentwaiting" element={<ParentWaitingPage />} />
+            <Route exact path="/pending" element={<FamilyPendingOfferPage />} />
+            <Route exact path="/fam-blog" element={<FamBlogPage />} />
+            <Route exact path="/ai-question" element={<FamAIQuestionPage />} />
+            <Route exact path="/myfiles" element={<FamMyFilesPage />} />
+            <Route exact path="/ai-lab" element={<FamAIQuestionPage />} />
+            <Route exact path="/fam-games" element={<FamGamesPage />} />
+            <Route exact path="/work-in-progress" element={<FamWorkInProgressPage />} />
 
-          <Route exact path="/pastdue" element={<MyPastDueTasksPage />} />
-          <Route exact path="/notification" element={<Notification />} />
-          <Route exact path="/mytask" element={<MyTaskPage />} />
-          <Route exact path="/myjobs" element={<MyJobsPage />} />
-          {/* <Route exact path="/add-job" element={<AddJobPage />} /> */}
-          <Route exact path="/my-active-jobs" element={<MyActiveJobsPage />} />
-          <Route
-            exact
-            path="/my-pastdue-jobs"
-            element={<MyPastDueJobsPage />}
-          />
-          <Route exact path="/my-offers" element={<MyOffersPage />} />
-          <Route exact path="/pend-interest" element={<MyWaitingJobsPage />} />
-          <Route
-            exact
-            path="/my-review-jobs"
-            element={<MyReviewDueJobsPage />}
-          />
+            <Route exact path="/pastdue" element={<MyPastDueTasksPage />} />
+            <Route exact path="/notification" element={<Notification />} />
+            <Route exact path="/mytask" element={<MyTaskPage />} />
+            <Route exact path="/myjobs" element={<MyJobsPage />} />
+            <Route exact path="/my-active-jobs" element={<MyActiveJobsPage />} />
+            <Route
+              exact
+              path="/my-pastdue-jobs"
+              element={<MyPastDueJobsPage />}
+            />
+            <Route exact path="/my-offers" element={<MyOffersPage />} />
+            <Route exact path="/pend-interest" element={<MyWaitingJobsPage />} />
+            <Route
+              exact
+              path="/my-review-jobs"
+              element={<MyReviewDueJobsPage />}
+            />
+            <Route path='/acc-family/*' element={<FamilyRoutesPage />} />
 
-          {/* <Route exact path='/acc-family' element={<FamilyAccPage />} />
-          <Route exact path="/acc-family/activities" element={<FamilyActivitiesPage />} />
-          <Route exact path="/acc-family/familysettings" element={<FamilySettingsPage />} /> */}
-          <Route path='/acc-family/*' element={<FamilyRoutesPage />} />
-
-          <Route exact path="/manage-family" element={<FamilyManagePage />} />
-          <Route exact path="/start-job" element={<StartJob />} />
-          <Route exact path="/yourpage" element={<YourPages />} />
-          <Route
-            exact
-            path="/manage-active-job"
-            element={<ManageActiveJobs />}
-          />
-          <Route exact path="/blog-page" element={<BlogPage />} />
-          <Route
-            exact
-            path="/offer-interest"
-            element={<OffersInterestPage />}
-          />
-          <Route
-            exact
-            path="/manage-offer"
-            element={<ManageInterestOfferPage />}
-          />
-
-          <Route
-            exact
-            path="/my-collection/collection-item"
-            element={<CollectionItemPage />}
-          />
-          <Route exact path="/sell" element={<SellPage />} />
-          <Route exact path="/saved" element={<SavedPage />} />
-          <Route exact path="/history" element={<HistoryPage />} />
-          <Route exact path="/learnmore" element={<LearnMorePage />} />
-          {/*<Route exact path="/upload-product" element={<UploadProductPage />} />*/}
-          <Route exact path="/my-uploads" element={<UploadProductPage />} />
-          <Route exact path="/profile" element={<AuthProfilePage />} />
-          <Route exact path="/user-profile" element={<UserProfilePage />} />
-          <Route exact path="/settings" element={<SettingsPage />} />
-          <Route exact path="/referral" element={<ReferralPage />} />
-          <Route exact path="/job-groups" element={<JobGroupsPage />} />
+            <Route exact path="/manage-family" element={<FamilyManagePage />} />
+            <Route exact path="/start-job" element={<StartJob />} />
+            <Route exact path="/yourpage" element={<YourPages />} />
+            <Route
+              exact
+              path="/manage-active-job"
+              element={<ManageActiveJobs />}
+            />
+            <Route exact path="/blog-page" element={<BlogPage />} />
+            <Route
+              exact
+              path="/offer-interest"
+              element={<OffersInterestPage />}
+            />
+            <Route
+              exact
+              path="/manage-offer"
+              element={<ManageInterestOfferPage />}
+            />
+            <Route exact path="/history" element={<HistoryPage />} />
+            <Route exact path="/learnmore" element={<LearnMorePage />} />
+            <Route exact path="/my-uploads" element={<UploadProductPage />} />
+            <Route exact path="/profile" element={<AuthProfilePage />} />
+            <Route exact path="/user-profile" element={<UserProfilePage />} />
+            <Route exact path="/settings" element={<SettingsPage />} />
+            <Route exact path="/referral" element={<ReferralPage />} />
+            <Route exact path="/job-groups" element={<JobGroupsPage />} />
+          </Route>
         </Route>
         <Route path="*" element={<FourZeroFour />} />
       </Routes>

src/assets/images/icons/refer-a-friend.svg

@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" id="add-friend" x="0" y="0" enable-background="new 0 0 56 56" version="1.1" viewBox="0 0 56 56">
+  <g id="_x34_">
+    <path fill="#ff614b" d="M20.1520596 48.5122223c-6.969367.6334381-16.1360435-2.538559-16.1360435-9.5089226 0-6.7552567 9.3379993-12.8340607 19.1365566-10.1025429C11.6365042 32.0076103 8.5797586 43.9628181 20.1520596 48.5122223zM23.2281342 21.9498482c-1.3167553 1.6189995-3.0113163 2.7414837-4.8678036 2.7414837-4.155407 0-7.544529-5.6017437-7.544529-9.7464113 0-6.0081682 6.6323166-9.4670734 11.4841213-6.4004383-1.3815784 1.4355316-2.223423 3.389122-2.223423 5.5477886C20.0764999 16.6826973 21.3177586 19.8127232 23.2281342 21.9498482z"></path>
+    <path d="M36.0304298 47.965065c-4.6939316 1.9150925-10.9132786 1.956356-15.6842041.0958252-.0213013-.0090942-.0412598-.0187378-.0639648-.0250244-11.5273151-4.5492096-7.7401743-16.8518009 4.2484741-18.9360332.30867.8989487 1.012928 1.4676666 1.9118042 1.8097534l-2.2802734 9.73419c-.1025391.4355469.03125.9023438.3491211 1.2177734l3.8803711 3.8544922c.2107143.2096252.5543423.188858.7397461-.0380859l3.3261719-4.0585938c.2789803-.3397827.3200912-.5983696.1914063-1.0166016-1.1257496-3.7452698.1548195.6061249-2.7582397-9.5864239.9509258-.3161449 1.663147-.9907551 2.2283325-1.8195801 3.4285889.5916748 6.3656006 2.1239014 8.2872314 4.3503399.1802521.2088089.496357.2312813.7050781.0517578.2089844-.1806641.2324219-.4970703.0517578-.7060547-2.1342773-2.4716778-5.3999023-4.1562481-9.1958008-4.7431622-.0008545-.0001221-.0016479.0002441-.0025024.0001221-.2167149-.0316906-.4131889.0921535-.4998169.2335205-.0004272.0006714-.0011597.0010376-.0015869.001709-.4018555.6640625-.8833008 1.1640625-1.4296875 1.4873047-1.3619595.8058376-4.409462.3548889-4.6435547-1.3857422-.0373135-.2786045-.2598305-.4986324-.766119-.4238281-.5176334.0825806-1.0214176.1906738-1.5172062.3118896C13.0129108 25.6687794 3.5157814 31.9572849 3.5157814 39.0031509c0 7.2062569 9.1560717 10.6395416 16.5500488 10.015564 4.9281864 1.9016037 11.3733406 1.899971 16.3425293-.1278687.2553711-.1044922.378418-.3964844.2739258-.6513672C36.5777931 47.9826431 36.2858009 47.8605728 36.0304298 47.965065zM28.9718361 31.4416294l.4660034 1.6382427c-.1742687.0852623.0627537-.0866661-3.2201538 3.1741943l1.1130371-4.7518902C27.8272762 31.4898281 28.4199524 31.4561787 28.9718361 31.4416294zM25.1358986 40.8722916l.649231-2.7717896 3.9557495-3.9552612.9927979 3.4902954-4.7506104 4.2474976c-.0058594.005249-.0079346.0126343-.0134888.0180664l-.7536011-.7485352C25.1432228 41.0793228 25.1124611 40.9728775 25.1358986 40.8722916zM31.6827736 40.9875259l-2.9765625 3.6318359-2.0285645-2.0148926 4.3604736-3.8986816c.7511387 2.5571251.4453716 1.4923744.6549072 2.1899414C31.7027931 40.9279556 31.7159767 40.9601822 31.6827736 40.9875259zM4.5157814 39.0031509c0-5.8982773 7.6678896-11.4824982 16.6328735-10.0299053-9.6517429 3.5520725-12.3788052 14.0203838-3.1348267 19.1047955C10.2978249 47.9708633 4.5157814 44.1104507 4.5157814 39.0031509zM23.2516823 22.6767979c1.3936768 1.3889771 3.0743408 2.2960815 4.8578491 2.2960815 3.8608398 0 6.9887695-4.0351563 8.0830078-8.0214844.0732422-.2666016-.0834961-.5419922-.3496094-.6152344-.2675781-.0703125-.5419922.0839844-.6142578.3496094-.9697266 3.5332031-3.7944336 7.2871094-7.1191406 7.2871094-4.1438522 0-7.5332031-5.7720966-7.5332031-9.8808603 0-4.1711521 3.4018421-7.5205073 7.5214844-7.5205073 3.9272461 0 7.2163086 3.0712886 7.487793 6.9912105.0195313.2753906.2602539.4755859.5336914.4648438.2753906-.0195313.4833984-.2578125.4643555-.5332031-.4944992-7.1314373-9.1289673-10.5536861-14.3618164-5.558105-5.3048058-2.9869342-11.90625.8975091-11.90625 7.0083003C10.3155861 21.4710331 17.3002548 29.2743626 23.2516823 22.6767979zM21.5162697 8.6711206c-3.2331066 3.9059381-2.063303 9.517417 1.0541992 13.2802744-5.3480682 6.0405064-11.2548828-1.5758038-11.2548828-7.0068369C11.3155861 9.6542807 16.9414864 6.3203502 21.5162697 8.6711206zM49.5030861 33.2590103l-1.8736572-.184082c.0150757-.0079346.0324707-.0045166.0469971-.0141602 6.2281075-4.1175671 6.166069-13.8392754 1.1938477-16.9414043-.0844727-2.0888681-.8623047-3.9804697-2.1958008-5.243165-1.9521484-1.8457031-5.0620117-2.0644531-6.934082-.4853516-.2114258.1777344-.237793.4931641-.0600586.7041016.1782227.2109375.4931641.2373047.7045898.0595703 1.4697266-1.2392578 4.034668-1.0351563 5.6020508.4482422 1.0302734.9746094 1.6738281 2.4042969 1.8452148 4.0136719-3.2912941-1.1423397-6.6737289 1.6315832-5.0351563 4.7509775 1.415638 2.6920357 5.6048317 2.0048065 6.0458984-3.0429688 3.8890877 3.1670475 3.621582 11.1923389-1.5643311 14.7892437l.4412842-.9708843c.2745361-.6030388-.6399498-1.0150375-.9101563-.4140625l-.824707 1.8144512c-.3768578.8212128.0631943 1.3852425.9770508 1.4716797l2.4433594.2402344C50.0908356 34.2954216 50.1399155 33.3223534 49.5030861 33.2590103zM43.6822853 19.9015903c-1.2788124-2.4307442 1.6810646-4.3558064 4.1933594-3.1884766C47.761219 21.1266956 44.6973381 21.8336697 43.6822853 19.9015903z"></path>
+    <g>
+      <circle cx="41.237" cy="41.649" r="8.435" fill="#f7d01c" transform="rotate(-76.717 41.237 41.649)"></circle>
+    </g>
+    <path d="M44.2379494,41.1486588H42.244297v-1.9941406c0-0.2763672-0.2236328-0.5-0.5-0.5s-0.5,0.2236328-0.5,0.5v1.9941406
+		h-1.9936523c-0.2763672,0-0.5,0.2236328-0.5,0.5s0.2236328,0.5,0.5,0.5h1.9936523v1.9941406c0,0.2763672,0.2236328,0.5,0.5,0.5
+		s0.5-0.2236328,0.5-0.5v-1.9941406h1.9936523c0.2763672,0,0.5-0.2236328,0.5-0.5S44.5143166,41.1486588,44.2379494,41.1486588z"></path>
+  </g>
+</svg>

src/assets/images/icons/resources.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="resources" enable-background="new 0 0 48 48" viewBox="0 0 48 48">
+  <ellipse cx="9.1" cy="5.4" fill="#ffd499" rx="4.4" ry="4.9"></ellipse>
+  <path fill="#b0f0a8" d="M20.2,22.2c0.5,0,1-0.2,1.4-0.6l5-5c0.8-0.8,0.8-2,0-2.8c-0.8-0.8-2-0.8-2.8,0l-3.7,3.7L15.1,13c-0.1-0.1-0.2-0.2-0.4-0.3c-1.2-1-2.8-1.5-4.4-1.5H7.9c-4.1,0-7.4,3.4-7.4,7.5v11.3h3.1v14.6c0,1.6,1.2,2.8,2.8,2.8c1.3,0,2.4-0.9,2.7-2.2c0.3,1.3,1.4,2.2,2.7,2.2c1.5,0,2.8-1.3,2.8-2.8V17.9l4.4,3.9C19.3,22.1,19.8,22.2,20.2,22.2z"></path>
+  <path fill="#c1e5ff" d="M39.8 45.1c1.8-.9 3.4-2.2 4.7-3.8h-2.8C41.2 42.8 40.6 44.1 39.8 45.1zM34.8 46.4c1.7-.6 3.2-2.5 4.3-5h-4.3V46.4zM42.4 38.9h3.6c.8-1.5 1.3-3.2 1.4-5h-4.4C43 35.7 42.8 37.4 42.4 38.9zM44.5 24c-1.3-1.6-2.8-2.9-4.7-3.8.7 1.1 1.4 2.4 1.9 3.8H44.5zM39.9 26.4h-5.1v5h5.8C40.6 29.7 40.3 28 39.9 26.4zM43.1 31.5h4.4c-.2-1.8-.7-3.5-1.4-5h-3.6C42.8 28 43 29.7 43.1 31.5zM34.8 19v5h4.3C38 21.4 36.5 19.6 34.8 19zM40.7 33.9h-5.8v5h5.1C40.3 37.4 40.6 35.7 40.7 33.9zM28.1 24h4.3v-5C30.7 19.6 29.2 21.4 28.1 24zM22.7 41.4c1.3 1.6 2.8 2.9 4.7 3.8-.7-1.1-1.4-2.4-1.9-3.8H22.7zM24.1 33.9h-4.4c.2 1.8.7 3.5 1.4 5h3.6C24.4 37.4 24.2 35.7 24.1 33.9zM26.6 31.5h5.8v-5h-5.1C26.9 28 26.7 29.7 26.6 31.5zM32.4 46.4v-5h-4.3C29.2 43.9 30.7 45.8 32.4 46.4zM27.4 20.2c-1.8.9-3.4 2.2-4.7 3.8h2.8C26 22.6 26.7 21.3 27.4 20.2zM27.3 38.9h5.1v-5h-5.8C26.7 35.7 26.9 37.4 27.3 38.9zM19.7 31.5h4.4c.1-1.8.3-3.5.7-5h-3.6C20.4 28 19.9 29.7 19.7 31.5z"></path>
+</svg>

src/assets/images/icons/waiting.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 672 672" id="waiting">
+  <path fill="#4d4d4d" d="M497 595H175a7 7 0 0 1-7-7v-79.237a112.163 112.163 0 0 1 37.076-83.249L304.536 336l-99.46-89.515A112.163 112.163 0 0 1 168 163.236V119a7 7 0 0 1 14 0v44.236a98.142 98.142 0 0 0 32.441 72.843L319.683 330.8a7 7 0 0 1 0 10.406L214.441 435.92A98.142 98.142 0 0 0 182 508.763V581h308v-72.237a98.142 98.142 0 0 0-32.441-72.843L352.317 341.2a7 7 0 0 1 0-10.406l105.242-94.718A98.142 98.142 0 0 0 490 163.236V119a7 7 0 0 1 14 0v44.236a112.163 112.163 0 0 1-37.076 83.249L367.464 336l99.46 89.514A112.163 112.163 0 0 1 504 508.763V588a7 7 0 0 1-7 7Z"></path>
+  <path fill="#5b96ff" d="M440.679 207.553a7 7 0 0 0-6.535-4.492H237.856a7 7 0 0 0-4.682 12.2l98.143 88.339a7 7 0 0 0 9.366 0l98.143-88.334a7 7 0 0 0 1.853-7.713Z"></path>
+  <path fill="#5b95ff" d="M330.475 469.1 238 588h196l-92.475-118.9a7 7 0 0 0-11.05 0Z"></path>
+  <rect width="420" height="35" x="126" y="49" fill="#ebeff2" rx="17.5"></rect>
+  <rect width="420" height="35" x="126" y="588" fill="#ebeff2" rx="17.5"></rect>
+  <path fill="#4d4d4d" d="M528.5 91h-385a24.5 24.5 0 0 1 0-49h385a24.5 24.5 0 0 1 0 49zm-385-35a10.5 10.5 0 0 0 0 21h385a10.5 10.5 0 0 0 0-21zm385 574h-385a24.5 24.5 0 0 1 0-49h385a24.5 24.5 0 0 1 0 49zm-385-35a10.5 10.5 0 0 0 0 21h385a10.5 10.5 0 0 0 0-21z"></path>
+</svg>

src/components/AddJob/AddJob.jsx

@@ -3,7 +3,7 @@ import {
   useDispatch,
   useSelector,
   usersService,
-  initialValues as IV,
+  // initialValues as IV,
   initialReqState,
   useState,
   tableReload,
@@ -39,7 +39,7 @@ function AddJob({ popUpHandler, categories }) {
 
     try {
       const res = await ApiCall.jobManagerCreateJob(reqData);
-      if (res.data.internal_return < 1) {
+      if (res?.data?.internal_return < 1) {
         setRequestStatus({
           loading: false,
           status: false,
@@ -75,7 +75,7 @@ function AddJob({ popUpHandler, categories }) {
   // For form initial values
   const initialValues = {
     // initial values for formik
-    country: walletDetails.data.length == 1 ? walletDetails.data[0].country : '',
+    country: walletDetails?.data?.length === 1 ? walletDetails.data[0].country : '',
     price: "",
     title: "",
     description: "",
@@ -117,18 +117,18 @@ function AddJob({ popUpHandler, categories }) {
                           className={`input-field p-2 mt-3 rounded-full placeholder:text-base text-dark-gray w-full h-[42px] bg-slate-100 focus:ring-0 focus:outline-none border`}
                           onChange={props.handleChange}
                           onBlur={props.handleBlur}
-                          disabled={walletDetails.data.length == 1}
+                          disabled={walletDetails?.data?.length === 1}
                         >
                           {walletDetails?.loading ? (
                             <option className="text-slate-500 text-lg" value="">
                               Loading...
                             </option>
-                          ) : walletDetails.data.length > 1 ? (
+                          ) : walletDetails?.data?.length > 1 ? (
                             <>
                               <option className="text-slate-500 text-lg" value="">
                                 Select a currency
                               </option>
-                              {walletDetails.data?.map((item, index) => (
+                              {walletDetails?.data?.map((item, index) => (
                                 <option
                                   key={index}
                                   className="text-slate-500 text-lg"
@@ -138,9 +138,9 @@ function AddJob({ popUpHandler, categories }) {
                                 </option>
                               ))}
                             </>
-                          ) : walletDetails.data.length == 1 ?
+                          ) : walletDetails?.data?.length === 1 ?
                           <>
-                            {walletDetails.data?.map((item, index) => (
+                            {walletDetails?.data?.map((item, index) => (
                               <option
                                 key={index}
                                 className="text-slate-500 text-lg"
@@ -184,10 +184,10 @@ function AddJob({ popUpHandler, categories }) {
                             className="job-label job-label-flex"
                             htmlFor="timeline_days"
                           >
-                            Timeline
-                            <span className="text-green-700 text-[12px] tracking-wide">
+                            Delivery Timeline
+                            {/* <span className="text-green-700 text-[12px] tracking-wide">
                               - Duration
-                            </span>
+                            </span> */}
                           </label>
 
                         <Field
@@ -367,7 +367,7 @@ function AddJob({ popUpHandler, categories }) {
                 {/* ERROR DISPLAY AND SUBMIT BUTTON */}
                 <div className="content-footer w-full">
                   {/* error or success display */}
-                  {requestStatus.message != "" &&
+                  {requestStatus.message !== "" &&
                     (!requestStatus.status ? (
                       <div
                         className={`relative p-4 my-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}

src/components/AuthPages/AuthLayout2.jsx

@@ -5,8 +5,8 @@ import WrenchBoard from "../../assets/images/wrenchboard-logo-text.png";
 
 import DarkModeContext from "../Contexts/DarkModeContext";
 
-export default function LoginLayout({ slogan, children }) {
-  const bgImg = localImgLoad("images/left-wrenchboard.jpg");
+export default function AuthLayout2({ slogan, children }) {
+  // const bgImg = localImgLoad("images/left-wrenchboard.jpg");
   const bgImgNig = localImgLoad("images/wrench-home-back-nigeria.jpg");
   const bgImgCom = localImgLoad("images/wrench-home-back-common.jpg");
 
@@ -16,7 +16,7 @@ export default function LoginLayout({ slogan, children }) {
     <div
       className={`relative min-h-screen overflow-y-auto bg-cover bg-center flex flex-col items-center`}
       style={{
-        backgroundImage: `url(${countryMode == "NG" ? bgImgNig : bgImgCom})`,
+        backgroundImage: `url(${countryMode === "NG" ? bgImgNig : bgImgCom})`,
       }}
     >
       <div className="my-5">
@@ -47,8 +47,16 @@ export default function LoginLayout({ slogan, children }) {
           <div className="w-full flex flex-col md:flex-row justify-center items-center px-10 py-2">
             <div className="flex justify-center items-center">
               <div className="flex items-center">
+                <a 
+                  href={process.env.REACT_APP_HOME_LINK}
+                  className='text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]' 
+                  target="_blank"
+                  rel="noreferrer"
+                >
+                  Home
+                </a>
                 <a
-                  href="https://www.wrenchboard.com/about-us"
+                  href={process.env.REACT_APP_ABOUT_LINK}
                   className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
                   target="_blank"
                   rel="noreferrer"
@@ -56,15 +64,16 @@ export default function LoginLayout({ slogan, children }) {
                   About
                 </a>
                 <a
-                  href="https://www.wrenchboard.com/service"
+                  // href="https://www.wrenchboard.com/service"
+                  href={process.env.REACT_APP_TERMS_LINK}
                   className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
                   target="_blank"
                   rel="noreferrer"
                 >
-                  Services
+                  Terms
                 </a>
                 <a
-                  href="https://www.wrenchboard.com/contact"
+                  href={process.env.REACT_APP_CONTACTS_LINK}
                   className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
                   target="_blank"
                   rel="noreferrer"

src/components/AuthPages/AuthProfile/index.jsx

@@ -1,63 +1,63 @@
-import React, { useState } from "react";
+import React from "react";
 import { Link } from "react-router-dom";
 import authProfilePic from "../../../assets/images/auth-profile-picture.png";
 import profileBanner from "../../../assets/images/profile-cover.png";
-import collections from "../../../data/collectionplan_data.json";
-import marketPlace from "../../../data/marketplace_data.json";
-import products from "../../../data/product_data.json";
 import Layout from "../../Partials/Layout";
 import ActivitiesTab from "./ActivitiesTab";
-import CollectionTab from "./CollectionTab";
-import CreatedTab from "./CreatedTab";
-import HiddenProductsTab from "./HiddenProductsTab";
-import OnSaleTab from "./OnSaleTab";
-import OwnTab from "./OwnTab";
+// import collections from "../../../data/collectionplan_data.json";
+// import marketPlace from "../../../data/marketplace_data.json";
+// import products from "../../../data/product_data.json";
+// import CollectionTab from "./CollectionTab";
+// import CreatedTab from "./CreatedTab";
+// import HiddenProductsTab from "./HiddenProductsTab";
+// import OnSaleTab from "./OnSaleTab";
+// import OwnTab from "./OwnTab";
 
 export default function AuthProfile() {
-  const onSaleProducts = marketPlace.data;
-  const CreatedSell = marketPlace.data;
-  const CreatedBits = products.datas;
+  // const onSaleProducts = marketPlace.data;
+  // const CreatedSell = marketPlace.data;
+  // const CreatedBits = products.datas;
   // const mainProducts = products.datas;
-  const ownProducts = products.datas;
-  const collectionProducts = collections.data;
+  // const ownProducts = products.datas;
+  // const collectionProducts = collections.data;
 
-  const tabs = [
-    {
-      id: 1,
-      name: "onsale",
-      content: "On Sale",
-    },
-    {
-      id: 2,
-      name: "owned",
-      content: "Owned",
-    },
-    {
-      id: 3,
-      name: "created",
-      content: "Created",
-    },
-    {
-      id: 4,
-      name: "hidden",
-      content: "Hidden",
-    },
-    {
-      id: 5,
-      name: "collection",
-      content: "Collection",
-    },
-    {
-      id: 6,
-      name: "activity",
-      content: "Activity",
-    },
-  ];
+  // const tabs = [
+  //   {
+  //     id: 1,
+  //     name: "onsale",
+  //     content: "On Sale",
+  //   },
+  //   {
+  //     id: 2,
+  //     name: "owned",
+  //     content: "Owned",
+  //   },
+  //   {
+  //     id: 3,
+  //     name: "created",
+  //     content: "Created",
+  //   },
+  //   {
+  //     id: 4,
+  //     name: "hidden",
+  //     content: "Hidden",
+  //   },
+  //   {
+  //     id: 5,
+  //     name: "collection",
+  //     content: "Collection",
+  //   },
+  //   {
+  //     id: 6,
+  //     name: "activity",
+  //     content: "Activity",
+  //   },
+  // ];
 
-  const [tab, setTab] = useState(tabs[0].name);
-  const tabHandler = (value) => {
-    setTab(value);
-  };
+  // const [tab, setTab] = useState(tabs[0].name);
+  // const tabHandler = (value) => {
+  //   setTab(value);
+  // };
   return (
     <>
       <Layout>

src/components/AuthPages/AuthRedirect/AppleRedirect.jsx

@@ -1,15 +1,15 @@
 import React, { useEffect } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
-import usersService from '../../../services/UsersService';
-import {updateUserDetails} from "../../../store/UserDetails";
-import { useDispatch } from "react-redux";
+// import usersService from '../../../services/UsersService';
+// import {updateUserDetails} from "../../../store/UserDetails";
+// import { useDispatch } from "react-redux";
 import AuthLayout from "../AuthLayout";
 
 function AppleRedirect() {
     const location = useLocation();
     const navigate = useNavigate();
-    const userApi = new usersService();
-    const dispatch = useDispatch()
+    // const userApi = new usersService();
+    // const dispatch = useDispatch()
 
     const queryParams = new URLSearchParams(location?.search);
     const codeResponse = queryParams.get("code");
@@ -36,11 +36,11 @@ function AppleRedirect() {
       redirect_uri=https%3A//oauth2.example.com/code&
       grant_type=authorization_code
       */
-      var reqData = {
-        auth_type: "APPLE",
-        code: codeResponse,
-        redirect_uri: process.env.REACT_APP_GOOGLE_REDIRECT_URL,
-      };
+      // var reqData = {
+      //   auth_type: "APPLE",
+      //   code: codeResponse,
+      //   redirect_uri: process.env.REACT_APP_GOOGLE_REDIRECT_URL,
+      // };
     //   userApi
     //     .authStart(reqData)
     //     .then((res) => {
@@ -58,7 +58,7 @@ function AppleRedirect() {
     //       navigate('/login', {state: {error: true}})
     //       console.log(error);
     //     });
-    },[])
+    },[codeResponse, navigate])
   return (
     <AuthLayout>
     <div className='min-h-[70vh]'>Redirecting ... </div>

src/components/AuthPages/AuthRedirect/FbookRedirect.jsx

@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { useMemo, useEffect } from 'react';
 import { useDispatch } from "react-redux";
 import { useLocation, useNavigate } from 'react-router-dom';
 import usersService from '../../../services/UsersService';
@@ -8,7 +8,7 @@ import AuthLayout from "../AuthLayout";
 function FbookRedirect() {
     const location = useLocation();
     const navigate = useNavigate();
-    const userApi = new usersService();
+    const userApi = useMemo(()=> new usersService(),[]);
     const dispatch = useDispatch()
 
     const queryParams = new URLSearchParams(location?.search);
@@ -52,7 +52,7 @@ function FbookRedirect() {
       userApi
         .authStart(reqData)
         .then((res) => {
-          if (res.status == 200  && res.data.internal_return >= 0 && res.data.member_id && res.data.uid && res.data.session) {
+          if (res.status === 200  && res.data.internal_return >= 0 && res.data.member_id && res.data.uid && res.data.session) {
             localStorage.setItem("member_id", `${res.data.member_id}`);
             localStorage.setItem("uid", `${res.data.uid}`);
             localStorage.setItem("session_token", `${res.data.session}`);
@@ -66,7 +66,7 @@ function FbookRedirect() {
           navigate('/login', {state: {error: true}})
           console.log(error);
         });
-    },[])
+    },[codeResponse, userApi, dispatch, navigate])
   return (
     <AuthLayout>
     <div className='min-h-[70vh]'>Redirecting ... </div>

src/components/AuthPages/AuthRedirect/Redirect.jsx

@@ -1,4 +1,4 @@
-import React, { useEffect } from "react";
+import React, { useEffect, useMemo } from "react";
 import { useDispatch } from "react-redux";
 import { useLocation, useNavigate } from "react-router-dom";
 import usersService from "../../../services/UsersService";
@@ -8,7 +8,7 @@ import AuthLayout from "../AuthLayout";
 function Redirect() {
   const location = useLocation();
   const navigate = useNavigate();
-  const userApi = new usersService();
+  const userApi = useMemo(()=> new usersService(),[]);
   const dispatch = useDispatch();
 
   const queryParams = new URLSearchParams(location?.search);
@@ -40,7 +40,7 @@ function Redirect() {
       .authStart(reqData)
       .then((res) => {
         if (
-          res.status == 200 &&
+          res.status === 200 &&
           res.data.internal_return >= 0 &&
           res.data.member_id &&
           res.data.uid &&
@@ -59,7 +59,7 @@ function Redirect() {
         navigate("/login", { state: { error: true } });
         console.log(error);
       });
-  }, []);
+  }, [codeResponse, userApi, dispatch, navigate]);
   return (
     <AuthLayout>
       <div className="min-h-[70vh]">Redirecting ... </div>

src/components/AuthPages/ForgotPassword/index.jsx

@@ -38,7 +38,7 @@ export default function ForgotPassword() {
   }
 
   const resetHandler = async () => {
-    if (email == "") {
+    if (email === "") {
       setMsgError("An email is required");
       return setTimeout(() => {
         setMsgError(null);

src/components/AuthPages/ForgotPassword/index2.jsx

@@ -1,6 +1,6 @@
 import React, { useState } from "react";
-import { Link, useNavigate } from "react-router-dom";
-import WrenchBoard from "../../../assets/images/wrenchboard-logo-text.png";
+import { useNavigate } from "react-router-dom";
+// import WrenchBoard from "../../../assets/images/wrenchboard-logo-text.png";
 import usersService from "../../../services/UsersService";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import AuthLayout from "../AuthLayout2";
@@ -38,7 +38,7 @@ export default function ForgotPassword() {
   }
 
   const resetHandler = async () => {
-    if (email == "") {
+    if (email === "") {
       setMsgError("An email is required");
       return setTimeout(() => {
         setMsgError(null);

src/components/AuthPages/Login/LoginLanding.jsx

@@ -95,15 +95,26 @@ export default function LoginLanding() {
 
                   <div className="text-gray-400 font-medium text-[16.25px] leading-[24.375px]">
                     Don't have an account?{" "}
-                    <Link
+                    {/* <Link
                       to="/signup"
                       className="font-semibold text-[#4687ba] hover:text-[#009ef7] transition"
                     >
                       Sign Up
-                    </Link>
+                    </Link> */}
+                    <div
+                      className="font-semibold text-[#4687ba] hover:text-[#009ef7] transition"
+                    >
+                      Sign Up in App Store
+                    </div>
                   </div>
                 </div>
               </div>
+              {/* <div className="login-links mt-10 flex justify-center text-gray-400 divide-x-4">
+                  <a className='text-sm font-bold px-5' href={process.env.REACT_APP_HOME_LINK}>Home</a>
+                  <a className='text-sm font-bold px-5' href={process.env.REACT_APP_ABOUT_LINK}>About</a>
+                  <a className='text-sm font-bold px-5' href={process.env.REACT_APP_CONTACTS_LINK}>Contact</a>
+                  <a className='text-sm font-bold px-5' href={process.env.REACT_APP_TERMS_LINK}>Terms</a>
+              </div> */}
             </div>
           </div>
         </div>

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'>
-                <Link className='text-center block font-semibold text-lg pt-3 tracking-wide' to='/login'>Return</Link>
+              <div className='mt-4 w-full flex justify-center items-center text-center'>
+                <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

@@ -8,7 +8,13 @@ import AuthLayout from "../AuthLayout2";
 import GoogleDownload from '../../../assets/images/download/andriod.jpg'
 import IOSDownload from '../../../assets/images/download/apple.jpg'
 
-export default function SignUp() {
+/* Note 
+The Props in this component
+1. refer_link holds the value to be sent as the referral code
+2. details holds the value of the person either referred via invite or promo
+*/
+
+export default function SignUp({refer_link, details}) {
   const location = useLocation();
 
   // eslint-disable-next-line no-restricted-globals
@@ -28,9 +34,9 @@ export default function SignUp() {
 
   const [formData, setFormData] = useState({
     country: country ? country : "",
-    first_name: "",
-    last_name: "",
-    email: "",
+    first_name: details ? details.firstname : "",
+    last_name: details ? details.lastname : "",
+    email: details ? details.email : "",
     password: "",
   });
 
@@ -104,6 +110,7 @@ export default function SignUp() {
         }
 
         setSignUpLoading(true);
+        let referral_link = refer_link ? {refer_link} : {} // FOR USER COMING FROM REFERRAL PROCESS
         const reqData = {
           country: country,
           firstname: first_name,
@@ -113,6 +120,7 @@ export default function SignUp() {
           password: password,
           terms: 1,
           news: 1,
+          ...referral_link
         };
 
         const res = await userApi.CreateUser(reqData);
@@ -202,6 +210,7 @@ export default function SignUp() {
                       type="text"
                       value={formData.first_name}
                       inputHandler={handleInputChange}
+                      disable={details ? true : false}
                     />
                   </div>
                   <div className="input-item flex-1">
@@ -213,6 +222,7 @@ export default function SignUp() {
                       type="text"
                       value={formData.last_name}
                       inputHandler={handleInputChange}
+                      disable={details ? true : false}
                     />
                   </div>
                 </div>
@@ -225,6 +235,7 @@ export default function SignUp() {
                     type="email"
                     value={formData.email}
                     inputHandler={handleInputChange}
+                    disable={details ? true : false}
                   />
                 </div>
                 <div className="input-item mb-4">
@@ -271,16 +282,17 @@ export default function SignUp() {
                       )}
                     </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
-                        href="#"
+                      <a
+                        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/Contexts/SocketIOContext.js

@@ -67,6 +67,7 @@ export default function SocketIOContextProvider({children}) {
             let {message} = data
             if(message.action == "REFRESH_OFFER" && message.family_uid == user_uid && message.audience == "MEMBER"){  // for refreshing child account when parent assigns a job
                 dispatch(tableReload({type:'FAMILYOFFERLIST'})) // dispatches to update family pending/offer list on family side
+                dispatch(tableReload({ type: "FAMILYBANNERSLIST" })) // dispatches to update family banner list on family side
             }
             if(message.action == "REFRESH_TASK" && message.audience == "PARENT"){  // for refreshing parent account when child accepts or rejects a job
                 dispatch(tableReload({type:'PARENTFAMILYTASKLIST'})) // dispatches to update parent family task list on parent side

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

@@ -8,16 +8,13 @@ import { tableReload } from "../../store/TableReloads";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
 import HomeModal from "./HomeModal";
 
-export default function FamilyDash({ MyActiveJobList=[], serverImg }) {
-  // console.log("PROPS IN FAMILY DASH->", familyOffers?.result_list);
+export default function FamilyDash() {
 
   const dispatch = useDispatch();
 
   const [firstTimeModal, setFirstTimeModal] = useState(true)
   
   const userApi = new usersService();
-
-  // const trending = MyActiveJobList;
   
   const { familyBannersList } = useSelector((state) => state.familyBannersList);
 
@@ -25,22 +22,6 @@ export default function FamilyDash({ MyActiveJobList=[], serverImg }) {
 
   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>
@@ -49,13 +30,13 @@ export default function FamilyDash({ MyActiveJobList=[], serverImg }) {
           <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>
@@ -79,8 +60,8 @@ export default function FamilyDash({ MyActiveJobList=[], serverImg }) {
                         <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>
-                            <p className="text-sm text-black dark:text-white">{content.banner.description}</p>
+                            <h1 className="text-xl text-[#083e21] dark:text-white font-bold tracking-wide">{content.banner.text}</h1>
+                            <p className="text-base text-black dark:text-white">{content.banner.description}</p>
                           </div>
                         </div>
                       </div>
@@ -107,7 +88,7 @@ export default function FamilyDash({ MyActiveJobList=[], serverImg }) {
                         </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>
@@ -124,22 +105,6 @@ export default function FamilyDash({ MyActiveJobList=[], serverImg }) {
             }
           </>
           }
-
-          {/* {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,125 +1,56 @@
 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";
-import { useSelector } from "react-redux";
+import { useSelector, useDispatch } from "react-redux";
 import FamilyDash from "./FamilyDash";
 import FullAccountDash from "./FullAccountDash";
 import LoadingSpinner from '../../components/Spinners/LoadingSpinner'
+import { tableReload } from '../../store/TableReloads';
 
 export default function Home(props) {
- // console.log("PROPS IN HOME->", props);
-  const userApi = new usersService();
-  const { commonHeadBanner } = useSelector((state) => state.commonHeadBanner);
 
+  const dispatch = useDispatch()
+
+  const { commonHeadBanner } = useSelector((state) => state.commonHeadBanner);
   const { userDetails } = useSelector((state) => state?.userDetails);
 
-  // const [MyActiveJobList, setMyActiveJobList] = useState({loading:true, data:[]}); // STATE TO HOLD ACTIVE/CURRENT TASKS
-
-  // const getMyActiveJobList = async () => { // FUNCTION TO POPULATE ACTIVE/CURRENT TASK LIST
-  //   try {
-  //     const res = await userApi.getMyActiveTaskList();
-  //     setMyActiveJobList({loading:false, data:res?.data?.result_list});
-  //     // setMyActiveJobList(res?.data?.result_list);
-  //   } catch (error) {
-  //     setMyActiveJobList({loading:false, data:[]});
-  //     // setMyActiveJobList([]);
-  //     console.log("Error getting tasks");
-  //   }
-  // };
-
-  // FUNCTION TO GET DASH DATA TO DETERMINE CURRENT TASK DUE TIME
-  // const getHomeDate = () => {
-  //   userApi
-  //     .getHomeDate()
-  //     .then((res) => {
-  //       if (res.status != 200 || res.internal_return < 0) {
-  //         return;
-  //       }
-  //       setNextDueTask(res.data);
-  //     })
-  //     .catch((error) => {
-  //       console.log(error);
-  //     });
-  // };
-
-  // const getMyOffersList = async () => {
-  //   try {
-  //     const res = await userApi.getOffersList();
-  //     setMyOffersList({loading:false, data:res.data});
-  //   } catch (error) {
-  //     setMyOffersList({loading:false, data:[]});
-  //     console.log("Error getting offers", error);
-  //   }
-  // };
-
-  // useEffect(() => {
-  //   if(userDetails?.account_type == 'FULL'){
-  //     getMyActiveJobList();
-  //   }
-  // }, []);
+  useEffect(()=>{
+    if(!commonHeadBanner.loading && (!commonHeadBanner?.data || Object.keys(commonHeadBanner?.data).length < 1)){
+      dispatch(tableReload({ type: "HOMEBANNERS" })); // reloads home banner in case it fails to load or encounters error while loading
+    }
+  },[])
 
   return (
     <Layout>
-      {/* {Object.keys(commonHeadBanner).length < 1 ?
-      <LoadingSpinner height='h-48' size='16' />
-      :
       <div className="w-full">
+        <>
         {userDetails && userDetails?.account_type == "FAMILY" ? (
           <FamilyDash
             account={userDetails}
-            commonHeadData={props.bannerList}
-            // familyOffers={MyOffersList?.data}
-            serverImg = {userDetails?.session_image_server}
-            // MyActiveJobList={MyActiveJobList?.data}
           />
         ) : userDetails && userDetails?.account_type == "FULL" ? (
-          <FullAccountDash
-            bannerList={props.bannerList}
-            dashTypes={props.dashTypes}
-            // offersList={MyOffersList}
-            // MyActiveJobList={MyActiveJobList}
-            offersList={props.offersList}
-            imageServer={props.imageServer}
-          />
-        ) : (
-          <div>
-            You are not logged in or your account type is not supported.
-          </div>
-        )}
-      </div>
-      } */}
-
-        <div className="w-full">
-          {userDetails && userDetails?.account_type == "FAMILY" ? (
-            <FamilyDash
-              account={userDetails}
-              commonHeadData={props.bannerList}
-              // familyOffers={MyOffersList?.data}
-              serverImg = {userDetails?.session_image_server}
-              // MyActiveJobList={MyActiveJobList?.data}
-            />
-          ) : userDetails && userDetails?.account_type == "FULL" ? (
-            <>
-              {Object.keys(commonHeadBanner).length < 1 ?
-              <LoadingSpinner height='h-48' size='16' />
-              :
-              <FullAccountDash
-                bannerList={props.bannerList}
-                dashTypes={props.dashTypes}
-                // offersList={MyOffersList}
-                // MyActiveJobList={MyActiveJobList}
-                offersList={props.offersList}
-                imageServer={props.imageServer}
-              />
+          <>
+              {commonHeadBanner.loading ?
+                <LoadingSpinner height='h-48' size='16' />
+                :
+                <FullAccountDash
+                  bannerList={commonHeadBanner?.data?.result_list}
+                  dashTypes={commonHeadBanner?.data?.home_dash_type}
+                  offersList={commonHeadBanner?.data?.offers_list}
+                  imageServer={commonHeadBanner?.data?.session_image_server}
+                />
               }
-            </>
-          ) : (
-            <div>
-              You are not logged in or your account type is not supported.
-            </div>
-          )}
-        </div>
+          </>
+        ) : (
+          // <div>
+          //   You are not logged in or your account type is not supported.
+          // </div>
+          <Navigate to='/login' />
+        )}
+        </>
+      </div>
     </Layout>
   );
 }

src/components/LearnMore/LearnMore.jsx

@@ -66,17 +66,17 @@ export default function LearnMore() {
     })
 
     //FUNCTION TO GET LEARN MORE TOPIC
-  
   useEffect(()=>{
     apiCall.getLearnmoreTopics().then((res)=>{
         if(res.data.internal_return < 0){ // success but no data
             setTopics(prev => ({...prev, loading: false}))
             return
         }
-        const resData = res?.data?.result_list
+        const resData = res?.data?.result_list || []
+        console.log('resData', resData)
         setTopics(prev => ({...prev, loading: false, data: resData}))
         setTabs(prev => {
-           return prev.map((item, index) => ({...item, title:resData[index].topic}))
+           return prev?.map((item, index) => ({...item, title:resData[index]?.topic}))
         })
         setSelectedTab(resData[0].topic)
         // console.log('RES', resData)
@@ -130,7 +130,7 @@ export default function LearnMore() {
                                 <>
                                     {(topics?.data && topics?.data?.length > 0) ?
                                     <div dangerouslySetInnerHTML={{
-                                        __html: topics?.data?.filter(item => item.topic == selectedTab)[0]?.contents,
+                                        __html: topics?.data?.filter(item => item?.topic == selectedTab)[0]?.contents,
                                       }} className='prose dark:text-white dark:bg-dark-white'
                                     >
                                         {/* {topics?.data?.filter(item => item.topic == selectedTab)[0]?.contents} */}

src/components/MarketPlace/PopUp/LockJob.jsx

@@ -57,6 +57,7 @@ export default function LockJob({
         </div>
       ) : (
         <>
+        <div className='md:grid md:grid-cols-4'>
           <div className="px-4 py-2 w-full md:col-span-3 md:border-r-1">
             <div className="min-h-[200px]">
               <h2 className="w-full flex gap-1 items-center font-semibold text-slate-900 dark:text-white tracking-wide">
@@ -277,6 +278,7 @@ export default function LockJob({
               </div>
             </div>
           </div>
+        </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
-    ?.replace(/&lt;/g, "<")
-    .replace(/&gt;/g, ">")
-    .replace(/&quot;/g, '"')
-    .replace(/&amp;/g, "&");
+  let cleanedText = details?.job_description?.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&amp;/g, "&");
 
   return (
     <ModalCom action={onClose} situation={situation}>
@@ -149,7 +145,7 @@ const MarketPopUp = ({ details, onClose, situation, marketInt, marketPlaceProduc
           <CloseIcon onClose={onClose} />
         </div>
 
-        <div className="md:grid md:grid-cols-4 bg-white dark:bg-dark-white text-slate-900 dark:text-white rounded-lg">
+        <div className="bg-white dark:bg-dark-white text-slate-900 dark:text-white rounded-lg">
           {details?.offer_depend_uid ?
           <LockJob
             marketPlaceProduct={marketPlaceProduct}
@@ -164,7 +160,7 @@ const MarketPopUp = ({ details, onClose, situation, marketInt, marketPlaceProduc
           />
           :
           <>
-            <div className="px-4 py-2 w-full md:col-span-3 md:border-r-1">
+            <div className="px-4 py-2 w-full">
               <div className="min-h-[300px]">
                 <h2 className="w-full flex gap-1 items-center font-semibold text-slate-900 dark:text-white tracking-wide">
                   {details?.offer_depend_uid && <i className="fa-solid fa-lock p-1 text-red-500 text-[12px]"></i>}
@@ -190,15 +186,15 @@ const MarketPopUp = ({ details, onClose, situation, marketInt, marketPlaceProduc
                     danger: true,
                   },
                 ].map(({ name, content, danger }, idx) => (
-                  <div className={`my-3 md:flex items-start`} key={idx}>
+                  <div className={`my-3 flex-col gap-1`} key={idx}>
                     <label className="py-2 job-label w-full md:w-[19%]">
                       {name}
                     </label>
                     <div
-                      className={`w-full p-2 md:w-3/4 text-slate-900 dark:text-white market-pop rounded-2xl ${
+                      className={`w-full p-2 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"
-                          : name == "Delivery Detail" ? " overflow-y-auto h-full min-h-[150px] max-h-[150px] bg-slate-50"
+                          ? "min-h-[60px] max-h-[75px] h-full overflow-y-auto break-words 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"
                       }`}
                     >
@@ -237,122 +233,111 @@ const MarketPopUp = ({ details, onClose, situation, marketInt, marketPlaceProduc
                 ))}
               </div>
               <hr className='my-1' />
-              <div className='w-full'>
-                <label className="job-label w-full flex gap-2 items-center">
-                  If you have any questions about this task:
-                  <span className={`text-sm ${marketMsg.state ? 'text-[#57cd89]' : 'text-red-500'}`}>
-                    {marketMsg.state && "Message Sent!"}
-                    {errMsg.market && "Failed to send"}
-                  </span>
-                </label>
-                <div className="w-full flex items-center gap-3">
-                  <div className="w-full">
-                    <textarea
-                      className={`p-1 w-full text-sm text-slate-900 dark:text-white ${
-                        marketMsg.loading && "italic text-[#9CA3AF]"
-                      } bg-transparent outline-none border-2 border-slate-300 rounded-md`}
-                      rows="3"
-                      style={{ resize: "none" }}
-                      placeholder="Enter message here ..."
-                      value={marketMsg.loading ? "Sending..." : textValue}
-                      onChange={handleInputChange}
-                    />
-                  </div>
-                  <div className="relative flex flex-col">
-                    <button
-                      className="rounded-full flex justify-center items-center w-12 h-11 bg-yellow-500 text-white"
-                      name="market-message"
-                      onClick={MarketDetail}
-                      disabled={marketMsg.loading}
-                    >
-                      {marketMsg.loading ? (
-                        <LoadingSpinner size={5} color="white" />
-                      ) : (
-                        // "Send Message"
-                        <svg
-                        xmlns="http://www.w3.org/2000/svg"
-                        viewBox="0 0 11 20"
-                        id="Arrow"
-                        className="w-[0.7rem]"
+              <div className='w-full grid grid-cols-1 md:grid-cols-3 gap-4 md:gap-8 items-center'>
+                <div className='col-span-1 md:col-span-2 flex flex-col justify-center gap-2'>
+                  <label className="job-label w-full flex gap-2 items-center">
+                    If you have any questions about this task:
+                    <span className={`text-sm ${marketMsg.state ? 'text-[#57cd89]' : 'text-red-500'}`}>
+                      {marketMsg.state && "Message Sent!"}
+                      {errMsg.market && "Failed to send"}
+                    </span>
+                  </label>
+                  <div className="w-full flex items-center gap-3">
+                    <div className="w-full">
+                      <textarea
+                        className={`p-1 w-full text-sm text-slate-900 dark:text-white ${
+                          marketMsg.loading && "italic text-[#9CA3AF]"
+                        } bg-transparent outline-none border-2 border-slate-300 rounded-md`}
+                        rows="3"
+                        style={{ resize: "none" }}
+                        placeholder="Enter message here ..."
+                        value={marketMsg.loading ? "Sending..." : textValue}
+                        onChange={handleInputChange}
+                      />
+                    </div>
+                    <div className="relative flex flex-col">
+                      <button
+                        className="rounded-full flex justify-center items-center w-12 h-11 bg-yellow-500 text-white"
+                        name="market-message"
+                        onClick={MarketDetail}
+                        disabled={marketMsg.loading}
                       >
-                        <path
-                          fillRule="evenodd"
-                          d="M.366 19.708c.405.39 1.06.39 1.464 0l8.563-8.264a1.95 1.95 0 0 0 0-2.827L1.768.292A1.063 1.063 0 0 0 .314.282a.976.976 0 0 0-.011 1.425l7.894 7.617a.975.975 0 0 1 0 1.414L.366 18.295a.974.974 0 0 0 0 1.413"
-                          // fill=""
-                          className="color000000 svgShape fill-[#fff]"
-                        ></path>
-                      </svg>
-                      )}
-                    </button>
-                    {/* <span className="text-sm text-[#57cd89]">
-                      {marketMsg.state && "Sent!"}
-                      {errMsg.market && "Failed"}
-                    </span> */}
+                        {marketMsg.loading ? (
+                          <LoadingSpinner size={5} color="white" />
+                        ) : (
+                          // "Send Message"
+                          <svg
+                          xmlns="http://www.w3.org/2000/svg"
+                          viewBox="0 0 11 20"
+                          id="Arrow"
+                          className="w-[0.7rem]"
+                        >
+                          <path
+                            fillRule="evenodd"
+                            d="M.366 19.708c.405.39 1.06.39 1.464 0l8.563-8.264a1.95 1.95 0 0 0 0-2.827L1.768.292A1.063 1.063 0 0 0 .314.282a.976.976 0 0 0-.011 1.425l7.894 7.617a.975.975 0 0 1 0 1.414L.366 18.295a.974.974 0 0 0 0 1.413"
+                            // fill=""
+                            className="color000000 svgShape fill-[#fff]"
+                          ></path>
+                        </svg>
+                        )}
+                      </button>
+                    </div>
                   </div>
                 </div>
-              </div>
-            </div>
-
-            <div className="py-2 w-full md:col-span-1 h-full flex flex-col rounded-2xl">
-              <div className="mx-auto bg-[#f1f8ff] dark:bg-[#C2C8D3] px-4 rounded-md w-full h-full md:min-h-[420px] flex flex-col justify-between">
-                <div className="w-full flex flex-col justify-center pb-4 gap-2">
-                  <p className="job-label w-full">
-                    Interested?
+                
+                <div className="span-1 flex flex-col justify-center mb-4 gap-2">
+                  <p className="flex items-center tracking-wide">
+                    <span className="job-label">Interest Count: </span> <b className="ml-1">{interestCount.length > 0 ? interestCount[0].interest_count : '0'}</b>
                   </p>
-                  <hr />
+                  {/* <hr /> */}
                   <button
-                    className="btn-gradient text-white px-2 py-2 border-4 border-slate-300 text-lg lg:text-xl font-medium rounded-2xl"
+                    className="btn-gradient text-white p-1 border-4 border-slate-300 text-lg lg:text-xl font-medium rounded-2xl"
                     name="market-interest"
                     onClick={ManageInterest}
                   >
                     {" "}
                     <div className="flex md:flex-col justify-center gap-2">
-                      <span>Notify</span>
-                      <span>Owner</span>
+                      <span>I am Interested</span>
+                      {/* <span>Owner</span> */}
                     </div>
                   </button>
-                  <>
-                    {manageInt.loading ? (
-                      <p className="text-sm italic">please wait...</p>
-                    ) : (
-                      <>
-                        {manageInt?.msg !== "" && (
-                          <p
-                            className={`text-sm italic ${
-                              manageInt?.state ? "text-green-500" : "text-red-500"
-                            }`}
-                          >
-                            {manageInt?.msg}
-                          </p>
-                        )}
-                      </>
-                    )}
-                  </>
-                </div>
-
-                <div className="text-slate-900">
-                  <p className="flex items-center tracking-wide">
-                    <span className="job-label">Interest: </span> <b className="ml-1">{interestCount.length > 0 ? interestCount[0].interest_count : '0'}</b>
-                  </p>
-                  <hr />
-                  <p className="my-1 flex flex-col">
-                    <span className="job-label">Expire: </span> 
-                    <span> {new Date(details.expire).toLocaleString()} </span>
-                  </p>
                 </div>
               </div>
+              <div>
+                  {manageInt.loading ? (
+                    <p className="text-sm italic">please wait...</p>
+                  ) : (
+                    <>
+                      {manageInt?.msg !== "" && (
+                        <p
+                          className={`text-sm italic ${
+                            manageInt?.state ? "text-green-500" : "text-red-500"
+                          }`}
+                        >
+                          {manageInt?.msg}
+                        </p>
+                      )}
+                    </>
+                  )}
+              </div>
             </div>
           </>
           }
         </div>
         
-        <div className="modal-footer-wrapper">
+        <div className="modal-footer-wrapper flex justify-between gap-2 items-center">
+          <div className="text-slate-900">
+            <p className="my-1 flex flex-col">
+              <span className="job-label">Expire: </span> 
+              <span> {new Date(details.expire).toLocaleString()} </span>
+            </p>
+          </div>
           <button
             className="custom-btn bg-transparent border border-red-500 text-red-500 ml-auto"
             name="cancel"
             onClick={onClose}
           >
-            Cancel
+            Close
           </button>
         </div>
       </div>

src/components/MarketPlace/index.jsx

@@ -15,7 +15,7 @@ export default function MarketPlace({ commonHeadData }) {
   const marketData = jobLists?.result_list;
   const categories = jobLists?.categories;
   const image_server = jobLists?.session_image_server;
-  console.log('Lenth', marketData?.length )
+  // console.log('Lenth', marketData?.length )
 
   useEffect(()=>{
     if(!jobLists.loading && (marketData?.length < 1 || !marketData)){

src/components/MyWallet/VirtualCardAction.jsx

@@ -0,0 +1,60 @@
+import React, { useEffect, useState } from "react";
+import usersService from "../../services/UsersService";
+import ConfirmNairaWithdraw from "./Popup/ConfirmNairaWithdraw";
+import NairaWithdraw from "./Popup/NairaWithdraw";
+import ViewVirtualCardPopout from "./walletvirtual/ViewVirtualCardPopout";
+import WalletExtraActionBtn from "./WalletExtraActionBtn";
+
+function VirtualCardAction({ walletItem, payment }) {
+
+  // virtual add card popout
+  const [popup, setPopup] = useState({ show: false, name: '', data: {} }); 
+
+    /*OPENS the virtual add card popout*/
+  const openPopUp = (name, value) => {
+    setPopup({
+      show: true,
+      name: name,
+      data: { ...value },
+    });
+  };
+
+  /*Closes the virtual add card popout*/
+  const closePopUp = () => {
+    setPopup({ show: false, name: '', data: {} });
+    // dispatch(tableReload({ type: "WALLETTABLE" }));
+  };
+
+  return (
+    <div className="counters w-full flex justify-end gap-2">
+
+      {/* EXTRA ACTIONS BTN */}
+      <div className="w-1/2 flex justify-end items-center">
+        <button
+          className="logout-btn btn-gradient text-white"
+          onClick={() => {
+            openPopUp('view_card',{
+              payment: payment,
+              currency: walletItem?.description,
+            });
+          }}
+        >
+          View Card
+        </button>
+      </div>
+
+      {/* VIRTUAL CARD POPOUT */}
+      {(popup.show && popup.name=='view_card') && (
+        <ViewVirtualCardPopout
+          details={popup.data}
+          walletItem={walletItem}
+          onClose={closePopUp}
+          situation={popup.show}
+        />
+      )}
+
+    </div>
+  );
+}
+
+export default VirtualCardAction;

src/components/MyWallet/WalletBox.jsx

@@ -1,7 +1,6 @@
-import { useSelector } from "react-redux";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
 import WalletItemCard from "./WalletItemCard";
-import WalletItemCardVirtual from './walletvirtual/WalletItemCardVirtual'
+import WalletItemCardVirtual from './walletvirtual/WalletItemCardVirtual';
 
 /**
  * Renders a list of wallet items or a loading spinner depending on the state of the `wallet` object.

src/components/MyWallet/WalletComponent/ReferralTable.jsx

@@ -31,7 +31,10 @@ function ReferralTable({ history }) {
             currentReferral.map((item, index) => (
               <tr key={index} className="text-slate-500">
                 <td className="p-3">
-                  {item.added_date} / {item.firstname} {item.lastname}
+                 <div style={{flexDirection: "column"}} >
+                     <div style={{color: "blue"}}>{item.added_date} </div>
+                     <div>{item.firstname} {item.lastname}</div>
+                 </div>
                 </td>
                 <td className="p-3">{item.email}</td>
                 <td className="p-3">{item.status}</td>

src/components/MyWallet/WalletItemCard.jsx

@@ -1,11 +1,11 @@
 import React, { useState } from "react";
-import { useDispatch, useSelector } from "react-redux";
+import { useDispatch } from "react-redux";
 // import background from "../../assets/images/bg-sky-blue.jpg"; //shape/balance-bg.svg";
-import localImgLoad from "../../lib/localImgLoad";
 import { tableReload } from "../../store/TableReloads";
 import { PriceFormatter } from "../Helpers/PriceFormatter";
 import CreditPopup from "./Popup/CreditPopup";
 import WalletAction from "./WalletAction";
+import VirtualCardAction from "./VirtualCardAction";
 
 /**
  * Renders a card displaying information about a wallet item.
@@ -59,7 +59,7 @@ export default function WalletItemCard({ walletItem, payment, countries }) {
           </div> */}
           <div className="balance w-full mt-2 flex justify-end">
             <div className="flex flex-col items-center">
-              <p className="text-base sm:text-lg text-white tracking-wide mb-2 sm:mb-6">
+              <p className={`${(walletItem?.brand && walletItem?.card_last4) && 'hidden' } text-base sm:text-lg text-white tracking-wide mb-2 sm:mb-6`}>
                 Current Balance
               </p>
               {walletItem?.brand && walletItem?.card_last4 ? // FOR VIRTUAL CARD NUMBER ELSE WALLET BALANCE DISPLAY
@@ -80,7 +80,7 @@ export default function WalletItemCard({ walletItem, payment, countries }) {
           </div>
         </div>
         
-        {walletItem.escrow > 0 ? 
+        {walletItem.escrow > 0 & (!walletItem?.brand && !walletItem?.card_last4 ) ? 
         <div className='w-full flex justify-end'>
           <p className="text-lg text-white tracking-wide flex justify-center items-center gap-8">
             HOLDINGS :{" "}
@@ -98,6 +98,7 @@ export default function WalletItemCard({ walletItem, payment, countries }) {
         null
         }
 
+        {(!walletItem?.brand || !walletItem?.card_last4) ?
         <div className='w-full'>
           <div className="w-full h-[1px] mb-2 bg-white"></div>
           <WalletAction
@@ -106,6 +107,16 @@ export default function WalletItemCard({ walletItem, payment, countries }) {
             openPopUp={openPopUp}
           />
         </div>
+        :
+        <div className='w-full'>
+          <div className="w-full h-[1px] mb-2 bg-white"></div>
+          <VirtualCardAction
+            walletItem={{ ...walletItem, walletCountry: currentWalletCurrency }}
+            payment={payment}
+          />
+        </div>
+        }
+
       </div>
 
       {creditPopup.show && (

src/components/MyWallet/walletvirtual/ViewVirtualCardPopout.jsx

@@ -0,0 +1,221 @@
+import { useEffect, useState } from "react";
+import { Form, Formik } from "formik";
+import * as Yup from "yup";
+import { useSelector } from "react-redux";
+import ModalCom from "../../Helpers/ModalCom";
+import LoadingSpinner from "../../Spinners/LoadingSpinner";
+import CustomTimer from "../../countdown/CustomTimer";
+import InputCom from '../../Helpers/Inputs/InputCom'
+import usersService from "../../../services/UsersService";
+
+
+const validationSchema = Yup.object().shape({
+
+  country: Yup.string()
+    .required("Required"),
+  phone_number: Yup.string()
+    .min(9, "Invalid")
+    .max(11, "Invalid")
+    .required("Required"),
+  address: Yup.string()
+    .min(5, "Min 3 characters")
+    .max(50, "Max 25 characters")
+    .required("Required"),
+  city: Yup.string()
+    .min(2, "Min 3 characters")
+    .max(25, "Max 25 characters")
+    .required("Required"),
+  state: Yup.string()
+    .required("Required"),
+  zipCode: Yup.string()
+    .min(1, "Min 3 characters")
+    .max(8, "Max 8 characters")
+    .required("Required"),
+  dob: Yup.string()
+    .required("Required"),
+  checked: Yup.bool() // use bool instead of boolean
+    .oneOf([true], "You must accept the terms and conditions")
+});
+
+const ViewVirtualCardPopout = ({ details, onClose, situation, walletItem }) => {
+
+  const { userDetails } = useSelector((state) => state.userDetails);
+
+  const countryCode = walletItem?.country
+
+  const userApi = new usersService()
+
+  const [requestStatus, setRequestStatus] = useState({loading: false, status:false, message: ''})
+  
+  let initialValues = {
+    // initial values for formik
+    country: countryCode ? countryCode : '',
+    phone_number: '',
+    email: userDetails?.email,
+    firstname: userDetails?.firstname,
+    lastname: userDetails?.lastname,
+    birthYear: '',
+    birthMonth: '',
+    birthDay: '',
+    address: '',
+    city: userDetails?.city ? userDetails.city : '',
+    state: '',
+    zipCode: '',
+    dob: '',
+    checked: false
+  };
+
+  
+  const handleSubmit = (values) => {
+    let date = new Date(values.dob)
+    const reqData = {
+      request_type: '100',
+      address: values.address,
+      city: values.city,
+      state: values.state,
+      country: values.country,
+      postal_code: values.zipCode,
+      phone_number: values.phone_number,
+      // dob_day: values.birthDay,
+      // dob_month: values.birthMonth,
+      // dob_year: values.birthYear,
+      dob_day: Number(date.getDate()),
+      dob_month: Number(date.getMonth()) + 1,
+      dob_year: Number(date.getFullYear()),
+      dob: values.dob
+    }
+    // console.log('Values', reqData)
+    setRequestStatus({loading: true, status:false, message: ''})
+    userApi.walletCardRequest(reqData).then(res => {
+      if(res?.data?.internal_return < 0){
+        setRequestStatus({loading: false, status:false, message: 'Failed, try again'})
+        setTimeout(()=>{
+          setRequestStatus({loading: false, status:true, message: ''})
+        },4000)
+        return 
+      }
+      setRequestStatus({loading: false, status:true, message: 'Successful'})
+      setTimeout(()=>{
+        setRequestStatus({loading: false, status:true, message: ''})
+        onClose()
+      },4000)
+    }).catch(err => {
+      console.log('ERR', err)
+      setRequestStatus({loading: false, status:false, message: 'Unable to complete'})
+      setTimeout(()=>{
+        setRequestStatus({loading: false, status:false, message: ''})
+      },4000)
+    })
+  }
+
+  useEffect(()=>{
+      // Get Country Api
+    console.log('ok')
+  },[])
+
+  return (
+    <ModalCom
+      action={onClose}
+      situation={situation}
+    >
+      <Formik
+        initialValues={initialValues}
+        validationSchema={validationSchema}
+        onSubmit={handleSubmit}
+      >
+        {(props) => (
+          <div className="logout-modal-wrapper mx-auto w-[90%] md:w-[768px] h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
+            <Form className="w-full">
+              <div className="modal-header-con">
+                <h1 className="modal-title">
+                  {walletItem?.description}
+                </h1>
+                <button
+                  type="button"
+                  className="modal-close-btn"
+                  onClick={onClose}
+                >
+                  <svg
+                    width="36"
+                    height="36"
+                    viewBox="0 0 36 36"
+                    fill="none"
+                    className="fill-current"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M36 16.16C36 17.4399 36 18.7199 36 20.0001C35.7911 20.0709 35.8636 20.2554 35.8385 20.4001C34.5321 27.9453 30.246 32.9248 22.9603 35.2822C21.9006 35.6251 20.7753 35.7657 19.6802 35.9997C18.4003 35.9997 17.1204 35.9997 15.8401 35.9997C15.5896 35.7086 15.2189 35.7732 14.9034 35.7093C7.77231 34.2621 3.08728 30.0725 0.769671 23.187C0.435002 22.1926 0.445997 21.1199 0 20.1599C0 18.7198 0 17.2798 0 15.8398C0.291376 15.6195 0.214408 15.2656 0.270759 14.9808C1.71321 7.69774 6.02611 2.99691 13.0428 0.700951C14.0118 0.383805 15.0509 0.386897 15.9999 0C17.2265 0 18.4532 0 19.6799 0C19.7156 0.124041 19.8125 0.136067 19.9225 0.146719C27.3 0.868973 33.5322 6.21922 35.3801 13.427C35.6121 14.3313 35.7945 15.2484 36 16.16ZM33.011 18.0787C33.0433 9.77105 26.3423 3.00309 18.077 2.9945C9.78479 2.98626 3.00344 9.658 2.98523 17.8426C2.96667 26.1633 9.58859 32.9601 17.7602 33.0079C26.197 33.0577 32.9787 26.4186 33.011 18.0787Z"
+                      fill=""
+                      fillOpacity="0.6"
+                    />
+                    <path
+                      d="M15.9309 18.023C13.9329 16.037 12.007 14.1207 10.0787 12.2072C9.60071 11.733 9.26398 11.2162 9.51996 10.506C9.945 9.32677 11.1954 9.0811 12.1437 10.0174C13.9067 11.7585 15.6766 13.494 17.385 15.2879C17.9108 15.8401 18.1633 15.7487 18.6375 15.258C20.3586 13.4761 22.1199 11.7327 23.8822 9.99096C24.8175 9.06632 26.1095 9.33639 26.4967 10.517C26.7286 11.2241 26.3919 11.7413 25.9133 12.2178C24.1757 13.9472 22.4477 15.6855 20.7104 17.4148C20.5228 17.6018 20.2964 17.7495 20.0466 17.9485C22.0831 19.974 24.0372 21.8992 25.9689 23.8468C26.9262 24.8119 26.6489 26.1101 25.4336 26.4987C24.712 26.7292 24.2131 26.3441 23.7455 25.8757C21.9945 24.1227 20.2232 22.3892 18.5045 20.6049C18.0698 20.1534 17.8716 20.2269 17.4802 20.6282C15.732 22.4215 13.9493 24.1807 12.1777 25.951C11.7022 26.4262 11.193 26.7471 10.4738 26.4537C9.31345 25.9798 9.06881 24.8398 9.98589 23.8952C11.285 22.5576 12.6138 21.2484 13.9387 19.9355C14.5792 19.3005 15.2399 18.6852 15.9309 18.023Z"
+                      fill="#"
+                      fillOpacity="0.6"
+                    />
+                  </svg>
+                </button>
+              </div>
+              <div className='h-[22rem]'></div>
+              {requestStatus.message &&
+              <div className='px-4 my-1'>
+                <p className={`text-center text-base py-1 font-bold ${requestStatus.status ? 'bg-emerald-600 text-white' : 'bg-red-100 text-red-600'}`}>{requestStatus.message}</p>
+              </div>
+              }
+              <div className="modal-footer-wrapper grid grid-cols-1 xxs:grid-cols-3">
+                  <div className="w-full col-span-1 xxs:col-span-2 xxs:col-start-2 flex justify-between items-center">
+                      <button
+                      type="button"
+                      onClick={onClose}
+                      className="custom-btn bg-[#f5a430] text-black text-base"
+                      >
+                      Cancel
+                      </button>
+
+                      <>
+                      {requestStatus.loading ?
+                      <LoadingSpinner size="6" color="sky-blue" />
+                      :
+                      <button
+                      type="submit"
+                      className="custom-btn btn-gradient text-base text-white"
+                      disabled={requestStatus.loading || requestStatus.status}
+                      >
+                      Continue
+                      </button>
+                      }
+                      </>
+                  </div>
+              </div>
+            </Form>
+          </div>
+        )}
+      </Formik>
+    </ModalCom>
+  );
+};
+
+export default ViewVirtualCardPopout;
+
+
+
+const day = new Array(31).fill(0).map((_,i) => i+1 )
+
+const month = [
+  {value: 1, name: 'January'},
+  {value: 2, name: 'February'},
+  {value: 3, name: 'March'},
+  {value: 4, name: 'April'},
+  {value: 5, name: 'May'},
+  {value: 6, name: 'June'},
+  {value: 7, name: 'July'},
+  {value: 8, name: 'August'},
+  {value: 9, name: 'September'},
+  {value: 10, name: 'October'},
+  {value: 11, name: 'November'},
+  {value: 12, name: 'December'},
+]
+
+const date = new Date().getFullYear()
+
+const year = new Array(100).fill(0).map((_,i) =>  (date-2) - i+1 )

src/components/Partials/Default.jsx

@@ -6,6 +6,8 @@ import axios from 'axios'
 function Default({ children }) {
   const location = useLocation()
 
+  const [nocache, setNoCache] = useState(false) // holds cache/nocache value
+
   // dark mode setup
   const [theme, setTheme] = useState(null);
 
@@ -16,6 +18,10 @@ function Default({ children }) {
   const queryParams = new URLSearchParams(location?.search);
   const country = queryParams.get("cnt")?.toUpperCase();
 
+  const handleThemeSwitch = () => {
+    setTheme(theme === "dark" ? "light" : "dark");
+  };
+
   const getLocation = () => {
     if (navigator.geolocation) {
       navigator.geolocation.getCurrentPosition(
@@ -58,10 +64,6 @@ function Default({ children }) {
     }
   }, [theme]);
 
-  const handleThemeSwitch = () => {
-    setTheme(theme === "dark" ? "light" : "dark");
-  };
-
   useEffect(()=>{
     if(country){
       setCountryMode(country)
@@ -75,7 +77,7 @@ function Default({ children }) {
 
   return (
     <>
-      <DarkModeContext.Provider value={{ theme, handleThemeSwitch, countryMode }}>
+      <DarkModeContext.Provider value={{ theme, handleThemeSwitch, countryMode, nocache, setNoCache }}>
         {children && children}
       </DarkModeContext.Provider>
     </>

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/components/Partials/RightSideBar.jsx

@@ -86,7 +86,7 @@ export default function RightSideBar({ myJobList }) {
                 <div className="item flex space-x-3 items-center">
                   {/* image */}
                   <div className="w-8 h-8 rounded-full flex items-center justify-center">
-                    <Icons name="pending-job" />
+                    <img src={localImgLoad('images/icons/waiting.svg')} alt='refer a friend' />
                   </div>
                   {/* name */}
                   <div>
@@ -99,29 +99,7 @@ export default function RightSideBar({ myJobList }) {
                 <div className="item flex space-x-3 items-center">
                   {/* image */}
                   <div className="w-8 h-8 rounded-full">
-                    <svg
-                      xmlns="http://www.w3.org/2000/svg"
-                      viewBox="0 0 24 24"
-                      id="add-user"
-                    >
-                      <path
-                        fill="#9bcb5b"
-                        d="M12 13.4c-2 0-3.7-1.6-3.7-3.6s1.6-3.7 3.6-3.7 3.7 1.6 3.7 3.6-1.6 3.6-3.6 3.7zm0-6.2c-1.4 0-2.6 1.1-2.6 2.6 0 1.4 1.1 2.6 2.6 2.6s2.6-1.1 2.6-2.6c-.1-1.5-1.2-2.6-2.6-2.6z"
-                      ></path>
-                      <path
-                        fill="#9bcb5b"
-                        d="M16.6 17.9c-.3 0-.5-.2-.6-.5 0-2.2-1.8-4-4-4s-4 1.8-4 4c0 .3-.3.5-.6.5-.2 0-.4-.2-.5-.5 0-2.8 2.3-5.1 5.1-5.1s5.1 2.3 5.1 5.1c0 .3-.2.5-.5.5z"
-                      ></path>
-                      <path
-                        fill="#0376bc"
-                        d="M12 23.7C5.5 23.7.3 18.4.3 12 .3 5.5 5.6.3 12 .3c2.6 0 5.1.9 7.2 2.5.2.2.2.6 0 .8-.2.2-.4.2-.7.1-1.9-1.4-4.1-2.2-6.5-2.2C6.2 1.4 1.4 6.2 1.4 12S6.2 22.6 12 22.6 22.6 17.8 22.6 12c0-2.4-.8-4.6-2.2-6.5-.2-.3-.1-.6.2-.8.2-.1.5-.1.7.1 1.6 2 2.5 4.6 2.4 7.2 0 6.4-5.3 11.7-11.7 11.7z"
-                      ></path>
-                      <circle cx="20.2" cy="20.3" r="2.4" fill="#fff"></circle>
-                      <path
-                        fill="#9bcb5b"
-                        d="M18 18.1c.6-.6 1.4-.9 2.2-.9.8 0 1.6.3 2.2.9s1 1.4.9 2.2c0 .8-.3 1.6-.9 2.2s-1.4 1-2.2.9c-.8 0-1.6-.3-2.2-.9s-1-1.4-.9-2.2c-.1-.8.3-1.7.9-2.2zm3.8 2.5V20h-1.3v-1.3h-.6V20h-1.3v.6h1.3v1.3h.6v-1.3h1.3z"
-                      ></path>
-                    </svg>
+                    <img src={localImgLoad('images/icons/refer-a-friend.svg')} alt='refer a friend' />
                   </div>
                   {/* name */}
                   <div>
@@ -157,32 +135,7 @@ export default function RightSideBar({ myJobList }) {
             <div className="item flex space-x-3 items-center">
               {/* image */}
               <div className="w-8 h-8 rounded-full">
-                <svg
-                  xmlns="http://www.w3.org/2000/svg"
-                  viewBox="0 0 48 48"
-                  id="InternationalUser"
-                >
-                  <path
-                    fill="#e6e7f9"
-                    d="M38.5 31.1c2.1-1.1 3.9-2.5 5.4-4.4h-3.2c-.6 1.6-1.3 3.1-2.2 4.4zm-5.8 1.4c2-.7 3.7-2.8 4.9-5.8h-4.9v5.8zm8.8-8.6h4.2c.9-1.8 1.5-3.7 1.7-5.8h-5.1c-.1 2-.4 4-.8 5.8zm2.4-17.3c-1.5-1.8-3.3-3.3-5.4-4.4.8 1.2 1.6 2.7 2.2 4.4h3.2zm-5.3 2.9h-5.9v5.8h6.7c-.1-2.1-.4-4.1-.8-5.8zm3.7 5.8h5.1c-.2-2.1-.8-4-1.7-5.8h-4.2c.4 1.8.7 3.7.8 5.8zM32.7.8v5.8h4.9c-1.2-2.9-2.9-5.1-4.9-5.8zm6.7 17.3h-6.7v5.8h5.9c.4-1.8.7-3.8.8-5.8zM25 6.6h4.9V.8c-2 .7-3.7 2.9-4.9 5.8zm-1.8 8.7h6.7V9.5H24c-.4 1.7-.7 3.7-.8 5.8zm6.7 17.2v-5.8H25c1.2 3 2.9 5.1 4.9 5.8zM24.1 2.3c-2.1 1.1-3.9 2.5-5.4 4.4H22c.5-1.7 1.3-3.2 2.1-4.4zM24 23.9h5.9v-5.8h-6.7c.1 2 .4 4 .8 5.8z"
-                    className="colorc1e5ff svgShape"
-                  ></path>
-                  <path
-                    fill="#ff6699"
-                    d="M3.7 44.7c0 1.6 1.2 2.8 2.8 2.8 1.3 0 2.4-.9 2.7-2.2.3 1.3 1.4 2.2 2.7 2.2 1.5 0 2.8-1.3 2.8-2.8V30.1h3.1V18.8c0-4.2-3.3-7.5-7.4-7.5H8c-4.1 0-7.4 3.4-7.4 7.5v11.3h3.1v14.6z"
-                    className="colorff99b0 svgShape"
-                  ></path>
-                  <path
-                    fill="#998da0"
-                    d="M9.2 10.3c2.4 0 4.4-2.2 4.4-4.9S11.6.5 9.2.5C6.8.5 4.8 2.7 4.8 5.4s2 4.9 4.4 4.9z"
-                    className="colorffd499 svgShape"
-                  ></path>
-                  <path
-                    fill="#e6e7f9"
-                    d="M16.9 9.5c-.3.6-.5 1.2-.8 1.8 1.3 1 2.3 2.4 2.9 4h1.3c.1-2 .3-4 .8-5.8h-4.2zm2.9 9.3v5.1h1.4c-.4-1.8-.7-3.8-.8-5.8h-.6c-.1.2 0 .4 0 .7zm2.2 7.9h-2.2v1.2c1.3 1.3 2.7 2.4 4.4 3.2-.9-1.3-1.7-2.8-2.2-4.4z"
-                    className="colorc1e5ff svgShape"
-                  ></path>
-                </svg>
+                <img src={localImgLoad('images/icons/resources.svg')} alt='refer a friend' />
               </div>
               {/* name */}
               <div>

src/components/Referral/ReferralDisplay.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import { toast } from "react-toastify";
+// import { toast } from "react-toastify";
 import usersService from "../../services/UsersService";
 import InputCom from "../Helpers/Inputs/InputCom";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
@@ -74,7 +74,7 @@ function ReferralDisplay() {
   };
 
   //FUNCTION TO SEND REFERRAL MESSAGE
-  const sendReferralMsg = (postData) => {
+  const sendReferralMsg = (postData, helpers) => {
     apiCall
       .sendReferralMsg(postData)
       .then((res) => {
@@ -84,11 +84,17 @@ function ReferralDisplay() {
             loading: false,
             status: false,
           });
-          return;
+          setTimeout(()=>{
+            setError({ message: '', loading: false, status: false });
+          },3000)
         } else {
-          toast.success(res.data.status | "Message Sent!");
-          setError({ message: "", loading: false, status: true });
+          // toast.success(res.data.status | "Message Sent!");
+          setError({ message: res.data.status, loading: false, status: true });
+          helpers.resetForm() // resets the form data
           setRefHistoryReload((prev) => !prev);
+          setTimeout(()=>{
+            setError({ message: '', loading: false, status: true });
+          },3000)
         }
       })
       .catch((error) => {
@@ -97,13 +103,16 @@ function ReferralDisplay() {
           loading: false,
           status: false,
         });
+        setTimeout(()=>{
+          setError({ message: '', loading: false, status: false });
+        },3000)
       });
   };
 
   //FUNCTION TO HANDLE SUBMIT
   const handleSubmit = (values, helpers) => {
     setError({ message: "", loading: true, status: false });
-    sendReferralMsg({...values}); // FUNCTION TO SEND REFERRAL MESSAGE
+    sendReferralMsg({...values}, helpers); // FUNCTION TO SEND REFERRAL MESSAGE
   };
 
   const [selectedTab, setSelectedTab] = useState("Send Referral");
@@ -228,7 +237,7 @@ function ReferralDisplay() {
 
                       <hr />
                       {error.message != "" && (
-                        <p className="text-base text-red-500 py-2">{error.message}</p>
+                        <p className={`text-base py-2 ${error.status ? 'text-emerald-500' : 'text-red-500'}`}>{error.message}</p>
                       )}
                       <div className="referral-btn flex justify-end items-center py-4">
                         {error.loading ? (
@@ -237,6 +246,7 @@ function ReferralDisplay() {
                           <button
                             type="submit"
                             className="px-2 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                            disabled={error.loading || error.status}
                           >
                             Send Message
                           </button>
@@ -251,9 +261,12 @@ function ReferralDisplay() {
             {selectedTab == 'Referral List' &&
               <>
                 <div className="w-full p-4">
-                  <h2 className="mb-2 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium">
-                    Referral List
-                  </h2>
+                  <div className='mb-2 flex flex-wrap gap-4 items-center'>
+                    <h2 className="text-slate-900 dark:text-white text-xl lg:text-2xl font-medium">
+                      Referral List
+                    </h2>
+                    <p className='text-slate-900 dark:text-white text-sm lg:text-base'>Uncompleted signup will be removed automatically after 7 days</p>
+                  </div>
                   {referralList.loading ? (
                     <LoadingSpinner size="22" color="sky-blue" />
                   ) : (

src/components/jobPopout/EditJobPopoutNew.jsx

@@ -294,7 +294,7 @@ const EditJobPopoutNew = ({
                                     className="job-label"
                                     htmlFor="timeline_days"
                                 >
-                                    Timeline -
+                                    Delivery Timeline -
                                     {/* <span className="w-full text-center text-green-700 text-sm tracking-wide">
                                     Expected duration of this task
                                     </span> */}

src/components/jobPopout/PendingJobsPopout.jsx

@@ -225,11 +225,17 @@ function PendingJobsPopout({ details, onClose, situation }) {
               />
             </div>
 
-            <div className="my-2 md:flex">
-              <Detail
+            <div className="my-2">
+              {/* <Detail
                 label="Detail"
                 value={details.job_description || details.description}
-              />
+              /> */}
+              <>
+                  <label className='job-label w-full'>Detail</label>
+                  <p className={`p-1 w-full text-sm text-slate-900 dark:text-white overflow-y-auto min-h-[100px]`}>
+                    {details.job_description || details.description}
+                  </p>
+              </>
             </div>
           </div>
 

src/components/jobPopout/popoutcomponent/AssignToPublic.jsx

@@ -70,14 +70,14 @@ export default function AssignToPublic({
                 </div>
                 
                 <div className='mb-3 w-full flex flex-col xxs:flex-row items-center gap-1'>
-                    <label className='w-full xxs:max-w-[120px] xxs:text-right'>Duration:</label>
+                    <label className='w-full xxs:max-w-[120px] xxs:text-right'>Available for:</label>
                     <div className='w-full'>
                         <JobFieldInput
                         select={true}
                         inputName="public"
                         value={props?.values.public}
                         data={publicArray}
-                        optionText="Select Duration"
+                        optionText="Select Availability"
                         parentClass="w-full flex flex-col gap-4"
                         inputClass={(props.errors.public && props.touched.public) && 'border-red-500 dark:border-red-500'}
                         />

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/index.js

@@ -1,4 +1,4 @@
-import React from "react";
+import React ,{Suspense} from "react";
 import ReactDOM from "react-dom/client";
 import { Provider } from "react-redux";
 import { BrowserRouter } from "react-router-dom";
@@ -13,7 +13,9 @@ ReactDOM.createRoot(root).render(
   <BrowserRouter>
     <Provider store={store}>
       <GoogleOAuthProvider clientId={process.env.REACT_APP_GOOGLE_CLIENT_ID}>
-        <App />
+          <Suspense>
+              <App />
+          </Suspense>
       </GoogleOAuthProvider>
     </Provider>
   </BrowserRouter>

src/lib/apiConst.js

@@ -59,6 +59,7 @@ export const apiConst = {
     WRENCHBOARD_RESET_PASSWORD: 11013 ,
     WRENCHBOARD_ACCOUNT_JOBLIST:11014 ,
     WRENCHBOARD_VERIFY_PENDING_LINK: 11015,
+    WRENCHBOARD_LOAD_REFERLINK: 11072,
     WRENCHBOARD_ACCOUNT_RESETPASS: 11016,
     WRENCHBOARD_ACCOUNT_SETPASSWD: 11017,
     WRENCHBOARD_DELETE_PENDING_LINK: 11018,

src/middleware/AuthRoute.jsx

@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useState, useContext } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import { Navigate, Outlet, useNavigate } from "react-router-dom";
 import LoadingSpinner from "../components/Spinners/LoadingSpinner";
@@ -15,16 +15,20 @@ import { familyBannersList } from "../store/FamilyBannerList";
 import { familyResources } from "../store/FamilyResources";
 import {familyWalletRedeemOptList} from '../store/FamilyWalletRedeemOpt'
 import { SocketValues } from "../components/Contexts/SocketIOContext";
+import DarkModeContext from '../components/Contexts/DarkModeContext'
 
 const AuthRoute = ({ redirectPath = "/login", children }) => {
 
   let {joinRoom} = SocketValues() // destructures 'SEND MESSAGE' and 'JOIN ROOM' FUNCTIONS FROM SOCKET
 
+  // const [nocache, setNoCache] = useState(false) // holds cache/nocache value
+
+  const {nocache, setNoCache} = useContext(DarkModeContext); // Destructures nocache and set nocache from context API
+
   const apiCall = useMemo(() => new usersService(), []);
   const dispatch = useDispatch();
   const [lastActivityTime, setLastActivityTime] = useState(Date.now());
   const [isLogin, setIsLogin] = useState({ loading: true, status: false });
-  const [loadProfileDetails, setLoadProfileDetails] = useState([]);
   const navigate = useNavigate();
 
   const { jobListTable, marketTableList, walletTable, familyBannersListTable, homeBanners } = useSelector(
@@ -46,19 +50,12 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
     };
 
     const checkInactivity = setInterval(() => {
-      let { account_type } = loadProfileDetails;
       if (account_type === "FAMILY") {
-        if (
-          Date.now() - lastActivityTime >
-          process.env.REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY
-        ) {
+        if (Date.now() - Number(lastActivityTime) > Number(process.env.REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY)) {
           expireSession();
         }
       } else {
-        if (
-          Date.now() - lastActivityTime >
-          process.env.REACT_APP_SESSION_EXPIRE_MINUTES
-        ) {
+        if (Date.now() - Number(lastActivityTime) > Number(process.env.REACT_APP_SESSION_EXPIRE_MINUTES)) {
           expireSession();
         }
       }
@@ -68,7 +65,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
     return () => {
       clearInterval(checkInactivity);
     };
-  }, [lastActivityTime, navigate]);
+  }, [lastActivityTime, navigate, isLogin.status]);
 
   // Reset last activity time on user input
   const resetTime = useCallback(() => {
@@ -93,13 +90,13 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
         apiCall
           .loadProfile()
           .then((res) => {
-            if (res?.data?.internal_return < 0) {
+            if (!res?.data) {
               setIsLogin({ loading: false, status: false });
               return;
             }
-            setLoadProfileDetails(res.data);
             dispatch(updateUserDetails({ ...res.data }));
             setIsLogin({ loading: false, status: true });
+            setNoCache(true) // Sets no cache to true, so as to trigger nocache whenever used in api call
           })
           .catch((error) => {
             setIsLogin({ loading: false, status: false });
@@ -108,24 +105,26 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
       loadProfile();
     }else{
       setIsLogin({ loading: false, status: true });
+      setNoCache(true) // Sets no cache to true, so as to trigger nocache whenever used in api call
     }
   }, []);
 
   //FUNCTION TO GET COMMON HEAD DATA
   useEffect(() => {
-    if((!loggedIn && !isLogin.status) || account_type == 'FAMILY'){  // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FAMILY
+    if((!loggedIn && !isLogin.status) || isLogin.loading || account_type == 'FAMILY'){  // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FAMILY
       return
     }
+      dispatch(commonHeadBanner({loading:true, data:{}}));
       apiCall
         .getHeroJBanners()
         .then((res) => {
           if (res?.data?.internal_return < 0) {
             return;
           }
-          dispatch(commonHeadBanner(res.data));
+          dispatch(commonHeadBanner({loading:false, data:res.data}));
         })
         .catch((error) => {
-          // console.log("ERROR ", error);
+          dispatch(commonHeadBanner({loading:false, data:{}}));
         });
   }, [isLogin.status, homeBanners]);
 
@@ -140,8 +139,6 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
             dispatch(updateNotifications({ loading: false, data: null }));
             return;
           }
-          setLoadProfileDetails(res.data);
-
           const _raw = res.data?.result_list;
 
           //Sort the notifications in ascending order based on the API time
@@ -192,7 +189,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
   }, []);
 
   useEffect(() => {
-    if((!loggedIn && !isLogin.status) || account_type == 'FAMILY'){ // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FAMILY
+    if((!loggedIn && !isLogin.status) || isLogin.loading || account_type == 'FAMILY'){ // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FAMILY
       return
     }
     const getMyJobList = async () => {
@@ -213,7 +210,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
 
   //FUNCTION TO GET FULL USER WALLETS
   useEffect(() => {
-    if((!loggedIn && !isLogin.status) || account_type == 'FAMILY'){ // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FAMILY
+    if((!loggedIn && !isLogin.status) || isLogin.loading || account_type == 'FAMILY'){ // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FAMILY
       return
     }
     const getMyWalletList = async () => {
@@ -235,7 +232,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
 
   // FUNCTION TO GET MARKET JOB LIST
   useEffect(() => {
-    if((!loggedIn && !isLogin.status) || account_type == 'FAMILY'){ // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FAMILY
+    if((!loggedIn && !isLogin.status) || isLogin.loading || account_type == 'FAMILY'){ // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FAMILY
       return
     }
     // Getting market data
@@ -254,7 +251,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
 
   //FUNCTION TO GET COMMON HEAD DATA
   // useEffect(() => {
-  //   if((!loggedIn && !isLogin.status) || account_type == 'FAMILY'){ // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FAMILY
+  //   if((!loggedIn && !isLogin.status) || isLogin.loading || account_type == 'FAMILY'){ // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FAMILY
   //     return
   //   }
   //   apiCall
@@ -274,13 +271,16 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
 
   //FUNCTION TO GET FAMILY BANNERS
   useEffect(() => {
-    if((!loggedIn && !isLogin.status) || account_type == 'FULL'){  // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FULL
+    if((!loggedIn && !isLogin.status) || isLogin.loading || isLogin.loading || account_type == 'FULL'){  // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FULL
       return
     }
     const getFamilyBanners = async () => { // FUNCTION TO GET FAMILY BANNERS
       // setFamilyBannersList({loading:true, result:[]});
+      dispatch(familyBannersList({loading:true}))
+      const noCache = (isLogin.status && nocache )? 1 : 0
+      const reqData = {nocache: noCache}
       try {
-        const res = await apiCall.getFamilyBannersList();
+        const res = await apiCall.getFamilyBannersList(reqData);
         dispatch(familyBannersList({...res?.data, loading:false}))
       } catch (error) {
         dispatch(familyBannersList({loading:false}))
@@ -292,7 +292,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
 
   //FUNCTION TO GET FAMILY RESOURCES
   useEffect(() => {
-    if((!loggedIn && !isLogin.status) || account_type == 'FULL'){  // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FULL
+    if((!loggedIn && !isLogin.status) || isLogin.loading || account_type == 'FULL'){  // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FULL
       return
     }
     const getFamilyResourcesList = async () => { // FUNCTION TO GET FAMILY BANNERS
@@ -310,7 +310,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
 
   //FUNCTION TO GET FAMILY WALLET REDEEM OPTIONS
   useEffect(() => {
-    if((!loggedIn && !isLogin.status) || account_type == 'FULL'){  // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FULL
+    if((!loggedIn && !isLogin.status) || isLogin.loading || account_type == 'FULL'){  // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FULL
       return
     }
     const familyWalletRedeemOptions = async () => { // FUNCTION TO GET FAMILY WALLET REDDEM OPTIONS

src/middleware/SocketConnection.jsx

@@ -0,0 +1,11 @@
+import React from 'react'
+import SocketIOContextProvider from '../components/Contexts/SocketIOContext'
+import { Navigate, Outlet, useNavigate } from "react-router-dom";
+
+export default function SocketConnection() {
+  return (
+    <SocketIOContextProvider>
+      <Outlet />
+    </SocketIOContextProvider>
+  )
+}

src/services/UsersService.js

@@ -618,8 +618,8 @@ class usersService {
       uid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
-      offset: 1,
-      limit: 100,
+      offset: 0,
+      limit: 140,
       action: apiConst.WRENCHBOARD_ACCOUNT_REFFERHX,
     };
     return this.postAuxEnd("/refferhx", postData);
@@ -1032,6 +1032,14 @@ class usersService {
     return this.postAuxEnd("/verifysignuplink", reqData);
   }
 
+  loadRefer(reqData) { // GETS THE INFORMATION OF A USER REFERRED VIA PROMO
+    const postData = {
+      action: apiConst.WRENCHBOARD_LOAD_REFERLINK,
+      ...reqData
+    };
+    return this.postAuxEnd("/loadrefer", postData);
+  }
+
   // END POINT FOR OFFER RESPONSE (i.e TO ACCEPT, REJECT, CANCEL, ETC OFFER)
   offersResponse(reqData) {
     var postData = {
@@ -1396,7 +1404,7 @@ class usersService {
   }
 
   // API FUNCTION TO FAMILY BANNERS
-  getFamilyBannersList() {
+  getFamilyBannersList(reqData) {
     var postData = {
       uid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
@@ -1404,6 +1412,7 @@ class usersService {
       action: apiConst.WRENCHBOARD_ACCOUNT_FAMILY_BANNERS,
       limit: 20,
       offset: 1,
+      ...reqData
     };
     return this.postAuxEnd("/familybanners", postData);
   }
@@ -1686,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 ~~~~~~~~");

src/store/CommonHeadBanner.js

@@ -1,7 +1,7 @@
 import { createSlice } from "@reduxjs/toolkit";
 
 const initialState = {
-  commonHeadBanner: {}
+  commonHeadBanner: {loading:true, data:{}}
 };
 
 export const commonHeadBannerSlice = createSlice({

src/views/HomePages.jsx

@@ -1,27 +1,10 @@
-import {useState, useEffect} from 'react'
-import { useSelector } from "react-redux";
 import Home from "../components/Home";
 
 export default function HomePages() {
-  const { commonHeadBanner } = useSelector((state) => state.commonHeadBanner);
-
-  const [bannerOptions, setBannerOptions] = useState({})
-
-
-
-  useEffect(()=>{
-    const bannerOptions = {
-      bannerList: commonHeadBanner?.result_list,
-      dashTypes: commonHeadBanner?.home_dash_type,
-      offersList: commonHeadBanner?.offers_list,
-      imageServer: commonHeadBanner?.session_image_server
-    };
-    setBannerOptions(bannerOptions)
-  },[commonHeadBanner])
 
   return (
     <>
-      <Home {...bannerOptions} />
+      <Home />
     </>
   );
 }

src/views/InviteRefer.jsx

@@ -0,0 +1,78 @@
+import React, {useState, useEffect} from "react";
+import { useLocation } from "react-router-dom";
+import usersService from '../services/UsersService'
+
+import SignUp from "../components/AuthPages/SignUp/index2";
+import LoadingSpinner from '../components/Spinners/LoadingSpinner'
+import AuthLayout from '../components/AuthPages/AuthLayout2'
+
+function InviteRefer() {
+  const api = new usersService()
+
+  const location = useLocation();
+
+  const queryParams = new URLSearchParams(location?.search);
+  const refer_link = queryParams.get("refer_link")?.toUpperCase();
+
+  const [reload, setReload] = useState(false)
+
+  let [details, setDetails] = useState({loading:true, error:false, data:{}})
+
+  useEffect(()=>{
+    setDetails({loading:true, error:false, data:{}})
+    if(refer_link){
+      const reqData = {
+        refer_link: refer_link,
+        path: ''
+      }
+      api.loadRefer(reqData).then(res => {
+        if(res?.data?.internal_return < 0){
+          return setDetails({loading:false, error:true, data:{}})
+        }
+        setDetails({loading:false, error:false, data:res.data})
+      }).catch(err => {
+        setDetails({loading:false, error:true, data:{}})
+      })
+    }else{
+      setDetails({loading:false, error:false, data:{}})
+    }
+  },[reload])
+  return (
+    <>
+    {details.loading ?
+      <LoadingSpinner size="32" color="sky-blue" height="h-screen" />
+    : details.error ?
+      <AuthLayout>
+        <ErrorComponent onClick={()=>setReload(prev => !prev)} />
+      </AuthLayout>
+    :
+      <SignUp details={details.data} />
+    }
+    </>
+  );
+}
+
+export default InviteRefer;
+
+
+const ErrorComponent = ({ onClick }) => (
+  <div className="input-area">
+    <div className="my-5">
+      <p className="text-[14px] leading-[19px] text-center text-[#181c32]">
+        This error occurs because you have already verified this link or the
+        link has expired. Try login or reset password. If none worked, try to
+        create the account from the start.
+      </p>
+    </div>
+
+    <div className="signin-area flex justify-center mb-3.5">
+      <button
+        onClick={onClick}
+        type="button"
+        className={`rounded-[0.475rem] mb-6 text-[15px] font-semibold text-[#009ef7] hover:text-white flex justify-center bg-[#f1faff] hover:bg-[#009ef7] transition-all duration-300 items-center py-[0.8875rem] px-[1.81rem]`}
+      >
+        <span>Try Again</span>
+      </button>
+    </div>
+  </div>
+);

src/views/MyRefer.jsx

@@ -0,0 +1,17 @@
+import React, {useState, useEffect} from "react";
+import { useParams } from "react-router-dom";
+
+import SignUp from "../components/AuthPages/SignUp/index2";
+
+function MyRefer() {
+
+  const {refer_link} = useParams()
+
+  return (
+    <>
+      <SignUp refer_link={refer_link ? refer_link : ''} />
+    </>
+  );
+}
+
+export default MyRefer;

src/views/MyWalletPage.jsx

@@ -9,7 +9,7 @@ export default function MyWalletPage() {
 
   useEffect(()=>{
     let walletExist = wallet_available_status || localStorage.getItem('wallet_available_status')
-    console.log(walletExist)
+    // console.log(walletExist)
     if(account_type == 'FULL' && walletExist != 'WALLET_AVAILABLE'){
       navigate('/', {replace: true})
     }

src/views/OffersInterestPage.jsx

@@ -1,4 +1,4 @@
-import React, { useContext, useState, useEffect } from "react";
+import React, { useMemo, useState, useEffect } from "react";
 // import BlogItem from "../components/Blogs";
 import { useSelector } from "react-redux";
 import OffersInterest from "../components/OffersInterest";
@@ -15,7 +15,7 @@ export default function OffersInterestPage() {
 
     let {joinRoom} = SocketValues() // function to join room for socket
 
-    const apiCall = new usersService()
+    const apiCall = useMemo(()=> new usersService(),[]) 
 
     let {commonHeadBanner} = useSelector(state => state.commonHeadBanner)
 
@@ -28,11 +28,11 @@ export default function OffersInterestPage() {
             setOfferInterestList({loading: false, data: [], imgServer:''})
             console.log('Error: ', err)
         })
-    },[offerInterestListReload])
+    },[apiCall, offerInterestListReload])
 
     useEffect(()=>{
         joinRoom(`INTEREST-${userDetails?.uid}`)
-    },[])
+    },[joinRoom, userDetails])
 
     return (
         <>

src/views/PromoRefer.jsx

@@ -0,0 +1,78 @@
+import React, {useState, useEffect} from "react";
+import { useLocation } from "react-router-dom";
+import usersService from '../services/UsersService'
+
+import SignUp from "../components/AuthPages/SignUp/index2";
+import LoadingSpinner from '../components/Spinners/LoadingSpinner'
+import AuthLayout from '../components/AuthPages/AuthLayout2'
+
+function PromoRefer() {
+  const api = new usersService()
+
+  const location = useLocation();
+
+  const queryParams = new URLSearchParams(location?.search);
+  const refer_link = queryParams.get("refer_link")?.toUpperCase();
+
+  const [reload, setReload] = useState(false)
+
+  let [details, setDetails] = useState({loading:true, error:false, data:{}})
+
+  useEffect(()=>{
+    setDetails({loading:true, error:false, data:{}})
+    if(refer_link){
+      const reqData = {
+        refer_link: refer_link,
+        path: 'promoref'
+      }
+      api.loadRefer(reqData).then(res => {
+        if(res?.data?.internal_return < 0){
+          return setDetails({loading:false, error:true, data:{}})
+        }
+        setDetails({loading:false, error:false, data:res.data})
+      }).catch(err => {
+        setDetails({loading:false, error:true, data:{}})
+      })
+    }else{
+      setDetails({loading:false, error:false, data:{}})
+    }
+  },[reload])
+  return (
+    <>
+    {details.loading ?
+      <LoadingSpinner size="32" color="sky-blue" height="h-screen" />
+    : details.error ?
+      <AuthLayout>
+        <ErrorComponent onClick={()=>setReload(prev => !prev)} />
+      </AuthLayout>
+    :
+      <SignUp details={details.data} />
+    }
+    </>
+  );
+}
+
+export default PromoRefer;
+
+
+const ErrorComponent = ({ onClick }) => (
+  <div className="input-area">
+    <div className="my-5">
+      <p className="text-[14px] leading-[19px] text-center text-[#181c32]">
+        This error occurs because you have already verified this link or the
+        link has expired. Try login or reset password. If none worked, try to
+        create the account from the start.
+      </p>
+    </div>
+
+    <div className="signin-area flex justify-center mb-3.5">
+      <button
+        onClick={onClick}
+        type="button"
+        className={`rounded-[0.475rem] mb-6 text-[15px] font-semibold text-[#009ef7] hover:text-white flex justify-center bg-[#f1faff] hover:bg-[#009ef7] transition-all duration-300 items-center py-[0.8875rem] px-[1.81rem]`}
+      >
+        <span>Try Again</span>
+      </button>
+    </div>
+  </div>
+);

src/views/ResourcePage.jsx

@@ -1,22 +1,22 @@
-import React, { useState, useEffect } from "react";
+import React, { useCallback, useMemo, useState, useEffect } from "react";
 import Resources from "../components/Resources";
 import usersService from "../services/UsersService";
 import { useLocation } from "react-router-dom";
 export default function ResourcePage() {
-  const {state, pathname} = useLocation() // CHECKS IF THERE IS AN ACTIVE TAB WITH LINK BACK TO RESOURCES
+  const {state} = useLocation() // CHECKS IF THERE IS AN ACTIVE TAB WITH LINK BACK TO RESOURCES
   const [MyResourceData, setMyResourceData] = useState([]);
-  const api = new usersService();
-  const getMyResourceData = async () => {
-    try {
-      const res = await api.getResourceList();
-      setMyResourceData(res.data);
-    } catch (error) {
-      throw new Error("Error getting mode");
-    }
-  };
+  const api = useMemo(()=> new usersService(),[]);
+  const getMyResourceData = useCallback( async () => {
+      try {
+        const res = await api.getResourceList();
+        setMyResourceData(res.data);
+      } catch (error) {
+        throw new Error("Error getting mode");
+      }
+    },[api]) 
   useEffect(() => {
     getMyResourceData();
-  }, []);
+  }, [getMyResourceData]);
 
   return <Resources MyResourceData={MyResourceData} activeTab={state ? state.tab : ''} />;
 }

src/views/SignupPageTwo.jsx

@@ -1,4 +1,5 @@
 import React from "react";
+
 import SignUp from "../components/AuthPages/SignUp/index2";
 
 function SignupPageTwo() {
@@ -9,4 +10,4 @@ function SignupPageTwo() {
   );
 }
 
-export default SignupPageTwo;
+export default SignupPageTwo;