Code

Direction routing#186

Code

Open

jjyh wants to merge 135 commits intogarrettgsb:mastergarrettgsb/react-express-boilerplate:masterfrom ckats123:directionckats123/gas-station-locator:directionCopy head branch name to clipboard

+37,258-122

Commits

Commits on Jan 26, 2024

• added the seeds

  

  Feda Muhammadian

  authored and

  Feda Muhammadian

  committed
  6dd46d2

• set up branch for leaflet code, test map

  jjyh

  committed
  a9b2b0a

• figuring pop up etc in just js leaflet, lat long order and crs

  jjyh

  committed
  f28a432

• add css to start creating ring frame around map

  jjyh

  committed
  10b9bab

• Update Axios, React Version and React Scripts

  maryanibrahim

  committed
  17c3687

• add top navigation bar

  maryanibrahim

  committed
  9cded41

Commits on Jan 27, 2024

• add loop for more markers, fix testing csv

  jjyh

  committed
  5092698

• troubleshooting loop markers

  jjyh

  committed
  83dd46e

• troubleshooting loop markers

  jjyh

  committed
  cb7202c

• troubleshooting loop markers

  jjyh

  committed
  6688e56

• figured out issue - coordinates are exactly the same so could not see

  jjyh

  committed
  32e8330

• added google seed

  

  Feda Muhammadian

  authored and

  Feda Muhammadian

  committed
  9ffa827

• Merge branch 'map-leaflet' into react-front-end

  maryanibrahim

  committed
  a9c7a7b

Commits on Jan 28, 2024

• removed extraneous testing file

  jjyh

  committed
  fe888e8

Commits on Jan 29, 2024

• changed test csv data to latest from Feda, excerpted for Victoria

  jjyh

  committed
  92ad639

• changed some test code to match Victoria data

  jjyh

  committed
  edc1a0a

• changed static zoom level, changed pop-up to only open for the lowest after data is sorted.

  jjyh

  committed
  857f9dc

Commits on Jan 30, 2024

• pull recent changes

  ckats123

  committed
  8641491

• install dependencies

  ckats123

  committed
  751f660

• setup puppeteer

  ckats123

  committed
  10e0285

• incorporate puppeteer into react

  ckats123

  committed
  393ef62

Commits on Jan 31, 2024

• Merge pull request #1 from ckats123/map-leaflet

  Show description for 5b0e32c
  ckats123

  authored
  5b0e32c

• t Merge branch 'express_backend'

  Show description for ebfaf32
  ckats123

  committed
  ebfaf32

• create LocationComponent.js

  ckats123

  committed
  79a4928

• create LocationComponent.js

  ckats123

  committed
  c846411

• set up branch for leaflet code, test map

  

  jjyh

  authored and

  ckats123

  committed
  82d5ffe

• figuring pop up etc in just js leaflet, lat long order and crs

  

  jjyh

  authored and

  ckats123

  committed
  bd3fea8

• add css to start creating ring frame around map

  

  jjyh

  authored and

  ckats123

  committed
  2cb334f

• add loop for more markers, fix testing csv

  

  jjyh

  authored and

  ckats123

  committed
  c152e7d

• troubleshooting loop markers

  

  jjyh

  authored and

  ckats123

  committed
  594f14f

• troubleshooting loop markers

  

  jjyh

  authored and

  ckats123

  committed
  3355901

• troubleshooting loop markers

  

  jjyh

  authored and

  ckats123

  committed
  5a53f2c

• figured out issue - coordinates are exactly the same so could not see

  

  jjyh

  authored and

  ckats123

  committed
  a24bd68

• removed extraneous testing file

  

  jjyh

  authored and

  ckats123

  committed
  14841eb

• changed test csv data to latest from Feda, excerpted for Victoria

  

  jjyh

  authored and

  ckats123

  committed
  f32b2f0

• changed some test code to match Victoria data

  

  jjyh

  authored and

  ckats123

  committed
  c8f9a33

• changed static zoom level, changed pop-up to only open for the lowest after data is sorted.

  

  jjyh

  authored and

  ckats123

  committed
  e37a592

• Merge branch 'react_dependencies'

  ckats123

  committed
  282fc3f

• create login and signup

  maryanibrahim

  committed
  1057fa8

• Add login, signup, and profile routes; update dependencies

  maryanibrahim

  committed
  46a145d

• updated dataset

  

  Feda Muhammadian

  authored and

  Feda Muhammadian

  committed
  a73488c

• Merge branch 'master' into dataset

  fedamuhammadian

  authored
  fb6a624

• Merge pull request #2 from ckats123/dataset

  Show description for 5381e5f
  ckats123

  authored
  5381e5f

Commits on Feb 1, 2024

• install nodemon locally

  ckats123

  committed
  f4b4f09

• add dependencies to run both react and express concurrently

  ckats123

  committed
  20ae8bc

• Prepare react-front-end branch for merging with master

  maryanibrahim

  committed
  03ea495

• Resolved merge conflicts

  maryanibrahim

  committed
  fbe4a4b

• Updated server configurations and React App component after merged

  maryanibrahim

  committed
  0aa374d

• merging to master

  maryanibrahim

  committed
  a7be521

• mergind to master

  maryanibrahim

  committed
  394b415

Commits on Feb 2, 2024

• fixed the login and register

  maryanibrahim

  committed
  673eb99

• add function to check current range of map (returns in console for information only)

  jjyh

  committed
  a97a286

• tried out more fitting size for styles

  jjyh

  committed
  e91bb99

• Merge pull request #5 from ckats123/moreMapping

  Show description for be73425
  fedamuhammadian

  authored
  be73425

• Merge branch 'react-front-end' of https://github.com/ckats123/gas-station-locator into react-front-end

  fedamuhammadian

  committed
  63a5fc1

Commits on Feb 3, 2024

• add greeting when the user loged in

  maryanibrahim

  committed
  fa0bf1c

• Merge pull request #3 from ckats123/react-front-end

  Show description for 33498c9
  ckats123

  authored
  33498c9

• Ignore and remove .DS_Store files

  maryanibrahim

  committed
  2a83d87

• Ignore and remove .DS_Store files

  maryanibrahim

  committed
  d4691ef

• Ignore and remove .DS_Store files

  maryanibrahim

  committed
  f38f743

• Delete express-back-end/src/.DS_Store

  Show description for 5ca19d3
  maryanibrahim

  authored
  5ca19d3

• Merge pull request #6 from ckats123/new-front-end

  Show description for 423fb63
  fedamuhammadian

  authored
  423fb63

Commits on Feb 4, 2024

• approve changes in leaflet

  ckats123

  committed
  22a07f8

• add LocationComponent to components file

  ckats123

  committed
  2b32aed

• resolve conflict

  ckats123

  committed
  66e4e2b

• install nodemon locally

  ckats123

  committed
  8ee21b8

• Update Axios, React Version and React Scripts

  

  maryanibrahim

  authored and

  ckats123

  committed
  61b1591

• add top navigation bar

  

  maryanibrahim

  authored and

  ckats123

  committed
  da16572

• create login and signup

  

  maryanibrahim

  authored and

  ckats123

  committed
  01e6c1a

• Add login, signup, and profile routes; update dependencies

  

  maryanibrahim

  authored and

  ckats123

  committed
  5ed3168

• update changes

  ckats123

  committed
  6382609

• Updated server configurations and React App component after merged

  

  maryanibrahim

  authored and

  ckats123

  committed
  1cce7ab

• merging to master

  

  maryanibrahim

  authored and

  ckats123

  committed
  2140670

• rebase

  ckats123

  committed
  45eb6ff

• add greeting when the user loged in

  

  maryanibrahim

  authored and

  ckats123

  committed
  0f37d68

• add function to check current range of map (returns in console for information only)

  

  jjyh

  authored and

  ckats123

  committed
  61d859a

• tried out more fitting size for styles

  

  jjyh

  authored and

  ckats123

  committed
  524b3a5

• rebase

  ckats123

  committed
  0e87ed0

Commits on Feb 5, 2024

• added request for user location and map accordingly, however needs the alternative option (if user denies or wants to enter postal code) handled more gracefully

  jjyh

  committed
  38433ee

• create rough draft of all routes needed in server.js

  ckats123

  committed
  9d749bb

• create register route

  ckats123

  committed
  33bd944

• add favorite gas station route

  ckats123

  committed
  8b4e4f6

• add gas stations route

  ckats123

  committed
  cfc4b9f

• create users route

  ckats123

  committed
  3aa1a0e

• relocate LocationComponent to correct file

  ckats123

  committed
  097456a

• add logout route

  ckats123

  committed
  8a9589c

• add gas-station-price route

  ckats123

  committed
  8033696

• add initial location route

  ckats123

  committed
  83f4845

Commits on Feb 6, 2024

• notes for location.js route

  ckats123

  committed
  4bd8a37

• queries

  fedamuhammadian

  committed
  4823c8b

• update mock csv query result to match Feda output. move map variable out of function scope to correct problem showing other gas stations

  jjyh

  committed
  7cb07c7

• update mock csv query result to match Feda output. move map variable out of function scope to correct problem showing other gas stations

  jjyh

  committed
  413e1c8

• remove extraneous code

  jjyh

  committed
  d2cb870

• set pre-location info to Victoria to test sample csv

  jjyh

  committed
  6d4c0ab

• updated and test queries

  fedamuhammadian

  committed
  c1e0b27

• add favicon and menu

  maryanibrahim

  committed
  4f7c560

• moved leaflet map into react front end

  fedamuhammadian

  committed
  166f288

• leatlet map moved to frontend

  fedamuhammadian

  committed
  e999a9f

• added an marker icon

  fedamuhammadian

  committed
  67fa446

Commits on Feb 7, 2024

• add settings with routes for history, favorites and settings

  maryanibrahim

  committed
  ce8fe05

• Add routes folder and server.js

  maryanibrahim

  committed
  0872696

• Add welcome page and search page

  maryanibrahim

  committed
  03a4b4a

• refactoring the previous code

  fedamuhammadian

  committed
  dc00f75

• Merge branch 'master' into backend

  fedamuhammadian

  committed
  b9d5222

• Merge pull request #9 from ckats123/backend

  Show description for 38463c5
  ckats123

  authored
  38463c5

Commits on Feb 8, 2024

• update search results

  maryanibrahim

  committed
  e5d5fe1

• fix conflicts

  maryanibrahim

  committed
  cb224b4

• Merge pull request #10 from ckats123/gas-app

  Show description for 6fb0536
  ckats123

  authored
  6fb0536

• update gas-station-prices.js route

  ckats123

  committed
  f9d2713

• initiate Settings.jsx of frontend

  ckats123

  committed
  c45234c

• renamed LocationComponent.js

  ckats123

  committed
  7745e5e

• list of gas stations for home page

  ckats123

  committed
  4dace4c

• initiate user profile

  ckats123

  committed
  f14b861

• everything so far

  fedamuhammadian

  committed
  45ddb2d

• fixing erroneous routes name, connection, and dummy authorization.js. Connection is now set to login with postgres postgres

  jjyh

  committed
  15aea44

• resolved with fixes to route misnaming and new connection login (postgres)

  jjyh

  committed
  56c18b5

• Merge branch 'frontend' of github.com:ckats123/gas-station-locator into frontend

  jjyh

  committed
  d1f2770

• Merge pull request #11 from ckats123/frontend

  Show description for 48afb14
  ckats123

  authored
  48afb14

• removed authorization for now until we figure out the logic

  fedamuhammadian

  committed
  001f2d1

• Merge branch 'master' into frontend

  fedamuhammadian

  authored
  a1d4dba

• still doing refactoring

  fedamuhammadian

  committed
  e569251

• initiate Account.jsx

  ckats123

  committed
  b7b4fe6

• remove constant

  ckats123

  committed
  07144a2

• add placeholder for search bar

  ckats123

  committed
  0fe3d39

Commits on Feb 9, 2024

• getting the user location and center the map

  fedamuhammadian

  committed
  e3a761e

• Merge pull request #12 from ckats123/frontend

  Show description for 2cab948
  jjyh

  authored
  2cab948

• search query and box

  fedamuhammadian

  committed
  371962e

Commits on Feb 11, 2024

• pull recent changes

  ckats123

  committed
  8f9ebf9

• adapting api call in MapComponent.js. Using geolocation of user, and temporarily a hard-coded destinated. Getting 200 status and link json is ok but need to get json loaded in properly.

  jjyh

  committed
  778108a

Commits on Feb 12, 2024

• direction json retrieved from api and parsed into array of lat long objects. however unable to pass the array out to the render portion for polyline in the react-leaflet (line 147 hard coded with d…

  Show description for 0aacd4b
  jjyh

  committed
  0aacd4b

• Merge pull request #13 from ckats123/searchbar

  Show description for 81eebe4
  fedamuhammadian

  authored
  81eebe4

• Merge pull request #14 from ckats123/front-back

  Show description for b8eb141
  fedamuhammadian

  authored
  b8eb141

• fixed the not-appearing polyline by passing out polylineCoord properly as useState with mentor. Still need to remove hard-coded destination.

  jjyh

  committed
  c5e8cb9

• slight refactoring

  jjyh

  committed
  d4cff46

Commits on Feb 13, 2024

• Merge branch 'master' into direction

  fedamuhammadian

  authored
  b2f61e4