updated social login text size

.env

@@ -18,7 +18,7 @@ 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"
 
@@ -129,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

@@ -18,7 +18,7 @@ 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"
 
@@ -98,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=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.production

@@ -104,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'

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-lock.json

@@ -8,6 +8,7 @@
       "name": "WrenchBoard-Users",
       "version": "0.2.0",
       "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,6 +37,7 @@
         "react-toastify": "^9.0.1",
         "redux": "^4.2.0",
         "slick-carousel": "^1.8.1",
+        "socket.io-client": "^4.4.1",
         "web-vitals": "^1.0.1",
         "yup": "^1.1.1"
       }
@@ -2302,6 +2304,11 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@fvilers/disable-react-devtools": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@fvilers/disable-react-devtools/-/disable-react-devtools-1.3.0.tgz",
+      "integrity": "sha512-LbASP6voPkKS5b6OlQhupEDtMeoAakamauqLEFHatkQUTmblNY5nPK7/eSqKBXxExT6uypVPczpTsJjJIrhpOQ=="
+    },
     "node_modules/@humanwhocodes/config-array": {
       "version": "0.11.8",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
@@ -3717,6 +3724,11 @@
         "@sinonjs/commons": "^1.7.0"
       }
     },
+    "node_modules/@socket.io/component-emitter": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz",
+      "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA=="
+    },
     "node_modules/@surma/rollup-plugin-off-main-thread": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz",
@@ -7078,6 +7090,46 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/engine.io-client": {
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.6.3.tgz",
+      "integrity": "sha512-T0iLjnyNWahNyv/lcjS2y4oE358tVS/SYQNxYXGAJ9/GLgH4VCvOQ/mhTjqU88mLZCQgiG8RIegFHYCdVC+j5w==",
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~5.2.1",
+        "ws": "~8.17.1",
+        "xmlhttprequest-ssl": "~2.1.1"
+      }
+    },
+    "node_modules/engine.io-client/node_modules/ws": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/engine.io-parser": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.3.tgz",
+      "integrity": "sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
     "node_modules/enhanced-resolve": {
       "version": "5.12.0",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz",
@@ -16099,6 +16151,32 @@
         "jquery": ">=1.8.0"
       }
     },
+    "node_modules/socket.io-client": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.8.1.tgz",
+      "integrity": "sha512-hJVXfu3E28NmzGk8o1sHhN3om52tRvwYeidbj7xKy2eIIse5IoKX3USlS6Tqt3BHAtflLIkCQBkzVrEEfWUyYQ==",
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.2",
+        "engine.io-client": "~6.6.1",
+        "socket.io-parser": "~4.2.4"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/socket.io-parser": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
+      "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
     "node_modules/sockjs": {
       "version": "0.3.24",
       "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
@@ -18111,6 +18189,14 @@
       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
     },
+    "node_modules/xmlhttprequest-ssl": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.1.2.tgz",
+      "integrity": "sha512-TEU+nJVUUnA4CYJFLvK5X9AOeH4KvDvhIfm0vV1GaQRtchnG0hgK5p8hw/xjv8cunWYCsiPCSDzObPyhEwq3KQ==",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",

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

src/Routers.jsx

@@ -1,74 +1,80 @@
 import { Route, Routes } from "react-router-dom";
 import { lazy } from "react";
 
-import LoginLandingPage from './views/LoginLandingPage'
-import LoginPage from "./views/LoginPage";
 import SocketConnection from "./middleware/SocketConnection";
 
-const HomePages = lazy(() => import("./views/HomePages"));
-const FourZeroFour = lazy(() => import("./components/FourZeroFour"));
-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 AppDownloadPage = lazy(() => import("./views/AppDownloadPage"));
-const AppleRedirectPage = lazy(() => import("./views/AppleRedirectPage"));
-const AuthProfilePage = lazy(() => import("./views/AuthProfilePage"));
-const AuthRedirect = lazy(() => import("./views/AuthRedirect"));
-const BlogPage = lazy(() => import("./views/BlogPage"));
-const FacebookRedirect = lazy(() => import("./views/FacebookRedirect"));
-const FamilyManagePage = lazy(() => import("./views/FamilyManagePage"));
-const FamilyMarketPage = lazy(() => import("./views/FamilyMarketPage"));
+// AUTH PAGES
+import LoginLandingPage from './views/LoginLandingPage';
+import LoginPage from "./views/LoginPage";
+import LoginPageTwo from "./views/LoginPageTwo";
+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 UpdatePasswordPages from "./views/UpdatePasswordPages";
+import UpdatePasswordPagesTwo from "./views/UpdatePasswordPagesTwo";
+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 FacebookRedirect from "./views/FacebookRedirect";
+import PromoPage from "./views/PromoPage";
+import PromoRefer from './views/PromoRefer';
+import InviteRefer from './views/InviteRefer';
+import MyRefer from './views/MyRefer';
 
-const ForgotPasswordPages = lazy(()=> import("./views/ForgotPasswordPages"));
-const ForgotPasswordPagesTwo = lazy(()=> import("./views/ForgotPasswordPagesTwo"));
-const HistoryPage = lazy(()=> import("./views/HistoryPage"));
-const JobGroupsPage = lazy(()=> import("./views/JobGroupsPage"));
-const LndPage = lazy(()=> import("./views/LndPage"));
-const LoginPageTwo = lazy(()=> import("./views/LoginPageTwo"));
-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 SignupPage = lazy(()=> import("./views/SignupPage"));
-const SignupPageTwo = lazy(()=> import("./views/SignupPageTwo"));
-const TrackingPage = lazy(()=> import("./views/TrackingPage"));
-const UpdatePasswordPages = lazy(()=> import("./views/UpdatePasswordPages"));
-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"));
+
+import HomePages from "./views/HomePages"
+import ScrollToTop from "./components/Helpers/ScrollToTop"
+import StartJob from "./components/MyJobs/StartJob"
+import Notification from "./components/Notification"
+import AuthRoute from "./middleware/AuthRoute"
+import AuthProfilePage from "./views/AuthProfilePage"
+import BlogPage from "./views/BlogPage"
+import FamilyManagePage from "./views/FamilyManagePage"
+import FamilyMarketPage from "./views/FamilyMarketPage"
+
+import HistoryPage from "./views/HistoryPage"
+import JobGroupsPage from "./views/JobGroupsPage"
+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 SettingsPage from "./views/SettingsPage"
+import TrackingPage from "./views/TrackingPage"
+import UploadProductPage from "./views/UploadProductPage"
+import UserProfilePage from "./views/UserProfilePage"
+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 LearnMorePage from "./views/LearnMorePage"
+import FamGamesPage from "./views/FamGamesPage"
+import FamilyRoutesPage from "./views/FamilyRoutesPage"
 
 export default function Routers() {
   return (
@@ -94,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={<SignupPageTwo />} />
             <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 />} />
           </>
         ) : (
           <>

src/components/AddJob/AddJob.jsx

@@ -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"

src/components/AuthPages/AuthLayout2.jsx

@@ -47,8 +47,16 @@ export default function AuthLayout2({ 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 AuthLayout2({ 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/Login/LoginLanding.jsx

@@ -104,6 +104,12 @@ export default function LoginLanding() {
                   </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({details}) {
+/* 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,8 +34,8 @@ export default function SignUp({details}) {
 
   const [formData, setFormData] = useState({
     country: country ? country : "",
-    first_name: details ? details.first_name : "",
-    last_name: details ? details.last_name : "",
+    first_name: details ? details.firstname : "",
+    last_name: details ? details.lastname : "",
     email: details ? details.email : "",
     password: "",
   });
@@ -104,6 +110,7 @@ export default function SignUp({details}) {
         }
 
         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({details}) {
           password: password,
           terms: 1,
           news: 1,
+          ...referral_link
         };
 
         const res = await userApi.CreateUser(reqData);
@@ -202,7 +210,7 @@ export default function SignUp({details}) {
                       type="text"
                       value={formData.first_name}
                       inputHandler={handleInputChange}
-                      disable={details.first_name}
+                      disable={details ? true : false}
                     />
                   </div>
                   <div className="input-item flex-1">
@@ -214,7 +222,7 @@ export default function SignUp({details}) {
                       type="text"
                       value={formData.last_name}
                       inputHandler={handleInputChange}
-                      disable={details.last_name}
+                      disable={details ? true : false}
                     />
                   </div>
                 </div>
@@ -227,7 +235,7 @@ export default function SignUp({details}) {
                     type="email"
                     value={formData.email}
                     inputHandler={handleInputChange}
-                    disable={details.email}
+                    disable={details ? true : false}
                   />
                 </div>
                 <div className="input-item mb-4">
@@ -274,16 +282,17 @@ export default function SignUp({details}) {
                       )}
                     </button>
                     <span
-                      onClick={rememberMe}
+                      // onClick={rememberMe}
                       className="cursor-default text-gray-400 font-medium text-[16.25px] leading-[24.375px] group-checked:text-white transition-all duration-200 group-checked:cursor-default"
                     >
                       I agree with all
-                      <Link
-                        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/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/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/services/UsersService.js

@@ -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 = {
@@ -1666,7 +1674,7 @@ class usersService {
   }
 
   postAuxEnd(uri, reqData, uploadPost=false) {
-    const endPoint = uploadPost ? process.env.REACT_APP_MEDIA_LINK + uri : process.env.REACT_APP_USERS_ENDPOINT + uri;
+    const endPoint = uploadPost ? process.env.REACT_APP_MEDIA_LINK + uri : 'https://apigate.orion.g1.wrenchboard.com/en/wrench/api/v1' + uri;
     const session_token = localStorage.getItem("session_token");
     // session_token = session_token !=null ?session_token : '';
     //   'Authorization': `Basic ${(session_token !=null) ?session_token : ''}`,

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

@@ -1,79 +1,13 @@
-import React, {useState, useEffect} from "react";
-import { useLocation } from "react-router-dom";
-import usersService from '../services/UsersService'
+import React from "react";
 
 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 (
     <>
-    {details.loading ?
-      <LoadingSpinner size="32" color="sky-blue" height="h-screen" />
-    : details.error ?
-      <AuthLayout>
-        <ErrorComponent onClick={()=>setReload(prev => !prev)} />
-      </AuthLayout>
-    :
-      <SignUp details={details.data} />
-    }
+      <SignUp />
     </>
   );
 }
 
-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>
-);
+export default SignupPageTwo;