Added new stuff
This commit is contained in:
@@ -72,6 +72,7 @@ const TopBanner = ({ image, title = "", desc = "", btn, link_path, key }) => {
|
|||||||
<img
|
<img
|
||||||
src={image}
|
src={image}
|
||||||
alt="banner-img"
|
alt="banner-img"
|
||||||
|
loading="lazy"
|
||||||
className="w-full h-full rounded-t-xl object-cover"
|
className="w-full h-full rounded-t-xl object-cover"
|
||||||
/>
|
/>
|
||||||
</Link>
|
</Link>
|
||||||
@@ -120,6 +121,7 @@ const LowerBanner = ({ image, title = "", desc = "", btn, link_path, key }) => {
|
|||||||
<img
|
<img
|
||||||
src={image}
|
src={image}
|
||||||
alt="banner-img"
|
alt="banner-img"
|
||||||
|
loading="lazy"
|
||||||
className="w-full h-full rounded-xl"
|
className="w-full h-full rounded-xl"
|
||||||
/>
|
/>
|
||||||
</Link>
|
</Link>
|
||||||
|
|||||||
@@ -8,8 +8,6 @@ import {
|
|||||||
} from "../Dashboards";
|
} from "../Dashboards";
|
||||||
import MyJobTable from "../MyTasks/MyJobTable";
|
import MyJobTable from "../MyTasks/MyJobTable";
|
||||||
import MyOffersTable from "../MyTasks/MyOffersTable";
|
import MyOffersTable from "../MyTasks/MyOffersTable";
|
||||||
import LoadingSpinner from "../Spinners/LoadingSpinner";
|
|
||||||
import HomeActivities from "./HomeActivities";
|
|
||||||
|
|
||||||
export default function FullAccountDash(props) {
|
export default function FullAccountDash(props) {
|
||||||
// console.log("PROPS IN HOME->", props);
|
// console.log("PROPS IN HOME->", props);
|
||||||
@@ -86,24 +84,17 @@ export default function FullAccountDash(props) {
|
|||||||
imageServer={props.offersList?.data?.session_image_server}
|
imageServer={props.offersList?.data?.session_image_server}
|
||||||
/>
|
/>
|
||||||
</>
|
</>
|
||||||
) : !props.offersList?.loading && !props.MyActiveJobList?.loading ? (
|
) : null}
|
||||||
<HomeActivities className="mb-10" />
|
|
||||||
) : (
|
|
||||||
<div className="w-full h-[220px] flex items-center justify-center">
|
|
||||||
<LoadingSpinner size="16" color="sky-blue" />
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/*<UpdateTable className="mb-10"/>*/}
|
|
||||||
{/*<SellHistoryMarketVisitorAnalytic className="mb-10"/>*/}
|
|
||||||
{/*<TopSellerTopBuyerSliderSection className="mb-10" />*/}
|
|
||||||
|
|
||||||
{/*<HomeTaskDisplay*/}
|
|
||||||
{/* jobData={jobData}*/}
|
|
||||||
{/* className="mb-10"*/}
|
|
||||||
{/* bannerList={props.bannerList}*/}
|
|
||||||
{/*/>*/}
|
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// : !props.offersList?.loading && !props.MyActiveJobList?.loading ? (
|
||||||
|
// <HomeActivities className="mb-10" />
|
||||||
|
// )
|
||||||
|
// : (
|
||||||
|
// <div className="w-full h-[220px] flex items-center justify-center">
|
||||||
|
// <LoadingSpinner size="16" color="sky-blue" />
|
||||||
|
// </div>
|
||||||
|
// )
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ export default function HomeActivities({ className }) {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className={`update-table w-full p-8 bg-white dark:bg-dark-white overflow-hidden rounded-2xl section-shadow relative min-h-[520px] ${
|
className={`update-table w-full p-8 bg-white dark:bg-dark-white overflow-hidden rounded-2xl relative min-h-[520px] ${
|
||||||
className || ""
|
className || ""
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -1,18 +1,17 @@
|
|||||||
import React, { useContext, useMemo, useState } from "react";
|
import React, { useContext } from "react";
|
||||||
import { Link, useLocation, useNavigate } from "react-router-dom";
|
import { Link, useLocation } from "react-router-dom";
|
||||||
import bank1 from "../../assets/images/bank-1.png";
|
import bank1 from "../../assets/images/bank-1.png";
|
||||||
import bank2 from "../../assets/images/bank-2.png";
|
import bank2 from "../../assets/images/bank-2.png";
|
||||||
import bank3 from "../../assets/images/bank-3.png";
|
import bank3 from "../../assets/images/bank-3.png";
|
||||||
import bank4 from "../../assets/images/bank-4.png";
|
import bank4 from "../../assets/images/bank-4.png";
|
||||||
import profileImg from "../../assets/images/profile.jpg";
|
import profileImg from "../../assets/images/profile.jpg";
|
||||||
import useToggle from "../../hooks/useToggle";
|
import useToggle from "../../hooks/useToggle";
|
||||||
import usersService from "../../services/UsersService";
|
|
||||||
import DarkModeContext from "../Contexts/DarkModeContext";
|
import DarkModeContext from "../Contexts/DarkModeContext";
|
||||||
import Icons from "../Helpers/Icons";
|
import Icons from "../Helpers/Icons";
|
||||||
import ModalCom from "../Helpers/ModalCom";
|
import ModalCom from "../Helpers/ModalCom";
|
||||||
import WalletHeader from "../MyWallet/WalletHeader";
|
import WalletHeader from "../MyWallet/WalletHeader";
|
||||||
|
|
||||||
import { useDispatch, useSelector } from "react-redux";
|
import { useSelector } from "react-redux";
|
||||||
import Flag from "../../assets/images/united-states.svg";
|
import Flag from "../../assets/images/united-states.svg";
|
||||||
import siteLogo from "../../assets/images/wrenchboard-logo-text.png";
|
import siteLogo from "../../assets/images/wrenchboard-logo-text.png";
|
||||||
// import { updateWalletDetails } from "../../store/walletDetails";
|
// import { updateWalletDetails } from "../../store/walletDetails";
|
||||||
@@ -43,7 +42,6 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
|
|||||||
|
|
||||||
// 9308RDR122
|
// 9308RDR122
|
||||||
|
|
||||||
|
|
||||||
const handlerBalance = () => {
|
const handlerBalance = () => {
|
||||||
setbalanceValue.toggle();
|
setbalanceValue.toggle();
|
||||||
if (notificationDropdown) {
|
if (notificationDropdown) {
|
||||||
@@ -153,9 +151,10 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
|
|||||||
</defs>
|
</defs>
|
||||||
</svg>
|
</svg>
|
||||||
</button>
|
</button>
|
||||||
{/* search bar */}
|
|
||||||
<div className="search-bar lg:block hidden w-[376px]">
|
<div className="search-bar xl:hidden justify-center items-center w-[376px]">
|
||||||
{/*<SearchCom />*/}
|
{/* Home */}
|
||||||
|
<HomeButton />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* user info */}
|
{/* user info */}
|
||||||
@@ -501,7 +500,6 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -684,3 +682,18 @@ const PageButton = () => {
|
|||||||
</Link>
|
</Link>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const HomeButton = () => {
|
||||||
|
return (
|
||||||
|
<Link
|
||||||
|
to="/"
|
||||||
|
className="flex user-balance cursor-pointer w-[100px] h-[48px] items-center rounded-full relative bg-sky-blue pr-1.5 pl-4"
|
||||||
|
>
|
||||||
|
<div className="flex items-center lg:justify-between justify-center w-full h-full">
|
||||||
|
<span className="hidden"></span>
|
||||||
|
<p className="lg:text-xl text-lg font-bold text-white">Home</p>
|
||||||
|
<span className="hidden"></span>
|
||||||
|
</div>
|
||||||
|
</Link>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
import React from "react";
|
||||||
|
import HomeActivities from "../../Home/HomeActivities";
|
||||||
|
|
||||||
|
const RecentActivitiesTab = () => {
|
||||||
|
return (
|
||||||
|
<div className="recent-activity-tab w-full">
|
||||||
|
<HomeActivities />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default RecentActivitiesTab;
|
||||||
@@ -5,6 +5,7 @@ import NotificationSettingTab from "./NotificationSettingTab";
|
|||||||
import PaymentMathodsTab from "./PaymentMathodsTab";
|
import PaymentMathodsTab from "./PaymentMathodsTab";
|
||||||
import PersonalInfoTab from "./PersonalInfoTab";
|
import PersonalInfoTab from "./PersonalInfoTab";
|
||||||
import PrivacyPolicyTab from "./PrivacyPolicyTab";
|
import PrivacyPolicyTab from "./PrivacyPolicyTab";
|
||||||
|
import RecentActivitiesTab from "./RecentActivitiesTab";
|
||||||
import TermsConditionTab from "./TermsConditionTab";
|
import TermsConditionTab from "./TermsConditionTab";
|
||||||
|
|
||||||
export {
|
export {
|
||||||
@@ -15,5 +16,6 @@ export {
|
|||||||
PaymentMathodsTab,
|
PaymentMathodsTab,
|
||||||
PersonalInfoTab,
|
PersonalInfoTab,
|
||||||
PrivacyPolicyTab,
|
PrivacyPolicyTab,
|
||||||
|
RecentActivitiesTab,
|
||||||
TermsConditionTab,
|
TermsConditionTab,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,10 +1,4 @@
|
|||||||
import React, {
|
import React, { useCallback, useEffect, useState } from "react";
|
||||||
useCallback,
|
|
||||||
useEffect,
|
|
||||||
useMemo,
|
|
||||||
useRef,
|
|
||||||
useState,
|
|
||||||
} from "react";
|
|
||||||
import { useSelector } from "react-redux";
|
import { useSelector } from "react-redux";
|
||||||
import usersService from "../../services/UsersService";
|
import usersService from "../../services/UsersService";
|
||||||
import Icons from "../Helpers/Icons";
|
import Icons from "../Helpers/Icons";
|
||||||
@@ -17,6 +11,7 @@ import {
|
|||||||
PaymentMathodsTab,
|
PaymentMathodsTab,
|
||||||
PersonalInfoTab,
|
PersonalInfoTab,
|
||||||
PrivacyPolicyTab,
|
PrivacyPolicyTab,
|
||||||
|
RecentActivitiesTab,
|
||||||
TermsConditionTab,
|
TermsConditionTab,
|
||||||
} from "./Tabs";
|
} from "./Tabs";
|
||||||
import RecipientAccountTab from "./Tabs/RecipientAccountTab";
|
import RecipientAccountTab from "./Tabs/RecipientAccountTab";
|
||||||
@@ -102,24 +97,30 @@ export default function Settings({ faq }) {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: 6,
|
id: 6,
|
||||||
|
name: "recent_activities",
|
||||||
|
title: "Recent Activities",
|
||||||
|
iconName: "login-activity",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 7,
|
||||||
name: "password",
|
name: "password",
|
||||||
title: "Change Password",
|
title: "Change Password",
|
||||||
iconName: "password-hover",
|
iconName: "password-hover",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: 7,
|
id: 8,
|
||||||
name: "faq",
|
name: "faq",
|
||||||
title: "FAQ",
|
title: "FAQ",
|
||||||
iconName: "block-question",
|
iconName: "block-question",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: 8,
|
id: 9,
|
||||||
name: "privacy",
|
name: "privacy",
|
||||||
title: "Privacy Policy",
|
title: "Privacy Policy",
|
||||||
iconName: "page-right",
|
iconName: "page-right",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: 9,
|
id: 10,
|
||||||
name: "terms",
|
name: "terms",
|
||||||
title: "Terms and Conditions",
|
title: "Terms and Conditions",
|
||||||
iconName: "page-right",
|
iconName: "page-right",
|
||||||
@@ -166,6 +167,7 @@ export default function Settings({ faq }) {
|
|||||||
</div>
|
</div>
|
||||||
),
|
),
|
||||||
login_activity: <LoginActivityTab />,
|
login_activity: <LoginActivityTab />,
|
||||||
|
recent_activities: <RecentActivitiesTab />,
|
||||||
password: <ChangePasswordTab />,
|
password: <ChangePasswordTab />,
|
||||||
faq: <FaqTab datas={faq} />,
|
faq: <FaqTab datas={faq} />,
|
||||||
privacy: <PrivacyPolicyTab />,
|
privacy: <PrivacyPolicyTab />,
|
||||||
|
|||||||
Reference in New Issue
Block a user