Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stef -- Carets #27

Open
wants to merge 40 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
f3efb6f
Initial Commit.
SesameSeeds Nov 1, 2017
e419b6f
Gem better_errors added.
SesameSeeds Nov 1, 2017
01397c7
.ENV created, added to .gitignore, and api wrapper started.
SesameSeeds Nov 1, 2017
f63896a
Addition of recipes controller.
SesameSeeds Nov 2, 2017
404fa24
Added routes, updated api_wrapper, started controller pseudocode test…
SesameSeeds Nov 3, 2017
04aa27d
Move app/channels/assets to app/assets
SesameSeeds Nov 3, 2017
4e423ff
Fixed foundation version, installed (thanks Charles), added lib file …
SesameSeeds Nov 3, 2017
20cc1eb
Updated API wrapper to get list of recipes.
SesameSeeds Nov 4, 2017
6893fc8
Finished list method, working on show method.
SesameSeeds Nov 4, 2017
669b34e
Updated self method, still recieving error.
SesameSeeds Nov 4, 2017
3d9e509
Updated show method with encode.
SesameSeeds Nov 4, 2017
7cc82de
Show method now working, yay.
SesameSeeds Nov 4, 2017
e6cbfc4
Working on controller and views, added favicon.
SesameSeeds Nov 4, 2017
ada5c0f
Working through creating tests.
SesameSeeds Nov 4, 2017
e7a18ad
Updated controller to reflect 10 not 12 items, reading is still a cha…
SesameSeeds Nov 4, 2017
5357d03
Controller updated with proper methods being called.
SesameSeeds Nov 4, 2017
bdfb375
Working with views, currently too large to render...
SesameSeeds Nov 5, 2017
92e1bd8
List view in progress, now showing photos.
SesameSeeds Nov 5, 2017
5c9fa0b
Updated params and show views. Basic things now working on all paths.
SesameSeeds Nov 6, 2017
ab727d2
Views complete and working.
SesameSeeds Nov 6, 2017
bb0521a
Removed home page, updated application.html.erb to reflect needs of h…
SesameSeeds Nov 6, 2017
ccd8aae
Creation of logo, re-addition of placeholder home page due to errors.
SesameSeeds Nov 6, 2017
399ce7a
Some styling added.
SesameSeeds Nov 6, 2017
c1e4f75
Tests written but database failure, unsure if they pass or why I am r…
SesameSeeds Nov 6, 2017
5e77332
Very basic styling done.
SesameSeeds Nov 6, 2017
4eeeb28
Small updates.
SesameSeeds Nov 6, 2017
6aea894
Testing gems and missing info added to run tests.
SesameSeeds Nov 6, 2017
15ff149
Pagination is now working.
SesameSeeds Nov 6, 2017
3b928f7
Update to API Wrapper.
SesameSeeds Nov 6, 2017
5b3dd5e
Removed unnecessary divs to make html more semantic.
SesameSeeds Nov 6, 2017
2910d97
Footer now on bottom properly on every page.
SesameSeeds Nov 6, 2017
b80c3cf
Minor styling updates.
SesameSeeds Nov 7, 2017
a64215a
Styling nearly finished.
SesameSeeds Nov 7, 2017
d962729
Link update.
SesameSeeds Nov 7, 2017
428eeb2
Link update.
SesameSeeds Nov 7, 2017
f8f645f
More changes for heroku push.
SesameSeeds Nov 7, 2017
7ba3227
All tests passing for APIWrapper and Recipe lib.
SesameSeeds Nov 7, 2017
6046f0f
All tests passing.
SesameSeeds Nov 7, 2017
86fdfa8
Errors/Flash messages working.
SesameSeeds Nov 7, 2017
37c6423
Another test added, simplecov added, 100% passing, still messing with…
SesameSeeds Nov 8, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update to API Wrapper.
SesameSeeds committed Nov 6, 2017
commit 3b928f7eca300e42ff3ab78cda94e68ac891312c
2 changes: 1 addition & 1 deletion lib/edamam_api_wrapper.rb
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ class EdamamApiWrapper

def self.list_recipes(search_word)
# The url I defined/created by using Postman to fully read the get function and how it worked.
url = BASE_URL + "q=#{search_word}" + "&app_id=#{ID}" + "&app_key=#{KEY}&to=50"
url = BASE_URL + "q=#{search_word}" + "&app_id=#{ID}" + "&app_key=#{KEY}&to=100"

data = HTTParty.get(url)