Nutrition Tracker Feature#36

Open

abdelhamidm wants to merge 21 commits intomasterfrom

Commits on Nov 11, 2020

Added I Ate This switch

Mohamed Abdelhamid
authored and
Mohamed Abdelhamid
committed
Created consumed calories table def. and nutrition tracking frontend

Mohamed Abdelhamid
authored and
Mohamed Abdelhamid
committed
fixing merge conflicts

Mohamed Abdelhamid
authored and
Mohamed Abdelhamid
committed
Fixing merge conflicts

Mohamed Abdelhamid
authored and
Mohamed Abdelhamid
committed
Fixing merge conflicts

Mohamed Abdelhamid
authored and
Mohamed Abdelhamid
committed

Commits on Nov 12, 2020

Work in progress on migrating consumed recipes table to DB

Mohamed Abdelhamid
authored and
Mohamed Abdelhamid
committed
Created consumed recipes table

Mohamed Abdelhamid
authored and
Mohamed Abdelhamid
committed

Commits on Nov 14, 2020

Merge branch 'master' of https://github.com/ECE444-2020Fall/project1-webapp-group6-importteamname-1 into m.abdelhamid

Mohamed Abdelhamid
authored and
Mohamed Abdelhamid
committed
Created methods to add, delete, and retrieve recipes from consumed recipe table

Mohamed Abdelhamid
authored and
Mohamed Abdelhamid
committed
Merge branch 'master' of https://github.com/ECE444-2020Fall/project1-webapp-group6-importteamname-1 into m.abdelhamid

Mohamed Abdelhamid
authored and
Mohamed Abdelhamid
committed
Changed switch component name to RecipeConsumedToggle and added it to dedicated folder

Mohamed Abdelhamid
authored and
Mohamed Abdelhamid
committed
Added nutrition info aggregation function and corrected variable name in get_consumed_recipe for loop

Mohamed Abdelhamid
authored and
Mohamed Abdelhamid
committed

Commits on Nov 15, 2020

Combined the retrieve consumed recipes and calculate nutrition facts functions

Mohamed Abdelhamid
authored and
Mohamed Abdelhamid
committed
Fixing merge conflicts with master

Mohamed Abdelhamid
authored and
Mohamed Abdelhamid
committed
Removed nutrition facts total endpoint in server.py

Mohamed Abdelhamid
authored and
Mohamed Abdelhamid
committed
Implemented the frontend/Javascript component for the nutrition tracker feature

Mohamed Abdelhamid
authored and
Mohamed Abdelhamid
committed
Merge branch 'master' of https://github.com/ECE444-2020Fall/project1-webapp-group6-importteamname-1 into m.abdelhamid

Mohamed Abdelhamid
authored and
Mohamed Abdelhamid
committed

Commits on Nov 16, 2020

Fixed syntax errors in backend

Mohamed Abdelhamid
authored and
Mohamed Abdelhamid
committed
Merge branch 'master' of https://github.com/ECE444-2020Fall/project1-webapp-group6-importteamname-1 into m.abdelhamid

Mohamed Abdelhamid
authored and
Mohamed Abdelhamid
committed
Merge branch 'master' of https://github.com/ECE444-2020Fall/project1-webapp-group6-importteamname-1 into m.abdelhamid

Mohamed Abdelhamid
authored and
Mohamed Abdelhamid
committed

Commits on Nov 17, 2020

Fixed bugs with the nutrition tracker feature

Mohamed Abdelhamid
authored and
Mohamed Abdelhamid
committed