This commit is contained in:
Ebube
2023-05-31 10:35:08 +01:00
parent ced9c523ad
commit 16401cc3a2
5 changed files with 79 additions and 69 deletions
+17 -22
View File
@@ -138,26 +138,17 @@ export default function FamilyManageTabs({
} h-full p-4 border border-[#dbd9d9]`}
key={id}
>
<Suspense
fallback={
<LoadingSpinner size="8" color="sky-blue" />
}
>
{name === "Tasks" && (
<FamilyTasks
className={className}
loader={loader}
/>
)}
{name === "Account" && (
<Account
familyDetails={familyDetails}
myRef={accountRef}
handlePrint={useHandlePrint}
/>
)}
{name === "Profile" && <Profile />}
</Suspense>
{name === "Tasks" && (
<FamilyTasks className={className} loader={loader} />
)}
{name === "Account" && (
<Account
familyDetails={familyDetails}
myRef={accountRef}
handlePrint={useHandlePrint}
/>
)}
{name === "Profile" && <Profile />}
</div>
);
})}
@@ -244,12 +235,16 @@ const Account = forwardRef(({ familyDetails, myRef, handlePrint }) => {
<h2 className="font-bold text-lg tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
Username:{" "}
<span className="ml-2 normal-case">
{familyDetails?.username}
{familyDetails?.username
? familyDetails?.username
: "please wait..."}
</span>
</h2>
<h2 className="font-bold text-lg tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
Pin:{" "}
<span className="ml-2 normal-case">{familyDetails?.pin}</span>
<span className="ml-2 normal-case">
{familyDetails?.pin ? familyDetails?.pin : "please wait..."}
</span>
</h2>
</div>
+3 -3
View File
@@ -51,9 +51,9 @@ export default function MyOffersTable({ className, MyActiveOffersList}) {
// }
};
if ( !MyActiveOffersList || MyActiveOffersList?.result_list?.length == 0 ){
return(''); // want blank or no appear when no items
}
// if ( !MyActiveOffersList || MyActiveOffersList?.result_list?.length == 0 ){
// return(''); // want blank or no appear when no items
// }
return (
<>
+12 -4
View File
@@ -6,7 +6,11 @@ import CommonHead from "../UserHeader/CommonHead";
import TopSellerTopBuyerSliderSection from "../Home/TopSellerTopBuyerSliderSection";
import MyOffersTable from "./MyOffersTable";
export default function MyTasks({MyActiveOffersList, ActiveJobList, commonHeadData}) {
export default function MyTasks({
MyActiveOffersList,
ActiveJobList,
commonHeadData,
}) {
const [selectTab, setValue] = useState("today");
const filterHandler = (value) => {
setValue(value);
@@ -34,9 +38,13 @@ export default function MyTasks({MyActiveOffersList, ActiveJobList, commonHeadDa
></div>
</div>
</div>
<MyOffersTable
MyActiveOffersList={MyActiveOffersList}
className="mb-10" />
{MyActiveOffersList &&
MyActiveOffersList?.result_list?.length >= 0 && (
<MyOffersTable
MyActiveOffersList={MyActiveOffersList}
className="mb-10"
/>
)}
<MyJobTable ActiveJobList={ActiveJobList} />
</div>
</div>
-1
View File
@@ -12,7 +12,6 @@ export default function Sidebar({ sidebar, action, logoutModalHandler, myJobList
const darkMode = useContext(DarkModeContext);
let { userDetails } = useSelector((state) => state.userDetails);
console.log('user-details for job',userDetails);
//const jobLists = getJobList(); // pass from upper - we need in a lot of places
let { jobLists } = useSelector((state) => state.jobLists);
const marketData = jobLists?.result_list;