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

Fix error message and API call with fetch. Fix total price value in expandable sidebar. #36

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

Fix error message and API call with fetch. Fix total price value in expandable sidebar. #36

wants to merge 46 commits into from

Commits on Jan 18, 2018

  1. Refactor DinnerModel to ES6, Implement interface methods

    @andrascodes
    andrascodes committed Jan 18, 2018
    Configuration menu
    Copy the full SHA
    7269872 View commit details
    Browse the repository at this point in the history

  2. Create layout for first Home screen

    @andrascodes
    andrascodes committed Jan 18, 2018
    Configuration menu
    Copy the full SHA
    2ab6fbf View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2018

  1. Fixed a typo in a comment

    @andrascodes
    andrascodes committed Jan 19, 2018
    Configuration menu
    Copy the full SHA
    947971e View commit details
    Browse the repository at this point in the history

  2. Add the desktop version of the dish search screen with the sidebar.

    @andrascodes
    andrascodes committed Jan 19, 2018
    Configuration menu
    Copy the full SHA
    c2dd3c8 View commit details
    Browse the repository at this point in the history

  3. Add responsive sidebar to dish search screen

    @andrascodes
    andrascodes committed Jan 19, 2018
    Configuration menu
    Copy the full SHA
    c5cf573 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2018

  1. Add Dinner Overview Confirm screen

    @andrascodes
    andrascodes committed Jan 20, 2018
    Configuration menu
    Copy the full SHA
    973417e View commit details
    Browse the repository at this point in the history

  2. Remove CSS from Confirm screen HTML and put it into the CSS file.

    @andrascodes
    andrascodes committed Jan 20, 2018
    Configuration menu
    Copy the full SHA
    d36bdae View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2018

  1. Add Dish screen and Printout screen.

    @andrascodes
    andrascodes committed Jan 21, 2018
    Configuration menu
    Copy the full SHA
    35f9610 View commit details
    Browse the repository at this point in the history

  2. Fix Collapse Sidebar on Dish screen

    @andrascodes
    andrascodes committed Jan 21, 2018
    Configuration menu
    Copy the full SHA
    97ca437 View commit details
    Browse the repository at this point in the history

  3. Improve the Dish search and select screen

    @andrascodes
    andrascodes committed Jan 21, 2018
    Configuration menu
    Copy the full SHA
    b95d057 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2018

  1. Create Welcome view and CSS in the single index.html page

    @andrascodes
    andrascodes committed Jan 22, 2018
    Configuration menu
    Copy the full SHA
    bb2f075 View commit details
    Browse the repository at this point in the history

  2. Add Welcome, DishSearch and DishDetails views into index.html

    @andrascodes
    andrascodes committed Jan 22, 2018
    Configuration menu
    Copy the full SHA
    68258fa View commit details
    Browse the repository at this point in the history

  3. Add MenuSummary/Confirm view to index.html

    @andrascodes
    andrascodes committed Jan 22, 2018
    Configuration menu
    Copy the full SHA
    c846fe7 View commit details
    Browse the repository at this point in the history

  4. Add all views into index.html

    @andrascodes
    andrascodes committed Jan 22, 2018
    Configuration menu
    Copy the full SHA
    1cfa038 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2018

  1. Add methods to display/hide view elements, connect them to buttons

    @andrascodes
    andrascodes committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    8e2811c View commit details
    Browse the repository at this point in the history

  2. Connect the initial dish search results to the model

    @andrascodes
    andrascodes committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    8b0e61e View commit details
    Browse the repository at this point in the history

  3. Added a demo link to README.md

    @andrascodes
    andrascodes committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    03e9b81 View commit details
    Browse the repository at this point in the history

  4. Add methods to display/hide the Dish Details View and connect them to… 

    … the dish results
    @andrascodes
    andrascodes committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    0c1da50 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2018

  1. Create PriceSummaryView, StatusBarView. Fix bug when going back from … 

    …recipe summary (not hiding it).
    @andrascodes
    andrascodes committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    4766b8c View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2018

  1. Add individual Views and Controllers. Complete Sidebar and Dish Searc… 

    …h features.
    @andrascodes
    andrascodes committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    21526ae View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2018

  1. Connect PriceSummary and RecipeSummary views to model.

    @andrascodes
    andrascodes committed Feb 9, 2018
    Configuration menu
    Copy the full SHA
    6201034 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2018

  1. Connected the Dish Search and Dish Details views to the model. Finish… 

    …ed the interaction in them.
    @andrascodes
    andrascodes committed Feb 10, 2018
    Configuration menu
    Copy the full SHA
    2b3aced View commit details
    Browse the repository at this point in the history

  2. Fix bug for missing controllers.

    @andrascodes
    andrascodes committed Feb 10, 2018
    Configuration menu
    Copy the full SHA
    4e6a21d View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2018

  1. Move transition functions from general state controller, to the respe… 

    …ctive controllers
    @andrascodes
    andrascodes committed Feb 12, 2018
    Configuration menu
    Copy the full SHA
    7ff0178 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2018

  1. Added apiConfig

    Nina Laribi authored and Nina Laribi committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    c570206 View commit details
    Browse the repository at this point in the history

  2. Converted getAllDishes/getDishes into Promise-based

    Nina Laribi authored and Nina Laribi committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    b84e9b9 View commit details
    Browse the repository at this point in the history

  3. Adjusted search view to work with getAllDishes() and the API

    Nina Laribi authored and Nina Laribi committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    562087e View commit details
    Browse the repository at this point in the history

  4. Remove "hard coded" dishes

    Nina Laribi authored and Nina Laribi committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    aac3613 View commit details
    Browse the repository at this point in the history

  5. Adjusted logic to support Promises

    Nina Laribi authored and Nina Laribi committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    3a3742f View commit details
    Browse the repository at this point in the history

  6. Fixed bug in API call

    Nina Laribi authored and Nina Laribi committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    4861855 View commit details
    Browse the repository at this point in the history

  7. Fixed bugs with getAllIngredients()

    Nina Laribi authored and Nina Laribi committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    ec3e1d6 View commit details
    Browse the repository at this point in the history

  8. Updated list of dish types according to API Docs

    Nina Laribi authored and Nina Laribi committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    12a945f View commit details
    Browse the repository at this point in the history

  9. Updated ingredients & dishType logic based on API Docs

    Nina Laribi authored and Nina Laribi committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    e3cfe66 View commit details
    Browse the repository at this point in the history

  10. Fixed name/price in sidebar

    Nina Laribi authored and Nina Laribi committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    f4dc6b6 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2018

  1. Attempted to address unknown types of food items

    Nina Laribi authored and Nina Laribi committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    c7e8d85 View commit details
    Browse the repository at this point in the history

  2. Added error messages on failed requests

    Nina Laribi authored and Nina Laribi committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    86de472 View commit details
    Browse the repository at this point in the history

  3. Refactor generalStateController into app.js

    @andrascodes
    andrascodes committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    e085704 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2018

  1. Uses first dishType and added interactions

    Nina Laribi authored and Nina Laribi committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    01f3399 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/andrewszucs/dinnerplanner… 

    …-html
    Nina Laribi authored and Nina Laribi committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    fc22055 View commit details
    Browse the repository at this point in the history

  3. Added alert to homepage

    Nina Laribi authored and Nina Laribi committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    b983bae View commit details
    Browse the repository at this point in the history

  4. Fixed bug in dinnerModel

    Nina Laribi authored and Nina Laribi committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    5ccafe4 View commit details
    Browse the repository at this point in the history

  5. Added full list of new categories

    Nina Laribi authored and Nina Laribi committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    ea4c743 View commit details
    Browse the repository at this point in the history

  6. Fixed image size on recipe summary view

    Nina Laribi authored and Nina Laribi committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    018678c View commit details
    Browse the repository at this point in the history

  7. No longer displays alerts

    Nina Laribi authored and Nina Laribi committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    7fad079 View commit details
    Browse the repository at this point in the history

  8. Add catch-statement to getDish

    Nina Laribi authored and Nina Laribi committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    82ed724 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2018

  1. Fix error message when no network. Fix totalPriceValue in expandable … 

    …sidebar.
    @andrascodes
    andrascodes committed Feb 27, 2018
    Configuration menu
    Copy the full SHA
    7e5f21b View commit details
    Browse the repository at this point in the history