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

API Muncher - Angela - Octos #31

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
d053b29
run rails new
knockknockhusthere May 2, 2018
21f69c0
created recipe controller and routes
knockknockhusthere May 2, 2018
c3cc13d
added httparty and figaro to gemfile
knockknockhusthere May 2, 2018
18cc73a
added env files
knockknockhusthere May 2, 2018
7dfc014
added env file and added api wrapper
knockknockhusthere May 2, 2018
9413df4
recipe model tests and api wrapper tests
knockknockhusthere May 2, 2018
748d0e9
wrote list_recipes and added edamam attribute
knockknockhusthere May 3, 2018
13c66c1
testing output for pesto chicken in index views page
knockknockhusthere May 4, 2018
0acd604
linked show page for recipes, editted controller actions
knockknockhusthere May 4, 2018
bdef4a9
FIXED THE SHOW PAGE YAY
knockknockhusthere May 4, 2018
cfe6f11
eager load addition to config/application
knockknockhusthere May 4, 2018
ba06229
added enable dependencies
knockknockhusthere May 4, 2018
2e7de85
remove pry
knockknockhusthere May 4, 2018
ace3624
circular reference fix
knockknockhusthere May 4, 2018
f1b90c9
hid pry gem
knockknockhusthere May 4, 2018
ce7b87a
added paginate
knockknockhusthere May 5, 2018
3590ffa
recipes controller testing for index
knockknockhusthere May 6, 2018
0f6a93d
controller tests for show
knockknockhusthere May 6, 2018
9d1aa69
test added and passing
knockknockhusthere May 6, 2018
5eece16
added a background image
knockknockhusthere May 7, 2018
fdf8717
css changes
knockknockhusthere May 7, 2018
873f692
css for index and show
knockknockhusthere May 7, 2018
bf01469
getting heroku to compile assets
knockknockhusthere May 7, 2018
63d54f4
created footer
knockknockhusthere May 7, 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
31 changes: 31 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# 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

/public/assets
.byebug_history

.env

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

# Ignore application configuration
/config/application.yml
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.5.0
92 changes: 92 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
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 'figaro'

gem 'will_paginate', '~> 3.1.0'

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]

gem 'dotenv-rails'
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'
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'
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