Compare commits

...

4 Commits

4 changed files with 65 additions and 41 deletions
+16 -16
View File
@@ -1,22 +1,22 @@
import Toaster from "./components/Helpers/Toaster";
import Routers from "./Routers";
import Default from "./components/Partials/Default";
import { Navigate, useLocation } from "react-router-dom"; import { Navigate, useLocation } from "react-router-dom";
import Routers from "./Routers";
import Toaster from "./components/Helpers/Toaster";
import Default from "./components/Partials/Default";
function App() { function App() {
const {pathname} = useLocation() const { pathname } = useLocation();
return ( return (
<Default> <Default>
<> <>
{pathname.startsWith('/@') ? {pathname.startsWith("/@") ? (
<Navigate to="/app" replace={true} /> <Navigate to="/app" replace={true} />
: ) : (
<Routers /> <Routers />
} )}
<Toaster /> <Toaster />
</> </>
</Default> </Default>
); );
} }
export default App; export default App;
@@ -115,8 +115,6 @@ export default function VerifyLink() {
debouncedEmail(token); debouncedEmail(token);
}, []); }, []);
// ebube.ojinta+ga1@chiefsoft.com
return ( return (
<> <>
<AuthLayout slogan="Welcome to WrenchBoard"> <AuthLayout slogan="Welcome to WrenchBoard">
+25
View File
@@ -2,6 +2,7 @@ import React from "react";
import ParentWaiting from "../MyOffers/ParentWaiting"; import ParentWaiting from "../MyOffers/ParentWaiting";
import MyOffersFamilyTable from "../MyTasks/MyOffersFamilyTable"; import MyOffersFamilyTable from "../MyTasks/MyOffersFamilyTable";
import FamilyActiveLSlde from "./FamilyActiveLSlde"; import FamilyActiveLSlde from "./FamilyActiveLSlde";
import { Link } from "react-router-dom";
export default function FamilyDash({ familyOffers, MyActiveJobList }) { export default function FamilyDash({ familyOffers, MyActiveJobList }) {
// console.log("PROPS IN FAMILY DASH->", familyOffers?.result_list); // console.log("PROPS IN FAMILY DASH->", familyOffers?.result_list);
@@ -11,6 +12,30 @@ export default function FamilyDash({ familyOffers, MyActiveJobList }) {
<div> <div>
<div className="home-page-wrapper"> <div className="home-page-wrapper">
{/* <CommonHead commonHeadData={props.commonHeadData} /> */} {/* <CommonHead commonHeadData={props.commonHeadData} /> */}
<div className="w-full mb-4 grid grid-cols-2 md:grid-cols-4 gap-2 md:gap-4">
{[1,2,3,4,5].map((item, index) => (
<Link to='/' className={`h-40 rounded-lg shadow-sm ${index%2==0 ? 'bg-red-200/50' : 'bg-sky-300/50'}`}>
<div >
</div>
</Link>
))}
</div>
<div className="my-4">
<h1 className="my-4 text-26 font-bold text-dark-gray dark:text-white tracking-wide">Resources</h1>
<div className="w-full grid grid-cols-2 md:grid-cols-3 gap-2 md:gap-4">
{[1,2,3,4,5].map((item, index) => (
<Link to='/' className={`h-40 rounded-lg shadow-sm ${index%2==0 ? 'bg-red-200/50' : 'bg-sky-300/50'}`}>
<div >
</div>
</Link>
))}
</div>
</div>
{familyOffers?.result_list && familyOffers?.result_list.length > 0 && ( {familyOffers?.result_list && familyOffers?.result_list.length > 0 && (
<MyOffersFamilyTable <MyOffersFamilyTable
familyOffers={familyOffers?.result_list} familyOffers={familyOffers?.result_list}
+24 -23
View File
@@ -48,6 +48,7 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
// 9308RDR122 // 9308RDR122
const handlerBalance = () => { const handlerBalance = () => {
setbalanceValue.toggle(); setbalanceValue.toggle();
if (notificationDropdown) { if (notificationDropdown) {
@@ -238,9 +239,9 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
</div> </div>
</button> </button>
{/* balance */} {/* balance */}
{/* My Page Button */} {/* My Page Button */}
<PageButton /> {userDetails.account_type === "FULL" ? <PageButton /> : null}
{/*<div className="lg:hidden block"></div>*/} {/*<div className="lg:hidden block"></div>*/}
<WalletHeader <WalletHeader
@@ -671,28 +672,28 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
); );
} }
const PageButton = () => { const PageButton = () => {
return ( return (
<Link to="/yourpage" className="lg:flex hidden user-balance cursor-pointer lg:w-[152px] w-[150px] h-[48px] items-center rounded-full relative bg-sky-blue pr-1.5 pl-4"> <Link
<div to="/yourpage"
className="flex items-center lg:justify-between justify-center w-full h-full" className="lg:flex hidden user-balance cursor-pointer lg:w-[152px] w-[150px] h-[48px] items-center rounded-full relative bg-sky-blue pr-1.5 pl-4"
> >
<span className="lg:block hidden w-[25px]"> <div className="flex items-center lg:justify-between justify-center w-full h-full">
<span className="lg:block hidden w-[25px]">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 68 50" id="Page"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 68 50" id="Page">
<path <path
fillRule="evenodd" fillRule="evenodd"
d="M0 13V2a2 2 0 0 1 2-2h64a2 2 0 0 1 2 2v11H0Zm0 4v31a2 2 0 0 0 2 2h20V17H0Zm26 33h40a2 2 0 0 0 2-2V17H26v33Z" d="M0 13V2a2 2 0 0 1 2-2h64a2 2 0 0 1 2 2v11H0Zm0 4v31a2 2 0 0 0 2 2h20V17H0Zm26 33h40a2 2 0 0 0 2-2V17H26v33Z"
fill="#ffffff" fill="#ffffff"
className="color000000 svgShape" className="color000000 svgShape"
></path> ></path>
</svg> </svg>
</span> </span>
<p className="lg:text-xl text-lg font-bold text-white">My Page</p> <p className="lg:text-xl text-lg font-bold text-white">My Page</p>
<span className="lg:block hidden"> <span className="lg:block hidden">
{/* <Icons name="deep-plus" /> */} {/* <Icons name="deep-plus" /> */}
</span> </span>
</div> </div>
</Link> </Link>
) );
} };