no cache handler added

.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"
@@ -22,7 +23,7 @@ REACT_APP_PRIMARY_SOCKET="https://socket-dev.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

.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_AUX_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/svs/user"
-#REACT_APP_USERS_ENDPOINT="https://apigate.orion.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_AUX_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
-REACT_APP_USERS_ENDPOINT="https://apigate.orion.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-dev.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_GOOGLE_REDIRECT_URL=http://localhost:9082/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
 
 #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://dev-media.wrenchboard.com'
 
 # FOR FAMILY GAME LINK
 REACT_APP_FAM_GAME_LINK='https://games.wrenchboard.com'
@@ -103,4 +98,4 @@ 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

.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

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

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",
+    "start": "react-scripts start -e .env.development",
-    "build": "react-scripts build -e .env.production",
+    "build": "GENERATE_SOURCEMAP=false react-scripts build -e .env.production",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
   },

public/manifest.json

@@ -1,6 +1,6 @@
 {
-  "short_name": "React App",
+  "short_name": "WrenchBoard App",
-  "name": "Create React App Sample",
+  "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 run build
-  npm start
+  # 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,81 @@
 import { Route, Routes } from "react-router-dom";
-import FourZeroFour from "./components/FourZeroFour";
+import { lazy } from "react";
-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 LoginPage from "./views/LoginPage";
-import LoginPageTwo from "./views/LoginPageTwo";
 import LoginLandingPage from './views/LoginLandingPage'
-import ManageActiveJobs from "./views/ManageActiveJobs";
+import LoginPage from "./views/LoginPage";
-import ManageInterestOfferPage from "./views/ManageInterestOfferPage";
+import SocketConnection from "./middleware/SocketConnection";
-import MarketPlacePage from "./views/MarketPlacePage";
+
-import MyActiveJobsPage from "./views/MyActiveJobsPage";
+const HomePages = lazy(() => import("./views/HomePages"));
-import MyCouponPage from "./views/MyCouponPage";
+const FourZeroFour = lazy(() => import("./components/FourZeroFour"));
-import MyJobsPage from "./views/MyJobsPage";
+const ScrollToTop = lazy(() => import("./components/Helpers/ScrollToTop"));
-import MyOffersPage from "./views/MyOffersPage";
+const StartJob = lazy(() => import("./components/MyJobs/StartJob"));
-import MyPastDueJobsPage from "./views/MyPastDueJobsPage";
+const Notification = lazy(() => import("./components/Notification"));
-import MyReviewDueJobsPage from "./views/MyReviewDueJobsPage";
+const AuthRoute = lazy(() => import("./middleware/AuthRoute"));
-import MyTaskPage from "./views/MyTaskPage";
+const AppDownloadPage = lazy(() => import("./views/AppDownloadPage"));
-import MyWaitingJobsPage from "./views/MyWaitingJobsPage";
+const AppleRedirectPage = lazy(() => import("./views/AppleRedirectPage"));
-import MyWalletPage from "./views/MyWalletPage";
+const AuthProfilePage = lazy(() => import("./views/AuthProfilePage"));
-import OffersInterestPage from "./views/OffersInterestPage";
+const AuthRedirect = lazy(() => import("./views/AuthRedirect"));
-import ReferralPage from "./views/ReferralPage";
+const BlogPage = lazy(() => import("./views/BlogPage"));
-import RemindersPage from "./views/RemindersPage";
+const FacebookRedirect = lazy(() => import("./views/FacebookRedirect"));
-import ResourcePage from "./views/ResourcePage";
+const FamilyManagePage = lazy(() => import("./views/FamilyManagePage"));
-import SavedPage from "./views/SavedPage";
+const FamilyMarketPage = lazy(() => import("./views/FamilyMarketPage"));
-import SellPage from "./views/SellPage";
+
-import SettingsPage from "./views/SettingsPage";
+const ForgotPasswordPages = lazy(()=> import("./views/ForgotPasswordPages"));
-import SignupPage from "./views/SignupPage";
+const ForgotPasswordPagesTwo = lazy(()=> import("./views/ForgotPasswordPagesTwo"));
-import SignupPageTwo from "./views/SignupPageTwo";
+const HistoryPage = lazy(()=> import("./views/HistoryPage"));
-import TrackingPage from "./views/TrackingPage";
+const JobGroupsPage = lazy(()=> import("./views/JobGroupsPage"));
-import UpdatePasswordPages from "./views/UpdatePasswordPages";
+const LndPage = lazy(()=> import("./views/LndPage"));
-import UpdatePasswordPagesTwo from "./views/UpdatePasswordPagesTwo";
+const LoginPageTwo = lazy(()=> import("./views/LoginPageTwo"));
-import UploadProductPage from "./views/UploadProductPage";
+const ManageActiveJobs = lazy(()=> import("./views/ManageActiveJobs"));
-import UserProfilePage from "./views/UserProfilePage";
+const ManageInterestOfferPage = lazy(()=> import("./views/ManageInterestOfferPage"));
-import VerifyLinkPages from "./views/VerifyLinkPages";
+const MarketPlacePage = lazy(()=> import("./views/MarketPlacePage"));
-import VerifyLinkPagesTwo from "./views/VerifyLinkPagesTwo";
+const MyActiveJobsPage = lazy(()=> import("./views/MyActiveJobsPage"));
-import VerifyPasswordPages from "./views/VerifyPasswordPages";
+const MyCouponPage = lazy(()=> import("./views/MyCouponPage"));
-import VerifyPasswordPagesTwo from "./views/VerifyPasswordPagesTwo";
+const MyJobsPage = lazy(()=> import("./views/MyJobsPage"));
-import VerifyYouPages from "./views/VerifyYouPages";
+const MyOffersPage = lazy(()=> import("./views/MyOffersPage"));
-import VerifyYouPagesTwo from "./views/VerifyYouPagesTwo";
+const MyPastDueJobsPage = lazy(()=> import("./views/MyPastDueJobsPage"));
-import YourPages from "./views/YourPage_";
+const MyReviewDueJobsPage = lazy(()=> import("./views/MyReviewDueJobsPage"));
-import ParentWaitingPage from "./views/ParentWaitingPage";
+const MyTaskPage = lazy(()=> import("./views/MyTaskPage"));
-import FamilyPendingOfferPage from "./views/FamilyPendingOfferPage";
+const MyWaitingJobsPage = lazy(()=> import("./views/MyWaitingJobsPage"));
-import FamBlogPage from "./views/FamBlogPage"
+const MyWalletPage = lazy(()=> import("./views/MyWalletPage"));
-import FamAIQuestionPage from "./views/FamAIQuestionPage"
+const OffersInterestPage = lazy(()=> import("./views/OffersInterestPage"));
-import FamMyFilesPage from "./views/FamMyFilesPage"
+const ReferralPage = lazy(()=> import("./views/ReferralPage"));
-import FamWorkInProgressPage from "./views/FamWorkInProgressPage";
+const RemindersPage = lazy(()=> import("./views/RemindersPage"));
-import MyPastDueTasksPage from "./views/MyPastDueTasksPage";
+const ResourcePage = lazy(()=> import("./views/ResourcePage"));
-import FamilyWalletPage from "./views/FamilyWalletPage";
+const SettingsPage = lazy(()=> import("./views/SettingsPage"));
-import FamilyActivitiesPage from "./views/FamilyActivitiesPage";
+const SignupPage = lazy(()=> import("./views/SignupPage"));
-import FamGamesPage from "./views/FamGamesPage";
+const SignupPageTwo = lazy(()=> import("./views/SignupPageTwo"));
-import FamilyRoutesPage from "./views/FamilyRoutesPage";
+const TrackingPage = lazy(()=> import("./views/TrackingPage"));
-import PromoPage from "./views/PromoPage";
+const UpdatePasswordPages = lazy(()=> import("./views/UpdatePasswordPages"));
-import LearnMorePage from "./views/LearnMorePage";
+const UpdatePasswordPagesTwo = lazy(()=> import("./views/UpdatePasswordPagesTwo"));
+const UploadProductPage = lazy(()=> import("./views/UploadProductPage"));
+const UserProfilePage = lazy(()=> import("./views/UserProfilePage"));
+const VerifyLinkPages = lazy(()=> import("./views/VerifyLinkPages"));
+const VerifyLinkPagesTwo = lazy(()=> import("./views/VerifyLinkPagesTwo"));
+const VerifyPasswordPages = lazy(()=> import("./views/VerifyPasswordPages"));
+const VerifyPasswordPagesTwo = lazy(()=> import("./views/VerifyPasswordPagesTwo"));
+const VerifyYouPages = lazy(()=> import("./views/VerifyYouPages"));
+const VerifyYouPagesTwo = lazy(()=> import("./views/VerifyYouPagesTwo"));
+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"));
+const PromoPage = lazy(()=> import("./views/PromoPage"));
 
 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,7 +94,7 @@ 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="/invite" element={<SignupPageTwo />} />
             <Route exact path="/promo/:name/:id" element={<PromoPage />} />
           </>
         ) : (
@@ -127,94 +125,76 @@ export default function Routers() {
         <Route exact path="/app" element={<AppDownloadPage />} />
 
         {/* private route */}
-        <Route element={<AuthRoute />}>
+        <Route element={<SocketConnection />}>
-          <Route exact path="/" element={<HomePages />} />
+          <Route element={<AuthRoute />}>
-          {/*  <Route exact path="/active-bids" element={<AcitveBidsPage />} />
+            <Route exact path="/" element={<HomePages />} />
-          <Route exact path="/notification" element={<Notification />} />
+            <Route exact path="/reminders" element={<RemindersPage />} />
-          <Route exact path="/market-place" element={<MarketPlacePage />} />
+            <Route exact path="/tracking" element={<TrackingPage />} />
-          <Route exact path="/shop-details" element={<ShopDetailsPage />} />
+            <Route exact path="/resources" element={<ResourcePage />} />
-        <Route exact path="/my-collection" element={<MyCollection />} />*/}
+            <Route exact path="/my-wallet/*" element={<MyWalletPage />} />
-          <Route exact path="/reminders" element={<RemindersPage />} />
+            <Route exact path="/family-wallet" element={<FamilyWalletPage />} />
-          <Route exact path="/tracking" element={<TrackingPage />} />
+            <Route exact path="/my-coupon" element={<MyCouponPage />} />
-          <Route exact path="/calendar" element={<CalendarPage />} />
+            <Route exact path="/notification" element={<Notification />} />
-          <Route exact path="/resources" element={<ResourcePage />} />
+            <Route exact path="/market-place" element={<MarketPlacePage />} />
-          <Route exact path="/my-wallet/*" element={<MyWalletPage />} />
+            <Route exact path="/market" element={<MarketPlacePage />} />
-          <Route exact path="/family-wallet" element={<FamilyWalletPage />} />
+            <Route exact path="/familymarket" element={<FamilyMarketPage />} />
-          <Route exact path="/my-coupon" element={<MyCouponPage />} />
+            <Route exact path="/suggested" element={<ParentWaitingPage />} />
-          <Route exact path="/notification" element={<Notification />} />
+            <Route exact path="/parentwaiting" element={<ParentWaitingPage />} />
-          <Route exact path="/market-place" element={<MarketPlacePage />} />
+            <Route exact path="/pending" element={<FamilyPendingOfferPage />} />
-          <Route exact path="/market" element={<MarketPlacePage />} />
+            <Route exact path="/fam-blog" element={<FamBlogPage />} />
-          <Route exact path="/familymarket" element={<FamilyMarketPage />} />
+            <Route exact path="/ai-question" element={<FamAIQuestionPage />} />
-          <Route exact path="/suggested" element={<ParentWaitingPage />} />
+            <Route exact path="/myfiles" element={<FamMyFilesPage />} />
-          <Route exact path="/parentwaiting" element={<ParentWaitingPage />} />
+            <Route exact path="/ai-lab" element={<FamAIQuestionPage />} />
-          <Route exact path="/pending" element={<FamilyPendingOfferPage />} />
+            <Route exact path="/fam-games" element={<FamGamesPage />} />
-          <Route exact path="/fam-blog" element={<FamBlogPage />} />
+            <Route exact path="/work-in-progress" element={<FamWorkInProgressPage />} />
-          <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="/pastdue" element={<MyPastDueTasksPage />} />
-          <Route exact path="/notification" element={<Notification />} />
+            <Route exact path="/notification" element={<Notification />} />
-          <Route exact path="/mytask" element={<MyTaskPage />} />
+            <Route exact path="/mytask" element={<MyTaskPage />} />
-          <Route exact path="/myjobs" element={<MyJobsPage />} />
+            <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-active-jobs" element={<MyActiveJobsPage />} />
+            <Route
-          <Route
+              exact
-            exact
+              path="/my-pastdue-jobs"
-            path="/my-pastdue-jobs"
+              element={<MyPastDueJobsPage />}
-            element={<MyPastDueJobsPage />}
+            />
-          />
+            <Route exact path="/my-offers" element={<MyOffersPage />} />
-          <Route exact path="/my-offers" element={<MyOffersPage />} />
+            <Route exact path="/pend-interest" element={<MyWaitingJobsPage />} />
-          <Route exact path="/pend-interest" element={<MyWaitingJobsPage />} />
+            <Route
-          <Route
+              exact
-            exact
+              path="/my-review-jobs"
-            path="/my-review-jobs"
+              element={<MyReviewDueJobsPage />}
-            element={<MyReviewDueJobsPage />}
+            />
-          />
+            <Route path='/acc-family/*' element={<FamilyRoutesPage />} />
 
-          {/* <Route exact path='/acc-family' element={<FamilyAccPage />} />
+            <Route exact path="/manage-family" element={<FamilyManagePage />} />
-          <Route exact path="/acc-family/activities" element={<FamilyActivitiesPage />} />
+            <Route exact path="/start-job" element={<StartJob />} />
-          <Route exact path="/acc-family/familysettings" element={<FamilySettingsPage />} /> */}
+            <Route exact path="/yourpage" element={<YourPages />} />
-          <Route path='/acc-family/*' element={<FamilyRoutesPage />} />
+            <Route
-
+              exact
-          <Route exact path="/manage-family" element={<FamilyManagePage />} />
+              path="/manage-active-job"
-          <Route exact path="/start-job" element={<StartJob />} />
+              element={<ManageActiveJobs />}
-          <Route exact path="/yourpage" element={<YourPages />} />
+            />
-          <Route
+            <Route exact path="/blog-page" element={<BlogPage />} />
-            exact
+            <Route
-            path="/manage-active-job"
+              exact
-            element={<ManageActiveJobs />}
+              path="/offer-interest"
-          />
+              element={<OffersInterestPage />}
-          <Route exact path="/blog-page" element={<BlogPage />} />
+            />
-          <Route
+            <Route
-            exact
+              exact
-            path="/offer-interest"
+              path="/manage-offer"
-            element={<OffersInterestPage />}
+              element={<ManageInterestOfferPage />}
-          />
+            />
-          <Route
+            <Route exact path="/history" element={<HistoryPage />} />
-            exact
+            <Route exact path="/learnmore" element={<LearnMorePage />} />
-            path="/manage-offer"
+            <Route exact path="/my-uploads" element={<UploadProductPage />} />
-            element={<ManageInterestOfferPage />}
+            <Route exact path="/profile" element={<AuthProfilePage />} />
-          />
+            <Route exact path="/user-profile" element={<UserProfilePage />} />
-
+            <Route exact path="/settings" element={<SettingsPage />} />
-          <Route
+            <Route exact path="/referral" element={<ReferralPage />} />
-            exact
+            <Route exact path="/job-groups" element={<JobGroupsPage />} />
-            path="/my-collection/collection-item"
+          </Route>
-            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>
         <Route path="*" element={<FourZeroFour />} />
       </Routes>

src/components/AddJob/AddJob.jsx

@@ -3,7 +3,7 @@ import {
   useDispatch,
   useSelector,
   usersService,
-  initialValues as IV,
+  // initialValues as IV,
   initialReqState,
   useState,
   tableReload,
@@ -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,7 +117,7 @@ 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="">
@@ -138,7 +138,7 @@ function AddJob({ popUpHandler, categories }) {
                                 </option>
                               ))}
                             </>
-                          ) : walletDetails.data.length == 1 ?
+                          ) : walletDetails.data.length === 1 ?
                           <>
                             {walletDetails.data?.map((item, index) => (
                               <option
@@ -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 }) {
+export default function AuthLayout2({ slogan, children }) {
-  const bgImg = localImgLoad("images/left-wrenchboard.jpg");
+  // 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">

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 collections from "../../../data/collectionplan_data.json";
-import CreatedTab from "./CreatedTab";
+// import marketPlace from "../../../data/marketplace_data.json";
-import HiddenProductsTab from "./HiddenProductsTab";
+// import products from "../../../data/product_data.json";
-import OnSaleTab from "./OnSaleTab";
+// import CollectionTab from "./CollectionTab";
-import OwnTab from "./OwnTab";
+// 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 onSaleProducts = marketPlace.data;
-  const CreatedSell = marketPlace.data;
+  // const CreatedSell = marketPlace.data;
-  const CreatedBits = products.datas;
+  // const CreatedBits = products.datas;
   // const mainProducts = products.datas;
-  const ownProducts = products.datas;
+  // const ownProducts = products.datas;
-  const collectionProducts = collections.data;
+  // const collectionProducts = collections.data;
 
-  const tabs = [
+  // const tabs = [
-    {
+  //   {
-      id: 1,
+  //     id: 1,
-      name: "onsale",
+  //     name: "onsale",
-      content: "On Sale",
+  //     content: "On Sale",
-    },
+  //   },
-    {
+  //   {
-      id: 2,
+  //     id: 2,
-      name: "owned",
+  //     name: "owned",
-      content: "Owned",
+  //     content: "Owned",
-    },
+  //   },
-    {
+  //   {
-      id: 3,
+  //     id: 3,
-      name: "created",
+  //     name: "created",
-      content: "Created",
+  //     content: "Created",
-    },
+  //   },
-    {
+  //   {
-      id: 4,
+  //     id: 4,
-      name: "hidden",
+  //     name: "hidden",
-      content: "Hidden",
+  //     content: "Hidden",
-    },
+  //   },
-    {
+  //   {
-      id: 5,
+  //     id: 5,
-      name: "collection",
+  //     name: "collection",
-      content: "Collection",
+  //     content: "Collection",
-    },
+  //   },
-    {
+  //   {
-      id: 6,
+  //     id: 6,
-      name: "activity",
+  //     name: "activity",
-      content: "Activity",
+  //     content: "Activity",
-    },
+  //   },
-  ];
+  // ];
 
-  const [tab, setTab] = useState(tabs[0].name);
+  // const [tab, setTab] = useState(tabs[0].name);
-  const tabHandler = (value) => {
+  // const tabHandler = (value) => {
-    setTab(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 usersService from '../../../services/UsersService';
-import {updateUserDetails} from "../../../store/UserDetails";
+// import {updateUserDetails} from "../../../store/UserDetails";
-import { useDispatch } from "react-redux";
+// import { useDispatch } from "react-redux";
 import AuthLayout from "../AuthLayout";
 
 function AppleRedirect() {
     const location = useLocation();
     const navigate = useNavigate();
-    const userApi = new usersService();
+    // const userApi = new usersService();
-    const dispatch = useDispatch()
+    // 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 = {
+      // var reqData = {
-        auth_type: "APPLE",
+      //   auth_type: "APPLE",
-        code: codeResponse,
+      //   code: codeResponse,
-        redirect_uri: process.env.REACT_APP_GOOGLE_REDIRECT_URL,
+      //   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 { useNavigate } from "react-router-dom";
-import WrenchBoard from "../../../assets/images/wrenchboard-logo-text.png";
+// 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/SignUp/index2.jsx

@@ -8,7 +8,7 @@ import AuthLayout from "../AuthLayout2";
 import GoogleDownload from '../../../assets/images/download/andriod.jpg'
 import IOSDownload from '../../../assets/images/download/apple.jpg'
 
-export default function SignUp() {
+export default function SignUp({details}) {
   const location = useLocation();
 
   // eslint-disable-next-line no-restricted-globals
@@ -28,9 +28,9 @@ export default function SignUp() {
 
   const [formData, setFormData] = useState({
     country: country ? country : "",
-    first_name: "",
+    first_name: details ? details.first_name : "",
-    last_name: "",
+    last_name: details ? details.last_name : "",
-    email: "",
+    email: details ? details.email : "",
     password: "",
   });
 
@@ -202,6 +202,7 @@ export default function SignUp() {
                       type="text"
                       value={formData.first_name}
                       inputHandler={handleInputChange}
+                      disable={details.first_name}
                     />
                   </div>
                   <div className="input-item flex-1">
@@ -213,6 +214,7 @@ export default function SignUp() {
                       type="text"
                       value={formData.last_name}
                       inputHandler={handleInputChange}
+                      disable={details.last_name}
                     />
                   </div>
                 </div>
@@ -225,6 +227,7 @@ export default function SignUp() {
                     type="email"
                     value={formData.email}
                     inputHandler={handleInputChange}
+                    disable={details.email}
                   />
                 </div>
                 <div className="input-item mb-4">

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/Home/FamilyDash.jsx

@@ -8,8 +8,7 @@ import { tableReload } from "../../store/TableReloads";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
 import HomeModal from "./HomeModal";
 
-export default function FamilyDash({ MyActiveJobList=[], serverImg }) {
+export default function FamilyDash() {
-  // console.log("PROPS IN FAMILY DASH->", familyOffers?.result_list);
 
   const dispatch = useDispatch();
 
@@ -17,29 +16,27 @@ export default function FamilyDash({ MyActiveJobList=[], serverImg }) {
   
   const userApi = new usersService();
   
-  // const trending = MyActiveJobList;
-  
   const { familyBannersList } = useSelector((state) => state.familyBannersList);
 
   const { familyResources:{ tab_categories } } = useSelector((state) => state.familyResources);
 
   const { userDetails } = useSelector((state) => state?.userDetails);
 
-  let [reloadBanner, setReloadBanner] = useState(0)
+  // let [reloadBanner, setReloadBanner] = useState(0)
 
-  useEffect(()=>{
+  // useEffect(()=>{
-    if(reloadBanner >= 2){
+  //   if(reloadBanner >= 2){
-      dispatch(tableReload({ type: "FAMILYBANNERSLIST" })); // RELOAD FAMILY BANNERS LIST EVERY 10 MINS
+  //     dispatch(tableReload({ type: "FAMILYBANNERSLIST" })); // RELOAD FAMILY BANNERS LIST EVERY 10 MINS
-      setReloadBanner(0)
+  //     setReloadBanner(0)
-    }
+  //   }
-    const timer = setInterval(()=>{
+  //   const timer = setInterval(()=>{
-      setReloadBanner(prev => prev+1)
+  //     setReloadBanner(prev => prev+1)
-    },300000)
+  //   },300000)
 
-    return ()=>{
+  //   return ()=>{
-      clearInterval(timer)
+  //     clearInterval(timer)
-    }
+  //   }
-  },[reloadBanner])
+  // },[reloadBanner])
 
   return (
     <>

src/components/Home/index.jsx

@@ -2,124 +2,53 @@ import React, { useState, useEffect } from "react";
 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
+  useEffect(()=>{
-
+    if(!commonHeadBanner.loading && (!commonHeadBanner?.data || Object.keys(commonHeadBanner?.data).length < 1)){
-  // const getMyActiveJobList = async () => { // FUNCTION TO POPULATE ACTIVE/CURRENT TASK LIST
+      dispatch(tableReload({ type: "HOMEBANNERS" })); // reloads home banner in case it fails to load or encounters error while loading
-  //   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();
-  //   }
-  // }, []);
 
   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}
+              {commonHeadBanner.loading ?
-            dashTypes={props.dashTypes}
+                <LoadingSpinner height='h-48' size='16' />
-            // offersList={MyOffersList}
+                :
-            // MyActiveJobList={MyActiveJobList}
+                <FullAccountDash
-            offersList={props.offersList}
+                  bannerList={commonHeadBanner?.data?.result_list}
-            imageServer={props.imageServer}
+                  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 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}
-              />
-              }
-            </>
-          ) : (
-            <div>
-              You are not logged in or your account type is not supported.
-            </div>
-          )}
-        </div>
     </Layout>
   );
 }

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/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!");
+          // toast.success(res.data.status | "Message Sent!");
-          setError({ message: "", loading: false, status: true });
+          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">
+                  <div className='mb-2 flex flex-wrap gap-4 items-center'>
-                    Referral List
+                    <h2 className="text-slate-900 dark:text-white text-xl lg:text-2xl font-medium">
-                  </h2>
+                      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/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/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 (
+        if (Date.now() - Number(lastActivityTime) > Number(process.env.REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY)) {
-          Date.now() - lastActivityTime >
-          process.env.REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY
-        ) {
           expireSession();
         }
       } else {
-        if (
+        if (Date.now() - Number(lastActivityTime) > Number(process.env.REACT_APP_SESSION_EXPIRE_MINUTES)) {
-          Date.now() - lastActivityTime >
-          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(() => {
@@ -97,9 +94,9 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
               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,
+      offset: 0,
-      limit: 100,
+      limit: 140,
       action: apiConst.WRENCHBOARD_ACCOUNT_REFFERHX,
     };
     return this.postAuxEnd("/refferhx", postData);
@@ -1396,7 +1396,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 +1404,7 @@ class usersService {
       action: apiConst.WRENCHBOARD_ACCOUNT_FAMILY_BANNERS,
       limit: 20,
       offset: 1,
+      ...reqData
     };
     return this.postAuxEnd("/familybanners", postData);
   }

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/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/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 api = useMemo(()=> new usersService(),[]);
-  const getMyResourceData = async () => {
+  const getMyResourceData = useCallback( async () => {
-    try {
+      try {
-      const res = await api.getResourceList();
+        const res = await api.getResourceList();
-      setMyResourceData(res.data);
+        setMyResourceData(res.data);
-    } catch (error) {
+      } catch (error) {
-      throw new Error("Error getting mode");
+        throw new Error("Error getting mode");
-    }
+      }
-  };
+    },[api]) 
   useEffect(() => {
     getMyResourceData();
-  }, []);
+  }, [getMyResourceData]);
 
   return <Resources MyResourceData={MyResourceData} activeTab={state ? state.tab : ''} />;
 }

src/views/SignupPageTwo.jsx

@@ -1,12 +1,79 @@
-import React from "react";
+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 SignupPageTwo() {
+  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 timer = setTimeout(()=>{
+      //   setDetails({loading:false, data:{
+      //     first_name: 'Emeka',
+      //     last_name: 'John',
+      //     email: 'example@example.com'
+      //   }})
+      // },[1000])
+      api.verifyEmail(refer_link).then(res => {
+        setDetails({loading:false, error:false, data:{}})
+        console.log('RES', rres)
+      }).catch(err => {
+        setDetails({loading:false, error:true, data:{}})
+      })
+    }else{
+      setDetails({loading:false, error:false, data:{}})
+    }
+  },[reload])
   return (
     <>
-      <SignUp />
+    {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 SignupPageTwo;
+
+
+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>
+);