From 9c00badcf6b35dc5c62454d85c8afc91747c2d11 Mon Sep 17 00:00:00 2001 From: Ebube Date: Tue, 30 May 2023 01:42:36 +0100 Subject: [PATCH] . --- src/assets/images/qr-sample.png | Bin 0 -> 3145 bytes src/components/AddJob/AddJob.jsx | 10 --- src/components/FamilyAcc/FamilyManageTabs.jsx | 19 +++++- src/components/jobPopout/EditJobPopout.jsx | 57 +++++++++++++----- src/components/jobPopout/JobListPopout.jsx | 38 ++++++++---- src/index.css | 4 ++ 6 files changed, 88 insertions(+), 40 deletions(-) create mode 100644 src/assets/images/qr-sample.png diff --git a/src/assets/images/qr-sample.png b/src/assets/images/qr-sample.png new file mode 100644 index 0000000000000000000000000000000000000000..e39f3cad5d3827a3e822b979e48cdabd7d8761b7 GIT binary patch literal 3145 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 literal 0 HcmV?d00001 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