Skip to content

Routes #184

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.

Sign up for GitHub

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
ckats123 wants to merge 107 commits into
base: master
Choose a base branch
from
Open

Routes #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
6dd46d2
added the seeds
Jan 26, 2024
a9b2b0a
set up branch for leaflet code, test map
jjyh Jan 26, 2024
f28a432
figuring pop up etc in just js leaflet, lat long order and crs
jjyh Jan 26, 2024
10b9bab
add css to start creating ring frame around map
jjyh Jan 26, 2024
17c3687
Update Axios, React Version and React Scripts
maryanibrahim Jan 26, 2024
9cded41
add top navigation bar
maryanibrahim Jan 26, 2024
5092698
add loop for more markers, fix testing csv
jjyh Jan 27, 2024
83dd46e
troubleshooting loop markers
jjyh Jan 27, 2024
cb7202c
troubleshooting loop markers
jjyh Jan 27, 2024
6688e56
troubleshooting loop markers
jjyh Jan 27, 2024
32e8330
figured out issue - coordinates are exactly the same so could not see
jjyh Jan 27, 2024
9ffa827
added google seed
Jan 27, 2024
a9c7a7b
Merge branch 'map-leaflet' into react-front-end
maryanibrahim Jan 27, 2024
fe888e8
removed extraneous testing file
jjyh Jan 28, 2024
92ad639
changed test csv data to latest from Feda, excerpted for Victoria
jjyh Jan 29, 2024
edc1a0a
changed some test code to match Victoria data
jjyh Jan 29, 2024
857f9dc
changed static zoom level, changed pop-up to only open for the lowest…
jjyh Jan 29, 2024
8641491
pull recent changes
ckats123 Jan 30, 2024
751f660
install dependencies
ckats123 Jan 30, 2024
10e0285
setup puppeteer
ckats123 Jan 30, 2024
393ef62
incorporate puppeteer into react
ckats123 Jan 30, 2024
5b0e32c
Merge pull request #1 from ckats123/map-leaflet
ckats123 Jan 31, 2024
ebfaf32
t Merge branch 'express_backend'
ckats123 Jan 31, 2024
79a4928
create LocationComponent.js
ckats123 Jan 31, 2024
c846411
create LocationComponent.js
ckats123 Jan 31, 2024
82d5ffe
set up branch for leaflet code, test map
jjyh Jan 26, 2024
bd3fea8
figuring pop up etc in just js leaflet, lat long order and crs
jjyh Jan 26, 2024
2cb334f
add css to start creating ring frame around map
jjyh Jan 26, 2024
c152e7d
add loop for more markers, fix testing csv
jjyh Jan 27, 2024
594f14f
troubleshooting loop markers
jjyh Jan 27, 2024
3355901
troubleshooting loop markers
jjyh Jan 27, 2024
5a53f2c
troubleshooting loop markers
jjyh Jan 27, 2024
a24bd68
figured out issue - coordinates are exactly the same so could not see
jjyh Jan 27, 2024
14841eb
removed extraneous testing file
jjyh Jan 28, 2024
f32b2f0
changed test csv data to latest from Feda, excerpted for Victoria
jjyh Jan 29, 2024
c8f9a33
changed some test code to match Victoria data
jjyh Jan 29, 2024
e37a592
changed static zoom level, changed pop-up to only open for the lowest…
jjyh Jan 29, 2024
282fc3f
Merge branch 'react_dependencies'
ckats123 Jan 31, 2024
1057fa8
create login and signup
maryanibrahim Jan 31, 2024
46a145d
Add login, signup, and profile routes; update dependencies
maryanibrahim Jan 31, 2024
a73488c
updated dataset
Jan 31, 2024
fb6a624
Merge branch 'master' into dataset
fedamuhammadian Jan 31, 2024
5381e5f
Merge pull request #2 from ckats123/dataset
ckats123 Jan 31, 2024
f4b4f09
install nodemon locally
ckats123 Feb 1, 2024
20ae8bc
add dependencies to run both react and express concurrently
ckats123 Feb 1, 2024
03ea495
Prepare react-front-end branch for merging with master
maryanibrahim Feb 1, 2024
fbe4a4b
Resolved merge conflicts
maryanibrahim Feb 1, 2024
0aa374d
Updated server configurations and React App component after merged
maryanibrahim Feb 1, 2024
a7be521
merging to master
maryanibrahim Feb 1, 2024
394b415
mergind to master
maryanibrahim Feb 1, 2024
673eb99
fixed the login and register
maryanibrahim Feb 2, 2024
a97a286
add function to check current range of map (returns in console for in…
jjyh Feb 2, 2024
e91bb99
tried out more fitting size for styles
jjyh Feb 2, 2024
be73425
Merge pull request #5 from ckats123/moreMapping
fedamuhammadian Feb 2, 2024
63a5fc1
Merge branch 'react-front-end' of https://github.com/ckats123/gas-sta…
fedamuhammadian Feb 2, 2024
fa0bf1c
add greeting when the user loged in
maryanibrahim Feb 3, 2024
33498c9
Merge pull request #3 from ckats123/react-front-end
ckats123 Feb 3, 2024
2a83d87
Ignore and remove .DS_Store files
maryanibrahim Feb 3, 2024
d4691ef
Ignore and remove .DS_Store files
maryanibrahim Feb 3, 2024
f38f743
Ignore and remove .DS_Store files
maryanibrahim Feb 3, 2024
5ca19d3
Delete express-back-end/src/.DS_Store
maryanibrahim Feb 3, 2024
423fb63
Merge pull request #6 from ckats123/new-front-end
fedamuhammadian Feb 3, 2024
22a07f8
approve changes in leaflet
ckats123 Feb 1, 2024
2b32aed
add LocationComponent to components file
ckats123 Feb 4, 2024
66e4e2b
resolve conflict
ckats123 Feb 4, 2024
8ee21b8
install nodemon locally
ckats123 Feb 1, 2024
61b1591
Update Axios, React Version and React Scripts
maryanibrahim Jan 26, 2024
da16572
add top navigation bar
maryanibrahim Jan 26, 2024
01e6c1a
create login and signup
maryanibrahim Jan 31, 2024
5ed3168
Add login, signup, and profile routes; update dependencies
maryanibrahim Jan 31, 2024
6382609
update changes
ckats123 Feb 4, 2024
1cce7ab
Updated server configurations and React App component after merged
maryanibrahim Feb 1, 2024
2140670
merging to master
maryanibrahim Feb 1, 2024
45eb6ff
rebase
ckats123 Feb 4, 2024
0f37d68
add greeting when the user loged in
maryanibrahim Feb 3, 2024
61d859a
add function to check current range of map (returns in console for in…
jjyh Feb 2, 2024
524b3a5
tried out more fitting size for styles
jjyh Feb 2, 2024
0e87ed0
rebase
ckats123 Feb 4, 2024
9d749bb
create rough draft of all routes needed in server.js
ckats123 Feb 5, 2024
33bd944
create register route
ckats123 Feb 5, 2024
8b4e4f6
add favorite gas station route
ckats123 Feb 5, 2024
cfc4b9f
add gas stations route
ckats123 Feb 5, 2024
3aa1a0e
create users route
ckats123 Feb 5, 2024
097456a
relocate LocationComponent to correct file
ckats123 Feb 5, 2024
8a9589c
add logout route
ckats123 Feb 5, 2024
8033696
add gas-station-price route
ckats123 Feb 5, 2024
83f4845
add initial location route
ckats123 Feb 5, 2024
4bd8a37
notes for location.js route
ckats123 Feb 6, 2024
d523682
updated and test queries
fedamuhammadian Feb 6, 2024
a787bde
added request for user location and map accordingly, however needs th…
jjyh Feb 5, 2024
78e92aa
update mock csv query result to match Feda output. move map variable…
jjyh Feb 6, 2024
34c254c
update mock csv query result to match Feda output. move map variable…
jjyh Feb 6, 2024
9f0209a
remove extraneous code
jjyh Feb 6, 2024
022e2ff
set pre-location info to Victoria to test sample csv
jjyh Feb 6, 2024
b6c22fc
add favicon and menu
maryanibrahim Feb 6, 2024
a7cd5ca
add settings with routes for history, favorites and settings
maryanibrahim Feb 7, 2024
941fea9
Add routes folder and server.js
maryanibrahim Feb 7, 2024
b4cc559
Add welcome page and search page
maryanibrahim Feb 7, 2024
e6d01f5
update search results
maryanibrahim Feb 8, 2024
6830d34
queries
fedamuhammadian Feb 6, 2024
c23943e
updated and test queries
fedamuhammadian Feb 6, 2024
ef0f295
update gas-station-prices.js route
ckats123 Feb 8, 2024
2b8b2f4
initiate Settings.jsx of frontend
ckats123 Feb 8, 2024
83c99fb
renamed LocationComponent.js
ckats123 Feb 8, 2024
78d1ac1
list of gas stations for home page
ckats123 Feb 8, 2024
44581b3
initiate user profile
ckats123 Feb 8, 2024
01368fc
no comment
ckats123 Feb 8, 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
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added express-back-end/.DS_Store
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions express-back-end/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
node_modules/
.env
.DS_Store
5 changes: 5 additions & 0 deletions express-back-end/.vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"cSpell.words": [
"usersdatabase"
]
}
Empty file added express-back-end/README.md
View file
Open in desktop
Empty file.
Loading