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

Kelly Tran: Hungry Cook What? #92

Open
wants to merge 23 commits into
base: b/kelly_tran/master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3d3e54c
Created API wrapper and API model. Configured ruby to refer to custom…
KellyPT Nov 3, 2016
3d02f56
write list_recipes method
KellyPT Nov 3, 2016
fbebc78
Generated controller. Edited routes. Modified home and index methods …
KellyPT Nov 3, 2016
ef5e2b7
Created the self.search_by function in recipe.rb model and correspond…
KellyPT Nov 3, 2016
692e79d
Added target: :_blank in Recipe link to make it open in a new tab. Ad…
KellyPT Nov 3, 2016
2ed28f0
changed the search_all methods in order to factor in pagination
KellyPT Nov 3, 2016
83cf80c
Trial and error with manual pagination.
KellyPT Nov 4, 2016
6a7e16d
Changed index path in homepage. Also, added will_paginate gem.
KellyPT Nov 4, 2016
d86232d
Refactor: let self.search_by(id) in Recipe model call from self.all r…
KellyPT Nov 4, 2016
c98f0b0
cleaned up comments and un-used methods
KellyPT Nov 4, 2016
58905e3
removed api-pagination and will_paginate gem
KellyPT Nov 4, 2016
ab60b8c
Successfully added pagination. Make 'back to index' button dynamic.
KellyPT Nov 4, 2016
7d5f902
changed name of API wrapper. created test files.
KellyPT Nov 4, 2016
84f71fe
wrote test for new classes
KellyPT Nov 4, 2016
f12d620
Added some test comments
KellyPT Nov 4, 2016
070276a
Added API developer account's ID and key in ENV file. Added .env fil …
KellyPT Nov 4, 2016
c7213df
Added Foundation CSS. Added .DS_Store types to .gitignore
KellyPT Nov 4, 2016
ca65ad6
added foundation style
KellyPT Nov 4, 2016
39f77ef
Put back self.list_a_recipe(id) method into the API wrapper. Removed …
KellyPT Nov 7, 2016
d80d10f
Finished testing for API wrapper and recipe.rb model.
KellyPT Nov 8, 2016
e542988
Finished Controller tests
KellyPT Nov 8, 2016
b09c331
Created styling for all pages.
KellyPT Nov 8, 2016
1f1e5e8
Filter sensitive data in test_helper.rb
KellyPT Nov 12, 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
12 changes: 12 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,15 @@
/log/*
!/log/.keep
/tmp

# Ingore ENV
.env

# Ignore coverage
/coverage


# Ignore DS_Store file
.DS_Store
app/.DS_Store
app/assets/.DS_Store
9 changes: 6 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,17 @@ gem 'sdoc', '~> 0.4.0', group: :doc

# Use Unicorn as the app server
# gem 'unicorn'

gem 'pry'
# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development
# API GEMS
gem 'httparty'
gem 'foundation-rails'

# Pagination gems
gem 'rails-api'
gem 'kaminari'

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug'
Expand All @@ -56,6 +60,5 @@ end
group :test do
gem 'minitest-reporters'
gem "pry-rails"
gem 'simplecov', :require => false
end

gem 'simplecov', :require => false, :group => :test
9 changes: 9 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ GEM
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
kaminari (0.17.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.4)
Expand Down Expand Up @@ -133,6 +136,9 @@ GEM
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.7)
sprockets-rails
rails-api (0.4.0)
actionpack (>= 3.2.11)
railties (>= 3.2.11)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
Expand Down Expand Up @@ -214,10 +220,13 @@ DEPENDENCIES
httparty
jbuilder (~> 2.0)
jquery-rails
kaminari
minitest-reporters
minitest-vcr
pry
pry-rails
rails (= 4.2.7)
rails-api
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
simplecov
Expand Down
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/
67 changes: 67 additions & 0 deletions app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,70 @@
*= require_tree .
*= require_self
*/


*, h2, h3, h4, h5 {
color: #795548;
font-family: 'Port Lligat Slab', serif;
}

.container {
margin: 20px;

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

.pagination .current {
background: #ff5722;
}

header {
text-align: center;
margin-bottom: 20px;
border-bottom: 5px double;
font-weight: 600;
}

footer {
font-size: 13px;
text-align: center;
margin: 100px 20px 20px 20px;
}

h2, h3, h4 {
text-align: center;
}

h2, h3, h4, h5 {
margin-bottom: 20px;
}
main {
margin-top: 50px;
}

p {
color: #795548;
}

a {
color: #ff5722;
}

a:hover {
color: red;
}

.button.success {
background-color: #ff5722;
}

.button.alert {
background-color: #795548;
}

label {
color: #795548;
}
Loading