Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Map api #133

Open
wants to merge 144 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
144 commits
Select commit Hold shift + click to select a range
4cb20d3
Update README.md
brianguyen97 Sep 17, 2022
f7ea8bb
initial installation
gloria-cheung Sep 18, 2022
5a8b670
change components to function
gloria-cheung Sep 18, 2022
b3469a2
install bootstrap react-bootstrap and sass
gloria-cheung Sep 18, 2022
4b5b71a
change node-sass version
gloria-cheung Sep 19, 2022
cd3a705
moved styles from css to sass file
gloria-cheung Sep 19, 2022
eb0afa0
import TopBar component to use as navbar
gloria-cheung Sep 19, 2022
17f3787
use react bootstrap navbar and export to use in App.js
gloria-cheung Sep 19, 2022
56723e8
Merge pull request #1 from gloria-cheung/react_functions
brianguyen97 Sep 19, 2022
e29d042
add react icons
Sep 20, 2022
87c71e8
remove default links and update styles
Sep 20, 2022
2e1a0e3
add styles to topbar
Sep 20, 2022
557bbf1
create image banner under topbar
Sep 20, 2022
6fc66b7
style image to be width of page
Sep 20, 2022
d2f3178
create carditems with data for each card
Sep 20, 2022
ffb54be
add styles for each card
Sep 20, 2022
4864625
change default colors of bootstrap
Sep 20, 2022
954bcc9
import topbar, banner and carditem to display on main page
Sep 20, 2022
a4f4f34
install react-router-dom
brianguyen97 Sep 20, 2022
1b44c45
Update Navbar to render different components
brianguyen97 Sep 20, 2022
595446a
import placeholder components, implement react router
brianguyen97 Sep 20, 2022
943a0a9
Placeholder Homepage
brianguyen97 Sep 20, 2022
649c513
Placeholder /homes_rent route
brianguyen97 Sep 20, 2022
b4aeffb
Placeholder /homes_sale route
brianguyen97 Sep 20, 2022
9fe2088
Import browserRouter from React-router
brianguyen97 Sep 20, 2022
f4ae458
Placeholder sell route
brianguyen97 Sep 20, 2022
f9fd6a9
Merge pull request #3 from gloria-cheung/react-router
gloria-cheung Sep 20, 2022
7b940d3
Merge branch 'master' into frontend/home
gloria-cheung Sep 20, 2022
e6cef17
Merge pull request #2 from gloria-cheung/frontend/home
gloria-cheung Sep 20, 2022
07fbdc1
update package-lock.json
gloria-cheung Sep 20, 2022
fa45f0b
move home components to be imported from home file
gloria-cheung Sep 20, 2022
dc89a9a
move components to components folder
gloria-cheung Sep 20, 2022
5dd339b
Merge pull request #4 from gloria-cheung/frontend/home2
gloria-cheung Sep 20, 2022
76022a2
Rename to PascalCase
brianguyen97 Sep 20, 2022
f39afad
Rename to PascalCase
brianguyen97 Sep 20, 2022
522efa5
Rename to PascalCase
brianguyen97 Sep 20, 2022
0bce39a
Update Imports, test zillow API to get data
brianguyen97 Sep 20, 2022
1c803b1
Remove API Key
brianguyen97 Sep 20, 2022
15ccc17
create searchbar component for filtering api later
gloria-cheung Sep 20, 2022
01e2c59
create listing container to hold each listing
gloria-cheung Sep 20, 2022
f80b04c
add listing container styles
gloria-cheung Sep 20, 2022
52a4c7d
create listingitem component to display a card for each listing
gloria-cheung Sep 20, 2022
c6bbae9
add styles for entire rent page
gloria-cheung Sep 20, 2022
ba05c6c
import listingcontainer and searchbar to render on page
gloria-cheung Sep 20, 2022
6bede8f
remove axios fetch for now
gloria-cheung Sep 20, 2022
18a5244
Merge pull request #5 from gloria-cheung/zillow-api
brianguyen97 Sep 21, 2022
8e8b061
resolve conflicts
gloria-cheung Sep 21, 2022
8f1cdba
Merge pull request #6 from gloria-cheung/frontend/rent
gloria-cheung Sep 21, 2022
46193cc
change key to env variable for api
gloria-cheung Sep 22, 2022
b1c65a1
use state to pass data from form to api call
gloria-cheung Sep 22, 2022
6772a13
add .env to gitignore
gloria-cheung Sep 22, 2022
991045d
Stopped tracking env
gloria-cheung Sep 22, 2022
3294300
add example template for env
gloria-cheung Sep 22, 2022
dbef0c9
Create schema file for users
brianguyen97 Sep 22, 2022
67dac97
Create db.js
brianguyen97 Sep 22, 2022
e9aa56f
install dotenv, pg
brianguyen97 Sep 22, 2022
7a0edb5
create seed file for users
brianguyen97 Sep 22, 2022
9b71280
Update package-lock.json
brianguyen97 Sep 22, 2022
68a291b
implement pg
brianguyen97 Sep 22, 2022
b46412b
Create Placeholder Login Page
brianguyen97 Sep 22, 2022
5a7486a
Create Placeholder Registration Page
brianguyen97 Sep 22, 2022
8ca6ecb
Add Login and Registration links to Navbar
brianguyen97 Sep 22, 2022
519fdf2
Add LoginPage and RegistrationPage routes
brianguyen97 Sep 22, 2022
4ba9cee
comment out unused items to remove errors
gloria-cheung Sep 22, 2022
474904c
move functions from searchbar to homerent so that data can be passed …
gloria-cheung Sep 22, 2022
2a80881
use data from homrent component to map over and create list of listin…
gloria-cheung Sep 22, 2022
88e1011
use data values to display in each card
gloria-cheung Sep 22, 2022
80f1f25
moved logic to parent component homerent
gloria-cheung Sep 22, 2022
8d987c0
rename env variable
gloria-cheung Sep 23, 2022
03a4e30
Create db.js, configure database
brianguyen97 Sep 23, 2022
3303bce
Create 01_users.sql
brianguyen97 Sep 23, 2022
002f94b
Delete db.js
brianguyen97 Sep 23, 2022
d45856f
Create schema file for database
brianguyen97 Sep 23, 2022
951cc4d
Update package.json
brianguyen97 Sep 23, 2022
bd52f45
Update package-lock.json
brianguyen97 Sep 23, 2022
1edbbef
Setup server, implement registration
brianguyen97 Sep 23, 2022
04d7fdd
Create Card.module.css
brianguyen97 Sep 23, 2022
2542b78
Create Card.js
brianguyen97 Sep 23, 2022
85bdc2d
Create Button.module.css
brianguyen97 Sep 23, 2022
d7a42f4
Create Button.js
brianguyen97 Sep 23, 2022
a0b098f
Update TopBar.js
brianguyen97 Sep 23, 2022
1bb3806
Create Registration Page
brianguyen97 Sep 23, 2022
fb2f443
Create LoginPage.module.css
brianguyen97 Sep 23, 2022
387709a
Create LoginPage
brianguyen97 Sep 23, 2022
716d658
Update App.js
brianguyen97 Sep 23, 2022
bb8786c
remove unused code
brianguyen97 Sep 23, 2022
20d7f48
Merge pull request #7 from gloria-cheung/rent/displaydata
brianguyen97 Sep 23, 2022
ebf375e
Merge branch 'master' into feature/login-registration
brianguyen97 Sep 23, 2022
6223684
Merge pull request #8 from gloria-cheung/feature/login-registration
brianguyen97 Sep 23, 2022
9e832b4
update env example for variables
gloria-cheung Sep 24, 2022
63e63e7
import and use listgroup component to render each listing item
gloria-cheung Sep 24, 2022
ad53dd4
remove card markup and use listgroup to display each listing
gloria-cheung Sep 24, 2022
92e408e
installed fontawesome icons and then uninstalled
gloria-cheung Sep 25, 2022
52cb62c
remove console.log
gloria-cheung Sep 25, 2022
12843f6
import modalcontent component and add logic for fetching data from ap…
gloria-cheung Sep 25, 2022
da38556
add styles for listing item component
gloria-cheung Sep 25, 2022
4380714
use bootstrap react modal component to display info from api
gloria-cheung Sep 25, 2022
ff321aa
add style for fontsize
gloria-cheung Sep 25, 2022
e84a155
import react-icons and display facts for listing when modal open
gloria-cheung Sep 25, 2022
52d5e17
add styles for fontsize and weight
gloria-cheung Sep 25, 2022
402539d
change size of inputs for form to be smaller
gloria-cheung Sep 25, 2022
3d238eb
Merge pull request #9 from gloria-cheung/frontend/modal
gloria-cheung Sep 25, 2022
3d8cf58
Update RegistrationPage.js
brianguyen97 Sep 25, 2022
727bdcc
remove fake login logic from app.js
brianguyen97 Sep 25, 2022
93ebae6
change password requirement to 1 character
brianguyen97 Sep 25, 2022
bd0ddbe
install cookie-session
brianguyen97 Sep 25, 2022
269b955
install and use http-proxy-middleware to fix bug
brianguyen97 Sep 25, 2022
7252549
install http-proxy-middleware
brianguyen97 Sep 25, 2022
30c635b
Update server.js
brianguyen97 Sep 25, 2022
87514b5
uninstall cookie-session
brianguyen97 Sep 25, 2022
8b3ad3e
moved authentication to firebase
brianguyen97 Sep 25, 2022
21e2aa5
install bootstrap, firebase
brianguyen97 Sep 25, 2022
96b3ad6
remove usestate, useeffect
brianguyen97 Sep 25, 2022
e00a5cb
re-create login page with firebase
brianguyen97 Sep 25, 2022
89643e6
re-create registration page with firebase
brianguyen97 Sep 25, 2022
29172c2
show login/logout button based on if user is logged in
brianguyen97 Sep 25, 2022
8744b18
create context to pass user data around
brianguyen97 Sep 25, 2022
59930a0
use context to pass user data around
brianguyen97 Sep 25, 2022
4d7c593
Create firebase.js
brianguyen97 Sep 25, 2022
6b8ce2f
remove maxprice filter since api inaccurate and add hometype filter
gloria-cheung Sep 25, 2022
160367e
set up hometype in state and pass down to searchbar as prop
gloria-cheung Sep 25, 2022
0038238
remove Col component for styles and only display price if over $1
gloria-cheung Sep 25, 2022
3de8c0f
reset hometype to all true if choose option value = all and all zero …
gloria-cheung Sep 25, 2022
8ba3c35
set default beds to 1 so api doesnt just show new constructions initi…
gloria-cheung Sep 25, 2022
01405eb
conditionally render data based on whether result is for rent or sale
gloria-cheung Sep 25, 2022
c65906e
import contactagent component to render form
gloria-cheung Sep 25, 2022
9ca7ebe
create contact agent form to be displayed in modal
gloria-cheung Sep 25, 2022
538f31d
Merge pull request #10 from gloria-cheung/feature/login-2
brianguyen97 Sep 25, 2022
42183a7
Merge pull request #11 from gloria-cheung/frontend/sale
brianguyen97 Sep 25, 2022
d3626e6
add env variables
gloria-cheung Sep 25, 2022
dece96f
deleted unused UI and removed bootstrap import
gloria-cheung Sep 25, 2022
8ade79e
add link to each card when click button and unique key
gloria-cheung Sep 25, 2022
cda888a
remove id from form for email
gloria-cheung Sep 25, 2022
3088e66
use bootstrap container and change layout to display map before data …
gloria-cheung Sep 25, 2022
cdcd5bd
use bootstrap container and change layout to display map before data …
gloria-cheung Sep 25, 2022
c926c0d
remove import of stylesheet
gloria-cheung Sep 25, 2022
30d74e8
fix layout of links in navbar
gloria-cheung Sep 25, 2022
b97b916
delete stylesheets
gloria-cheung Sep 25, 2022
42c1e1e
add google maps api
gloria-cheung Sep 26, 2022
283f038
install google maps api
gloria-cheung Sep 26, 2022
ab42884
import googlemaps api and use to render map centered to USA and canada
gloria-cheung Sep 26, 2022
78bc159
add styles for map container
gloria-cheung Sep 26, 2022
a57b847
import google maps and marker to display location for given listing
gloria-cheung Sep 26, 2022
4894052
add styles for map container
gloria-cheung Sep 26, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,13 @@ And don't forget to update the README!

You might want to look at examples of projects that have used this boilerplate for hints on how to extend it. Here are a few:

* [Later Cart](https://github.com/bonitac/later-cart)
* [Buddi.io](https://github.com/Danny-Tran/buddi.io)
- [Later Cart](https://github.com/bonitac/later-cart)
- [Buddi.io](https://github.com/Danny-Tran/buddi.io)

If you'd like your project added to the list, please shoot me a message.

## Contact

Please contact me on Slack (@garrettgsb) or Nima at `[email protected]` if you have any questions, requests, or feedback, or post an issue to this repo. If you are using the boilerplate, I'd love to hear from you as well!

.
5 changes: 5 additions & 0 deletions express-back-end/.env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
DB_HOST=localhost
DB_USER=your_user
DB_PASS=your_password
DB_NAME=your_db_name
DB_PORT=5432
12 changes: 12 additions & 0 deletions express-back-end/db.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
require("dotenv").config();
const Pool = require("pg").Pool;

const pool = new Pool({
user: process.env.DB_USER,
password: process.env.DB_PASS,
host: process.env.DB_HOST,
port: process.env.DB_PORT,
database: process.env.DB_NAME,
});

module.exports = pool;
6 changes: 6 additions & 0 deletions express-back-end/db/schema/01_users.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
DROP TABLE IF EXISTS users CASCADE;
CREATE TABLE users(
userid SERIAL PRIMARY KEY NOT NULL,
email VARCHAR(255) NOT NULL,
pw VARCHAR(255) NOT NULL
);
5 changes: 5 additions & 0 deletions express-back-end/db/seeds/01_users.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
INSERT INTO users (email, pw) VALUES ('[email protected]', 'blohsh');
INSERT INTO users (email, pw) VALUES ('[email protected]', 'password1');
INSERT INTO users (email, pw) VALUES ('[email protected]', 'password2');
INSERT INTO users (email, pw) VALUES ('[email protected]', 'password3');
INSERT INTO users (email, pw) VALUES ('[email protected]', 'password4');
Loading