diff --git a/src/assets/images/qr-sample.png b/src/assets/images/qr-sample.png new file mode 100644 index 0000000..e39f3ca Binary files /dev/null and b/src/assets/images/qr-sample.png differ diff --git a/src/components/AddJob/AddJob.jsx b/src/components/AddJob/AddJob.jsx index bac4931..7bda2ad 100644 --- a/src/components/AddJob/AddJob.jsx +++ b/src/components/AddJob/AddJob.jsx @@ -36,16 +36,6 @@ const validationSchema = Yup.object().shape({ .required("Timeline is required"), }); -// let initialValues = { -// // initial values for formik -// country: "NG", -// price: 0, -// title: "", -// description: "", -// job_detail: "", -// timeline_days: "", -// }; - function AddJob() { const ApiCall = new usersService(); const navigate = useNavigate(); diff --git a/src/components/FamilyAcc/FamilyManageTabs.jsx b/src/components/FamilyAcc/FamilyManageTabs.jsx index c17f860..355708c 100644 --- a/src/components/FamilyAcc/FamilyManageTabs.jsx +++ b/src/components/FamilyAcc/FamilyManageTabs.jsx @@ -7,6 +7,7 @@ import React, { } from "react"; import LoadingSpinner from "../Spinners/LoadingSpinner"; import profile from "../../assets/images/profile-info-profile.png"; +import qrSample from "../../assets/images/qr-sample.png"; import usersService from "../../services/UsersService"; import FamilyTasks from "./FamilyTasks"; @@ -99,7 +100,7 @@ export default function FamilyManageTabs({ accountDetails={accountDetails} /> -
+
    {tabs.map(({ name, id }) => ( @@ -213,7 +214,9 @@ function ProfileInfo({ function Account({ familyDetails }) { return ( -
    +
    +
    +

    Username: {familyDetails?.username} @@ -222,6 +225,18 @@ function Account({ familyDetails }) { Pin: {familyDetails?.pin}

    + + or + +
    +

    scan the code from mobile app

    +qr-sample +
    +
    +
    + +
    +
    ); } diff --git a/src/components/jobPopout/EditJobPopout.jsx b/src/components/jobPopout/EditJobPopout.jsx index a65e54f..8801227 100644 --- a/src/components/jobPopout/EditJobPopout.jsx +++ b/src/components/jobPopout/EditJobPopout.jsx @@ -1,6 +1,6 @@ import React, { useCallback, useEffect, useMemo, useState } from "react"; import ModalCom from "../Helpers/ModalCom"; -import { Form, Formik } from "formik"; +import { Field, Form, Formik } from "formik"; import * as Yup from "yup"; import InputCom from "../Helpers/Inputs/InputCom"; import LoadingSpinner from "../Spinners/LoadingSpinner"; @@ -245,20 +245,34 @@ const EditJobPopOut = ({ details, onClose, situation, country }) => {
    - +
    + +
    + + + + {publicArray.map(({ name, duration }, idx) => ( + + ))} + {props.errors.timeline_days && props.touched.timeline_days && (

    @@ -316,3 +330,16 @@ const EditJobPopOut = ({ details, onClose, situation, country }) => { }; export default EditJobPopOut; + +const publicArray = [ + { duration: 1, name: "1 day" }, + { duration: 2, name: "2 days" }, + { duration: 3, name: "3 days" }, + { duration: 4, name: "4 days" }, + { duration: 5, name: "5 days" }, + { duration: 6, name: "6 days" }, + { duration: 7, name: "1 week" }, + { duration: 14, name: "2 weeks" }, + { duration: 21, name: "3 weeks" }, + { duration: 28, name: "4 weeks" }, +]; diff --git a/src/components/jobPopout/JobListPopout.jsx b/src/components/jobPopout/JobListPopout.jsx index 507222d..0933920 100644 --- a/src/components/jobPopout/JobListPopout.jsx +++ b/src/components/jobPopout/JobListPopout.jsx @@ -168,7 +168,7 @@ function JobListPopout({ details, onClose, situation }) { }; return ( - +

    @@ -264,9 +264,12 @@ function JobListPopout({ details, onClose, situation }) { loader={loader?.jobFields.family} errorHandler={errorHandler} /> - {props?.values.family === "" && ( -

    {errMsg.jobFields.family}

    - )} +

    + {" "} + {props?.values.family === "" && ( + {errMsg.jobFields.family} + )} +

    {" "} ); }} @@ -292,9 +295,12 @@ function JobListPopout({ details, onClose, situation }) { loader={loader?.jobFields.public} errorHandler={errorHandler} /> - {props?.values.public === "" && ( -

    {errMsg.jobFields.public}

    - )} +

    + {" "} + {props?.values.public === "" && ( + {errMsg.jobFields.public} + )} +

    {" "} ); }} @@ -320,9 +326,12 @@ function JobListPopout({ details, onClose, situation }) { loader={loader?.jobFields.individual} errorHandler={errorHandler} /> - {props?.values.individual === "" && ( -

    {errMsg.jobFields.individual}

    - )} +

    + {" "} + {props?.values.individual === "" && ( + {errMsg.jobFields.individual} + )} +

    {" "} ); }} @@ -347,9 +356,12 @@ function JobListPopout({ details, onClose, situation }) { loader={loader?.jobFields.group} errorHandler={errorHandler} /> - {props?.values.group === "" && ( -

    {errMsg.jobFields.group}

    - )} +

    + {" "} + {props?.values.group === "" && ( + {errMsg.jobFields.group} + )} +

    ); }} diff --git a/src/index.css b/src/index.css index 5a4e0ee..6b1a5b1 100644 --- a/src/index.css +++ b/src/index.css @@ -787,4 +787,8 @@ TODO: Responsive =========================== .edit-popup{ top: 75px; +} + +.job-popup{ + top: 55px; } \ No newline at end of file