Merge pull request #112 from hack4bengal/adarsh-fix-dev

fix and update in navbar, brand page and forwarding pages
hack4bengal · Jun 15, 2024 · 114109f · 114109f
2 parents ac0f2be + 2a5e369
commit 114109f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 9 deletions.
diff --git a/src/App.jsx b/src/App.jsx
@@ -23,9 +23,9 @@ const App = () => {
         <main>
           {(window.location.pathname === "/" ||
             window.location.pathname === "/coc" ||
-            window.location.pathname === "brand" ||
+            window.location.pathname === "/brand" ||
             window.location.pathname === "/events" ||
-            window.location.pathname === "team") && <Navbar />}
+            window.location.pathname === "/team") && <Navbar />}
           <Routes>
             <Route exact path="/" element={<Home />} />
             <Route
@@ -89,7 +89,8 @@ const App = () => {
         </main>
 
         {window.location.pathname !== "/surprise" &&
-          window.location.pathname !== "/register" && <Footer />}
+          window.location.pathname !== "/register" &&
+          window.location.pathname !== "/discord" && <Footer />}
       </Suspense>
     </Router>
   );

diff --git a/src/assets/data/HeaderContent.js b/src/assets/data/HeaderContent.js
@@ -102,6 +102,14 @@ const HeaderData = {
     backWordSize_mobile: "80px",
     backWordSpacing_mobile: "0rem",
   },
+  brand: {
+    backWord: "H4B",
+    frontWord: "Brand",
+    backWordSpacing: "0rem",
+    backWordSize: "130px",
+    backWordSize_mobile: "80px",
+    backWordSpacing_mobile: "0rem",
+  },
 };
 
 export default HeaderData;
diff --git a/src/components/shared/navbar/Navbar.jsx b/src/components/shared/navbar/Navbar.jsx
@@ -157,7 +157,7 @@ const Navbar = () => {
               <svg
                 xmlns="http://www.w3.org/2000/svg"
                 width="2"
-                height="560"
+                height="500"
                 viewBox="0 0 2 560"
                 fill="none"
               >

diff --git a/src/pages/brand/Brand.jsx b/src/pages/brand/Brand.jsx
@@ -2,6 +2,10 @@ import React, { useEffect } from "react";
 import { brandContent } from "../../assets/data/BrandContent.js";
 import "./Brand.scss";
 import BrandCard from "./brandcard/BrandCard.jsx";
+import HeaderData from "../../assets/data/HeaderContent";
+import { Header } from "../../components/shared";
+
+
 function Brand() {
   useEffect(() => {
     window.scrollTo(0, 0);
@@ -11,7 +15,7 @@ function Brand() {
     <>
       <div className="brand">
         <div className="brand__content">
-          <h1 className="heading">Brands</h1>
+          <Header {...HeaderData.brand} />
           <div className="brandCards__parent">
             {brandContent.map((brandItem, brandIndex) => (
               <BrandCard key={brandIndex} brandItem={brandItem} />

diff --git a/src/pages/brand/Brand.scss b/src/pages/brand/Brand.scss
@@ -1,14 +1,12 @@
 .brand {
   width: 70%;
   margin: auto;
-  margin-top: 5rem;
-  .heading {
-    margin: 4rem 0;
-  }
+  margin-top: 13rem;
   .brandCards__parent {
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(230px, 1fr));
     gap: 2.2rem;
+    margin-top: 7rem;
     margin-bottom: 4rem;
   }
 }