Code

Mary Morrison#79

Code

Open

morrime wants to merge 18 commits intoAda-C6:b/mem/masterAda-C6/api-muncher:b/mem/masterfrom morrime:b/mem/mastermorrime/api-muncher:b/mem/masterCopy head branch name to clipboard

+143,678-10

Commits

Commits on Nov 1, 2016

• added coverage, added test helper gems to gemfile, added edamam_api_wrapper.rb to lib, and created test file for it under test/lib/edamam_api_wrapper_test.rb, started self.listrecipes class method,…

  Show description for ed8bb2f
  morrime

  committed
  ed8bb2f

• added gem 'foundation-rails' to gemfile, added folder app/assets/stylesheets/css with contents app.css, foundation.css, and foundation.min.css, bundle installed

  morrime

  committed
  68a651f

• generated pages controller, created index view page for pages, created lib/recipe.rb, embellished listrecipes class method in lib/edamam_api_wrapper.rb

  morrime

  committed
  966e920

Commits on Nov 2, 2016

• did lots of things without commiting...oops. Was able to pull in api name/label info, now working on getting everything else.

  morrime

  committed
  c57181c

• fixed initialize method, all required info now coming in through the class method listrecipes()

  morrime

  committed
  f4a73bd

• made show page and show action, added 'rails' to line 2 of test_helper and added Minitest::Reporters.use!

  morrime

  committed
  6f003c9

• added binding of caller gem, have index page that search page directs to, is working and giving 10 recipes, but it's giving ALL info instead of just the recipe label/name

  morrime

  committed
  bae2d7b

Commits on Nov 4, 2016

• moved foundation stuff up one level so now it actually works, added pagination gem, added yield option from api to model initialize method, created show page - totally working, woot woot

  morrime

  committed
  23c9fb9

Commits on Nov 7, 2016

• cleaned up routes, added back functionality to show page, links to last search page, pagination working

  morrime

  committed
  c9d5c54

• added pagination to bottom of search results page in addition to top

  morrime

  committed
  e8a5b3b

• created header, switched around layout of pagination and placed in header and footer of index page

  morrime

  committed
  05c5281

• fixed indentation

  morrime

  committed
  3564bbc

• changed containers for links to nav, more semantic

  morrime

  committed
  51568c6

• added gem 'rails-controller-testing' to gemfile because terminal told me to; made controller tests and cleaned up unneccessary lines in controller, so skinny...

  morrime

  committed
  0fcc202

• controller tests and recipe model tests, also added main tag in application.html.erb because semantics

  morrime

  committed
  8ceb6b6

• css and stuff. as pretty as it's gonna get

  morrime

  committed
  e317821

• fixed copyright formatting

  morrime

  committed
  20287ae

Commits on Nov 13, 2016

• fixed vcr issue

  morrime

  committed
  ae6edc4