Merge pull request #9 from kjannette/harry

Harry

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;
-
-/*
-
-
-
-          <div className="features-top-mobile-img">
-            <img className="features-image-one" src={legalTechFlip} />
-          </div>
-          <div className="features-top-left">
-            <FeaturesTop />
-          </div>
-          <div className="features-top-right">
-            <img className="features-image-one" src={legalTechFlip} />
-          </div>
-          <div className="features-bottom-wrapper">
-            <div className="features-top-mobile-img">
-              <img className="features-image-one" src={legalTek} />
-            </div>
-            <div className="features-top-left">
-              <FeaturesBottom />
-            </div>
-          </div>
-
-          
-        <div className="features-bottom-wrapper">
-          <div className="features-bottom-right">
-            <img className="features-image-one" src={legalTek} />
-          </div>
-          <div className="features-bottom-left">
-            <FeaturesBottom />
-          </div>
-        </div>
-
-  */

src/Components/Navigation/Navbar.js

@@ -47,9 +47,25 @@ const NavbarElement = (props) => {
     setMenuOpen(!menuOpen);
   }
 
-  function handleClick(item) {
+  function handleClick(link) {
-    const link = item.toLowerCase();
+    const _link = link.toLowerCase();
-    navigate(`/${link}`);
+    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) => {
     <div className="navbar-wrapper">
       <Navbar fixed="top" className="navbar-main">
         <div className="logo-container">
-          <a href="/">
+          <a onClick={() => special("")}>
             <img src={logoNobackCropped} className="nav-"></img>
           </a>
         </div>
@@ -100,7 +116,11 @@ const NavbarElement = (props) => {
         </div>
         <div className="navbar-mobile-hamburg">
           <List size="36px" onClick={() => navToggle()} />
-          <Navpanel menuOpen={menuOpen} />
+          <Navpanel
+            menuOpen={menuOpen}
+            navToggle={navToggle}
+            packUpAndLeave={packUpAndLeave}
+          />
         </div>
       </Navbar>
       <div className="navbar-main-spacer"></div>

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) {
         <div className="mobileHeadingLinkWrap">
           <div className="mobile-info-box">
             <div className="contact-detail-one">
-              <a className="contact-link" href="/login" onClick={navToggle}>
+              <a
+                className="contact-link"
+                onClick={() => packUpAndLeave("login")}
+              >
                 Login
               </a>
             </div>
             <div className="contact-detail-two">
               <a
                 className="contact-link-two"
-                href="/features"
+                onClick={() => packUpAndLeave("features")}
-                onClick={navToggle}
               >
                 Features
               </a>
             </div>
             <div className="contact-detail-three">
-              <a className="nav-link-three" href="/signup" onClick={navToggle}>
+              <a
+                className="nav-link-three"
+                onClick={() => packUpAndLeave("signup")}
+              >
                 Signup
               </a>
             </div>
             <div className="contact-detail-one">
-              <Link className="contact-link" href="/login" onClick={navToggle}>
+              <a className="contact-link" onClick={() => packUpAndLeave("")}>
                 Blog
-              </Link>
+              </a>
             </div>
           </div>
         </div>