diff --git a/README.md b/README.md index 9fa8708..fdf5031 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ The Real Estate Website using React made by Ruchira Perrera, Sam Oyediran, Batuhan Basoglu, and Kene Ojukwu. -After npm start execute the command "node src/homePage/index.js" in order to set up the backend of the contact form. +After npm start execute the command "node src/shared-components/contact-us/index.js" in order to set up the backend of the contact form. # Authors diff --git a/package-lock.json b/package-lock.json index ab7382e..edd73d5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4466,6 +4466,15 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, + "cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "requires": { + "object-assign": "^4", + "vary": "^1" + } + }, "cosmiconfig": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz", @@ -9830,6 +9839,11 @@ } } }, + "joi-browser": { + "version": "13.4.0", + "resolved": "https://registry.npmjs.org/joi-browser/-/joi-browser-13.4.0.tgz", + "integrity": "sha512-TfzJd2JaJ/lg/gU+q5j9rLAjnfUNF9DUmXTP9w+GfmG79LjFOXFeM7hIFuXCBcZCivUDFwd9l1btTV9rhHumtQ==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -10807,6 +10821,11 @@ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz", "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==" }, + "nodemailer": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.5.0.tgz", + "integrity": "sha512-Tm4RPrrIZbnqDKAvX+/4M+zovEReiKlEXWDzG4iwtpL9X34MJY+D5LnQPH/+eghe8DLlAVshHAJZAZWBGhkguw==" + }, "normalize-package-data": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", @@ -12927,6 +12946,19 @@ "prop-types": "^15.5.8" } }, + "react-form-with-constraints": { + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/react-form-with-constraints/-/react-form-with-constraints-0.16.0.tgz", + "integrity": "sha512-xt6geBao/+i3pcfNKDHYIJCHI+Ii6mhNN5rhL5l7BnKnQ04KPIRkWmrBNrhfptwV2LIc21hLH6lYZMN5BaKkvQ==", + "requires": { + "prop-types": "^15.7.2" + } + }, + "react-form-with-constraints-bootstrap4": { + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/react-form-with-constraints-bootstrap4/-/react-form-with-constraints-bootstrap4-0.16.0.tgz", + "integrity": "sha512-eauxGmqAdLEFCAwZxWWO6QtAP10rS/mvZRWC9qHqGeRj1qIlVZ73egi5pJSgnpDUDeqScmwADQvmn8GsUyNdXg==" + }, "react-google-maps": { "version": "9.4.5", "resolved": "https://registry.npmjs.org/react-google-maps/-/react-google-maps-9.4.5.tgz", diff --git a/package.json b/package.json index 299fa06..6f97658 100644 --- a/package.json +++ b/package.json @@ -8,11 +8,17 @@ "@testing-library/user-event": "^12.8.3", "axios": "^0.21.1", "bootstrap": "^4.6.0", + "cors": "^2.8.5", + "express": "^4.17.1", + "joi-browser": "^13.4.0", + "nodemailer": "^6.5.0", "react": "^17.0.2", "react-bootstrap": "^1.5.2", "react-bootstrap-carousel": "^4.1.1", "react-dom": "^17.0.2", "react-fa": "^5.0.0", + "react-form-with-constraints": "^0.16.0", + "react-form-with-constraints-bootstrap4": "^0.16.0", "react-google-maps": "^9.4.5", "react-router-dom": "^5.2.0", "react-scripts": "4.0.3", @@ -45,5 +51,18 @@ }, "devDependencies": { "create-react-component-folder": "^0.3.7" - } + }, + "description": "The Real Estate Website using React made by Ruchira Perrera, Sam Oyediran, Batuhan Basoglu, and Kene Ojukwu.", + "main": "index.js", + "repository": { + "type": "git", + "url": "git+https://github.com/ArcticHawk1/SEG3125-LAB8.git" + }, + "keywords": [], + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/ArcticHawk1/SEG3125-LAB8/issues" + }, + "homepage": "" } diff --git a/src/App.js b/src/App.js index 3879683..167c621 100644 --- a/src/App.js +++ b/src/App.js @@ -5,7 +5,7 @@ import { BrowserRouter, Route } from "react-router-dom"; 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 ContactUs from "./shared-components/contact-us/contact-us"; class App extends Component { render() { @@ -16,6 +16,7 @@ class App extends Component { + diff --git a/src/homePage/Homepage.css b/src/homePage/Homepage.css index 40a7326..fd2434a 100644 --- a/src/homePage/Homepage.css +++ b/src/homePage/Homepage.css @@ -41,16 +41,6 @@ height: 800px; } -.heading-1{ - padding-left: 40%; - padding-top: 10%; - padding-bottom: 20px; -} - -.formhelper{ - padding-bottom: 15px; -} - .button-1 { background-color: rgb(0, 0, 0); border-color: transparent; diff --git a/src/homePage/Homepage.js b/src/homePage/Homepage.js index 76e5134..e7c3135 100644 --- a/src/homePage/Homepage.js +++ b/src/homePage/Homepage.js @@ -3,9 +3,9 @@ import "./Homepage.css"; import house1 from "../images/house1.jpg"; import house2 from "../images/house2.jpg"; import house3 from "../images/house3.jpg"; +import house4 from "../images/house4.jpg"; import Carousel from "react-bootstrap/Carousel"; import Button from "react-bootstrap/Button"; -import axios from 'axios' @@ -13,10 +13,6 @@ class Homepage extends Component { constructor(props) { super(props); this.state = { - firstname: "", - lastname: "", - email: "", - message: "", nextIcon: , prevIcon: , }; @@ -42,7 +38,8 @@ class Homepage extends Component { First House -

360 Michawashkode St, Ottawa, Ontario K4A 3N6

+

100 Charlie Rogers, Kanata, ON K2V 1A7

+

1 Bedroom, 2 Bathroom

@@ -51,7 +48,8 @@ class Homepage extends Component { Second House -

6865 PEBBLE TRAIL WAY, Ottawa, Ontario K4P 0B7

+

1490 Youville Drive, Orléans, ON K1C 2X8

+

1 Bedroom, 2 Bathroom

@@ -60,7 +58,18 @@ class Homepage extends Component { Third House -

5284 Knott Crescent, Ottawa, Ontario K4M 0A2

+

8720 Russell Road, Navan, ON K4B 1J1

+

1 Bedroom, 2 Bathroom

+
+ +
+
+
+ + Fourth House + +

2785 8th Line Road, Metcalfe, ON K0A 2P0

+

1 Bedroom, 2 Bathroom

@@ -69,102 +78,9 @@ class Homepage extends Component { -
-
-
-

Contact Us

-
-
-
- -
-
- -
-
-
- -
-
-