diff --git a/src/components/MyJobs/MyJobTable.jsx b/src/components/MyJobs/MyJobTable.jsx index d3bc803..bd94149 100644 --- a/src/components/MyJobs/MyJobTable.jsx +++ b/src/components/MyJobs/MyJobTable.jsx @@ -135,7 +135,7 @@ export default function MyJobTable({ MyJobList, reloadJobList, className }) { onClick={() => { setDeleteJobPopout({ show: true, - data: value, + data: {thePrice, ...value} }); }} > @@ -148,7 +148,7 @@ export default function MyJobTable({ MyJobList, reloadJobList, className }) { onClick={() => { setEditJob({ show: true, - data: value, + data: {thePrice, ...value} }); }} > @@ -162,7 +162,7 @@ export default function MyJobTable({ MyJobList, reloadJobList, className }) { + +
+
+ + + + + +
+
+

+ {details.title} +

+

+ Price: {details.thePrice} +

+

+ Duration: {details.timeline_days} day(s) +

+
+
+ + {requestStatus.laoding ? ( + + ) : ( -
-
-
- - - - - -
-
-

- {details.title} -

-

- Price: {details.price * 0.01} -

-

- Duration: {details.timeline_days} day(s) -

-
-
- - {requestStatus.laoding ? - - : - - } -
- - {/* ERROR DISPLAY AND SUBMIT BUTTON */} - {requestStatus.message != "" && ( - !requestStatus.status ? - (
- {requestStatus.message} -
) - : - requestStatus.status && - (
- {requestStatus.message} -
- ) - )} - {/* End of error or success display */} -
+ )}
- - - ) + {/* ERROR DISPLAY AND SUBMIT BUTTON */} + {requestStatus.message != "" && + (!requestStatus.status ? ( +
+ {requestStatus.message} +
+ ) : ( + requestStatus.status && ( +
+ {requestStatus.message} +
+ ) + ))} + {/* End of error or success display */} + + + + ); } -export default DeleteJobPopout \ No newline at end of file +export default DeleteJobPopout; diff --git a/src/components/jobPopout/EditJobPopout.jsx b/src/components/jobPopout/EditJobPopout.jsx index 8801227..d7e143c 100644 --- a/src/components/jobPopout/EditJobPopout.jsx +++ b/src/components/jobPopout/EditJobPopout.jsx @@ -1,4 +1,4 @@ -import React, { useCallback, useEffect, useMemo, useState } from "react"; +import React, { useCallback, useMemo, useState } from "react"; import ModalCom from "../Helpers/ModalCom"; import { Field, Form, Formik } from "formik"; import * as Yup from "yup"; @@ -6,7 +6,6 @@ import InputCom from "../Helpers/Inputs/InputCom"; import LoadingSpinner from "../Spinners/LoadingSpinner"; import usersService from "../../services/UsersService"; import { useNavigate } from "react-router-dom"; - import { tableReload } from "../../store/TableReloads"; import { useDispatch } from "react-redux"; diff --git a/src/components/jobPopout/JobListPopout.jsx b/src/components/jobPopout/JobListPopout.jsx index caedf82..ddc44c4 100644 --- a/src/components/jobPopout/JobListPopout.jsx +++ b/src/components/jobPopout/JobListPopout.jsx @@ -3,7 +3,7 @@ import Detail from "./popoutcomponent/Detail"; import ModalCom from "../Helpers/ModalCom"; import InputCom from "../Helpers/Inputs/InputCom/index"; import SiteService from "../../services/SiteService"; -import { Form, Formik, Field, ErrorMessage } from "formik"; +import { Form, Formik, Field } from "formik"; import * as Yup from "yup"; import LoadingSpinner from "../Spinners/LoadingSpinner"; @@ -210,7 +210,7 @@ function JobListPopout({ details, onClose, situation }) {
- +