Code

Lauren_Sky (b/sky/master)#72

Code

Open

LaurenSky wants to merge 21 commits intoAda-C6:b/sky/masterAda-C6/api-muncher:b/sky/masterfrom LaurenSky:b/sky/masterLaurenSky/api-muncher:b/sky/masterCopy head branch name to clipboard

+49,479-74

Commits

Commits on Nov 1, 2016

• added edamam_api_wrapper.rb & added lib link in config/app & added id and key to .env

  LaurenSky

  committed
  68893f5

  Copy full SHA for 68893f5

• added api_wrapper and recipe code and some tests... need to still work on Recipe_test.rb

  LaurenSky

  committed
  943d81b

  Copy full SHA for 943d81b

Commits on Nov 3, 2016

• wrote Recipes controller and test, created show and index views

  LaurenSky

  committed
  42979bc

  Copy full SHA for 42979bc

• removed sourceIcon and updated class name in helper file

  LaurenSky

  committed
  2c8d1e6

  Copy full SHA for 2c8d1e6

• added foundation and some css styling

  LaurenSky

  committed
  416202e

  Copy full SHA for 416202e

• added will-paginate gem & added count to apiwrapper & added page links to index.html & changed :label to :uri for routes and unique signifier for sesarch by uri instead of label

  LaurenSky

  committed
  0977dd4

  Copy full SHA for 0977dd4

Commits on Nov 4, 2016

• worked on foundatoin and added no match error message

  LaurenSky

  committed
  fe47333

  Copy full SHA for fe47333

• foundation and css styling added more tests to recipe controller

  LaurenSky

  committed
  71fd6f9

  Copy full SHA for 71fd6f9

• finalized styling and foundation for forms and pages

  LaurenSky

  committed
  80ed95b

  Copy full SHA for 80ed95b

• added only 10 per page for pagination

  LaurenSky

  committed
  e0476f9

  Copy full SHA for e0476f9

• styling got messed up

  LaurenSky

  committed
  edc38ab

  Copy full SHA for edc38ab

Commits on Nov 7, 2016

• foundation updates

  LaurenSky

  committed
  8eb0608

  Copy full SHA for 8eb0608

• change to 12/page from 10/page on index

  LaurenSky

  committed
  693ff3e

  Copy full SHA for 693ff3e

Commits on Nov 14, 2016

• added section to tst_helper to remove token info from vcr

  LaurenSky

  committed
  98df7b9

  Copy full SHA for 98df7b9

Commits on May 11, 2017

• changed page name

  LaurenSky

  committed
  16e6d30

  Copy full SHA for 16e6d30

• updated gemfile

  LaurenSky

  committed
  2900053

  Copy full SHA for 2900053

Commits on May 25, 2017

• added postgress to gemfile

  LaurenSky

  committed
  14d03be

  Copy full SHA for 14d03be

• commented out sqlite3

  LaurenSky

  committed
  2bc47f6

  Copy full SHA for 2bc47f6

• commented out sqlite3

  LaurenSky

  committed
  9bc7bb4

  Copy full SHA for 9bc7bb4

• update comments in gemfile

  LaurenSky

  committed
  964e3ca

  Copy full SHA for 964e3ca

• updated config/env/production config.assets.compile to true

  LaurenSky

  committed
  ea6f363

  Copy full SHA for ea6f363