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

feat: Nutrition Game #70 #114

Draft
wants to merge 33 commits into
base: master
Choose a base branch
from
Draft

feat: Nutrition Game #70 #114

wants to merge 33 commits into from

Commits on Jul 28, 2022

  1. bug: shortCut issue solved

    @Shmigolk
    Shmigolk committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    c7043b9 View commit details
    Browse the repository at this point in the history

  2. UI: add settings icon and moved links in NavBar to the right

    @Shmigolk
    Shmigolk committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    9c92737 View commit details
    Browse the repository at this point in the history

  3. UI: align pictures and add gap

    @Shmigolk
    Shmigolk committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    d0149e2 View commit details
    Browse the repository at this point in the history

  4. UI: add settings icon and moved links in NavBar to the right

    @Shmigolk
    Shmigolk committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    4529d8b View commit details
    Browse the repository at this point in the history

  5. UI: align pictures and add gap

    @Shmigolk
    Shmigolk committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    0df05c0 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2022

  1. UI: create table component

    @Shmigolk
    Shmigolk committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    c89e1f2 View commit details
    Browse the repository at this point in the history

  2. UI: add media queueueueueueury

    @Shmigolk
    Shmigolk committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    3a5bd0d View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2022

  1. fix: add controlled input

    @Shmigolk
    Shmigolk committed Jul 31, 2022
    Configuration menu
    Copy the full SHA
    9412b2c View commit details
    Browse the repository at this point in the history

  2. fix: add controlled input

    @Shmigolk
    Shmigolk committed Jul 31, 2022
    Configuration menu
    Copy the full SHA
    d36a119 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2022

  1. Merge remote-tracking branch 'upstream/master' into nutrition 

    # Conflicts:
#	.gitignore
#	src/components/ResponsiveAppBar.jsx
#	src/pages/questions/ProductInformation.jsx
    @Shmigolk
    Shmigolk committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    ce50230 View commit details
    Browse the repository at this point in the history

  2. feature: change the code of additional nutr

    @Shmigolk
    Shmigolk committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    93d4b4e View commit details
    Browse the repository at this point in the history

  3. feature: implement adding nutriments to the table

    @Shmigolk
    Shmigolk committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    fe21b02 View commit details
    Browse the repository at this point in the history

  4. feature: implement adding nutriments to the table and removing them f… 

    …rom addition nutriments
    @Shmigolk
    Shmigolk committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    a674dfd View commit details
    Browse the repository at this point in the history

  5. feature: add delete icons and implement deleting nutriments from the … 

    …table
    @Shmigolk
    Shmigolk committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    630f0ef View commit details
    Browse the repository at this point in the history

  6. feature: add Title and the description of the product (hardcoded)

    @Shmigolk
    Shmigolk committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    257bd35 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2022

  1. feature: get data from API. Display picture

    @Shmigolk
    Shmigolk committed Aug 2, 2022
    Configuration menu
    Copy the full SHA
    cb1e486 View commit details
    Browse the repository at this point in the history

  2. feature: make clickHandler shorter

    @Shmigolk
    Shmigolk committed Aug 2, 2022
    Configuration menu
    Copy the full SHA
    ecd4f07 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2022

  1. feature: move nutriments arraus out of the component. Refresh the tab… 

    …le when click SKIP or VALIDATE
    @Shmigolk
    Shmigolk committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    fb90329 View commit details
    Browse the repository at this point in the history

  2. feature: replace useEffect with React.useEffect

    @Shmigolk
    Shmigolk committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    b952bc4 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2022

  1. feature: restructure Table component. Make TableRowComp

    @Shmigolk
    Shmigolk committed Aug 9, 2022
    Configuration menu
    Copy the full SHA
    7d36892 View commit details
    Browse the repository at this point in the history

  2. feature: now delete icon toggle display property

    @Shmigolk
    Shmigolk committed Aug 9, 2022
    Configuration menu
    Copy the full SHA
    b179515 View commit details
    Browse the repository at this point in the history

  3. feature: now delete icon toggle display property

    @Shmigolk
    Shmigolk committed Aug 9, 2022
    Configuration menu
    Copy the full SHA
    cb6e2c2 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/master' into nutrition

    @alexfauquette
    alexfauquette committed Aug 9, 2022
    Configuration menu
    Copy the full SHA
    089d9df View commit details
    Browse the repository at this point in the history

  5. remove unused import

    @alexfauquette
    alexfauquette committed Aug 9, 2022
    Configuration menu
    Copy the full SHA
    79d4643 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2022

  1. feature: now i18n works into the table

    @Shmigolk
    Shmigolk committed Aug 11, 2022
    Configuration menu
    Copy the full SHA
    9b873e3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into nutrition

    @Shmigolk
    Shmigolk committed Aug 11, 2022
    Configuration menu
    Copy the full SHA
    10f5d56 View commit details
    Browse the repository at this point in the history

  3. feature: add keys to common json and en json

    @Shmigolk
    Shmigolk committed Aug 11, 2022
    Configuration menu
    Copy the full SHA
    0add0f0 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/nutrition' into nutrition

    @Shmigolk
    Shmigolk committed Aug 11, 2022
    Configuration menu
    Copy the full SHA
    93e7719 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2022

  1. feature: display correct properties in select elements

    @Shmigolk
    Shmigolk committed Aug 12, 2022
    Configuration menu
    Copy the full SHA
    79764f1 View commit details
    Browse the repository at this point in the history

  2. feature: on change is working

    @Shmigolk
    Shmigolk committed Aug 12, 2022
    Configuration menu
    Copy the full SHA
    ae0bffe View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2022

  1. UI: fixed width problem

    @Shmigolk
    Shmigolk committed Aug 13, 2022
    Configuration menu
    Copy the full SHA
    30be061 View commit details
    Browse the repository at this point in the history

  2. UI: change the order of elements of productCard and add temporary bor… 

    …ders

feature: log into the console array of nutriments that we want to send to the server
    @Shmigolk
    Shmigolk committed Aug 13, 2022
    Configuration menu
    Copy the full SHA
    7214c83 View commit details
    Browse the repository at this point in the history

  3. bug: fix onChange handler bug

    @Shmigolk
    Shmigolk committed Aug 13, 2022
    Configuration menu
    Copy the full SHA
    d19a758 View commit details
    Browse the repository at this point in the history