Compare commits

...

2 Commits

Author SHA1 Message Date
victorAnumudu a9cf3c9d22 added breadcrumb to some pages in full account type 2024-03-07 16:51:24 +01:00
ameye 01bf8a4c52 Merge branch 'login-page-width' of WrenchBoard/Users-Wrench into master 2024-03-07 12:50:47 +00:00
4 changed files with 29 additions and 5 deletions
+13 -1
View File
@@ -13,6 +13,7 @@ import ModalCom from "../Helpers/ModalCom";
import Layout from "../Partials/Layout"; import Layout from "../Partials/Layout";
import LoadingSpinner from "../Spinners/LoadingSpinner"; import LoadingSpinner from "../Spinners/LoadingSpinner";
import FamilyTable from "./FamilyTable"; import FamilyTable from "./FamilyTable";
import CustomBreadcrumb from "../Breadcrumb/CustomBreadcrumb";
export default function FamilyAcc() { export default function FamilyAcc() {
// State to store the selected year and month // State to store the selected year and month
@@ -137,7 +138,18 @@ export default function FamilyAcc() {
<div className="sm:flex justify-between items-center mb-6"> <div className="sm:flex justify-between items-center mb-6">
<div className="mb-5 sm:mb-0"> <div className="mb-5 sm:mb-0">
<h1 className="text-26 font-bold inline-flex gap-3 text-dark-gray dark:text-white items-center"> <h1 className="text-26 font-bold inline-flex gap-3 text-dark-gray dark:text-white items-center">
<span className={``}>Family Accounts</span> {/* <span className={``}>Family Accounts</span> */}
<div className="mb-5">
<CustomBreadcrumb
title = {'Family Account'}
breadcrumb={
[
{ link: "/", title: "Home" },
{ link: "/acc-family", title: "Family-acc", active: true},
]
}
/>
</div>
{familyList?.result_list?.length < {familyList?.result_list?.length <
process.env.REACT_APP_MAX_FAMILY_MEMBERS && process.env.REACT_APP_MAX_FAMILY_MEMBERS &&
!loader && ( !loader && (
+1 -1
View File
@@ -18,7 +18,7 @@ export default function MainSection({
); );
const [tab, setTab] = useState(Object.keys(marketCategories)[0]); const [tab, setTab] = useState(Object.keys(marketCategories)[0]);
let [contentDisplay, setContentDisplay] = useState("grid"); // STATE TO HOLD LIST VIEW STYLE let [contentDisplay, setContentDisplay] = useState("list"); // STATE TO HOLD LIST VIEW STYLE
// Convert to array in order to map // Convert to array in order to map
const mappedArray = Object.entries(marketCategories).map(([key, value]) => { const mappedArray = Object.entries(marketCategories).map(([key, value]) => {
+12
View File
@@ -2,6 +2,7 @@ import { useSelector } from "react-redux";
import Layout from "../Partials/Layout"; import Layout from "../Partials/Layout";
import CommonHead from "../UserHeader/CommonHead"; import CommonHead from "../UserHeader/CommonHead";
import MainSection from "./MainSection"; import MainSection from "./MainSection";
import CustomBreadcrumb from "../Breadcrumb/CustomBreadcrumb";
export default function MarketPlace({ commonHeadData }) { export default function MarketPlace({ commonHeadData }) {
let { jobLists } = useSelector((state) => state.jobLists); let { jobLists } = useSelector((state) => state.jobLists);
@@ -13,6 +14,17 @@ export default function MarketPlace({ commonHeadData }) {
<> <>
<Layout> <Layout>
<CommonHead commonHeadData={commonHeadData} /> <CommonHead commonHeadData={commonHeadData} />
<div className="mb-5">
<CustomBreadcrumb
title = {'Market'}
breadcrumb={
[
{ link: "/", title: "Home" },
{ link: "/market", title: "Market", active: true},
]
}
/>
</div>
<MainSection <MainSection
marketPlaceProduct={marketData} marketPlaceProduct={marketData}
categories={categories} categories={categories}
+3 -3
View File
@@ -75,7 +75,7 @@ export default function MyTasks({
/> />
)} )}
<div className="w-full mb-5 flex justify-between items-center gap-1"> <div className="w-full mb-5 flex justify-between items-center gap-1">
{userDetails.account_type == 'FULL'? {/* {userDetails.account_type == 'FULL'?
<h1 className="text-26 font-bold text-dark-gray dark:text-white"> <h1 className="text-26 font-bold text-dark-gray dark:text-white">
<span <span
className={`${selectTab === "today" ? "block" : "hidden"}`} className={`${selectTab === "today" ? "block" : "hidden"}`}
@@ -83,7 +83,7 @@ export default function MyTasks({
My Tasks My Tasks
</span> </span>
</h1> </h1>
: : */}
<CustomBreadcrumb <CustomBreadcrumb
title = 'My Tasks' title = 'My Tasks'
breadcrumb={ breadcrumb={
@@ -93,7 +93,7 @@ export default function MyTasks({
] ]
} }
/> />
} {/* } */}
{ActiveJobList?.data?.length > 0 && userDetails.account_type == 'FAMILY' && {ActiveJobList?.data?.length > 0 && userDetails.account_type == 'FAMILY' &&
<button <button