Skip to content

Nicole Api Muncher #89

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

Open
wants to merge 46 commits into
base: b/nmu/master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
a804da0
Added a homepages controller and some lib folder files
nurlywhirly Oct 31, 2016
62e77ef
Forgot to add httparty gem
nurlywhirly Oct 31, 2016
30cb9fd
Merge branch 'b/nmu/master' of https://github.com/nurlywhirly/api-mun…
nurlywhirly Oct 31, 2016
6b9cee0
Added index and show views
nurlywhirly Nov 1, 2016
8ef9e2e
Added dotenv gem along with minitest and vcr gems
nurlywhirly Nov 1, 2016
ca0041e
Added empty test files for my lib files
nurlywhirly Nov 1, 2016
09eef9f
added requires for my lib files in the application controller
nurlywhirly Nov 1, 2016
cd77c09
I spelled edamam wrong in my api wrapper
nurlywhirly Nov 1, 2016
fc4f5eb
Modifed the views a little so I'd know which page was which
nurlywhirly Nov 2, 2016
481f07c
Added binding of caller of gem
nurlywhirly Nov 2, 2016
cc5c865
Changed wrapper a bit and inactivated .all method in recipe.rb
nurlywhirly Nov 2, 2016
ddc7277
Added some tests and their files, nothing working yet
nurlywhirly Nov 2, 2016
e7ae58d
Added a search controller, made more sense to me I guess
nurlywhirly Nov 2, 2016
0e8f2ef
Added some routes for searches controller
nurlywhirly Nov 2, 2016
8415b84
Required lib directory files in application controller
nurlywhirly Nov 2, 2016
5dcdba8
Only index view for homepages controller now
nurlywhirly Nov 2, 2016
65c631f
Changed the show route a little
nurlywhirly Nov 2, 2016
4a9651a
Finally got show to work by dividing up the uri and putting it back t…
nurlywhirly Nov 2, 2016
e73743e
Made the root path the searches#new route
nurlywhirly Nov 2, 2016
67b28c2
Cleaning up the file a bit
nurlywhirly Nov 3, 2016
5890af1
Added forward pagination powers
nurlywhirly Nov 3, 2016
4c52ee2
Deleted the homepages controller and fixed routes to match
nurlywhirly Nov 3, 2016
73bc7e2
Added a previous method in searches controller
nurlywhirly Nov 3, 2016
cda0723
Fixed error with url search_index number being one search behind.
nurlywhirly Nov 3, 2016
bb47006
Forgot to add the Minitest Reporters gem
nurlywhirly Nov 4, 2016
eb3138c
Was pulling a weird error with line 16, so I commented it out
nurlywhirly Nov 4, 2016
b6c8ee8
Added flash error to compensate for no returned search results
nurlywhirly Nov 4, 2016
b56fe77
Passing tests for EdamamApiWrapper lib class
nurlywhirly Nov 4, 2016
7b09c06
Added one more edge case test for the Api Wrapper
nurlywhirly Nov 4, 2016
46dc432
Finished intial recipe.rb testing
nurlywhirly Nov 4, 2016
5c0f0cd
more homepages controller stuff I need to delete
nurlywhirly Nov 4, 2016
8f28261
cleaned up routes some more
nurlywhirly Nov 4, 2016
7eb21aa
Adding Foundation CSS
nurlywhirly Nov 4, 2016
e2e04fe
Semantic-ing application.html.erb
nurlywhirly Nov 4, 2016
4d4313c
I swear to God, everything I do requires another gem.
nurlywhirly Nov 6, 2016
31fdef1
Added controller tests and modified the controller bc tests make peop…
nurlywhirly Nov 6, 2016
3e67c2a
I forgot to save before pushing the searches controller test file. Je…
nurlywhirly Nov 6, 2016
106d2f9
Forgot to add dietary information in my initial wrapper. Fixed everyt…
nurlywhirly Nov 6, 2016
8118373
Adding some pictures for design work
nurlywhirly Nov 6, 2016
e342199
Frontpage CSS settled; footer on bottom, words in footer in right pla…
nurlywhirly Nov 6, 2016
104aa1a
Got the next/previous page options to be correctly conditional
nurlywhirly Nov 7, 2016
bbff342
Design and CSS done enough, I guess
nurlywhirly Nov 7, 2016
ebabe46
Had to fix some tests because my pagination stopped working for what …
nurlywhirly Nov 7, 2016
f78fbc3
Totally forgot to style the show page. Now I did.
nurlywhirly Nov 7, 2016
97b4b22
Final push for now
nurlywhirly Nov 7, 2016
87d702a
Had to add show.css into config initializer thingie because I tried t…
nurlywhirly Nov 7, 2016
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
7 changes: 7 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,17 @@ gem 'jbuilder', '~> 2.5'
# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

gem 'httparty'
group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platform: :mri
gem 'dotenv-rails'
gem 'better_errors'
gem 'binding_of_caller'
gem 'minitest-vcr'
gem 'webmock'
gem 'minitest-reporters'
gem 'rails-controller-testing'
end

group :development do
Expand Down
43 changes: 43 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,15 @@ GEM
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.4.0)
ansi (1.5.0)
arel (7.1.4)
better_errors (2.1.1)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.2)
byebug (9.0.6)
coderay (1.1.1)
Expand All @@ -54,12 +58,21 @@ GEM
execjs
coffee-script-source (1.10.0)
concurrent-ruby (1.0.2)
crack (0.4.3)
safe_yaml (~> 1.0.0)
debug_inspector (0.0.2)
dotenv (2.1.1)
dotenv-rails (2.1.1)
dotenv (= 2.1.1)
railties (>= 4.0, < 5.1)
erubis (2.7.0)
execjs (2.7.0)
ffi (1.9.14)
globalid (0.3.7)
activesupport (>= 4.1.0)
hashdiff (0.3.0)
httparty (0.14.0)
multi_xml (>= 0.5.2)
i18n (0.7.0)
jbuilder (2.6.0)
activesupport (>= 3.0.0, < 5.1)
Expand All @@ -80,8 +93,20 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minispec-metadata (2.0.0)
minitest
minitest (5.9.1)
minitest-reporters (1.1.12)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
minitest-vcr (1.4.0)
minispec-metadata (~> 2.0)
minitest (>= 4.7.5)
vcr (>= 2.9)
multi_json (1.12.1)
multi_xml (0.5.5)
nio4r (1.2.1)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
Expand All @@ -101,6 +126,10 @@ GEM
bundler (>= 1.3.0, < 2.0)
railties (= 5.0.0.1)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.1)
actionpack (~> 5.x)
actionview (~> 5.x)
activesupport (~> 5.x)
rails-dom-testing (2.0.1)
activesupport (>= 4.2.0, < 6.0)
nokogiri (~> 1.6.0)
Expand All @@ -116,6 +145,8 @@ GEM
rb-fsevent (0.9.8)
rb-inotify (0.9.7)
ffi (>= 0.5.0)
ruby-progressbar (1.8.1)
safe_yaml (1.0.4)
sass (3.4.22)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
Expand Down Expand Up @@ -146,11 +177,16 @@ GEM
thread_safe (~> 0.1)
uglifier (3.0.3)
execjs (>= 0.3.0, < 3)
vcr (3.0.3)
web-console (3.4.0)
actionview (>= 5.0)
activemodel (>= 5.0)
debug_inspector
railties (>= 5.0)
webmock (2.1.0)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
websocket-driver (0.6.4)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
Expand All @@ -160,13 +196,19 @@ PLATFORMS

DEPENDENCIES
better_errors
binding_of_caller
byebug
coffee-rails (~> 4.2)
dotenv-rails
httparty
jbuilder (~> 2.5)
jquery-rails
listen (~> 3.0.5)
minitest-reporters
minitest-vcr
puma (~> 3.0)
rails (~> 5.0.0, >= 5.0.0.1)
rails-controller-testing
sass-rails (~> 5.0)
spring
spring-watcher-listen (~> 2.0.0)
Expand All @@ -175,6 +217,7 @@ DEPENDENCIES
tzinfo-data
uglifier (>= 1.3.0)
web-console
webmock

BUNDLED WITH
1.13.5
Binary file added app/assets/images/EdamamAttribution.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/food.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/foodfooter.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/assets/javascripts/searches.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
88 changes: 88 additions & 0 deletions app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,91 @@
*= require_tree .
*= require_self
*/

@import url('foundation.css');

/********** BODY *********/
body {
background-color: #f5eee1;
}

.fullWidth {
width: 100%;
/*margin-left: auto;
margin-right: auto;*/
max-width: initial;
}

/********* HEADER ********/
#header {
width: 100%
}

#banner {
width: 100%;
}

header h1 {
position: absolute;
padding-top: 1em;
padding-right: 1em;
right: 0;
color: #f5eee1;
font-size: 10vw;
}

/*********** FONTS **********/
h1, h2 {
font-family: 'IM Fell English SC', serif;
}

h3, h4, h5, h6 {
font-family: 'IM Fell DW Pica', serif;
}

p, td, li, input, label, a {
font-family: 'IM Fell Double Pica', serif;
}

a {
color: #b01111;
}

a:hover {
color: #ff2525;
}
/************ MAIN *********/
#main-content {
width: 75%;
margin-top: 5em;
margin-bottom: 5em;
}

/*#main {
min-height: 100%;
}*/

/********** FOOTER *********/
#footer {
width: 100%;
position: fixed;
height: 60px;
bottom: 0;
background-image: url("/assets/foodfooter.jpg");
background-size: 100%;
}

.footer-words {
margin-top: 1em;
margin-bottom: 1em;
}

.footer-words h5 {
color: #f5eee1;
}

.attribution-pic {
background-color: #f5eee1;
padding: .5em;
border-radius: 10px;
}
Loading