diff --git a/src/assets/images/facebook-4.svg b/src/assets/images/facebook.svg similarity index 99% rename from src/assets/images/facebook-4.svg rename to src/assets/images/facebook.svg index 70a3d90..ccff813 100644 --- a/src/assets/images/facebook-4.svg +++ b/src/assets/images/facebook.svg @@ -1,4 +1,4 @@ - - - - + + + + diff --git a/src/components/AuthPages/Login/index.jsx b/src/components/AuthPages/Login/index.jsx index d1cf2d8..acc3f40 100644 --- a/src/components/AuthPages/Login/index.jsx +++ b/src/components/AuthPages/Login/index.jsx @@ -2,7 +2,7 @@ import React, { useEffect, useLayoutEffect, useState } from "react"; import { Link, useLocation, useNavigate } from "react-router-dom"; import linkedInLogo from "../../../assets/images/Linkedin.png"; import appleLogo from "../../../assets/images/apple-black.svg"; -import facebookLogo from "../../../assets/images/facebook-4.svg"; +import facebookLogo from "../../../assets/images/facebook.svg"; import googleLogo from "../../../assets/images/google-logo.svg"; import WrenchBoard from "../../../assets/images/wrenchboard-logo-text.png"; import usersService from "../../../services/UsersService"; diff --git a/src/components/AuthPages/Login/index2.jsx b/src/components/AuthPages/Login/index2.jsx index f2526b8..e6201a4 100644 --- a/src/components/AuthPages/Login/index2.jsx +++ b/src/components/AuthPages/Login/index2.jsx @@ -2,7 +2,7 @@ import React, { useEffect, useLayoutEffect, useState } from "react"; import { Link, useLocation, useNavigate } from "react-router-dom"; import linkedInLogo from "../../../assets/images/Linkedin.png"; import appleLogo from "../../../assets/images/apple-black.svg"; -import facebookLogo from "../../../assets/images/facebook-4.svg"; +import facebookLogo from "../../../assets/images/facebook.svg"; import googleLogo from "../../../assets/images/google-logo.svg"; import WrenchBoard from "../../../assets/images/wrenchboard-logo-text.png"; import usersService from "../../../services/UsersService"; diff --git a/src/components/Dashboards/AccountDashboard.jsx b/src/components/Dashboards/AccountDashboard.jsx new file mode 100644 index 0000000..77bd98a --- /dev/null +++ b/src/components/Dashboards/AccountDashboard.jsx @@ -0,0 +1,15 @@ +import React from 'react' + +const AccountDashboard = ({className}) => { + return ( +
+
+ Account Dashboard +
+
+ ) +} + +export default AccountDashboard diff --git a/src/components/Dashboards/index.js b/src/components/Dashboards/index.js index 5da23db..88dd521 100644 --- a/src/components/Dashboards/index.js +++ b/src/components/Dashboards/index.js @@ -2,10 +2,12 @@ import FamilyParentDashboard from "./FamilyParentDashboard"; import HomeDashboard from "./HomeDashboard"; import JobOwnerDashboard from "./JobOwnerDashboard"; import WorkerDashboard from "./WorkerDashboard"; +import AccountDashboard from "./AccountDashboard"; export { FamilyParentDashboard, HomeDashboard, JobOwnerDashboard, WorkerDashboard, + AccountDashboard }; diff --git a/src/components/Home/FullAccountDash.jsx b/src/components/Home/FullAccountDash.jsx index 7178217..40bdbab 100644 --- a/src/components/Home/FullAccountDash.jsx +++ b/src/components/Home/FullAccountDash.jsx @@ -1,10 +1,15 @@ import { useSelector } from "react-redux"; +import { + AccountDashboard, + FamilyParentDashboard, + HomeDashboard, + JobOwnerDashboard, + WorkerDashboard, +} from "../Dashboards"; import MyJobTable from "../MyTasks/MyJobTable"; import MyOffersTable from "../MyTasks/MyOffersTable"; import LoadingSpinner from "../Spinners/LoadingSpinner"; -import Hero from "./Hero"; import HomeActivities from "./HomeActivities"; -import { FamilyParentDashboard, HomeDashboard, JobOwnerDashboard, WorkerDashboard } from "../Dashboards"; export default function FullAccountDash(props) { // console.log("PROPS IN HOME->", props); @@ -57,9 +62,11 @@ export default function FullAccountDash(props) { return ( <>
+ {renderDashboard()} - {props?.dashTypes !== "undefined" && props.offersList?.data?.result_list?.length ? ( + {props?.dashTypes !== "undefined" && + props.offersList?.data?.result_list?.length ? ( { const apiCall = useMemo(() => new usersService(), []); @@ -26,7 +25,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => { ); const { - userDetails: { username, uid, session}, + userDetails: { username, uid, session }, } = useSelector((state) => state?.userDetails); // CHECKS IF USER Details are avaliable, to determine if user is active let loggedIn = username && session && uid ? true : false; // variable to determine if user is logged in @@ -227,7 +226,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => { console.log("ERROR ", error); }); }, []); - + //FUNCTION TO GET COMMON HEAD DATA useEffect(() => { apiCall