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 d2a406563a text updated 2024-06-28 13:46:24 +01:00
4 changed files with 15 additions and 16 deletions
@@ -252,7 +252,7 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
<div className="mx-auto bg-[#f1f8ff] dark:bg-[#C2C8D3] px-4 rounded-md md:min-h-[420px] flex flex-col justify-between">
<div className="w-full flex flex-col justify-center pb-4 gap-2">
<p className="job-label w-full">
Interested in the task?
Interested?
</p>
<hr />
<button
@@ -262,9 +262,8 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
>
{" "}
<div className="w-full flex flex-col justify-between gap-2">
<span>Send</span>
<span>Interest</span>
<span>Request</span>
<span>Notify</span>
<span>Owner</span>
</div>
</button>
<>
+3 -3
View File
@@ -80,18 +80,18 @@ function ActiveJobs(props) {
setRequestStatus({
loading: false,
status: false,
message: "File must be <= 30mb",
message: `File must be <= ${Number(process.env.REACT_APP_MAX_VIDEO_FILE_SIZE)/1048576} mb`,
});
setTimeout(() => {
setRequestStatus({ loading: false, status: false, message: "" });
}, 5000);
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({
loading: false,
status: false,
message: "File must be <= 1mb",
message: `File must be <= ${Number(process.env.REACT_APP_MAX_FILE_SIZE)/1048576} mb`,
});
setTimeout(() => {
setRequestStatus({ loading: false, status: false, message: "" });
@@ -74,18 +74,18 @@ function ActiveJobsMedia(props) {
setRequestStatus({
loading: false,
status: false,
message: "File must be <= 30mb",
message: `File must be <= ${Number(process.env.REACT_APP_MAX_VIDEO_FILE_SIZE)/1048576} mb`,
});
setTimeout(() => {
setRequestStatus({ loading: false, status: false, message: "" });
}, 5000);
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({
loading: false,
status: false,
message: "File must be <= 1mb",
message: `File must be <= ${Number(process.env.REACT_APP_MAX_FILE_SIZE)/1048576} mb`,
});
setTimeout(() => {
setRequestStatus({ loading: false, status: false, message: "" });
+6 -6
View File
@@ -106,7 +106,7 @@ export default function Sidebar({
}`}
>
<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 className="items">
<ul className="flex flex-col space-y-6">
@@ -141,11 +141,11 @@ export default function Sidebar({
{userDetails?.account_type !== "FAMILY" && (
<div
className={`menu-item transition-all duration-300 ease-in-out ${
sidebar ? "my-5" : ""
sidebar ? "mb-5" : "mb-2"
}`}
>
<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 className="items">
<ul className="flex flex-col space-y-6">
@@ -206,8 +206,8 @@ export default function Sidebar({
}`}
>
<div className="heading mb-5">
<h1 className="title text-xl font-bold text-sky-blue">
My Jobs
<h1 className={`${!sidebar && 'text-center'} title text-xl font-bold text-sky-blue`}>
Jobs
</h1>
</div>
<div className="items">
@@ -321,7 +321,7 @@ const ListItem = ({ sidebar, route, title, bubble, iconName, popup }) => {
</span>
<span
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}