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

Dev #2

Open
wants to merge 98 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
a5a80b2
added navbar and navbar css
jimbobding Jun 12, 2023
2b27c39
Merge pull request #1 from jimbobding/feature-nav
jimbobding Jun 12, 2023
434322f
added calorie form and calorie form css
jimbobding Jun 13, 2023
6bad7f0
Merge pull request #2 from jimbobding/feature-calorieForm
jimbobding Jun 13, 2023
08232e1
added calorie map with css. Added distance, places and mapcontainer. …
jimbobding Jun 14, 2023
e4440b9
added calorie map with css. Added distance, places and mapcontainer. …
jimbobding Jun 14, 2023
0a5573b
fixed some typescript errors. Gave map in map.tsx, setWeight, weight,…
jimbobding Jun 14, 2023
d529522
attempted fix on the on load in map.tsx
jimbobding Jun 14, 2023
85e1ce9
.env const fix
jimbobding Jun 14, 2023
5e9ffb5
api test fix
jimbobding Jun 14, 2023
ece1815
jest cssTransform fix
jimbobding Jun 14, 2023
28d7863
Merge pull request #3 from jimbobding/feature-calorieMap
jimbobding Jun 14, 2023
839db00
added footer with css style
jimbobding Jun 15, 2023
acba70f
added a links to icons on footer
jimbobding Jun 15, 2023
75d90cb
Merge pull request #4 from jimbobding/feature-footer
jimbobding Jun 15, 2023
e96b5a5
added header, icon container, text container and flex box for 3 cols …
jimbobding Jun 15, 2023
eca5147
added cards to landing page, also added -margin to nav bar
jimbobding Jun 15, 2023
ff7f98f
added some styling to landing page
jimbobding Jun 15, 2023
151a11a
Merge pull request #6 from jimbobding/feature-landingPage
jimbobding Jun 16, 2023
50f6e21
used flex box to make the calorie map look better on mobile view
jimbobding Jun 19, 2023
0e9c258
used flex box to make the calorie map look better on mobile view
jimbobding Jun 19, 2023
22ca2ca
used flex box to make the calorie map look better on mobile view
jimbobding Jun 19, 2023
fbbdeb8
Merge branch 'dev' into feature-calorieMap
jimbobding Jun 19, 2023
e02bd69
Merge pull request #7 from jimbobding/feature-calorieMap
jimbobding Jun 19, 2023
707209d
added form slice/selector and state tpo store?
jimbobding Jun 19, 2023
b8f4d16
got the weight from the state form state to work globally, added test…
jimbobding Jun 19, 2023
c6cb7ec
changed the inputs on the calorie form so they are now dispatching th…
jimbobding Jun 19, 2023
48234a9
fixed mistake on name input and data type on dropdown in formstate file
jimbobding Jun 19, 2023
0844a46
parsed the dropdown to a number in distance file
jimbobding Jun 19, 2023
d8f5f30
Merge pull request #8 from jimbobding/feature-redux
jimbobding Jun 19, 2023
d5784da
added browswer links for the map and form components, aswell as nav l…
jimbobding Jun 20, 2023
27bed9b
Merge pull request #9 from jimbobding/feature-routing
jimbobding Jun 20, 2023
a2bebbe
added an empty about page with a route and nav link, tidied up the ap…
jimbobding Jun 20, 2023
6fbc72b
added quick link to landing page for calorie map/form. Moved apikey i…
jimbobding Jun 20, 2023
517b116
added geolocation and waypoint map place holders with nav links and r…
jimbobding Jun 20, 2023
2c786e8
added page wrappers to routes and added a form map page to display th…
jimbobding Jun 20, 2023
1e25eae
Merge pull request #10 from jimbobding/feature-routing
jimbobding Jun 20, 2023
19026fb
added origin and destination boxes to the calorie map and removed som…
jimbobding Jun 21, 2023
0b1bf15
uninstalled reach combobox package added logic to distance page so ca…
jimbobding Jun 22, 2023
994c848
added a test map to the way point map to study the directions from go…
jimbobding Jun 23, 2023
8fc0d19
styeld the directions
jimbobding Jun 23, 2023
900c103
styeld the directions
jimbobding Jun 23, 2023
53a59f2
deleted the test waypoint map and its imports
jimbobding Jun 23, 2023
c9735b5
Merge pull request #11 from jimbobding/feature-calorieMapRevamnp
jimbobding Jun 26, 2023
7005a5e
deleted react-google-maps and google-maps-react also got the .env scr…
jimbobding Jun 29, 2023
cda4444
added working map to geolocation file
jimbobding Jun 29, 2023
cf0251a
added geolocation service to geolocation file
jimbobding Jun 29, 2023
b10e2b6
added places search for breweries in radius to the user'
jimbobding Jun 29, 2023
cd06ddc
added logic to make the places search happening asynchronous to the g…
jimbobding Jun 29, 2023
c5ccc10
changed the myVariable state to clickedMarker and enab;ed it to get t…
jimbobding Jul 3, 2023
be05c49
added distance function to get the distance of the users location and…
jimbobding Jul 3, 2023
23b037f
used directions renderer to get the leg object from the route
jimbobding Jul 4, 2023
510469a
deleted unused code from geolocation file and started geoinformation …
jimbobding Jul 4, 2023
8521c46
added journey information to geo information and created geo form usi…
jimbobding Jul 4, 2023
70dc483
added user time to the redux store for form
jimbobding Jul 4, 2023
ce7a35a
added geolocation form/map to the router and nav
jimbobding Jul 4, 2023
baac31a
added a sperate loading page for the geolocation map
jimbobding Jul 4, 2023
64f8c87
Merge pull request #12 from jimbobding/feature-geoLocationMap
jimbobding Jul 4, 2023
25bf720
added waypoint map fromap api
jimbobding Jul 5, 2023
8de800e
added nav/router links for waypoint map
jimbobding Jul 5, 2023
b9418e6
Merge pull request #13 from jimbobding/feature-wayPointMap
jimbobding Jul 5, 2023
c51ba1b
put the state form for user into about page
jimbobding Jul 6, 2023
0d75e1c
updated packages
jimbobding Jul 6, 2023
aac7e8d
Merge pull request #14 from jimbobding/feature-aboutPageState
jimbobding Jul 6, 2023
305c8e8
added waypoint information and passed props from waypoint map
jimbobding Jul 7, 2023
9fcd4ac
added logic to get the calories lost for each segement of the journey…
jimbobding Jul 10, 2023
11bd97d
added logic to display full travel time for journey
jimbobding Jul 10, 2023
fa2bfec
bugs in total calories lost and also in the logic that stops hours, m…
jimbobding Jul 10, 2023
28638d4
Merge pull request #15 from jimbobding/feature-wayPointMap
jimbobding Jul 10, 2023
3d93c91
made some css style fixes to the map and loading page
jimbobding Jul 11, 2023
3dd5309
added a server.js file and back end side of project
jimbobding Jul 11, 2023
4e94ea1
added an about link to the geoform and changed all px measurment to e…
jimbobding Jul 11, 2023
0b1a216
added copy to landing page. added hover effects to nav bar. Changed p…
jimbobding Jul 12, 2023
4245a13
added calories by minute logic
jimbobding Jul 12, 2023
cbbc7f7
Merge pull request #16 from jimbobding/feature-smallFixes
jimbobding Jul 12, 2023
7eadc11
added server.mjs file and have express connected to my database
jimbobding Jul 13, 2023
17af853
added routes/users.js and got my crerate api working
jimbobding Jul 13, 2023
320b13b
split backend into db/model/controller/route. Got full CRUD functiona…
jimbobding Jul 14, 2023
deec497
added columns for email and pic to the db aswell logic to handle it i…
jimbobding Jul 14, 2023
31881b9
added columns for email and pic to the db aswell logic to handle it i…
jimbobding Jul 18, 2023
825bedd
Merge branch 'dev' into feature-login
jimbobding Jul 18, 2023
b81b4d4
Merge pull request #17 from jimbobding/feature-login
jimbobding Jul 18, 2023
c6b1d25
styled login and registration pages and gave them redirects to th ela…
jimbobding Jul 19, 2023
eca84b1
Merge pull request #18 from jimbobding/feature-login
jimbobding Jul 20, 2023
b128bb4
used JWT tokens to persist user data when they are logged in, created…
jimbobding Jul 25, 2023
f06ca89
added logic to the modal pop up and a ternary operator for the log in…
jimbobding Jul 25, 2023
1dac809
styled modal and handled logic to add user name to landing page once …
jimbobding Aug 1, 2023
8520de0
fixed bug taht was stopping commits
jimbobding Aug 8, 2023
f2fac9e
commented out code in husky pre commit
jimbobding Aug 8, 2023
965ea94
commented out code in husky pre commit
jimbobding Aug 8, 2023
40d1ecf
Merge pull request #20 from jimbobding/feature-login
jimbobding Aug 8, 2023
caeaf4e
got rid off original profile pic codde. Fixed media queries for mobil…
jimbobding Aug 9, 2023
fb07bd6
added table in database for images and logic to add images path to it
jimbobding Aug 11, 2023
1d229cf
added create and fetch/fetch by id for the image table
jimbobding Aug 14, 2023
5f6406f
fixed api call to fetch the profile picture from the database, using …
jimbobding Aug 15, 2023
e8f6094
added ternery statement so that the users profile pic displays when t…
jimbobding Aug 15, 2023
a0ccb64
fixed issue with loging in, in the user controller replaced the passw…
jimbobding Aug 16, 2023
c663827
Merge pull request #21 from jimbobding/feature-profilePicDisplay
jimbobding Aug 16, 2023
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
Prev Previous commit
Next Next commit
added calorie map with css. Added distance, places and mapcontainer. …
…Placed api key in .env file and added autocomple, reach/combobox packages
  • Loading branch information
jimbobding committed Jun 14, 2023
commit e4440b93a29a83cb8925517c9e5f22c07980ccf8
2 changes: 0 additions & 2 deletions src/components/MapContainer.tsx
Original file line number Diff line number Diff line change
@@ -2,8 +2,6 @@ import { useLoadScript } from "@react-google-maps/api";

import Map from "./Map";

// const VITE_REACT_APP_GOOGLE_API_KEY = import.meta.env.REACT_APP_GOOGLE_API_KEY;

const MapContainer = ({ weight, dropdown, name }) => {
console.log("weight:", weight);
console.log("dropdown:", dropdown);