From 3ce97a4b76b890f65d48118c2f5ce569a22c240b Mon Sep 17 00:00:00 2001 From: Ebube Date: Tue, 20 Jun 2023 20:46:51 +0100 Subject: [PATCH] . --- src/Routers.jsx | 2 +- src/components/AddJob/AddJob.jsx | 124 ++++++------ .../Helpers/Inputs/InputCom/index.jsx | 5 +- src/components/MarketPlace/MainSection.jsx | 4 +- src/components/MyJobs/MyJobTable.jsx | 1 + src/components/MyJobs/index.jsx | 10 +- src/components/jobPopout/EditJobPopout.jsx | 185 ++++++++++-------- src/index.css | 24 ++- src/views/AddJobPage.jsx | 8 +- 9 files changed, 208 insertions(+), 155 deletions(-) diff --git a/src/Routers.jsx b/src/Routers.jsx index af3f32f..7240e91 100644 --- a/src/Routers.jsx +++ b/src/Routers.jsx @@ -89,7 +89,7 @@ export default function Routers() { } /> } /> } /> - {/* } /> */} + } /> } /> } /> } /> diff --git a/src/components/AddJob/AddJob.jsx b/src/components/AddJob/AddJob.jsx index b6dc1d6..14d82eb 100644 --- a/src/components/AddJob/AddJob.jsx +++ b/src/components/AddJob/AddJob.jsx @@ -3,11 +3,8 @@ import { Link } from "react-router-dom"; import InputCom from "../Helpers/Inputs/InputCom"; import LoadingSpinner from "../Spinners/LoadingSpinner"; import usersService from "../../services/UsersService"; - import { useSelector, useDispatch } from "react-redux"; - import { tableReload } from "../../store/TableReloads"; - import { Field, Form, Formik } from "formik"; import * as Yup from "yup"; @@ -36,9 +33,10 @@ const validationSchema = Yup.object().shape({ .typeError("you must specify a number") .min(1, "Price must be greater than 0") .required("Timeline is required"), + category: Yup.array().min(1, "Select at least one checkbox"), }); -function AddJob({ popUpHandler }) { +function AddJob({ popUpHandler, categories }) { const ApiCall = new usersService(); let dispatch = useDispatch(); @@ -58,6 +56,7 @@ function AddJob({ popUpHandler }) { description: "", job_detail: "", timeline_days: "", + category: [], }; let [requestStatus, setRequestStatus] = useState({ @@ -88,6 +87,7 @@ function AddJob({ popUpHandler }) { // FUNCTION TO HANDLE ADD JOB FORM const handleAddJob = (values, helpers) => { + values.category = values.category?.join("@"); setRequestStatus({ loading: true, status: false, message: "" }); ApiCall.jobManagerCreateJob(values) .then((res) => { @@ -127,6 +127,8 @@ function AddJob({ popUpHandler }) { getUserCountry(); }, []); + console.log("This is for AddJob >>", categories); + return (
)} -
- {props.errors.country && props.touched.country && ( -

- {props.errors.country} -

- )} -
{/* Price */} @@ -209,14 +204,8 @@ function AddJob({ popUpHandler }) { value={props.values.price} inputHandler={props.handleChange} blurHandler={props.handleBlur} + errorBorder={props.errors.price && props.touched.price} /> -
- {props.errors.price && props.touched.price && ( -

- {props.errors.price} -

- )} -
@@ -233,14 +222,8 @@ function AddJob({ popUpHandler }) { value={props.values.title} inputHandler={props.handleChange} blurHandler={props.handleBlur} + errorBorder={props.errors.title && props.touched.title} /> -
- {props.errors.title && props.touched.title && ( -

- {props.errors.title} -

- )} -
{/* Description */} @@ -255,42 +238,64 @@ function AddJob({ popUpHandler }) { value={props.values.description} inputHandler={props.handleChange} blurHandler={props.handleBlur} + errorBorder={props.errors.description && props.touched.description} /> -
- {props.errors.description && - props.touched.description && ( -

- {props.errors.description} -

- )} -
{/* Details */} -
- -