Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@
/log/*
!/log/.keep
/tmp
.env
8 changes: 8 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,20 @@ gem 'sdoc', '~> 0.4.0', group: :doc
# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

gem 'httparty'

gem 'will_paginate', '~> 3.1.5'

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug'
gem 'dotenv-rails'
gem 'better_errors'
gem "binding_of_caller"
gem "pry-rails"

gem 'minitest-vcr'
gem 'webmock'
end

group :development do
Expand Down
31 changes: 30 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.4.0)
arel (6.0.3)
better_errors (2.1.1)
coderay (>= 1.0.0)
Expand All @@ -54,11 +55,20 @@ 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)
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 @@ -77,8 +87,15 @@ 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-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)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
pry (0.10.4)
Expand Down Expand Up @@ -117,6 +134,7 @@ GEM
rake (11.3.0)
rdoc (4.2.2)
json (~> 1.4)
safe_yaml (1.0.4)
sass (3.4.22)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
Expand Down Expand Up @@ -148,11 +166,17 @@ GEM
thread_safe (~> 0.1)
uglifier (3.0.3)
execjs (>= 0.3.0, < 3)
vcr (3.0.3)
web-console (2.3.0)
activemodel (>= 4.0)
binding_of_caller (>= 0.7.2)
railties (>= 4.0)
sprockets-rails (>= 2.0, < 4.0)
webmock (2.1.0)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
will_paginate (3.1.5)

PLATFORMS
ruby
Expand All @@ -162,8 +186,11 @@ DEPENDENCIES
binding_of_caller
byebug
coffee-rails (~> 4.1.0)
dotenv-rails
httparty
jbuilder (~> 2.0)
jquery-rails
minitest-vcr
pry-rails
rails (= 4.2.7)
sass-rails (~> 5.0)
Expand All @@ -173,6 +200,8 @@ DEPENDENCIES
turbolinks
uglifier (>= 1.3.0)
web-console (~> 2.0)
webmock
will_paginate (~> 3.1.5)

BUNDLED WITH
1.13.1
1.13.6
3 changes: 3 additions & 0 deletions app/assets/javascripts/recipe_search.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/
51 changes: 51 additions & 0 deletions app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,54 @@
*= require_tree .
*= require_self
*/
@import url('foundation.css');

header h1 {
font-family: 'Monoton', cursive;
margin: 40px 0px 0px 0px;
}

body {
font-family: 'Work Sans', sans-serif;
}

.pagination a, .pagination button {
display: inline-block;
}

ul {
list-style-type: none;
}

img.index {
border-radius: 50%;
}

main.search-results {
margin: 50px 0px 0px 0px;
}

main li.column {
margin: 0px 0px 30px 0px;
}

main.recipe h3, section.ingredients {
text-align: center;
}

img.show {
max-width: 50%;
margin: auto;
display: block;
}


section.labels {
text-align: center;
font-style: italic;
}

.recipe p{
font-weight: bold;
text-align: center;
}
Loading