forked from AdaGold/api-muncher
-
Notifications
You must be signed in to change notification settings - Fork 42
Stef -- Carets #27
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
Open
SesameSeeds
wants to merge
40
commits into
Ada-C8:master
Choose a base branch
from
SesameSeeds:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Stef -- Carets #27
Changes from all commits
Commits
Show all changes
40 commits
Select commit
Hold shift + click to select a range
f3efb6f
Initial Commit.
SesameSeeds e419b6f
Gem better_errors added.
SesameSeeds 01397c7
.ENV created, added to .gitignore, and api wrapper started.
SesameSeeds f63896a
Addition of recipes controller.
SesameSeeds 404fa24
Added routes, updated api_wrapper, started controller pseudocode test…
SesameSeeds 04aa27d
Move app/channels/assets to app/assets
SesameSeeds 4e423ff
Fixed foundation version, installed (thanks Charles), added lib file …
SesameSeeds 20cc1eb
Updated API wrapper to get list of recipes.
SesameSeeds 6893fc8
Finished list method, working on show method.
SesameSeeds 669b34e
Updated self method, still recieving error.
SesameSeeds 3d9e509
Updated show method with encode.
SesameSeeds 7cc82de
Show method now working, yay.
SesameSeeds e6cbfc4
Working on controller and views, added favicon.
SesameSeeds ada5c0f
Working through creating tests.
SesameSeeds e7a18ad
Updated controller to reflect 10 not 12 items, reading is still a cha…
SesameSeeds 5357d03
Controller updated with proper methods being called.
SesameSeeds bdfb375
Working with views, currently too large to render...
SesameSeeds 92e1bd8
List view in progress, now showing photos.
SesameSeeds 5c9fa0b
Updated params and show views. Basic things now working on all paths.
SesameSeeds ab727d2
Views complete and working.
SesameSeeds bb0521a
Removed home page, updated application.html.erb to reflect needs of h…
SesameSeeds ccd8aae
Creation of logo, re-addition of placeholder home page due to errors.
SesameSeeds 399ce7a
Some styling added.
SesameSeeds c1e4f75
Tests written but database failure, unsure if they pass or why I am r…
SesameSeeds 5e77332
Very basic styling done.
SesameSeeds 4eeeb28
Small updates.
SesameSeeds 6aea894
Testing gems and missing info added to run tests.
SesameSeeds 15ff149
Pagination is now working.
SesameSeeds 3b928f7
Update to API Wrapper.
SesameSeeds 5b3dd5e
Removed unnecessary divs to make html more semantic.
SesameSeeds 2910d97
Footer now on bottom properly on every page.
SesameSeeds b80c3cf
Minor styling updates.
SesameSeeds a64215a
Styling nearly finished.
SesameSeeds d962729
Link update.
SesameSeeds 428eeb2
Link update.
SesameSeeds f8f645f
More changes for heroku push.
SesameSeeds 7ba3227
All tests passing for APIWrapper and Recipe lib.
SesameSeeds 6046f0f
All tests passing.
SesameSeeds 86fdfa8
Errors/Flash messages working.
SesameSeeds 37c6423
Another test added, simplecov added, 100% passing, still messing with…
SesameSeeds File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| # 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' | ||
|
|
||
| .env | ||
|
|
||
| # Ignore bundler config. | ||
| /.bundle | ||
|
|
||
| # Ignore all logfiles and tempfiles. | ||
| /log/* | ||
| /tmp/* | ||
| !/log/.keep | ||
| !/tmp/.keep | ||
|
|
||
| /node_modules | ||
| /yarn-error.log | ||
|
|
||
| .byebug_history |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| 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 | ||
|
|
||
| gem 'awesome_print' | ||
| gem 'httparty' | ||
| gem 'will_paginate', '~> 3.1.0' | ||
| # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' | ||
| gem 'rails', '~> 5.1.4' | ||
| # Use postgresql as the database for Active Record | ||
| gem 'pg', '~> 0.18' | ||
| # Use Puma as the app server | ||
| gem 'puma', '~> 3.7' | ||
| # 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 'therubyracer', platforms: :ruby | ||
| gem 'foundation-rails' | ||
| # 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', '~> 3.0' | ||
| # Use ActiveModel has_secure_password | ||
| # gem 'bcrypt', '~> 3.1.7' | ||
|
|
||
| # Use Capistrano for deployment | ||
| # gem 'capistrano-rails', group: :development | ||
|
|
||
| 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] | ||
| # Adds support for Capybara system testing and selenium driver | ||
| gem 'better_errors' | ||
| gem 'capybara', '~> 2.13' | ||
| gem 'selenium-webdriver' | ||
| gem 'dotenv-rails' | ||
| gem 'minitest-vcr' | ||
| gem 'webmock' | ||
| 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', '< 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 | ||
|
|
||
| # Windows does not include zoneinfo files, so bundle the tzinfo-data gem | ||
| gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] | ||
|
|
||
| gem 'jquery-turbolinks' | ||
| 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' | ||
| gem 'simplecov' | ||
| end | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,270 @@ | ||
| GEM | ||
| remote: https://rubygems.org/ | ||
| specs: | ||
| actioncable (5.1.4) | ||
| actionpack (= 5.1.4) | ||
| nio4r (~> 2.0) | ||
| websocket-driver (~> 0.6.1) | ||
| actionmailer (5.1.4) | ||
| actionpack (= 5.1.4) | ||
| actionview (= 5.1.4) | ||
| activejob (= 5.1.4) | ||
| mail (~> 2.5, >= 2.5.4) | ||
| rails-dom-testing (~> 2.0) | ||
| actionpack (5.1.4) | ||
| actionview (= 5.1.4) | ||
| activesupport (= 5.1.4) | ||
| rack (~> 2.0) | ||
| rack-test (>= 0.6.3) | ||
| rails-dom-testing (~> 2.0) | ||
| rails-html-sanitizer (~> 1.0, >= 1.0.2) | ||
| actionview (5.1.4) | ||
| activesupport (= 5.1.4) | ||
| builder (~> 3.1) | ||
| erubi (~> 1.4) | ||
| rails-dom-testing (~> 2.0) | ||
| rails-html-sanitizer (~> 1.0, >= 1.0.3) | ||
| activejob (5.1.4) | ||
| activesupport (= 5.1.4) | ||
| globalid (>= 0.3.6) | ||
| activemodel (5.1.4) | ||
| activesupport (= 5.1.4) | ||
| activerecord (5.1.4) | ||
| activemodel (= 5.1.4) | ||
| activesupport (= 5.1.4) | ||
| arel (~> 8.0) | ||
| activesupport (5.1.4) | ||
| concurrent-ruby (~> 1.0, >= 1.0.2) | ||
| i18n (~> 0.7) | ||
| minitest (~> 5.1) | ||
| tzinfo (~> 1.1) | ||
| addressable (2.5.2) | ||
| public_suffix (>= 2.0.2, < 4.0) | ||
| ansi (1.5.0) | ||
| arel (8.0.0) | ||
| awesome_print (1.8.0) | ||
| babel-source (5.8.35) | ||
| babel-transpiler (0.7.0) | ||
| babel-source (>= 4.0, < 6) | ||
| execjs (~> 2.0) | ||
| better_errors (2.4.0) | ||
| coderay (>= 1.0.0) | ||
| erubi (>= 1.0.0) | ||
| rack (>= 0.9.0) | ||
| bindex (0.5.0) | ||
| binding_of_caller (0.7.3) | ||
| debug_inspector (>= 0.0.1) | ||
| builder (3.2.3) | ||
| byebug (9.1.0) | ||
| capybara (2.15.4) | ||
| addressable | ||
| mini_mime (>= 0.1.3) | ||
| nokogiri (>= 1.3.3) | ||
| rack (>= 1.0.0) | ||
| rack-test (>= 0.5.4) | ||
| xpath (~> 2.0) | ||
| childprocess (0.8.0) | ||
| ffi (~> 1.0, >= 1.0.11) | ||
| coderay (1.1.2) | ||
| concurrent-ruby (1.0.5) | ||
| crack (0.4.3) | ||
| safe_yaml (~> 1.0.0) | ||
| crass (1.0.2) | ||
| debug_inspector (0.0.3) | ||
| docile (1.1.5) | ||
| dotenv (2.2.1) | ||
| dotenv-rails (2.2.1) | ||
| dotenv (= 2.2.1) | ||
| railties (>= 3.2, < 5.2) | ||
| erubi (1.7.0) | ||
| execjs (2.7.0) | ||
| ffi (1.9.18) | ||
| foundation-rails (6.4.1.2) | ||
| railties (>= 3.1.0) | ||
| sass (>= 3.3.0, < 3.5) | ||
| sprockets-es6 (>= 0.9.0) | ||
| globalid (0.4.1) | ||
| activesupport (>= 4.2.0) | ||
| hashdiff (0.3.7) | ||
| httparty (0.15.6) | ||
| multi_xml (>= 0.5.2) | ||
| i18n (0.9.1) | ||
| concurrent-ruby (~> 1.0) | ||
| jbuilder (2.7.0) | ||
| activesupport (>= 4.2.0) | ||
| multi_json (>= 1.2) | ||
| jquery-turbolinks (2.1.0) | ||
| railties (>= 3.1.0) | ||
| turbolinks | ||
| json (2.0.4) | ||
| listen (3.1.5) | ||
| rb-fsevent (~> 0.9, >= 0.9.4) | ||
| rb-inotify (~> 0.9, >= 0.9.7) | ||
| ruby_dep (~> 1.2) | ||
| loofah (2.1.1) | ||
| crass (~> 1.0.2) | ||
| nokogiri (>= 1.5.9) | ||
| mail (2.6.6) | ||
| mime-types (>= 1.16, < 4) | ||
| method_source (0.9.0) | ||
| mime-types (3.1) | ||
| mime-types-data (~> 3.2015) | ||
| mime-types-data (3.2016.0521) | ||
| mini_mime (0.1.4) | ||
| mini_portile2 (2.3.0) | ||
| minispec-metadata (2.0.0) | ||
| minitest | ||
| minitest (5.10.3) | ||
| minitest-rails (3.0.0) | ||
| minitest (~> 5.8) | ||
| railties (~> 5.0) | ||
| minitest-reporters (1.1.18) | ||
| ansi | ||
| builder | ||
| minitest (>= 5.0) | ||
| ruby-progressbar | ||
| minitest-vcr (1.4.0) | ||
| minispec-metadata (~> 2.0) | ||
| minitest (>= 4.7.5) | ||
| vcr (>= 2.9) | ||
| multi_json (1.12.2) | ||
| multi_xml (0.6.0) | ||
| nio4r (2.1.0) | ||
| nokogiri (1.8.1) | ||
| mini_portile2 (~> 2.3.0) | ||
| pg (0.21.0) | ||
| pry (0.11.2) | ||
| coderay (~> 1.1.0) | ||
| method_source (~> 0.9.0) | ||
| pry-rails (0.3.6) | ||
| pry (>= 0.10.4) | ||
| public_suffix (3.0.0) | ||
| puma (3.10.0) | ||
| rack (2.0.3) | ||
| rack-test (0.7.0) | ||
| rack (>= 1.0, < 3) | ||
| rails (5.1.4) | ||
| actioncable (= 5.1.4) | ||
| actionmailer (= 5.1.4) | ||
| actionpack (= 5.1.4) | ||
| actionview (= 5.1.4) | ||
| activejob (= 5.1.4) | ||
| activemodel (= 5.1.4) | ||
| activerecord (= 5.1.4) | ||
| activesupport (= 5.1.4) | ||
| bundler (>= 1.3.0) | ||
| railties (= 5.1.4) | ||
| sprockets-rails (>= 2.0.0) | ||
| rails-dom-testing (2.0.3) | ||
| activesupport (>= 4.2.0) | ||
| nokogiri (>= 1.6) | ||
| rails-html-sanitizer (1.0.3) | ||
| loofah (~> 2.0) | ||
| railties (5.1.4) | ||
| actionpack (= 5.1.4) | ||
| activesupport (= 5.1.4) | ||
| method_source | ||
| rake (>= 0.8.7) | ||
| thor (>= 0.18.1, < 2.0) | ||
| rake (12.2.1) | ||
| rb-fsevent (0.10.2) | ||
| rb-inotify (0.9.10) | ||
| ffi (>= 0.5.0, < 2) | ||
| ruby-progressbar (1.9.0) | ||
| ruby_dep (1.5.0) | ||
| rubyzip (1.2.1) | ||
| safe_yaml (1.0.4) | ||
| sass (3.4.25) | ||
| sass-rails (5.0.6) | ||
| railties (>= 4.0.0, < 6) | ||
| sass (~> 3.1) | ||
| sprockets (>= 2.8, < 4.0) | ||
| sprockets-rails (>= 2.0, < 4.0) | ||
| tilt (>= 1.1, < 3) | ||
| selenium-webdriver (3.6.0) | ||
| childprocess (~> 0.5) | ||
| rubyzip (~> 1.0) | ||
| simplecov (0.15.1) | ||
| docile (~> 1.1.0) | ||
| json (>= 1.8, < 3) | ||
| simplecov-html (~> 0.10.0) | ||
| simplecov-html (0.10.2) | ||
| spring (2.0.2) | ||
| activesupport (>= 4.2) | ||
| spring-watcher-listen (2.0.1) | ||
| listen (>= 2.7, < 4.0) | ||
| spring (>= 1.2, < 3.0) | ||
| sprockets (3.7.1) | ||
| concurrent-ruby (~> 1.0) | ||
| rack (> 1, < 3) | ||
| sprockets-es6 (0.9.2) | ||
| babel-source (>= 5.8.11) | ||
| babel-transpiler | ||
| sprockets (>= 3.0.0) | ||
| sprockets-rails (3.2.1) | ||
| actionpack (>= 4.0) | ||
| activesupport (>= 4.0) | ||
| sprockets (>= 3.0.0) | ||
| thor (0.20.0) | ||
| thread_safe (0.3.6) | ||
| tilt (2.0.8) | ||
| turbolinks (5.0.1) | ||
| turbolinks-source (~> 5) | ||
| turbolinks-source (5.0.3) | ||
| tzinfo (1.2.4) | ||
| thread_safe (~> 0.1) | ||
| uglifier (3.2.0) | ||
| execjs (>= 0.3.0, < 3) | ||
| vcr (3.0.3) | ||
| web-console (3.5.1) | ||
| actionview (>= 5.0) | ||
| activemodel (>= 5.0) | ||
| bindex (>= 0.4.0) | ||
| railties (>= 5.0) | ||
| webmock (3.1.0) | ||
| addressable (>= 2.3.6) | ||
| crack (>= 0.3.2) | ||
| hashdiff | ||
| websocket-driver (0.6.5) | ||
| websocket-extensions (>= 0.1.0) | ||
| websocket-extensions (0.1.2) | ||
| will_paginate (3.1.6) | ||
| xpath (2.1.0) | ||
| nokogiri (~> 1.3) | ||
|
|
||
| PLATFORMS | ||
| ruby | ||
|
|
||
| DEPENDENCIES | ||
| awesome_print | ||
| better_errors | ||
| binding_of_caller | ||
| byebug | ||
| capybara (~> 2.13) | ||
| dotenv-rails | ||
| foundation-rails | ||
| httparty | ||
| jbuilder (~> 2.5) | ||
| jquery-turbolinks | ||
| listen (>= 3.0.5, < 3.2) | ||
| minitest-rails | ||
| minitest-reporters | ||
| minitest-vcr | ||
| pg (~> 0.18) | ||
| pry-rails | ||
| puma (~> 3.7) | ||
| rails (~> 5.1.4) | ||
| sass-rails (~> 5.0) | ||
| selenium-webdriver | ||
| simplecov | ||
| spring | ||
| spring-watcher-listen (~> 2.0.0) | ||
| turbolinks (~> 5) | ||
| tzinfo-data | ||
| uglifier (>= 1.3.0) | ||
| web-console (>= 3.3.0) | ||
| webmock | ||
| will_paginate (~> 3.1.0) | ||
|
|
||
| BUNDLED WITH | ||
| 1.15.4 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| # Add your own tasks in files placed in lib/tasks ending in .rake, | ||
| # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. | ||
|
|
||
| require_relative 'config/application' | ||
|
|
||
| Rails.application.load_tasks |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| //= link_tree ../images | ||
| //= link_directory ../javascripts .js | ||
| //= link_directory ../stylesheets .css |
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| // This is a manifest file that'll be compiled into application.js, which will include all the files | ||
| // listed below. | ||
| // | ||
| // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's | ||
| // vendor/assets/javascripts directory can be referenced here using a relative path. | ||
| // | ||
| // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the | ||
| // compiled file. JavaScript code in this file should be added after the last require_* statement. | ||
| // | ||
| // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details | ||
| // about supported directives. | ||
| // | ||
| //= require rails-ujs | ||
| //= require foundation | ||
| //= require turbolinks | ||
| //= require_tree . | ||
|
|
||
| $(function(){ $(document).foundation(); }); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also missing VCR and webmock