Code

Alma#74

Code

Open

mimyal wants to merge 17 commits intoAda-C6:b/almaAda-C6/api-muncher:b/almafrom mimyal:mastermimyal/api-muncher:masterCopy head branch name to clipboard

+1,329-13

Commits

Commits on Oct 31, 2016

• Update README.md

  miriam-cortes

  authored
  babdc87

  Copy full SHA for babdc87

• Merge pull request Ada-C6#1 from miriam-cortes/master

  Show description for c2520f8
  CheezItMan

  authored
  c2520f8

  Copy full SHA for c2520f8

• created a rails app within my branch fork

  NatashaRaime

  committed
  54e22b7

  Copy full SHA for 54e22b7

Commits on Nov 1, 2016

• setting up basic routes/controllers/view for #index

  mimyal

  committed
  7965f33

  Copy full SHA for 7965f33

• added .env to .gitignore

  mimyal

  committed
  bb06c6d

  Copy full SHA for bb06c6d

• solving merging conflicts with set-up

  mimyal

  committed
  ed77898

  Copy full SHA for ed77898

• WIP setting up API. Next pass first test.

  mimyal

  committed
  b0d3253

  Copy full SHA for b0d3253

Commits on Nov 2, 2016

• list_recipe method works if method has a manipulated search string inserted

  mimyal

  committed
  a6ccdd2

  Copy full SHA for a6ccdd2

• Recipe class and APIwrapper implemented and searches can be preformed from console, some testing

  mimyal

  committed
  83bc95b

  Copy full SHA for 83bc95b

Commits on Nov 3, 2016

• Tests ensures only valid search queries get through to wrapper. List view at recipes#index set up with basic html and content. Working on pagation-search and list view.

  mimyal

  committed
  4958795

  Copy full SHA for 4958795

Commits on Nov 4, 2016

• added get_recipe method and started on recipe#show

  mimyal

  committed
  2159af6

  Copy full SHA for 2159af6

• validation tests and logic in the right places

  mimyal

  committed
  2af5dd5

  Copy full SHA for 2af5dd5

• Added some pages logic. Removed recipe#index and instead recipes#search is using '/recipes' - and tests

  mimyal

  committed
  1f8d410

  Copy full SHA for 1f8d410

• Basic Foundation added

  mimyal

  committed
  6234f04

  Copy full SHA for 6234f04

• Merge conflicts solved

  mimyal

  committed
  4b088be

  Copy full SHA for 4b088be

Commits on Nov 6, 2016

• show controller tested and has a basic view

  mimyal

  committed
  809e8ed

  Copy full SHA for 809e8ed

• Through TDD added feature to change recipe listings back and forward, and to first page

  mimyal

  committed
  b514aba

  Copy full SHA for b514aba