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

Nutrition Tracker Feature #36

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open

Nutrition Tracker Feature #36

wants to merge 21 commits into from

Commits on Nov 11, 2020

  1. Added I Ate This switch

    Mohamed Abdelhamid authored and Mohamed Abdelhamid committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    f183bf4 View commit details
    Browse the repository at this point in the history

  2. Created consumed calories table def. and nutrition tracking frontend

    Mohamed Abdelhamid authored and Mohamed Abdelhamid committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    607f7ac View commit details
    Browse the repository at this point in the history

  3. fixing merge conflicts

    Mohamed Abdelhamid authored and Mohamed Abdelhamid committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    1a54ddd View commit details
    Browse the repository at this point in the history

  4. Fixing merge conflicts

    Mohamed Abdelhamid authored and Mohamed Abdelhamid committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    1e68b09 View commit details
    Browse the repository at this point in the history

  5. Fixing merge conflicts

    Mohamed Abdelhamid authored and Mohamed Abdelhamid committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    20b0d3f View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2020

  1. Work in progress on migrating consumed recipes table to DB

    Mohamed Abdelhamid authored and Mohamed Abdelhamid committed Nov 12, 2020
    Configuration menu
    Copy the full SHA
    00d0bec View commit details
    Browse the repository at this point in the history

  2. Created consumed recipes table

    Mohamed Abdelhamid authored and Mohamed Abdelhamid committed Nov 12, 2020
    Configuration menu
    Copy the full SHA
    150786c View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2020

  1. Merge branch 'master' of https://github.com/ECE444-2020Fall/project1-… 

    …webapp-group6-importteamname-1 into m.abdelhamid

Pulling from master
    Mohamed Abdelhamid authored and Mohamed Abdelhamid committed Nov 14, 2020
    Configuration menu
    Copy the full SHA
    10f0e14 View commit details
    Browse the repository at this point in the history

  2. Created methods to add, delete, and retrieve recipes from consumed re… 

    …cipe table
    Mohamed Abdelhamid authored and Mohamed Abdelhamid committed Nov 14, 2020
    Configuration menu
    Copy the full SHA
    a4c5f66 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/ECE444-2020Fall/project1-… 

    …webapp-group6-importteamname-1 into m.abdelhamid

Resolving merge conflicts with master
    Mohamed Abdelhamid authored and Mohamed Abdelhamid committed Nov 14, 2020
    Configuration menu
    Copy the full SHA
    c51b318 View commit details
    Browse the repository at this point in the history

  4. Changed switch component name to RecipeConsumedToggle and added it to… 

    … dedicated folder
    Mohamed Abdelhamid authored and Mohamed Abdelhamid committed Nov 14, 2020
    Configuration menu
    Copy the full SHA
    a9394e4 View commit details
    Browse the repository at this point in the history

  5. Added nutrition info aggregation function and corrected variable name… 

    … in get_consumed_recipe for loop
    Mohamed Abdelhamid authored and Mohamed Abdelhamid committed Nov 14, 2020
    Configuration menu
    Copy the full SHA
    3edaf84 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2020

  1. Combined the retrieve consumed recipes and calculate nutrition facts … 

    …functions
    Mohamed Abdelhamid authored and Mohamed Abdelhamid committed Nov 15, 2020
    Configuration menu
    Copy the full SHA
    8746f64 View commit details
    Browse the repository at this point in the history

  2. Fixing merge conflicts with master

    Mohamed Abdelhamid authored and Mohamed Abdelhamid committed Nov 15, 2020
    Configuration menu
    Copy the full SHA
    06a0440 View commit details
    Browse the repository at this point in the history

  3. Removed nutrition facts total endpoint in server.py

    Mohamed Abdelhamid authored and Mohamed Abdelhamid committed Nov 15, 2020
    Configuration menu
    Copy the full SHA
    04c16b6 View commit details
    Browse the repository at this point in the history

  4. Implemented the frontend/Javascript component for the nutrition track… 

    …er feature
    Mohamed Abdelhamid authored and Mohamed Abdelhamid committed Nov 15, 2020
    Configuration menu
    Copy the full SHA
    9c391ad View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/ECE444-2020Fall/project1-… 

    …webapp-group6-importteamname-1 into m.abdelhamid

Merging from master
    Mohamed Abdelhamid authored and Mohamed Abdelhamid committed Nov 15, 2020
    Configuration menu
    Copy the full SHA
    14fe272 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2020

  1. Fixed syntax errors in backend

    Mohamed Abdelhamid authored and Mohamed Abdelhamid committed Nov 16, 2020
    Configuration menu
    Copy the full SHA
    3dbb61a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/ECE444-2020Fall/project1-… 

    …webapp-group6-importteamname-1 into m.abdelhamid

Merging from master
    Mohamed Abdelhamid authored and Mohamed Abdelhamid committed Nov 16, 2020
    Configuration menu
    Copy the full SHA
    2bf3a2c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/ECE444-2020Fall/project1-… 

    …webapp-group6-importteamname-1 into m.abdelhamid

Merging from master
    Mohamed Abdelhamid authored and Mohamed Abdelhamid committed Nov 16, 2020
    Configuration menu
    Copy the full SHA
    f58bb5e View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2020

  1. Fixed bugs with the nutrition tracker feature

    Mohamed Abdelhamid authored and Mohamed Abdelhamid committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    9f14ddb View commit details
    Browse the repository at this point in the history