Compare commits

...

4 Commits

Author SHA1 Message Date
victorAnumudu f90a6e6687 fixed width added to back btn 2023-05-30 14:37:27 +01:00
victorAnumudu b44c039bbf fixed width added to back btn 2023-05-30 14:36:34 +01:00
victorAnumudu 09e0661e48 sliderCom item repeat fix 2023-05-30 14:28:57 +01:00
ameye af2c2d66a3 Merge branch 'myjoblist-moved' of WrenchBoard/Users-Wrench into master 2023-05-30 10:35:45 +00:00
5 changed files with 11 additions and 6 deletions
+1 -1
View File
@@ -59,7 +59,7 @@ function ActiveJobs(props) {
<div className="w-full flex justify-start space-x-3 items-center"> <div className="w-full flex justify-start space-x-3 items-center">
<button <button
type="button" type="button"
className="text-[#374557] border border-sky-blue p-1 rounded-full" className="min-w-[45px] h-auto text-[#374557] border border-sky-blue p-1 rounded-full"
onClick={() => navigate(props.details.pathname, {replace: true})} onClick={() => navigate(props.details.pathname, {replace: true})}
> >
<svg <svg
+2 -1
View File
@@ -15,7 +15,7 @@ export default function MyOffersTable({ className, MyActiveOffersList}) {
const settings = { const settings = {
arrows: false, arrows: false,
dots: false, dots: false,
infinite: true, infinite: MyActiveOffersList?.result_list?.length > 4,
autoplay: true, autoplay: true,
slidesToShow: 4, slidesToShow: 4,
slidesToScroll: 1, slidesToScroll: 1,
@@ -25,6 +25,7 @@ export default function MyOffersTable({ className, MyActiveOffersList}) {
settings: { settings: {
slidesToShow: 2, slidesToShow: 2,
slidesToScroll: 1, slidesToScroll: 1,
infinite: MyActiveOffersList?.result_list?.length > 2,
}, },
}, },
], ],
+1 -1
View File
@@ -43,7 +43,7 @@ function OfferJobPopout({details, onClose, situation}) {
setRequestStatus({loading: false, status: true, message: `Offer ${name}ed Successfully`, trigger: ''}) setRequestStatus({loading: false, status: true, message: `Offer ${name}ed Successfully`, trigger: ''})
setTimeout(()=>{ setTimeout(()=>{
onClose() onClose()
dispatch(tableReload({type:'JOBTABLE'})) dispatch(tableReload({type:'MYTASKTABLE'}))
navigate('/mytask', {replace:true}) navigate('/mytask', {replace:true})
setRequestStatus({loading: false, status: false, message: '', trigger: ''}) setRequestStatus({loading: false, status: false, message: '', trigger: ''})
},2000) },2000)
+5 -1
View File
@@ -2,7 +2,8 @@ import { createSlice } from "@reduxjs/toolkit";
const initialState = { const initialState = {
jobListTable: false, jobListTable: false,
pendingListTable: false pendingListTable: false,
myTaskTable: false
}; };
export const tableReloadSlice = createSlice({ export const tableReloadSlice = createSlice({
@@ -17,6 +18,9 @@ export const tableReloadSlice = createSlice({
case 'PENDINGTABLE' : case 'PENDINGTABLE' :
state.pendingListTable = !state.pendingListTable; state.pendingListTable = !state.pendingListTable;
return return
case 'MYTASKTABLE' :
state.myTaskTable = !state.myTaskTable;
return
default: default:
return state return state
} }
+2 -2
View File
@@ -6,7 +6,7 @@ import usersService from "../services/UsersService";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
export default function MyTaskPage() { export default function MyTaskPage() {
const {jobListTable} = useSelector((state) => state.tableReload) const {myTaskTable} = useSelector((state) => state.tableReload)
const [MyActiveJobList, setMyActiveJobList] = useState({loading: true, status:false, data:[]}); const [MyActiveJobList, setMyActiveJobList] = useState({loading: true, status:false, data:[]});
const [MyActiveOffersList, setMyActiveOffersList] = useState([]); const [MyActiveOffersList, setMyActiveOffersList] = useState([]);
@@ -38,7 +38,7 @@ export default function MyTaskPage() {
useEffect(() => { useEffect(() => {
getMyActiveJobList(); getMyActiveJobList();
getMyActiveOffersList(); getMyActiveOffersList();
}, [jobListTable]); }, [myTaskTable]);
//debugger; //debugger;
return ( return (