Skip to content

Functional Neighborhood Selection Dropdown #92

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

Open
wants to merge 175 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
175 commits
Select commit Hold shift + click to select a range
ebb0857
Added project name to README.md
mattperkins02 Mar 19, 2024
e4cca0f
Merge branch 'Capstone-Projects-2024-Spring:main' into main
Maggieh76 Mar 19, 2024
a8cb614
Add files via upload
mattperkins02 Mar 19, 2024
a07920e
setup sample backend and frontend example
matthoot Mar 19, 2024
080a756
added install and run project steps to read me
matthoot Mar 21, 2024
e7ce0d5
Updated README.md
GrenellT Mar 21, 2024
b68ee18
Database file with database structure and file to test connection to …
eross04 Mar 21, 2024
24af2ee
Fix foreign key relationship in saved_routes_locations_table
eross04 Mar 21, 2024
d959e51
Add missing autoincrement
eross04 Mar 25, 2024
3cf6bb6
Merge pull request #1 from Capstone-Projects-2024-Spring/establish_da…
Maggieh76 Mar 25, 2024
2ce3f17
Created all files defined in FE class diagram
Mar 26, 2024
ccfd08a
Added all files defined in FE class diagram
Mar 26, 2024
5f26486
Added code skeletons for each FE file
Mar 26, 2024
e6d7908
Merge pull request #2 from Capstone-Projects-2024-Spring/Frontend_Ske…
eross04 Mar 27, 2024
78d2841
attempting google scraping
Maggieh76 Mar 27, 2024
d8fd25a
google attempt
Maggieh76 Mar 27, 2024
b1c5692
updates toward yelp scrape
Maggieh76 Mar 27, 2024
8073b09
Update scrapeLogicFile.py
Maggieh76 Mar 27, 2024
74a77a2
Barebones user log in page and adding .gitignore for my google maps k…
eross04 Mar 27, 2024
0ab8959
cleaning files, updates to array output
Maggieh76 Mar 27, 2024
2298094
access price denotion
Maggieh76 Mar 27, 2024
d34015d
add buzzwords
Maggieh76 Mar 27, 2024
473b61a
Update scrapeLogicFile.py
Maggieh76 Mar 27, 2024
5d2088e
Merge pull request #3 from Capstone-Projects-2024-Spring/BasicLogInPage
matthoot Mar 28, 2024
cf85668
Remove email and add to readme
eross04 Mar 28, 2024
c96a69b
Merge pull request #4 from Capstone-Projects-2024-Spring/BasicLogInPage
matthoot Mar 28, 2024
b30959e
created django models for database
matthoot Mar 28, 2024
90d684f
Backend Skeleton
mattperkins02 Mar 28, 2024
1203d8d
added backend authentication module to settings
matthoot Mar 29, 2024
8b10a93
New Rating
Maggieh76 Apr 1, 2024
1e84e21
N/A options
Maggieh76 Apr 1, 2024
afc3a0f
Cleaner restaurant name
Maggieh76 Apr 1, 2024
beed8ac
Clean up
Maggieh76 Apr 1, 2024
ce0c26a
insideRequest Setup
Maggieh76 Apr 1, 2024
086ebae
got API frontend to backend endpoint working
matthoot Apr 1, 2024
d15a599
Add addresses and Hours
Maggieh76 Apr 2, 2024
db4101e
Selenium integration
Maggieh76 Apr 2, 2024
5e1ce8f
Merge pull request #5 from Capstone-Projects-2024-Spring/perkins_branch
eross04 Apr 2, 2024
7ff48ed
Account for Hours Day
Maggieh76 Apr 2, 2024
4260d74
login successful with super user
matthoot Apr 2, 2024
c0f4b53
Input user categories and location types
eross04 Apr 2, 2024
c74695d
Attributes work!
Maggieh76 Apr 2, 2024
83fd3c9
update casual and classy attributes
Maggieh76 Apr 2, 2024
b18715b
move logic into insideRequest
Maggieh76 Apr 2, 2024
8375acc
ParallelProcessing Setup
Maggieh76 Apr 3, 2024
b0946be
Fixed Hours Issue
Maggieh76 Apr 3, 2024
922d135
multiprocessing comment
Maggieh76 Apr 3, 2024
ada96cc
Speed optimization
Maggieh76 Apr 3, 2024
a7df4ed
clean up
Maggieh76 Apr 3, 2024
0c96f7f
Added Philly Google Maps to planning page
eross04 Apr 3, 2024
07d6698
remove key
eross04 Apr 3, 2024
afde518
signup page
matthoot Apr 4, 2024
785558c
Merging into main
Apr 4, 2024
8684c71
Navbar and map
eross04 Apr 5, 2024
1ae6c66
Add gitignore
eross04 Apr 5, 2024
fb5bafa
Merge pull request #6 from Capstone-Projects-2024-Spring/HomePageForUI
GrenellT Apr 5, 2024
386349b
signup finished
matthoot Apr 5, 2024
b2afbe1
removed console log
matthoot Apr 5, 2024
8cd27ed
Merge branch 'main' into LoginBranch
matthoot Apr 6, 2024
fbe25c5
Navbar with bootstrap
eross04 Apr 6, 2024
1fda4a3
pull out addresses
Maggieh76 Apr 7, 2024
a3ee4cb
Getting latitude
Maggieh76 Apr 7, 2024
d9b7b6d
set up for database
Maggieh76 Apr 7, 2024
322baae
Add markers for locations passed in
eross04 Apr 7, 2024
9c97541
Remove reviews per star
eross04 Apr 7, 2024
e560e02
Merge pull request #8 from Capstone-Projects-2024-Spring/FixLocations…
Maggieh76 Apr 8, 2024
099c6f2
Add attributes and cost to locations table
eross04 Apr 8, 2024
fb098a4
Merge pull request #9 from Capstone-Projects-2024-Spring/FixLocations…
Maggieh76 Apr 8, 2024
791d686
Add to database set up logic
Maggieh76 Apr 8, 2024
fbd0166
delete geocode testing file
Maggieh76 Apr 8, 2024
01f675f
Merge branch 'main' into scrapeLogic
Maggieh76 Apr 8, 2024
9ee1ace
program adds to database
Maggieh76 Apr 8, 2024
716b508
List and map plus navbar icon
eross04 Apr 8, 2024
24e72e3
Begin work on large data runs
Maggieh76 Apr 8, 2024
e89e357
Merge branch 'main' of https://github.com/Capstone-Projects-2024-Spri…
Apr 8, 2024
58add9d
works intermittedly
Maggieh76 Apr 8, 2024
f774e19
Should work
Maggieh76 Apr 9, 2024
d800822
Merge branch 'main' into MapOnPlanning
eross04 Apr 9, 2024
a69ab98
Designed general backend logic for location selection
Apr 9, 2024
155bad9
Merge branch 'main' into LoginBranch
matthoot Apr 9, 2024
a29db7f
Updated database queries to use correct column names
Apr 9, 2024
e7d9934
added db to git ignore and error numbers
matthoot Apr 9, 2024
5c9078c
Merge pull request #7 from Capstone-Projects-2024-Spring/LoginBranch
matthoot Apr 9, 2024
d20c99c
Merge branch 'main' of https://github.com/Capstone-Projects-2024-Spri…
Apr 9, 2024
1d91aa8
Safeguards
Maggieh76 Apr 9, 2024
bff6e9e
Rating safeguard
Maggieh76 Apr 9, 2024
84c30d7
bookstores
Maggieh76 Apr 9, 2024
6457180
Excess prints
Maggieh76 Apr 9, 2024
73c7bab
fix locationtypeids
Maggieh76 Apr 9, 2024
630e565
Delete scapeLogicGoogle.py
Maggieh76 Apr 9, 2024
c526342
Resolved conflict by keeping changes from my branch
Maggieh76 Apr 9, 2024
60d402c
Add homepage design
eross04 Apr 10, 2024
3ae958b
Sign up screen
eross04 Apr 10, 2024
a0dddf4
Merge pull request #12 from Capstone-Projects-2024-Spring/scrapeLogic
GrenellT Apr 10, 2024
56d0d6c
Created a FE to BE connection to calculateReasonableRoute
Apr 10, 2024
e7aa072
Merge branch 'main' of https://github.com/Capstone-Projects-2024-Spri…
Apr 10, 2024
305b15a
Attributes Fixing (Hole Patch)
Maggieh76 Apr 10, 2024
dea8aef
Change package-lock.json
eross04 Apr 10, 2024
db7bd0d
Merge branch 'main' into MapOnPlanning
eross04 Apr 10, 2024
472a543
Fix same name issues
Maggieh76 Apr 10, 2024
b87e121
Reruns
Maggieh76 Apr 10, 2024
a86c2b1
Museums Updated
Maggieh76 Apr 10, 2024
7b94984
Signup and Login screen styling
eross04 Apr 10, 2024
3c3d3f0
Merge pull request #13 from Capstone-Projects-2024-Spring/scrapeLogic
eross04 Apr 10, 2024
2388b90
Fix missing css
eross04 Apr 10, 2024
9b03e57
Added background color
eross04 Apr 10, 2024
bf90dc4
Location types updated
eross04 Apr 10, 2024
e5776c3
Merge branch 'MapOnPlanning' of https://github.com/Capstone-Projects-…
eross04 Apr 10, 2024
b1f956a
Updated db connection code and SQL statements to match appropriate ta…
Apr 10, 2024
419fd7b
Merge pull request #14 from Capstone-Projects-2024-Spring/HomepageDesign
Maggieh76 Apr 10, 2024
1c3e24a
Merge branch 'main' into MapOnPlanning
eross04 Apr 10, 2024
f284861
Merge pull request #10 from Capstone-Projects-2024-Spring/MapOnPlanning
Maggieh76 Apr 10, 2024
e88eb4f
Created a fetch_location_data function to retrieve all columns for a …
Apr 10, 2024
1301d89
Minor Updates + Added a simple test script in PathController.py to se…
Apr 10, 2024
5c454af
Merge pull request #11 from Capstone-Projects-2024-Spring/Location_Se…
matthoot Apr 10, 2024
83239cf
Working on login redirect
eross04 Apr 10, 2024
6e23359
Merge branch 'main' into HomepageDesign
eross04 Apr 10, 2024
28e27e4
User authentication on frontend
eross04 Apr 11, 2024
7d6ac7e
Working map markers
eross04 Apr 11, 2024
484f1d5
Working listing
eross04 Apr 11, 2024
c8b2c62
Remove no lat long
eross04 Apr 11, 2024
36c4fb6
User input and sign up pretty
eross04 Apr 11, 2024
b4f73a5
Trying to avoid merge conflicts
eross04 Apr 11, 2024
cb0e671
Merge branch 'frontendlocations' into demobranch
eross04 Apr 11, 2024
691fe9e
Fix db
eross04 Apr 11, 2024
1a0efa8
Add location type
eross04 Apr 11, 2024
6ed886c
Merge pull request #17 from Capstone-Projects-2024-Spring/demobranch
matthoot Apr 16, 2024
2c3d1cf
More data
Maggieh76 Apr 16, 2024
0205201
Add route to map
eross04 Apr 17, 2024
d268c30
fix controller
eross04 Apr 17, 2024
cf65827
Merge pull request #18 from Capstone-Projects-2024-Spring/demobranch
Maggieh76 Apr 17, 2024
88ed81d
Great Data
Maggieh76 Apr 17, 2024
9c3cda7
Merge branch 'main' into scrapeLogic
Maggieh76 Apr 17, 2024
134e356
Merge pull request #19 from Capstone-Projects-2024-Spring/scrapeLogic
eross04 Apr 17, 2024
b3e113e
More data!
Maggieh76 Apr 17, 2024
beed50d
more data
Maggieh76 Apr 18, 2024
ab4cafb
Updated all Lats and Longs
Maggieh76 Apr 18, 2024
cad9230
More data
Maggieh76 Apr 18, 2024
e30d03c
Add Attributes
eross04 Apr 19, 2024
bb810db
Add first location attributes
eross04 Apr 19, 2024
52d80ab
Change order of route by doing location type with least number of loc…
eross04 Apr 20, 2024
bf6a0b8
saved routes page and saved routes button
matthoot Apr 20, 2024
78c6bc0
local settings file to hide routing API key
matthoot Apr 20, 2024
e59cf7e
More data!
Maggieh76 Apr 21, 2024
c269d61
More data
Maggieh76 Apr 21, 2024
2e5be0a
Bakeries
Maggieh76 Apr 22, 2024
cc8e9b4
activities
Maggieh76 Apr 22, 2024
1fbb59b
Attribute selection
eross04 Apr 22, 2024
5018fc8
Add location types on frontend
eross04 Apr 22, 2024
f45a607
Work on Garages
Maggieh76 Apr 22, 2024
5382446
added parking garages!
Maggieh76 Apr 23, 2024
7decff3
Cleaned non rated places
Maggieh76 Apr 23, 2024
9f530c7
Yelp reworking
Maggieh76 Apr 24, 2024
523f8b8
More coffee shops!
Maggieh76 Apr 24, 2024
03764a8
Merge pull request #20 from Capstone-Projects-2024-Spring/UpdateFront…
GrenellT Apr 24, 2024
795561e
new bagel tag
Maggieh76 Apr 24, 2024
943ffd3
finished saved routes
matthoot Apr 24, 2024
014bdb9
removed print statements
matthoot Apr 24, 2024
40e4fb1
render save route button if they are logged in
matthoot Apr 24, 2024
b279b64
Merge branch 'main' into SavingRoutesBranch3
matthoot Apr 24, 2024
ad2f801
Merge pull request #21 from Capstone-Projects-2024-Spring/SavingRoute…
matthoot Apr 24, 2024
01ba6b9
changed pathcontroller back
matthoot Apr 24, 2024
37265bc
Merge pull request #22 from Capstone-Projects-2024-Spring/BackendTest…
matthoot Apr 24, 2024
0f104de
changed module back
matthoot Apr 24, 2024
27f4db3
key
matthoot Apr 24, 2024
a5ff68d
Merge pull request #23 from Capstone-Projects-2024-Spring/BackendTest…
matthoot Apr 24, 2024
05757e6
Updated PathController to account for neighborhood parameter
Apr 25, 2024
e971ab7
Updated neighborhood selection in frontend to properly send data to b…
Apr 25, 2024
ec39233
Merging main
Apr 25, 2024
9d6c35c
Removed node_modules
Apr 25, 2024
eb9432b
Novelty/paper stores
Maggieh76 Apr 25, 2024
1cfa0b6
Cleaned Data
Maggieh76 Apr 26, 2024
ea0bbf1
Add novelty and bagel shops to the frontend
eross04 Apr 26, 2024
0c49fb7
Merge pull request #25 from Capstone-Projects-2024-Spring/scrapeLogic
eross04 Apr 27, 2024
48a7e3c
Merge branch 'main' into Neighborhood_Filter
eross04 Apr 27, 2024
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
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
# Generated files
.docusaurus

# Ignore database files
*.sqlite3
*.db
db.sqlite3

# Misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local
./node_modules

*.pyc

myproject/local_settings.py
126 changes: 83 additions & 43 deletions README.md

Large diffs are not rendered by default.

26 changes: 26 additions & 0 deletions myapp/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*

googlemapsapikey.txt

70 changes: 70 additions & 0 deletions myapp/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# Getting Started with Create React App

This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).

## Available Scripts

In the project directory, you can run:

### `npm start`

Runs the app in the development mode.\
Open [http://localhost:3000](http://localhost:3000) to view it in your browser.

The page will reload when you make changes.\
You may also see any lint errors in the console.

### `npm test`

Launches the test runner in the interactive watch mode.\
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.

### `npm run build`

Builds the app for production to the `build` folder.\
It correctly bundles React in production mode and optimizes the build for the best performance.

The build is minified and the filenames include the hashes.\
Your app is ready to be deployed!

See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.

### `npm run eject`

**Note: this is a one-way operation. Once you `eject`, you can't go back!**

If you aren't satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.

Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you're on your own.

You don't have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn't feel obligated to use this feature. However we understand that this tool wouldn't be useful if you couldn't customize it when you are ready for it.

## Learn More

You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).

To learn React, check out the [React documentation](https://reactjs.org/).

### Code Splitting

This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)

### Analyzing the Bundle Size

This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)

### Making a Progressive Web App

This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)

### Advanced Configuration

This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)

### Deployment

This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)

### `npm run build` fails to minify

This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)
Loading