Compare commits

..

8 Commits

Author SHA1 Message Date
victorAnumudu 7231d97492 currency added to amount 2024-07-03 21:14:10 +01:00
ameye f880afabb0 Merge branch 'sidebar-update' of WrenchBoard/Users-Wrench into master 2024-07-01 14:08:06 +00:00
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
5 changed files with 16 additions and 16 deletions
+2 -2
View File
@@ -85,7 +85,7 @@ export default function AvailableJobsCard({
// 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>
</div>
</div>
@@ -95,7 +95,7 @@ export default function AvailableJobsCard({
<div className="flex justify-between">
<div className="flex items-center space-x-2">
<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}
</p>
+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: "" });
@@ -51,7 +51,7 @@ function AmountSection({ currency, amount, country }) {
<div className={`flex items-center gap-8`}>
{/* text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1 */}
<h1 className="min-w-[150px] job-label">
Amount({currency})
Amount ({currency})
</h1>
<span className="min-w-[100px] text-base text-right font-normal text-dark-gray dark:text-white tracking-tighter my-1">
{formattedAmount}
@@ -91,7 +91,7 @@ function TotalSection({ currency, amount, fee, country }) {
return (
<div className={`flex items-center gap-8`}>
<h1 className="min-w-[150px] job-label">
Total
Total ({currency})
</h1>
<span className="min-w-[100px] text-base text-right font-normal text-dark-gray dark:text-white tracking-tighter my-1">
{formattedTotal}
+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}