Compare commits

...

4 Commits

Author SHA1 Message Date
victorAnumudu 630ccefa51 Made the email input longer 2024-03-21 12:20:20 +01:00
ameye 4e81156d72 Merge branch 'parent-kid-wallet' of WrenchBoard/Users-Wrench into master 2024-03-21 09:50:41 +00:00
ameye e402c02c1f Merge branch 'assign-task-image' of WrenchBoard/Users-Wrench into master 2024-03-21 09:50:34 +00:00
victorAnumudu 944fd134f6 added image to assign task popout 2024-03-20 18:02:47 +01:00
4 changed files with 51 additions and 31 deletions
@@ -1,4 +1,4 @@
import React, { useEffect, useState } from "react"; import React, { Suspense, useEffect, useState } from "react";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import { useLocation } from "react-router-dom"; import { useLocation } from "react-router-dom";
import usersService from "../../../services/UsersService"; import usersService from "../../../services/UsersService";
@@ -23,7 +23,9 @@ const AssignTaskPopout = ({
}) => { }) => {
const {parentAssignJobToKid} = SocketValues() const {parentAssignJobToKid} = SocketValues()
const apiCall = new usersService(); const apiCall = new usersService();
let { pathname, state } = useLocation(); let { pathname, state } = useLocation();
const {userDetails} = useSelector((state) => state?.userDetails); // CHECKS IF USER Details are avaliable, to determine if user is active const {userDetails} = useSelector((state) => state?.userDetails); // CHECKS IF USER Details are avaliable, to determine if user is active
@@ -219,7 +221,10 @@ const AssignTaskPopout = ({
setRequestStatus({ loading: false, status: false, message: "" }); setRequestStatus({ loading: false, status: false, message: "" });
}, 5000); }, 5000);
}); });
}; };
let imageSrc = (localStorage.getItem("session_token")
? `${userDetails?.session_image_server}${localStorage.getItem("session_token")}/job/${activeTask.data.job_uid}` : ""); // FOR GETTING JOB IMAGE
useEffect(()=>{ // effect to update family UID when components mounts useEffect(()=>{ // effect to update family UID when components mounts
if(familyDetailsData?.uid){ if(familyDetailsData?.uid){
@@ -231,6 +236,7 @@ const AssignTaskPopout = ({
} }
},[]) },[])
return ( return (
<> <>
<ModalCom action={action} situation={situation}> <ModalCom action={action} situation={situation}>
@@ -382,25 +388,37 @@ const AssignTaskPopout = ({
value={activeTask?.data?.description} value={activeTask?.data?.description}
/> />
</div> </div>
<div className="flex items-center"> <div className="grid grid-cols-2">
<div className="my-3 w-full flex items-center gap-1"> <div className="w-full">
<label className="job-label"> <div className="my-3 w-full flex items-center gap-1">
Price <label className="job-label">
</label> Price
<p className="p-1 text-sm text-slate-900 dark:text-white"> </label>
{PriceFormatter( <p className="p-1 text-sm text-slate-900 dark:text-white">
activeTask?.data?.price * 0.01, {PriceFormatter(
activeTask?.data?.currency, activeTask?.data?.price * 0.01,
activeTask?.data?.curreny_code activeTask?.data?.currency,
)} activeTask?.data?.curreny_code
</p> )}
</div> </p>
</div>
<div className="my-3 w-full flex items-center gap-1"> <div className="my-3 w-full flex items-center gap-1">
<label className="job-label"> <label className="job-label">
Timeline Timeline
</label> </label>
<p className="p-1 text-sm text-slate-900 dark:text-white">{`${activeTask?.data?.timeline_days} day(s)`}</p> <p className="p-1 text-sm text-slate-900 dark:text-white">{`${activeTask?.data?.timeline_days} day(s)`}</p>
</div>
</div>
<div className="w-full flex items-center justify-center">
<div className="w-28 h-28 rounded-2xl flex items-center justify-center">
<img
className="w-full h-auto"
loading="lazy"
src={imageSrc}
alt='job image'
/>
</div>
</div> </div>
</div> </div>
+5 -5
View File
@@ -89,13 +89,13 @@ export default function AddGroup({ action, situation, setUpdateList }) {
return ( return (
<ModalCom action={action} situation={situation}> <ModalCom action={action} situation={situation}>
<div className="logout-modal-wrapper lg:w-[500px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl"> <div className="logout-modal-wrapper lg:w-[500px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
<div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b border-light-purple dark:border-[#5356fb29] "> <div className="modal-header-con">
<h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide"> <h1 className="modal-title">
Add Group Add Group
</h1> </h1>
<button <button
type="button" type="button"
className="text-[#374557] dark:text-red-500" className="modal-close-btn"
onClick={action} onClick={action}
> >
<svg <svg
@@ -139,9 +139,9 @@ export default function AddGroup({ action, situation, setUpdateList }) {
<button <button
onClick={action} onClick={action}
type="button" type="button"
className="text-base text-light-red tracking-wide " className="w-[152px] h-[46px] flex justify-center items-center rounded-full text-base text-light-red tracking-wide border border-light-red"
> >
<span className="border-b dark:border-[#5356fb29] border-light-red"> <span className="">
Cancel Cancel
</span> </span>
</button> </button>
+3 -3
View File
@@ -21,13 +21,13 @@ export default function DeleteMember({action, situation, details}) {
situation={situation} situation={situation}
> >
<div className="logout-modal-wrapper lg:w-[500px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl"> <div className="logout-modal-wrapper lg:w-[500px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
<div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b border-light-purple dark:border-[#5356fb29] "> <div className="modal-header-con">
<h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide"> <h1 className="modal-title">
Remove Member Remove Member
</h1> </h1>
<button <button
type="button" type="button"
className="text-[#374557] dark:text-red-500" className="modal-close-btn"
onClick={action} onClick={action}
> >
<svg <svg
+5 -3
View File
@@ -229,13 +229,15 @@ export default function MemberList({
// iconName="message" // iconName="message"
/> />
</div> </div>
<div className="input-item w-full"> </div>
<div className="sm:flex gap-2 items-center">
<div className="input-item my-2 w-full sm:w-9/12">
<InputCom <InputCom
labelClass="tracking-wider" labelClass="tracking-wider"
fieldClass="sm:px-6 px-2" fieldClass="sm:px-6 px-2"
value={fields.email} value={fields.email}
inputHandler={handleFieldsChange} inputHandler={handleFieldsChange}
inputClass="xl:w-[16rem] 2xl:w-full" inputClass=""
placeholder="Email" placeholder="Email"
// label="Email" // label="Email"
name="email" name="email"
@@ -243,7 +245,7 @@ export default function MemberList({
// iconName="message" // iconName="message"
/> />
</div> </div>
<div className="flex justify-end items-end"> <div className="flex justify-end items-end w-full sm:w-3/12">
{requestState.loading ? ( {requestState.loading ? (
<LoadingSpinner size="8" color="sky-blue" /> <LoadingSpinner size="8" color="sky-blue" />
) : ( ) : (