Merge pull request #58 from Krish-Panchani/main

Added navbar links and resolved conflicts
gauravsingh1281 · Oct 15, 2023 · 5efc58d · 5efc58d
2 parents 9b2727c + 0c3ac95
commit 5efc58d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/components/AboutUs-section/AboutUs.jsx b/src/components/AboutUs-section/AboutUs.jsx
@@ -2,7 +2,7 @@ import rentBoardImg from "../.././assets/Images/rent-board.png";
 import "./AboutUs-section.css";
 const AboutUs = () => {
   return (
-    <div className="aboutUs-section">
+    <div id="AboutUs" className="aboutUs-section">
       <span className="text-3xl md:text-4xl font-semibold text-[#312F2F] text-center pt-10">About Us</span>
       <div className=" row flex flex-col justify-center items-center md:flex-row">
         <img

diff --git a/src/components/Contact-section/Contact.jsx b/src/components/Contact-section/Contact.jsx
@@ -4,7 +4,7 @@ import GoogleMap from './GoogleMap';
 const Contact = () => {
   return (
     <>
-      <header className="flex justify-center align-middle my-20">
+      <header id="ContactUs" className="flex justify-center align-middle my-20">
         <h1 className="text-5xl font-bold tracking-wider text-text-black font-monsterrat">
           Contact Us
         </h1>

diff --git a/src/components/Header-section/Navbar.jsx b/src/components/Header-section/Navbar.jsx
@@ -45,10 +45,10 @@ const Navbar = () => {
             <div className="mt-4 h-[2px] w-600 bg-textWhite rounded-full"></div>
 
             <div className="flex flex-col gap-8 justify-center items-center mt-10">
-              <div className="text-textWhite">HOME</div>
-              <div className="text-textWhite">CONTACT</div>
-              <div className="text-textWhite">ABOUT</div>
-              <div className="text-textWhite">RENTALS</div>
+              <a href="/" aria-current="page"><div className="text-textWhite">HOME</div></a>
+              <a href="#AboutUs" aria-current="page"><div className="text-textWhite">ABOUT</div></a>
+              <a href="#ContactUs" aria-current="page"><div className="text-textWhite">CONTACT</div></a>
+              <a href="#Service" aria-current="page"><div className="text-textWhite">RENTALS</div></a>
               <div className="text-gray-dark">
                 <Link to="/login">
                   <button
@@ -117,22 +117,22 @@ const Navbar = () => {
           >
             <ul className="flex flex-row lg:gap-10 md:gap-6 font-medium">
               <li>
-                <a href="#" aria-current="page">
+                <a href="/" aria-current="page">
                   HOME
                 </a>
               </li>
               <li>
-                <a href="#" aria-current="page">
+                <a href="#AboutUs" aria-current="page">
                   ABOUT
                 </a>
               </li>
               <li>
-                <a href="#" aria-current="page">
+                <a href="#ContactUs" aria-current="page">
                   CONTACT
                 </a>
               </li>
               <li>
-                <a href="#" aria-current="page">
+                <a href="#Service" aria-current="page">
                   RENTALS
                 </a>
               </li>
@@ -170,4 +170,4 @@ const Navbar = () => {
     </>
   );
 };
-export default Navbar;
+export default Navbar;
diff --git a/src/components/Services-section/Services-section.jsx b/src/components/Services-section/Services-section.jsx
@@ -5,7 +5,7 @@ import placeName from "./placeName";
 const Services = () => {
   return (
     <>
-      <h1 className=" text-4xl md:text-5xl font-semibold text-[#312F2F] text-center pt-10">
+      <h1 id="Service" className=" text-4xl md:text-5xl font-semibold text-[#312F2F] text-center pt-10">
         Our Services Includes
       </h1>
       <div className="grid grid-cols-1 md:grid-cols-2 gap-10 my-10 md:mx-36 sm:mx-24 mx-16">