Compare commits

...

21 Commits

Author SHA1 Message Date
victorAnumudu 7f534556be market popout height fixed 2025-07-14 17:48:32 +01:00
CHIEFSOFT\ameye 2bf8b2fe06 Roboto 2025-07-12 16:24:13 -04:00
CHIEFSOFT\ameye 4718b7962e added timeout 2025-07-05 20:05:34 -04:00
ameye 9cbf797ab0 Merge branch 'font-increase' of WrenchBoard/Users-Wrench into master 2025-07-01 18:26:06 +00:00
victorAnumudu 4b132b0499 dashboard card font increased 2025-07-01 18:55:02 +01:00
ameye a3320724de Merge branch 'social-login-text-fix' of WrenchBoard/Users-Wrench into master 2025-06-14 01:51:34 +00:00
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
25 changed files with 328 additions and 215 deletions
+8 -2
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"
#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'
+8 -2
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"
#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'
+7 -1
View File
@@ -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'
+3 -2
View File
@@ -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}
+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."
/>
<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" />
+31 -23
View File
@@ -1,31 +1,48 @@
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";
// 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 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"));
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"));
@@ -43,19 +60,9 @@ 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"));
@@ -68,7 +75,6 @@ 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 (
@@ -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 />} />
</>
) : (
<>
+7 -7
View File
@@ -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"
+13 -4
View File
@@ -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"
@@ -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>
+4 -4
View File
@@ -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>
+19 -10
View File
@@ -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>
+13 -31
View File
@@ -78,25 +78,7 @@ const AccountDashboard = ({ className, bannerList, offersList, imageServer }) =>
{/* for flat banner section */}
<div className="w-full grid-cols-1 md:grid-cols-2 2xl:grid-cols-3 grid items-center justify-center gap-2 md:gap-4">
{/* OFFER LIST DISPLAY */}
{/* <>
{(offersList && offersList?.length > 0) &&
offersList.map((item, index) => {
let thePrice = PriceFormatter(
item?.price * 0.01,
item?.currency_code,
item?.currency
);
let image = `${imageServer}${localStorage.getItem("session_token")}/job/${item.job_uid}`
if(index >= 3) {
return(
<div key={item.offer_uid}>
<NewOfferCardFlat datas={item} image={image} price={thePrice} setOfferPopout={setOfferPopout} />
</div>
)
}
})}
</> */}
{getLowerBanner?.map((props, idx) => {
let image = getImage(props);
@@ -150,15 +132,15 @@ const TopBanner = ({ image, title = "", desc = "", btn, link_path, key }) => {
</Link>
<div className="rounded-b-xl bg-white dark:bg-dark-white">
<div className="border-b border-slate-300 px-2 py-1 h-[5.4rem] flex flex-col gap-2 dark:text-white">
<Link to={link_path} className="font-bold text-lg line-clamp-1">
<Link to={link_path} className="font-bold text-xl line-clamp-1">
{title}
</Link>
<Link to={link_path} className="text-sm">
<Link to={link_path} className="text-base line-clamp-1">
{desc}
</Link>
</div>
<div className="flex justify-between w-full p-1 items-center">
<Link to={link_path} className="text-slate-300 font-semibold text-sm">
<Link to={link_path} className="text-slate-300 font-semibold text-base">
{btn}
</Link>
<button className="flex items-center justify-center gap-2">
@@ -201,7 +183,7 @@ const NewOfferCard = ({ datas, hidden = false, price, setOfferPopout, image }) =
</div>
<div className="rounded-b-xl bg-transparent dark:bg-dark-transparent">
<div className="border-b border-slate-300 px-2 py-1 h-[5.4rem] flex flex-col gap-2 dark:text-white">
<h1 className="font-bold text-lg line-clamp-1 text-center">
<h1 className="font-bold text-xl line-clamp-1 text-center">
{datas?.title}
</h1>
<div className="card-buttons flex justify-center items-center space-x-2">
@@ -210,7 +192,7 @@ const NewOfferCard = ({ datas, hidden = false, price, setOfferPopout, image }) =
onClick={() =>
setOfferPopout({ show: true, data: { ...datas, image } })
}
className="btn-shine w-2/3 h-[40px] text-white rounded-full text-sm bg-pink flex justify-center items-center"
className="btn-shine w-2/3 h-[40px] text-white rounded-full text-base bg-pink flex justify-center items-center"
>
Start Now
</button>
@@ -240,7 +222,7 @@ const NewOfferCardFlat = ({ datas, hidden = false, price, setOfferPopout, image
<div className="w-full xxs:flex justify-between items-center border-b border-slate-300 p-2">
<div className="min-h-[130px] sm:min-h-[100px] flex justify-between items-center">
<div className="px-2 flex flex-col gap-2 dark:text-white">
<h1 className="font-bold text-lg line-clamp-1 text-center">
<h1 className="font-bold text-xl line-clamp-1 text-center">
{datas?.title}
</h1>
<div className="card-buttons flex items-center space-x-2">
@@ -249,7 +231,7 @@ const NewOfferCardFlat = ({ datas, hidden = false, price, setOfferPopout, image
onClick={() =>
setOfferPopout({ show: true, data: { ...datas, image } })
}
className="btn-shine w-28 h-[40px] text-white rounded-full text-sm bg-pink flex justify-center items-center"
className="btn-shine w-28 h-[40px] text-white rounded-full text-base bg-pink flex justify-center items-center"
>
Start Now
</button>
@@ -301,10 +283,10 @@ const LowerBanner = ({ image, title = "", desc = "", btn, link_path, card_type,
<div className="w-full xxs:flex justify-between items-center border-b border-slate-300 p-2">
<div className="min-h-[130px] sm:min-h-[100px] flex justify-between items-center">
<div className="px-2 flex flex-col gap-2 dark:text-white">
<Link to={newLinkPath} className="text-lg font-bold">
<Link to={newLinkPath} className="text-xl font-bold line-clamp-1">
{title}
</Link>
<p to={newLinkPath} className="text-sm">
<p to={newLinkPath} className="text-base line-clamp-1">
{desc}
</p>
</div>
@@ -319,7 +301,7 @@ const LowerBanner = ({ image, title = "", desc = "", btn, link_path, card_type,
</Link>
</div>
<div className="flex justify-between w-full p-1 items-center">
<Link to={newLinkPath} className="text-slate-300 font-semibold text-sm">
<Link to={newLinkPath} className="text-slate-300 font-semibold text-base">
{btn}
</Link>
<button className="flex items-center justify-center gap-2">
@@ -370,10 +352,10 @@ const BannerSection = ({ banners, variant }) => {
}`}
>
<div className="border-b border-slate-300 px-2 py-1 h-[5.4rem] flex flex-col gap-2">
<Link to={link_path} className="font-bold text-lg">
<Link to={link_path} className="font-bold text-xl">
{short_title}
</Link>
<Link to={link_path} className="text-sm">
<Link to={link_path} className="text-base">
{short_description}
</Link>
</div>
+6 -38
View File
@@ -22,22 +22,6 @@ export default function FamilyDash() {
const { userDetails } = useSelector((state) => state?.userDetails);
// let [reloadBanner, setReloadBanner] = useState(0)
// useEffect(()=>{
// if(reloadBanner >= 2){
// dispatch(tableReload({ type: "FAMILYBANNERSLIST" })); // RELOAD FAMILY BANNERS LIST EVERY 10 MINS
// setReloadBanner(0)
// }
// const timer = setInterval(()=>{
// setReloadBanner(prev => prev+1)
// },300000)
// return ()=>{
// clearInterval(timer)
// }
// },[reloadBanner])
return (
<>
<div>
@@ -46,13 +30,13 @@ export default function FamilyDash() {
<div className="text-white mb-4 min-h-[3rem] px-2 w-full flex justify-between items-center rounded-xl bg-family-header-bg">
<div className="w-full">
<div className="w-full flex flex-wrap gap-x-4 ">
<p className="text-lg font-normal leading-5">Welcome</p>
<p className="text-xl font-normal leading-5">Welcome</p>
<div className="">
<h1 className="text-lg font-normal leading-5">{`${userDetails?.firstname} ${userDetails?.lastname}`}</h1>
<h1 className="text-xl font-normal leading-5">{`${userDetails?.firstname} ${userDetails?.lastname}`}</h1>
</div>
</div>
</div>
<div className="py-1 w-full text-sm text-right self-end">
<div className="py-1 w-full text-base text-right self-end">
<p className="leading-4">Last Login: {`${userDetails?.last_login.split(' ')[0]}`}</p>
</div>
</div>
@@ -76,8 +60,8 @@ export default function FamilyDash() {
<img className="w-full h-[10rem] object-cover rounded-t-xl" src={content.banner.image} alt='banner image' />
<div className="flex flex-col justify-between">
<div className="px-2 py-2 border-b border-transparent min-h-[4rem] flex flex-col gap-1">
<h1 className="text-lg text-[#083e21] dark:text-white font-bold tracking-wide">{content.banner.text}</h1>
<p className="text-sm text-black dark:text-white">{content.banner.description}</p>
<h1 className="text-xl text-[#083e21] dark:text-white font-bold tracking-wide">{content.banner.text}</h1>
<p className="text-base text-black dark:text-white">{content.banner.description}</p>
</div>
</div>
</div>
@@ -104,7 +88,7 @@ export default function FamilyDash() {
</div>
<div className="flex flex-col justify-between">
<div className="px-2 py-1 border-b border-transparent min-h-[2rem] flex justify-between items-center gap-1">
<h1 className="text-lg text-[#083e21] dark:text-white font-bold tracking-wide">{item?.content}</h1>
<h1 className="text-xl text-[#083e21] dark:text-white font-bold tracking-wide">{item?.content}</h1>
<div className="flex justify-center gap-1">
<div className="w-1 h-1 bg-slate-400 rounded-full"></div>
<div className="w-1 h-1 bg-slate-400 rounded-full"></div>
@@ -121,22 +105,6 @@ export default function FamilyDash() {
}
</>
}
{/* {familyOffers?.result_list && familyOffers?.result_list.length > 0 && (
<MyOffersFamilyTable
familyOffers={familyOffers?.result_list}
image_server={familyOffers?.session_image_server}
className="mb-10"
/>
)} */}
{/* {trending && trending.length > 0 && (
<FamilyActiveLSlde
trending={trending}
className="mb-10"
image_server={serverImg}
/>
)} */}
</div>
</div>
+5 -3
View File
@@ -1,4 +1,5 @@
import React, { useState, useEffect } from "react";
import {Navigate} from 'react-router-dom'
import datas from "../../data/product_data.json";
import Layout from "../Partials/Layout";
import usersService from "../../services/UsersService";
@@ -43,9 +44,10 @@ export default function Home(props) {
}
</>
) : (
<div>
You are not logged in or your account type is not supported.
</div>
// <div>
// You are not logged in or your account type is not supported.
// </div>
<Navigate to='/login' />
)}
</>
</div>
+4 -4
View File
@@ -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} */}
@@ -133,11 +133,7 @@ const MarketPopUp = ({ details, onClose, situation, marketInt, marketPlaceProduc
// let addedIntDate = marketInt?.added?.split(" ")[0];
// let expireIntDate = marketInt?.expire?.split(" ")[0];
let cleanedText = details?.job_description
?.replace(/&lt;/g, "<")
.replace(/&gt;/g, ">")
.replace(/&quot;/g, '"')
.replace(/&amp;/g, "&");
let cleanedText = details?.job_description?.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&amp;/g, "&");
return (
<ModalCom action={onClose} situation={situation}>
@@ -197,8 +193,8 @@ const MarketPopUp = ({ details, onClose, situation, marketInt, marketPlaceProduc
<div
className={`w-full p-2 md:w-3/4 text-slate-900 dark:text-white market-pop rounded-2xl ${
name == "Description"
? "min-h-[150px] max-h-[150px] h-full overflow-y-auto break-words bg-slate-50"
: name == "Delivery Detail" ? " overflow-y-auto h-full min-h-[150px] max-h-[150px] bg-slate-50"
? "min-h-[100px] max-h-[100px] h-full overflow-y-auto break-words bg-slate-50"
: name == "Delivery Detail" ? " overflow-y-auto h-full min-h-[200px] max-h-[200px] bg-slate-50"
: "h-full flex items-center"
}`}
>
+1 -1
View File
@@ -480,7 +480,7 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
{/* end Language list items*/}
</li>
<li className="content-item my-2 hover:bg-slate-100 transition duration-500 rounded-lg">
<Link to="#" className="notifications">
<Link to="/settings" className="notifications">
<div className="name">
<p className="text-sm py-2 px-4 text-dark-gray dark:text-white hover:text-sky-blue transition font-medium">
Account Settings
+2 -2
View File
@@ -1,6 +1,6 @@
/* Regular Weight */
@font-face {
font-family: "Product Sans";
font-family: Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif,"Product Sans";
src: url("./assets/fonts/Product Sans Regular.ttf");
}
.nft-main-container {
@@ -8,7 +8,7 @@
}
/* Bold Weight */
@font-face {
font-family: "Product Sans";
font-family: Roboto,"Product Sans";
src: url("./assets/fonts/Product Sans Bold.ttf");
}
.SENDER {
+1
View File
@@ -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,
+1 -1
View File
@@ -90,7 +90,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
apiCall
.loadProfile()
.then((res) => {
if (res?.data?.internal_return < 0) {
if (!res?.data?.internal_return || res?.data?.internal_return < 0) {
setIsLogin({ loading: false, status: false });
return;
}
+9 -1
View File
@@ -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 = {
@@ -1687,7 +1695,7 @@ class usersService {
if(localStorage && localStorage.getItem('myloc')){
reqData.loc = localStorage.getItem('myloc')
}
return Axios.post(endPoint, reqData)
return Axios.post(endPoint, reqData,{timeout: 7000 })
.then((response) => {
// console.log(response);
// console.log("~~~~~~~ WrenchBoard::POST ~~~~~~~~");
+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>
);
+3 -69
View File
@@ -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;