Code

Maya Wang's otter-muncher#75

Code

Open

mayawang wants to merge 52 commits intoAda-C6:masterAda-C6/api-muncher:masterfrom mayawang:mastermayawang/api-muncher:masterCopy head branch name to clipboard

+5,790

Commits

Commits on Oct 31, 2016

• created new rails. add better_error gem to Gemfile

  

  Maya Wang

  committed
  99b8364

  Copy full SHA for 99b8364

• Merge pull request #1 from mayawang/mw_baseline

  Show description for c5d4eb1
  

  Maya Wang

  authored
  c5d4eb1

  Copy full SHA for c5d4eb1

• add awesome_print gem and api gems

  

  Maya Wang

  committed
  3b6d553

  Copy full SHA for 3b6d553

• Merge pull request #2 from mayawang/mw_baseline

  Show description for d09523a
  

  Maya Wang

  authored
  d09523a

  Copy full SHA for d09523a

• create rs_api_wrapper.rb in lib and search method as helper

  

  Maya Wang

  committed
  ebac1f1

  Copy full SHA for ebac1f1

• created homepages controller

  

  Maya Wang

  committed
  d9380f6

  Copy full SHA for d9380f6

• set up application.rb

  

  Maya Wang

  committed
  1ecfa59

  Copy full SHA for 1ecfa59

Commits on Nov 1, 2016

• complete recipe search api

  

  Maya Wang

  committed
  5fd34e3

  Copy full SHA for 5fd34e3

• create recipe model

  

  Maya Wang

  committed
  d95064d

  Copy full SHA for d95064d

• remove extra call to search api

  

  Maya Wang

  committed
  55028d6

  Copy full SHA for 55028d6

• Merge remote-tracking branch 'origin/master' into mw_search

  

  Maya Wang

  committed
  79315b0

  Copy full SHA for 79315b0

• completed search mvc logic, show recipe with label, image and link to details

  

  Maya Wang

  committed
  8a52dbb

  Copy full SHA for 8a52dbb

• Merge pull request #3 from mayawang/mw_search

  Show description for f71c546
  

  Maya Wang

  authored
  f71c546

  Copy full SHA for f71c546

• add foundation for css

  

  Maya Wang

  committed
  f77e1e2

  Copy full SHA for f77e1e2

Commits on Nov 2, 2016

• add pagination on list show. show + 5 and -5 pages, handle empty pages. result count and last_page not ideal. can improve later

  

  Maya Wang

  committed
  38898a5

  Copy full SHA for 38898a5

• comment out puts in api homepage countroller

  

  Maya Wang

  committed
  fef24c3

  Copy full SHA for fef24c3

• Merge pull request #4 from mayawang/mw_list_view

  Show description for ee958ef
  

  Maya Wang

  authored
  ee958ef

  Copy full SHA for ee958ef

• complete show individual recipe with label, image and link to original recipe

  

  Maya Wang

  committed
  88a53c6

  Copy full SHA for 88a53c6

• show ingredients in table

  

  Maya Wang

  committed
  4771122

  Copy full SHA for 4771122

• show diet label

  

  Maya Wang

  committed
  a56ba22

  Copy full SHA for a56ba22

• add home page button

  

  Maya Wang

  committed
  77f3338

  Copy full SHA for 77f3338

• add attribution to API in footer

  

  Maya Wang

  committed
  9eaac58

  Copy full SHA for 9eaac58

• move home link to header

  

  Maya Wang

  committed
  19f48cb

  Copy full SHA for 19f48cb

• Merge pull request #5 from mayawang/mw_show_view

  Show description for 2bdbbc2
  

  Maya Wang

  authored
  2bdbbc2

  Copy full SHA for 2bdbbc2

Commits on Nov 3, 2016

• working on limit search, add checkbox for label search, draft m(api)vc logic for diet label sample and health label sample. Does not work yet. Switch to mw_show_view to add health label to show to …

  Show description for c07e6a3
  

  Maya Wang

  committed
  c07e6a3

  Copy full SHA for c07e6a3

• add show health labels on show page

  

  Maya Wang

  committed
  e005ec7

  Copy full SHA for e005ec7

• add recipe image link to show page

  

  Maya Wang

  committed
  99734b1

  Copy full SHA for 99734b1

• handle case when no result found, hits=[]

  

  Maya Wang

  committed
  771a8ee

  Copy full SHA for 771a8ee

• complete limit search by label checkbox feature. handle case when no result found, hits=[]

  

  Maya Wang

  committed
  619605f

  Copy full SHA for 619605f

• Merge pull request #6 from mayawang/mw_limit_search

  Show description for f2fcf87
  

  Maya Wang

  authored
  f2fcf87

  Copy full SHA for f2fcf87

• Merge branch 'master' of https://github.com/mayawang/api-muncher into mw_tests

  

  Maya Wang

  committed
  89ac335

  Copy full SHA for 89ac335

• added vcr testing gem in Gemfile

  

  Maya Wang

  committed
  eb653ff

  Copy full SHA for eb653ff

• add require in test_helper

  

  Maya Wang

  committed
  68e10ae

  Copy full SHA for 68e10ae

• change require position in test_helper

  

  Maya Wang

  committed
  d3353a7

  Copy full SHA for d3353a7

Commits on Nov 4, 2016

• add column styling to search result. add back to list button on show page(need backend functionde improve). Dlete import app.css

  

  Maya Wang

  committed
  69f1eb6

  Copy full SHA for 69f1eb6

• add foundation pagination styling

  

  Maya Wang

  committed
  0a173c6

  Copy full SHA for 0a173c6

• setup header and go to back button on show page

  

  Maya Wang

  committed
  7734f3f

  Copy full SHA for 7734f3f

• set up attribution link in footer

  

  Maya Wang

  committed
  254a8ac

  Copy full SHA for 254a8ac

Commits on Nov 7, 2016

• completed css design and styling on index, search result and show pages

  

  Maya Wang

  committed
  b471102

  Copy full SHA for b471102

• fix bugs filter search feature, add more filters. improve styling on filter search view(checkboxes alignment)

  

  Maya Wang

  committed
  a1328c0

  Copy full SHA for a1328c0

• changed indentation

  

  Maya Wang

  committed
  04d1497

  Copy full SHA for 04d1497

• Merge pull request #7 from mayawang/mw_styling

  Show description for c4a73ac
  

  Maya Wang

  authored
  c4a73ac

  Copy full SHA for c4a73ac

• Updated Gemfile for Heroku

  

  Maya Wang

  committed
  2e9d261

  Copy full SHA for 2e9d261

• add APP_ID and APP_KEY into env

  

  Maya Wang

  committed
  c475b42

  Copy full SHA for c475b42

• comment out squilte

  

  Maya Wang

  committed
  8f4f4c2

  Copy full SHA for 8f4f4c2

• set config.autoload_path in production

  

  Maya Wang

  committed
  850a613

  Copy full SHA for 850a613

• add require in controller

  

  Maya Wang

  committed
  f04a627

  Copy full SHA for f04a627

• Update README.md

  

  Maya Wang

  authored
  716bfce

  Copy full SHA for 716bfce

• Update README.md

  

  Maya Wang

  authored
  16e7d44

  Copy full SHA for 16e7d44

• Update README.md

  

  Maya Wang

  authored
  bd5da50

  Copy full SHA for bd5da50

• Update README.md

  

  Maya Wang

  authored
  8661a11

  Copy full SHA for 8661a11

• Update README.md

  

  Maya Wang

  authored
  bad512b

  Copy full SHA for bad512b