Compare commits

...

8 Commits

8 changed files with 29 additions and 31 deletions
+2 -2
View File
@@ -79,7 +79,7 @@ REACT_APP_ANDROID_APP='https://play.google.com/store/apps/details?id=com.wrenchb
REACT_APP_APPLE_APP='https://itunes.apple.com/us/app/wrenchboard/id1435718367?ls=1&mt=8' REACT_APP_APPLE_APP='https://itunes.apple.com/us/app/wrenchboard/id1435718367?ls=1&mt=8'
# Displays the new family dashboard with boxes # Displays the new family dashboard with boxes
REACT_APP_SHOW_NEW_FAMILY_DASH=0 REACT_APP_SHOW_NEW_FAMILY_DASH=1
# Displays the account dashboard # Displays the account dashboard
REACT_APP_SHOW_ACCOUNT_DASH=0 REACT_APP_SHOW_ACCOUNT_DASH=1
+2 -4
View File
@@ -5,7 +5,6 @@ import MarketPopUp from "../MarketPlace/PopUp/MarketPopUp";
export default function AvailableJobsCard({ export default function AvailableJobsCard({
className, className,
datas, datas,
key,
hidden = false, hidden = false,
contentDisplay, contentDisplay,
image_server, image_server,
@@ -38,7 +37,6 @@ export default function AvailableJobsCard({
className={`card-style-two w-full h-[426px] p-[20px] bg-white dark:bg-dark-white rounded-2xl section-shadow ${ className={`card-style-two w-full h-[426px] p-[20px] bg-white dark:bg-dark-white rounded-2xl section-shadow ${
className || "" className || ""
}`} }`}
key={key}
> >
<div <div
onClick={() => { onClick={() => {
@@ -57,7 +55,7 @@ export default function AvailableJobsCard({
Added Added
</p> </p>
<p className="text-base text-dark-gray dark:text-white"> <p className="text-base text-dark-gray dark:text-white">
{datas.offer_added} {new Date(datas.offer_added).toLocaleDateString()}
</p> </p>
</div> </div>
</div> </div>
@@ -68,7 +66,7 @@ export default function AvailableJobsCard({
Expires Expires
</p> </p>
<p className="text-base text-dark-gray dark:text-white text-right"> <p className="text-base text-dark-gray dark:text-white text-right">
{datas.expire} {new Date(datas.expire).toLocaleDateString()}
</p> </p>
</div> </div>
</div> </div>
@@ -85,7 +85,7 @@ const TopBanner = ({ image, title = "", desc = "", btn, link_path, key }) => {
</Link> </Link>
</div> </div>
<div className="flex justify-between w-full px-2 items-center"> <div className="flex justify-between w-full px-2 items-center">
<Link to={link_path} className="text-slate-300 font-semibold"> <Link to={link_path} className="text-slate-300 font-semibold text-sm">
{btn} {btn}
</Link> </Link>
<button className="flex items-center justify-center gap-2"> <button className="flex items-center justify-center gap-2">
@@ -125,7 +125,7 @@ const LowerBanner = ({ image, title = "", desc = "", btn, link_path, key }) => {
</Link> </Link>
</div> </div>
<div className="flex justify-between w-full px-2 items-center"> <div className="flex justify-between w-full px-2 items-center">
<Link to={link_path} className="text-slate-300 font-semibold"> <Link to={link_path} className="text-slate-300 font-semibold text-sm">
{btn} {btn}
</Link> </Link>
<button className="flex items-center justify-center gap-2"> <button className="flex items-center justify-center gap-2">
@@ -16,7 +16,7 @@ export default function JobOwnerDashboard({
return ( return (
<div <div
className={`w-full min-h-[100px] flex lg:p-8 p-4 justify-between items-center gap-2 rounded-2xl overflow-hidden bg-sky-blue ${ className={`w-full h-[75px] flex p-4 justify-between items-center gap-2 rounded-2xl overflow-hidden bg-sky-blue ${
className || "" className || ""
}`} }`}
style={{ style={{
@@ -28,12 +28,12 @@ export default function JobOwnerDashboard({
<div className="h-full flex w-full justify-between mb-5 lg:mb-0"> <div className="h-full flex w-full justify-between mb-5 lg:mb-0">
{/* heading */} {/* heading */}
<div className="flex gap-8"> <div className="flex gap-8">
<h1 className="lg:text-2xl text-xl font-medium text-white tracking-wide"> <h1 className="text-base ng font-medium text-white tracking-wide">
Welcome Welcome
</h1> </h1>
{/* user */} {/* user */}
<div> <div>
<p className="text-3xl tracking-wide font-bold antise text-white"> <p className="text-base tracking-wide font-bold antise text-white">
{`${firstname} ${lastname}`} {`${firstname} ${lastname}`}
</p> </p>
<p className="text-sm tracking-wide text-white">@{userEmail}</p> <p className="text-sm tracking-wide text-white">@{userEmail}</p>
@@ -72,7 +72,7 @@ export default function JobOwnerDashboard({
</div> </div>
</div> </div>
)} )}
<span className="text-[18px] font-thin tracking-wide text-white flex items-end"> <span className="text-base font-thin tracking-wide text-white flex items-end">
Last Login : {loginDate} Last Login : {loginDate}
</span> </span>
</div> </div>
+4 -4
View File
@@ -16,7 +16,7 @@ export default function JobOwnerDashboard({
return ( return (
<div <div
className={`w-full min-h-[100px] flex lg:p-8 p-4 justify-between items-center gap-2 rounded-2xl overflow-hidden bg-sky-blue ${ className={`w-full h-[75px] flex p-4 justify-between items-center gap-2 rounded-2xl overflow-hidden bg-sky-blue ${
className || "" className || ""
}`} }`}
style={{ style={{
@@ -28,12 +28,12 @@ export default function JobOwnerDashboard({
<div className="h-full flex w-full justify-between mb-5 lg:mb-0"> <div className="h-full flex w-full justify-between mb-5 lg:mb-0">
{/* heading */} {/* heading */}
<div className="flex gap-8"> <div className="flex gap-8">
<h1 className="lg:text-2xl text-xl font-medium text-white tracking-wide"> <h1 className="text-base ng font-medium text-white tracking-wide">
Welcome Welcome
</h1> </h1>
{/* user */} {/* user */}
<div> <div>
<p className="text-3xl tracking-wide font-bold antise text-white"> <p className="text-base tracking-wide font-bold antise text-white">
{`${firstname} ${lastname}`} {`${firstname} ${lastname}`}
</p> </p>
<p className="text-sm tracking-wide text-white">@{userEmail}</p> <p className="text-sm tracking-wide text-white">@{userEmail}</p>
@@ -72,7 +72,7 @@ export default function JobOwnerDashboard({
</div> </div>
</div> </div>
)} )}
<span className="text-[18px] font-thin tracking-wide text-white flex items-end"> <span className="text-base font-thin tracking-wide text-white flex items-end">
Last Login : {loginDate} Last Login : {loginDate}
</span> </span>
</div> </div>
@@ -16,7 +16,7 @@ export default function JobOwnerDashboard({
return ( return (
<div <div
className={`w-full min-h-[100px] flex lg:p-8 p-4 justify-between items-center gap-2 rounded-2xl overflow-hidden bg-sky-blue ${ className={`w-full h-[75px] flex p-4 justify-between items-center gap-2 rounded-2xl overflow-hidden bg-sky-blue ${
className || "" className || ""
}`} }`}
style={{ style={{
@@ -28,12 +28,12 @@ export default function JobOwnerDashboard({
<div className="h-full flex w-full justify-between mb-5 lg:mb-0"> <div className="h-full flex w-full justify-between mb-5 lg:mb-0">
{/* heading */} {/* heading */}
<div className="flex gap-8"> <div className="flex gap-8">
<h1 className="lg:text-2xl text-xl font-medium text-white tracking-wide"> <h1 className="text-base font-medium text-white tracking-wide">
Welcome Welcome
</h1> </h1>
{/* user */} {/* user */}
<div> <div>
<p className="text-3xl tracking-wide font-bold antise text-white"> <p className="text-base tracking-wide font-bold antise text-white">
{`${firstname} ${lastname}`} {`${firstname} ${lastname}`}
</p> </p>
<p className="text-sm tracking-wide text-white">@{userEmail}</p> <p className="text-sm tracking-wide text-white">@{userEmail}</p>
@@ -72,11 +72,10 @@ export default function JobOwnerDashboard({
</div> </div>
</div> </div>
)} )}
<span className="text-[18px] font-thin tracking-wide text-white flex items-end"> <span className="text-base font-thin tracking-wide text-white flex items-end">
Last Login : {loginDate} Last Login : {loginDate}
</span> </span>
</div> </div>
</div> </div>
); );
} }
@@ -16,7 +16,7 @@ export default function JobOwnerDashboard({
return ( return (
<div <div
className={`w-full min-h-[100px] flex lg:p-8 p-4 justify-between items-center gap-2 rounded-2xl overflow-hidden bg-sky-blue ${ className={`w-full h-[75px] flex p-4 justify-between items-center gap-2 rounded-2xl overflow-hidden bg-sky-blue ${
className || "" className || ""
}`} }`}
style={{ style={{
@@ -28,12 +28,12 @@ export default function JobOwnerDashboard({
<div className="h-full flex w-full justify-between mb-5 lg:mb-0"> <div className="h-full flex w-full justify-between mb-5 lg:mb-0">
{/* heading */} {/* heading */}
<div className="flex gap-8"> <div className="flex gap-8">
<h1 className="lg:text-2xl text-xl font-medium text-white tracking-wide"> <h1 className="text-base ng font-medium text-white tracking-wide">
Welcome Welcome
</h1> </h1>
{/* user */} {/* user */}
<div> <div>
<p className="text-3xl tracking-wide font-bold antise text-white"> <p className="text-base tracking-wide font-bold antise text-white">
{`${firstname} ${lastname}`} {`${firstname} ${lastname}`}
</p> </p>
<p className="text-sm tracking-wide text-white">@{userEmail}</p> <p className="text-sm tracking-wide text-white">@{userEmail}</p>
@@ -72,7 +72,7 @@ export default function JobOwnerDashboard({
</div> </div>
</div> </div>
)} )}
<span className="text-[18px] font-thin tracking-wide text-white flex items-end"> <span className="text-base font-thin tracking-wide text-white flex items-end">
Last Login : {loginDate} Last Login : {loginDate}
</span> </span>
</div> </div>
+7 -6
View File
@@ -109,12 +109,13 @@ export default function MainSection({
endLength={products?.length} endLength={products?.length}
> >
{({ datas }) => ( {({ datas }) => (
<AvailableJobsCard <div key={datas.job_uid}>
contentDisplay={contentDisplay} <AvailableJobsCard
image_server={image_server} contentDisplay={contentDisplay}
key={datas.job_uid} image_server={image_server}
datas={datas} datas={datas}
/> />
</div>
)} )}
</DataIteration> </DataIteration>
</div> </div>