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

Michelle - Edges - API-Muncher #31

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
d21f8d7
setting up new rails project
kangazoom Oct 30, 2018
b6c0fbf
created Recipes controller
kangazoom Oct 30, 2018
464d68a
began designing routes
kangazoom Oct 30, 2018
1f22add
added token info
kangazoom Oct 30, 2018
3d834e5
added lib files for recipe class + api wrapper
kangazoom Oct 30, 2018
1b2f369
got basic api request/response down
kangazoom Nov 1, 2018
dfe7674
got search working. WE SHALL REJOICE.
kangazoom Nov 2, 2018
79d13bd
added some regex to pull out uri
kangazoom Nov 2, 2018
d38851c
set up some testing shizz basics
kangazoom Nov 4, 2018
8ba9b41
updated filtering in test_helper
kangazoom Nov 4, 2018
dceacf1
got show page worked (had to edit controller and api_wrapper method
kangazoom Nov 4, 2018
2d0a1ac
got show page workin. special delivery.
kangazoom Nov 4, 2018
861ed5b
added dietary info and some descriptive alt tags
kangazoom Nov 4, 2018
a94efed
wrote api wrapper tests; not yet working
kangazoom Nov 5, 2018
0c42bd9
moved stuff around in test_helper; suddenly, api wrapper tests all pa…
kangazoom Nov 5, 2018
7659ead
most lib/recipes tests passing; added defaults to kwargs
kangazoom Nov 5, 2018
9a4df56
added pagination w/ will_paginate + increased num of search results r…
kangazoom Nov 5, 2018
7bb874d
added flash messages and logic for invalid searches/recipe calls
kangazoom Nov 5, 2018
76ef0cb
controller tests pass
kangazoom Nov 5, 2018
4602cfe
added attribution and some header/search everywhere
kangazoom Nov 5, 2018
c464fef
added some styling to the index
kangazoom Nov 5, 2018
1b494c2
added some more styling for splash and show pages
kangazoom Nov 5, 2018
e4b4b37
trying to make deployment work
kangazoom Nov 5, 2018
56260c0
gemfile business
kangazoom Nov 5, 2018
c7a806e
h10 error
kangazoom Nov 5, 2018
0fdbc54
why heroku why
kangazoom Nov 5, 2018
a15050d
procfile
kangazoom Nov 5, 2018
50e828e
procfile round two
kangazoom Nov 5, 2018
70c4da6
got rid of procfile; throwing in the towel for the night/morning
kangazoom Nov 5, 2018
ff311fe
moved some gemfiles outside the groups
kangazoom Nov 5, 2018
7915653
trying to get api tokens working in production mode
kangazoom Nov 5, 2018
b970dec
more token work
kangazoom Nov 5, 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/*
!/storage/.keep

/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 @@
ruby-2.4.1
93 changes: 93 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.4.1'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.1'
# 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

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'
end

group :test do
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '>= 2.15'
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-rails'
gem 'jquery-turbolinks'
gem 'bootstrap', '~> 4.1.3'
group :development, :test do
gem 'pry-rails'
gem 'dotenv-rails'
gem 'httparty'
gem 'minitest-vcr'
gem 'webmock'
end

group :development do
gem 'better_errors'
gem 'binding_of_caller'
gem 'guard'
gem 'guard-minitest'
end

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

gem 'will_paginate', '~> 3.1.0'
gem 'will_paginate-bootstrap'
# gem 'kaminari'

gem 'concurrent-ruby', '~> 1.0', '= 1.0.5'
gem 'dotenv-rails'
gem 'httparty'
Loading