Compare commits

...

5 Commits

Author SHA1 Message Date
victorAnumudu 7859cffd49 no wallet view dummy component added 2024-06-20 15:43:58 +01:00
victorAnumudu 3a574d1fd0 added no wallet message 2024-06-19 18:32:33 +01:00
ameye 7c6a2316a8 Merge branch 'my-page-link-hidden' of WrenchBoard/Users-Wrench into master 2024-06-01 13:25:20 +00:00
ameye ef99a8f1f7 Merge branch 'market-thumbnail' of WrenchBoard/Users-Wrench into master 2024-06-01 13:25:12 +00:00
victorAnumudu 05453661ee job thumbnail position changed 2024-05-31 13:33:01 +01:00
3 changed files with 55 additions and 36 deletions
@@ -145,6 +145,7 @@ export default function Login() {
localStorage.setItem("member_id", `${res.data.member_id}`);
localStorage.setItem("uid", `${res.data.uid}`);
localStorage.setItem("session_token", `${res.data.session}`);
localStorage.setItem("wallet_status", `${res.data.wallet_status}`);
if (res.data?.account_type == "FAMILY") {
sessionStorage.setItem("family_uid", res.data?.family_uid);
sessionStorage.setItem("parent_uid", res.data?.parent_uid);
+33 -26
View File
@@ -44,39 +44,46 @@ export default function AvailableJobsCard({
}}
className="flex flex-col justify-between w-full h-full"
>
<h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
{datas.title}
</h1>
<div className="card-two-info flex justify-between items-center">
<div className="owned-by flex space-x-2 items-center">
<div>
<p className="text-thin-light-gray text-sm leading-3">
Added
</p>
<p className="text-base text-dark-gray dark:text-white">
{new Date(datas.offer_added).toLocaleDateString()}
</p>
</div>
<div className='w-full flex items-center gap-4'>
<div className='min-w-[60px] min-h-[60px] max-w-[60px] max-h-[60px] rounded-full overflow-hidden'>
<img className='w-full h-full object-cover' src={image} alt='Job Image' />
</div>
<div className="w-[1px] bg-light-purple dark:bg-dark-light-purple h-7"></div>
<div className="created-by flex space-x-2 items-center flex-row-reverse">
<div>
<p className="text-thin-light-gray text-sm leading-3 text-right">
Expires
</p>
<p className="text-base text-dark-gray dark:text-white text-right">
{new Date(datas.expire).toLocaleDateString()}
</p>
<div className='w-full'>
<h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
{datas.title}
</h1>
<div className="card-two-info flex justify-between items-center">
<div className="owned-by flex space-x-2 items-center">
<div>
<p className="text-thin-light-gray text-sm leading-3">
Added
</p>
<p className="text-base text-dark-gray dark:text-white">
{new Date(datas.offer_added).toLocaleDateString()}
</p>
</div>
</div>
<div className="w-[1px] bg-light-purple dark:bg-dark-light-purple h-7"></div>
<div className="created-by flex space-x-2 items-center flex-row-reverse">
<div>
<p className="text-thin-light-gray text-sm leading-3 text-right">
Expires
</p>
<p className="text-base text-dark-gray dark:text-white text-right">
{new Date(datas.expire).toLocaleDateString()}
</p>
</div>
</div>
</div>
</div>
</div>
<div className="thumbnail-area w-full">
<div
className="w-full h-[236px] p-6 rounded-xl overflow-hidden bg-center bg-cover bg-no-repeat"
style={{
backgroundImage: `url('${image}')`,
}}
// style={{
// backgroundImage: `url('${image}')`,
// }}
>
<div className="flex justify-center bg-slate-100 p-2 rounded-md">
{datas.description}
+21 -10
View File
@@ -11,7 +11,7 @@ import { useSelector } from "react-redux";
export default function WalletHeader(props) {
const {userDetails: { account_type }} = useSelector((state) => state?.userDetails);
const {userDetails: { account_type, wallet_status }} = useSelector((state) => state?.userDetails);
// debugger;
//props.myWalletList.result_list
let { pathname } = useLocation();
@@ -22,6 +22,7 @@ export default function WalletHeader(props) {
props.setBalanceDropdown.toggle();
else navigate("/my-wallet", { replace: true });
}
console.log('props.myWalletList', wallet_status)
return (
<>
{account_type == 'FULL' ?
@@ -49,6 +50,7 @@ export default function WalletHeader(props) {
</h3>
</div>
<div className="content px-7 pb-7">
{(wallet_status == '1' || localStorage.getItem('wallet_status')== '1') ?
<ul>
{props.myWalletList &&
props.myWalletList?.length > 0 &&
@@ -176,17 +178,25 @@ export default function WalletHeader(props) {
{/* </div>*/}
{/*</li>*/}
</ul>
:
<div className='p-2 w-full flex gap-4 items-center'>
<img className='w-[100px!important] h-auto' src={localImgLoad('images/icons/wallet.svg')} alt='Wallet Icon' />
<p className='text-lg text-red-500'>We do not currently support wallets in your area. We are diligently working on it. </p>
</div>
}
{(wallet_status == '1' || localStorage.getItem('wallet_status')== '1') &&
<div className="add-money-btn flex justify-center items-center mt-3">
{/* <button
onClick={() => {
if(pathname == '/my-wallet') props.setBalanceDropdown.toggle()
else navigate('/my-wallet', {replace: true})
}}
type="button"
className="w-[122px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
>
Manage
</button> */}
onClick={() => {
if(pathname == '/my-wallet') props.setBalanceDropdown.toggle()
else navigate('/my-wallet', {replace: true})
}}
type="button"
className="w-[122px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
>
Manage
</button> */}
<Link
to="/my-wallet"
onClick={onWalletClick}
@@ -195,6 +205,7 @@ export default function WalletHeader(props) {
Manage
</Link>
</div>
}
</div>
</div>
</div>