Compare commits

...

3 Commits

Author SHA1 Message Date
victorAnumudu 7e7176ae5c server icon fix 2023-11-11 07:03:54 +01:00
victorAnumudu 306fa1300d replaced images to server images on mytask route 2023-11-11 06:26:00 +01:00
ameye 7b3178bd1a Merge branch 'add-family-btn-bug' of WrenchBoard/Users-Wrench into master 2023-11-10 17:50:11 +00:00
8 changed files with 19 additions and 17 deletions
@@ -5,7 +5,7 @@ import localImgLoad from "../../lib/localImgLoad";
import CountDown from "../Helpers/CountDown"; import CountDown from "../Helpers/CountDown";
import Icons from "../Helpers/Icons"; import Icons from "../Helpers/Icons";
export default function FamilyActiveJobsCard({ datas, hidden = false }) { export default function FamilyActiveJobsCard({ datas, hidden = false, image_server }) {
let { pathname } = useLocation(); let { pathname } = useLocation();
@@ -22,7 +22,8 @@ export default function FamilyActiveJobsCard({ datas, hidden = false }) {
} }
}; };
//debugger; //debugger;
const bannerName = datas.banner == null ?'default.jpg':datas.banner; // const bannerName = datas.banner == null ?'default.jpg':datas.banner;
let image = `${image_server}${localStorage.getItem('session_token')}/job/${datas.origin_job_uid}`
return ( return (
<div className="card-style-one flex flex-col justify-between w-full h-[387px] bg-white dark:bg-dark-white p-3 pb rounded-2xl"> <div className="card-style-one flex flex-col justify-between w-full h-[387px] bg-white dark:bg-dark-white p-3 pb rounded-2xl">
<div className="content"> <div className="content">
@@ -31,10 +32,13 @@ export default function FamilyActiveJobsCard({ datas, hidden = false }) {
{/* thumbnail image */} {/* thumbnail image */}
<div <div
className="thumbnail w-full h-full rounded-xl overflow-hidden px-4 pt-4" className="thumbnail w-full h-full rounded-xl overflow-hidden px-4 pt-4"
// style={{
// background: `url(${localImgLoad(
// `images/taskbanners/${bannerName}`
// )}) center / contain no-repeat`,
// }}
style={{ style={{
background: `url(${localImgLoad( background: `url(${image}) center / contain no-repeat`,
`images/taskbanners/${bannerName}`
)}) center / contain no-repeat`,
}} }}
> >
{/* <div className="product-options flex justify-between relative">*/} {/* <div className="product-options flex justify-between relative">*/}
+1 -5
View File
@@ -14,11 +14,7 @@ export default function OfferCard({
datas?.currency datas?.currency
); );
let image = localStorage.getItem("session_token") let image = `${image_server}${localStorage.getItem("session_token")}/job/${datas.job_uid}`
? `${image_server}${localStorage.getItem("session_token")}/job/${
datas.job_uid
}`
: "";
return ( return (
<div className="card-style-one flex flex-col justify-between w-full h-[387px] bg-white dark:bg-dark-white p-3 pb rounded-2xl"> <div className="card-style-one flex flex-col justify-between w-full h-[387px] bg-white dark:bg-dark-white p-3 pb rounded-2xl">
+2 -2
View File
@@ -4,7 +4,7 @@ import Icons from "../Helpers/Icons";
import SliderCom from "../Helpers/SliderCom"; import SliderCom from "../Helpers/SliderCom";
import FamilyActiveJobsCard from "../Cards/FamilyActiveJobsCard"; import FamilyActiveJobsCard from "../Cards/FamilyActiveJobsCard";
export default function FamilyActiveLSlde({ className, trending }) { export default function FamilyActiveLSlde({ className, trending, image_server }) {
const settings = { const settings = {
arrows: false, arrows: false,
slidesToShow: 3, slidesToShow: 3,
@@ -98,7 +98,7 @@ export default function FamilyActiveLSlde({ className, trending }) {
{trending && {trending &&
trending.length > 0 && trending.length > 0 &&
trending.map((item) => ( trending.map((item) => (
<FamilyActiveJobsCard key={item.id} datas={item} /> <FamilyActiveJobsCard key={item.id} datas={item} image_server={image_server} />
))} ))}
</SliderCom> </SliderCom>
</div> </div>
+1 -1
View File
@@ -19,7 +19,7 @@ export default function FamilyDash({ familyOffers, MyActiveJobList }) {
/> />
)} )}
{trending && trending.length > 0 && ( {trending && trending.length > 0 && (
<FamilyActiveLSlde trending={trending} className="mb-10" /> <FamilyActiveLSlde trending={trending} className="mb-10" image_server={familyOffers?.session_image_server} />
)} )}
{/*<TopSellerTopBuyerSliderSection className="mb-10" />*/} {/*<TopSellerTopBuyerSliderSection className="mb-10" />*/}
+1
View File
@@ -34,6 +34,7 @@ export default function FullAccountDash(props) {
<MyJobTable <MyJobTable
ActiveJobList={props.MyActiveJobList} ActiveJobList={props.MyActiveJobList}
Account={userDetails} Account={userDetails}
imageServer={props.offersList?.data?.session_image_server}
/> />
</> </>
) : !props.offersList?.loading && !props.MyActiveJobList?.loading ? ( ) : !props.offersList?.loading && !props.MyActiveJobList?.loading ? (
+3 -2
View File
@@ -10,7 +10,7 @@ import localImgLoad from "../../lib/localImgLoad";
const noTasksBg = require("../../assets/images/no-task-background.jpg"); const noTasksBg = require("../../assets/images/no-task-background.jpg");
const noFamilyTasksBg = require("../../assets/images/family-no-task-background.jpg"); const noFamilyTasksBg = require("../../assets/images/family-no-task-background.jpg");
export default function MyJobTable({ className, ActiveJobList, Account }) { export default function MyJobTable({ className, ActiveJobList, Account, imageServer }) {
let navigate = useNavigate(); let navigate = useNavigate();
let { pathname } = useLocation(); let { pathname } = useLocation();
@@ -71,6 +71,7 @@ export default function MyJobTable({ className, ActiveJobList, Account }) {
task?.currency_code, task?.currency_code,
task?.currency task?.currency
); );
let image = `${imageServer}${localStorage.getItem('session_token')}/job/${task.origin_job_uid}`
return ( return (
<div <div
className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] w-full flex justify-between items-center hover:bg-gray-50" className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] w-full flex justify-between items-center hover:bg-gray-50"
@@ -80,7 +81,7 @@ export default function MyJobTable({ className, ActiveJobList, Account }) {
<div className="flex space-x-2 items-center"> <div className="flex space-x-2 items-center">
<div className="w-full min-w-[60px] max-w-[60px] flex-[0.1] h-[60px] rounded-full overflow-hidden flex justify-center items-center"> <div className="w-full min-w-[60px] max-w-[60px] flex-[0.1] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
<img <img
src={localImgLoad(`images/taskbanners/${task?.banner}`)} src={image}
alt="data" alt="data"
className="w-full h-full" className="w-full h-full"
/> />
+1 -1
View File
@@ -122,7 +122,7 @@ export default function MyOffersTable({ className, MyActiveOffersList }) {
MyActiveOffersList?.result_list?.length > 0 && MyActiveOffersList?.result_list?.length > 0 &&
MyActiveOffersList.result_list.map((item) => { MyActiveOffersList.result_list.map((item) => {
return ( return (
<OfferCard key={item.id} datas={item} setOfferPopout={setOfferPopout} /> <OfferCard key={item.id} datas={item} setOfferPopout={setOfferPopout} image_server={MyActiveOffersList.session_image_server} />
) )
})} })}
</SliderCom> </SliderCom>
+1 -1
View File
@@ -94,7 +94,7 @@ export default function MyTasks({
</button> </button>
} }
</div> </div>
<MyJobTable ActiveJobList={ActiveJobList} Account={userDetails} /> <MyJobTable ActiveJobList={ActiveJobList} Account={userDetails} imageServer={MyActiveOffersList.session_image_server} />
</div> </div>
</div> </div>
</Layout> </Layout>