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

Brenda Rios - API-Muncher - Octos #25

Open
wants to merge 51 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
0386a3e
Created rails folders.
brendarios May 2, 2018
8020aec
Created edamam api wrapper file and a recipe file in lib.
brendarios May 2, 2018
8341317
Added .env file with id and key and added .env in the .gitignore file.
brendarios May 2, 2018
3b1ffad
Added line of config.autoload_paths to file application.rb
brendarios May 2, 2018
55f771d
Added routes and created recipes controller plus view files.
brendarios May 2, 2018
9562e05
Added gem Kaminari for pagination.
brendarios May 5, 2018
7ebb57d
Refactored controllers.
brendarios May 5, 2018
0111f6b
Refactored lib files to show recipes.
brendarios May 5, 2018
3d5e6c9
Modified views to be able to see recipes.
brendarios May 5, 2018
4057b57
Routes working.
brendarios May 5, 2018
c2cc579
Added lines in the test helper to hide the api key and api kid
brendarios May 5, 2018
a4e892b
cleaning controller.
brendarios May 5, 2018
590aecd
Deleted a gem
brendarios May 5, 2018
26576b1
Updated gem
brendarios May 5, 2018
8a245c0
Changed line name
brendarios May 5, 2018
93a3f3c
Trying to fix the deployment.
brendarios May 5, 2018
c0bc0a3
Added flash message in controller and in the views
brendarios May 5, 2018
b9f47e5
Trying to do tests.
brendarios May 5, 2018
f2b11c2
refactoring tests.
brendarios May 5, 2018
d6d32f4
Created form file for search bar
brendarios May 5, 2018
d822183
Adding styling to the app.
brendarios May 5, 2018
7e66ee7
Updated gem file
brendarios May 5, 2018
1f8b479
modified gems.
brendarios May 5, 2018
8a76686
Cleaning gems file
brendarios May 5, 2018
ba2990f
Continued adding styling.
brendarios May 5, 2018
84e23d5
Trying to fix deployemnt.
brendarios May 5, 2018
421928d
Changed application configuration.
brendarios May 5, 2018
30b8cfa
removing require pry
brendarios May 5, 2018
117ac5d
Solved the problem that was not allowing me to run the tests.
brendarios May 5, 2018
5d38291
fixing again deployment issues.
brendarios May 5, 2018
f2f9c80
Tests for class recipe.rb passing
brendarios May 5, 2018
e532223
Tests for recipes controller are passing.
brendarios May 5, 2018
219f9f8
Cleaninun up tests. All passing =)
brendarios May 5, 2018
9971730
Adding styling.
brendarios May 5, 2018
7a19ac4
wondering why heroku didnt take my styling of the homepage.
brendarios May 5, 2018
aecc5b8
Trying to fix why heroku does not update the CSS
brendarios May 6, 2018
18501db
Still trying to fix assets issue with heroku
brendarios May 6, 2018
4b0737a
Going back, not working assets on heroku.
brendarios May 6, 2018
f58b2d7
Working on css and trying to deploy.
brendarios May 6, 2018
f9f0e00
working on css and tryin to deploy them
brendarios May 6, 2018
91eff5d
I think now heroku is taking care of my css.
brendarios May 6, 2018
d0d93fe
Adding more css now that heroku is taking it.
brendarios May 7, 2018
2d24f20
trying to upload background image to heroku.
brendarios May 7, 2018
e3b90dd
Still trying to upload image to heroku.
brendarios May 7, 2018
0679931
Added css to the show page. Heroku likes my background image now.
brendarios May 7, 2018
357cdea
Last changes of styling.
brendarios May 7, 2018
d41277b
Cleaning files.
brendarios May 7, 2018
6125e85
Improved media screen view for phones.
brendarios May 19, 2018
f6a41ef
improving mobile views.
brendarios May 19, 2018
c448ad4
Mobile view improved.
brendarios May 19, 2018
2b52503
changing background.
brendarios May 19, 2018
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
Binary file added .DS_Store
Binary file not shown.
28 changes: 28 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# 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 uploaded files in development
/storage/*

/node_modules
/yarn-error.log


.byebug_history

# Ignore master key for decrypting credentials and more.
/config/master.key

.env
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.5.0
89 changes: 89 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.5.0'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.0'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 3.11'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'mini_racer', platforms: :ruby

# Use CoffeeScript for .coffee assets and views
# gem 'coffee-rails', '~> 4.2'
# 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', '~> 4.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use ActiveStorage variant
# gem 'mini_magick', '~> 4.8'

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

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.1.0', require: false
gem "httparty"
gem "kaminari"

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
end

group :development do
# Access an interactive console on exception pages or by calling 'console' anywhere in the code.
gem 'web-console', '>= 3.3.0'
gem 'listen', '>= 3.0.5', '< 3.2'
# 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'
gem "dotenv-rails"
end

group :test do
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '>= 2.15', '< 4.0'
gem 'selenium-webdriver'
# Easy installation and use of chromedriver to run system tests with Chrome
gem 'chromedriver-helper'
end

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

gem 'jquery-turbolinks'
gem 'jquery-rails'
gem 'foundation-rails'
gem 'normalize-rails'
group :development, :test do
gem 'pry-rails'
gem 'dotenv-rails'
end

group :development do
gem 'better_errors'
gem 'binding_of_caller'
end

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

group :development, :test do
gem 'minitest-vcr'
gem 'webmock'
end
Loading