diff --git a/src/Components/Features/FeaturesPage.js b/src/Components/Features/FeaturesPage.js index 143eeaf..b48ced6 100644 --- a/src/Components/Features/FeaturesPage.js +++ b/src/Components/Features/FeaturesPage.js @@ -6,7 +6,6 @@ import { } from "../../Constants/Copy/featuresCopy.js"; import legalTek from "../../Assets/Images/legalTek.jpg"; import legalTechFlip from "../../Assets/Images/legalTechFlip.jpg"; -import { ReactComponent as HowToInfoSvg } from "../../Assets/svg/howToInfo.svg"; import "../../styles/features.scss"; const FeaturesPage = () => { @@ -38,37 +37,3 @@ const FeaturesPage = () => { }; export default FeaturesPage; - -/* - - - -
- -
-
- -
-
- -
-
-
- -
-
- -
-
- - -
-
- -
-
- -
-
- - */ diff --git a/src/Components/Navigation/Navbar.js b/src/Components/Navigation/Navbar.js index 3907d65..5ce8052 100644 --- a/src/Components/Navigation/Navbar.js +++ b/src/Components/Navigation/Navbar.js @@ -47,9 +47,25 @@ const NavbarElement = (props) => { setMenuOpen(!menuOpen); } - function handleClick(item) { - const link = item.toLowerCase(); - navigate(`/${link}`); + function handleClick(link) { + const _link = link.toLowerCase(); + if (_link === undefined) { + _link = ""; + } + navigate(`/${_link}`); + } + + function packUpAndLeave(link) { + console.log("packUpAndLeave!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!", link); + navToggle(); + handleClick(link); + } + + function special() { + navigate("/"); + if (menuOpen) { + setMenuOpen(false); + } } async function handleLogout() { @@ -60,7 +76,7 @@ const NavbarElement = (props) => {
- + special("")}>
@@ -100,7 +116,11 @@ const NavbarElement = (props) => {
navToggle()} /> - +
diff --git a/src/Components/Navigation/Navpanel.js b/src/Components/Navigation/Navpanel.js index cb91466..cc079ca 100644 --- a/src/Components/Navigation/Navpanel.js +++ b/src/Components/Navigation/Navpanel.js @@ -4,7 +4,7 @@ import "../../styles/contact.scss"; import { Link } from "react-router-dom"; export default function Navpanel(props) { - const { menuOpen, setMenuOpen, navToggle } = props; + const { menuOpen, setMenuOpen, navToggle, packUpAndLeave } = props; console.log("+++++++++menuOpen", menuOpen); const mobileMainHeadingClass = menuOpen ? "mobileMainHeadingShow" @@ -27,28 +27,33 @@ export default function Navpanel(props) {
- + packUpAndLeave("login")} + > Login
packUpAndLeave("features")} > Features
- + packUpAndLeave("signup")} + > Signup
- + packUpAndLeave("")}> Blog - +