Code

Lauren Cardella -- Carets#29

Code

Open

enigmagnetic wants to merge 24 commits intoAda-C8:masterAda-C8/api-muncher:masterfrom enigmagnetic:masterenigmagnetic/api-muncher:masterCopy head branch name to clipboard

+3,401

Commits

Commits on Oct 31, 2017

• Initialize rails application. Add and install dotenv and httparty gems. Add .env to .gitignore.

  enigmagnetic

  committed
  d0dfc94

  Copy full SHA for d0dfc94

Commits on Nov 1, 2017

• Add copyright and attribution to footer. Create root route to search page. Create recipes controller.

  enigmagnetic

  committed
  1314df5

  Copy full SHA for 1314df5

• Add header to application html. Change heading on search page.

  enigmagnetic

  committed
  d424bbe

  Copy full SHA for d424bbe

• Add wrapper for Edamam API. Define Recipe class with initialize method.

  enigmagnetic

  committed
  7705b7c

  Copy full SHA for 7705b7c

• Add search form to search/root view. Clean up routes.

  enigmagnetic

  committed
  4da0af4

  Copy full SHA for 4da0af4

Commits on Nov 3, 2017

• Build wrapper for Edamam Api. Build recipe model.

  enigmagnetic

  committed
  ec8a701

  Copy full SHA for ec8a701

• Add routes for search form and root. Add autoload to application.rb.

  enigmagnetic

  committed
  f83d581

  Copy full SHA for f83d581

• Edit actions in recipes controller to remove search and build out index. Edit application and recipe index views. Search not returning any results.

  enigmagnetic

  committed
  8be7aa1

  Copy full SHA for 8be7aa1

Commits on Nov 4, 2017

• Got recipes index working.

  enigmagnetic

  committed
  5e1bb1a

  Copy full SHA for 5e1bb1a

Commits on Nov 5, 2017

• Add link to recipe show page. Start building show action in recipes controller.

  enigmagnetic

  committed
  f372a70

  Copy full SHA for f372a70

• Edit root path.

  enigmagnetic

  committed
  1087047

  Copy full SHA for 1087047

• Add find_recipe method to API wrapper. Add uri param to show link in index view. Build show action in recipes controller. Add uri instance variable to recipe.rb and make some info into optional var…

  Show description for e6e3601
  enigmagnetic

  committed
  e6e3601

  Copy full SHA for e6e3601

• Build recipe show page. Add health and diet labels to recipe.rb and api wrapper.

  enigmagnetic

  committed
  91ff41e

  Copy full SHA for 91ff41e

• Add will_paginate gem. Add initalizer file to allow will_paginate to use array data. Change index action to include paginate method. Add pagination to recipes index view.

  enigmagnetic

  committed
  eca6090

  Copy full SHA for eca6090

• Clean up unused routes.

  enigmagnetic

  committed
  d2bbb21

  Copy full SHA for d2bbb21

Commits on Nov 6, 2017

• Add VCR and webmock gems.

  enigmagnetic

  committed
  017f7d6

  Copy full SHA for 017f7d6

• Add require statements to test_helper. Add test files and initial tests to api wrapper tests.

  enigmagnetic

  committed
  96cb24b

  Copy full SHA for 96cb24b

• Add tests with VCR cassettes for recipes controller, recipe model, and api wrapper.

  enigmagnetic

  committed
  e18018c

  Copy full SHA for e18018c

• Configure VCR in test helper. Create and migrate database.

  enigmagnetic

  committed
  ef276cf

  Copy full SHA for ef276cf

• Add show page styling.

  enigmagnetic

  committed
  5b60905

  Copy full SHA for 5b60905

• Style index page.

  enigmagnetic

  committed
  2bf2039

  Copy full SHA for 2bf2039

• Possible fix for heroku depoyment error.

  enigmagnetic

  committed
  0d9a65c

  Copy full SHA for 0d9a65c

• Heroku deploy fix did not work.

  enigmagnetic

  committed
  fe2516f

  Copy full SHA for fe2516f

• Fix application css for heroku deployment.

  enigmagnetic

  committed
  2ab368b

  Copy full SHA for 2ab368b