Code

Brenda Rios - API-Muncher - Octos#25

Code

Open

brendarios wants to merge 51 commits intoAda-C9:masterAda-C9/api-muncher:masterfrom brendarios:masterbrendarios/api-muncher:masterCopy head branch name to clipboard

+115,493

Commits

Commits on May 2, 2018

• Created rails folders.

  brendarios

  committed
  0386a3e

  Copy full SHA for 0386a3e

• Created edamam api wrapper file and a recipe file in lib.

  brendarios

  committed
  8020aec

  Copy full SHA for 8020aec

• Added .env file with id and key and added .env in the .gitignore file.

  brendarios

  committed
  8341317

  Copy full SHA for 8341317

• Added line of config.autoload_paths to file application.rb

  brendarios

  committed
  3b1ffad

  Copy full SHA for 3b1ffad

• Added routes and created recipes controller plus view files.

  brendarios

  committed
  55f771d

  Copy full SHA for 55f771d

Commits on May 5, 2018

• Added gem Kaminari for pagination.

  brendarios

  committed
  9562e05

  Copy full SHA for 9562e05

• Refactored controllers.

  brendarios

  committed
  7ebb57d

  Copy full SHA for 7ebb57d

• Refactored lib files to show recipes.

  brendarios

  committed
  0111f6b

  Copy full SHA for 0111f6b

• Modified views to be able to see recipes.

  brendarios

  committed
  3d5e6c9

  Copy full SHA for 3d5e6c9

• Routes working.

  brendarios

  committed
  4057b57

  Copy full SHA for 4057b57

• Added lines in the test helper to hide the api key and api kid

  brendarios

  committed
  c2cc579

  Copy full SHA for c2cc579

• cleaning controller.

  brendarios

  committed
  a4e892b

  Copy full SHA for a4e892b

• Deleted a gem

  brendarios

  committed
  590aecd

  Copy full SHA for 590aecd

• Updated gem

  brendarios

  committed
  26576b1

  Copy full SHA for 26576b1

• Changed line name

  brendarios

  committed
  8a245c0

  Copy full SHA for 8a245c0

• Trying to fix the deployment.

  brendarios

  committed
  93a3f3c

  Copy full SHA for 93a3f3c

• Added flash message in controller and in the views

  brendarios

  committed
  c0bc0a3

  Copy full SHA for c0bc0a3

• Trying to do tests.

  brendarios

  committed
  b9f47e5

  Copy full SHA for b9f47e5

• refactoring tests.

  brendarios

  committed
  f2b11c2

  Copy full SHA for f2b11c2

• Created form file for search bar

  brendarios

  committed
  d6d32f4

  Copy full SHA for d6d32f4

• Adding styling to the app.

  brendarios

  committed
  d822183

  Copy full SHA for d822183

• Updated gem file

  brendarios

  committed
  7e66ee7

  Copy full SHA for 7e66ee7

• modified gems.

  brendarios

  committed
  1f8b479

  Copy full SHA for 1f8b479

• Cleaning gems file

  brendarios

  committed
  8a76686

  Copy full SHA for 8a76686

• Continued adding styling.

  brendarios

  committed
  ba2990f

  Copy full SHA for ba2990f

• Trying to fix deployemnt.

  brendarios

  committed
  84e23d5

  Copy full SHA for 84e23d5

• Changed application configuration.

  brendarios

  committed
  421928d

  Copy full SHA for 421928d

• removing require pry

  brendarios

  committed
  30b8cfa

  Copy full SHA for 30b8cfa

• Solved the problem that was not allowing me to run the tests.

  brendarios

  committed
  117ac5d

  Copy full SHA for 117ac5d

• fixing again deployment issues.

  brendarios

  committed
  5d38291

  Copy full SHA for 5d38291

• Tests for class recipe.rb passing

  brendarios

  committed
  f2f9c80

  Copy full SHA for f2f9c80

• Tests for recipes controller are passing.

  brendarios

  committed
  e532223

  Copy full SHA for e532223

• Cleaninun up tests. All passing =)

  brendarios

  committed
  219f9f8

  Copy full SHA for 219f9f8

• Adding styling.

  brendarios

  committed
  9971730

  Copy full SHA for 9971730

• wondering why heroku didnt take my styling of the homepage.

  brendarios

  committed
  7a19ac4

  Copy full SHA for 7a19ac4

Commits on May 6, 2018

• Trying to fix why heroku does not update the CSS

  brendarios

  committed
  aecc5b8

  Copy full SHA for aecc5b8

• Still trying to fix assets issue with heroku

  brendarios

  committed
  18501db

  Copy full SHA for 18501db

• Going back, not working assets on heroku.

  brendarios

  committed
  4b0737a

  Copy full SHA for 4b0737a

• Working on css and trying to deploy.

  brendarios

  committed
  f58b2d7

  Copy full SHA for f58b2d7

• working on css and tryin to deploy them

  brendarios

  committed
  f9f0e00

  Copy full SHA for f9f0e00

• I think now heroku is taking care of my css.

  brendarios

  committed
  91eff5d

  Copy full SHA for 91eff5d

Commits on May 7, 2018

• Adding more css now that heroku is taking it.

  brendarios

  committed
  d0d93fe

  Copy full SHA for d0d93fe

• trying to upload background image to heroku.

  brendarios

  committed
  2d24f20

  Copy full SHA for 2d24f20

• Still trying to upload image to heroku.

  brendarios

  committed
  e3b90dd

  Copy full SHA for e3b90dd

• Added css to the show page. Heroku likes my background image now.

  brendarios

  committed
  0679931

  Copy full SHA for 0679931

• Last changes of styling.

  brendarios

  committed
  357cdea

  Copy full SHA for 357cdea

• Cleaning files.

  brendarios

  committed
  d41277b

  Copy full SHA for d41277b

Commits on May 19, 2018

• Improved media screen view for phones.

  brendarios

  committed
  6125e85

  Copy full SHA for 6125e85

• improving mobile views.

  brendarios

  committed
  f6a41ef

  Copy full SHA for f6a41ef

• Mobile view improved.

  brendarios

  committed
  c448ad4

  Copy full SHA for c448ad4

• changing background.

  brendarios

  committed
  2b52503

  Copy full SHA for 2b52503