Merge pull request #18 from sudhirverma/bug

Fix search for Explore Marketplace, fix filter and route for footer button
OSSVerse · Dec 9, 2024 · 8035bd5 · 8035bd5
2 parents a5e18d3 + 22707bc
commit 8035bd5
Show file tree

Hide file tree

Showing 4 changed files with 170 additions and 142 deletions.
diff --git a/src/components/layout/__test__/footer.test.tsx b/src/components/layout/__test__/footer.test.tsx
@@ -33,14 +33,14 @@ describe('Footer', () => {
 
 
         const links = [
-            { text: 'Platform', href: '/platform' },
-            { text: 'Solutions', href: '/solutions' },
-            { text: 'Resources', href: '/resources' },
-            { text: 'Company', href: '/company' },
+            // { text: 'Platform', href: '/platform' },
+            // { text: 'Solutions', href: '/solutions' },
+            // { text: 'Resources', href: '/resources' },
+            // { text: 'Company', href: '/company' },
             { text: 'Book a Demo', href: '/book-a-demo' },
-            { text: 'Explore Marketplace', href: '/explore-marketplace' },
-            { text: 'Get Started', href: '/get-started' },
-            { text: 'Sign in', href: '/sign-in' },
+            { text: 'Explore Marketplace', href: '/marketplace' },
+            // { text: 'Get Started', href: '/get-started' },
+            { text: 'Sign in', href: '/' },
         ]
 
         for (const link of links) {

diff --git a/src/components/layout/footer.tsx b/src/components/layout/footer.tsx
@@ -1,57 +1,70 @@
 import { Link } from "react-router-dom";
 import Logo from "../icons/logo";
+import useAuthStore from "@/store/auth-store";
+import LoginNavbar from "./login-navbar";
+import { ROUTE_PATH } from "@/routes/route-path";
 
 const Footer = () => {
+  const { isAuthenticated, openLoginNavbar, setOpenLoginNavbar } =
+    useAuthStore((state) => state);
   return (
-    <footer className="mt-8 border-t pt-4 page-root bg-secondary">
-      <div className="flex flex-col sm:flex-row justify-between items-center gap-10 text-sm ">
-        <div className="flex flex-col gap-10 text-muted-foreground">
-          <Logo height={26 * 1.5} width={87 * 1.5} />
-          <div>
-            <p>© 2024 OSSVerse.</p>
-            <p>Connecting Innovators with Security Experts.</p>
-            <p>All rights reserved.</p>
-          </div>
-        </div>
-        <div className="flex flex-wrap w-1/2 justify-between gap-10">
-          <div className="flex flex-col gap-4">
-            <Link to="/platform" className="hover:underline">
-              Platform
-            </Link>
-            <Link to="/solutions" className="hover:underline">
-              Solutions
-            </Link>
+    <>
+      {openLoginNavbar && (
+        <LoginNavbar close={() => setOpenLoginNavbar(false)} />
+      )}
+      <footer className="mt-8 border-t pt-4 page-root bg-secondary">
+        <div className="flex flex-col sm:flex-row justify-between items-center gap-10 text-sm ">
+          <div className="flex flex-col gap-10 text-muted-foreground">
+            <Logo height={26 * 1.5} width={87 * 1.5} />
+            <div>
+              <p>© 2024 OSSVerse.</p>
+              <p>Connecting Innovators with Security Experts.</p>
+              <p>All rights reserved.</p>
+            </div>
           </div>
+          <div className="flex flex-wrap w-1/2 gap-20">
+            {/* <div className="flex flex-col gap-4">
+              <Link to="/platform" className="hover:underline">
+                Platform
+              </Link>
+              <Link to="/solutions" className="hover:underline">
+                Solutions
+              </Link>
+            </div> */}
 
-          <div className="flex flex-col gap-4">
-            <Link to="/resources" className="hover:underline">
-              Resources
-            </Link>
-            <Link to="/company" className="hover:underline">
-              Company
-            </Link>
-          </div>
-
-          <div className="flex flex-col gap-4">
-            <Link to="/book-a-demo" className="hover:underline">
-              Book a Demo
-            </Link>
-            <Link to="/explore-marketplace" className="hover:underline">
-              Explore Marketplace
-            </Link>
-          </div>
+            {/* <div className="flex flex-col gap-4">
+              <Link to="/resources" className="hover:underline">
+                Resources
+              </Link>
+              <Link to="/company" className="hover:underline">
+                Company
+              </Link>
+            </div> */}
 
-          <div className="flex flex-col gap-4">
-            <Link to="/get-started" className="hover:underline">
-              Get Started
-            </Link>
-            <Link to="/sign-in" className="hover:underline">
-              Sign in
-            </Link>
+            <div className="flex flex-col gap-4">
+              <Link to="/book-a-demo" className="hover:underline cursor-not-allowed text-gray-400 pointer-events-none" aria-disabled={true}>
+                Book a Demo
+              </Link>
+              <Link to={ROUTE_PATH.MARKETPLACE} className="hover:underline">
+                Explore Marketplace
+              </Link>
+            </div>
+            {
+              !isAuthenticated && (
+                <div className="flex flex-col gap-4">
+                  <Link onClick={(e) => {
+                    e.preventDefault();
+                    setOpenLoginNavbar(true);
+                  }} className="hover:underline" to={""}>
+                    Sign in
+                  </Link>
+                </div>
+              )
+            }
           </div>
         </div>
-      </div>
-    </footer>
+      </footer>
+    </>
   );
 };