fix navbar

NEARBuilders · Jan 29, 2024 · 75feaa6 · 75feaa6
1 parent f606797
commit 75feaa6
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 22 deletions.
diff --git a/apps/builddao/widget/components/buttons/Connect.jsx b/apps/builddao/widget/components/buttons/Connect.jsx
@@ -1,6 +1,7 @@
+const { joinBtnChildren, connectedChildren, showActivity, className, href } = props;
+
 const { Bullet } = VM.require("buildhub.near/widget/components.Bullet");
 const DaoSDK = VM.require("sdks.near/widget/SDKs.Sputnik.DaoSDK");
-const { joinBtnChildren, connectedChildren, showActivity, className } = props;
 
 if (!DaoSDK) {
   return <></>;
@@ -150,11 +151,19 @@ const Component = () => {
     }
     return <div>{connectedChildren}</div>;
   } else {
-    return (
-      <button className={className} onClick={handleJoin}>
-        {joinBtnChildren}
-      </button>
-    );
+    if (href) {
+      return (
+        <a type="button" href={href} className={className}>
+          {joinBtnChildren}
+        </a>
+      );
+    } else {
+      return (
+        <button className={className} onClick={handleJoin}>
+           {joinBtnChildren}
+        </button>
+      );
+    }
   }
 };
 

diff --git a/apps/builddao/widget/section/cta.jsx b/apps/builddao/widget/section/cta.jsx
@@ -138,7 +138,8 @@ return (
         props={{
           joinBtnChildren: "Join Now",
           showActivity: true,
-          className: "custom-button"
+          className: "custom-button",
+          href: "/join"
         }}
       />
     </Card>

diff --git a/apps/builddao/widget/section/join.jsx b/apps/builddao/widget/section/join.jsx
@@ -361,7 +361,8 @@ return (
           props={{
             joinBtnChildren: "Join Now",
             showActivity: true,
-            className: "custom-button"
+            className: "custom-button",
+            href: "/join"
           }}
         />
       </CTAContent>

diff --git a/src/components/navigation/Navbar.js b/src/components/navigation/Navbar.js
@@ -3,6 +3,7 @@ import styled from "styled-components";
 import { UserDropdown } from "./desktop/UserDropdown";
 import { Widget } from "near-social-vm";
 import { useBosLoaderStore } from "../../stores/bos-loader";
+import { Link } from "react-router-dom/cjs/react-router-dom.min";
 
 const StyledNavbar = styled.nav`
   display: flex;
@@ -147,7 +148,8 @@ export function Navbar(props) {
   return (
     <div
       style={{
-        borderBottom: "1px solid var(--Stroke-color, rgba(255, 255, 255, 0.20))"
+        borderBottom:
+          "1px solid var(--Stroke-color, rgba(255, 255, 255, 0.20))",
       }}
     >
       <StyledNavbar className="container-xl position-relative">
@@ -201,16 +203,21 @@ export function Navbar(props) {
             </button>
           )}
           {props.signedIn && (
-            <Widget
-              src="buildhub.near/widget/components.buttons.Connect"
-              config={{
-                redirectMap: redirectStore.redirectMap
-              }}
-              props={{
-                connectedChildren: <UserDropdown {...props} />,
-                showActivity: false
-              }}
-            />
+            <Link to="/join">
+              <Widget
+                src="buildhub.near/widget/components.buttons.Connect"
+                config={{
+                  redirectMap: redirectStore.redirectMap,
+                }}
+                props={{
+                  connectedChildren: <UserDropdown {...props} />,
+                  showActivity: false,
+                  className: "custom-button",
+                  joinBtnChildren: "Join Now",
+                  // href: "/join",
+                }}
+              />
+              </Link>
           )}
         </div>
 
@@ -229,7 +236,7 @@ export function Navbar(props) {
             padding: "24px 48px",
             zIndex: 5,
             borderBottom:
-              "1px solid var(--Stroke-color, rgba(255, 255, 255, 0.20))"
+              "1px solid var(--Stroke-color, rgba(255, 255, 255, 0.20))",
           }}
         >
           <MobileLink
@@ -274,11 +281,14 @@ export function Navbar(props) {
               <Widget
                 src="buildhub.near/widget/components.buttons.Connect"
                 config={{
-                  redirectMap: redirectStore.redirectMap
+                  redirectMap: redirectStore.redirectMap,
                 }}
                 props={{
                   connectedChildren: <UserDropdown {...props} />,
-                  showActivity: false
+                  showActivity: false,
+                  className: "custom-button",
+                  joinBtnChildren: "Join Now",
+                  href: "/join",
                 }}
               />
             </div>