Compare commits

..

6 Commits

Author SHA1 Message Date
victorAnumudu e9d9dd2395 sidebar update 2024-07-01 14:15:32 +01:00
ameye a9c273aa17 Merge branch 'active-jobs-page-update' of WrenchBoard/Users-Wrench into master 2024-06-30 16:21:48 +00:00
victorAnumudu dddd314412 bug fix for video upload 2024-06-30 11:04:53 +01:00
ameye 43f0039d29 Merge branch 'height-adjust' of WrenchBoard/Users-Wrench into master 2024-06-28 14:29:56 +00:00
ameye c9a475b525 Merge branch 'text-replace' of WrenchBoard/Users-Wrench into master 2024-06-28 14:29:50 +00:00
victorAnumudu 74b2a554f1 height adjust 2024-06-28 14:37:32 +01:00
4 changed files with 14 additions and 14 deletions
+2 -2
View File
@@ -85,7 +85,7 @@ export default function AvailableJobsCard({
// backgroundImage: `url('${image}')`, // backgroundImage: `url('${image}')`,
// }} // }}
> >
<div className="flex flex-col h-full bg-slate-100 p-2 rounded-md"> <div className="flex flex-col min-h-full bg-slate-100 p-2 rounded-md">
<p>{datas.description}</p> <p>{datas.description}</p>
</div> </div>
</div> </div>
@@ -95,7 +95,7 @@ export default function AvailableJobsCard({
<div className="flex justify-between"> <div className="flex justify-between">
<div className="flex items-center space-x-2"> <div className="flex items-center space-x-2">
<div> <div>
<p className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white"> <p className="w-full font-bold text-xl tracking-wide text-dark-gray dark:text-white">
{/* {thePrice} | {datas.timeline_days} day(s) */} {/* {thePrice} | {datas.timeline_days} day(s) */}
{thePrice} {thePrice}
</p> </p>
+3 -3
View File
@@ -80,18 +80,18 @@ function ActiveJobs(props) {
setRequestStatus({ setRequestStatus({
loading: false, loading: false,
status: false, status: false,
message: "File must be <= 30mb", message: `File must be <= ${Number(process.env.REACT_APP_MAX_VIDEO_FILE_SIZE)/1048576} mb`,
}); });
setTimeout(() => { setTimeout(() => {
setRequestStatus({ loading: false, status: false, message: "" }); setRequestStatus({ loading: false, status: false, message: "" });
}, 5000); }, 5000);
return; return;
} }
if (files[0].size > Number(process.env.REACT_APP_MAX_FILE_SIZE)) { // return if other files is more than 1mb if (fileType != 'video' && files[0].size > Number(process.env.REACT_APP_MAX_FILE_SIZE)) { // return if other files is more than 1mb
setRequestStatus({ setRequestStatus({
loading: false, loading: false,
status: false, status: false,
message: "File must be <= 1mb", message: `File must be <= ${Number(process.env.REACT_APP_MAX_FILE_SIZE)/1048576} mb`,
}); });
setTimeout(() => { setTimeout(() => {
setRequestStatus({ loading: false, status: false, message: "" }); setRequestStatus({ loading: false, status: false, message: "" });
@@ -74,18 +74,18 @@ function ActiveJobsMedia(props) {
setRequestStatus({ setRequestStatus({
loading: false, loading: false,
status: false, status: false,
message: "File must be <= 30mb", message: `File must be <= ${Number(process.env.REACT_APP_MAX_VIDEO_FILE_SIZE)/1048576} mb`,
}); });
setTimeout(() => { setTimeout(() => {
setRequestStatus({ loading: false, status: false, message: "" }); setRequestStatus({ loading: false, status: false, message: "" });
}, 5000); }, 5000);
return; return;
} }
if (files[0].size > Number(process.env.REACT_APP_MAX_FILE_SIZE)) { // return if other files is more than 1mb if (fileType != 'video' && files[0].size > Number(process.env.REACT_APP_MAX_FILE_SIZE)) { // return if other files is more than 1mb
setRequestStatus({ setRequestStatus({
loading: false, loading: false,
status: false, status: false,
message: "File must be <= 1mb", message: `File must be <= ${Number(process.env.REACT_APP_MAX_FILE_SIZE)/1048576} mb`,
}); });
setTimeout(() => { setTimeout(() => {
setRequestStatus({ loading: false, status: false, message: "" }); setRequestStatus({ loading: false, status: false, message: "" });
+6 -6
View File
@@ -106,7 +106,7 @@ export default function Sidebar({
}`} }`}
> >
<div className="heading mb-5"> <div className="heading mb-5">
<h1 className="title text-xl font-bold text-sky-blue">Menu</h1> <h1 className={`${!sidebar && 'text-center'} title text-xl font-bold text-sky-blue`}>Menu</h1>
</div> </div>
<div className="items"> <div className="items">
<ul className="flex flex-col space-y-6"> <ul className="flex flex-col space-y-6">
@@ -141,11 +141,11 @@ export default function Sidebar({
{userDetails?.account_type !== "FAMILY" && ( {userDetails?.account_type !== "FAMILY" && (
<div <div
className={`menu-item transition-all duration-300 ease-in-out ${ className={`menu-item transition-all duration-300 ease-in-out ${
sidebar ? "my-5" : "" sidebar ? "mb-5" : "mb-2"
}`} }`}
> >
<div className="heading mb-5"> <div className="heading mb-5">
<h1 className="title text-xl font-bold text-sky-blue">Family</h1> <h1 className={`${!sidebar && 'text-center'} title text-xl font-bold text-sky-blue`}>Family</h1>
</div> </div>
<div className="items"> <div className="items">
<ul className="flex flex-col space-y-6"> <ul className="flex flex-col space-y-6">
@@ -206,8 +206,8 @@ export default function Sidebar({
}`} }`}
> >
<div className="heading mb-5"> <div className="heading mb-5">
<h1 className="title text-xl font-bold text-sky-blue"> <h1 className={`${!sidebar && 'text-center'} title text-xl font-bold text-sky-blue`}>
My Jobs Jobs
</h1> </h1>
</div> </div>
<div className="items"> <div className="items">
@@ -321,7 +321,7 @@ const ListItem = ({ sidebar, route, title, bubble, iconName, popup }) => {
</span> </span>
<span <span
className={`item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium ${ className={`item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium ${
sidebar ? "active flex-1" : "w-0" sidebar ? "active flex-1" : "hidden"
}`} }`}
> >
{title && title} {title && title}