@@ -48,5 +41,4 @@ class AgentPage extends Component {
}
}
-/* export default AgentPage; */
-export default withTranslation()(AgentPage);
+export default AgentPage;
diff --git a/src/agent-page/Agents.js b/src/agent-page/Agents.js
index d1e5343..d1f583f 100644
--- a/src/agent-page/Agents.js
+++ b/src/agent-page/Agents.js
@@ -1,149 +1,31 @@
import React from "react";
/* import {Link} from 'react-router-dom' */
import Card from "react-bootstrap/Card";
-import {Link} from 'react-router-dom'
-/* import Button from "react-bootstrap/Button"; */
-import { useTranslation } from 'react-i18next';
-import './agent-page.css';
-import Agent1 from "../images/Agent1.jpg";
-import Agent2 from "../images/Agent2.jpg";
-import Agent3 from "../images/Agent3.jpg";
-import Agent4 from "../images/Agent4.jpg";
-import Agent5 from "../images/Agent5.jpg";
-import Agent6 from "../images/Agent6.jpg";
-import { withTranslation } from "react-i18next";
-import { Container, Row, Col } from 'reactstrap';
-
-
+import Button from "react-bootstrap/Button";
const Agents = ({ agents }) => {
- const { t } = useTranslation();
- /* const agentlist = agents.map((agent) => { */
+ const agentlist = agents.map((agent) => {
return (
-
+
{}
-
-
+
- {t("Mike.Title")}
- Michael
+ {agent.title}
+ {agent.name}
- {t("Mike.Word")}
+ {agent.word}
-
-
- {t("View_Button")}
-
-
- {/*
-
-
-
- {t("Regular")}
- Jin
-
- {t("Agent2.W")}
-
-
-
- {t("View_Button")}
-
-
- {/*
- VIEW
-
*/}
-
-
-
-
-
-
-
- {t("Regular")}
- Anita
-
- {t("Agent3.W")}
-
-
-
- {t("View_Button")}
-
-
- {/*
- VIEW
-
*/}
-
-
-
-
-
-
-
- {t("Regular")}
- Alex
-
- {t("Agent4.W")}
-
-
-
- {t("View_Button")}
-
-
- {/*
- VIEW
-
*/}
-
-
-
-
-
-
- {t("Regular")}
- Xuan
-
- {t("Agent5.W")}
-
-
-
- {t("View_Button")}
-
-
- {/*
- VIEW
-
*/}
-
-
-
-
-
- {t("Regular")}
- Walter
-
- {t("Agent6.W")}
-
-
-
- {t("View_Button")}
-
-
- {/*
- VIEW
-
*/}
-
-
-
-
-
);
- /* }); */
- /* console.log(agentlist); */
- /* return (
+ });
+ console.log(agentlist);
+ return (
{agentlist[0]}
@@ -154,6 +36,6 @@ const Agents = ({ agents }) => {
{agentlist[5]}
- ); */
+ );
};
export default Agents;
diff --git a/src/homePage/Homepage.css b/src/homePage/Homepage.css
index 5e8dad6..018d5c6 100644
--- a/src/homePage/Homepage.css
+++ b/src/homePage/Homepage.css
@@ -1,11 +1,7 @@
-.big-heading{
- font-family: 'Source Sans Pro',sans-serif!important;
- font-weight: bold;
- font-size: 40px;
- text-shadow: rgb(0 0 0 / 10%) 0 5px 10px;
- text-align: center;
- color:rgb(53, 53, 53);
-
+.colored-section {
+ background-color: #e7dec8;
+ color: #000000;
+ white-space: nowrap;
}
diff --git a/src/homePage/Homepage.js b/src/homePage/Homepage.js
index 9fe829c..dc2ce32 100644
--- a/src/homePage/Homepage.js
+++ b/src/homePage/Homepage.js
@@ -43,7 +43,7 @@ class Homepage extends Component {
100 Charlie Rogers, Kanata, ON K2V 1A7
{t("Rooms")}
- {t("Info")}
+ {t("Info")}
@@ -51,9 +51,9 @@ class Homepage extends Component {
1490 Youville Drive, Orléans, ON K1C 2X8
- {t("Rooms1")}
+ {t("Rooms")}
- {t("Info")}
+ {t("Info")}
@@ -61,9 +61,9 @@ class Homepage extends Component {
8720 Russell Road, Navan, ON K4B 1J1
- {t("Rooms2")}
+ {t("Rooms")}
- {t("Info")}
+ {t("Info")}
@@ -71,9 +71,9 @@ class Homepage extends Component {
2785 8th Line Road, Metcalfe, ON K0A 2P0
- {t("Rooms3")}
+ {t("Rooms")}
- {t("Info")}
+ {t("Info")}
diff --git a/src/images/Agent1.jpg b/src/images/Agent1.jpg
index dd91452..716c1dd 100644
Binary files a/src/images/Agent1.jpg and b/src/images/Agent1.jpg differ
diff --git a/src/images/Agent3.jpg b/src/images/Agent3.jpg
index 370656b..205480b 100644
Binary files a/src/images/Agent3.jpg and b/src/images/Agent3.jpg differ
diff --git a/src/images/Agent4.jpg b/src/images/Agent4.jpg
index e1aecdc..a60aa5f 100644
Binary files a/src/images/Agent4.jpg and b/src/images/Agent4.jpg differ
diff --git a/src/images/Agent5.jpg b/src/images/Agent5.jpg
index b613998..4580d5f 100644
Binary files a/src/images/Agent5.jpg and b/src/images/Agent5.jpg differ
diff --git a/src/images/Agent6.jpg b/src/images/Agent6.jpg
index b00c798..288ae24 100644
Binary files a/src/images/Agent6.jpg and b/src/images/Agent6.jpg differ
diff --git a/src/images/banner.jpg b/src/images/banner.jpg
deleted file mode 100644
index 00107bd..0000000
Binary files a/src/images/banner.jpg and /dev/null differ
diff --git a/src/images/house3-2.jpg b/src/images/house3-2.png
similarity index 100%
rename from src/images/house3-2.jpg
rename to src/images/house3-2.png
diff --git a/src/images/login_bg1.jpg b/src/images/login_bg1.jpg
deleted file mode 100644
index ff36b22..0000000
Binary files a/src/images/login_bg1.jpg and /dev/null differ
diff --git a/src/images/login_bg2.jpg b/src/images/login_bg2.jpg
deleted file mode 100644
index 3cf762f..0000000
Binary files a/src/images/login_bg2.jpg and /dev/null differ
diff --git a/src/images/login_bg3.jpg b/src/images/login_bg3.jpg
deleted file mode 100644
index 185b986..0000000
Binary files a/src/images/login_bg3.jpg and /dev/null differ
diff --git a/src/listings-page/ListingsPage.js b/src/listings-page/ListingsPage.js
index 969688c..c9bbe8c 100644
--- a/src/listings-page/ListingsPage.js
+++ b/src/listings-page/ListingsPage.js
@@ -17,7 +17,7 @@ import {
ComboboxList,
ComboboxOption,
} from "@reach/combobox";
-//import { formatRelative } from "date-fns";
+import { formatRelative } from "date-fns";
import Select from "react-select";
import "@reach/combobox/styles.css";
@@ -26,9 +26,6 @@ import * as listingData from "./data/property-data.json";
import "./ListingsPage.css";
import compassImg from "./compass.svg";
-import { useTranslation } from "react-i18next";
-import Cookies from "js-cookie";
-import i18next from "i18next";
const libraries = ["places"];
@@ -48,10 +45,6 @@ const center = {
};
export default function ListingsPage() {
- const {t} = useTranslation();
-
-
-
const price_filter = [
{
value: null,
@@ -82,15 +75,15 @@ export default function ListingsPage() {
},
{
value: 1,
- label: "1",
+ label: "One Bed",
},
{
value: 2,
- label: "2",
+ label: "Two Beds",
},
{
value: 3,
- label: "3",
+ label: "Three Beds",
}
];
@@ -102,24 +95,23 @@ export default function ListingsPage() {
},
{
value: 1,
- label: "1",
+ label: "One Bath",
},
{
value: 2,
- label: "2",
+ label: "Two Baths",
},
{
value: 3,
- label: "3",
+ label: "Three Baths",
}
];
//console.log(data1[0]);
-
const { isLoaded, loadError } = useLoadScript({
googleMapsApiKey: `https://maps.googleapis.com/maps/api/js?v=3.exp&libraries=geometry,drawing,places&key=
- AIzaSyC5TiZoTEwEcB_HUZRhe_rXrcSWW1Z5x8I`,
+ AIzaSyC5TiZoTEwEcB_HUZRhe_rXrcSWW1Z5x8I`,
libraries,
});
@@ -127,7 +119,7 @@ export default function ListingsPage() {
const [selectedBeds, setSelectedBeds] = useState(null);
const [selectedBaths, setSelectedBaths] = useState(null);
- //const [markers, setMarkers] = React.useState([]);
+ const [markers, setMarkers] = React.useState([]);
const [selected, setSelected] = React.useState(null);
const [budget, setBudget] = useState(null);
@@ -165,7 +157,6 @@ export default function ListingsPage() {
setBath(e.value);
};
-
return (
@@ -176,7 +167,7 @@ export default function ListingsPage() {
{listingData.Properties.map((house) =>
(budget >= house.PRICE || !budget) &&
- (bed === house.BEDS || !bed) &&
- (bath === house.BATHS || !bath) ? (
+ (bed == house.BEDS || !bed) &&
+ (bath == house.BATHS || !bath) ? (
-
{Cookies.get("i18next") === "en"? i18next.t("listing_address", {address:selected.ADDRESS_ENG}): i18next.t("listing_address", {address:selected.ADDRESS_FR})}
-
-
-
{Cookies.get("i18next") === "en"? i18next.t("listing_desc", {desc:selected.DESCRIPTION_ENG}): i18next.t("listing_desc", {desc:selected.DESCRIPTION_FR})}
-
+
{selected.ADDRESS}
+
{selected.DESC}
@@ -274,8 +262,7 @@ export default function ListingsPage() {
- { window.location.href='/listing-page-'+selected.LISTING_ID
- }}>{t("Listing-Button")}
+ Show Listing
@@ -345,8 +332,6 @@ function Search({ panTo }) {
}
};
- const {t} = useTranslation()
-
return (
@@ -354,7 +339,7 @@ function Search({ panTo }) {
value={value}
onChange={handleInput}
disabled={!ready}
- placeholder= {t("Search-Bar")}
+ placeholder="Search your location"
/>
diff --git a/src/listings-page/data/property-data.json b/src/listings-page/data/property-data.json
index a46f30e..40b2281 100644
--- a/src/listings-page/data/property-data.json
+++ b/src/listings-page/data/property-data.json
@@ -4,8 +4,7 @@
{
"LISTING_ID": 1,
- "ADDRESS_ENG": "8720 Russell Road",
- "ADDRESS_FR":"8720, Chemin Russell",
+ "ADDRESS": "8720 Russell Road",
"PRICE": 400000,
"BEDS":3,
"BATHS":3,
@@ -17,8 +16,6 @@
],
"DESC":"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui.",
"FULL_DESCRIPTION": "RUN DON'T WALK to this beautiful former Jayman show home. This home has every feature and convenience you could want in a home. When you enter you will be greeted with a large entry way, open concept main floor with a very spacious chef-like kitchen, the big eat in dinning area is an entertainers dream and plenty of room in the living room as to cozy up to the fireplace. When you head upstairs the owner 's suite will impress with a gorgeous ensuite consisting of a large soaker tub, oversized shower, separate vanities, in-floor heating and 2 separate closest. You will also find a nice sized flex room, spacious laundry room up stairs, 4 piece main bathroom and 2 more bedrooms. Then head downstairs where you will find another bedroom, bathroom and Theatre room with wet bar and beverage station that is perfect for any movie lover. Must not forget that this home is air conditioned, has front and back irrigation outside and speakers throughout the house. All of this can be yours in the lake community of Auburn Bay close to all amenities and year round lake access just a short distance away",
- "DESCRIPTION_ENG": "This home has every feature and convenience you could want in a home. When you head upstairs the owners suite will impress with a gorgeous ensuite consisting of a large soaker tub, oversized shower, separate vanities, in-floor heating and 2 separate closest. ",
- "DESCRIPTION_FR": "Cette maison a toutes les caractéristiques et commodités que vous pourriez souhaiter dans une maison. Lorsque vous montez à l'étage, la suite des propriétaires impressionnera avec une magnifique salle de bains comprenant une grande baignoire, une douche surdimensionnée, des vanités séparées, le chauffage au sol et 2 séparés plus proches.",
"FOR_SALE": true,
"coordinates": [-75.3372987731628, 45.383321536272049],
"BEDROOM": "2",
@@ -30,8 +27,7 @@
{
"LISTING_ID": 2,
- "ADDRESS_ENG": "1490 Youville Drive",
- "ADDRESS_FR":"1490, Promenade Youville",
+ "ADDRESS": "1490 Youville Drive",
"PRICE": 100000,
"BEDS":1,
"BATHS":1,
@@ -43,8 +39,6 @@
],
"DESC":"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui.",
"FULL_DESCRIPTION": "Nature at its Finest The Shores of Toney Bay are located at the mouth of River Phillip where it meets the Northumberland Straight with direct access to the incredible recreational waterways of River Phillip and nature rich Toney Bay. This nature lovers paradise boasts a plethora of migratory bird life and the rich fish stock of River Philip. The warm waters of the Northumberland Straight are swimmable from your shorefront, easy access to year-around activities and close proximity to the quaint community of Pugwash make this an ideal spot for a permeant residence or cottage. There are also ocean view / deeded access lots available. Large lots with unobstructed views and well away from highway noise. Swim in the warm waters at beautiful Heather's Beach just 4km away, fly fishing in the spring on River Phillip, book at tee time at Northumberland links, 16km away or enjoy a day at the Luxury Fox Harb'r Resort and Spa less then 30 mins away, and in winter enjoy skiing at Ski Wentworth a short 30 minutes drive. Lots are flat, cleared and ready for your dream home. All septic and building lot approvals are in place, good roads, and power to the lot line are included. Please take a few minutes to watch the video of the stunning Shores at Toney Bay",
- "DESCRIPTION_ENG": "This nature lovers paradise boasts a plethora of migratory bird life and the rich fish stock of River Philip. Swim in the warm waters at beautiful Heather's Beach just 4km away, fly fishing in the spring on River Phillip, book at tee time at Northumberland links, 16km away or enjoy a day at the Luxury Fox Harb'r Resort and Spa less then 30 mins away, and in winter enjoy skiing at Ski Wentworth a short 30 minutes drive.",
- "DESCRIPTION_FR": "Ce paradis des amoureux de la nature possède une pléthore d'oiseaux migrateurs et le riche stock de poissons de la rivière Philip. Nagez dans les eaux chaudes de la magnifique plage de Heather à seulement 4 km, pêchez à la mouche au printemps sur la rivière Phillip, réservez à l'heure du départ à Northumberland links, à 16 km ou profitez d'une journée au Luxury Fox Harb'r Resort and Spa à moins de 30 minutes loin, et en hiver, profitez du ski à Ski Wentworth à 30 minutes en voiture.",
"FOR_SALE": true,
"coordinates": [-75.546518086577947, 45.467134581917357],
"BEDROOM": "7",
@@ -58,9 +52,7 @@
{
"LISTING_ID": 3,
- "ADDRESS_ENG": "100 Charlie Rogers Place",
- "ADDRESS_FR":"100, Place Charlie Rogers",
-
+ "ADDRESS": "100 Charlie Rogers Place",
"PRICE": 200000,
"BEDS":2,
"BATHS":3,
@@ -72,8 +64,6 @@
],
"DESC":"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui.",
"FULL_DESCRIPTION": "Custom, Hi-Ranch home located in sought after neighborhood in the Heart of Petawawa. This home features 2+1 bedrooms and 4 bathrooms. Main level features spacious foyer, hardwood staircase, gleaming hardwood floors and open concept living. Large windows provide lots of natural light, vaulted ceilings in living room, a spectacular spacious kitchen with stainless steel appliances and large island. Master bedroom with walk through closet and 3 piece en-suite with custom tile shower and heated tile floor. Lower level features a finished rec room with cozy gas fireplace, bedroom and 3 piece bathroom. Patio door in foyer leads to large private backyard with no rear neighbours, spacious wood deck and hot tub. Double attached garage completes the package. Pack your backs and move right in! No Conveyances of offers until Friday April 9th at 3PM however the seller has the right to view and may accept pre-emptive offers",
- "DESCRIPTION_ENG": "Main level features spacious foyer, hardwood staircase, gleaming hardwood floors and open concept living. ",
- "DESCRIPTION_FR": "Le niveau principal comprend un hall d'entrée spacieux, un escalier en bois franc, des planchers de bois franc étincelants et un salon à aire ouverte.",
"FOR_SALE": true,
"coordinates": [-75.898610599532319, 45.295014379864874],
"BEDROOM": "2",
@@ -87,8 +77,7 @@
{
"LISTING_ID": 4,
- "ADDRESS_ENG": "2785 8th Line Road",
- "ADDRESS_FR": "2785, Chemin 8th Line",
+ "ADDRESS": "2785 8th Line Road",
"PRICE": 300000,
"BEDS":3,
"BATHS":3,
@@ -100,8 +89,6 @@
],
"DESC":"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui.",
"FULL_DESCRIPTION": "Nestled in a quiet cul-de-sac in the family-friendly Ski Club/Widdifield neighbourhood, is 62 Riddle Court, a hidden gem that has everything you've been searching for - inside and out! Look up and take in the picturesque views of the escarpment, take a short walk or drive to the Laurentian Ski Hill with the family, or simply savour your very own property by having dinner on the patio, a glass of wine on the deck/balcony, and admire the breathtaking landscape (designed by an award-winning landscape artist) that wraps around your home. Lush perennials, tall grasses, interlocking brick pathways, in-ground sprinkler system and outdoor lighting make this property standout from the rest! Step inside to relish in all of the updated features this home has to offer - gleaming maple hardwood floors & stairs, updated maple kitchen cabinets, ceramic tile with in-floor radiant heat in bathrooms and office, built-in entertainment units, finished laundry room, low-maintenance composite deck off dining area, recessed lighting, updated windows, doors, insulation... the list goes on! Working from home these days? Enter the private & professional home office right off the recreation room through french doors. Enjoy the under-cabinet lighting, as well as the natural light beaming through the window with views of the backyard. Pride of ownership is obvious. Nothing left to do, but move-in! Pre-inspected for your peace of mind.",
- "DESCRIPTION_ENG": "A hidden gem that has everything you've been searching for - inside and out! Look up and take in the picturesque views of the escarpment, take a short walk or drive to the Laurentian Ski Hill with the family, or simply savour your very own property by having dinner on the patio.",
- "DESCRIPTION_FR": "Un joyau caché qui a tout ce que vous cherchiez - à l'intérieur comme à l'extérieur! Levez les yeux et admirez les vues pittoresques de l'escarpement, faites une courte promenade ou conduisez jusqu'à la station de ski des Laurentides en famille, ou savourez simplement votre propriété en dînant sur la terrasse.",
"FOR_SALE": true,
"coordinates": [-75.468561642270757, 45.23032561834377],
"BEDROOM": "4",
diff --git a/src/listings-page/single-listing-1/listing-page-1.js b/src/listings-page/single-listing-1/listing-page-1.js
deleted file mode 100644
index aa21a6e..0000000
--- a/src/listings-page/single-listing-1/listing-page-1.js
+++ /dev/null
@@ -1,121 +0,0 @@
-import React from "react";
-import "./listing-page-1.css";
-import { Link } from "react-router-dom";
-import { useTranslation } from "react-i18next";
-
-// import house images
-import house_img1 from "../../images/house3.jpg";
-import house_img2 from "../../images/house1-2.jpg";
-import house_img3 from "../../images/house1-3.jpg";
-const ListingPage1 = () => {
- const { t } = useTranslation();
-
- return (
-
- {/* Listing header */}
-
-
-
- {t("Listing1-address")}
-
-
-
-
- {/* Carousel for images of the listings */}
-
-
- {/* Text box for listing amenities */}
-
- 2
-
- 4
-
-
-
- {/* Description for the listing */}
-
-
{t("Listing-description-header")}
-
{t("Listing1-description")}
-
-
-
- {t("Listing-booking-btn")}
-
-
-
-
-
- );
-};
-
-// sources for the images used
-//images.adsttc.com/media/images/524c/2511/e8e4/4e67/bf00/03c3/large_jpg/Tetris_House_03.jpg?1380721927
-
-//House description
-// ->Link 1 -https://www.realtor.ca/real-estate/23018057/9811-elbow-drive-calgary-haysboro
-// images
-// 1 ->house1.jpg
-// 2 ->//images.adsttc.com/media/images/524c/2511/e8e4/4e67/bf00/03c3/large_jpg/Tetris_House_03.jpg?1380721927
-// 3 ->https://s3.amazonaws.com/on1-wp/wp-content/uploads/2018/08/3191-NW-Jenna-22-of-49v2-1024x683.jpg
-//-> Link2 -> https://www.realtor.ca/real-estate/23020015/lot-14-67-seastone-drive-port-howe-port-howe
-// 1 ->house2.jpg
-// 2 ->https://static.photocdn.pt/images/articles/2019/12/24/How_to_Take_Gorgeous_Interior_Real_Estate_Photos.jpg
-// 3 ->https://i.pinimg.com/originals/f3/72/87/f372870f4f99d3278193a3970aa394ce.jpg
-//->Link3 -> https://www.realtor.ca/real-estate/23020040/1035-butler-boulevard-petawawa-laurentian-highlands
-// 1 ->house3.jpg
-// 2 ->https://miro.medium.com/max/1200/1*EyGqOwy0wQwKHUgi3xpQZA.png
-// 3 ->https://i.pinimg.com/originals/9b/fe/76/9bfe76b23f7ed9dcb35f7553b8255f48.jpg
-//->Link4 -> https://www.realtor.ca/real-estate/23020103/62-riddle-court-north-bay
-// 1 ->house4.jpg
-// 2 ->https://pictureitsoldfl.com/wp-content/uploads/2016/07/305-Rudder-Cay-Way-Jupiter-FL-print-014-28-Family-Room-4200x2800-300dpi-1170x780.jpg
-// 3 ->https://www.tlcinteriors.com.au/wp-content/uploads/2018/06/hamptons-style-kitchen-from-metricon-bayville-display-home.jpg
-
-export default ListingPage1;
diff --git a/src/listings-page/single-listing-2/listing-page-2.css b/src/listings-page/single-listing-2/listing-page-2.css
deleted file mode 100644
index 8ce675b..0000000
--- a/src/listings-page/single-listing-2/listing-page-2.css
+++ /dev/null
@@ -1,51 +0,0 @@
-.single-listing-2{
- padding: 7% 15%;
- /* background-color: darksalmon; */
- text-align: center;
-}
-
-.listing-header{
- border: 1px solid black;
- text-align: left;
- padding: 1%;
-}
-.listing-title{
- font-size: 2.5rem;
- /* font-style: italic; */
-}
-
-.listing-carousel{
- margin: 5% 15%;
- width: 70%;
- /* padding-right: 10; */
-}
-
-.amentities{
- border: 1px solid black;
- /* padding: 5% 0; */
- margin: 3% 40%;
- /* padding: 1% 0%; */
-}
-.amentities-text{
- font-size: 2rem;
-}
-
-.amentities-icon{
- padding: 2% 7%;
-}
-
-.description-box{
- border: 1px solid black;
- padding: 5%;
- text-align: left;
-}
-
-.description-title{
- padding: 2% 0%;
-}
-
-.booking-btn{
- padding: 2% 0%;
- text-align: center;
-}
-
diff --git a/src/listings-page/single-listing-2/listing-page-2.js b/src/listings-page/single-listing-2/listing-page-2.js
deleted file mode 100644
index 8afcee3..0000000
--- a/src/listings-page/single-listing-2/listing-page-2.js
+++ /dev/null
@@ -1,119 +0,0 @@
-import React from "react";
-import "./listing-page-2.css";
-import { Link } from "react-router-dom";
-import { useTranslation } from "react-i18next";
-// import house images
-import house_img1 from "../../images/house2.jpg";
-import house_img2 from "../../images/house2-2.jpg";
-import house_img3 from "../../images/house2-3.jpg";
-const ListingPage2 = () => {
- const { t } = useTranslation();
- return (
-
- {/* Listing header */}
-
-
-
- {t("Listing2-address")}
-
-
-
-
- {/* Carousel for images of the listings */}
-
-
- {/* Text box for listing amenities */}
-
- 1
-
- 1
-
-
-
- {/* Description for the listing */}
-
-
{t("Listing-description-header")}
-
{t("Listing2-description")}
-
-
-
- {t("Listing-booking-btn")}
-
-
-
-
-
- );
-};
-
-// sources for the images used
-//images.adsttc.com/media/images/524c/2511/e8e4/4e67/bf00/03c3/large_jpg/Tetris_House_03.jpg?1380721927
-
-//House description
-// ->Link 1 -https://www.realtor.ca/real-estate/23018057/9811-elbow-drive-calgary-haysboro
-// images
-// 1 ->house1.jpg
-// 2 ->//images.adsttc.com/media/images/524c/2511/e8e4/4e67/bf00/03c3/large_jpg/Tetris_House_03.jpg?1380721927
-// 3 ->https://s3.amazonaws.com/on1-wp/wp-content/uploads/2018/08/3191-NW-Jenna-22-of-49v2-1024x683.jpg
-//-> Link2 -> https://www.realtor.ca/real-estate/23020015/lot-14-67-seastone-drive-port-howe-port-howe
-// 1 ->house2.jpg
-// 2 ->https://static.photocdn.pt/images/articles/2019/12/24/How_to_Take_Gorgeous_Interior_Real_Estate_Photos.jpg
-// 3 ->https://i.pinimg.com/originals/f3/72/87/f372870f4f99d3278193a3970aa394ce.jpg
-//->Link3 -> https://www.realtor.ca/real-estate/23020040/1035-butler-boulevard-petawawa-laurentian-highlands
-// 1 ->house3.jpg
-// 2 ->https://miro.medium.com/max/1200/1*EyGqOwy0wQwKHUgi3xpQZA.png
-// 3 ->https://i.pinimg.com/originals/9b/fe/76/9bfe76b23f7ed9dcb35f7553b8255f48.jpg
-//->Link4 -> https://www.realtor.ca/real-estate/23020103/62-riddle-court-north-bay
-// 1 ->house4.jpg
-// 2 ->https://pictureitsoldfl.com/wp-content/uploads/2016/07/305-Rudder-Cay-Way-Jupiter-FL-print-014-28-Family-Room-4200x2800-300dpi-1170x780.jpg
-// 3 ->https://www.tlcinteriors.com.au/wp-content/uploads/2018/06/hamptons-style-kitchen-from-metricon-bayville-display-home.jpg
-
-export default ListingPage2;
diff --git a/src/listings-page/single-listing-2/listing-page-2.test.js b/src/listings-page/single-listing-2/listing-page-2.test.js
deleted file mode 100644
index a4006fe..0000000
--- a/src/listings-page/single-listing-2/listing-page-2.test.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import React from "react";
-import { shallow } from "enzyme";
-import ListingPage2 from "./listing-page-2";
-
-describe("ListingPage2", () => {
- test("matches snapshot", () => {
- const wrapper = shallow( );
- expect(wrapper).toMatchSnapshot();
- });
-});
diff --git a/src/listings-page/single-listing-3/listing-page-3.css b/src/listings-page/single-listing-3/listing-page-3.css
deleted file mode 100644
index e5ef061..0000000
--- a/src/listings-page/single-listing-3/listing-page-3.css
+++ /dev/null
@@ -1,51 +0,0 @@
-.single-listing-3{
- padding: 7% 15%;
- /* background-color: darksalmon; */
- text-align: center;
-}
-
-.listing-header{
- border: 1px solid black;
- text-align: left;
- padding: 1%;
-}
-.listing-title{
- font-size: 2.5rem;
- /* font-style: italic; */
-}
-
-.listing-carousel{
- margin: 5% 15%;
- width: 70%;
- /* padding-right: 10; */
-}
-
-.amentities{
- border: 1px solid black;
- /* padding: 5% 0; */
- margin: 3% 40%;
- /* padding: 1% 0%; */
-}
-.amentities-text{
- font-size: 2rem;
-}
-
-.amentities-icon{
- padding: 2% 7%;
-}
-
-.description-box{
- border: 1px solid black;
- padding: 5%;
- text-align: left;
-}
-
-.description-title{
- padding: 2% 0%;
-}
-
-.booking-btn{
- padding: 2% 0%;
- text-align: center;
-}
-
diff --git a/src/listings-page/single-listing-3/listing-page-3.test.js b/src/listings-page/single-listing-3/listing-page-3.test.js
deleted file mode 100644
index 3cc850d..0000000
--- a/src/listings-page/single-listing-3/listing-page-3.test.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import React from "react";
-import { shallow } from "enzyme";
-import ListingPage3 from "./listing-page-3";
-
-describe("ListingPage3", () => {
- test("matches snapshot", () => {
- const wrapper = shallow( );
- expect(wrapper).toMatchSnapshot();
- });
-});
diff --git a/src/listings-page/single-listing-4/listing-page-4.css b/src/listings-page/single-listing-4/listing-page-4.css
deleted file mode 100644
index 2f53717..0000000
--- a/src/listings-page/single-listing-4/listing-page-4.css
+++ /dev/null
@@ -1,51 +0,0 @@
-.single-listing-4{
- padding: 7% 15%;
- /* background-color: darksalmon; */
- text-align: center;
-}
-
-.listing-header{
- border: 1px solid black;
- text-align: left;
- padding: 1%;
-}
-.listing-title{
- font-size: 2.5rem;
- /* font-style: italic; */
-}
-
-.listing-carousel{
- margin: 5% 15%;
- width: 70%;
- /* padding-right: 10; */
-}
-
-.amentities{
- border: 1px solid black;
- /* padding: 5% 0; */
- margin: 3% 40%;
- /* padding: 1% 0%; */
-}
-.amentities-text{
- font-size: 2rem;
-}
-
-.amentities-icon{
- padding: 2% 7%;
-}
-
-.description-box{
- border: 1px solid black;
- padding: 5%;
- text-align: left;
-}
-
-.description-title{
- padding: 2% 0%;
-}
-
-.booking-btn{
- padding: 2% 0%;
- text-align: center;
-}
-
diff --git a/src/listings-page/single-listing-4/listing-page-4.js b/src/listings-page/single-listing-4/listing-page-4.js
deleted file mode 100644
index 0a78338..0000000
--- a/src/listings-page/single-listing-4/listing-page-4.js
+++ /dev/null
@@ -1,119 +0,0 @@
-import React from "react";
-import "./listing-page-4.css";
-import { Link } from "react-router-dom";
-import { useTranslation } from "react-i18next";
-// import house images
-import house_img1 from "../../images/house4.jpg";
-import house_img2 from "../../images/house4-2.jpg";
-import house_img3 from "../../images/house4-3.jpg";
-const ListingPage4 = () => {
- const { t } = useTranslation();
- return (
-
- {/* Listing header */}
-
-
-
- {t("Listing4-address")}
-
-
-
-
- {/* Carousel for images of the listings */}
-
-
- {/* Text box for listing amenities */}
-
- 3
-
- 3
-
-
-
- {/* Description for the listing */}
-
-
{t("Listing-description-header")}
-
{t("Listing4-description")}
-
-
-
- {t("Listing-booking-btn")}
-
-
-
-
-
- );
-};
-
-// sources for the images used
-//images.adsttc.com/media/images/524c/2511/e8e4/4e67/bf00/03c3/large_jpg/Tetris_House_03.jpg?1380721927
-
-//House description
-// ->Link 1 -https://www.realtor.ca/real-estate/23018057/9811-elbow-drive-calgary-haysboro
-// images
-// 1 ->house1.jpg
-// 2 ->//images.adsttc.com/media/images/524c/2511/e8e4/4e67/bf00/03c3/large_jpg/Tetris_House_03.jpg?1380721927
-// 3 ->https://s3.amazonaws.com/on1-wp/wp-content/uploads/2018/08/3191-NW-Jenna-22-of-49v2-1024x683.jpg
-//-> Link2 -> https://www.realtor.ca/real-estate/23020015/lot-14-67-seastone-drive-port-howe-port-howe
-// 1 ->house2.jpg
-// 2 ->https://static.photocdn.pt/images/articles/2019/12/24/How_to_Take_Gorgeous_Interior_Real_Estate_Photos.jpg
-// 3 ->https://i.pinimg.com/originals/f3/72/87/f372870f4f99d3278193a3970aa394ce.jpg
-//->Link3 -> https://www.realtor.ca/real-estate/23020040/1035-butler-boulevard-petawawa-laurentian-highlands
-// 1 ->house3.jpg
-// 2 ->https://miro.medium.com/max/1200/1*EyGqOwy0wQwKHUgi3xpQZA.png
-// 3 ->https://i.pinimg.com/originals/9b/fe/76/9bfe76b23f7ed9dcb35f7553b8255f48.jpg
-//->Link4 -> https://www.realtor.ca/real-estate/23020103/62-riddle-court-north-bay
-// 1 ->house4.jpg
-// 2 ->https://pictureitsoldfl.com/wp-content/uploads/2016/07/305-Rudder-Cay-Way-Jupiter-FL-print-014-28-Family-Room-4200x2800-300dpi-1170x780.jpg
-// 3 ->https://www.tlcinteriors.com.au/wp-content/uploads/2018/06/hamptons-style-kitchen-from-metricon-bayville-display-home.jpg
-
-export default ListingPage4;
diff --git a/src/listings-page/single-listing-4/listing-page-4.test.js b/src/listings-page/single-listing-4/listing-page-4.test.js
deleted file mode 100644
index 826dc1b..0000000
--- a/src/listings-page/single-listing-4/listing-page-4.test.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import React from "react";
-import { shallow } from "enzyme";
-import ListingPage4 from "./listing-page-4";
-
-describe("ListingPage4", () => {
- test("matches snapshot", () => {
- const wrapper = shallow( );
- expect(wrapper).toMatchSnapshot();
- });
-});
diff --git a/src/listings-page/single-listing-1/listing-page-1.css b/src/listings-page/single-listing/listing-page.css
similarity index 81%
rename from src/listings-page/single-listing-1/listing-page-1.css
rename to src/listings-page/single-listing/listing-page.css
index 3be6c27..137ea6b 100644
--- a/src/listings-page/single-listing-1/listing-page-1.css
+++ b/src/listings-page/single-listing/listing-page.css
@@ -1,7 +1,6 @@
-.single-listing-1{
+.single-listing{
padding: 7% 15%;
/* background-color: darksalmon; */
- text-align: center;
}
.listing-header{
@@ -14,24 +13,32 @@
/* font-style: italic; */
}
+.title-icon{
+
+}
+
.listing-carousel{
margin: 5% 15%;
width: 70%;
/* padding-right: 10; */
}
+.carousel-img{
+ /* width: 70%; */
+}
+
+
.amentities{
border: 1px solid black;
/* padding: 5% 0; */
margin: 3% 40%;
- /* padding: 1% 0%; */
+ padding: 1% 0%;
}
.amentities-text{
- font-size: 2rem;
-}
+}
.amentities-icon{
- padding: 2% 7%;
+ margin: 0% 5%;
}
.description-box{
@@ -42,6 +49,10 @@
.description-title{
padding: 2% 0%;
+}
+.listing-description{
+
+
}
.booking-btn{
diff --git a/src/listings-page/single-listing-3/listing-page-3.js b/src/listings-page/single-listing/listing-page.js
similarity index 63%
rename from src/listings-page/single-listing-3/listing-page-3.js
rename to src/listings-page/single-listing/listing-page.js
index ffccb9d..1be54ab 100644
--- a/src/listings-page/single-listing-3/listing-page-3.js
+++ b/src/listings-page/single-listing/listing-page.js
@@ -1,20 +1,17 @@
import React from "react";
-import "./listing-page-3.css";
+import "./listing-page.css";
import { Link } from "react-router-dom";
-import { useTranslation } from "react-i18next";
+
// import house images
-import house_img1 from "../../images/house1.jpg";
-import house_img2 from "../../images/house3-2.jpg";
-import house_img3 from "../../images/house3-3.jpg";
-const ListingPage3 = () => {
- const { t } = useTranslation();
+import house_img1 from "../../images/house1-2.jpg";
+const ListingPage = () => {
return (
-
+
{/* Listing header */}
- {t("Listing3-address")}
+ My title
@@ -36,14 +33,14 @@ const ListingPage3 = () => {
@@ -72,20 +69,43 @@ const ListingPage3 = () => {
{/* Text box for listing amenities */}
+ 1
+
2
-
+
3
-
+
{/* Description for the listing */}
-
{t("Listing-description-header")}
-
{t("Listing3-description")}
+
Description
+
+ MOVE IN READY I WALKING DISTANCE TO SHOPPING, SCHOOLS AND TRANSIT I
+ Conveniently located in Haysboro, you have Restaurants, Groceries,
+ Coffee shops, Schools and a Library all within walking distance. This
+ Updated Bungalow offers over 2000 square feet of developed living
+ space, 3 Bedrooms upstairs to accommodate almost any family and 2 down
+ stairs in the fully developed basement. Having a separate entrance
+ downstairs through the backyard makes it much easier if you ever want
+ to convert the basement into a suite. The double garage is even heated
+ with 220v plus 2 additional spaces that could be used for RV parking
+ or for any additional vehicles in the house. You will notice the home
+ has been tastefully updated over the years including a soaker tub in
+ the bathroom, in the kitchen your cabinetry goes right to the ceiling
+ for a nice finished look, granite counters and Kitchenaid appliances
+ and a new garburator. The entire property has a fresh coat of paint
+ inside and out, Newer windows and roof along with the Plumbing,
+ Electrical (Cat 5 connection throughout and 200amp service) has been
+ updated. Last but not least, the back deck already has gas and ready
+ for the BBQ season. With the BIG updates being done, all that is left
+ to do is enjoy Summer on the deck or enjoy a bonfire in your sunny
+ West facing backyard!
+
- {t("Listing-booking-btn")}
+ Book Showing
@@ -116,4 +136,4 @@ const ListingPage3 = () => {
// 2 ->https://pictureitsoldfl.com/wp-content/uploads/2016/07/305-Rudder-Cay-Way-Jupiter-FL-print-014-28-Family-Room-4200x2800-300dpi-1170x780.jpg
// 3 ->https://www.tlcinteriors.com.au/wp-content/uploads/2018/06/hamptons-style-kitchen-from-metricon-bayville-display-home.jpg
-export default ListingPage3;
+export default ListingPage;
diff --git a/src/listings-page/single-listing-1/listing-page-1.test.js b/src/listings-page/single-listing/listing-page.test.js
similarity index 53%
rename from src/listings-page/single-listing-1/listing-page-1.test.js
rename to src/listings-page/single-listing/listing-page.test.js
index 07a81d5..bbe9600 100644
--- a/src/listings-page/single-listing-1/listing-page-1.test.js
+++ b/src/listings-page/single-listing/listing-page.test.js
@@ -1,10 +1,10 @@
import React from "react";
import { shallow } from "enzyme";
-import ListingPage1 from "./listing-page-1";
+import ListingPage from "./listing-page";
-describe("ListingPage1", () => {
+describe("ListingPage", () => {
test("matches snapshot", () => {
- const wrapper = shallow(
);
+ const wrapper = shallow(
);
expect(wrapper).toMatchSnapshot();
});
});
diff --git a/src/login-page/Login.css b/src/login-page/Login.css
index d4dd465..80fb3b1 100644
--- a/src/login-page/Login.css
+++ b/src/login-page/Login.css
@@ -1,19 +1,11 @@
-body{
- /*
- background-image: url("../images/login_bg3.jpg");
- background-size:cover;
- */
-
-}
.login-page{
padding: 10% 30%;
text-align: center;
- background-color: white;
+ background-color: pink;
}
.signin-Form{
border: 1px solid blanchedalmond;
- background-color: #e7dec8;
border-radius: 2%;
}
diff --git a/src/login-page/Login.js b/src/login-page/Login.js
index b7bb946..f260a7a 100644
--- a/src/login-page/Login.js
+++ b/src/login-page/Login.js
@@ -1,7 +1,7 @@
import React, { Component } from "react";
import Logo from "../images/logo1.png";
import "./Login.css";
-import { Link, Redirect, withRouter } from "react-router-dom";
+import { Link } from "react-router-dom";
// import { useTranslation } from "react-i18next";
import { withTranslation } from "react-i18next";
class Login extends Component {
@@ -15,22 +15,13 @@ class Login extends Component {
};
handleLogin = (e) => {
- e.preventDefault();
- var loginEmail = document.getElementById("login-email");
- if (loginEmail.value === this.state.Account.email) {
- // alert("validated!!!");
- return this.props.history.push("/account");
- } else {
- // alert("Errors!!")
- return this.props.history.push("/login");
- }
+ console.log(e);
};
-
render() {
const { t } = this.props;
return (
-
-
- {t("Login_submit_button")}
-
+
+
+ {t("Login_submit_button")}
+
+
@@ -82,4 +74,4 @@ class Login extends Component {
}
}
-export default withTranslation()(withRouter(Login));
+export default withTranslation()(Login);
diff --git a/src/login-page/account/Account.js b/src/login-page/account/Account.js
index 92ca733..9097434 100644
--- a/src/login-page/account/Account.js
+++ b/src/login-page/account/Account.js
@@ -11,7 +11,6 @@ class Account extends Component {
lastName: "Green",
email: "kevon.green@kcribs.com",
password: "Kcribs123",
- phoneNumber: "613-234-8796",
},
};
render() {
@@ -94,7 +93,7 @@ class Account extends Component {
type="text"
class="form-control"
id="account-phoneNumber"
- placeholder={this.state.Account.phoneNumber}
+ placeholder={this.state.Account.email}
required
disabled={true}
/>
diff --git a/src/shared-components/navbar-component/Navbar.js b/src/shared-components/navbar-component/Navbar.js
index 2dd8b0b..42cfa11 100644
--- a/src/shared-components/navbar-component/Navbar.js
+++ b/src/shared-components/navbar-component/Navbar.js
@@ -1,33 +1,11 @@
-import React, { useEffect } from "react";
+import React from "react";
import { Link, withRouter } from "react-router-dom";
import "./Navbar.css";
import logo from "./logo2.png";
-import Cookies from "js-cookie";
/* eslint-disable jsx-a11y/anchor-is-valid */
import { useTranslation } from "react-i18next";
-import i18next from "i18next";
-const langauges = [
- {
- code: "fr",
- name: "Français",
- country_code: "fr",
- },
- {
- code: "en",
- name: "English",
- country_code: "gb",
- },
-];
-
const Navbar = () => {
- const currentLanguageCode = Cookies.get("i18next") || "en";
- const currentLanguage = langauges.find(
- (lang) => lang.code === currentLanguageCode
- );
const { t } = useTranslation();
- useEffect(() => {
- document.body.dir = currentLanguage.dir || "ltr";
- }, [currentLanguage]);
return (
/* Nav Bar */
@@ -49,34 +27,6 @@ const Navbar = () => {
-
-
-
-
-
-
-
-
{t("Nav_Home")}
@@ -100,6 +50,12 @@ const Navbar = () => {
+
+
+ {t("Nav_listing_page")}
+
+
+
{t("Nav_Login")}