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

Lauren_Sky (b/sky/master) #72

Open
wants to merge 21 commits into
base: b/sky/master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
68893f5
added edamam_api_wrapper.rb & added lib link in config/app & added id…
LaurenSky Nov 1, 2016
943d81b
added api_wrapper and recipe code and some tests... need to still wor…
LaurenSky Nov 1, 2016
42979bc
wrote Recipes controller and test, created show and index views
LaurenSky Nov 3, 2016
2c8d1e6
removed sourceIcon and updated class name in helper file
LaurenSky Nov 3, 2016
416202e
added foundation and some css styling
LaurenSky Nov 3, 2016
0977dd4
added will-paginate gem & added count to apiwrapper & added page link…
LaurenSky Nov 3, 2016
fe47333
worked on foundatoin and added no match error message
LaurenSky Nov 4, 2016
71fd6f9
foundation and css styling added more tests to recipe controller
LaurenSky Nov 4, 2016
80ed95b
finalized styling and foundation for forms and pages
LaurenSky Nov 4, 2016
e0476f9
added only 10 per page for pagination
LaurenSky Nov 4, 2016
edc38ab
styling got messed up
LaurenSky Nov 4, 2016
8eb0608
foundation updates
LaurenSky Nov 7, 2016
693ff3e
change to 12/page from 10/page on index
LaurenSky Nov 7, 2016
98df7b9
added section to tst_helper to remove token info from vcr
LaurenSky Nov 14, 2016
16e6d30
changed page name
LaurenSky May 11, 2017
2900053
updated gemfile
LaurenSky May 11, 2017
14d03be
added postgress to gemfile
LaurenSky May 25, 2017
2bc47f6
commented out sqlite3
LaurenSky May 25, 2017
9bc7bb4
commented out sqlite3
LaurenSky May 25, 2017
964e3ca
update comments in gemfile
LaurenSky May 25, 2017
ea6f363
updated config/env/production config.assets.compile to true
LaurenSky May 25, 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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@
/log/*
!/log/.keep
/tmp
.env
.npm-debug.log
21 changes: 19 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ source 'https://rubygems.org'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.7'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'

# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
Expand Down Expand Up @@ -38,12 +37,25 @@ gem 'httparty'
# FOUNDATION
gem 'foundation-rails'

#PAGINATION
gem 'will_paginate'

group :production do
gem 'pg'
gem 'rails_12factor'
end

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'
# # Use sqlite3 as the database for Active Record
# gem 'sqlite3'

#FOR VCR
gem 'minitest-vcr'
gem 'webmock'
end

group :development do
Expand All @@ -53,3 +65,8 @@ group :development do
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
end

group :test do
gem 'minitest-reporters'
gem 'simplecov'
end
45 changes: 43 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.4.0)
ansi (1.5.0)
arel (6.0.3)
babel-source (5.8.35)
babel-transpiler (0.7.0)
Expand All @@ -58,7 +60,10 @@ 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)
Expand All @@ -71,6 +76,7 @@ GEM
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)
Expand All @@ -90,11 +96,23 @@ 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)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
pg (0.19.0)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
Expand All @@ -117,6 +135,11 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (4.2.7)
actionpack (= 4.2.7)
activesupport (= 4.2.7)
Expand All @@ -125,6 +148,8 @@ GEM
rake (11.3.0)
rdoc (4.2.2)
json (~> 1.4)
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 All @@ -135,6 +160,11 @@ GEM
sdoc (0.4.2)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
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)
sprockets (3.7.0)
Expand All @@ -148,7 +178,6 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.12)
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.5)
Expand All @@ -159,11 +188,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 @@ -177,14 +212,20 @@ DEPENDENCIES
httparty
jbuilder (~> 2.0)
jquery-rails
minitest-reporters
minitest-vcr
pg
rails (= 4.2.7)
rails_12factor
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
simplecov
spring
sqlite3
turbolinks
uglifier (>= 1.3.0)
web-console (~> 2.0)
webmock
will_paginate

BUNDLED WITH
1.13.5
Binary file added app/assets/images/edamam-logo.png
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/recipes.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/
3 changes: 3 additions & 0 deletions app/assets/javascripts/welcome.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/
Loading