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.

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

Jump to bottom

Dev #2

Open
wants to merge 98 commits into
base: main
Choose a base branch
from
Open

Dev #2

wants to merge 98 commits into from

Conversation

jimbobding
Copy link

No description provided.

jimbobding and others added 30 commits June 12, 2023 10:57
@jimbobding
added navbar and navbar css
a5a80b2
@jimbobding
Merge pull request #1 from jimbobding/feature-nav
2b27c39 
added navbar and navbar css
@jimbobding
added calorie form and calorie form css
434322f
@jimbobding
Merge pull request #2 from jimbobding/feature-calorieForm
6bad7f0 
added calorie form and calorie form css
@jimbobding
added calorie map with css. Added distance, places and mapcontainer. …
08232e1 
…Placed api key in .env file and added autocomple, reach/combobox packages
@jimbobding
added calorie map with css. Added distance, places and mapcontainer. …
e4440b9 
…Placed api key in .env file and added autocomple, reach/combobox packages
@jimbobding
fixed some typescript errors. Gave map in map.tsx, setWeight, weight,…
0a5573b 
… dropdown, name in form.tsx types and wrapped cluster in a div in map.tsx
@jimbobding
attempted fix on the on load in map.tsx
d529522
@jimbobding
.env const fix
85e1ce9
@jimbobding
api test fix
5e9ffb5
@jimbobding
jest cssTransform fix
ece1815
@jimbobding
Merge pull request #3 from jimbobding/feature-calorieMap
28d7863 
Feature calorie map
@jimbobding
added footer with css style
839db00
@jimbobding
added a links to icons on footer
acba70f
@jimbobding
Merge pull request #4 from jimbobding/feature-footer
75d90cb 
Feature footer
@jimbobding
added header, icon container, text container and flex box for 3 cols …
e96b5a5 
…for cards
@jimbobding
added cards to landing page, also added -margin to nav bar
eca5147
@jimbobding
added some styling to landing page
ff7f98f
@jimbobding
Merge pull request #6 from jimbobding/feature-landingPage
151a11a 
Feature landing page
@jimbobding
used flex box to make the calorie map look better on mobile view
50f6e21
@jimbobding
used flex box to make the calorie map look better on mobile view
0e9c258
@jimbobding
used flex box to make the calorie map look better on mobile view
22ca2ca
@jimbobding
Merge branch 'dev' into feature-calorieMap
fbbdeb8
@jimbobding
Merge pull request #7 from jimbobding/feature-calorieMap
e02bd69 
Feature calorie map
@jimbobding
added form slice/selector and state tpo store?
707209d
@jimbobding
got the weight from the state form state to work globally, added test…
b8f4d16 
… component to test out state
@jimbobding
changed the inputs on the calorie form so they are now dispatching th…
c6cb7ec 
…e values to the redux store
@jimbobding
fixed mistake on name input and data type on dropdown in formstate file
48234a9
@jimbobding
parsed the dropdown to a number in distance file
0844a46
@jimbobding
Merge pull request #8 from jimbobding/feature-redux
d8f5f30 
Feature redux
jimbobding and others added 30 commits July 10, 2023 17:49
@jimbobding
Merge pull request #15 from jimbobding/feature-wayPointMap
28638d4 
Feature way point map
@jimbobding
made some css style fixes to the map and loading page
3d93c91
@jimbobding
added a server.js file and back end side of project
3dd5309
@jimbobding
added an about link to the geoform and changed all px measurment to e…
4e94ea1 
…ms on the Nav.css page
@jimbobding
added copy to landing page. added hover effects to nav bar. Changed p…
0b1a216 
…x to em on nav css
@jimbobding
added calories by minute logic
4245a13
@jimbobding
Merge pull request #16 from jimbobding/feature-smallFixes
cbbc7f7 
Feature small fixes
@jimbobding
added server.mjs file and have express connected to my database
7eadc11
@jimbobding
added routes/users.js and got my crerate api working
17af853
@jimbobding
split backend into db/model/controller/route. Got full CRUD functiona…
320b13b 
…lity working
@jimbobding
added columns for email and pic to the db aswell logic to handle it i…
deec497 
…n model and controller
@jimbobding
added columns for email and pic to the db aswell logic to handle it i…
31881b9 
…n model and controller
@jimbobding
Merge branch 'dev' into feature-login
825bedd
@jimbobding
Merge pull request #17 from jimbobding/feature-login
b81b4d4 
Feature login
@jimbobding
styled login and registration pages and gave them redirects to th ela…
c6b1d25 
…nding page
@jimbobding
Merge pull request #18 from jimbobding/feature-login
eca84b1 
styled login and registration pages and gave them redirects to th ela…
@jimbobding
used JWT tokens to persist user data when they are logged in, created…
b128bb4 
… html for modal not yet implemented the logic
@jimbobding
added logic to the modal pop up and a ternary operator for the log in…
f06ca89 
… and out button
@jimbobding
styled modal and handled logic to add user name to landing page once …
1dac809 
…they are logged in. Also deleted unused files
@jimbobding
fixed bug taht was stopping commits
8520de0
@jimbobding
commented out code in husky pre commit
f2fac9e
@jimbobding
commented out code in husky pre commit
965ea94
@jimbobding
Merge pull request #20 from jimbobding/feature-login
40d1ecf 
Feature login
@jimbobding
got rid off original profile pic codde. Fixed media queries for mobil…
caeaf4e 
…e devices
@jimbobding
added table in database for images and logic to add images path to it
fb07bd6
@jimbobding
added create and fetch/fetch by id for the image table
1d229cf
@jimbobding
fixed api call to fetch the profile picture from the database, using …
5f6406f 
…the user Id in the images table
@jimbobding
added ternery statement so that the users profile pic displays when t…
e8f6094 
…he user is logged in
@jimbobding
fixed issue with loging in, in the user controller replaced the passw…
a0ccb64 
…ord section. Fixed some small css problems
@jimbobding
Merge pull request #21 from jimbobding/feature-profilePicDisplay
c663827 
Feature profile pic display
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@jimbobding