Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
eee0093
created rails project
ricecakemonster May 2, 2017
26ca295
created routes,controller and view files
ricecakemonster May 2, 2017
14f80f5
takes the user input and gets the response form edamam
ricecakemonster May 3, 2017
4255f97
list view page done
ricecakemonster May 3, 2017
89cf386
displays show view successfully
ricecakemonster May 3, 2017
021c087
show file gets one recipe info instead of 10
ricecakemonster May 5, 2017
aa88b18
search functions work well with health checkboxes
ricecakemonster May 5, 2017
4b53692
added a line
ricecakemonster May 5, 2017
57120f4
fixed some problems cause by params with wrong value
ricecakemonster May 5, 2017
3b252ea
set up for tests
ricecakemonster May 7, 2017
fdca0c9
rmoved from to from url(don't need it)
ricecakemonster May 8, 2017
fba635c
tests for api wrapper
ricecakemonster May 8, 2017
f69a448
recipe controller tests added
ricecakemonster May 8, 2017
2126319
css added
ricecakemonster May 9, 2017
abc3e41
trying to deploy
ricecakemonster May 9, 2017
5817fd6
trying to fix heroku google oauth error
ricecakemonster May 9, 2017
a285aba
trying to put previously searched words function back(heroku errors)
ricecakemonster May 9, 2017
ec715fb
git push heroku
ricecakemonster May 9, 2017
836d93f
previously search terms error fixed
ricecakemonster May 9, 2017
48518fc
fixed displaying searched word problems
ricecakemonster May 9, 2017
2a5372c
Changed the code so session[:search_terms] only holds up to 7 words-r…
ricecakemonster May 9, 2017
8c4b0f1
session[:search_terms]=[] when user signs out
ricecakemonster May 9, 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
19 changes: 19 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

# Ignore bundler config.
/.bundle

# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
!/log/.keep
!/tmp/.keep

# Ignore Byebug command history file.
.byebug_history
.env
coverage
88 changes: 88 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
source 'https://rubygems.org'

git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
"https://github.com/#{repo_name}.git"
end


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.0.2'
# Use postgresql as the database for Active Record
gem 'pg', '~> 0.18'
# Use Puma as the app server
gem 'puma', '~> 3.0'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 4.2'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

# Use jquery as the JavaScript library
gem 'jquery-rails'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
gem 'turbolinks', '~> 5'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.5'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 3.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development
gem 'faker'

gem 'awesome_print'

gem 'httparty'

gem 'foundation-rails'
gem 'omniauth'
gem 'omniauth-github'
gem 'omniauth-google-oauth2'
gem 'simple_form'
gem 'foundation-rails'

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'

#Mocking for API wrapper tests
gem 'minitest-vcr'
gem 'webmock'
gem 'simplecov'
gem 'binding_of_caller'
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
gem 'web-console', '>= 3.3.0'
gem 'listen', '~> 3.0.5'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

group :development do
gem 'better_errors'
gem 'pry-rails'

end

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

gem 'awesome_print'
gem 'foundation-rails'
Loading