From 746e612e7b622852615a20a42c47f7c78bfa5c19 Mon Sep 17 00:00:00 2001
From: Batuhan Basoglu <bbaso079@uottawa.ca>
Date: Wed, 31 Mar 2021 15:35:29 -0400
Subject: [PATCH] Fixed the integration.

---
 src/App.js                                       | 8 ++------
 src/homePage/homePage.js                         | 8 ++++----
 src/shared-components/navbar-component/Navbar.js | 7 +------
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/App.js b/src/App.js
index 9eee6fd..7deb65a 100644
--- a/src/App.js
+++ b/src/App.js
@@ -2,25 +2,21 @@ import { Component } from "react";
 import Footer from "./shared-components/footer-component/Footer";
 import Navbar from "./shared-components/navbar-component/Navbar";
 import { BrowserRouter, Route } from "react-router-dom";
-import HomePage from "./homePage/Homepage";
+import HomePage from "./homePage/homePage";
 import ListingsPage from "./listings-page/ListingsPage";
 import AgentPage from "./agent-page/AgentPage";
 // import ContactUs from "./shared-components/Contact-us/Contact-us";
 
-import Homepage from "./homePage/Homepage";
-
 class App extends Component {
   render() {
     return (
       <div className="App">
         <BrowserRouter>
           <Navbar></Navbar>
-          <Route path="/home" component={HomePage}></Route>
+          <Route exact path="/" component={HomePage}></Route>
           <Route path="/listings" component={ListingsPage}></Route>
           <Route path="/agents" component={AgentPage}></Route>
-          {/* <Route path="/contact-us" component={ContactUs}></Route> */}
         </BrowserRouter>
-        <Homepage></Homepage>
         <Footer></Footer>
       </div>
     );
diff --git a/src/homePage/homePage.js b/src/homePage/homePage.js
index 86803fd..28dcf13 100644
--- a/src/homePage/homePage.js
+++ b/src/homePage/homePage.js
@@ -1,11 +1,11 @@
 import { Component } from "react";
-import "./Homepage.css";
+import "./homePage.css";
 import house1 from "../images/house1.jpg";
 import house2 from "../images/house2.jpg";
 import house3 from "../images/house3.jpg";
 import Carousel from "react-bootstrap/Carousel";
 
-class Homepage extends Component {
+class homePage extends Component {
   constructor(props) {
     super(props);
     this.state = {
@@ -18,7 +18,7 @@ class Homepage extends Component {
 
   render() {
     return (
-      <div className="Homepage">
+      <div className="homePage">
         <section className="colored-section" id="title">
           <div className="container-fluid">
             <div className="row">
@@ -120,4 +120,4 @@ class Homepage extends Component {
   handleSubmit(event) {}
 }
 
-export default Homepage;
+export default homePage;
diff --git a/src/shared-components/navbar-component/Navbar.js b/src/shared-components/navbar-component/Navbar.js
index 1c4cbb3..5499ca4 100644
--- a/src/shared-components/navbar-component/Navbar.js
+++ b/src/shared-components/navbar-component/Navbar.js
@@ -25,7 +25,7 @@ const Navbar = () => {
         <div class="collapse navbar-collapse" id="navbarTogglerDemo02">
           <ul class="navbar-nav ml-auto">
             <li class="nav-item">
-              <Link class="nav-link" to="/">
+              <Link class="nav-link" exact to="/">
                 Home
               </Link>
             </li>
@@ -39,11 +39,6 @@ const Navbar = () => {
                 Agents
               </Link>
             </li>
-            <li class="nav-item">
-              <Link class="nav-link" to="/contact-us">
-                Contact Us
-              </Link>
-            </li>
           </ul>
         </div>
       </nav>