Compare commits

...

6 Commits

Author SHA1 Message Date
victorAnumudu ae494b3e48 auth fonts adjusted 2024-11-07 19:52:53 +01:00
ameye d2de4e8d56 Merge branch 'auth-loyout-adjust' of WrenchBoard/Users-Wrench into master 2024-11-07 13:46:19 +00:00
victorAnumudu cdd6b1beb5 adjustments added 2024-11-07 14:41:26 +01:00
ameye 96cb474288 Merge branch 'auth-layout-change' of WrenchBoard/Users-Wrench into master 2024-11-06 19:37:05 +00:00
victorAnumudu 897864b330 auth layout page changed 2024-11-06 19:42:55 +01:00
ameye 6396ab33d0 Merge branch 'text-fix' of WrenchBoard/Users-Wrench into master 2024-11-05 17:46:15 +00:00
11 changed files with 106 additions and 196 deletions
+52 -42
View File
@@ -1,6 +1,7 @@
import React, { useContext } from "react";
import { Link } from "react-router-dom";
import { localImgLoad } from "../../lib";
import WrenchBoard from "../../assets/images/wrenchboard-logo-text.png";
import DarkModeContext from "../Contexts/DarkModeContext";
@@ -13,65 +14,74 @@ export default function LoginLayout({ slogan, children }) {
return (
<div
className={`min-h-screen overflow-y-auto bg-cover bg-center flex flex-col justify-between items-center`}
className={`relative min-h-screen overflow-y-auto bg-cover bg-center flex flex-col items-center`}
style={{
backgroundImage: `url(${countryMode == "NG" ? bgImgNig : bgImgCom})`,
}}
>
<div className={`w-full grid grid-cols-1 xl:grid-cols-2`}>
<div className="my-5">
<Link to="#">
<img
src={WrenchBoard}
alt="wrenchboard"
className="h-10 mx-auto"
/>
</Link>
</div>
<div className={`h-full w-full mb-5 grid grid-cols-1 place-content-center`}>
{/* <div
className={`auth-bg hidden xl:block bg-blue-50 relative bg-cover bg-no-repeat border-0 after:content-[''] after:absolute after:inset-0`}
style={{backgroundImage: `url(${bgImg})`}}
>
</div> */}
<div className="p-5 sm:p-7 flex place-content-center xl:col-start-2">
<div className="py-5 w-full sm:w-11/12 max-w-[550px] shadow-md bg-slate-50 dark:bg-dark-white rounded-[0.475rem]">
<div className="p-5 sm:p-7 flex place-content-center">
<div className="pt-5 pb-5 w-full sm:w-11/12 max-w-[550px] shadow-md bg-slate-50 dark:bg-dark-white rounded-[0.475rem]">
<div className="w-full flex justify-center items-center">
{children && children}
</div>
</div>
</div>
</div>
<div className='w-full shadow-md bg-slate-50 dark:bg-dark-white'>
<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="https://www.wrenchboard.com/about-us"
className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
target="_blank"
rel="noreferrer"
>
About
</a>
<a
href="https://www.wrenchboard.com/service"
className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
target="_blank"
rel="noreferrer"
>
Services
</a>
<a
href="https://www.wrenchboard.com/contact"
className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
target="_blank"
rel="noreferrer"
>
Contact Us
</a>
<div className='absolute left-0 right-0 bottom-0'>
<div className='w-full shadow-md bg-slate-50 dark:bg-dark-white'>
<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="https://www.wrenchboard.com/about-us"
className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
target="_blank"
rel="noreferrer"
>
About
</a>
<a
href="https://www.wrenchboard.com/service"
className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
target="_blank"
rel="noreferrer"
>
Services
</a>
<a
href="https://www.wrenchboard.com/contact"
className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
target="_blank"
rel="noreferrer"
>
Contact Us
</a>
</div>
</div>
<p className="text-black text-[15px] px-2 font-medium flex items-center gap-1">
<span className="dark:text-white">
&copy; {new Date().getFullYear()} -
</span>
<Link to="/" className="text-[#009ef7] ml-1">
WrenchBoard
</Link>{" "}
</p>
</div>
<p className="text-black text-[15px] px-2 font-medium flex items-center gap-1">
<span className="dark:text-white">
&copy; {new Date().getFullYear()} -
</span>
<Link to="/" className="text-[#009ef7] ml-1">
WrenchBoard
</Link>{" "}
</p>
</div>
</div>
@@ -89,15 +89,6 @@ export default function ForgotPassword() {
<>
<AuthLayout slogan="Welcome to WrenchBoard">
<div className="w-full">
<div className="mb-12">
<Link to="#">
<img
src={WrenchBoard}
alt="wrenchboard"
className="h-10 mx-auto"
/>
</Link>
</div>
<div className="flex place-content-center">
<div className="w-10/12">
{msgSuccess == null ?
@@ -11,6 +11,9 @@ import AuthLayout from "../AuthLayout2";
import { useDispatch } from "react-redux";
// import { updateUserDetails } from "../../../store/UserDetails";
import GoogleDownload from '../../../assets/images/download/andriod.jpg'
import IOSDownload from '../../../assets/images/download/apple.jpg'
export default function LoginLanding() {
const queryParams = new URLSearchParams(location?.search);
@@ -27,7 +30,7 @@ export default function LoginLanding() {
<>
<AuthLayout slogan="Welcome to WrenchBoard">
<div className="w-full">
<div className="mb-5">
{/* <div className="mb-5">
<Link to="#">
<img
src={WrenchBoard}
@@ -35,17 +38,42 @@ export default function LoginLanding() {
className="h-10 mx-auto"
/>
</Link>
</div>
</div> */}
{/* <div className="content-wrapper login shadow-md w-10/12 mx-auto flex justify-center items-center xl:bg-white dark:bg-dark-white 2xl:w-[828px] rounded-[0.475rem] sm:p-7 p-5"> */}
<div className="flex place-content-center">
<div className="w-10/12">
<div className="title-area flex flex-col gap-5 justify-center items-center relative text-center mb-5">
<h1 className="text-[#181c32] font-medium dark:text-white leading-6 text-2xl tracking-wide">
<span className='font-semibold'>Log in</span> as a:
<div className='grid grid-cols-1 sm:grid-cols-5 gap-3'>
{/* APP DOWNLOAD STORE */}
<div className="col-span-1 order-2 sm:col-span-2 sm:order-1 w-full">
<div className="relative w-full h-full flex sm:flex-col justify-center gap-4">
<div className="w-28 sm:w-36">
<a
target="_blank"
rel="noreferrer"
href={process.env.REACT_APP_APPLE_APP}
>
<img src={IOSDownload} className='w-full h-auto' alt='IOS Download' />
</a>
</div>
<div className="w-28 sm:w-36">
<a
target="_blank"
rel="noreferrer"
href={process.env.REACT_APP_ANDROID_APP}
>
<img src={GoogleDownload} className='w-full h-auto' alt='IOS Download' />
</a>
</div>
<div className='hidden sm:block absolute top-0 bottom-0 right-0 w-1 rounded-full bg-[linear-gradient(180deg,_#94a3b8,_#0f172a,_#94a3b8)]'></div>
</div>
</div>
<div className="col-span-1 order-1 sm:col-span-3 sm:order-2 title-area flex flex-col gap-5 justify-center items-center relative text-center mb-5">
<h1 className="text-gray-400 font-medium text-[16.25px] leading-[24.375px]">
<span className='font-semibold text-[#4687ba] hover:text-[#009ef7] transition'>Log in</span> as a:
</h1>
<div className='w-full flex flex-col gap-4'>
<button name='full' onClick={()=>navigate('/login/parent', {state:{loginType:'full'}})} className='w-2/3 mx-auto flex justify-between items-center p-4 md:p-8 rounded-lg bg-[#e0f7eb] text-emerald-800 cursor-pointer'>
<button name='full' onClick={()=>navigate('/login/parent', {state:{loginType:'full'}})} className='w-full mx-auto flex justify-between items-center p-4 md:p-8 rounded-lg bg-[#e0f7eb] text-emerald-800 cursor-pointer'>
<div className='flex items-center gap-4'>
<img className='w-12 h-auto' src={ParentIcon} alt='login key' />
<p className='text-lg font-semibold'>Adult or Parent</p>
@@ -54,7 +82,7 @@ export default function LoginLanding() {
<i className="fa-solid fa-caret-right"></i>
</button>
<button name='family' onClick={()=>navigate('/login/kid', {state:{loginType:'family'}})} className='w-2/3 mx-auto flex justify-between items-center p-4 md:p-8 rounded-lg bg-[#f0eef1] text-[#a94ef3] cursor-pointer'>
<button name='family' onClick={()=>navigate('/login/kid', {state:{loginType:'family'}})} className='w-full mx-auto flex justify-between items-center p-4 md:p-8 rounded-lg bg-[#f0eef1] text-[#a94ef3] cursor-pointer'>
<div className='flex items-center gap-4'>
<img className='w-12 h-auto' src={KidIcon} alt='login key' />
<p className='text-lg font-semibold'>Kids or Teens</p>
@@ -68,12 +96,13 @@ export default function LoginLanding() {
Don't have an account?{" "}
<Link
to="/signup"
className="font-semibold text-emerald-800 hover:text-emerald-600 transition"
className="font-semibold text-[#4687ba] hover:text-[#009ef7] transition"
>
Sign Up
</Link>
</div>
</div>
</div>
</div>
</div>
</div>
+10 -6
View File
@@ -259,7 +259,7 @@ export default function Login() {
<>
<AuthLayout slogan="Welcome to WrenchBoard">
<div className="w-full">
<div className="mb-5">
{/* <div className="mb-5">
<Link to="#">
<img
src={WrenchBoard}
@@ -267,13 +267,13 @@ export default function Login() {
className="h-10 mx-auto"
/>
</Link>
</div>
</div> */}
{/* <div className="content-wrapper login shadow-md w-10/12 mx-auto flex justify-center items-center xl:bg-white dark:bg-dark-white 2xl:w-[828px] rounded-[0.475rem] sm:p-7 p-5"> */}
<div className="flex place-content-center">
<div className="w-10/12">
{/* HIDES THIS IF USER SESSION HAS EXPIRED */}
{sessionExpired != "true" && (
<div className="hidden title-area flex flex-col justify-center items-center relative text-center mb-7">
<div className="hidden title-area --flex-- flex-col justify-center items-center relative text-center mb-7">
{/* <h1 className="text-[#181c32] font-semibold dark:text-white mb-3 leading-[27.3px] text-[22.75px]">
Sign In to WrenchBoard
</h1> */}
@@ -327,6 +327,7 @@ export default function Login() {
{/* END of switch login component */}
{/* for login component */}
<h1 className='pb-2 text-center font-medium text-2xl leading-[24.375px]'>{loginType == 'full' ? 'Login' : 'Kids and Teens'}</h1>
{
loginType == "full" ? (
//user login component
@@ -390,7 +391,7 @@ export default function Login() {
{msgError}
</div>
)}
<div className="signin-area mb-3.5">
<div className="signin-area">
<div className="flex justify-center">
<button
name="full"
@@ -524,10 +525,13 @@ 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>
{/* END of login component */}
{/* APP DOWNLOAD STORE */}
<div className="w-full mt-4">
<div className="hidden w-full mt-4">
<div className="w-full flex justify-center items-center gap-4">
<div className="w-32 lg:w-48">
<a
@@ -568,7 +572,7 @@ export default function Login() {
{loginType == "full" && (
<>
<div className="pt-5 text-[#181c32] text-center font-semibold text-[13.975px] leading-[20.9625px]">
<div className="hidden pt-5 text-[#181c32] text-center font-semibold text-[13.975px] leading-[20.9625px]">
This site is protected by a Captcha. <br />Our Privacy Policy and
Terms of Service apply.
</div>
+1 -50
View File
@@ -107,15 +107,6 @@ export default function Promo() {
return (
<PromoPageLayout>
<div className="w-full">
<div className="mb-5">
<Link to="#">
<img
src={WrenchBoard}
alt="wrenchboard"
className="h-10 mx-auto"
/>
</Link>
</div>
{requestStatus.loading ?
<div className='flex flex-col justify-center items-center'>
<LoadingSpinner height='h-40' size='8' />
@@ -178,47 +169,7 @@ export default function Promo() {
</button>
</div>
</div>
{/* APP DOWNLOAD STORE */}
<div className="w-full mt-4">
<div className="w-full flex justify-center items-center gap-4">
<div className="w-32 lg:w-48">
<a
// className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
target="_blank"
rel="noreferrer"
href={process.env.REACT_APP_APPLE_APP}
>
{/* <i className="fa-brands fa-apple text-3xl"></i>
<div className="flex flex-col">
<span className="text-[11px]">Available on the</span>
<span className="text-[12px] lg:text-base">
App Store
</span>
</div> */}
<img src={IOSDownload} className='w-full h-auto' alt='IOS Download' />
</a>
</div>
<div className="w-32 lg:w-48">
<a
// className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
target="_blank"
rel="noreferrer"
href={process.env.REACT_APP_ANDROID_APP}
>
{/* <i className="fa-brands fa-google-play text-2xl"></i>
<div className="flex flex-col">
<span className="text-[11px]">Available on the</span>
<span className="text-[12px] lg:text-base">
Google Play
</span>
</div> */}
<img src={GoogleDownload} className='w-full h-auto' alt='IOS Download' />
</a>
</div>
</div>
</div>
</div>
</div>
</div>
:
<ErrorComponent onClick={() => navigate("/login")} />
+2 -51
View File
@@ -157,15 +157,6 @@ export default function SignUp() {
<>
<AuthLayout slogan="Welcome to WrenchBoard">
<div className="w-full">
<div className="mb-5">
<Link to={currentPath}>
<img
src={WrenchBoard}
alt="wrenchboard"
className="h-10 mx-auto"
/>
</Link>
</div>
<div className="flex place-content-center">
<div className="w-10/12">
<div className="title-area flex flex-col justify-center items-center relative text-center mb-7">
@@ -280,12 +271,12 @@ export default function SignUp() {
</button>
<span
onClick={rememberMe}
className="cursor-default text-dark-gray dark:text-white text-[15px] 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
<Link
href="#"
className="text-base text-[#4687ba] hover:text-[#009ef7] mx-1 inline-block"
className="font-semibold text-[#4687ba] hover:text-[#009ef7] transition mx-1 inline-block"
>
terms and condition
</Link>
@@ -346,46 +337,6 @@ export default function SignUp() {
</button>
</div>
</div>
{/* APP DOWNLOAD STORE */}
<div className="w-full mt-4">
<div className="w-full flex justify-center items-center gap-4">
<div className="w-32 lg:w-48">
<a
// className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
target="_blank"
rel="noreferrer"
href={process.env.REACT_APP_APPLE_APP}
>
{/* <i className="fa-brands fa-apple text-3xl"></i>
<div className="flex flex-col">
<span className="text-[11px]">Available on the</span>
<span className="text-[12px] lg:text-base">
App Store
</span>
</div> */}
<img src={IOSDownload} className='w-full h-auto' alt='IOS Download' />
</a>
</div>
<div className="w-32 lg:w-48">
<a
// className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
target="_blank"
rel="noreferrer"
href={process.env.REACT_APP_ANDROID_APP}
>
{/* <i className="fa-brands fa-google-play text-2xl"></i>
<div className="flex flex-col">
<span className="text-[11px]">Available on the</span>
<span className="text-[12px] lg:text-base">
Google Play
</span>
</div> */}
<img src={GoogleDownload} className='w-full h-auto' alt='IOS Download' />
</a>
</div>
</div>
</div>
</div>
</div>
</div>
@@ -137,15 +137,6 @@ export default function VerifyLink() {
</div>
) : (
<div className="w-full">
<div className="mb-12">
<Link to="#">
<img
src={WrenchBoard}
alt="wrenchboard"
className="h-10 mx-auto"
/>
</Link>
</div>
<div className="flex place-content-center">
<div className="w-10/12">
<div className="title-area flex flex-col justify-center items-center relative text-center mb-7">
@@ -139,15 +139,6 @@ const VerifyPassword = () => {
<>
<AuthLayout slogan="Welcome to WrenchBoard">
<div className="w-full">
<div className="mb-12">
<Link to="#">
<img
src={WrenchBoard}
alt="wrenchboard"
className="h-10 mx-auto"
/>
</Link>
</div>
<div className="flex place-content-center">
{requestStatus.loading ? (
<LoadingSpinner color="sky-blue" size="16" height="h-300px" />
@@ -8,15 +8,6 @@ export default function VerifyYou() {
<>
<AuthLayout slogan="Welcome to WrenchBoard">
<div className="w-full">
<div className="mb-12">
<Link to="#">
<img
src={WrenchBoard}
alt="wrenchboard"
className="h-10 mx-auto"
/>
</Link>
</div>
<div className="flex place-content-center">
<div className="w-10/12">
<div className="title-area flex flex-col justify-center items-center relative text-center mb-7">
+1 -1
View File
@@ -51,7 +51,7 @@ export default function FamilyWalletBox({ wallet, payment }) {
height="min-h-[240px]"
/>
</div>
) : wallet?.data.length > 0 ? (
) : wallet?.data?.length > 0 ? (
<>
{wallet?.data?.length > 1 && (
<div className="wal-selection px-5 py-2 text-black dark:text-white flex items-center gap-2">
+3 -2
View File
@@ -11,7 +11,7 @@ import Sidebar from "./Sidebar";
export default function Layout({ children }) {
const { userDetails } = useSelector((state) => state?.userDetails); // CHECKS FOR USER Details
const { drawer } = useSelector((state) => state.drawer);
const { userJobList } = useSelector((state) => state.userJobList);
const dispatch = useDispatch();
@@ -22,13 +22,14 @@ export default function Layout({ children }) {
};
const navigate = useNavigate();
const logOut = () => {
let loginType = userDetails?.account_type == 'FULL' ? 'parent' : 'kid'
sessionStorage.clear();
localStorage.clear();
// toast.success("Come Back Soon", {
// icon: `🙂`,
// });
navigate("/login", { replace: true });
navigate(`/login/${loginType}`, {state:{loginType:userDetails?.account_type.toLowerCase()}, replace:true});
};
return (