diff --git a/src/components/Dashboards/AccountDashboard.jsx b/src/components/Dashboards/AccountDashboard.jsx index 254097b..68beb24 100644 --- a/src/components/Dashboards/AccountDashboard.jsx +++ b/src/components/Dashboards/AccountDashboard.jsx @@ -72,6 +72,7 @@ const TopBanner = ({ image, title = "", desc = "", btn, link_path, key }) => { banner-img @@ -120,6 +121,7 @@ const LowerBanner = ({ image, title = "", desc = "", btn, link_path, key }) => { banner-img diff --git a/src/components/Home/FullAccountDash.jsx b/src/components/Home/FullAccountDash.jsx index ba029f4..748b7e3 100644 --- a/src/components/Home/FullAccountDash.jsx +++ b/src/components/Home/FullAccountDash.jsx @@ -8,8 +8,6 @@ import { } from "../Dashboards"; import MyJobTable from "../MyTasks/MyJobTable"; import MyOffersTable from "../MyTasks/MyOffersTable"; -import LoadingSpinner from "../Spinners/LoadingSpinner"; -import HomeActivities from "./HomeActivities"; export default function FullAccountDash(props) { // console.log("PROPS IN HOME->", props); @@ -86,24 +84,17 @@ export default function FullAccountDash(props) { imageServer={props.offersList?.data?.session_image_server} /> - ) : !props.offersList?.loading && !props.MyActiveJobList?.loading ? ( - - ) : ( -
- -
- )} - - {/**/} - {/**/} - {/**/} - - {/**/} + ) : null} ); } + +// : !props.offersList?.loading && !props.MyActiveJobList?.loading ? ( +// +// ) +// : ( +//
+// +//
+// ) diff --git a/src/components/Home/HomeActivities.jsx b/src/components/Home/HomeActivities.jsx index 7741a16..3b5f50e 100644 --- a/src/components/Home/HomeActivities.jsx +++ b/src/components/Home/HomeActivities.jsx @@ -53,7 +53,7 @@ export default function HomeActivities({ className }) { return (
diff --git a/src/components/Partials/Header.jsx b/src/components/Partials/Header.jsx index c54ccad..a1b93d3 100644 --- a/src/components/Partials/Header.jsx +++ b/src/components/Partials/Header.jsx @@ -1,18 +1,17 @@ -import React, { useContext, useMemo, useState } from "react"; -import { Link, useLocation, useNavigate } from "react-router-dom"; +import React, { useContext } from "react"; +import { Link, useLocation } from "react-router-dom"; import bank1 from "../../assets/images/bank-1.png"; import bank2 from "../../assets/images/bank-2.png"; import bank3 from "../../assets/images/bank-3.png"; import bank4 from "../../assets/images/bank-4.png"; import profileImg from "../../assets/images/profile.jpg"; import useToggle from "../../hooks/useToggle"; -import usersService from "../../services/UsersService"; import DarkModeContext from "../Contexts/DarkModeContext"; import Icons from "../Helpers/Icons"; import ModalCom from "../Helpers/ModalCom"; 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 siteLogo from "../../assets/images/wrenchboard-logo-text.png"; // import { updateWalletDetails } from "../../store/walletDetails"; @@ -43,7 +42,6 @@ export default function Header({ logoutModalHandler, sidebarHandler }) { // 9308RDR122 - const handlerBalance = () => { setbalanceValue.toggle(); if (notificationDropdown) { @@ -153,9 +151,10 @@ export default function Header({ logoutModalHandler, sidebarHandler }) { - {/* search bar */} -
- {/**/} + +
+ {/* Home */} +
{/* user info */} @@ -501,7 +500,6 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
- @@ -684,3 +682,18 @@ const PageButton = () => { ); }; + +const HomeButton = () => { + return ( + +
+ +

Home

+ +
+ + ); +}; diff --git a/src/components/Settings/Tabs/RecentActivitiesTab.jsx b/src/components/Settings/Tabs/RecentActivitiesTab.jsx new file mode 100644 index 0000000..ab633cc --- /dev/null +++ b/src/components/Settings/Tabs/RecentActivitiesTab.jsx @@ -0,0 +1,12 @@ +import React from "react"; +import HomeActivities from "../../Home/HomeActivities"; + +const RecentActivitiesTab = () => { + return ( +
+ +
+ ); +}; + +export default RecentActivitiesTab; diff --git a/src/components/Settings/Tabs/index.jsx b/src/components/Settings/Tabs/index.jsx index 95f1b5a..7cfe575 100644 --- a/src/components/Settings/Tabs/index.jsx +++ b/src/components/Settings/Tabs/index.jsx @@ -5,6 +5,7 @@ import NotificationSettingTab from "./NotificationSettingTab"; import PaymentMathodsTab from "./PaymentMathodsTab"; import PersonalInfoTab from "./PersonalInfoTab"; import PrivacyPolicyTab from "./PrivacyPolicyTab"; +import RecentActivitiesTab from "./RecentActivitiesTab"; import TermsConditionTab from "./TermsConditionTab"; export { @@ -15,5 +16,6 @@ export { PaymentMathodsTab, PersonalInfoTab, PrivacyPolicyTab, + RecentActivitiesTab, TermsConditionTab, }; diff --git a/src/components/Settings/index.jsx b/src/components/Settings/index.jsx index 9969b9e..27f118c 100644 --- a/src/components/Settings/index.jsx +++ b/src/components/Settings/index.jsx @@ -1,10 +1,4 @@ -import React, { - useCallback, - useEffect, - useMemo, - useRef, - useState, -} from "react"; +import React, { useCallback, useEffect, useState } from "react"; import { useSelector } from "react-redux"; import usersService from "../../services/UsersService"; import Icons from "../Helpers/Icons"; @@ -17,6 +11,7 @@ import { PaymentMathodsTab, PersonalInfoTab, PrivacyPolicyTab, + RecentActivitiesTab, TermsConditionTab, } from "./Tabs"; import RecipientAccountTab from "./Tabs/RecipientAccountTab"; @@ -102,24 +97,30 @@ export default function Settings({ faq }) { }, { id: 6, + name: "recent_activities", + title: "Recent Activities", + iconName: "login-activity", + }, + { + id: 7, name: "password", title: "Change Password", iconName: "password-hover", }, { - id: 7, + id: 8, name: "faq", title: "FAQ", iconName: "block-question", }, { - id: 8, + id: 9, name: "privacy", title: "Privacy Policy", iconName: "page-right", }, { - id: 9, + id: 10, name: "terms", title: "Terms and Conditions", iconName: "page-right", @@ -166,6 +167,7 @@ export default function Settings({ faq }) { ), login_activity: , + recent_activities: , password: , faq: , privacy: ,