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

Add energy and kcal values to ingredient logging/adding forms #585

Merged
merged 8 commits into from
May 24, 2024
Merged

Add energy and kcal values to ingredient logging/adding forms #585

merged 8 commits into from
May 24, 2024

Commits on May 23, 2024

  1. cleaner way to show line of macros

    @Dieterbe
    Dieterbe committed May 23, 2024
    Configuration menu
    Copy the full SHA
    5ae30e6 View commit details
    Browse the repository at this point in the history

  2. small refactor

    @Dieterbe
    Dieterbe committed May 23, 2024
    Configuration menu
    Copy the full SHA
    ad4543f View commit details
    Browse the repository at this point in the history

  3. show reminder of macro's on ingredient tiles

    @Dieterbe
    Dieterbe committed May 23, 2024
    Configuration menu
    Copy the full SHA
    63d3717 View commit details
    Browse the repository at this point in the history

  4. convert form to stateful, show ingredient preview

    @Dieterbe
    Dieterbe committed May 23, 2024
    Configuration menu
    Copy the full SHA
    1c84d91 View commit details
    Browse the repository at this point in the history

  5. get ready to support showing images in the ingredient preview 

    note: the image doesn't seem to
be set yet, but at least the UI is now ready for it
    @Dieterbe
    Dieterbe committed May 23, 2024
    Configuration menu
    Copy the full SHA
    58122d4 View commit details
    Browse the repository at this point in the history

  6. unify IngredientLogForm and MealItemForm

    @Dieterbe
    Dieterbe committed May 23, 2024
    Configuration menu
    Copy the full SHA
    7400235 View commit details
    Browse the repository at this point in the history

  7. fix tests

    @Dieterbe
    Dieterbe committed May 23, 2024
    Configuration menu
    Copy the full SHA
    d4d298a View commit details
    Browse the repository at this point in the history

  8. add note

    @Dieterbe
    Dieterbe committed May 23, 2024
    Configuration menu
    Copy the full SHA
    eeec221 View commit details
    Browse the repository at this point in the history