Compare commits

...

15 Commits

Author SHA1 Message Date
victorAnumudu ab8320a846 updated social login text size 2025-06-10 18:06:40 +01:00
victorAnumudu 4fc109926c learnmore bug fixed 2025-06-10 17:17:20 +01:00
CHIEFSOFT\ameye e3399d4b95 Fix socker llink 2025-05-13 06:12:31 -04:00
victorAnumudu 4a732ab1e3 footer links updated 2025-04-01 17:46:55 +01:00
CHIEFSOFT\ameye 0b598e88ba added hosts 2025-03-31 15:12:52 -04:00
victorAnumudu 29ce4dd933 outer page lazy loading removal 2025-03-31 17:49:01 +01:00
victorAnumudu 17c8573031 link bug fixed 2025-03-31 17:21:40 +01:00
victorAnumudu 368148ef61 added footer links to mainsite 2025-03-31 16:43:51 +01:00
victorAnumudu 3cdea696e8 removed chat script 2025-03-20 18:35:57 +01:00
victorAnumudu 0c96441f84 removed chat script 2025-03-20 18:19:20 +01:00
ameye dff610b749 Merge branch 'refer-route' of WrenchBoard/Users-Wrench into master 2024-12-02 19:52:59 +00:00
victorAnumudu d234bb6747 refer-route added 2024-12-02 20:10:52 +01:00
ameye d6b6e34132 Merge branch 'refer_link' of WrenchBoard/Users-Wrench into master 2024-11-30 22:39:27 +00:00
victorAnumudu a0f0a6cf07 refer links added 2024-11-30 21:30:03 +01:00
ameye b3ae0c42c3 Merge branch 'no-cache-handler' of WrenchBoard/Users-Wrench into master 2024-11-30 08:42:19 +00:00
18 changed files with 296 additions and 131 deletions
+7 -1
View File
@@ -18,7 +18,7 @@ REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api
REACT_APP_ENDPOINT_KEY="WRENCH-BOARD-2024" REACT_APP_ENDPOINT_KEY="WRENCH-BOARD-2024"
#SOCKETS ENDS #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" #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
@@ -130,3 +130,9 @@ REACT_APP_CUSTOMTIMER=90
#SHOW OR HIDE MY PAGE LINK ROUTE #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'
+7 -1
View File
@@ -18,7 +18,7 @@ REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api
REACT_APP_ENDPOINT_KEY="WRENCH-BOARD-2024" REACT_APP_ENDPOINT_KEY="WRENCH-BOARD-2024"
#SOCKETS ENDS #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" #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
@@ -99,3 +99,9 @@ REACT_APP_CUSTOMTIMER=90
#SHOW OR HIDE MY PAGE LINK ROUTE #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'
+6
View File
@@ -105,3 +105,9 @@ REACT_APP_CUSTOMTIMER=90
#SHOW OR HIDE MY PAGE LINK ROUTE #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'
+3 -2
View File
@@ -25,8 +25,9 @@ services:
- apigate.orion.g1.wrenchboard.com:10.10.33.15 - apigate.orion.g1.wrenchboard.com:10.10.33.15
- socket-dev.wrenchboard.com:10.10.33.15 - socket-dev.wrenchboard.com:10.10.33.15
- socket.wrenchboard.com:10.10.33.15 - socket.wrenchboard.com:10.10.33.15
- apigateway.wrenchboard.app.dev.fluxtra.net:10.20.30.19 - media.wrenchboard.com:10.10.33.15
- apigateway.wrenchboard.app.lotus.fluxtra.net:172.31.4.19 - www.wrenchboard.com:10.10.33.15
- blog.wrenchboard.com:10.10.33.15
environment: environment:
- CHOKIDAR_USEPOLLING=true - CHOKIDAR_USEPOLLING=true
- NODE_ENV=${NODE_ENV:-production} - NODE_ENV=${NODE_ENV:-production}
+1 -3
View File
@@ -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." 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"/> <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="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" /> <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+31 -23
View File
@@ -1,31 +1,48 @@
import { Route, Routes } from "react-router-dom"; import { Route, Routes } from "react-router-dom";
import { lazy } from "react"; import { lazy } from "react";
import LoginLandingPage from './views/LoginLandingPage'
import LoginPage from "./views/LoginPage";
import SocketConnection from "./middleware/SocketConnection"; import SocketConnection from "./middleware/SocketConnection";
// 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 HomePages = lazy(() => import("./views/HomePages")); const HomePages = lazy(() => import("./views/HomePages"));
const FourZeroFour = lazy(() => import("./components/FourZeroFour"));
const ScrollToTop = lazy(() => import("./components/Helpers/ScrollToTop")); const ScrollToTop = lazy(() => import("./components/Helpers/ScrollToTop"));
const StartJob = lazy(() => import("./components/MyJobs/StartJob")); const StartJob = lazy(() => import("./components/MyJobs/StartJob"));
const Notification = lazy(() => import("./components/Notification")); const Notification = lazy(() => import("./components/Notification"));
const AuthRoute = lazy(() => import("./middleware/AuthRoute")); 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 AuthProfilePage = lazy(() => import("./views/AuthProfilePage"));
const AuthRedirect = lazy(() => import("./views/AuthRedirect"));
const BlogPage = lazy(() => import("./views/BlogPage")); const BlogPage = lazy(() => import("./views/BlogPage"));
const FacebookRedirect = lazy(() => import("./views/FacebookRedirect"));
const FamilyManagePage = lazy(() => import("./views/FamilyManagePage")); const FamilyManagePage = lazy(() => import("./views/FamilyManagePage"));
const FamilyMarketPage = lazy(() => import("./views/FamilyMarketPage")); const FamilyMarketPage = lazy(() => import("./views/FamilyMarketPage"));
const ForgotPasswordPages = lazy(()=> import("./views/ForgotPasswordPages"));
const ForgotPasswordPagesTwo = lazy(()=> import("./views/ForgotPasswordPagesTwo"));
const HistoryPage = lazy(()=> import("./views/HistoryPage")); const HistoryPage = lazy(()=> import("./views/HistoryPage"));
const JobGroupsPage = lazy(()=> import("./views/JobGroupsPage")); 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 ManageActiveJobs = lazy(()=> import("./views/ManageActiveJobs"));
const ManageInterestOfferPage = lazy(()=> import("./views/ManageInterestOfferPage")); const ManageInterestOfferPage = lazy(()=> import("./views/ManageInterestOfferPage"));
const MarketPlacePage = lazy(()=> import("./views/MarketPlacePage")); const MarketPlacePage = lazy(()=> import("./views/MarketPlacePage"));
@@ -43,19 +60,9 @@ const ReferralPage = lazy(()=> import("./views/ReferralPage"));
const RemindersPage = lazy(()=> import("./views/RemindersPage")); const RemindersPage = lazy(()=> import("./views/RemindersPage"));
const ResourcePage = lazy(()=> import("./views/ResourcePage")); const ResourcePage = lazy(()=> import("./views/ResourcePage"));
const SettingsPage = lazy(()=> import("./views/SettingsPage")); 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 TrackingPage = lazy(()=> import("./views/TrackingPage"));
const UpdatePasswordPages = lazy(()=> import("./views/UpdatePasswordPages"));
const UpdatePasswordPagesTwo = lazy(()=> import("./views/UpdatePasswordPagesTwo"));
const UploadProductPage = lazy(()=> import("./views/UploadProductPage")); const UploadProductPage = lazy(()=> import("./views/UploadProductPage"));
const UserProfilePage = lazy(()=> import("./views/UserProfilePage")); 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 YourPages = lazy(()=> import("./views/YourPage_"));
const ParentWaitingPage = lazy(()=> import("./views/ParentWaitingPage")); const ParentWaitingPage = lazy(()=> import("./views/ParentWaitingPage"));
const FamilyPendingOfferPage = lazy(()=> import("./views/FamilyPendingOfferPage")); const FamilyPendingOfferPage = lazy(()=> import("./views/FamilyPendingOfferPage"));
@@ -68,7 +75,6 @@ const FamilyWalletPage = lazy(()=> import("./views/FamilyWalletPage"));
const LearnMorePage = lazy(()=> import("./views/LearnMorePage")); const LearnMorePage = lazy(()=> import("./views/LearnMorePage"));
const FamGamesPage = lazy(()=> import("./views/FamGamesPage")); const FamGamesPage = lazy(()=> import("./views/FamGamesPage"));
const FamilyRoutesPage = lazy(()=> import("./views/FamilyRoutesPage")); const FamilyRoutesPage = lazy(()=> import("./views/FamilyRoutesPage"));
const PromoPage = lazy(()=> import("./views/PromoPage"));
export default function Routers() { export default function Routers() {
return ( return (
@@ -94,8 +100,10 @@ export default function Routers() {
<Route path="/complereset" element={<VerifyPasswordPagesTwo />} /> <Route path="/complereset" element={<VerifyPasswordPagesTwo />} />
<Route exact path="/outmessage" element={<VerifyYouPagesTwo />} /> <Route exact path="/outmessage" element={<VerifyYouPagesTwo />} />
<Route exact path="/eoffer" element={<LoginPageTwo />} /> <Route exact path="/eoffer" element={<LoginPageTwo />} />
<Route exact path="/invite" element={<SignupPageTwo />} />
<Route exact path="/promo/:name/:id" element={<PromoPage />} /> <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 />} />
</> </>
) : ( ) : (
<> <>
+7 -7
View File
@@ -39,7 +39,7 @@ function AddJob({ popUpHandler, categories }) {
try { try {
const res = await ApiCall.jobManagerCreateJob(reqData); const res = await ApiCall.jobManagerCreateJob(reqData);
if (res.data.internal_return < 1) { if (res?.data?.internal_return < 1) {
setRequestStatus({ setRequestStatus({
loading: false, loading: false,
status: false, status: false,
@@ -75,7 +75,7 @@ function AddJob({ popUpHandler, categories }) {
// For form initial values // For form initial values
const initialValues = { const initialValues = {
// initial values for formik // initial values for formik
country: walletDetails.data.length === 1 ? walletDetails.data[0].country : '', country: walletDetails?.data?.length === 1 ? walletDetails.data[0].country : '',
price: "", price: "",
title: "", title: "",
description: "", 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`} 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} onChange={props.handleChange}
onBlur={props.handleBlur} onBlur={props.handleBlur}
disabled={walletDetails.data.length === 1} disabled={walletDetails?.data?.length === 1}
> >
{walletDetails?.loading ? ( {walletDetails?.loading ? (
<option className="text-slate-500 text-lg" value=""> <option className="text-slate-500 text-lg" value="">
Loading... Loading...
</option> </option>
) : walletDetails.data.length > 1 ? ( ) : walletDetails?.data?.length > 1 ? (
<> <>
<option className="text-slate-500 text-lg" value=""> <option className="text-slate-500 text-lg" value="">
Select a currency Select a currency
</option> </option>
{walletDetails.data?.map((item, index) => ( {walletDetails?.data?.map((item, index) => (
<option <option
key={index} key={index}
className="text-slate-500 text-lg" className="text-slate-500 text-lg"
@@ -138,9 +138,9 @@ function AddJob({ popUpHandler, categories }) {
</option> </option>
))} ))}
</> </>
) : walletDetails.data.length === 1 ? ) : walletDetails?.data?.length === 1 ?
<> <>
{walletDetails.data?.map((item, index) => ( {walletDetails?.data?.map((item, index) => (
<option <option
key={index} key={index}
className="text-slate-500 text-lg" className="text-slate-500 text-lg"
+13 -4
View File
@@ -48,7 +48,15 @@ export default function AuthLayout2({ slogan, children }) {
<div className="flex justify-center items-center"> <div className="flex justify-center items-center">
<div className="flex items-center"> <div className="flex items-center">
<a <a
href="https://www.wrenchboard.com/about-us" 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={process.env.REACT_APP_ABOUT_LINK}
className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]" className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
target="_blank" target="_blank"
rel="noreferrer" rel="noreferrer"
@@ -56,15 +64,16 @@ export default function AuthLayout2({ slogan, children }) {
About About
</a> </a>
<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]" className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
target="_blank" target="_blank"
rel="noreferrer" rel="noreferrer"
> >
Services Terms
</a> </a>
<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]" className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
target="_blank" target="_blank"
rel="noreferrer" rel="noreferrer"
@@ -104,6 +104,12 @@ export default function LoginLanding() {
</div> </div>
</div> </div>
</div> </div>
{/* <div className="login-links mt-10 flex justify-center text-gray-400 divide-x-4">
<a className='text-sm font-bold px-5' href={process.env.REACT_APP_HOME_LINK}>Home</a>
<a className='text-sm font-bold px-5' href={process.env.REACT_APP_ABOUT_LINK}>About</a>
<a className='text-sm font-bold px-5' href={process.env.REACT_APP_CONTACTS_LINK}>Contact</a>
<a className='text-sm font-bold px-5' href={process.env.REACT_APP_TERMS_LINK}>Terms</a>
</div> */}
</div> </div>
</div> </div>
</div> </div>
+4 -4
View File
@@ -526,8 +526,8 @@ export default function Login() {
) )
// END of family login compoenent // END of family login compoenent
} }
<div className='w-full text-center'> <div className='mt-4 w-full flex justify-center items-center text-center'>
<Link className='text-center block font-semibold text-lg pt-3 tracking-wide' to='/login'>Return</Link> <Link className='px-4 py-2 rounded-full text-xl text-white bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center text-[15px]' to='/login'>Return</Link>
</div> </div>
{/* END of login component */} {/* 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" 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)" /> <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} Continue with {brand}
</span> </span>
</a> </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" 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)" /> <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} Continue with {brand}
</span> </span>
</button> </button>
+19 -10
View File
@@ -8,7 +8,13 @@ import AuthLayout from "../AuthLayout2";
import GoogleDownload from '../../../assets/images/download/andriod.jpg' import GoogleDownload from '../../../assets/images/download/andriod.jpg'
import IOSDownload from '../../../assets/images/download/apple.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(); const location = useLocation();
// eslint-disable-next-line no-restricted-globals // eslint-disable-next-line no-restricted-globals
@@ -28,8 +34,8 @@ export default function SignUp({details}) {
const [formData, setFormData] = useState({ const [formData, setFormData] = useState({
country: country ? country : "", country: country ? country : "",
first_name: details ? details.first_name : "", first_name: details ? details.firstname : "",
last_name: details ? details.last_name : "", last_name: details ? details.lastname : "",
email: details ? details.email : "", email: details ? details.email : "",
password: "", password: "",
}); });
@@ -104,6 +110,7 @@ export default function SignUp({details}) {
} }
setSignUpLoading(true); setSignUpLoading(true);
let referral_link = refer_link ? {refer_link} : {} // FOR USER COMING FROM REFERRAL PROCESS
const reqData = { const reqData = {
country: country, country: country,
firstname: first_name, firstname: first_name,
@@ -113,6 +120,7 @@ export default function SignUp({details}) {
password: password, password: password,
terms: 1, terms: 1,
news: 1, news: 1,
...referral_link
}; };
const res = await userApi.CreateUser(reqData); const res = await userApi.CreateUser(reqData);
@@ -202,7 +210,7 @@ export default function SignUp({details}) {
type="text" type="text"
value={formData.first_name} value={formData.first_name}
inputHandler={handleInputChange} inputHandler={handleInputChange}
disable={details.first_name} disable={details ? true : false}
/> />
</div> </div>
<div className="input-item flex-1"> <div className="input-item flex-1">
@@ -214,7 +222,7 @@ export default function SignUp({details}) {
type="text" type="text"
value={formData.last_name} value={formData.last_name}
inputHandler={handleInputChange} inputHandler={handleInputChange}
disable={details.last_name} disable={details ? true : false}
/> />
</div> </div>
</div> </div>
@@ -227,7 +235,7 @@ export default function SignUp({details}) {
type="email" type="email"
value={formData.email} value={formData.email}
inputHandler={handleInputChange} inputHandler={handleInputChange}
disable={details.email} disable={details ? true : false}
/> />
</div> </div>
<div className="input-item mb-4"> <div className="input-item mb-4">
@@ -274,16 +282,17 @@ export default function SignUp({details}) {
)} )}
</button> </button>
<span <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" 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 I agree with all
<Link <a
href="#" target='_blank'
href={process.env.REACT_APP_TERMS_LINK}
className="font-semibold text-[#4687ba] hover:text-[#009ef7] transition mx-1 inline-block" className="font-semibold text-[#4687ba] hover:text-[#009ef7] transition mx-1 inline-block"
> >
terms and condition terms and condition
</Link> </a>
</span> </span>
</div> </div>
</div> </div>
+4 -4
View File
@@ -66,17 +66,17 @@ export default function LearnMore() {
}) })
//FUNCTION TO GET LEARN MORE TOPIC //FUNCTION TO GET LEARN MORE TOPIC
useEffect(()=>{ useEffect(()=>{
apiCall.getLearnmoreTopics().then((res)=>{ apiCall.getLearnmoreTopics().then((res)=>{
if(res.data.internal_return < 0){ // success but no data if(res.data.internal_return < 0){ // success but no data
setTopics(prev => ({...prev, loading: false})) setTopics(prev => ({...prev, loading: false}))
return return
} }
const resData = res?.data?.result_list const resData = res?.data?.result_list || []
console.log('resData', resData)
setTopics(prev => ({...prev, loading: false, data: resData})) setTopics(prev => ({...prev, loading: false, data: resData}))
setTabs(prev => { 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) setSelectedTab(resData[0].topic)
// console.log('RES', resData) // console.log('RES', resData)
@@ -130,7 +130,7 @@ export default function LearnMore() {
<> <>
{(topics?.data && topics?.data?.length > 0) ? {(topics?.data && topics?.data?.length > 0) ?
<div dangerouslySetInnerHTML={{ <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' }} className='prose dark:text-white dark:bg-dark-white'
> >
{/* {topics?.data?.filter(item => item.topic == selectedTab)[0]?.contents} */} {/* {topics?.data?.filter(item => item.topic == selectedTab)[0]?.contents} */}
+1
View File
@@ -59,6 +59,7 @@ export const apiConst = {
WRENCHBOARD_RESET_PASSWORD: 11013 , WRENCHBOARD_RESET_PASSWORD: 11013 ,
WRENCHBOARD_ACCOUNT_JOBLIST:11014 , WRENCHBOARD_ACCOUNT_JOBLIST:11014 ,
WRENCHBOARD_VERIFY_PENDING_LINK: 11015, WRENCHBOARD_VERIFY_PENDING_LINK: 11015,
WRENCHBOARD_LOAD_REFERLINK: 11072,
WRENCHBOARD_ACCOUNT_RESETPASS: 11016, WRENCHBOARD_ACCOUNT_RESETPASS: 11016,
WRENCHBOARD_ACCOUNT_SETPASSWD: 11017, WRENCHBOARD_ACCOUNT_SETPASSWD: 11017,
WRENCHBOARD_DELETE_PENDING_LINK: 11018, WRENCHBOARD_DELETE_PENDING_LINK: 11018,
+8
View File
@@ -1032,6 +1032,14 @@ class usersService {
return this.postAuxEnd("/verifysignuplink", reqData); 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) // END POINT FOR OFFER RESPONSE (i.e TO ACCEPT, REJECT, CANCEL, ETC OFFER)
offersResponse(reqData) { offersResponse(reqData) {
var postData = { var postData = {
+78
View File
@@ -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>
);
+17
View File
@@ -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;
+78
View File
@@ -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>
);
+2 -68
View File
@@ -1,79 +1,13 @@
import React, {useState, useEffect} from "react"; import React from "react";
import { useLocation } from "react-router-dom";
import usersService from '../services/UsersService'
import SignUp from "../components/AuthPages/SignUp/index2"; import SignUp from "../components/AuthPages/SignUp/index2";
import LoadingSpinner from '../components/Spinners/LoadingSpinner'
import AuthLayout from '../components/AuthPages/AuthLayout2'
function SignupPageTwo() { 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 ( return (
<> <>
{details.loading ? <SignUp />
<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; 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>
);