fix: changes to stylings

ngoworldcommunity · Jun 29, 2023 · f324ce6 · f324ce6
1 parent 2c5a39a
commit f324ce6
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 31 deletions.
diff --git a/src/components/Banners/Banner.jsx b/src/components/Banners/Banner.jsx
@@ -1,13 +1,11 @@
 import React, { useContext } from "react";
-import { useNavigate } from "react-router-dom";
 import "../../styles/Banner.css";
 import Cookies from "js-cookie";
 import { ImGithub } from "react-icons/im";
 import MilanContext from "../../context/MilanContext";
 import Button from "../Button";
 
 const Banner = () => {
-  const nav = useNavigate();
   const { toggleSignUpModal } = useContext(MilanContext);
 
   return (
@@ -21,7 +19,6 @@ const Banner = () => {
                 <br />
                 MILAN
               </h1>
-              {/*  <p className="banner_header2">MILAN</p> */}
               <div>
                 <p className="banner_header3">
                   We are a hub which aims to connect NGOs, Charities and users
@@ -33,27 +30,24 @@ const Banner = () => {
                 {Cookies.get("token") || Cookies.get("club") ? (
                   <div className="banner_btn_div">
                     <Button
+                      className="banner_signup_btn banner_contribute_btn "
+                      to="https://github.com/IAmTamal/Milan"
+                      target="_blank"
+                      rel="noreferrer"
                       variant="outline"
-                      onClick={() => {
-                        nav("/shop");
-                      }}
-                      data-cy="landingpage-club-signup"
-                      id="landingpage-club-signup"
                     >
-                      Explore our brand new shop !
+                      Explore our shop
                     </Button>
 
-                    <a
-                      href="https://github.com/IAmTamal/Milan"
+                    <Button
+                      className="banner_signup_btn banner_contribute_btn "
+                      to="https://github.com/IAmTamal/Milan"
                       target="_blank"
-                      style={{ textDecoration: "none" }}
                       rel="noreferrer"
                     >
-                      <button className="btn btn-warning banner_signup_btn banner_contribute_btn ">
-                        <ImGithub className="banner_contribute_logo" />
-                        <p>Contribute to Milan</p>
-                      </button>
-                    </a>
+                      <ImGithub className="banner_contribute_logo" />
+                      Contribute to Milan
+                    </Button>
                   </div>
                 ) : (
                   <div className="banner_btn_div">

diff --git a/src/pages/clubs/ClubDetails.jsx b/src/pages/clubs/ClubDetails.jsx
@@ -5,6 +5,7 @@ import displayRazorpay from "../../service/PaymentGateway";
 import Modal from "../../components/Modal";
 import useSWR from "swr";
 import { defaultfetcher } from "../../utils/fetcher";
+import Navbar from "../../components/Navbar";
 
 function ClubDetailsCard() {
   const params = useParams();
@@ -27,23 +28,30 @@ function ClubDetailsCard() {
 
   useEffect(() => {
     loadScript("https://checkout.razorpay.com/v1/checkout.js");
-  });
+  }, []);
 
   const { data: clubdetails } = useSWR(
     `${import.meta.env.VITE_MILANAPI}/display/clubs?id=${params.id}`,
     defaultfetcher,
   );
 
+  console.log(clubdetails);
+
   const closePayModal = () => {
     setshowPaymodal(false);
     document.body.style.overflow = "auto";
   };
 
   return (
     <>
+      <Navbar />
+
       <div className="clubdetails_parent">
         <div className="clubdetails_imagediv">
-          <img src="https://i.ibb.co/88dTvtR/We-love-earth.png" alt={clubdetails.name} />
+          <img
+            src="https://i.ibb.co/88dTvtR/We-love-earth.png"
+            alt={clubdetails?.name}
+          />
         </div>
 
         <div className="clubdetails_textdiv">

diff --git a/src/styles/Button.module.css b/src/styles/Button.module.css
@@ -57,7 +57,7 @@
 .outline:hover,
 .outline:active {
   background-color: #e26959;
-  color: #fff;
+  color: #000;
 }
 
 .outline:disabled {

diff --git a/src/styles/Navbar.css b/src/styles/Navbar.css
@@ -7,15 +7,14 @@
   z-index: 10;
   position: fixed;
   top: 0;
-  width:100%;
+  width: 100%;
 }
 
 .nav_brand_parent {
   display: flex;
   align-items: center;
 }
 
-
 .nav_brand_name {
   color: #e26959;
   text-decoration: none;
@@ -27,7 +26,6 @@
 .navbar-nav {
   margin: auto;
   gap: 30px;
-  padding-left: 100px;
 }
 
 .navbar-brand {
@@ -47,18 +45,15 @@
   font-family: Poppins, sans-serif;
   color: #28183b;
   font-size: 1rem;
-  /* position: relative; */
 }
 
 .nav-item div:not(.active-link) {
   border-bottom: 2px solid #e26959;
   width: 0%;
   margin: auto;
   transition: all 0.2s ease-in;
-
 }
 
-
 .nav-item:hover div {
   border-bottom: 2px solid #e26959;
   width: 50%;
@@ -71,8 +66,6 @@
   margin: auto;
 }
 
-
-
 .shop_tag {
   font-weight: 600;
   color: black;
@@ -145,7 +138,7 @@
   }
 }
 
-.signUpModalHeader>h1 {
+.signUpModalHeader > h1 {
   font-family: Poppins, sans-serif;
   color: #000000;
   font-size: 1.5rem;
@@ -174,9 +167,9 @@
     align-items: center;
   }
 
-  .signUpModalHeader>h1 {
+  .signUpModalHeader > h1 {
     font-size: 1.2rem;
     margin-left: 1.4rem;
     flex: auto;
   }
-}
+}