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

Ari- Octos- Muncher #44

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

Ari- Octos- Muncher #44

wants to merge 21 commits into from

Commits on May 2, 2018

  1. initial rails app

    @arrriiii
    arrriiii committed May 2, 2018
    Configuration menu
    Copy the full SHA
    56eb721 View commit details
    Browse the repository at this point in the history

  2. upated gemfile and .gitignore with dotenv

    @arrriiii
    arrriiii committed May 2, 2018
    Configuration menu
    Copy the full SHA
    2899931 View commit details
    Browse the repository at this point in the history

  3. food controller and view page

    @arrriiii
    arrriiii committed May 2, 2018
    Configuration menu
    Copy the full SHA
    6e7d760 View commit details
    Browse the repository at this point in the history

  4. initial controller and api_wrapper file

    @arrriiii
    arrriiii committed May 2, 2018
    Configuration menu
    Copy the full SHA
    c6c71f8 View commit details
    Browse the repository at this point in the history

  5. new view page and controller methods

    @arrriiii
    arrriiii committed May 2, 2018
    Configuration menu
    Copy the full SHA
    d39333d View commit details
    Browse the repository at this point in the history

Commits on May 3, 2018

  1. moved recipe and wrapper class, new route for index, and css for copy… 

    …right
    @arrriiii
    arrriiii committed May 3, 2018
    Configuration menu
    Copy the full SHA
    09d46cd View commit details
    Browse the repository at this point in the history

Commits on May 4, 2018

  1. hash show page for recipes

    @arrriiii
    arrriiii committed May 4, 2018
    Configuration menu
    Copy the full SHA
    8b42fde View commit details
    Browse the repository at this point in the history

  2. uploaded images and label to view page

    @arrriiii
    arrriiii committed May 4, 2018
    Configuration menu
    Copy the full SHA
    4bdcce0 View commit details
    Browse the repository at this point in the history

  3. fixed naming conventions for controller and view

    @arrriiii
    arrriiii committed May 4, 2018
    Configuration menu
    Copy the full SHA
    5a511f3 View commit details
    Browse the repository at this point in the history

  4. Kaminari paginate gem added to controller, view and gemfile

    @arrriiii
    arrriiii committed May 4, 2018
    Configuration menu
    Copy the full SHA
    6e190b6 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2018

  1. new show page with recipe_detail method in wrapper

    @arrriiii
    arrriiii committed May 5, 2018
    Configuration menu
    Copy the full SHA
    491d8d4 View commit details
    Browse the repository at this point in the history

  2. Recipe.rb test complete

    @arrriiii
    arrriiii committed May 5, 2018
    Configuration menu
    Copy the full SHA
    ded2521 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2018

  1. new test for Edamam wrapper

    @arrriiii
    arrriiii committed May 6, 2018
    Configuration menu
    Copy the full SHA
    a4c9823 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2018

  1. updated show and controller for uri show page; test complete

    @arrriiii
    arrriiii committed May 7, 2018
    Configuration menu
    Copy the full SHA
    fdecad9 View commit details
    Browse the repository at this point in the history

  2. updated show page with image and label

    @arrriiii
    arrriiii committed May 7, 2018
    Configuration menu
    Copy the full SHA
    4cfa0ce View commit details
    Browse the repository at this point in the history

  3. fixed test with new uri info

    @arrriiii
    arrriiii committed May 7, 2018
    Configuration menu
    Copy the full SHA
    ee73447 View commit details
    Browse the repository at this point in the history

  4. updated test for recipe.rb

    @arrriiii
    arrriiii committed May 7, 2018
    Configuration menu
    Copy the full SHA
    cc554cf View commit details
    Browse the repository at this point in the history

Commits on May 8, 2018

  1. show page with ingredient list

    @arrriiii
    arrriiii committed May 8, 2018
    Configuration menu
    Copy the full SHA
    33a264d View commit details
    Browse the repository at this point in the history

  2. new css

    @arrriiii
    arrriiii committed May 8, 2018
    Configuration menu
    Copy the full SHA
    0a45da4 View commit details
    Browse the repository at this point in the history

  3. button fix on view

    @arrriiii
    arrriiii committed May 8, 2018
    Configuration menu
    Copy the full SHA
    d6e268f View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2018

  1. added key to .env file

    @arrriiii
    arrriiii committed Jun 18, 2018
    Configuration menu
    Copy the full SHA
    2b743a5 View commit details
    Browse the repository at this point in the history