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

Mary Morrison #79

Open
wants to merge 18 commits into
base: b/mem/master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ed8bb2f
added coverage, added test helper gems to gemfile, added edamam_api_w…
morrime Nov 1, 2016
68a651f
added gem 'foundation-rails' to gemfile, added folder app/assets/styl…
morrime Nov 1, 2016
966e920
generated pages controller, created index view page for pages, create…
morrime Nov 1, 2016
c57181c
did lots of things without commiting...oops. Was able to pull in api …
morrime Nov 2, 2016
f4a73bd
fixed initialize method, all required info now coming in through the …
morrime Nov 2, 2016
6f003c9
made show page and show action, added 'rails' to line 2 of test_helpe…
morrime Nov 2, 2016
bae2d7b
added binding of caller gem, have index page that search page directs…
morrime Nov 2, 2016
23c9fb9
moved foundation stuff up one level so now it actually works, added p…
morrime Nov 4, 2016
c9d5c54
cleaned up routes, added back functionality to show page, links to la…
morrime Nov 7, 2016
e8a5b3b
added pagination to bottom of search results page in addition to top
morrime Nov 7, 2016
05c5281
created header, switched around layout of pagination and placed in he…
morrime Nov 7, 2016
3564bbc
fixed indentation
morrime Nov 7, 2016
51568c6
changed containers for links to nav, more semantic
morrime Nov 7, 2016
0fcc202
added gem 'rails-controller-testing' to gemfile because terminal told…
morrime Nov 7, 2016
8ceb6b6
controller tests and recipe model tests, also added main tag in appli…
morrime Nov 7, 2016
e317821
css and stuff. as pretty as it's gonna get
morrime Nov 7, 2016
20287ae
fixed copyright formatting
morrime Nov 7, 2016
ae6edc4
fixed vcr issue
morrime Nov 13, 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@
# Ignore Byebug command history file.
.byebug_history
.env
coverage
12 changes: 12 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,19 @@ gem 'jbuilder', '~> 2.5'
# gem 'capistrano-rails', group: :development
gem 'httparty'

gem 'foundation-rails'
gem 'will_paginate', '~> 3.1.0'
gem 'rails-controller-testing'

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

gem 'minitest-vcr'
gem 'webmock'
gem "binding_of_caller"
end

group :development do
Expand All @@ -48,5 +55,10 @@ group :development do
gem 'spring-watcher-listen', '~> 2.0.0'
end

group :test do
gem 'minitest-reporters'
gem 'simplecov'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
72 changes: 72 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,22 @@ GEM
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.4.0)
ansi (1.5.0)
arel (7.1.4)
babel-source (5.8.35)
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
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)
coffee-rails (4.2.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.2.x)
Expand All @@ -49,12 +62,26 @@ 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)
docile (1.1.5)
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)
foundation-rails (6.2.4.0)
railties (>= 3.1.0)
sass (>= 3.3.0, < 3.5)
sprockets-es6 (>= 0.9.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 @@ -63,6 +90,7 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (2.0.2)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
Expand All @@ -75,8 +103,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 @@ -96,6 +136,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 @@ -111,13 +155,20 @@ 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)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
simplecov (0.12.0)
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
spring (2.0.0)
activesupport (>= 4.2)
spring-watcher-listen (2.0.1)
Expand All @@ -126,6 +177,10 @@ GEM
sprockets (3.7.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-es6 (0.9.2)
babel-source (>= 5.8.11)
babel-transpiler
sprockets (>= 3.0.0)
sprockets-rails (3.2.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
Expand All @@ -141,34 +196,51 @@ 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)
will_paginate (3.1.5)

PLATFORMS
ruby

DEPENDENCIES
better_errors
binding_of_caller
byebug
coffee-rails (~> 4.2)
dotenv-rails
foundation-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)
simplecov
spring
spring-watcher-listen (~> 2.0.0)
sqlite3
turbolinks (~> 5)
tzinfo-data
uglifier (>= 1.3.0)
web-console
webmock
will_paginate (~> 3.1.0)

BUNDLED WITH
1.13.5
3 changes: 3 additions & 0 deletions app/assets/javascripts/pages.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/
Empty file added app/assets/stylesheets/app.css
Empty file.
114 changes: 113 additions & 1 deletion app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,118 @@
* files in this directory. Styles in this file should be added after the last require_* statement.
* It is generally better to create a new file per style scope.
*
*= require_tree .
*= require_self
*= require_tree .
*/

* {
font-family: Gill Sans, sans-serif;
}

.indiv-recipes {
display: block;
text-align: center;
}

footer {
margin: 2%;
text-align: center;
right: 0;
bottom: 0;
left: 0;
/*padding: 1rem;*/
}

.head {
display: block;
clear: left;
text-align: center;
}

.fake-button {
border:1px solid #CACC90;
background-color: #CACC90;
border-radius:5px;
display: inline-block;
padding: 3px;
margin: 5px;
display: inline-block;
}

a:link {
color: #8BA6A9;
}

.recipe, a:visited {
color: #75704E;
}

.recipe {
text-align: center;
margin-bottom: 5%;
}

#recipes {
margin-bottom: 5%;
}

.main-title, #main-title {
font-family: Gill Sans, sans-serif;
}

.main-title {
color: #7EB5B0;
padding-left: 15%;
}

#main-title {
font-style: italic;
padding-left: 8px;
color: #8BA6A9;
}

.image {
position: absolute;
top: 0;
right: 15%;
zoom: 70%;
}

img {
border-radius: 25px;
}

header, #search-form {
padding-bottom: 2.5%;
}

#search-form {
padding-left: 5%;
}

h2, h4 {
display: inline-block;
}

.color-green {
color: #75704E;
text-align: center;
display: block;
margin-top: 2%;
margin-bottom: 2%;
}

li {
list-style-type: none;
}

#show-pg-bottom, .copyright {
text-align: center;
display: block;
margin-top: 5%;
}


/*#paginate {
display: inline-block;
}*/
Loading