Compare commits

..

12 Commits

Author SHA1 Message Date
victorAnumudu 9fb0a65e46 disabled assign btn after task is assigned 2024-05-21 09:35:04 +01:00
ameye 15fce205a6 Merge branch 'font-match' of WrenchBoard/Users-Wrench into master 2024-05-21 01:25:26 +00:00
victorAnumudu dddf6af401 select option tag font changed 2024-05-20 20:59:32 +01:00
ameye 1a86361fbb Merge branch 'blog-page-display' of WrenchBoard/Users-Wrench into master 2024-05-20 16:57:50 +00:00
victorAnumudu 4f69786f19 blog page bug fixed 2024-05-20 17:51:13 +01:00
CHIEFSOFT\ameye 5634c1542b Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench 2024-05-19 14:06:31 -04:00
CHIEFSOFT\ameye f9e3d2aad2 due job banner 2024-05-19 14:06:20 -04:00
tokslaw 921d1af7f0 Merge branch 'add-job-mobile-view' of WrenchBoard/Users-Wrench into master 2024-05-14 17:06:58 +00:00
tokslaw c98d2e41ef Merge branch 'text-overlap' of WrenchBoard/Users-Wrench into master 2024-05-14 17:06:36 +00:00
victorAnumudu ea260fa15a height adjust 2024-05-14 13:15:00 +01:00
victorAnumudu b604e0b527 fixed text overlapping issue 2024-05-14 13:11:29 +01:00
victorAnumudu 991571b2d2 fixed text overlapping issue 2024-05-14 13:09:58 +01:00
7 changed files with 26 additions and 13 deletions
Binary file not shown.

Before

Width:  |  Height:  |  Size: 82 KiB

After

Width:  |  Height:  |  Size: 52 KiB

+12 -8
View File
@@ -45,7 +45,7 @@ const AccountDashboard = ({ className, bannerList }) => {
{getLowerBanner?.map((props, idx) => {
let image = getImage(props);
let { short_title, short_description, short_button_text, link_path } =
let { short_title, short_description, short_button_text, link_path, card_type, blog_id } =
props;
return (
@@ -56,6 +56,8 @@ const AccountDashboard = ({ className, bannerList }) => {
title={short_title}
desc={short_description}
link_path={link_path}
card_type={card_type}
blog_id={blog_id}
/>
</div>
);
@@ -102,24 +104,26 @@ const TopBanner = ({ image, title = "", desc = "", btn, link_path, key }) => {
);
};
const LowerBanner = ({ image, title = "", desc = "", btn, link_path, key }) => {
const LowerBanner = ({ image, title = "", desc = "", btn, link_path, card_type, blog_id, key }) => {
const newLinkPath = card_type == 'BLOG' ? `${link_path}?blog_id=${blog_id}` : link_path
return (
<div
key={key}
className="flex flex-col bg-white shadow-md h-full rounded-xl dark:border-[#5356fb29] dark:bg-dark-white"
>
<div className="w-full flex justify-between border-b border-slate-300 p-2">
<div className="h-[130px] flex justify-between items-center">
<div className="w-full xxs:flex justify-between items-center border-b border-slate-300 p-2">
<div className="min-h-[150px] sm:min-h-[130px] flex justify-between items-center">
<div className="px-2 flex flex-col gap-2 dark:text-white">
<Link to={link_path} className="text-lg font-bold">
<Link to={newLinkPath} className="text-lg font-bold">
{title}
</Link>
<p to={link_path} className="text-sm">
<p to={newLinkPath} className="text-sm">
{desc}
</p>
</div>
</div>
<Link to={link_path} className="w-[150px] h-[100px]">
<Link to={newLinkPath} className="w-[150px] h-[100px]">
<img
src={image}
alt="banner-img"
@@ -129,7 +133,7 @@ const LowerBanner = ({ image, title = "", desc = "", btn, link_path, key }) => {
</Link>
</div>
<div className="flex justify-between w-full px-2 items-center">
<Link to={link_path} className="text-slate-300 font-semibold text-sm">
<Link to={newLinkPath} className="text-slate-300 font-semibold text-sm">
{btn}
</Link>
<button className="flex items-center justify-center gap-2">
@@ -176,6 +176,9 @@ export default function FamilyManageTabs({
familyData={familyWaitList}
accountDetails={accountDetails}
setUpdatePage={setUpdatePage}
jobList={jobList}
setActiveTask={setActiveTask}
activeTask={activeTask}
/>
),
Pending: (
@@ -22,7 +22,7 @@ export default function AssignPrevNewTask({
let imageSrc = (localStorage.getItem("session_token")
? `${userDetails?.session_image_server}${localStorage.getItem("session_token")}/job/${activeTask.data.job_uid}` : ""); // FOR GETTING JOB IMAGE
? `${userDetails?.session_image_server}${localStorage.getItem("session_token")}/job/${activeTask?.data?.job_uid}` : ""); // FOR GETTING JOB IMAGE
return (
<>
@@ -230,9 +230,9 @@ export default function AssignPrevNewTask({
) : (
<button
type="button"
disabled={requestStatus.loading}
disabled={requestStatus.loading || requestStatus.status}
onClick={assignFamilyTask}
className="custom-btn btn-gradient text-white"
className={`custom-btn btn-gradient text-white ${requestStatus.status && 'opacity-50'}`}
>
Assign
</button>
@@ -5,7 +5,7 @@ import LoadingSpinner from "../../Spinners/LoadingSpinner";
import AssignTaskPopout from "../FamilyPopout/AssignTaskPopout";
const FamilyWaitlist = memo(
({ familyData, className, accountDetails, setUpdatePage }) => {
({ familyData, className, accountDetails, setUpdatePage, jobList, setActiveTask, activeTask }) => {
const [popUp, setPopUp] = useState({ show: false, data: {} });
const [continueTaskPopup, setContinueTaskPopup] = useState({
show: false,
@@ -144,6 +144,9 @@ const FamilyWaitlist = memo(
action={closeContinueTaskPopup}
situation={continueTaskPopup.show}
setUpdatePage={setUpdatePage}
jobList={jobList}
setActiveTask={setActiveTask}
activeTask={activeTask}
/>
)}
</div>
+1 -1
View File
@@ -560,7 +560,7 @@ const JobFieldInput = ({
<Field
component="select"
name={inputName}
className={`input-field placeholder:text-base text-dark-gray w-full h-full bg-white outline-none px-2`}
className={`options-default`}
value={value}
>
{/* <option value="">{optionText}</option> */}
+3
View File
@@ -194,6 +194,9 @@
.logout-btn {
@apply px-4 min-w-[80px] h-[52px] flex justify-center items-center text-xl font-bold rounded-full cursor-pointer
}
.options-default {
@apply px-2 placeholder:text-sm w-full h-full bg-white outline-none text-sm text-slate-900 dark:text-white
}
}
/* ===================== EXTRA ===================== */