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

tor s - octos - api-muncher #41

Open
wants to merge 47 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
596f0b1
ran rails new
torshimizu May 2, 2018
8458d7a
added .env to gitignore
torshimizu May 2, 2018
2579ba5
added file for muncher wrapper
torshimizu May 2, 2018
1b238d9
changed muncher wrapper to a class
torshimizu May 2, 2018
476432a
added vcr to gemfile, added to test_helper
torshimizu May 2, 2018
496cba6
created a recipes controller, trying to get tests to work for wrapper
torshimizu May 2, 2018
15cade3
added a recipes class that muncher api calls on
torshimizu May 2, 2018
77383bb
tested lib/recipe class
torshimizu May 2, 2018
cf8a7aa
added new attributes in test and from_api for Recipe.new
torshimizu May 2, 2018
45ed311
added more attributes for Recipe and added defaults
torshimizu May 2, 2018
3e674fc
wrote test for get_one_recipe
torshimizu May 2, 2018
8453a6e
added controller tests and some views
torshimizu May 3, 2018
51e64b5
fixed link to show page, now can take uri from recipe.url
torshimizu May 3, 2018
25688eb
added some css, pagination, and edamam attribution
torshimizu May 3, 2018
fb6c65d
added a class for search button
torshimizu May 3, 2018
05ca316
removed prys
torshimizu May 3, 2018
ba237d6
changed config autoload to eager load to attempt to fix heroku deploy
torshimizu May 4, 2018
581a0c1
attempting to require httparty instead of including it in muncherapiw…
torshimizu May 4, 2018
da9206a
went back to include httparty and eager_load
torshimizu May 4, 2018
d8be09c
added a test for a query with a space
torshimizu May 4, 2018
1a89fa5
fixed some tests
torshimizu May 4, 2018
1fef322
added pagination things and updated tests now that the pagination gem…
torshimizu May 4, 2018
50db323
updated styles, added omniauth gems
torshimizu May 6, 2018
f10758c
added google omniauth, created a sessions controller
torshimizu May 6, 2018
5528394
created a user model to track users
torshimizu May 6, 2018
5e9e9d3
added a UsersController, added links to login and logout
torshimizu May 6, 2018
5ead141
tests for sessions controller
torshimizu May 6, 2018
c96babe
added tests for SessionsController
torshimizu May 6, 2018
a0aadfe
wrote tests for User.build_from_google
torshimizu May 6, 2018
2298fa0
added a favorites model
torshimizu May 6, 2018
e597067
added a recent searches list
torshimizu May 6, 2018
d912d70
added favorite-user relations and tests for relations
torshimizu May 7, 2018
019c0f9
created a favorites controller and routes
torshimizu May 7, 2018
d48fee1
added an image column to favorites, added tests for favorites controller
torshimizu May 7, 2018
97003f5
can add to favorites via link
torshimizu May 7, 2018
7536424
added validation for favorites and displays favorites and recent sear…
torshimizu May 7, 2018
581a4f2
added more controller tests, removed unnecessary route
torshimizu May 7, 2018
f3fb704
removed clear_searches
torshimizu May 7, 2018
71c9f0f
updated rescue from API wrapper error and updated tests for rescue
torshimizu May 7, 2018
d7baf63
removed pry
torshimizu May 7, 2018
0365a9f
fixed logout link
torshimizu May 7, 2018
05ec956
added home icon and sticky navbar
torshimizu May 7, 2018
e4013f2
updated card and color styles
torshimizu May 7, 2018
e05b5f5
added root background image
torshimizu May 7, 2018
9399d72
added more styles for root
torshimizu May 7, 2018
2124fd7
updated photo extension
torshimizu May 9, 2018
55eace8
updated config production
torshimizu May 9, 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
29 changes: 29 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# 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

# 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
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) { |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 'will_paginate'

gem 'omniauth'
gem 'omniauth-google-oauth2'

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'
gem 'minitest-vcr'
gem 'webmock'
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
Loading