diff --git a/src/components/AuthPages/AuthLayout.jsx b/src/components/AuthPages/AuthLayout.jsx index 43e745a..582bc01 100644 --- a/src/components/AuthPages/AuthLayout.jsx +++ b/src/components/AuthPages/AuthLayout.jsx @@ -11,15 +11,30 @@ export default function LoginLayout({ slogan, children }) {
- - About - - - Services - - - Contact Us - + + About + + + Services + + + Contact Us +
diff --git a/src/components/FamilyAcc/FamilyTable.jsx b/src/components/FamilyAcc/FamilyTable.jsx index a8f3fa5..3ff903d 100644 --- a/src/components/FamilyAcc/FamilyTable.jsx +++ b/src/components/FamilyAcc/FamilyTable.jsx @@ -3,6 +3,7 @@ import dataImage1 from "../../assets/images/data-table-user-1.png"; export default function FamilyTable({ className, familyList, loader }) { const filterCategories = ["All Categories", "Explore", "Featured"]; + console.log(familyList) const [selectedCategory, setCategory] = useState(filterCategories[0]); return (
{ - let { first_name, last_name } = formData; + const { first_name, last_name } = formData; setLoader(true); try { if (first_name !== "" && last_name !== "") { - const reqData = { + let reqData = { member_id: localStorage.getItem("member_id"), uid: localStorage.getItem("uid"), session_id: localStorage.getItem("session_token"), @@ -62,9 +63,10 @@ export default function FamilyAcc() { lastname: last_name, age: selectedAge, }; - const res = await apiCall.addFamily(reqData); + console.log(reqData); + let res = await apiCall.addFamily(reqData); const { data } = res; - if (data.internal_return > 0 && data.status == "OK") { + if (data?.internal_return > 0 && data?.status == "OK") { setLoader(false); setListReload((prev) => !prev); setIsOpen(false); @@ -79,6 +81,7 @@ export default function FamilyAcc() { } catch (error) { setLoader(false); setMsgErr("An error occurred"); + throw new Error(error); } finally { setTimeout(() => { setMsgErr(null); @@ -236,7 +239,7 @@ const FamilyForm = ({
{msgErr && ( -
+
{msgErr}
)} diff --git a/src/components/Helpers/CustomPopUp/index.jsx b/src/components/Helpers/CustomPopUp/index.jsx index 2e4357c..4653979 100644 --- a/src/components/Helpers/CustomPopUp/index.jsx +++ b/src/components/Helpers/CustomPopUp/index.jsx @@ -27,7 +27,7 @@ const CustomPopUp = ({ }); return ( - <> +
@@ -56,7 +56,7 @@ const CustomPopUp = ({
)} - + ); }; diff --git a/src/components/MyActiveJobs/MyActiveJobTable.jsx b/src/components/MyActiveJobs/MyActiveJobTable.jsx index 743d3b1..c8e20f0 100644 --- a/src/components/MyActiveJobs/MyActiveJobTable.jsx +++ b/src/components/MyActiveJobs/MyActiveJobTable.jsx @@ -102,7 +102,7 @@ export default function MyActiveJobTable({MyJobList, className }) { } {jobPopout.show && - {setJobPopout({show:false, data:{}})}} /> + {setJobPopout({show:false, data:{}})}} situation={jobPopout.show} /> } ); diff --git a/src/components/MyJobs/StartJob.jsx b/src/components/MyJobs/StartJob.jsx index eb5db3a..58f22a9 100644 --- a/src/components/MyJobs/StartJob.jsx +++ b/src/components/MyJobs/StartJob.jsx @@ -1,24 +1,49 @@ import React, { useState } from "react"; -import { Link } from "react-router-dom"; +import { Link, useNavigate } from "react-router-dom"; import Layout from "../Partials/Layout"; import MyJobTable from "./MyJobTable"; import CommonHead from "../UserHeader/CommonHead"; import SelectBox from "../Helpers/SelectBox"; import dataImage2 from "../../assets/images/data-table-user-2.png"; +import LoadingSpinner from "../Spinners/LoadingSpinner"; + +import usersService from "../../services/UsersService"; + export default function StartJob(props) { + const apiCall = new usersService() // instantiating API CALL + const navigate = useNavigate() + + let [request, setRequest] = useState({loading: false, status: false, message: ''}) const [selectTab, setValue] = useState("today"); const filterHandler = (value) => { setValue(value); }; - console.log("AMEYE LOC1", props.MyJobList); + + const handleOnclick = () => { + setRequest({loading: true, status: false, message: ''}) + apiCall.jobManagerAgree().then((res)=>{ + if(res.status != 200 || res.data.internal_return < 1){ + setRequest({loading: false, status: false, message: 'Could not complete request, Try Again'}) + return + } + setRequest({loading: false, status: true, message: 'Request completed successfully'}) + setTimeout(()=>{ + navigate('/', {replace: true}) + window.location.reload() + }, 2000) + }).catch(error => { + setRequest({loading: false, status: false, message: 'Opps! An Error Occured. Try Again'}) + console.log(error) + }) + } return ( {/**/}
{/* heading */} -
+ {/*

-
+
*/}
-

- Terms & Agreement -

+

+ Additional Terms for Jobs Posting. +

{/**/}
- All terms of sale must follow WrenchBoard policies for buying and selling. Setting and meeting expectations in a listing's terms of sale ensure a smooth transaction and buyer satisfaction while helping WrenchBoard remain a reputable marketplace. +

All terms of sale must follow WrenchBoard policies for buying and selling. Setting and meeting expectations in a listing's terms of sale ensure a smooth transaction and buyer satisfaction while helping WrenchBoard remain a reputable marketplace. +

- What is the policy? - Task or Job owners should provide clear and accurate delivery terms and conditions required to meet the expectations they have set in their listings. These should include: - Delivery mode, timelines, and reviews - The forms of payment available for the task - A returns policy: - Clearly stated criteria under which cancellation will be accepted. - Clearly stated the time period in which the buyer must notify the seller about the delivery delay. - How refunds/returns/cancellations will be issued +

What is the policy?

+

Task or Job owners should provide clear and accurate delivery terms and conditions required to meet the expectations they have set in their listings. These should include:

+
    +
  • Delivery mode, timelines, and reviews
    • +
  • The forms of payment available for the task
    • +
  • A returns policy: +
      +
    • Clearly stated criteria under which cancellation will be accepted.
      • +
    • Clearly stated the time period in which the buyer must notify the seller about the delivery delay.
      • +
    • How refunds/returns/cancellations will be issued
      • +
    +
    • +
- Activity that doesn't follow WrenchBoard policy could result in a range of actions, including for example: administratively ending or canceling listings, hiding or demoting all listings from search results, lowering rating, buying or selling restrictions, and account suspension. - All fees paid or payable concerning listings or accounts on which we take any action will not be refunded or otherwise credited to your account. +

Activity that doesn't follow WrenchBoard policy could result in a range of actions, including for example: administratively ending or canceling listings, hiding or demoting all listings from search results, lowering rating, buying or selling restrictions, and account suspension. + All fees paid or payable concerning listings or accounts on which we take any action will not be refunded or otherwise credited to your account.

- Why does WrencBoard have this policy? - Buyers and sellers enter a contract when they complete transactions, so it's necessary to have precise details on what the transaction entails to guarantee satisfaction. This policy also helps sellers meet our performance standards. +

Why does WrencBoard have this policy?

+ +

Buyers and sellers enter a contract when they complete transactions, so it's necessary to have precise details on what the transaction entails to guarantee satisfaction. This policy also helps sellers meet our performance standards.

+ + {/* error or success display */} + {request.message && !request.status ? +
+ {request.message} +
+ : + request.message && request.status && + (
+ {request.message} +
+ ) + } + {/* End of error or success display */} + +
+ {request.loading ? + + : + + } +
diff --git a/src/components/Partials/RightSideBar.jsx b/src/components/Partials/RightSideBar.jsx index 585dbe6..174b611 100644 --- a/src/components/Partials/RightSideBar.jsx +++ b/src/components/Partials/RightSideBar.jsx @@ -13,6 +13,7 @@ import LtcIco from "../Helpers/Icons/LtcIco"; import Usdt from "../Helpers/Icons/Usdt"; import SelectBox from "../Helpers/SelectBox"; import { NavLink } from "react-router-dom"; +//import SideStatistics from "./SideStatistics"; export default function RightSideBar() { const filterDatas = ["Last 15 days", "Last Month", "Last 6 month"]; @@ -200,130 +201,7 @@ export default function RightSideBar() {
- -
-
-
-

- Statistics -

- -
-
- -
- - - - - - - - - - - - - - - - - -
-
-
-
-
-

- Your All Artwork Statistics -

-
-
-
    -
  • - -
    - - Profit : - - - {/* don't change variable only change state */} - {filterDataSet[0]}% - -
    -
    • -
  • - -
    - - Total Sold : - - - {/* don't change variable only change state */} - {filterDataSet[1]}% - -
    -
    • -
  • - -
    - - Total Sold : - - - {/* don't change variable only change state */} - {filterDataSet[2]}% - -
    -
    • -
  • - -
    - - Total Sold : - - - {/* don't change variable only change state */} - {filterDataSet[3]}% - -
    -
    • -
-
-
-
- + {/**/} ); diff --git a/src/components/Partials/SideStatistics.jsx b/src/components/Partials/SideStatistics.jsx index a02db0e..b690083 100644 --- a/src/components/Partials/SideStatistics.jsx +++ b/src/components/Partials/SideStatistics.jsx @@ -3,6 +3,12 @@ import DoughnutChart from "../Charts/DoughnutChart"; import SelectBox from "../Helpers/SelectBox"; export default function SideStatistics() { + const showStats = false; + + if( showStats == false){ + return ''; + } +debugger; const filterDatas = ["Last 15 days", "Last Month", "Last 6 month"]; const [filterDataSet, setFilterDataSet] = useState([10, 30, 20, 40]); const dataSetHandler = (value) => { diff --git a/src/components/Partials/Sidebar.jsx b/src/components/Partials/Sidebar.jsx index 4e5e1cc..e229d36 100644 --- a/src/components/Partials/Sidebar.jsx +++ b/src/components/Partials/Sidebar.jsx @@ -220,12 +220,20 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) { + {/*
*/} + {/*
*/} + {/* */} + {/* */} + {/* Family Account*/} + {/* */} + {/* */} + {/*
*/} + {/*
*/} +
-
+
- - Family Account - +

Family Corner
diff --git a/src/components/jobPopout/ActiveJobsPopout.jsx b/src/components/jobPopout/ActiveJobsPopout.jsx index d282e3c..5117b70 100644 --- a/src/components/jobPopout/ActiveJobsPopout.jsx +++ b/src/components/jobPopout/ActiveJobsPopout.jsx @@ -1,97 +1,139 @@ import React from 'react' import Detail from './popoutcomponent/Detail' +import ModalCom from '../Helpers/ModalCom' -function ActiveJobsPopout({details, onClose}) { - console.log(details) - return ( -
-
-
-

{details.title}

-
- ! -
-

This Job have been sent to public view

-

This Job will expire

-
-
- - {/* INPUT SECTION */} -
- -
- -
- -
- -
- -
- -
- -
- -
- -
-
- +function ActiveJobsPopout({details, onClose, situation}) { + return ( + +
+
+ {/*

+ Confirm +

*/} + +
+
+
+

Opportunity to make some money by introducing 10 of our recent stories from our

+
+ ! +
+

This Job have been sent to public view

+

This Job will expire

- -
- -
-
- - {/* ACTION SECTION */} -
-

Actions

- -
-

Job sent to public view

-
- -
- -
- -
- -
- -
- -
+ + {/* INPUT SECTION */} +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ + {/* ACTION SECTION */} +
+

Actions

+ +
+

Job sent to public view

+
+ +
+ +
+ +
+ +
+ +
+
+
+
+
- ) +
+ + ) } export default ActiveJobsPopout \ No newline at end of file diff --git a/src/components/jobPopout/popoutcomponent/Detail.jsx b/src/components/jobPopout/popoutcomponent/Detail.jsx index 918d135..c154986 100644 --- a/src/components/jobPopout/popoutcomponent/Detail.jsx +++ b/src/components/jobPopout/popoutcomponent/Detail.jsx @@ -3,8 +3,8 @@ import React from 'react' function Detail({label, value, bg}) { return ( <> - -

{value}

+ +

{value}

) } diff --git a/src/services/SiteService.js b/src/services/SiteService.js index 0f19ea1..a8e832b 100644 --- a/src/services/SiteService.js +++ b/src/services/SiteService.js @@ -32,6 +32,10 @@ class SiteService { return this.postAuxEnd('/familyadd', reqData) } + familyListings(reqData) { + return this.postAuxEnd('/familylist', reqData) + } + //---------------------------------------- ----- //---------------------------------------- ----- // Unified call below diff --git a/src/services/UsersService.js b/src/services/UsersService.js index b67b52e..60bd7fb 100644 --- a/src/services/UsersService.js +++ b/src/services/UsersService.js @@ -350,7 +350,7 @@ class usersService { }; return this.postAuxEnd("/familymanage", postData); } - + //END POINT CALL FOR ACCOUNT TOP startTopUp(post){ var postData = { @@ -415,6 +415,17 @@ class usersService { return this.postAuxEnd("/accounttypes", postData); } + // END POINT TO ACCEPT TERMS AND AGREEMENT + jobManagerAgree() { + var postData = { + uid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + action: 13002 + }; + return this.postAuxEnd("/jobmanageragree", postData); + } + verifyEmail(code) { const reqData = { verify_link: code,