From f7f097e7c354be6382bec03249e35f49276b7b70 Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Tue, 17 Oct 2017 12:27:43 -0700 Subject: [PATCH 001/382] Initial commit --- .gitignore | 19 ++ Gemfile | 66 ++++++ Gemfile.lock | 223 ++++++++++++++++++ Rakefile | 6 + app/assets/config/manifest.js | 3 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 15 ++ app/assets/javascripts/cable.js | 13 + app/assets/javascripts/channels/.keep | 0 app/assets/stylesheets/application.css | 15 ++ app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 3 + app/controllers/concerns/.keep | 0 app/helpers/application_helper.rb | 2 + app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/application.html.erb | 14 ++ app/views/layouts/mailer.html.erb | 13 + app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 38 +++ bin/spring | 17 ++ bin/update | 29 +++ bin/yarn | 11 + config.ru | 5 + config/application.rb | 25 ++ config/boot.rb | 3 + config/cable.yml | 10 + config/database.yml | 85 +++++++ config/environment.rb | 5 + config/environments/development.rb | 54 +++++ config/environments/production.rb | 91 +++++++ config/environments/test.rb | 42 ++++ .../application_controller_renderer.rb | 8 + config/initializers/assets.rb | 14 ++ config/initializers/backtrace_silencers.rb | 7 + config/initializers/cookies_serializer.rb | 5 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 +++ config/puma.rb | 56 +++++ config/routes.rb | 3 + config/secrets.yml | 32 +++ config/spring.rb | 6 + db/seeds.rb | 7 + lib/assets/.keep | 0 lib/tasks/.keep | 0 log/.keep | 0 package.json | 5 + public/404.html | 67 ++++++ public/422.html | 67 ++++++ public/500.html | 66 ++++++ public/apple-touch-icon-precomposed.png | 0 public/apple-touch-icon.png | 0 public/favicon.ico | 0 public/robots.txt | 1 + test/application_system_test_case.rb | 5 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/helpers/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/system/.keep | 0 test/test_helper.rb | 26 ++ tmp/.keep | 0 vendor/.keep | 0 75 files changed, 1292 insertions(+) create mode 100644 .gitignore create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Rakefile create mode 100644 app/assets/config/manifest.js create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/javascripts/cable.js create mode 100644 app/assets/javascripts/channels/.keep create mode 100644 app/assets/stylesheets/application.css create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/helpers/application_helper.rb create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/application.html.erb create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100755 bin/yarn create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/assets.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cookies_serializer.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/secrets.yml create mode 100644 config/spring.rb create mode 100644 db/seeds.rb create mode 100644 lib/assets/.keep create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 package.json create mode 100644 public/404.html create mode 100644 public/422.html create mode 100644 public/500.html create mode 100644 public/apple-touch-icon-precomposed.png create mode 100644 public/apple-touch-icon.png create mode 100644 public/favicon.ico create mode 100644 public/robots.txt create mode 100644 test/application_system_test_case.rb create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/helpers/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/system/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..82701fedc8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,19 @@ +# 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 + +/node_modules +/yarn-error.log + +.byebug_history diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000000..88aee9dc96 --- /dev/null +++ b/Gemfile @@ -0,0 +1,66 @@ +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 + + +# 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 + +# 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 'capybara', '~> 2.13' + gem 'selenium-webdriver' +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 do + gem 'better_errors' + gem 'pry-rails' + gem 'binding_of_caller' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000000..58feab9ca4 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,223 @@ +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) + 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.2) + 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) + crass (1.0.2) + debug_inspector (0.0.3) + erubi (1.7.0) + execjs (2.7.0) + ffi (1.9.18) + globalid (0.4.0) + activesupport (>= 4.2.0) + i18n (0.9.0) + 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 + 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) + 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 + multi_json (1.12.2) + nio4r (2.1.0) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) + pg (0.21.0) + pry (0.11.1) + 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.1.0) + 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) + sass (3.5.2) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + 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) + 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-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.3) + thread_safe (~> 0.1) + uglifier (3.2.0) + execjs (>= 0.3.0, < 3) + web-console (3.5.1) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + xpath (2.1.0) + nokogiri (~> 1.3) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + byebug + capybara (~> 2.13) + jbuilder (~> 2.5) + jquery-turbolinks + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (~> 0.18) + pry-rails + puma (~> 3.7) + rails (~> 5.1.4) + sass-rails (~> 5.0) + selenium-webdriver + spring + spring-watcher-listen (~> 2.0.0) + turbolinks (~> 5) + tzinfo-data + uglifier (>= 1.3.0) + web-console (>= 3.3.0) + +BUNDLED WITH + 1.16.0.pre.3 diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000000..e85f913914 --- /dev/null +++ b/Rakefile @@ -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 diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 0000000000..b16e53d6d5 --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css diff --git a/app/assets/images/.keep b/app/assets/images/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js new file mode 100644 index 0000000000..46b20359fa --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,15 @@ +// 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 turbolinks +//= require_tree . diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js new file mode 100644 index 0000000000..739aa5f022 --- /dev/null +++ b/app/assets/javascripts/cable.js @@ -0,0 +1,13 @@ +// Action Cable provides the framework to deal with WebSockets in Rails. +// You can generate new channels where WebSocket features live using the `rails generate channel` command. +// +//= require action_cable +//= require_self +//= require_tree ./channels + +(function() { + this.App || (this.App = {}); + + App.cable = ActionCable.createConsumer(); + +}).call(this); diff --git a/app/assets/javascripts/channels/.keep b/app/assets/javascripts/channels/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css new file mode 100644 index 0000000000..d05ea0f511 --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,15 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's + * vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS + * files in this directory. Styles in this file should be added after the last require_* statement. + * It is generally better to create a new file per style scope. + * + *= require_tree . + *= require_self + */ diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 0000000000..d672697283 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 0000000000..0ff5442f47 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 0000000000..1c07694e9d --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,3 @@ +class ApplicationController < ActionController::Base + protect_from_forgery with: :exception +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb new file mode 100644 index 0000000000..de6be7945c --- /dev/null +++ b/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 0000000000..a009ace51c --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 0000000000..286b2239d1 --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 0000000000..10a4cba84d --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 0000000000..008c56f923 --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,14 @@ + + + + Betsy + <%= csrf_meta_tags %> + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 0000000000..cbd34d2e9d --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 0000000000..37f0bddbd7 --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 0000000000..66e9889e8b --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 0000000000..5badb2fde0 --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 0000000000..d87d5f5781 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 0000000000..78c4e861dc --- /dev/null +++ b/bin/setup @@ -0,0 +1,38 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 0000000000..fb2ec2ebb4 --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 0000000000..a8e4462f20 --- /dev/null +++ b/bin/update @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/yarn b/bin/yarn new file mode 100755 index 0000000000..c2bacef836 --- /dev/null +++ b/bin/yarn @@ -0,0 +1,11 @@ +#!/usr/bin/env ruby +VENDOR_PATH = File.expand_path('..', __dir__) +Dir.chdir(VENDOR_PATH) do + begin + exec "yarnpkg #{ARGV.join(" ")}" + rescue Errno::ENOENT + $stderr.puts "Yarn executable was not detected in the system." + $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install" + exit 1 + end +end diff --git a/config.ru b/config.ru new file mode 100644 index 0000000000..f7ba0b527b --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 0000000000..5f6ca0f9b2 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,25 @@ +require_relative 'boot' + +require 'rails/all' + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module Betsy + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.1 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 0000000000..30f5120df6 --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 0000000000..3cba994bb2 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 + channel_prefix: betsy_production diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 0000000000..6903bb6083 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: betsy_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: betsy + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: betsy_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: betsy_production + username: betsy + password: <%= ENV['BETSY_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 0000000000..426333bb46 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 0000000000..5187e22186 --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + if Rails.root.join('tmp/caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Debug mode disables concatenation and preprocessing of assets. + # This option may cause significant delays in view rendering with a large + # number of complex assets. + config.assets.debug = true + + # Suppress logger output for asset requests. + config.assets.quiet = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 0000000000..9284f84839 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,91 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Attempt to read encrypted secrets from `config/secrets.yml.enc`. + # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or + # `config/secrets.yml.key`. + config.read_encrypted_secrets = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "betsy_#{Rails.env}" + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 0000000000..8e5cbde533 --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,42 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.seconds.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 0000000000..89d2efab2b --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb new file mode 100644 index 0000000000..4b828e80cb --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# Version of your assets, change this if you want to expire all your assets. +Rails.application.config.assets.version = '1.0' + +# Add additional assets to the asset load path. +# Rails.application.config.assets.paths << Emoji.images_path +# Add Yarn node_modules folder to the asset load path. +Rails.application.config.assets.paths << Rails.root.join('node_modules') + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in the app/assets +# folder are already added. +# Rails.application.config.assets.precompile += %w( admin.js admin.css ) diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 0000000000..59385cdf37 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb new file mode 100644 index 0000000000..5a6a32d371 --- /dev/null +++ b/config/initializers/cookies_serializer.rb @@ -0,0 +1,5 @@ +# Be sure to restart your server when you modify this file. + +# Specify a serializer for the signed and encrypted cookie jars. +# Valid options are :json, :marshal, and :hybrid. +Rails.application.config.action_dispatch.cookies_serializer = :json diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 0000000000..4a994e1e7b --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 0000000000..ac033bf9dc --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 0000000000..dc1899682b --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 0000000000..bbfc3961bf --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 0000000000..decc5a8573 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 0000000000..1e19380dcb --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,56 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. If you use this option +# you need to make sure to reconnect any threads in the `on_worker_boot` +# block. +# +# preload_app! + +# If you are preloading your application and using Active Record, it's +# recommended that you close any connections to the database before workers +# are forked to prevent connection leakage. +# +# before_fork do +# ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord) +# end + +# The code in the `on_worker_boot` will be called if you are using +# clustered mode by specifying a number of `workers`. After each worker +# process is booted, this block will be run. If you are using the `preload_app!` +# option, you will want to use this block to reconnect to any threads +# or connections that may have been created at application boot, as Ruby +# cannot share connections between processes. +# +# on_worker_boot do +# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) +# end +# + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 0000000000..787824f888 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 0000000000..077752c6c0 --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,32 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rails secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +# Shared secrets are available across all environments. + +# shared: +# api_key: a1B2c3D4e5F6 + +# Environmental secrets are only available for that specific environment. + +development: + secret_key_base: 32fb3a67a79609350632f6bd02f05de4b111fd57e5ed241aafed70b7af16c9ae7805ea3214f046eabda5e7482b107aa4792328c11cabb3807affbf9733260070 + +test: + secret_key_base: 2e296e5a640e2d348bc082b6558c9ef6b6150f2fc7ce70eabfa9e8377c2e62fb771b439c927fe46742949d541e18fa0ea23040237127b9a63069cf3d05ec7e0b + +# Do not keep production secrets in the unencrypted secrets file. +# Instead, either read values from the environment. +# Or, use `bin/rails secrets:setup` to configure encrypted secrets +# and move the `production:` environment over there. + +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 0000000000..c9119b40c0 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w( + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +).each { |path| Spring.watch(path) } diff --git a/db/seeds.rb b/db/seeds.rb new file mode 100644 index 0000000000..1beea2accd --- /dev/null +++ b/db/seeds.rb @@ -0,0 +1,7 @@ +# This file should contain all the record creation needed to seed the database with its default values. +# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). +# +# Examples: +# +# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) +# Character.create(name: 'Luke', movie: movies.first) diff --git a/lib/assets/.keep b/lib/assets/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/log/.keep b/log/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/package.json b/package.json new file mode 100644 index 0000000000..f874acf437 --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "name": "betsy", + "private": true, + "dependencies": {} +} diff --git a/public/404.html b/public/404.html new file mode 100644 index 0000000000..2be3af26fc --- /dev/null +++ b/public/404.html @@ -0,0 +1,67 @@ + + + + The page you were looking for doesn't exist (404) + + + + + + +
+
+

The page you were looking for doesn't exist.

+

You may have mistyped the address or the page may have moved.

+
+

If you are the application owner check the logs for more information.

+
+ + diff --git a/public/422.html b/public/422.html new file mode 100644 index 0000000000..c08eac0d1d --- /dev/null +++ b/public/422.html @@ -0,0 +1,67 @@ + + + + The change you wanted was rejected (422) + + + + + + +
+
+

The change you wanted was rejected.

+

Maybe you tried to change something you didn't have access to.

+
+

If you are the application owner check the logs for more information.

+
+ + diff --git a/public/500.html b/public/500.html new file mode 100644 index 0000000000..78a030af22 --- /dev/null +++ b/public/500.html @@ -0,0 +1,66 @@ + + + + We're sorry, but something went wrong (500) + + + + + + +
+
+

We're sorry, but something went wrong.

+
+

If you are the application owner check the logs for more information.

+
+ + diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 0000000000..37b576a4a0 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb new file mode 100644 index 0000000000..d19212abd5 --- /dev/null +++ b/test/application_system_test_case.rb @@ -0,0 +1,5 @@ +require "test_helper" + +class ApplicationSystemTestCase < ActionDispatch::SystemTestCase + driven_by :selenium, using: :chrome, screen_size: [1400, 1400] +end diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/helpers/.keep b/test/helpers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/system/.keep b/test/system/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 0000000000..10594a3248 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,26 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" +require "minitest/reporters" # for Colorized output + +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 0000000000..e69de29bb2 From b175df16472bad8adadbd027aef1202c63e059e8 Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Tue, 17 Oct 2017 16:37:52 -0700 Subject: [PATCH 002/382] Added foundations --- Gemfile | 2 +- Gemfile.lock | 19 +- app/assets/javascripts/application.js | 3 + app/assets/stylesheets/_settings.scss | 863 ++++++++++++++++++ app/assets/stylesheets/application.css | 2 + .../stylesheets/foundation_and_overrides.scss | 53 ++ app/views/layouts/application.html.erb | 15 +- 7 files changed, 946 insertions(+), 11 deletions(-) create mode 100644 app/assets/stylesheets/_settings.scss create mode 100644 app/assets/stylesheets/foundation_and_overrides.scss diff --git a/Gemfile b/Gemfile index 88aee9dc96..3c82b5935c 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ git_source(:github) do |repo_name| "https://github.com/#{repo_name}.git" end - +gem 'foundation-rails', '6.4.1.2' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.1.4' # Use postgresql as the database for Active Record diff --git a/Gemfile.lock b/Gemfile.lock index 58feab9ca4..67420367a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,6 +42,10 @@ GEM public_suffix (>= 2.0.2, < 4.0) ansi (1.5.0) arel (8.0.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) @@ -67,6 +71,10 @@ GEM 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.0) activesupport (>= 4.2.0) i18n (0.9.0) @@ -146,11 +154,7 @@ GEM ruby-progressbar (1.9.0) ruby_dep (1.5.0) rubyzip (1.2.1) - sass (3.5.2) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) + sass (3.4.25) sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) @@ -168,6 +172,10 @@ GEM 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) @@ -201,6 +209,7 @@ DEPENDENCIES binding_of_caller byebug capybara (~> 2.13) + foundation-rails (= 6.4.1.2) jbuilder (~> 2.5) jquery-turbolinks listen (>= 3.0.5, < 3.2) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 46b20359fa..4f2cc0f55a 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -11,5 +11,8 @@ // about supported directives. // //= require rails-ujs +//= require foundation //= require turbolinks //= require_tree . + +$(function(){ $(document).foundation(); }); diff --git a/app/assets/stylesheets/_settings.scss b/app/assets/stylesheets/_settings.scss new file mode 100644 index 0000000000..b67ff00cdc --- /dev/null +++ b/app/assets/stylesheets/_settings.scss @@ -0,0 +1,863 @@ +// Foundation for Sites Settings +// ----------------------------- +// +// Table of Contents: +// +// 1. Global +// 2. Breakpoints +// 3. The Grid +// 4. Base Typography +// 5. Typography Helpers +// 6. Abide +// 7. Accordion +// 8. Accordion Menu +// 9. Badge +// 10. Breadcrumbs +// 11. Button +// 12. Button Group +// 13. Callout +// 14. Card +// 15. Close Button +// 16. Drilldown +// 17. Dropdown +// 18. Dropdown Menu +// 19. Flexbox Utilities +// 20. Forms +// 21. Label +// 22. Media Object +// 23. Menu +// 24. Meter +// 25. Off-canvas +// 26. Orbit +// 27. Pagination +// 28. Progress Bar +// 29. Prototype Arrow +// 30. Prototype Border-Box +// 31. Prototype Border-None +// 32. Prototype Bordered +// 33. Prototype Display +// 34. Prototype Font-Styling +// 35. Prototype List-Style-Type +// 36. Prototype Overflow +// 37. Prototype Position +// 38. Prototype Rounded +// 39. Prototype Separator +// 40. Prototype Shadow +// 41. Prototype Sizing +// 42. Prototype Spacing +// 43. Prototype Text-Decoration +// 44. Prototype Text-Transformation +// 45. Prototype Text-Utilities +// 46. Responsive Embed +// 47. Reveal +// 48. Slider +// 49. Switch +// 50. Table +// 51. Tabs +// 52. Thumbnail +// 53. Title Bar +// 54. Tooltip +// 55. Top Bar +// 56. Xy Grid + +@import 'util/util'; + +// 1. Global +// --------- + +$global-font-size: 100%; +$global-width: rem-calc(1200); +$global-lineheight: 1.5; +$foundation-palette: ( + primary: #1779ba, + secondary: #767676, + success: #3adb76, + warning: #ffae00, + alert: #cc4b37, +); +$light-gray: #e6e6e6; +$medium-gray: #cacaca; +$dark-gray: #8a8a8a; +$black: #0a0a0a; +$white: #fefefe; +$body-background: $white; +$body-font-color: $black; +$body-font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif; +$body-antialiased: true; +$global-margin: 1rem; +$global-padding: 1rem; +$global-position: 1rem; +$global-weight-normal: normal; +$global-weight-bold: bold; +$global-radius: 0; +$global-menu-padding: 0.7rem 1rem; +$global-menu-nested-margin: 1rem; +$global-text-direction: ltr; +$global-flexbox: true; +$global-prototype-breakpoints: false; +$global-color-pick-contrast-tolerance: 0; +$print-transparent-backgrounds: true; + +@include add-foundation-colors; + +// 2. Breakpoints +// -------------- + +$breakpoints: ( + small: 0, + medium: 640px, + large: 1024px, + xlarge: 1200px, + xxlarge: 1440px, +); +$print-breakpoint: large; +$breakpoint-classes: (small medium large); + +// 3. The Grid +// ----------- + +$grid-row-width: $global-width; +$grid-column-count: 12; +$grid-column-gutter: ( + small: 20px, + medium: 30px, +); +$grid-column-align-edge: true; +$grid-column-alias: 'columns'; +$block-grid-max: 8; + +// 4. Base Typography +// ------------------ + +$header-font-family: $body-font-family; +$header-font-weight: $global-weight-normal; +$header-font-style: normal; +$font-family-monospace: Consolas, 'Liberation Mono', Courier, monospace; +$header-color: inherit; +$header-lineheight: 1.4; +$header-margin-bottom: 0.5rem; +$header-styles: ( + small: ( + 'h1': ('font-size': 24), + 'h2': ('font-size': 20), + 'h3': ('font-size': 19), + 'h4': ('font-size': 18), + 'h5': ('font-size': 17), + 'h6': ('font-size': 16), + ), + medium: ( + 'h1': ('font-size': 48), + 'h2': ('font-size': 40), + 'h3': ('font-size': 31), + 'h4': ('font-size': 25), + 'h5': ('font-size': 20), + 'h6': ('font-size': 16), + ), +); +$header-text-rendering: optimizeLegibility; +$small-font-size: 80%; +$header-small-font-color: $medium-gray; +$paragraph-lineheight: 1.6; +$paragraph-margin-bottom: 1rem; +$paragraph-text-rendering: optimizeLegibility; +$code-color: $black; +$code-font-family: $font-family-monospace; +$code-font-weight: $global-weight-normal; +$code-background: $light-gray; +$code-border: 1px solid $medium-gray; +$code-padding: rem-calc(2 5 1); +$anchor-color: $primary-color; +$anchor-color-hover: scale-color($anchor-color, $lightness: -14%); +$anchor-text-decoration: none; +$anchor-text-decoration-hover: none; +$hr-width: $global-width; +$hr-border: 1px solid $medium-gray; +$hr-margin: rem-calc(20) auto; +$list-lineheight: $paragraph-lineheight; +$list-margin-bottom: $paragraph-margin-bottom; +$list-style-type: disc; +$list-style-position: outside; +$list-side-margin: 1.25rem; +$list-nested-side-margin: 1.25rem; +$defnlist-margin-bottom: 1rem; +$defnlist-term-weight: $global-weight-bold; +$defnlist-term-margin-bottom: 0.3rem; +$blockquote-color: $dark-gray; +$blockquote-padding: rem-calc(9 20 0 19); +$blockquote-border: 1px solid $medium-gray; +$cite-font-size: rem-calc(13); +$cite-color: $dark-gray; +$cite-pseudo-content: '\2014 \0020'; +$keystroke-font: $font-family-monospace; +$keystroke-color: $black; +$keystroke-background: $light-gray; +$keystroke-padding: rem-calc(2 4 0); +$keystroke-radius: $global-radius; +$abbr-underline: 1px dotted $black; + +// 5. Typography Helpers +// --------------------- + +$lead-font-size: $global-font-size * 1.25; +$lead-lineheight: 1.6; +$subheader-lineheight: 1.4; +$subheader-color: $dark-gray; +$subheader-font-weight: $global-weight-normal; +$subheader-margin-top: 0.2rem; +$subheader-margin-bottom: 0.5rem; +$stat-font-size: 2.5rem; + +// 6. Abide +// -------- + +$abide-inputs: true; +$abide-labels: true; +$input-background-invalid: get-color(alert); +$form-label-color-invalid: get-color(alert); +$input-error-color: get-color(alert); +$input-error-font-size: rem-calc(12); +$input-error-font-weight: $global-weight-bold; + +// 7. Accordion +// ------------ + +$accordion-background: $white; +$accordion-plusminus: true; +$accordion-title-font-size: rem-calc(12); +$accordion-item-color: $primary-color; +$accordion-item-background-hover: $light-gray; +$accordion-item-padding: 1.25rem 1rem; +$accordion-content-background: $white; +$accordion-content-border: 1px solid $light-gray; +$accordion-content-color: $body-font-color; +$accordion-content-padding: 1rem; + +// 8. Accordion Menu +// ----------------- + +$accordionmenu-padding: $global-menu-padding; +$accordionmenu-nested-margin: $global-menu-nested-margin; +$accordionmenu-submenu-padding: $accordionmenu-padding; +$accordionmenu-arrows: true; +$accordionmenu-arrow-color: $primary-color; +$accordionmenu-item-background: null; +$accordionmenu-border: null; +$accordionmenu-submenu-toggle-background: null; +$accordion-submenu-toggle-border: $accordionmenu-border; +$accordionmenu-submenu-toggle-width: 40px; +$accordionmenu-submenu-toggle-height: $accordionmenu-submenu-toggle-width; +$accordionmenu-arrow-size: 6px; + +// 9. Badge +// -------- + +$badge-background: $primary-color; +$badge-color: $white; +$badge-color-alt: $black; +$badge-palette: $foundation-palette; +$badge-padding: 0.3em; +$badge-minwidth: 2.1em; +$badge-font-size: 0.6rem; + +// 10. Breadcrumbs +// --------------- + +$breadcrumbs-margin: 0 0 $global-margin 0; +$breadcrumbs-item-font-size: rem-calc(11); +$breadcrumbs-item-color: $primary-color; +$breadcrumbs-item-color-current: $black; +$breadcrumbs-item-color-disabled: $medium-gray; +$breadcrumbs-item-margin: 0.75rem; +$breadcrumbs-item-uppercase: true; +$breadcrumbs-item-separator: true; +$breadcrumbs-item-separator-item: '/'; +$breadcrumbs-item-separator-item-rtl: '\\'; +$breadcrumbs-item-separator-color: $medium-gray; + +// 11. Button +// ---------- + +$button-font-family: inherit; +$button-padding: 0.85em 1em; +$button-margin: 0 0 $global-margin 0; +$button-fill: solid; +$button-background: $primary-color; +$button-background-hover: scale-color($button-background, $lightness: -15%); +$button-color: $white; +$button-color-alt: $black; +$button-radius: $global-radius; +$button-hollow-border-width: 1px; +$button-sizes: ( + tiny: 0.6rem, + small: 0.75rem, + default: 0.9rem, + large: 1.25rem, +); +$button-palette: $foundation-palette; +$button-opacity-disabled: 0.25; +$button-background-hover-lightness: -20%; +$button-hollow-hover-lightness: -50%; +$button-transition: background-color 0.25s ease-out, color 0.25s ease-out; + +// 12. Button Group +// ---------------- + +$buttongroup-margin: 1rem; +$buttongroup-spacing: 1px; +$buttongroup-child-selector: '.button'; +$buttongroup-expand-max: 6; +$buttongroup-radius-on-each: true; + +// 13. Callout +// ----------- + +$callout-background: $white; +$callout-background-fade: 85%; +$callout-border: 1px solid rgba($black, 0.25); +$callout-margin: 0 0 1rem 0; +$callout-padding: 1rem; +$callout-font-color: $body-font-color; +$callout-font-color-alt: $body-background; +$callout-radius: $global-radius; +$callout-link-tint: 30%; + +// 14. Card +// -------- + +$card-background: $white; +$card-font-color: $body-font-color; +$card-divider-background: $light-gray; +$card-border: 1px solid $light-gray; +$card-shadow: none; +$card-border-radius: $global-radius; +$card-padding: $global-padding; +$card-margin-bottom: $global-margin; + +// 15. Close Button +// ---------------- + +$closebutton-position: right top; +$closebutton-offset-horizontal: ( + small: 0.66rem, + medium: 1rem, +); +$closebutton-offset-vertical: ( + small: 0.33em, + medium: 0.5rem, +); +$closebutton-size: ( + small: 1.5em, + medium: 2em, +); +$closebutton-lineheight: 1; +$closebutton-color: $dark-gray; +$closebutton-color-hover: $black; + +// 16. Drilldown +// ------------- + +$drilldown-transition: transform 0.15s linear; +$drilldown-arrows: true; +$drilldown-padding: $global-menu-padding; +$drilldown-nested-margin: 0; +$drilldown-background: $white; +$drilldown-submenu-padding: $drilldown-padding; +$drilldown-submenu-background: $white; +$drilldown-arrow-color: $primary-color; +$drilldown-arrow-size: 6px; + +// 17. Dropdown +// ------------ + +$dropdown-padding: 1rem; +$dropdown-background: $body-background; +$dropdown-border: 1px solid $medium-gray; +$dropdown-font-size: 1rem; +$dropdown-width: 300px; +$dropdown-radius: $global-radius; +$dropdown-sizes: ( + tiny: 100px, + small: 200px, + large: 400px, +); + +// 18. Dropdown Menu +// ----------------- + +$dropdownmenu-arrows: true; +$dropdownmenu-arrow-color: $anchor-color; +$dropdownmenu-arrow-size: 6px; +$dropdownmenu-arrow-padding: 1.5rem; +$dropdownmenu-min-width: 200px; +$dropdownmenu-background: $white; +$dropdownmenu-submenu-background: $dropdownmenu-background; +$dropdownmenu-padding: $global-menu-padding; +$dropdownmenu-nested-margin: 0; +$dropdownmenu-submenu-padding: $dropdownmenu-padding; +$dropdownmenu-border: 1px solid $medium-gray; +$dropdown-menu-item-color-active: get-color(primary); +$dropdown-menu-item-background-active: transparent; + +// 19. Flexbox Utilities +// --------------------- + +$flex-source-ordering-count: 6; +$flexbox-responsive-breakpoints: true; + +// 20. Forms +// --------- + +$fieldset-border: 1px solid $medium-gray; +$fieldset-padding: rem-calc(20); +$fieldset-margin: rem-calc(18 0); +$legend-padding: rem-calc(0 3); +$form-spacing: rem-calc(16); +$helptext-color: $black; +$helptext-font-size: rem-calc(13); +$helptext-font-style: italic; +$input-prefix-color: $black; +$input-prefix-background: $light-gray; +$input-prefix-border: 1px solid $medium-gray; +$input-prefix-padding: 1rem; +$form-label-color: $black; +$form-label-font-size: rem-calc(14); +$form-label-font-weight: $global-weight-normal; +$form-label-line-height: 1.8; +$select-background: $white; +$select-triangle-color: $dark-gray; +$select-radius: $global-radius; +$input-color: $black; +$input-placeholder-color: $medium-gray; +$input-font-family: inherit; +$input-font-size: rem-calc(16); +$input-font-weight: $global-weight-normal; +$input-line-height: $global-lineheight; +$input-background: $white; +$input-background-focus: $white; +$input-background-disabled: $light-gray; +$input-border: 1px solid $medium-gray; +$input-border-focus: 1px solid $dark-gray; +$input-padding: $form-spacing / 2; +$input-shadow: inset 0 1px 2px rgba($black, 0.1); +$input-shadow-focus: 0 0 5px $medium-gray; +$input-cursor-disabled: not-allowed; +$input-transition: box-shadow 0.5s, border-color 0.25s ease-in-out; +$input-number-spinners: true; +$input-radius: $global-radius; +$form-button-radius: $global-radius; + +// 21. Label +// --------- + +$label-background: $primary-color; +$label-color: $white; +$label-color-alt: $black; +$label-palette: $foundation-palette; +$label-font-size: 0.8rem; +$label-padding: 0.33333rem 0.5rem; +$label-radius: $global-radius; + +// 22. Media Object +// ---------------- + +$mediaobject-margin-bottom: $global-margin; +$mediaobject-section-padding: $global-padding; +$mediaobject-image-width-stacked: 100%; + +// 23. Menu +// -------- + +$menu-margin: 0; +$menu-nested-margin: $global-menu-nested-margin; +$menu-items-padding: $global-menu-padding; +$menu-simple-margin: 1rem; +$menu-item-color-active: $white; +$menu-item-background-active: get-color(primary); +$menu-icon-spacing: 0.25rem; +$menu-item-background-hover: $light-gray; +$menu-state-back-compat: true; +$menu-centered-back-compat: true; + +// 24. Meter +// --------- + +$meter-height: 1rem; +$meter-radius: $global-radius; +$meter-background: $medium-gray; +$meter-fill-good: $success-color; +$meter-fill-medium: $warning-color; +$meter-fill-bad: $alert-color; + +// 25. Off-canvas +// -------------- + +$offcanvas-size: 250px; +$offcanvas-vertical-size: 250px; +$offcanvas-background: $light-gray; +$offcanvas-shadow: 0 0 10px rgba($black, 0.7); +$offcanvas-inner-shadow-size: 20px; +$offcanvas-inner-shadow-color: rgba($black, 0.25); +$offcanvas-overlay-zindex: 11; +$offcanvas-push-zindex: 12; +$offcanvas-overlap-zindex: 13; +$offcanvas-reveal-zindex: 12; +$offcanvas-transition-length: 0.5s; +$offcanvas-transition-timing: ease; +$offcanvas-fixed-reveal: true; +$offcanvas-exit-background: rgba($white, 0.25); +$maincontent-class: 'off-canvas-content'; + +// 26. Orbit +// --------- + +$orbit-bullet-background: $medium-gray; +$orbit-bullet-background-active: $dark-gray; +$orbit-bullet-diameter: 1.2rem; +$orbit-bullet-margin: 0.1rem; +$orbit-bullet-margin-top: 0.8rem; +$orbit-bullet-margin-bottom: 0.8rem; +$orbit-caption-background: rgba($black, 0.5); +$orbit-caption-padding: 1rem; +$orbit-control-background-hover: rgba($black, 0.5); +$orbit-control-padding: 1rem; +$orbit-control-zindex: 10; + +// 27. Pagination +// -------------- + +$pagination-font-size: rem-calc(14); +$pagination-margin-bottom: $global-margin; +$pagination-item-color: $black; +$pagination-item-padding: rem-calc(3 10); +$pagination-item-spacing: rem-calc(1); +$pagination-radius: $global-radius; +$pagination-item-background-hover: $light-gray; +$pagination-item-background-current: $primary-color; +$pagination-item-color-current: $white; +$pagination-item-color-disabled: $medium-gray; +$pagination-ellipsis-color: $black; +$pagination-mobile-items: false; +$pagination-mobile-current-item: false; +$pagination-arrows: true; + +// 28. Progress Bar +// ---------------- + +$progress-height: 1rem; +$progress-background: $medium-gray; +$progress-margin-bottom: $global-margin; +$progress-meter-background: $primary-color; +$progress-radius: $global-radius; + +// 29. Prototype Arrow +// ------------------- + +$prototype-arrow-directions: ( + down, + up, + right, + left +); +$prototype-arrow-size: 0.4375rem; +$prototype-arrow-color: $black; + +// 30. Prototype Border-Box +// ------------------------ + +$prototype-border-box-breakpoints: $global-prototype-breakpoints; + +// 31. Prototype Border-None +// ------------------------- + +$prototype-border-none-breakpoints: $global-prototype-breakpoints; + +// 32. Prototype Bordered +// ---------------------- + +$prototype-bordered-breakpoints: $global-prototype-breakpoints; +$prototype-border-width: rem-calc(1); +$prototype-border-type: solid; +$prototype-border-color: $medium-gray; + +// 33. Prototype Display +// --------------------- + +$prototype-display-breakpoints: $global-prototype-breakpoints; +$prototype-display: ( + inline, + inline-block, + block, + table, + table-cell +); + +// 34. Prototype Font-Styling +// -------------------------- + +$prototype-font-breakpoints: $global-prototype-breakpoints; +$prototype-wide-letter-spacing: rem-calc(4); +$prototype-font-normal: $global-weight-normal; +$prototype-font-bold: $global-weight-bold; + +// 35. Prototype List-Style-Type +// ----------------------------- + +$prototype-list-breakpoints: $global-prototype-breakpoints; +$prototype-style-type-unordered: ( + disc, + circle, + square +); +$prototype-style-type-ordered: ( + decimal, + lower-alpha, + lower-latin, + lower-roman, + upper-alpha, + upper-latin, + upper-roman +); + +// 36. Prototype Overflow +// ---------------------- + +$prototype-overflow-breakpoints: $global-prototype-breakpoints; +$prototype-overflow: ( + visible, + hidden, + scroll +); + +// 37. Prototype Position +// ---------------------- + +$prototype-position-breakpoints: $global-prototype-breakpoints; +$prototype-position: ( + static, + relative, + absolute, + fixed +); +$prototype-position-z-index: 975; + +// 38. Prototype Rounded +// --------------------- + +$prototype-rounded-breakpoints: $global-prototype-breakpoints; +$prototype-border-radius: rem-calc(3); + +// 39. Prototype Separator +// ----------------------- + +$prototype-separator-breakpoints: $global-prototype-breakpoints; +$prototype-separator-align: center; +$prototype-separator-height: rem-calc(2); +$prototype-separator-width: 3rem; +$prototype-separator-background: $primary-color; +$prototype-separator-margin-top: $global-margin; + +// 40. Prototype Shadow +// -------------------- + +$prototype-shadow-breakpoints: $global-prototype-breakpoints; +$prototype-box-shadow: 0 2px 5px 0 rgba(0,0,0,.16), + 0 2px 10px 0 rgba(0,0,0,.12); + +// 41. Prototype Sizing +// -------------------- + +$prototype-sizing-breakpoints: $global-prototype-breakpoints; +$prototype-sizing: ( + width, + height +); +$prototype-sizes: ( + 25: 25%, + 50: 50%, + 75: 75%, + 100: 100% +); + +// 42. Prototype Spacing +// --------------------- + +$prototype-spacing-breakpoints: $global-prototype-breakpoints; +$prototype-spacers-count: 3; + +// 43. Prototype Text-Decoration +// ----------------------------- + +$prototype-decoration-breakpoints: $global-prototype-breakpoints; +$prototype-text-decoration: ( + overline, + underline, + line-through, +); + +// 44. Prototype Text-Transformation +// --------------------------------- + +$prototype-transformation-breakpoints: $global-prototype-breakpoints; +$prototype-text-transformation: ( + lowercase, + uppercase, + capitalize +); + +// 45. Prototype Text-Utilities +// ---------------------------- + +$prototype-utilities-breakpoints: $global-prototype-breakpoints; +$prototype-text-overflow: ellipsis; + +// 46. Responsive Embed +// -------------------- + +$responsive-embed-margin-bottom: rem-calc(16); +$responsive-embed-ratios: ( + default: 4 by 3, + widescreen: 16 by 9, +); + +// 47. Reveal +// ---------- + +$reveal-background: $white; +$reveal-width: 600px; +$reveal-max-width: $global-width; +$reveal-padding: $global-padding; +$reveal-border: 1px solid $medium-gray; +$reveal-radius: $global-radius; +$reveal-zindex: 1005; +$reveal-overlay-background: rgba($black, 0.45); + +// 48. Slider +// ---------- + +$slider-width-vertical: 0.5rem; +$slider-transition: all 0.2s ease-in-out; +$slider-height: 0.5rem; +$slider-background: $light-gray; +$slider-fill-background: $medium-gray; +$slider-handle-height: 1.4rem; +$slider-handle-width: 1.4rem; +$slider-handle-background: $primary-color; +$slider-opacity-disabled: 0.25; +$slider-radius: $global-radius; + +// 49. Switch +// ---------- + +$switch-background: $medium-gray; +$switch-background-active: $primary-color; +$switch-height: 2rem; +$switch-height-tiny: 1.5rem; +$switch-height-small: 1.75rem; +$switch-height-large: 2.5rem; +$switch-radius: $global-radius; +$switch-margin: $global-margin; +$switch-paddle-background: $white; +$switch-paddle-offset: 0.25rem; +$switch-paddle-radius: $global-radius; +$switch-paddle-transition: all 0.25s ease-out; + +// 50. Table +// --------- + +$table-background: $white; +$table-color-scale: 5%; +$table-border: 1px solid smart-scale($table-background, $table-color-scale); +$table-padding: rem-calc(8 10 10); +$table-hover-scale: 2%; +$table-row-hover: darken($table-background, $table-hover-scale); +$table-row-stripe-hover: darken($table-background, $table-color-scale + $table-hover-scale); +$table-is-striped: true; +$table-striped-background: smart-scale($table-background, $table-color-scale); +$table-stripe: even; +$table-head-background: smart-scale($table-background, $table-color-scale / 2); +$table-head-row-hover: darken($table-head-background, $table-hover-scale); +$table-foot-background: smart-scale($table-background, $table-color-scale); +$table-foot-row-hover: darken($table-foot-background, $table-hover-scale); +$table-head-font-color: $body-font-color; +$table-foot-font-color: $body-font-color; +$show-header-for-stacked: false; +$table-stack-breakpoint: medium; + +// 51. Tabs +// -------- + +$tab-margin: 0; +$tab-background: $white; +$tab-color: $primary-color; +$tab-background-active: $light-gray; +$tab-active-color: $primary-color; +$tab-item-font-size: rem-calc(12); +$tab-item-background-hover: $white; +$tab-item-padding: 1.25rem 1.5rem; +$tab-expand-max: 6; +$tab-content-background: $white; +$tab-content-border: $light-gray; +$tab-content-color: $body-font-color; +$tab-content-padding: 1rem; + +// 52. Thumbnail +// ------------- + +$thumbnail-border: solid 4px $white; +$thumbnail-margin-bottom: $global-margin; +$thumbnail-shadow: 0 0 0 1px rgba($black, 0.2); +$thumbnail-shadow-hover: 0 0 6px 1px rgba($primary-color, 0.5); +$thumbnail-transition: box-shadow 200ms ease-out; +$thumbnail-radius: $global-radius; + +// 53. Title Bar +// ------------- + +$titlebar-background: $black; +$titlebar-color: $white; +$titlebar-padding: 0.5rem; +$titlebar-text-font-weight: bold; +$titlebar-icon-color: $white; +$titlebar-icon-color-hover: $medium-gray; +$titlebar-icon-spacing: 0.25rem; + +// 54. Tooltip +// ----------- + +$has-tip-cursor: help; +$has-tip-font-weight: $global-weight-bold; +$has-tip-border-bottom: dotted 1px $dark-gray; +$tooltip-background-color: $black; +$tooltip-color: $white; +$tooltip-padding: 0.75rem; +$tooltip-max-width: 10rem; +$tooltip-font-size: $small-font-size; +$tooltip-pip-width: 0.75rem; +$tooltip-pip-height: $tooltip-pip-width * 0.866; +$tooltip-radius: $global-radius; + +// 55. Top Bar +// ----------- + +$topbar-padding: 0.5rem; +$topbar-background: $light-gray; +$topbar-submenu-background: $topbar-background; +$topbar-title-spacing: 0.5rem 1rem 0.5rem 0; +$topbar-input-width: 200px; +$topbar-unstack-breakpoint: medium; + +// 56. Xy Grid +// ----------- + +$xy-grid: true; +$grid-container: $global-width; +$grid-columns: 12; +$grid-margin-gutters: ( + small: 20px, + medium: 30px +); +$grid-padding-gutters: $grid-margin-gutters; +$grid-container-padding: $grid-padding-gutters; +$grid-container-max: $global-width; +$block-grid-max: 8; + diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index d05ea0f511..a152282fce 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -12,4 +12,6 @@ * *= require_tree . *= require_self + *= require foundation_and_overrides + */ diff --git a/app/assets/stylesheets/foundation_and_overrides.scss b/app/assets/stylesheets/foundation_and_overrides.scss new file mode 100644 index 0000000000..2066155081 --- /dev/null +++ b/app/assets/stylesheets/foundation_and_overrides.scss @@ -0,0 +1,53 @@ +@charset 'utf-8'; + +@import 'settings'; +@import 'foundation'; + +// If you'd like to include motion-ui the foundation-rails gem comes prepackaged with it, uncomment the 3 @imports, if you are not using the gem you need to install the motion-ui sass package. +// +// @import 'motion-ui/motion-ui'; + +// We include everything by default. To slim your CSS, remove components you don't use. + +@include foundation-global-styles; +@include foundation-grid; +@include foundation-typography; +@include foundation-button; +@include foundation-forms; +@include foundation-visibility-classes; +@include foundation-float-classes; +@include foundation-accordion; +@include foundation-accordion-menu; +@include foundation-badge; +@include foundation-breadcrumbs; +@include foundation-button-group; +@include foundation-callout; +@include foundation-card; +@include foundation-close-button; +@include foundation-drilldown-menu; +@include foundation-dropdown; +@include foundation-dropdown-menu; +@include foundation-responsive-embed; +@include foundation-label; +@include foundation-media-object; +@include foundation-menu; +@include foundation-menu-icon; +@include foundation-off-canvas; +@include foundation-orbit; +@include foundation-pagination; +@include foundation-progress-bar; +@include foundation-slider; +@include foundation-sticky; +@include foundation-reveal; +@include foundation-switch; +@include foundation-table; +@include foundation-tabs; +@include foundation-thumbnail; +@include foundation-title-bar; +@include foundation-tooltip; +@include foundation-top-bar; + +// If you'd like to include motion-ui the foundation-rails gem comes prepackaged with it, uncomment the 3 @imports, if you are not using the gem you need to install the motion-ui sass package. +// +// @include motion-ui-transitions; +// @include motion-ui-animations; diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 008c56f923..cd60004891 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,14 +1,19 @@ - + - Betsy - <%= csrf_meta_tags %> + + + + <%= content_for?(:title) ? yield(:title) : "Untitled" %> - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag "application", 'data-turbolinks-track' => true %> + <%= csrf_meta_tags %> + <%= yield %> + From b349052a8a1de43d473583ffe65b79105cc2880c Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Tue, 17 Oct 2017 16:44:48 -0700 Subject: [PATCH 003/382] Add review and murchant models --- app/models/merchant.rb | 2 ++ app/models/review.rb | 2 ++ db/migrate/20171017234150_create_merchants.rb | 12 +++++++ db/migrate/20171017234347_create_reviews.rb | 11 ++++++ db/schema.rb | 35 +++++++++++++++++++ test/fixtures/merchants.yml | 13 +++++++ test/fixtures/reviews.yml | 11 ++++++ test/models/merchant_test.rb | 9 +++++ test/models/review_test.rb | 9 +++++ 9 files changed, 104 insertions(+) create mode 100644 app/models/merchant.rb create mode 100644 app/models/review.rb create mode 100644 db/migrate/20171017234150_create_merchants.rb create mode 100644 db/migrate/20171017234347_create_reviews.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/merchants.yml create mode 100644 test/fixtures/reviews.yml create mode 100644 test/models/merchant_test.rb create mode 100644 test/models/review_test.rb diff --git a/app/models/merchant.rb b/app/models/merchant.rb new file mode 100644 index 0000000000..0440407160 --- /dev/null +++ b/app/models/merchant.rb @@ -0,0 +1,2 @@ +class Merchant < ApplicationRecord +end diff --git a/app/models/review.rb b/app/models/review.rb new file mode 100644 index 0000000000..b2ca4935ed --- /dev/null +++ b/app/models/review.rb @@ -0,0 +1,2 @@ +class Review < ApplicationRecord +end diff --git a/db/migrate/20171017234150_create_merchants.rb b/db/migrate/20171017234150_create_merchants.rb new file mode 100644 index 0000000000..10bcafe477 --- /dev/null +++ b/db/migrate/20171017234150_create_merchants.rb @@ -0,0 +1,12 @@ +class CreateMerchants < ActiveRecord::Migration[5.1] + def change + create_table :merchants do |t| + t.string :name + t.string :email + t.string :uid + t.string :provider + + t.timestamps + end + end +end diff --git a/db/migrate/20171017234347_create_reviews.rb b/db/migrate/20171017234347_create_reviews.rb new file mode 100644 index 0000000000..2befbc57dd --- /dev/null +++ b/db/migrate/20171017234347_create_reviews.rb @@ -0,0 +1,11 @@ +class CreateReviews < ActiveRecord::Migration[5.1] + def change + create_table :reviews do |t| + t.integer :product_id + t.text :description + t.integer :rating + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000000..4795656052 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,35 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 20171017234347) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "merchants", force: :cascade do |t| + t.string "name" + t.string "email" + t.string "uid" + t.string "provider" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "reviews", force: :cascade do |t| + t.integer "product_id" + t.text "description" + t.integer "rating" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/fixtures/merchants.yml b/test/fixtures/merchants.yml new file mode 100644 index 0000000000..df860d7f66 --- /dev/null +++ b/test/fixtures/merchants.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + email: MyString + uid: MyString + provider: MyString + +two: + name: MyString + email: MyString + uid: MyString + provider: MyString diff --git a/test/fixtures/reviews.yml b/test/fixtures/reviews.yml new file mode 100644 index 0000000000..4332c2fd4d --- /dev/null +++ b/test/fixtures/reviews.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + product_id: 1 + description: MyText + rating: 1 + +two: + product_id: 1 + description: MyText + rating: 1 diff --git a/test/models/merchant_test.rb b/test/models/merchant_test.rb new file mode 100644 index 0000000000..1cc99d985f --- /dev/null +++ b/test/models/merchant_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Merchant do + let(:merchant) { Merchant.new } + + it "must be valid" do + value(merchant).must_be :valid? + end +end diff --git a/test/models/review_test.rb b/test/models/review_test.rb new file mode 100644 index 0000000000..ce8378a033 --- /dev/null +++ b/test/models/review_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Review do + let(:review) { Review.new } + + it "must be valid" do + value(review).must_be :valid? + end +end From d5ebc1942d14e2e0c19de5ae884422d17b4874b1 Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Tue, 17 Oct 2017 16:49:13 -0700 Subject: [PATCH 004/382] Add category and products models --- app/models/category.rb | 2 ++ app/models/product.rb | 2 ++ db/migrate/20171017234623_create_products.rb | 14 ++++++++++++++ .../20171017234842_create_categories.rb | 9 +++++++++ db/schema.rb | 19 ++++++++++++++++++- test/fixtures/categories.yml | 7 +++++++ test/fixtures/products.yml | 15 +++++++++++++++ test/models/category_test.rb | 9 +++++++++ test/models/product_test.rb | 9 +++++++++ 9 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 app/models/category.rb create mode 100644 app/models/product.rb create mode 100644 db/migrate/20171017234623_create_products.rb create mode 100644 db/migrate/20171017234842_create_categories.rb create mode 100644 test/fixtures/categories.yml create mode 100644 test/fixtures/products.yml create mode 100644 test/models/category_test.rb create mode 100644 test/models/product_test.rb diff --git a/app/models/category.rb b/app/models/category.rb new file mode 100644 index 0000000000..54cb6aee3f --- /dev/null +++ b/app/models/category.rb @@ -0,0 +1,2 @@ +class Category < ApplicationRecord +end diff --git a/app/models/product.rb b/app/models/product.rb new file mode 100644 index 0000000000..35a85acab3 --- /dev/null +++ b/app/models/product.rb @@ -0,0 +1,2 @@ +class Product < ApplicationRecord +end diff --git a/db/migrate/20171017234623_create_products.rb b/db/migrate/20171017234623_create_products.rb new file mode 100644 index 0000000000..3ac33f9048 --- /dev/null +++ b/db/migrate/20171017234623_create_products.rb @@ -0,0 +1,14 @@ +class CreateProducts < ActiveRecord::Migration[5.1] + def change + create_table :products do |t| + t.integer :merchant_id + t.integer :inventory + t.float :price + t.text :description + t.boolean :visible, default: true + t.string :image_url + + t.timestamps + end + end +end diff --git a/db/migrate/20171017234842_create_categories.rb b/db/migrate/20171017234842_create_categories.rb new file mode 100644 index 0000000000..5bef4913b8 --- /dev/null +++ b/db/migrate/20171017234842_create_categories.rb @@ -0,0 +1,9 @@ +class CreateCategories < ActiveRecord::Migration[5.1] + def change + create_table :categories do |t| + t.string :name + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 4795656052..e46e13acf5 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,11 +10,17 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20171017234347) do +ActiveRecord::Schema.define(version: 20171017234842) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "categories", force: :cascade do |t| + t.string "name" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "merchants", force: :cascade do |t| t.string "name" t.string "email" @@ -24,6 +30,17 @@ t.datetime "updated_at", null: false end + create_table "products", force: :cascade do |t| + t.integer "merchant_id" + t.integer "inventory" + t.float "price" + t.text "description" + t.boolean "visible", default: true + t.string "image_url" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "reviews", force: :cascade do |t| t.integer "product_id" t.text "description" diff --git a/test/fixtures/categories.yml b/test/fixtures/categories.yml new file mode 100644 index 0000000000..56066c68af --- /dev/null +++ b/test/fixtures/categories.yml @@ -0,0 +1,7 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + +two: + name: MyString diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml new file mode 100644 index 0000000000..c0b9ff4ace --- /dev/null +++ b/test/fixtures/products.yml @@ -0,0 +1,15 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + merchant_id: 1 + inventory: 1 + price: 1.5 + description: MyText + visible: false + +two: + merchant_id: 1 + inventory: 1 + price: 1.5 + description: MyText + visible: false diff --git a/test/models/category_test.rb b/test/models/category_test.rb new file mode 100644 index 0000000000..781320ad8e --- /dev/null +++ b/test/models/category_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Category do + let(:category) { Category.new } + + it "must be valid" do + value(category).must_be :valid? + end +end diff --git a/test/models/product_test.rb b/test/models/product_test.rb new file mode 100644 index 0000000000..a618b0a156 --- /dev/null +++ b/test/models/product_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Product do + let(:product) { Product.new } + + it "must be valid" do + value(product).must_be :valid? + end +end From bcfe289e6021f2d9a9074dfd52f03e0453baa65b Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Tue, 17 Oct 2017 16:58:06 -0700 Subject: [PATCH 005/382] Add OrderItem model --- app/models/orderitem.rb | 2 ++ db/migrate/20171017235648_create_orderitems.rb | 13 +++++++++++++ db/schema.rb | 12 +++++++++++- test/fixtures/orderitems.yml | 15 +++++++++++++++ test/models/orderitem_test.rb | 9 +++++++++ 5 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 app/models/orderitem.rb create mode 100644 db/migrate/20171017235648_create_orderitems.rb create mode 100644 test/fixtures/orderitems.yml create mode 100644 test/models/orderitem_test.rb diff --git a/app/models/orderitem.rb b/app/models/orderitem.rb new file mode 100644 index 0000000000..ebe5c835d9 --- /dev/null +++ b/app/models/orderitem.rb @@ -0,0 +1,2 @@ +class Orderitem < ApplicationRecord +end diff --git a/db/migrate/20171017235648_create_orderitems.rb b/db/migrate/20171017235648_create_orderitems.rb new file mode 100644 index 0000000000..a5ed008e7f --- /dev/null +++ b/db/migrate/20171017235648_create_orderitems.rb @@ -0,0 +1,13 @@ +class CreateOrderitems < ActiveRecord::Migration[5.1] + def change + create_table :orderitems do |t| + t.integer :product_id + t.integer :order_id + t.integer :quantity + t.float :cost + t.boolean :shipped_status, default: false + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index e46e13acf5..3b38ce3a9a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20171017234842) do +ActiveRecord::Schema.define(version: 20171017235648) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -30,6 +30,16 @@ t.datetime "updated_at", null: false end + create_table "orderitems", force: :cascade do |t| + t.integer "product_id" + t.integer "order_id" + t.integer "quantity" + t.float "cost" + t.boolean "shipped_status", default: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "products", force: :cascade do |t| t.integer "merchant_id" t.integer "inventory" diff --git a/test/fixtures/orderitems.yml b/test/fixtures/orderitems.yml new file mode 100644 index 0000000000..7f70214eb2 --- /dev/null +++ b/test/fixtures/orderitems.yml @@ -0,0 +1,15 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + product_id: + order_id: 1 + quantity: 1 + cost: 1.5 + shipped_status: false + +two: + product_id: + order_id: 1 + quantity: 1 + cost: 1.5 + shipped_status: false diff --git a/test/models/orderitem_test.rb b/test/models/orderitem_test.rb new file mode 100644 index 0000000000..b8bc7d17d6 --- /dev/null +++ b/test/models/orderitem_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Orderitem do + let(:orderitem) { Orderitem.new } + + it "must be valid" do + value(orderitem).must_be :valid? + end +end From 6f2e9630dbc2051f9157e5753fe5df9f4b4c8a4d Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Tue, 17 Oct 2017 17:03:23 -0700 Subject: [PATCH 006/382] Add Orders model --- app/models/order.rb | 2 ++ db/migrate/20171018000056_create_orders.rb | 17 ++++++++++++++++ db/schema.rb | 16 ++++++++++++++- test/fixtures/orders.yml | 23 ++++++++++++++++++++++ test/models/order_test.rb | 9 +++++++++ 5 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 app/models/order.rb create mode 100644 db/migrate/20171018000056_create_orders.rb create mode 100644 test/fixtures/orders.yml create mode 100644 test/models/order_test.rb diff --git a/app/models/order.rb b/app/models/order.rb new file mode 100644 index 0000000000..10281b3450 --- /dev/null +++ b/app/models/order.rb @@ -0,0 +1,2 @@ +class Order < ApplicationRecord +end diff --git a/db/migrate/20171018000056_create_orders.rb b/db/migrate/20171018000056_create_orders.rb new file mode 100644 index 0000000000..8b85698a94 --- /dev/null +++ b/db/migrate/20171018000056_create_orders.rb @@ -0,0 +1,17 @@ +class CreateOrders < ActiveRecord::Migration[5.1] + def change + create_table :orders do |t| + t.string :email + t.string :address + t.string :cc_name + t.string :cc_number + t.date :cc_exp + t.string :cc_cvv + t.string :zip + t.string :status, default: "pending" + t.date :date_submitted + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 3b38ce3a9a..c5e238e95d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20171017235648) do +ActiveRecord::Schema.define(version: 20171018000056) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -40,6 +40,20 @@ t.datetime "updated_at", null: false end + create_table "orders", force: :cascade do |t| + t.string "email" + t.string "address" + t.string "cc_name" + t.string "cc_number" + t.date "cc_exp" + t.string "cc_cvv" + t.string "zip" + t.string "status", default: "pending" + t.date "date_submitted" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "products", force: :cascade do |t| t.integer "merchant_id" t.integer "inventory" diff --git a/test/fixtures/orders.yml b/test/fixtures/orders.yml new file mode 100644 index 0000000000..aaa804a40e --- /dev/null +++ b/test/fixtures/orders.yml @@ -0,0 +1,23 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + email: MyString + address: MyString + name: MyString + cc_number: MyString + cc_exp: 2017-10-17 + cc_cvv: MyString + zip: MyString + status: MyString + date_submitted: 2017-10-17 + +two: + email: MyString + address: MyString + name: MyString + cc_number: MyString + cc_exp: 2017-10-17 + cc_cvv: MyString + zip: MyString + status: MyString + date_submitted: 2017-10-17 diff --git a/test/models/order_test.rb b/test/models/order_test.rb new file mode 100644 index 0000000000..df80f10fb6 --- /dev/null +++ b/test/models/order_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Order do + let(:order) { Order.new } + + it "must be valid" do + value(order).must_be :valid? + end +end From 1d70680938c78b729932cefec2a89c3fcdc06231 Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Tue, 17 Oct 2017 17:18:51 -0700 Subject: [PATCH 007/382] All models are added --- app/models/category.rb | 1 + app/models/merchant.rb | 1 + app/models/order.rb | 1 + app/models/orderitem.rb | 2 ++ app/models/product.rb | 4 ++++ app/models/review.rb | 1 + 6 files changed, 10 insertions(+) diff --git a/app/models/category.rb b/app/models/category.rb index 54cb6aee3f..f3218758f1 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -1,2 +1,3 @@ class Category < ApplicationRecord + has_and_belongs_to_many :products end diff --git a/app/models/merchant.rb b/app/models/merchant.rb index 0440407160..07aacc445d 100644 --- a/app/models/merchant.rb +++ b/app/models/merchant.rb @@ -1,2 +1,3 @@ class Merchant < ApplicationRecord + has_many :products end diff --git a/app/models/order.rb b/app/models/order.rb index 10281b3450..6148a1a172 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -1,2 +1,3 @@ class Order < ApplicationRecord + has_many :orderitems end diff --git a/app/models/orderitem.rb b/app/models/orderitem.rb index ebe5c835d9..1d5255a4c5 100644 --- a/app/models/orderitem.rb +++ b/app/models/orderitem.rb @@ -1,2 +1,4 @@ class Orderitem < ApplicationRecord + belongs_to :product + belongs_to :order end diff --git a/app/models/product.rb b/app/models/product.rb index 35a85acab3..06773a6322 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -1,2 +1,6 @@ class Product < ApplicationRecord + belongs_to :merchant + has_and_belongs_to_many :categories + has_many :orderitems + has_many :reviews end diff --git a/app/models/review.rb b/app/models/review.rb index b2ca4935ed..4291b35f71 100644 --- a/app/models/review.rb +++ b/app/models/review.rb @@ -1,2 +1,3 @@ class Review < ApplicationRecord + belongs_to :product end From d3e7eeb3e717046f9f05861891aa0d711c997cd5 Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Tue, 17 Oct 2017 21:08:39 -0700 Subject: [PATCH 008/382] Add fixtures for products --- test/fixtures/products.yml | 43 +++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml index c0b9ff4ace..537c947154 100644 --- a/test/fixtures/products.yml +++ b/test/fixtures/products.yml @@ -1,15 +1,38 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: +spider_plant: merchant_id: 1 - inventory: 1 - price: 1.5 - description: MyText - visible: false + name: Spider Plant + inventory: 5 + price: 8.75 + description: A full grown spider plant with some babies growing off it. + visible: true + image_url: https://images-na.ssl-images-amazon.com/images/I/7120dmLtRmL._SL1000_.jpg -two: +echeveria: merchant_id: 1 - inventory: 1 - price: 1.5 - description: MyText - visible: false + name: Echeveria + inventory: 2 + price: 5.50 + description: A small Echeveria plant + visible: true + image_url: https://altmanplants.com/wp-content/uploads/Echeveria-Bluebird.jpg + + +red_cap_cactus: + merchant_id: 2 + name: Red Cap Cactus + inventory: 10 + price: 6.00 + description: A cactus with a pink flower at the top. + visible: true + image_url: http://www.floristika.com.my/florist/image/cache/data/cactus%20red%20cap-500x612.jpg + +audrey_ficus: + merchant_id: 3 + name: Audrey Ficus + inventory: 3 + price: 80.00 + description: A small tree with large leaves + visible: true + image_url: https://www.plantshed.com//media/catalog/product/cache/1/image/9df78eab33525d08d6e5fb8d27136e95/p/s/ps20008_1_1.jpg From 117928263c125155be897506f1ee5df6677eb6fe Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Tue, 17 Oct 2017 21:12:55 -0700 Subject: [PATCH 009/382] Add category fixtures --- test/fixtures/categories.yml | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/test/fixtures/categories.yml b/test/fixtures/categories.yml index 56066c68af..c4a0626267 100644 --- a/test/fixtures/categories.yml +++ b/test/fixtures/categories.yml @@ -1,7 +1,22 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - name: MyString +perennials: + name: Perennials -two: - name: MyString +annuals: + name: Annuals + +succulents: + name: Succulents + +cactus: + name: Cactus + +house_plants: + name: House Plants + +terrarium_plants: + name: Terrarium Plants + +flower_bulb: + name: Flower Bulbs From 144f0f9805ac6fbb256ab599614836b3ddd552e3 Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Tue, 17 Oct 2017 21:22:26 -0700 Subject: [PATCH 010/382] Add category to product fixtures --- test/fixtures/products.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml index 537c947154..50f25672f6 100644 --- a/test/fixtures/products.yml +++ b/test/fixtures/products.yml @@ -1,5 +1,7 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + + spider_plant: merchant_id: 1 name: Spider Plant @@ -8,6 +10,7 @@ spider_plant: description: A full grown spider plant with some babies growing off it. visible: true image_url: https://images-na.ssl-images-amazon.com/images/I/7120dmLtRmL._SL1000_.jpg + category: House Plants echeveria: merchant_id: 1 @@ -17,6 +20,7 @@ echeveria: description: A small Echeveria plant visible: true image_url: https://altmanplants.com/wp-content/uploads/Echeveria-Bluebird.jpg + category: Succulents red_cap_cactus: @@ -27,6 +31,7 @@ red_cap_cactus: description: A cactus with a pink flower at the top. visible: true image_url: http://www.floristika.com.my/florist/image/cache/data/cactus%20red%20cap-500x612.jpg + category: Cactus audrey_ficus: merchant_id: 3 @@ -36,3 +41,4 @@ audrey_ficus: description: A small tree with large leaves visible: true image_url: https://www.plantshed.com//media/catalog/product/cache/1/image/9df78eab33525d08d6e5fb8d27136e95/p/s/ps20008_1_1.jpg + category: House Plants From a1828d5d7784e2c9004905f9d87d8f2cf4fc785f Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Tue, 17 Oct 2017 21:26:31 -0700 Subject: [PATCH 011/382] Add merchant fixtures --- test/fixtures/merchants.yml | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/test/fixtures/merchants.yml b/test/fixtures/merchants.yml index df860d7f66..b4d7301d8e 100644 --- a/test/fixtures/merchants.yml +++ b/test/fixtures/merchants.yml @@ -1,13 +1,25 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - name: MyString - email: MyString - uid: MyString - provider: MyString +tamira: + name: Tamira + email: tv@ada.edu + uid: 1111111111111111 + provider: Github -two: - name: MyString - email: MyString - uid: MyString +diane: + name: Diane + email: dl@ada.edu + uid: 2222222222222222 provider: MyString + +kimberley: + name: Kimberley + email: kz@ada.edu + uid: 3333333333333333 + provider: Github + +nkiru: + name: Nkiru + email: nk@ada.edu + uid: 4444444444444444 + provider: Github From 0ab43b79cf4196243b19c953837cf390500a4921 Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Tue, 17 Oct 2017 21:28:30 -0700 Subject: [PATCH 012/382] Add merchant keys to product fixtures --- test/fixtures/products.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml index 50f25672f6..3e02c1dc2c 100644 --- a/test/fixtures/products.yml +++ b/test/fixtures/products.yml @@ -3,7 +3,7 @@ spider_plant: - merchant_id: 1 + merchant: tamira name: Spider Plant inventory: 5 price: 8.75 @@ -13,7 +13,7 @@ spider_plant: category: House Plants echeveria: - merchant_id: 1 + merchant: tamira name: Echeveria inventory: 2 price: 5.50 @@ -24,7 +24,7 @@ echeveria: red_cap_cactus: - merchant_id: 2 + merchant: diane name: Red Cap Cactus inventory: 10 price: 6.00 @@ -34,7 +34,7 @@ red_cap_cactus: category: Cactus audrey_ficus: - merchant_id: 3 + merchant: diane name: Audrey Ficus inventory: 3 price: 80.00 From 1016fcd3da0d2b2b68e6931577d74930d553c63c Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Tue, 17 Oct 2017 21:29:46 -0700 Subject: [PATCH 013/382] Fixed catefory in product fixture to reference category key --- test/fixtures/products.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml index 3e02c1dc2c..4f021d9a20 100644 --- a/test/fixtures/products.yml +++ b/test/fixtures/products.yml @@ -10,17 +10,17 @@ spider_plant: description: A full grown spider plant with some babies growing off it. visible: true image_url: https://images-na.ssl-images-amazon.com/images/I/7120dmLtRmL._SL1000_.jpg - category: House Plants + category: house_plants echeveria: - merchant: tamira + merchant: tamira name: Echeveria inventory: 2 price: 5.50 description: A small Echeveria plant visible: true image_url: https://altmanplants.com/wp-content/uploads/Echeveria-Bluebird.jpg - category: Succulents + category: succulents red_cap_cactus: @@ -31,7 +31,7 @@ red_cap_cactus: description: A cactus with a pink flower at the top. visible: true image_url: http://www.floristika.com.my/florist/image/cache/data/cactus%20red%20cap-500x612.jpg - category: Cactus + category: cactus audrey_ficus: merchant: diane @@ -41,4 +41,4 @@ audrey_ficus: description: A small tree with large leaves visible: true image_url: https://www.plantshed.com//media/catalog/product/cache/1/image/9df78eab33525d08d6e5fb8d27136e95/p/s/ps20008_1_1.jpg - category: House Plants + category: house_plants From 64655f41666f1329d310b4446c862c2a0779d28d Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Tue, 17 Oct 2017 21:35:35 -0700 Subject: [PATCH 014/382] Add OrderItem fixture, but don't have Order yet so I can't reference that by key --- test/fixtures/orderitems.yml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/test/fixtures/orderitems.yml b/test/fixtures/orderitems.yml index 7f70214eb2..759db690be 100644 --- a/test/fixtures/orderitems.yml +++ b/test/fixtures/orderitems.yml @@ -1,15 +1,22 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - product_id: - order_id: 1 + product: spider_plant + order: NEED TO ADD THIS AFTER MAKING ORDER.YML quantity: 1 - cost: 1.5 + cost: 8.75 shipped_status: false two: - product_id: - order_id: 1 - quantity: 1 - cost: 1.5 + product: red_cap_cactus + order: NEED TO ADD THIS AFTER MAKING ORDER.YML + quantity: 2 + cost: 12.00 + shipped_status: false + +two: + product: audrey_ficus + order: NEED TO ADD THIS AFTER MAKING ORDER.YML + quantity: 2 + cost: 160.00 shipped_status: false From 9357434291147ea5dffded4bfb9c14891f1f2548 Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Tue, 17 Oct 2017 21:46:39 -0700 Subject: [PATCH 015/382] Made fixtures for Order model --- test/fixtures/orders.yml | 72 +++++++++++++++++++++++++++++----------- 1 file changed, 53 insertions(+), 19 deletions(-) diff --git a/test/fixtures/orders.yml b/test/fixtures/orders.yml index aaa804a40e..5ccb472579 100644 --- a/test/fixtures/orders.yml +++ b/test/fixtures/orders.yml @@ -1,23 +1,57 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - +# I wasn't sure what to do about the date submitted. Do we leave it blank for now? +# I wasn't sure what to do about the credit cad expiration date. I read somewhere that it is custom to have the experiation date be the first day of the month, so I did that. one: - email: MyString - address: MyString - name: MyString - cc_number: MyString - cc_exp: 2017-10-17 - cc_cvv: MyString - zip: MyString - status: MyString - date_submitted: 2017-10-17 + email: dl@ada.edu + address: Fake address for tamira + name: Diane + cc_number: fakenumber12345 + cc_exp: 2017-10-01 + cc_cvv: 444 + zip: 11111 + status: pending + date_submitted: two: - email: MyString - address: MyString - name: MyString - cc_number: MyString - cc_exp: 2017-10-17 - cc_cvv: MyString - zip: MyString - status: MyString - date_submitted: 2017-10-17 + email: nk@ada.edu + address: 21 Steet that Nkiru lives at + name: Nkiru + cc_number: 1234fakenumber + cc_exp: 2017-10-01 + cc_cvv: 222 + zip: 22222 + status: pending + date_submitted: + +three: + email: kz@ada.edu + address: 17 Steet that Kimberley lives at + name: Kinberly + cc_number: 7777fakenumber + cc_exp: 2017-10-01 + cc_cvv: 333 + zip: 33333 + status: paid + date_submitted: + +four: + email: tv@ada.edu + address: 4 Steet that Tamira lives at + name: Tamira + cc_number: 2121fakenumber + cc_exp: 2017-10-01 + cc_cvv: 123 + zip: 44444 + status: completed + date_submitted: + +four: + email: tv@ada.edu + address: 4 Steet that Tamira lives at + name: Tamira + cc_number: 2121fakenumber + cc_exp: 2017-10-01 + cc_cvv: 123 + zip: 44444 + status: cancelled + date_submitted: From da064a69e8ea274e7b22e422349051b0750cae62 Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Tue, 17 Oct 2017 21:52:58 -0700 Subject: [PATCH 016/382] Add order key to OrderItem fixtues --- test/fixtures/orderitems.yml | 6 +++--- test/fixtures/orders.yml | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/fixtures/orderitems.yml b/test/fixtures/orderitems.yml index 759db690be..9cb3246f86 100644 --- a/test/fixtures/orderitems.yml +++ b/test/fixtures/orderitems.yml @@ -2,21 +2,21 @@ one: product: spider_plant - order: NEED TO ADD THIS AFTER MAKING ORDER.YML + order: pending quantity: 1 cost: 8.75 shipped_status: false two: product: red_cap_cactus - order: NEED TO ADD THIS AFTER MAKING ORDER.YML + order: pending quantity: 2 cost: 12.00 shipped_status: false two: product: audrey_ficus - order: NEED TO ADD THIS AFTER MAKING ORDER.YML + order: paid quantity: 2 cost: 160.00 shipped_status: false diff --git a/test/fixtures/orders.yml b/test/fixtures/orders.yml index 5ccb472579..44391faa30 100644 --- a/test/fixtures/orders.yml +++ b/test/fixtures/orders.yml @@ -1,7 +1,7 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html # I wasn't sure what to do about the date submitted. Do we leave it blank for now? # I wasn't sure what to do about the credit cad expiration date. I read somewhere that it is custom to have the experiation date be the first day of the month, so I did that. -one: +pending: email: dl@ada.edu address: Fake address for tamira name: Diane @@ -12,7 +12,7 @@ one: status: pending date_submitted: -two: +pending_2: email: nk@ada.edu address: 21 Steet that Nkiru lives at name: Nkiru @@ -23,7 +23,7 @@ two: status: pending date_submitted: -three: +paid: email: kz@ada.edu address: 17 Steet that Kimberley lives at name: Kinberly @@ -34,7 +34,7 @@ three: status: paid date_submitted: -four: +completed: email: tv@ada.edu address: 4 Steet that Tamira lives at name: Tamira @@ -45,7 +45,7 @@ four: status: completed date_submitted: -four: +cancelled: email: tv@ada.edu address: 4 Steet that Tamira lives at name: Tamira @@ -53,5 +53,5 @@ four: cc_exp: 2017-10-01 cc_cvv: 123 zip: 44444 - status: cancelled + status: cancelled date_submitted: From 1098082350fe9f9abca76b675bdcd9e08c0f0263 Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Tue, 17 Oct 2017 21:56:45 -0700 Subject: [PATCH 017/382] Add fixtures for review model --- test/fixtures/orderitems.yml | 13 ++++++++++--- test/fixtures/reviews.yml | 14 +++++++------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/test/fixtures/orderitems.yml b/test/fixtures/orderitems.yml index 9cb3246f86..ce4d310ad6 100644 --- a/test/fixtures/orderitems.yml +++ b/test/fixtures/orderitems.yml @@ -2,21 +2,28 @@ one: product: spider_plant - order: pending + order: pending + quantity: 1 + cost: 8.75 + shipped_status: false + +one: + product: spider_plant + order: pending quantity: 1 cost: 8.75 shipped_status: false two: product: red_cap_cactus - order: pending + order: cancelled quantity: 2 cost: 12.00 shipped_status: false two: product: audrey_ficus - order: paid + order: paid quantity: 2 cost: 160.00 shipped_status: false diff --git a/test/fixtures/reviews.yml b/test/fixtures/reviews.yml index 4332c2fd4d..67a627fc54 100644 --- a/test/fixtures/reviews.yml +++ b/test/fixtures/reviews.yml @@ -1,11 +1,11 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - product_id: 1 - description: MyText - rating: 1 +good: + product: spider_plant + description: This is an exelent spider plant that produced a lot od babies that I planted later. Now my house is covered in spide plants! Oh my! + rating: 5 -two: - product_id: 1 - description: MyText +bad: + product: audrey_ficus + description: This tree lost most of its leaves and now it looks sad. rating: 1 From f90b2b27a19d30b5afb187a47248f74db3650f89 Mon Sep 17 00:00:00 2001 From: Kimberley Zell Date: Tue, 17 Oct 2017 22:38:14 -0700 Subject: [PATCH 018/382] added review controller. Added for review: methods for new and create. --- app/assets/javascripts/review.js | 2 + app/assets/stylesheets/review.scss | 3 ++ app/controllers/review_controller.rb | 43 ++++++++++++++++++++++ app/helpers/review_helper.rb | 2 + app/models/review.rb | 4 +- test/controllers/review_controller_test.rb | 7 ++++ 6 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/review.js create mode 100644 app/assets/stylesheets/review.scss create mode 100644 app/controllers/review_controller.rb create mode 100644 app/helpers/review_helper.rb create mode 100644 test/controllers/review_controller_test.rb diff --git a/app/assets/javascripts/review.js b/app/assets/javascripts/review.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/review.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/review.scss b/app/assets/stylesheets/review.scss new file mode 100644 index 0000000000..50894ab85c --- /dev/null +++ b/app/assets/stylesheets/review.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the review controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/review_controller.rb b/app/controllers/review_controller.rb new file mode 100644 index 0000000000..c711d14492 --- /dev/null +++ b/app/controllers/review_controller.rb @@ -0,0 +1,43 @@ +class ReviewController < ApplicationController + + def new + @review = Review.new + end + + def create + current_merchant = Merchant.find_by(id: session[:logged_in_user]) + product_merchant = Merchant.find_by(id: params[:product][:merchant_id]) + + unless current_merchant == nil + if current_merchant.id == product_merchant.id + flash[:status] = :failure + flash[:message] = "Sorry, you cannot review your own products." + redirect_to product_path(product_id) + return + end + end + + @review = Review.new(review_params) + + if @review.save + flash[:status] = :success + flash[:message] = "Thank you for your review!" + redirect_to product_path(product_id) + return + else + flash[:status] = :failure + flash[:message] = "Sorry, your review could not be saved." + redirect_to products_path + return + end + + end + + + + private + + def review_params + params.require(:review).permit(:rating, :description, :product_id) + end +end diff --git a/app/helpers/review_helper.rb b/app/helpers/review_helper.rb new file mode 100644 index 0000000000..30a319261d --- /dev/null +++ b/app/helpers/review_helper.rb @@ -0,0 +1,2 @@ +module ReviewHelper +end diff --git a/app/models/review.rb b/app/models/review.rb index 4291b35f71..9deefc272f 100644 --- a/app/models/review.rb +++ b/app/models/review.rb @@ -1,3 +1,5 @@ class Review < ApplicationRecord - belongs_to :product + belongs_to :product + + validates :rating, presence: {message: "A review must have a rating."}, numericality: { only_integer: true } end diff --git a/test/controllers/review_controller_test.rb b/test/controllers/review_controller_test.rb new file mode 100644 index 0000000000..02dca22c8e --- /dev/null +++ b/test/controllers/review_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe ReviewController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 314e366b2ec37f5e7400137098a780315b203b62 Mon Sep 17 00:00:00 2001 From: Kimberley Zell Date: Tue, 17 Oct 2017 22:56:58 -0700 Subject: [PATCH 019/382] fixed repeats in yml --- test/fixtures/orderitems.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/test/fixtures/orderitems.yml b/test/fixtures/orderitems.yml index ce4d310ad6..9e443d1379 100644 --- a/test/fixtures/orderitems.yml +++ b/test/fixtures/orderitems.yml @@ -1,12 +1,5 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - product: spider_plant - order: pending - quantity: 1 - cost: 8.75 - shipped_status: false - one: product: spider_plant order: pending @@ -20,10 +13,3 @@ two: quantity: 2 cost: 12.00 shipped_status: false - -two: - product: audrey_ficus - order: paid - quantity: 2 - cost: 160.00 - shipped_status: false From 6243b5a0d798d26212c8c2c363dac8fe679e51ef Mon Sep 17 00:00:00 2001 From: Diane Lenertz Date: Tue, 17 Oct 2017 23:50:09 -0700 Subject: [PATCH 020/382] add routes, methods and tests for products controller, and add producs root view page --- app/assets/javascripts/products.js | 2 + app/assets/stylesheets/products.scss | 3 + app/controllers/application_controller.rb | 35 ++++++ app/controllers/products_controller.rb | 81 ++++++++++++ app/helpers/products_helper.rb | 2 + app/models/{orderitem.rb => order_item.rb} | 2 +- app/views/products/root.html.erb | 14 +++ config/routes.rb | 21 ++++ .../20171018045419_add_name_to_product.rb | 5 + ...20171018045945_remove_order_items_table.rb | 5 + .../20171018050132_add_order_items_model.rb | 4 + .../20171018050310_create_order_items.rb | 13 ++ db/schema.rb | 11 +- test/controllers/products_controller_test.rb | 116 ++++++++++++++++++ test/fixtures/order_items.yml | 15 +++ test/models/order_item_test.rb | 9 ++ 16 files changed, 332 insertions(+), 6 deletions(-) create mode 100644 app/assets/javascripts/products.js create mode 100644 app/assets/stylesheets/products.scss create mode 100644 app/controllers/products_controller.rb create mode 100644 app/helpers/products_helper.rb rename app/models/{orderitem.rb => order_item.rb} (56%) create mode 100644 app/views/products/root.html.erb create mode 100644 db/migrate/20171018045419_add_name_to_product.rb create mode 100644 db/migrate/20171018045945_remove_order_items_table.rb create mode 100644 db/migrate/20171018050132_add_order_items_model.rb create mode 100644 db/migrate/20171018050310_create_order_items.rb create mode 100644 test/controllers/products_controller_test.rb create mode 100644 test/fixtures/order_items.yml create mode 100644 test/models/order_item_test.rb diff --git a/app/assets/javascripts/products.js b/app/assets/javascripts/products.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/products.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/products.scss b/app/assets/stylesheets/products.scss new file mode 100644 index 0000000000..89e2e8db07 --- /dev/null +++ b/app/assets/stylesheets/products.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the products controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1c07694e9d..f63ed28d96 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,3 +1,38 @@ class ApplicationController < ActionController::Base protect_from_forgery with: :exception + + # protected + # def require_login + # @merchant = Merchant.find_by(id: session[:user_id]) + # unless @merchant + # flash[:status] = :failure + # flash[:message] = "You must be logged in to do that" + # redirect_to root_path + # end + # end + + def save_and_flash(model) + result = model.save + if result + flash[:status] = :success + flash[:message] = "sucessfully saved #{model.class}" + else + flash.now[:status] = :failure + flash.now[:message] = "Failed to save #{model.class}" + flash.now[:details] = model.errors.messages + end + return result + end + +private + def find_merchant + if session[:merchant_id] #<<THIS IS THE ROOT HOMEPAGE FOR BIODOME +

it should display all products

+ +
+
+ <% @products.each do |product| %> +
+ <%= link_to image_tag(product.product_url), products_path(product.id)%> +

<%= product.name %>

+

<%= product.price %>

+
+ <%= end %> +
+
diff --git a/config/routes.rb b/config/routes.rb index 787824f888..425dd7348e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,24 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + +#put in only clauses for resources +#nested route for products for a certain category +#nested route for products for a certain merchant + +#resources merchants do + #resources products +#end + +#resources categories do + #resources products +#end +# ^^is this the right syntax? DL + +resources :products +resources :orders +resources :orderitems +resources :merchants +resources :categories +resources :reviews + end diff --git a/db/migrate/20171018045419_add_name_to_product.rb b/db/migrate/20171018045419_add_name_to_product.rb new file mode 100644 index 0000000000..4b3529f844 --- /dev/null +++ b/db/migrate/20171018045419_add_name_to_product.rb @@ -0,0 +1,5 @@ +class AddNameToProduct < ActiveRecord::Migration[5.1] + def change + add_column :products, :name, :string + end +end diff --git a/db/migrate/20171018045945_remove_order_items_table.rb b/db/migrate/20171018045945_remove_order_items_table.rb new file mode 100644 index 0000000000..508f87b98e --- /dev/null +++ b/db/migrate/20171018045945_remove_order_items_table.rb @@ -0,0 +1,5 @@ +class RemoveOrderItemsTable < ActiveRecord::Migration[5.1] + def change + drop_table :orderitems + end +end diff --git a/db/migrate/20171018050132_add_order_items_model.rb b/db/migrate/20171018050132_add_order_items_model.rb new file mode 100644 index 0000000000..9a2efd5670 --- /dev/null +++ b/db/migrate/20171018050132_add_order_items_model.rb @@ -0,0 +1,4 @@ +class AddOrderItemsModel < ActiveRecord::Migration[5.1] + def change + end +end diff --git a/db/migrate/20171018050310_create_order_items.rb b/db/migrate/20171018050310_create_order_items.rb new file mode 100644 index 0000000000..6a59dca490 --- /dev/null +++ b/db/migrate/20171018050310_create_order_items.rb @@ -0,0 +1,13 @@ +class CreateOrderItems < ActiveRecord::Migration[5.1] + def change + create_table :order_items do |t| + t.string :product_id + t.string :order_id + t.string :quantity + t.float :cost + t.boolean :shipped_status, default: false + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index c5e238e95d..babd7a0141 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20171018000056) do +ActiveRecord::Schema.define(version: 20171018050310) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -30,10 +30,10 @@ t.datetime "updated_at", null: false end - create_table "orderitems", force: :cascade do |t| - t.integer "product_id" - t.integer "order_id" - t.integer "quantity" + create_table "order_items", force: :cascade do |t| + t.string "product_id" + t.string "order_id" + t.string "quantity" t.float "cost" t.boolean "shipped_status", default: false t.datetime "created_at", null: false @@ -63,6 +63,7 @@ t.string "image_url" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.string "name" end create_table "reviews", force: :cascade do |t| diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb new file mode 100644 index 0000000000..90df232391 --- /dev/null +++ b/test/controllers/products_controller_test.rb @@ -0,0 +1,116 @@ +require "test_helper" + +describe ProductsController do + describe "root" do + it "returns a success status for all products" do + get root_path + must_respond_with :success + end + + it "returns a success status when there are no products" do + Product.destroy_all + get root_path + must_respond_with :success + end + end + + describe "new" do + it "returns a success status" do + get new_product_path + must_respond_with :success + end + end + + describe "create" do + it "redirects to merchants_products_path when the product data is valid and adds a work" do + product_data = { + product: { + name: "string of pearls", + price: 30.0, + inventory: 40, + image_url: 'https://img0.etsystatic.com/135/0/13063062/il_570xN.1001407668_zqhp.jpg' + } + } + Product.new(product_data[:product]).must_be :valid? + product_count = Product.count + post products_path, params: product_data + must_respond_with :redirect + must_redirect_to merchant_product_path + Product.count.must_equal product_count + 1 + end + + it "redirects to merchants_products_path when the work data is not valid and doesn't add a work" do + product_data = { + product: { + name: nil + price: nil, + inventory: nil, + image_url: nil + } + } + Product.new(product_data[:product]).wont_be :valid? + product_count = Product.count + post products_path, params: product_data + must_respond_with :bad_request + Product.count.must_equal product_count + end + + it "adds at least one instance to the products category intermediary table" do + #ADD THIS TEST + end + end + + describe "show" do + it "returns a success status when passed a valid id" do + product_id = Product.first.id + get product_path(product_id) + must_respond_with :success + end + + it "returns not_found when given a bogus product id" do + product_id = Product.first.id + 1 + get product_path(product_id) + must_respond_with :not_found + end + end + + describe "edit" do + it "returns a success status when passed a valid id" do + product_id = Product.first.id + get edit_product_path(product_id) + must_respond_with :success + end + + it "returns not_found when given a bogus product id" do + product_id = Product.first.id + 1 + get edit_product_path(product_id) + must_respond_with :not_found + end + end + + describe "update" do + end + + describe "retire" do + + end + + describe "destroy" do + it "returns success and destroys the work when given a valid product ID" do + product_id = Product.first.id + delete product_path(product_id) + must_respond_with :redirect + must_redirect_to merchant_product_path + Product.find_by(id: product_id).must_be_nil + end + + it "returns not_found when given an invalid work ID" do + invalid_product_id = Product.last.id + 1 + product_count = Product.count + delete product_path(invalid_product_id) + must_respond_with :not_found + Product.count.must_equal work_count + end + end + +end diff --git a/test/fixtures/order_items.yml b/test/fixtures/order_items.yml new file mode 100644 index 0000000000..84254e3843 --- /dev/null +++ b/test/fixtures/order_items.yml @@ -0,0 +1,15 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + product_id: MyString + order_id: MyString + quantity: MyString + cost: 1.5 + shipped_status: false + +two: + product_id: MyString + order_id: MyString + quantity: MyString + cost: 1.5 + shipped_status: false diff --git a/test/models/order_item_test.rb b/test/models/order_item_test.rb new file mode 100644 index 0000000000..19a9bf8f58 --- /dev/null +++ b/test/models/order_item_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe OrderItem do + let(:order_item) { OrderItem.new } + + it "must be valid" do + value(order_item).must_be :valid? + end +end From 6da5ee396b3069b22c70ae3fc1a978305be83f4f Mon Sep 17 00:00:00 2001 From: nkiru onwuneme Date: Tue, 17 Oct 2017 23:52:25 -0700 Subject: [PATCH 021/382] Added seed data --- db/seed_data/categories.csv | 8 +++ db/seed_data/merchants.csv | 8 +++ db/seed_data/products.csv | 8 +++ db/seeds.rb | 120 ++++++++++++++++++++++++++++++++++++ 4 files changed, 144 insertions(+) create mode 100644 db/seed_data/categories.csv create mode 100644 db/seed_data/merchants.csv create mode 100644 db/seed_data/products.csv diff --git a/db/seed_data/categories.csv b/db/seed_data/categories.csv new file mode 100644 index 0000000000..81dcc9c1fa --- /dev/null +++ b/db/seed_data/categories.csv @@ -0,0 +1,8 @@ +id,category +1,Perennials +2,Annuals +3,Succulents +4,Cactus +5,House Plants +6,Terrarium Plants +7,Flower Bulbs diff --git a/db/seed_data/merchants.csv b/db/seed_data/merchants.csv new file mode 100644 index 0000000000..4e1ac1a5ec --- /dev/null +++ b/db/seed_data/merchants.csv @@ -0,0 +1,8 @@ +id,email,uid,provider +1,Cheryl Katz,ck@gmail.com,04242023,github +2,Juanita Freeman,jf3@yahoo.com,05242023,github +3,Carolina Sodje,rolinas@hotmail.com,06242023,github +4,Carl Lewis,lewis1@gmail.com,07242023,github +5,Daphne Jones,Djones@yahoo.com,08242023,github +6,Ada Okafor,okaforlaw@hotmail.com,09242023,github +7,Su Lee,sus@hotmail.com,03442023,github diff --git a/db/seed_data/products.csv b/db/seed_data/products.csv new file mode 100644 index 0000000000..4bcc59ebae --- /dev/null +++ b/db/seed_data/products.csv @@ -0,0 +1,8 @@ +id,merchant_id,inventory,price,description,visible,image_url +1,7,24,17.99,Dahlia Cornel,true,https://phsonline.org/uploads/blog/dahlia-cornel.jpg +2,6,36,35.23,Chelsea Stickel,true,https://www.gardendesign.com/pictures/images/477x482Exact/site_3/pink-coleus-garden-crossings_9180.jpg +3,5,48,25.99,Tomato Soup Coneflower,true,https://i.pinimg.com/736x/5c/39/d0/5c39d04d4c7b02fff2d77179c71eb43f--tomato-soups-pretty-flowers.jpg +4,4,60,42.99,Velvet Cactus,true,https://zimedesign.files.wordpress.com/2017/01/img_4333.jpg +5,3,72,17.98,Hyacinth Bulbs,true,http://www.edenbrothers.com/store/media/Bulbs-Flowers/HYWH%20116-0950-1.jpg +6,2,12,29.97,New Zealand Red Hook Sedge,true,https://i.pinimg.com/736x/a6/0d/f2/a60df23ac93f5a11bbda2f4b00fd77b9--colorful-grasses-red-grasses.jpg +7,1,96,26.37,Petunia Belinda,true,https://s-media-cache-ak0.pinimg.com/originals/dc/cf/3a/dccf3a1ce891e593fcc0df6629d742e7.jpg diff --git a/db/seeds.rb b/db/seeds.rb index 1beea2accd..227cf0e5f3 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,3 +5,123 @@ # # movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) # Character.create(name: 'Luke', movie: movies.first) + + +require 'csv' + +PRODUCT_FILE = Rails.root.join('db', 'seed_data', 'products.csv') +puts "Loading raw product data from #{PRODUCT_FILE}" + +product_failures = [] +CSV.foreach(PRODUCT_FILE, :headers => true) do |row| + product = Product.new + product.id = row['id'] + product.merchant_id = row['merchant_id'] + product.inventory = row['inventory'] + product.price = row['price'] + product.description = row['description'] + product.visible = row['visible'] + product.image_url = row['image_url'] + puts "Created product: #{product.inspect}" + successful = product.save + if !successful + product_failures << product + end +end + +puts "Added #{Product.count} product records" +puts "#{product_failures.length} products failed to save" + + + +CATEGORY_FILE = Rails.root.join('db', 'seed_data', 'categories.csv') +puts "Loading raw category data from #{CATEGORY_FILE}" + +category_failures = [] +CSV.foreach(CATEGORY_FILE, :headers => true) do |row| + category = Category.new + category.id = row['id'] + category.name = row['name'] + puts "Created category: #{category.inspect}" + if !successful + category_failures << category + end +end + +puts "Added #{Category.count} category records" +puts "#{category_failures.length} categories failed to save" + + + +ORDER_FILE = Rails.root.join('db', 'seed_data', 'orders.csv') +puts "Loading raw order data from #{ORDER_FILE}" + +order_failures = [] +CSV.foreach(ORDER_FILE, :headers => true) do |row| + order = Order.new + order.id = row['id'] + order.cc_name = row['cc_name'] + order.cc_number = row['cc_number'] + order.cc_exp = row['cc_exp'] + order.cc_cvv = row['cc_cvv'] + order.address = row['address'] + order.zip = row['zip'] + order.email = row['email'] + order.date_submitted = Date.strptime(row['date'], '%Y-%m-%d') + order.status = row['status'] + puts "Created order: #{order.inspect}" + successful = order.save + if !successful + order_failures << order + end +end + +puts "Added #{Order.count} order records" +puts "#{order_failures.length} orders failed to save" + + + +ORDERITEM_FILE = Rails.root.join('db', 'seed_data', 'trips.csv') +puts "Loading raw order-item data from #{ORDERITEM_FILE}" + +orderitem_failures = [] +CSV.foreach(ORDERITEM_FILE, :headers => true) do |row| + orderitem = Orderitem.new + orderitem.id = row['id'] + orderitem.product_id = row['product_id'] + orderitem.order_id = row['order_id'] + orderitem.quantity = row['quantity'] + orderitem.cost = row['cost'] + orderitem.shipped_status = row['shipped_status'] + puts "Created orderitem: #{orderitem.inspect}" + successful = orderitem.save + if !successful + orderitem_failures << orderitem + end +end + +puts "Added #{OrderItem.count} orderitem records" +puts "#{orderitem_failures.length} orderitems failed to save" + + + +MERCHANT_FILE = Rails.root.join('db', 'seed_data', 'merchant.csv') +puts "Loading raw merchant data from #{MERCHANT_FILE}" + +merchant_failures = [] +CSV.foreach(MERCHANT_FILE, :headers => true) do |row| + merchant = Merchant.new + merchant.id = row['id'] + merchant.name = row['name'] + merchant.email = row['email'] + merchant.uid = row['uid'] + merchant.provider = row['provider'] + puts "Created merchant: #{merchant.inspect}" + successful = merchant.save + if !successful + merchant_failures << merchant + end +end + +puts "Added #{Merchant.count} merchant records" +puts "#{merchant_failures.length} merchants failed to save" From a45005237ea95368c0be0da649ad60932d11cea3 Mon Sep 17 00:00:00 2001 From: Diane Lenertz Date: Wed, 18 Oct 2017 00:56:46 -0700 Subject: [PATCH 022/382] add and refine products controller tests --- app/assets/javascripts/review.js | 2 + app/assets/stylesheets/review.scss | 3 + app/controllers/application_controller.rb | 4 +- app/controllers/products_controller.rb | 20 +++--- app/controllers/review_controller.rb | 45 ++++++++++++ app/helpers/review_helper.rb | 2 + app/models/order.rb | 2 +- app/models/order_item.rb | 3 +- app/models/product.rb | 4 +- app/models/review.rb | 4 +- app/views/products/edit.html.erb | 0 app/views/products/new.html.erb | 0 app/views/products/root.html.erb | 10 +-- app/views/products/show.html.erb | 0 config/routes.rb | 2 +- test/controllers/products_controller_test.rb | 6 +- test/controllers/review_controller_test.rb | 7 ++ test/fixtures/categories.yaml | 20 ++++++ test/fixtures/categories.yml | 7 -- test/fixtures/merchants.yml | 30 +++++--- test/fixtures/order_items.yml | 16 ++--- test/fixtures/orderitems.yml | 15 ---- test/fixtures/orders.yml | 74 ++++++++++++++------ test/fixtures/products.yml | 55 +++++++++++---- test/fixtures/reviews.yml | 14 ++-- 25 files changed, 244 insertions(+), 101 deletions(-) create mode 100644 app/assets/javascripts/review.js create mode 100644 app/assets/stylesheets/review.scss create mode 100644 app/controllers/review_controller.rb create mode 100644 app/helpers/review_helper.rb create mode 100644 app/views/products/edit.html.erb create mode 100644 app/views/products/new.html.erb create mode 100644 app/views/products/show.html.erb create mode 100644 test/controllers/review_controller_test.rb create mode 100644 test/fixtures/categories.yaml delete mode 100644 test/fixtures/categories.yml delete mode 100644 test/fixtures/orderitems.yml diff --git a/app/assets/javascripts/review.js b/app/assets/javascripts/review.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/review.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/review.scss b/app/assets/stylesheets/review.scss new file mode 100644 index 0000000000..50894ab85c --- /dev/null +++ b/app/assets/stylesheets/review.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the review controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index f63ed28d96..89ec624ba1 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -30,9 +30,9 @@ def find_merchant #merchants controller after verifying user is logged in as merchant DL @login_merchant = Merchant.find_by(id: session[:merchant_id]) end + end - def find_product - @ + end diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 4622205418..a2febe6047 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -17,7 +17,7 @@ def create @product = Product.new(product_params) @product.merchant_id = session[:merchant_id] #<< this will be set in the merchant controller login method # ^^ or we could do @product.merchant_id = @login_merchant.id as defined in application controller find_merchant method - if save_and_flash #<
- <% @products.each do |product| %> + <%# @products.each do |product| %>
- <%= link_to image_tag(product.product_url), products_path(product.id)%> -

<%= product.name %>

-

<%= product.price %>

+ <%#= link_to image_tag(product.product_url), products_path(product.id)%> +

<%#= product.name %>

+

<%#= product.price %>

- <%= end %> + <%# end %>
diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/routes.rb b/config/routes.rb index 425dd7348e..31a68cb806 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -13,7 +13,7 @@ #resources products #end # ^^is this the right syntax? DL - +root 'products#root' resources :products resources :orders resources :orderitems diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb index 90df232391..b69eb514b8 100644 --- a/test/controllers/products_controller_test.rb +++ b/test/controllers/products_controller_test.rb @@ -8,6 +8,8 @@ end it "returns a success status when there are no products" do + #THIS ONE IS COMPLAINING ABOUT THERE BEING NO CATEGORIES_PRODUCTS RELATION + #no idea how categories are being referenced. Product.destroy_all get root_path must_respond_with :success @@ -25,6 +27,7 @@ it "redirects to merchants_products_path when the product data is valid and adds a work" do product_data = { product: { + merchant: Merchant.first, name: "string of pearls", price: 30.0, inventory: 40, @@ -42,7 +45,7 @@ it "redirects to merchants_products_path when the work data is not valid and doesn't add a work" do product_data = { product: { - name: nil + name: nil, price: nil, inventory: nil, image_url: nil @@ -96,6 +99,7 @@ end describe "destroy" do + #not currently working because of merchant verification OAuth work necessary it "returns success and destroys the work when given a valid product ID" do product_id = Product.first.id delete product_path(product_id) diff --git a/test/controllers/review_controller_test.rb b/test/controllers/review_controller_test.rb new file mode 100644 index 0000000000..02dca22c8e --- /dev/null +++ b/test/controllers/review_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe ReviewController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/fixtures/categories.yaml b/test/fixtures/categories.yaml new file mode 100644 index 0000000000..7d25511ebc --- /dev/null +++ b/test/fixtures/categories.yaml @@ -0,0 +1,20 @@ +perennials: + name: Perennials + +annuals: + name: Annuals + +succulents: + name: Succulents + +cactus: + name: Cactus + +house_plants: + name: House Plants + +terrarium_plants: + name: Terrarium Plants + +flower_bulb: + name: Flower Bulbs diff --git a/test/fixtures/categories.yml b/test/fixtures/categories.yml deleted file mode 100644 index 56066c68af..0000000000 --- a/test/fixtures/categories.yml +++ /dev/null @@ -1,7 +0,0 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: - name: MyString - -two: - name: MyString diff --git a/test/fixtures/merchants.yml b/test/fixtures/merchants.yml index df860d7f66..b4d7301d8e 100644 --- a/test/fixtures/merchants.yml +++ b/test/fixtures/merchants.yml @@ -1,13 +1,25 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - name: MyString - email: MyString - uid: MyString - provider: MyString +tamira: + name: Tamira + email: tv@ada.edu + uid: 1111111111111111 + provider: Github -two: - name: MyString - email: MyString - uid: MyString +diane: + name: Diane + email: dl@ada.edu + uid: 2222222222222222 provider: MyString + +kimberley: + name: Kimberley + email: kz@ada.edu + uid: 3333333333333333 + provider: Github + +nkiru: + name: Nkiru + email: nk@ada.edu + uid: 4444444444444444 + provider: Github diff --git a/test/fixtures/order_items.yml b/test/fixtures/order_items.yml index 84254e3843..9e443d1379 100644 --- a/test/fixtures/order_items.yml +++ b/test/fixtures/order_items.yml @@ -1,15 +1,15 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - product_id: MyString - order_id: MyString - quantity: MyString - cost: 1.5 + product: spider_plant + order: pending + quantity: 1 + cost: 8.75 shipped_status: false two: - product_id: MyString - order_id: MyString - quantity: MyString - cost: 1.5 + product: red_cap_cactus + order: cancelled + quantity: 2 + cost: 12.00 shipped_status: false diff --git a/test/fixtures/orderitems.yml b/test/fixtures/orderitems.yml deleted file mode 100644 index 7f70214eb2..0000000000 --- a/test/fixtures/orderitems.yml +++ /dev/null @@ -1,15 +0,0 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: - product_id: - order_id: 1 - quantity: 1 - cost: 1.5 - shipped_status: false - -two: - product_id: - order_id: 1 - quantity: 1 - cost: 1.5 - shipped_status: false diff --git a/test/fixtures/orders.yml b/test/fixtures/orders.yml index aaa804a40e..d9a941d0f7 100644 --- a/test/fixtures/orders.yml +++ b/test/fixtures/orders.yml @@ -1,23 +1,57 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html +# I wasn't sure what to do about the date submitted. Do we leave it blank for now? +# I wasn't sure what to do about the credit cad expiration date. I read somewhere that it is custom to have the experiation date be the first day of the month, so I did that. +pending: + email: dl@ada.edu + address: Fake address for tamira + cc_name: Diane + cc_number: fakenumber12345 + cc_exp: 2017-10-01 + cc_cvv: 444 + zip: 11111 + status: pending + date_submitted: -one: - email: MyString - address: MyString - name: MyString - cc_number: MyString - cc_exp: 2017-10-17 - cc_cvv: MyString - zip: MyString - status: MyString - date_submitted: 2017-10-17 +pending_2: + email: nk@ada.edu + address: 21 Steet that Nkiru lives at + cc_name: Nkiru + cc_number: 1234fakenumber + cc_exp: 2017-10-01 + cc_cvv: 222 + zip: 22222 + status: pending + date_submitted: -two: - email: MyString - address: MyString - name: MyString - cc_number: MyString - cc_exp: 2017-10-17 - cc_cvv: MyString - zip: MyString - status: MyString - date_submitted: 2017-10-17 +paid: + email: kz@ada.edu + address: 17 Steet that Kimberley lives at + cc_name: Kinberly + cc_number: 7777fakenumber + cc_exp: 2017-10-01 + cc_cvv: 333 + zip: 33333 + status: paid + date_submitted: + +completed: + email: tv@ada.edu + address: 4 Steet that Tamira lives at + cc_name: Tamira + cc_number: 2121fakenumber + cc_exp: 2017-10-01 + cc_cvv: 123 + zip: 44444 + status: completed + date_submitted: + +cancelled: + email: tv@ada.edu + address: 4 Steet that Tamira lives at + cc_name: Tamira + cc_number: 2121fakenumber + cc_exp: 2017-10-01 + cc_cvv: 123 + zip: 44444 + status: cancelled + date_submitted: diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml index c0b9ff4ace..ee1378dd08 100644 --- a/test/fixtures/products.yml +++ b/test/fixtures/products.yml @@ -1,15 +1,44 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - merchant_id: 1 - inventory: 1 - price: 1.5 - description: MyText - visible: false - -two: - merchant_id: 1 - inventory: 1 - price: 1.5 - description: MyText - visible: false + + +spider_plant: + merchant: tamira + name: Spider Plant + inventory: 5 + price: 8.75 + description: A full grown spider plant with some babies growing off it. + visible: true + image_url: https://images-na.ssl-images-amazon.com/images/I/7120dmLtRmL._SL1000_.jpg + # category: house_plants + +echeveria: + merchant: tamira + name: Echeveria + inventory: 2 + price: 5.50 + description: A small Echeveria plant + visible: true + image_url: https://altmanplants.com/wp-content/uploads/Echeveria-Bluebird.jpg + # category: succulents + + +red_cap_cactus: + merchant: diane + name: Red Cap Cactus + inventory: 10 + price: 6.00 + description: A cactus with a pink flower at the top. + visible: true + image_url: http://www.floristika.com.my/florist/image/cache/data/cactus%20red%20cap-500x612.jpg + # category: cactus + +audrey_ficus: + merchant: diane + name: Audrey Ficus + inventory: 3 + price: 80.00 + description: A small tree with large leaves + visible: true + image_url: https://www.plantshed.com//media/catalog/product/cache/1/image/9df78eab33525d08d6e5fb8d27136e95/p/s/ps20008_1_1.jpg + # category: house_plants diff --git a/test/fixtures/reviews.yml b/test/fixtures/reviews.yml index 4332c2fd4d..67a627fc54 100644 --- a/test/fixtures/reviews.yml +++ b/test/fixtures/reviews.yml @@ -1,11 +1,11 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - product_id: 1 - description: MyText - rating: 1 +good: + product: spider_plant + description: This is an exelent spider plant that produced a lot od babies that I planted later. Now my house is covered in spide plants! Oh my! + rating: 5 -two: - product_id: 1 - description: MyText +bad: + product: audrey_ficus + description: This tree lost most of its leaves and now it looks sad. rating: 1 From d5b4cc759e4915456d6deb57e15e0c3d00d94f01 Mon Sep 17 00:00:00 2001 From: Diane Lenertz Date: Wed, 18 Oct 2017 09:14:09 -0700 Subject: [PATCH 023/382] Add .env to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 82701fedc8..fd7861badf 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /yarn-error.log .byebug_history +.env From 90818a8760bf53492bc0db178dbef12ab23032a2 Mon Sep 17 00:00:00 2001 From: Diane Lenertz Date: Wed, 18 Oct 2017 09:34:59 -0700 Subject: [PATCH 024/382] add OAuth gems, login/logout methods to Mercahnt controller, from_auth_hash self method in Merchant model --- Gemfile | 4 ++- Gemfile.lock | 28 +++++++++++++++ app/assets/javascripts/merchants.js | 2 ++ app/assets/stylesheets/merchants.scss | 3 ++ app/controllers/merchants_controller.rb | 36 +++++++++++++++++++ app/helpers/merchants_helper.rb | 2 ++ app/models/merchant.rb | 11 ++++++ config/initializers/omniauth.rb | 3 ++ config/routes.rb | 3 ++ test/controllers/merchants_controller_test.rb | 8 +++++ 10 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/merchants.js create mode 100644 app/assets/stylesheets/merchants.scss create mode 100644 app/controllers/merchants_controller.rb create mode 100644 app/helpers/merchants_helper.rb create mode 100644 config/initializers/omniauth.rb create mode 100644 test/controllers/merchants_controller_test.rb diff --git a/Gemfile b/Gemfile index 3c82b5935c..6a6de03758 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,8 @@ git_source(:github) do |repo_name| repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") "https://github.com/#{repo_name}.git" end - +gem "omniauth" +gem "omniauth-github" gem 'foundation-rails', '6.4.1.2' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.1.4' @@ -39,6 +40,7 @@ group :development, :test do # Adds support for Capybara system testing and selenium driver gem 'capybara', '~> 2.13' gem 'selenium-webdriver' + gem 'dotenv-rails' end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 67420367a1..030babfd88 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -68,8 +68,14 @@ GEM concurrent-ruby (1.0.5) crass (1.0.2) debug_inspector (0.0.3) + 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) + faraday (0.12.2) + multipart-post (>= 1.2, < 3) ffi (1.9.18) foundation-rails (6.4.1.2) railties (>= 3.1.0) @@ -77,6 +83,7 @@ GEM sprockets-es6 (>= 0.9.0) globalid (0.4.0) activesupport (>= 4.2.0) + hashie (3.5.6) i18n (0.9.0) concurrent-ruby (~> 1.0) jbuilder (2.7.0) @@ -85,6 +92,7 @@ GEM jquery-turbolinks (2.1.0) railties (>= 3.1.0) turbolinks + jwt (1.5.6) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -110,9 +118,26 @@ GEM minitest (>= 5.0) ruby-progressbar multi_json (1.12.2) + multi_xml (0.6.0) + multipart-post (2.0.0) nio4r (2.1.0) nokogiri (1.8.1) mini_portile2 (~> 2.3.0) + oauth2 (1.4.0) + faraday (>= 0.8, < 0.13) + jwt (~> 1.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) + rack (>= 1.2, < 3) + omniauth (1.7.1) + hashie (>= 3.4.6, < 3.6.0) + rack (>= 1.6.2, < 3) + omniauth-github (1.3.0) + omniauth (~> 1.5) + omniauth-oauth2 (>= 1.4.0, < 2.0) + omniauth-oauth2 (1.4.0) + oauth2 (~> 1.0) + omniauth (~> 1.2) pg (0.21.0) pry (0.11.1) coderay (~> 1.1.0) @@ -209,12 +234,15 @@ DEPENDENCIES binding_of_caller byebug capybara (~> 2.13) + dotenv-rails foundation-rails (= 6.4.1.2) jbuilder (~> 2.5) jquery-turbolinks listen (>= 3.0.5, < 3.2) minitest-rails minitest-reporters + omniauth + omniauth-github pg (~> 0.18) pry-rails puma (~> 3.7) diff --git a/app/assets/javascripts/merchants.js b/app/assets/javascripts/merchants.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/merchants.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/merchants.scss b/app/assets/stylesheets/merchants.scss new file mode 100644 index 0000000000..2327c00afe --- /dev/null +++ b/app/assets/stylesheets/merchants.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the merchants controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rb new file mode 100644 index 0000000000..8b782bbca5 --- /dev/null +++ b/app/controllers/merchants_controller.rb @@ -0,0 +1,36 @@ +class MerchantsController < ApplicationController + def login + auth_hash = request.env['omniauth.auth'] + + if auth_hash['uid'] + merchant = Merchant.find_by(provider: params[:provider], uid: auth_hash[:uid]) + + if merchant.nil? + #user has not logged in before + #create a new record in the DB + merchant = Merchant.from_auth_hash(params[:provider], auth_hash) + # save_and_flash(user) + + if merchant.save + flash[:status] = :success + flash[:message] = "successfully created a new merchant #{merchant.name}" + else + flash[:status] = :failure + end + + else + flash[:status] = :success + flash[:message] = "successfully logged in as returning merchant #{merchant.name}" + end + session[:merchant_id] = merchant.id + redirect_to root_path + end + end + + def logout + session[:merchant_id] = nil + flash[:status] = :success + flash[:message] = "You have successfully logged out" + redirect_to root_path + end +end diff --git a/app/helpers/merchants_helper.rb b/app/helpers/merchants_helper.rb new file mode 100644 index 0000000000..5337747b0f --- /dev/null +++ b/app/helpers/merchants_helper.rb @@ -0,0 +1,2 @@ +module MerchantsHelper +end diff --git a/app/models/merchant.rb b/app/models/merchant.rb index 07aacc445d..f9ca7073cc 100644 --- a/app/models/merchant.rb +++ b/app/models/merchant.rb @@ -1,3 +1,14 @@ class Merchant < ApplicationRecord has_many :products + + def self.from_auth_hash(provider, auth_hash) + merchant = new + merchant.provider = provider + merchant.uid = auth_hash['uid'] + merchant.name = auth_hash['info']['name'] + merchant.email = auth_hash['info']['email'] + merchant.name = auth_hash['info']['nickname'] + + return merchant +end end diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb new file mode 100644 index 0000000000..fd4416122a --- /dev/null +++ b/config/initializers/omniauth.rb @@ -0,0 +1,3 @@ +Rails.application.config.middleware.use OmniAuth::Builder do + provider :github, ENV["GITHUB_CLIENT_ID"], ENV["GITHUB_CLIENT_SECRET"], scope: "user:email" +end diff --git a/config/routes.rb b/config/routes.rb index 31a68cb806..b727e3a9ef 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -21,4 +21,7 @@ resources :categories resources :reviews +get '/auth/:provider/callback', to: 'merchants#login' + + end diff --git a/test/controllers/merchants_controller_test.rb b/test/controllers/merchants_controller_test.rb new file mode 100644 index 0000000000..7177c3d1b0 --- /dev/null +++ b/test/controllers/merchants_controller_test.rb @@ -0,0 +1,8 @@ +require "test_helper" + +describe MerchantsController do + + # it "must be a real test" do + # flunk "Need real tests" + # end +end From f0fbec589f6b99b2bda71881cf16f839ed1305cd Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Wed, 18 Oct 2017 09:43:34 -0700 Subject: [PATCH 025/382] Added back two of the OrderItem fixtures --- test/fixtures/orderitems.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/test/fixtures/orderitems.yml b/test/fixtures/orderitems.yml index 9e443d1379..c4295e862f 100644 --- a/test/fixtures/orderitems.yml +++ b/test/fixtures/orderitems.yml @@ -8,8 +8,22 @@ one: shipped_status: false two: + product: Echeveria + order: pending + quantity: 1 + cost: 8.75 + shipped_status: false + +three: product: red_cap_cactus order: cancelled quantity: 2 cost: 12.00 shipped_status: false + +four: + product: audrey_ficus + order: paid + quantity: 2 + cost: 160.00 + shipped_status: false From 6bdc04d7b8e41e8ab2a1c2b1a2da04a8086e626d Mon Sep 17 00:00:00 2001 From: Diane Lenertz Date: Wed, 18 Oct 2017 09:48:40 -0700 Subject: [PATCH 026/382] fix product_url/image_url error in products_controller and product root view --- app/controllers/products_controller.rb | 2 +- app/views/products/root.html.erb | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index a2febe6047..4eafede7ca 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -81,5 +81,5 @@ def destroy private def product_params - return params.require(:product).permit(:name, :inventory, :price, :product_url) + return params.require(:product).permit(:name, :inventory, :price, :image_url) end diff --git a/app/views/products/root.html.erb b/app/views/products/root.html.erb index 8d5ab67e5b..7755388772 100644 --- a/app/views/products/root.html.erb +++ b/app/views/products/root.html.erb @@ -3,12 +3,13 @@
- <%# @products.each do |product| %> +

Products

+ <% @products.each do |product| %>
- <%#= link_to image_tag(product.product_url), products_path(product.id)%> -

<%#= product.name %>

-

<%#= product.price %>

+ <%#= link_to image_tag(product.image_url), products_path(product.id)%> +

<%= product.name %>

+

<%= product.price %>

- <%# end %> + <% end %>
From 4839238f7be67343ca3f4aafd905105ab5014a95 Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Wed, 18 Oct 2017 10:48:35 -0700 Subject: [PATCH 027/382] Changed provider value from Github to github for the merchants fixtures --- test/fixtures/merchants.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/fixtures/merchants.yml b/test/fixtures/merchants.yml index b4d7301d8e..bdb844d4a8 100644 --- a/test/fixtures/merchants.yml +++ b/test/fixtures/merchants.yml @@ -4,22 +4,22 @@ tamira: name: Tamira email: tv@ada.edu uid: 1111111111111111 - provider: Github + provider: github diane: name: Diane email: dl@ada.edu uid: 2222222222222222 - provider: MyString + provider: github kimberley: name: Kimberley email: kz@ada.edu uid: 3333333333333333 - provider: Github + provider: github nkiru: name: Nkiru email: nk@ada.edu uid: 4444444444444444 - provider: Github + provider: github From d2569fbe197ff438c085813c133c58ddfbc0bc24 Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Wed, 18 Oct 2017 10:52:06 -0700 Subject: [PATCH 028/382] changed succulent product to Aloe vera and also changed this in the OrderItem fixtures --- test/fixtures/merchants.yml | 1 + test/fixtures/orderitems.yml | 2 +- test/fixtures/products.yml | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/fixtures/merchants.yml b/test/fixtures/merchants.yml index bdb844d4a8..df7d3bc9a9 100644 --- a/test/fixtures/merchants.yml +++ b/test/fixtures/merchants.yml @@ -1,4 +1,5 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html +# need to add a username for the merchnt! need to add it to our model too. Need to desicde if we want 'name' and 'username' or just 'username' tamira: name: Tamira diff --git a/test/fixtures/orderitems.yml b/test/fixtures/orderitems.yml index c4295e862f..e3078110b8 100644 --- a/test/fixtures/orderitems.yml +++ b/test/fixtures/orderitems.yml @@ -8,7 +8,7 @@ one: shipped_status: false two: - product: Echeveria + product: aloe_vera order: pending quantity: 1 cost: 8.75 diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml index 4f021d9a20..75e0c6a5c5 100644 --- a/test/fixtures/products.yml +++ b/test/fixtures/products.yml @@ -12,9 +12,9 @@ spider_plant: image_url: https://images-na.ssl-images-amazon.com/images/I/7120dmLtRmL._SL1000_.jpg category: house_plants -echeveria: +aloe_vera: merchant: tamira - name: Echeveria + name: Aloe vera inventory: 2 price: 5.50 description: A small Echeveria plant From 890b2bfff14a8cd2efb42887ff6afce8b0018926 Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Wed, 18 Oct 2017 10:55:15 -0700 Subject: [PATCH 029/382] Changed name to cc_name in Order fixtures --- test/fixtures/orders.yml | 10 +++++----- test/fixtures/products.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/fixtures/orders.yml b/test/fixtures/orders.yml index 44391faa30..d9a941d0f7 100644 --- a/test/fixtures/orders.yml +++ b/test/fixtures/orders.yml @@ -4,7 +4,7 @@ pending: email: dl@ada.edu address: Fake address for tamira - name: Diane + cc_name: Diane cc_number: fakenumber12345 cc_exp: 2017-10-01 cc_cvv: 444 @@ -15,7 +15,7 @@ pending: pending_2: email: nk@ada.edu address: 21 Steet that Nkiru lives at - name: Nkiru + cc_name: Nkiru cc_number: 1234fakenumber cc_exp: 2017-10-01 cc_cvv: 222 @@ -26,7 +26,7 @@ pending_2: paid: email: kz@ada.edu address: 17 Steet that Kimberley lives at - name: Kinberly + cc_name: Kinberly cc_number: 7777fakenumber cc_exp: 2017-10-01 cc_cvv: 333 @@ -37,7 +37,7 @@ paid: completed: email: tv@ada.edu address: 4 Steet that Tamira lives at - name: Tamira + cc_name: Tamira cc_number: 2121fakenumber cc_exp: 2017-10-01 cc_cvv: 123 @@ -48,7 +48,7 @@ completed: cancelled: email: tv@ada.edu address: 4 Steet that Tamira lives at - name: Tamira + cc_name: Tamira cc_number: 2121fakenumber cc_exp: 2017-10-01 cc_cvv: 123 diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml index 75e0c6a5c5..b76c10949f 100644 --- a/test/fixtures/products.yml +++ b/test/fixtures/products.yml @@ -17,7 +17,7 @@ aloe_vera: name: Aloe vera inventory: 2 price: 5.50 - description: A small Echeveria plant + description: A small aloe vera plant visible: true image_url: https://altmanplants.com/wp-content/uploads/Echeveria-Bluebird.jpg category: succulents From 391be5ce448359951d92461a32cc011117ad328f Mon Sep 17 00:00:00 2001 From: nkiru onwuneme Date: Wed, 18 Oct 2017 11:29:37 -0700 Subject: [PATCH 030/382] Added missing column header for category --- .gitignore | 3 ++ db/seed_data/merchants.csv | 2 +- db/seeds.rb | 95 +++++++++++++++++++------------------- 3 files changed, 52 insertions(+), 48 deletions(-) diff --git a/.gitignore b/.gitignore index 82701fedc8..8f9f5337b7 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,6 @@ /yarn-error.log .byebug_history + +# Ignore DS_Store +.DS_Store diff --git a/db/seed_data/merchants.csv b/db/seed_data/merchants.csv index 4e1ac1a5ec..0d4ec77f2f 100644 --- a/db/seed_data/merchants.csv +++ b/db/seed_data/merchants.csv @@ -1,4 +1,4 @@ -id,email,uid,provider +id,name,email,uid,provider 1,Cheryl Katz,ck@gmail.com,04242023,github 2,Juanita Freeman,jf3@yahoo.com,05242023,github 3,Carolina Sodje,rolinas@hotmail.com,06242023,github diff --git a/db/seeds.rb b/db/seeds.rb index 227cf0e5f3..21ad7a513b 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -43,6 +43,7 @@ category.id = row['id'] category.name = row['name'] puts "Created category: #{category.inspect}" + successful = category.save if !successful category_failures << category end @@ -53,59 +54,59 @@ -ORDER_FILE = Rails.root.join('db', 'seed_data', 'orders.csv') -puts "Loading raw order data from #{ORDER_FILE}" - -order_failures = [] -CSV.foreach(ORDER_FILE, :headers => true) do |row| - order = Order.new - order.id = row['id'] - order.cc_name = row['cc_name'] - order.cc_number = row['cc_number'] - order.cc_exp = row['cc_exp'] - order.cc_cvv = row['cc_cvv'] - order.address = row['address'] - order.zip = row['zip'] - order.email = row['email'] - order.date_submitted = Date.strptime(row['date'], '%Y-%m-%d') - order.status = row['status'] - puts "Created order: #{order.inspect}" - successful = order.save - if !successful - order_failures << order - end -end - -puts "Added #{Order.count} order records" -puts "#{order_failures.length} orders failed to save" - - +# ORDER_FILE = Rails.root.join('db', 'seed_data', 'orders.csv') +# puts "Loading raw order data from #{ORDER_FILE}" +# +# order_failures = [] +# CSV.foreach(ORDER_FILE, :headers => true) do |row| +# order = Order.new +# order.id = row['id'] +# order.cc_name = row['cc_name'] +# order.cc_number = row['cc_number'] +# order.cc_exp = row['cc_exp'] +# order.cc_cvv = row['cc_cvv'] +# order.address = row['address'] +# order.zip = row['zip'] +# order.email = row['email'] +# order.date_submitted = Date.strptime(row['date'], '%Y-%m-%d') +# order.status = row['status'] +# puts "Created order: #{order.inspect}" +# successful = order.save +# if !successful +# order_failures << order +# end +# end +# +# puts "Added #{Order.count} order records" +# puts "#{order_failures.length} orders failed to save" -ORDERITEM_FILE = Rails.root.join('db', 'seed_data', 'trips.csv') -puts "Loading raw order-item data from #{ORDERITEM_FILE}" -orderitem_failures = [] -CSV.foreach(ORDERITEM_FILE, :headers => true) do |row| - orderitem = Orderitem.new - orderitem.id = row['id'] - orderitem.product_id = row['product_id'] - orderitem.order_id = row['order_id'] - orderitem.quantity = row['quantity'] - orderitem.cost = row['cost'] - orderitem.shipped_status = row['shipped_status'] - puts "Created orderitem: #{orderitem.inspect}" - successful = orderitem.save - if !successful - orderitem_failures << orderitem - end -end -puts "Added #{OrderItem.count} orderitem records" -puts "#{orderitem_failures.length} orderitems failed to save" +# ORDERITEM_FILE = Rails.root.join('db', 'seed_data', 'orderitems.csv') +# puts "Loading raw order-item data from #{ORDERITEM_FILE}" +# +# orderitem_failures = [] +# CSV.foreach(ORDERITEM_FILE, :headers => true) do |row| +# orderitem = Orderitem.new +# orderitem.id = row['id'] +# orderitem.product_id = row['product_id'] +# orderitem.order_id = row['order_id'] +# orderitem.quantity = row['quantity'] +# orderitem.cost = row['cost'] +# orderitem.shipped_status = row['shipped_status'] +# puts "Created orderitem: #{orderitem.inspect}" +# successful = orderitem.save +# if !successful +# orderitem_failures << orderitem +# end +# end +# +# puts "Added #{OrderItem.count} orderitem records" +# puts "#{orderitem_failures.length} orderitems failed to save" -MERCHANT_FILE = Rails.root.join('db', 'seed_data', 'merchant.csv') +MERCHANT_FILE = Rails.root.join('db', 'seed_data', 'merchants.csv') puts "Loading raw merchant data from #{MERCHANT_FILE}" merchant_failures = [] From f440499a5ed68f5c7d3993f3ae216c2e41f80afc Mon Sep 17 00:00:00 2001 From: Diane Lenertz Date: Wed, 18 Oct 2017 11:54:27 -0700 Subject: [PATCH 031/382] attempting to fix product_controller_tests and adding nested routes --- app/controllers/merchants_controller.rb | 5 + app/controllers/products_controller.rb | 18 +- config/routes.rb | 5 +- test/controllers/merchants_controller_test.rb | 25 +- test/controllers/products_controller_test.rb | 233 ++++++++++-------- test/test_helper.rb | 23 ++ 6 files changed, 207 insertions(+), 102 deletions(-) diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rb index 8b782bbca5..a3620726d4 100644 --- a/app/controllers/merchants_controller.rb +++ b/app/controllers/merchants_controller.rb @@ -1,4 +1,9 @@ class MerchantsController < ApplicationController + + # def show + # @merchant = Merchant.find_by(id: params[:id]) + # end + def login auth_hash = request.env['omniauth.auth'] diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 4eafede7ca..dd2f2ac3cc 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -7,18 +7,34 @@ def root def new if find_merchant @product = Product.new + @product.merchant_id = session[:merchant_id] else redirect_to root_path end end + + def index + if params[:merchant_id] + merchant = Merchant.find_by(id: params[:merchant_id]) + if merchant + @products = merchant.products + else + head :not_found + end + else + @products = Product.all + end + end + + def create if find_merchant #<>>>>>>>>>>>>>>>>>>>>>> PRODUCT.ID #{product.id}" + puts ">>>>>>>>>>>>>>>>>>>>>>> MERCHANT.ID #{product.merchant.id}" + product.must_be :valid? + product_count = Product.count + post products_path, params: product_data + must_respond_with :redirect + must_redirect_to merchant_products_path(product.merchant.id) + Product.count.must_equal product_count + 1 + end + + it "redirects to merchant_products_path when the product data is not valid and doesn't add a work" do + product_data = { + product: { + name: nil, + price: nil, + inventory: nil, + image_url: nil + } + } + Product.new(product_data[:product]).wont_be :valid? + product_count = Product.count + post products_path, params: product_data + #must_redirect_to merchant_products_path + must_respond_with :bad_request + Product.count.must_equal product_count + end + + it "adds at least one instance to the products category intermediary table" do + #ADD THIS TEST + end end - it "returns not_found when given an invalid work ID" do - invalid_product_id = Product.last.id + 1 - product_count = Product.count - delete product_path(invalid_product_id) - must_respond_with :not_found - Product.count.must_equal work_count + # describe "show" do + # it "returns a success status when passed a valid id" do + # product_id = Product.first.id + # get product_path(product_id) + # must_respond_with :success + # end + # + # it "returns not_found when given a bogus product id" do + # product_id = Product.first.id + 1 + # get product_path(product_id) + # must_respond_with :not_found + # end + # end + # + # describe "edit" do + # it "returns a success status when passed a valid id" do + # product_id = Product.first.id + # get edit_product_path(product_id) + # must_respond_with :success + # end + # + # it "returns not_found when given a bogus product id" do + # product_id = Product.first.id + 1 + # get edit_product_path(product_id) + # must_respond_with :not_found + # end + # end + # + # describe "update" do + # end + # + # describe "retire" do + # + # end + + describe "destroy" do + #not currently working because of merchant verification OAuth work necessary + it "returns success and destroys the work when given a valid product ID" do + product_id = Product.first.id + delete product_path(product_id) + must_respond_with :redirect + must_redirect_to merchant_product_path + Product.find_by(id: product_id).must_be_nil + end + + it "returns not_found when given an invalid work ID" do + invalid_product_id = Product.last.id + 1 + product_count = Product.count + delete product_path(invalid_product_id) + must_respond_with :not_found + Product.count.must_equal work_count + end end end -end + end diff --git a/test/test_helper.rb b/test/test_helper.rb index 10594a3248..81660ea08d 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -23,4 +23,27 @@ class ActiveSupport::TestCase # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. fixtures :all # Add more helper methods to be used by all tests here... + def setup + # Once you have enabled test mode, all requests + # to OmniAuth will be short circuited to use the mock authentication hash. + # A request to /auth/provider will redirect immediately to /auth/provider/callback. + OmniAuth.config.test_mode = true + end + + def mock_auth_hash(merchant) + return { + provider: merchant.provider, + uid: merchant.uid, + info: { + email: merchant.email, + name: merchant.name + } + } + end + + def login(merchant) + OmniAuth.config.mock_auth[:github] = OmniAuth::AuthHash.new(mock_auth_hash(merchant)) + get auth_callback_path(:github) + end + end From 34f44aacbfa1b8fba41909a5f1464b0c27778166 Mon Sep 17 00:00:00 2001 From: Diane Lenertz Date: Wed, 18 Oct 2017 12:53:50 -0700 Subject: [PATCH 032/382] trying to resolve merchant_id issue in products_controller_tests create test --- app/controllers/products_controller.rb | 3 ++- test/controllers/products_controller_test.rb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index dd2f2ac3cc..9cd799686b 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -33,8 +33,9 @@ def create @product = Product.new(product_params) @product.merchant_id = session[:merchant_id] #<< this will be set in the merchant controller login method # ^^ or we could do @product.merchant_id = @login_merchant.id as defined in application controller find_merchant method + # merchant = Merchant.find_by(id: session[:merchant_id]) if save_and_flash(@product) #< Date: Wed, 18 Oct 2017 13:24:20 -0700 Subject: [PATCH 033/382] Add multiple categories to the products yml file --- test/fixtures/products.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml index b76c10949f..26485bb509 100644 --- a/test/fixtures/products.yml +++ b/test/fixtures/products.yml @@ -20,7 +20,7 @@ aloe_vera: description: A small aloe vera plant visible: true image_url: https://altmanplants.com/wp-content/uploads/Echeveria-Bluebird.jpg - category: succulents + category: succulents, house_plants red_cap_cactus: @@ -31,7 +31,7 @@ red_cap_cactus: description: A cactus with a pink flower at the top. visible: true image_url: http://www.floristika.com.my/florist/image/cache/data/cactus%20red%20cap-500x612.jpg - category: cactus + category: cactus, house_plants audrey_ficus: merchant: diane From dd9eba23b2d9eddd7af35a8cfb71cdfbe17a3336 Mon Sep 17 00:00:00 2001 From: Kimberley Zell Date: Wed, 18 Oct 2017 15:12:15 -0700 Subject: [PATCH 034/382] updated nav bar and some routes. log in does not work yet - not sure w here the issue is --- app/views/layouts/application.html.erb | 31 ++++++++++++++++++++++++- app/views/merchants/login_form.html.erb | 4 ++++ config/routes.rb | 4 ++++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 app/views/merchants/login_form.html.erb diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index cd60004891..22ba5a36a5 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -12,8 +12,37 @@ + +
+

Vine & Bloom | + Buy your plants here! +

+ +
+
+ <% flash.each do |name, message| %> +
<%= message %>
+ <% end %> +
+ + <%= yield %> + diff --git a/app/views/merchants/login_form.html.erb b/app/views/merchants/login_form.html.erb new file mode 100644 index 0000000000..91ac74f498 --- /dev/null +++ b/app/views/merchants/login_form.html.erb @@ -0,0 +1,4 @@ +

Log In

+<%= form_tag do %> + <%= link_to "Log In With Github", "/auth/github", class: "button" %> +<% end %> diff --git a/config/routes.rb b/config/routes.rb index 0e7a7a5680..a35c46038e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -27,4 +27,8 @@ get '/auth/:provider/callback', to: 'merchants#login', as: 'auth_callback' +get '/login', to: 'merchants#login', as: 'login' +post '/login', to: 'merchants#login' +post '/logout', to: 'merchants#logout', as: 'logout' + end From 393f584f09d008c2cd0b40013f6cff0b6d611876 Mon Sep 17 00:00:00 2001 From: Diane Lenertz Date: Wed, 18 Oct 2017 15:15:01 -0700 Subject: [PATCH 035/382] fix create products_controller_test --- app/controllers/products_controller.rb | 4 + test/controllers/products_controller_test.rb | 109 ++++++++++--------- test/fixtures/merchants.yml | 14 ++- 3 files changed, 70 insertions(+), 57 deletions(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 9cd799686b..64853f7bb4 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -1,3 +1,4 @@ + class ProductsController < ApplicationController def root @@ -32,9 +33,12 @@ def create if find_merchant #<>>>>>>>>>>>>>>>> LOGIN_MERCHANT.ID #{@login_merchant.id}" redirect_to merchant_products_path(@login_merchant.id) #redirect might need to be changed based on flow, but idk rn DL else render :new, status: :bad_request diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb index 5149cbebc8..e2b227a53e 100644 --- a/test/controllers/products_controller_test.rb +++ b/test/controllers/products_controller_test.rb @@ -3,33 +3,33 @@ describe ProductsController do describe "all users" do - describe "root" do - it "returns a success status for all products" do - get root_path - must_respond_with :success - end - - # it "returns a success status when there are no products" do - # #THIS ONE IS COMPLAINING ABOUT THERE BEING NO CATEGORIES_PRODUCTS RELATION - # #no idea how categories are being referenced. - # Product.destroy_all - # get root_path - # must_respond_with :success - # end - end + # describe "root" do + # it "returns a success status for all products" do + # get root_path + # must_respond_with :success + # end + # + # # it "returns a success status when there are no products" do + # # #THIS ONE IS COMPLAINING ABOUT THERE BEING NO CATEGORIES_PRODUCTS RELATION + # # #no idea how categories are being referenced. + # # Product.destroy_all + # # get root_path + # # must_respond_with :success + # # end + # end end - describe "guest users" do - - it "cannot access new" do - - end - - it "cannot access edit" do - - end - - end + # describe "guest users" do + # + # it "cannot access new" do + # + # end + # + # it "cannot access edit" do + # + # end + # + # end describe "logged in users (merchants)" do @@ -52,12 +52,13 @@ # end # end # - describe "new" do - it "returns a success status" do - get new_product_path - must_respond_with :success - end - end + # describe "new" do + # it "returns a success status" do + # + # get new_product_path + # must_respond_with :success + # end + # end describe "create" do it "redirects to merchant_products_path when the product data is valid and adds a work" do @@ -83,6 +84,7 @@ end it "redirects to merchant_products_path when the product data is not valid and doesn't add a work" do + product_data = { product: { name: nil, @@ -98,10 +100,11 @@ must_respond_with :bad_request Product.count.must_equal product_count end - - it "adds at least one instance to the products category intermediary table" do - #ADD THIS TEST - end + # + # it "adds at least one instance to the products category intermediary table" do + # + # #ADD THIS TEST + # end end # describe "show" do @@ -139,24 +142,24 @@ # # end - describe "destroy" do - #not currently working because of merchant verification OAuth work necessary - it "returns success and destroys the work when given a valid product ID" do - product_id = Product.first.id - delete product_path(product_id) - must_respond_with :redirect - must_redirect_to merchant_product_path - Product.find_by(id: product_id).must_be_nil - end - - it "returns not_found when given an invalid work ID" do - invalid_product_id = Product.last.id + 1 - product_count = Product.count - delete product_path(invalid_product_id) - must_respond_with :not_found - Product.count.must_equal work_count - end - end + # describe "destroy" do + # #not currently working because of merchant verification OAuth work necessary + # it "returns success and destroys the work when given a valid product ID" do + # product_id = Product.first.id + # delete product_path(product_id) + # must_respond_with :redirect + # must_redirect_to merchant_product_path + # Product.find_by(id: product_id).must_be_nil + # end + # + # it "returns not_found when given an invalid work ID" do + # invalid_product_id = Product.last.id + 1 + # product_count = Product.count + # delete product_path(invalid_product_id) + # must_respond_with :not_found + # Product.count.must_equal work_count + # end + # end end end diff --git a/test/fixtures/merchants.yml b/test/fixtures/merchants.yml index b4d7301d8e..3f3ab87c43 100644 --- a/test/fixtures/merchants.yml +++ b/test/fixtures/merchants.yml @@ -4,22 +4,28 @@ tamira: name: Tamira email: tv@ada.edu uid: 1111111111111111 - provider: Github + provider: github diane: name: Diane email: dl@ada.edu uid: 2222222222222222 - provider: MyString + provider: github kimberley: name: Kimberley email: kz@ada.edu uid: 3333333333333333 - provider: Github + provider: github nkiru: name: Nkiru email: nk@ada.edu uid: 4444444444444444 - provider: Github + provider: github + +stranger: + name: nil + email: nil + uid: nil + provider: nil From 7849a1d2957bde34b07bbd8d0075bf552ea022d0 Mon Sep 17 00:00:00 2001 From: nkiru onwuneme Date: Wed, 18 Oct 2017 15:19:08 -0700 Subject: [PATCH 036/382] Removed PK from seed data --- db/seed_data/categories.csv | 16 ++++++------- db/seed_data/merchants.csv | 16 ++++++------- db/seed_data/products.csv | 16 ++++++------- db/seeds.rb | 48 ++++++++++++++++++------------------- 4 files changed, 48 insertions(+), 48 deletions(-) diff --git a/db/seed_data/categories.csv b/db/seed_data/categories.csv index 81dcc9c1fa..9cb79a60ac 100644 --- a/db/seed_data/categories.csv +++ b/db/seed_data/categories.csv @@ -1,8 +1,8 @@ -id,category -1,Perennials -2,Annuals -3,Succulents -4,Cactus -5,House Plants -6,Terrarium Plants -7,Flower Bulbs +name +Perennials +Annuals +Succulents +Cactus +House Plants +Terrarium Plants +Flower Bulbs diff --git a/db/seed_data/merchants.csv b/db/seed_data/merchants.csv index 0d4ec77f2f..b57065d6bd 100644 --- a/db/seed_data/merchants.csv +++ b/db/seed_data/merchants.csv @@ -1,8 +1,8 @@ -id,name,email,uid,provider -1,Cheryl Katz,ck@gmail.com,04242023,github -2,Juanita Freeman,jf3@yahoo.com,05242023,github -3,Carolina Sodje,rolinas@hotmail.com,06242023,github -4,Carl Lewis,lewis1@gmail.com,07242023,github -5,Daphne Jones,Djones@yahoo.com,08242023,github -6,Ada Okafor,okaforlaw@hotmail.com,09242023,github -7,Su Lee,sus@hotmail.com,03442023,github +name,email,uid,provider +Cheryl Katz,ck@gmail.com,04242023,github +Juanita Freeman,jf3@yahoo.com,05242023,github +Carolina Sodje,rolinas@hotmail.com,06242023,github +Carl Lewis,lewis1@gmail.com,07242023,github +Daphne Jones,Djones@yahoo.com,08242023,github +Ada Okafor,okaforlaw@hotmail.com,09242023,github +Su Lee,sus@hotmail.com,03442023,github diff --git a/db/seed_data/products.csv b/db/seed_data/products.csv index 4bcc59ebae..0cff96fc58 100644 --- a/db/seed_data/products.csv +++ b/db/seed_data/products.csv @@ -1,8 +1,8 @@ -id,merchant_id,inventory,price,description,visible,image_url -1,7,24,17.99,Dahlia Cornel,true,https://phsonline.org/uploads/blog/dahlia-cornel.jpg -2,6,36,35.23,Chelsea Stickel,true,https://www.gardendesign.com/pictures/images/477x482Exact/site_3/pink-coleus-garden-crossings_9180.jpg -3,5,48,25.99,Tomato Soup Coneflower,true,https://i.pinimg.com/736x/5c/39/d0/5c39d04d4c7b02fff2d77179c71eb43f--tomato-soups-pretty-flowers.jpg -4,4,60,42.99,Velvet Cactus,true,https://zimedesign.files.wordpress.com/2017/01/img_4333.jpg -5,3,72,17.98,Hyacinth Bulbs,true,http://www.edenbrothers.com/store/media/Bulbs-Flowers/HYWH%20116-0950-1.jpg -6,2,12,29.97,New Zealand Red Hook Sedge,true,https://i.pinimg.com/736x/a6/0d/f2/a60df23ac93f5a11bbda2f4b00fd77b9--colorful-grasses-red-grasses.jpg -7,1,96,26.37,Petunia Belinda,true,https://s-media-cache-ak0.pinimg.com/originals/dc/cf/3a/dccf3a1ce891e593fcc0df6629d742e7.jpg +inventory,price,description,visible,image_url +24,17.99,Dahlia Cornel,true,https://phsonline.org/uploads/blog/dahlia-cornel.jpg +36,35.23,Chelsea Stickel,true,https://www.gardendesign.com/pictures/images/477x482Exact/site_3/pink-coleus-garden-crossings_9180.jpg +48,25.99,Tomato Soup Coneflower,true,https://i.pinimg.com/736x/5c/39/d0/5c39d04d4c7b02fff2d77179c71eb43f--tomato-soups-pretty-flowers.jpg +60,42.99,Velvet Cactus,true,https://zimedesign.files.wordpress.com/2017/01/img_4333.jpg +72,17.98,Hyacinth Bulbs,true,http://www.edenbrothers.com/store/media/Bulbs-Flowers/HYWH%20116-0950-1.jpg +12,29.97,New Zealand Red Hook Sedge,true,https://i.pinimg.com/736x/a6/0d/f2/a60df23ac93f5a11bbda2f4b00fd77b9--colorful-grasses-red-grasses.jpg +96,26.37,Petunia Belinda,true,https://s-media-cache-ak0.pinimg.com/originals/dc/cf/3a/dccf3a1ce891e593fcc0df6629d742e7.jpg diff --git a/db/seeds.rb b/db/seeds.rb index 21ad7a513b..463d593dd3 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -9,6 +9,29 @@ require 'csv' +MERCHANT_FILE = Rails.root.join('db', 'seed_data', 'merchants.csv') +puts "Loading raw merchant data from #{MERCHANT_FILE}" + +merchant_failures = [] +CSV.foreach(MERCHANT_FILE, :headers => true) do |row| + merchant = Merchant.new + merchant.id = row['id'] + merchant.name = row['name'] + merchant.email = row['email'] + merchant.uid = row['uid'] + merchant.provider = row['provider'] + puts "Created merchant: #{merchant.inspect}" + successful = merchant.save + if !successful + merchant_failures << merchant + end +end + +puts "Added #{Merchant.count} merchant records" +puts "#{merchant_failures.length} merchants failed to save" + + + PRODUCT_FILE = Rails.root.join('db', 'seed_data', 'products.csv') puts "Loading raw product data from #{PRODUCT_FILE}" @@ -16,7 +39,7 @@ CSV.foreach(PRODUCT_FILE, :headers => true) do |row| product = Product.new product.id = row['id'] - product.merchant_id = row['merchant_id'] + product.merchant_id = Merchant.find_by("RANDOM()").limit(1) product.inventory = row['inventory'] product.price = row['price'] product.description = row['description'] @@ -103,26 +126,3 @@ # # puts "Added #{OrderItem.count} orderitem records" # puts "#{orderitem_failures.length} orderitems failed to save" - - - -MERCHANT_FILE = Rails.root.join('db', 'seed_data', 'merchants.csv') -puts "Loading raw merchant data from #{MERCHANT_FILE}" - -merchant_failures = [] -CSV.foreach(MERCHANT_FILE, :headers => true) do |row| - merchant = Merchant.new - merchant.id = row['id'] - merchant.name = row['name'] - merchant.email = row['email'] - merchant.uid = row['uid'] - merchant.provider = row['provider'] - puts "Created merchant: #{merchant.inspect}" - successful = merchant.save - if !successful - merchant_failures << merchant - end -end - -puts "Added #{Merchant.count} merchant records" -puts "#{merchant_failures.length} merchants failed to save" From cdf245f0d3c97d4c717374c8cf7cb1f0032e095a Mon Sep 17 00:00:00 2001 From: Diane Lenertz Date: Wed, 18 Oct 2017 15:31:04 -0700 Subject: [PATCH 037/382] validations for products_controller --- app/controllers/products_controller.rb | 3 +- app/models/product.rb | 4 ++ test/controllers/products_controller_test.rb | 43 +++++++++----------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 64853f7bb4..2c358d17e3 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -33,7 +33,8 @@ def create if find_merchant #<>>>>>>>>>>>>>>>>>>>>>> PRODUCT.ID #{product.id}" - puts ">>>>>>>>>>>>>>>>>>>>>>> MERCHANT.ID #{product.merchant.id}" - product.must_be :valid? - product_count = Product.count - post products_path, params: product_data - must_respond_with :redirect - must_redirect_to merchant_products_path(product.merchant.id) - Product.count.must_equal product_count + 1 - end + # it "redirects to merchant_products_path when the product data is valid and adds a work" do + # diane = merchants(:diane) + # product_data = { + # product: { + # merchant: diane, + # name: "string of pearls", + # price: 30.0, + # inventory: 40, + # image_url: 'https://img0.etsystatic.com/135/0/13063062/il_570xN.1001407668_zqhp.jpg' + # } + # } + # product = Product.new(product_data[:product]) + # product.must_be :valid? + # product_count = Product.count + # post products_path, params: product_data + # must_respond_with :redirect + # must_redirect_to merchant_products_path(product.merchant.id) + # Product.count.must_equal product_count + 1 + # end it "redirects to merchant_products_path when the product data is not valid and doesn't add a work" do product_data = { product: { - name: nil, - price: nil, - inventory: nil, image_url: nil } } From da9f5a23ff901ae065dfd74b863d9aaa8bd1be7a Mon Sep 17 00:00:00 2001 From: Kimberley Zell Date: Wed, 18 Oct 2017 15:41:29 -0700 Subject: [PATCH 038/382] small changes --- test/models/orderitem_test.rb | 9 --------- test/test_helper.rb | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 test/models/orderitem_test.rb diff --git a/test/models/orderitem_test.rb b/test/models/orderitem_test.rb deleted file mode 100644 index b8bc7d17d6..0000000000 --- a/test/models/orderitem_test.rb +++ /dev/null @@ -1,9 +0,0 @@ -require "test_helper" - -describe Orderitem do - let(:orderitem) { Orderitem.new } - - it "must be valid" do - value(orderitem).must_be :valid? - end -end diff --git a/test/test_helper.rb b/test/test_helper.rb index 81660ea08d..5366b2a2fd 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -36,7 +36,7 @@ def mock_auth_hash(merchant) uid: merchant.uid, info: { email: merchant.email, - name: merchant.name + nickname: merchant.name } } end From 256ea62d271271eaf8acc23a30dc9061f899e62a Mon Sep 17 00:00:00 2001 From: Diane Lenertz Date: Wed, 18 Oct 2017 17:28:34 -0700 Subject: [PATCH 039/382] message: --- app/controllers/merchants_controller.rb | 14 ++++---- app/views/products/root.html.erb | 2 +- db/seed_data/categories.csv | 16 ++++----- db/seed_data/merchants.csv | 16 ++++----- db/seed_data/products.csv | 16 ++++----- db/seeds.rb | 48 ++++++++++++------------- 6 files changed, 56 insertions(+), 56 deletions(-) diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rb index a3620726d4..8fe5dca7b3 100644 --- a/app/controllers/merchants_controller.rb +++ b/app/controllers/merchants_controller.rb @@ -8,26 +8,26 @@ def login auth_hash = request.env['omniauth.auth'] if auth_hash['uid'] - merchant = Merchant.find_by(provider: params[:provider], uid: auth_hash[:uid]) + @merchant = Merchant.find_by(provider: params[:provider], uid: auth_hash[:uid]) - if merchant.nil? + if @merchant.nil? #user has not logged in before #create a new record in the DB - merchant = Merchant.from_auth_hash(params[:provider], auth_hash) + @merchant = Merchant.from_auth_hash(params[:provider], auth_hash) # save_and_flash(user) - if merchant.save + if @merchant.save flash[:status] = :success - flash[:message] = "successfully created a new merchant #{merchant.name}" + flash[:message] = "successfully created a new merchant #{@merchant.name}" else flash[:status] = :failure end else flash[:status] = :success - flash[:message] = "successfully logged in as returning merchant #{merchant.name}" + flash[:message] = "successfully logged in as returning merchant #{@merchant.name}" end - session[:merchant_id] = merchant.id + session[:merchant_id] = @merchant.id redirect_to root_path end end diff --git a/app/views/products/root.html.erb b/app/views/products/root.html.erb index e5572b3d7a..b4383af46b 100644 --- a/app/views/products/root.html.erb +++ b/app/views/products/root.html.erb @@ -12,6 +12,6 @@ <% end %>

Merchants:

<%= merchant = session[:merchant] %> - <%= merchant.class %> + <%= @merchant.class %> diff --git a/db/seed_data/categories.csv b/db/seed_data/categories.csv index 81dcc9c1fa..9cb79a60ac 100644 --- a/db/seed_data/categories.csv +++ b/db/seed_data/categories.csv @@ -1,8 +1,8 @@ -id,category -1,Perennials -2,Annuals -3,Succulents -4,Cactus -5,House Plants -6,Terrarium Plants -7,Flower Bulbs +name +Perennials +Annuals +Succulents +Cactus +House Plants +Terrarium Plants +Flower Bulbs diff --git a/db/seed_data/merchants.csv b/db/seed_data/merchants.csv index 0d4ec77f2f..b57065d6bd 100644 --- a/db/seed_data/merchants.csv +++ b/db/seed_data/merchants.csv @@ -1,8 +1,8 @@ -id,name,email,uid,provider -1,Cheryl Katz,ck@gmail.com,04242023,github -2,Juanita Freeman,jf3@yahoo.com,05242023,github -3,Carolina Sodje,rolinas@hotmail.com,06242023,github -4,Carl Lewis,lewis1@gmail.com,07242023,github -5,Daphne Jones,Djones@yahoo.com,08242023,github -6,Ada Okafor,okaforlaw@hotmail.com,09242023,github -7,Su Lee,sus@hotmail.com,03442023,github +name,email,uid,provider +Cheryl Katz,ck@gmail.com,04242023,github +Juanita Freeman,jf3@yahoo.com,05242023,github +Carolina Sodje,rolinas@hotmail.com,06242023,github +Carl Lewis,lewis1@gmail.com,07242023,github +Daphne Jones,Djones@yahoo.com,08242023,github +Ada Okafor,okaforlaw@hotmail.com,09242023,github +Su Lee,sus@hotmail.com,03442023,github diff --git a/db/seed_data/products.csv b/db/seed_data/products.csv index 4bcc59ebae..0cff96fc58 100644 --- a/db/seed_data/products.csv +++ b/db/seed_data/products.csv @@ -1,8 +1,8 @@ -id,merchant_id,inventory,price,description,visible,image_url -1,7,24,17.99,Dahlia Cornel,true,https://phsonline.org/uploads/blog/dahlia-cornel.jpg -2,6,36,35.23,Chelsea Stickel,true,https://www.gardendesign.com/pictures/images/477x482Exact/site_3/pink-coleus-garden-crossings_9180.jpg -3,5,48,25.99,Tomato Soup Coneflower,true,https://i.pinimg.com/736x/5c/39/d0/5c39d04d4c7b02fff2d77179c71eb43f--tomato-soups-pretty-flowers.jpg -4,4,60,42.99,Velvet Cactus,true,https://zimedesign.files.wordpress.com/2017/01/img_4333.jpg -5,3,72,17.98,Hyacinth Bulbs,true,http://www.edenbrothers.com/store/media/Bulbs-Flowers/HYWH%20116-0950-1.jpg -6,2,12,29.97,New Zealand Red Hook Sedge,true,https://i.pinimg.com/736x/a6/0d/f2/a60df23ac93f5a11bbda2f4b00fd77b9--colorful-grasses-red-grasses.jpg -7,1,96,26.37,Petunia Belinda,true,https://s-media-cache-ak0.pinimg.com/originals/dc/cf/3a/dccf3a1ce891e593fcc0df6629d742e7.jpg +inventory,price,description,visible,image_url +24,17.99,Dahlia Cornel,true,https://phsonline.org/uploads/blog/dahlia-cornel.jpg +36,35.23,Chelsea Stickel,true,https://www.gardendesign.com/pictures/images/477x482Exact/site_3/pink-coleus-garden-crossings_9180.jpg +48,25.99,Tomato Soup Coneflower,true,https://i.pinimg.com/736x/5c/39/d0/5c39d04d4c7b02fff2d77179c71eb43f--tomato-soups-pretty-flowers.jpg +60,42.99,Velvet Cactus,true,https://zimedesign.files.wordpress.com/2017/01/img_4333.jpg +72,17.98,Hyacinth Bulbs,true,http://www.edenbrothers.com/store/media/Bulbs-Flowers/HYWH%20116-0950-1.jpg +12,29.97,New Zealand Red Hook Sedge,true,https://i.pinimg.com/736x/a6/0d/f2/a60df23ac93f5a11bbda2f4b00fd77b9--colorful-grasses-red-grasses.jpg +96,26.37,Petunia Belinda,true,https://s-media-cache-ak0.pinimg.com/originals/dc/cf/3a/dccf3a1ce891e593fcc0df6629d742e7.jpg diff --git a/db/seeds.rb b/db/seeds.rb index 21ad7a513b..463d593dd3 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -9,6 +9,29 @@ require 'csv' +MERCHANT_FILE = Rails.root.join('db', 'seed_data', 'merchants.csv') +puts "Loading raw merchant data from #{MERCHANT_FILE}" + +merchant_failures = [] +CSV.foreach(MERCHANT_FILE, :headers => true) do |row| + merchant = Merchant.new + merchant.id = row['id'] + merchant.name = row['name'] + merchant.email = row['email'] + merchant.uid = row['uid'] + merchant.provider = row['provider'] + puts "Created merchant: #{merchant.inspect}" + successful = merchant.save + if !successful + merchant_failures << merchant + end +end + +puts "Added #{Merchant.count} merchant records" +puts "#{merchant_failures.length} merchants failed to save" + + + PRODUCT_FILE = Rails.root.join('db', 'seed_data', 'products.csv') puts "Loading raw product data from #{PRODUCT_FILE}" @@ -16,7 +39,7 @@ CSV.foreach(PRODUCT_FILE, :headers => true) do |row| product = Product.new product.id = row['id'] - product.merchant_id = row['merchant_id'] + product.merchant_id = Merchant.find_by("RANDOM()").limit(1) product.inventory = row['inventory'] product.price = row['price'] product.description = row['description'] @@ -103,26 +126,3 @@ # # puts "Added #{OrderItem.count} orderitem records" # puts "#{orderitem_failures.length} orderitems failed to save" - - - -MERCHANT_FILE = Rails.root.join('db', 'seed_data', 'merchants.csv') -puts "Loading raw merchant data from #{MERCHANT_FILE}" - -merchant_failures = [] -CSV.foreach(MERCHANT_FILE, :headers => true) do |row| - merchant = Merchant.new - merchant.id = row['id'] - merchant.name = row['name'] - merchant.email = row['email'] - merchant.uid = row['uid'] - merchant.provider = row['provider'] - puts "Created merchant: #{merchant.inspect}" - successful = merchant.save - if !successful - merchant_failures << merchant - end -end - -puts "Added #{Merchant.count} merchant records" -puts "#{merchant_failures.length} merchants failed to save" From 1b1a6f98c4c94c0a1957969c6b41ce592091c8c3 Mon Sep 17 00:00:00 2001 From: Kimberley Zell Date: Wed, 18 Oct 2017 17:33:29 -0700 Subject: [PATCH 040/382] removed orderitems test because we changed the name and arent using this anymore --- test/models/orderitem_test.rb | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 test/models/orderitem_test.rb diff --git a/test/models/orderitem_test.rb b/test/models/orderitem_test.rb deleted file mode 100644 index b8bc7d17d6..0000000000 --- a/test/models/orderitem_test.rb +++ /dev/null @@ -1,9 +0,0 @@ -require "test_helper" - -describe Orderitem do - let(:orderitem) { Orderitem.new } - - it "must be valid" do - value(orderitem).must_be :valid? - end -end From 8b80f41d29508c398027ac6ce30d758393bc89fb Mon Sep 17 00:00:00 2001 From: Kimberley Zell Date: Wed, 18 Oct 2017 17:51:59 -0700 Subject: [PATCH 041/382] updated review validations --- app/models/review.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/review.rb b/app/models/review.rb index 9deefc272f..599e8935b5 100644 --- a/app/models/review.rb +++ b/app/models/review.rb @@ -1,5 +1,5 @@ class Review < ApplicationRecord belongs_to :product - validates :rating, presence: {message: "A review must have a rating."}, numericality: { only_integer: true } + validates :rating, presence: {message: "A review must have a rating."}, numericality: { only_integer: true, greater_than: 0, less_than: 6 } end From ca2c9132671c0a8916e4b5154954af178795ff29 Mon Sep 17 00:00:00 2001 From: nkiru onwuneme Date: Wed, 18 Oct 2017 18:11:08 -0700 Subject: [PATCH 042/382] Added categories-products join table --- .../20171019010329_add_categories_products_table.rb | 10 ++++++++++ db/schema.rb | 9 ++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20171019010329_add_categories_products_table.rb diff --git a/db/migrate/20171019010329_add_categories_products_table.rb b/db/migrate/20171019010329_add_categories_products_table.rb new file mode 100644 index 0000000000..dcf0f52c16 --- /dev/null +++ b/db/migrate/20171019010329_add_categories_products_table.rb @@ -0,0 +1,10 @@ +class AddCategoriesProductsTable < ActiveRecord::Migration[5.1] + def change + create_table :categories_products do |t| + t.integer :category_id + t.integer :product_id + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index babd7a0141..3bc9c3a3e8 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20171018050310) do +ActiveRecord::Schema.define(version: 20171019010329) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -21,6 +21,13 @@ t.datetime "updated_at", null: false end + create_table "categories_products", force: :cascade do |t| + t.integer "category_id" + t.integer "product_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "merchants", force: :cascade do |t| t.string "name" t.string "email" From 285fd1829b93a59af71d59b7431ec6aebae5f830 Mon Sep 17 00:00:00 2001 From: nkiru onwuneme Date: Wed, 18 Oct 2017 19:11:36 -0700 Subject: [PATCH 043/382] Seed data is working, boom --- db/seed_data/categories.csv | 1 + db/seed_data/products.csv | 16 ++++++------ db/seeds.rb | 51 ++++++++++++++++++++++--------------- 3 files changed, 40 insertions(+), 28 deletions(-) diff --git a/db/seed_data/categories.csv b/db/seed_data/categories.csv index 9cb79a60ac..ea25a8a56b 100644 --- a/db/seed_data/categories.csv +++ b/db/seed_data/categories.csv @@ -6,3 +6,4 @@ Cactus House Plants Terrarium Plants Flower Bulbs +Ornamental Grass diff --git a/db/seed_data/products.csv b/db/seed_data/products.csv index 0cff96fc58..8138d52ed7 100644 --- a/db/seed_data/products.csv +++ b/db/seed_data/products.csv @@ -1,8 +1,8 @@ -inventory,price,description,visible,image_url -24,17.99,Dahlia Cornel,true,https://phsonline.org/uploads/blog/dahlia-cornel.jpg -36,35.23,Chelsea Stickel,true,https://www.gardendesign.com/pictures/images/477x482Exact/site_3/pink-coleus-garden-crossings_9180.jpg -48,25.99,Tomato Soup Coneflower,true,https://i.pinimg.com/736x/5c/39/d0/5c39d04d4c7b02fff2d77179c71eb43f--tomato-soups-pretty-flowers.jpg -60,42.99,Velvet Cactus,true,https://zimedesign.files.wordpress.com/2017/01/img_4333.jpg -72,17.98,Hyacinth Bulbs,true,http://www.edenbrothers.com/store/media/Bulbs-Flowers/HYWH%20116-0950-1.jpg -12,29.97,New Zealand Red Hook Sedge,true,https://i.pinimg.com/736x/a6/0d/f2/a60df23ac93f5a11bbda2f4b00fd77b9--colorful-grasses-red-grasses.jpg -96,26.37,Petunia Belinda,true,https://s-media-cache-ak0.pinimg.com/originals/dc/cf/3a/dccf3a1ce891e593fcc0df6629d742e7.jpg +category_name,name,inventory,price,description,visible,image_url +Perennials,Dahlia Cornel,24,17.99,"medium-sized, spherical purple-red flowers on strong stems",true,https://phsonline.org/uploads/blog/dahlia-cornel.jpg +Perennials,Chelsea Stickel,36,35.23,"Hot-pink leaves with ruffled, variegated borders edged with a thin line of light green.",true,https://www.gardendesign.com/pictures/images/477x482Exact/site_3/pink-coleus-garden-crossings_9180.jpg +House Plants,Aloe Vera,48,25.99,"The leaves are thick and fleshy, green to grey-green, with some varieties showing white flecks on their upper and lower stem surfaces.",true,https://images-na.ssl-images-amazon.com/images/I/51QbyJ0v%2BIL.jpg +Cactus,Velvet Cactus,60,42.99,designer Cactus,true,https://zimedesign.files.wordpress.com/2017/01/img_4333.jpg +Flower Bulbs,Hyacinth Bulbs,72,17.98,Loved for its intoxicating perfume.,true,http://www.edenbrothers.com/store/media/Bulbs-Flowers/HYWH%20116-0950-1.jpg +Ornamental Grass,Red Hood Sedge,12,29.97,New Zealand ornamental grass.,true,https://i.pinimg.com/736x/a6/0d/f2/a60df23ac93f5a11bbda2f4b00fd77b9--colorful-grasses-red-grasses.jpg +Annuals,Petunia Belinda,96,26.37,masses of vibrant color that will last all summer.,true,https://s-media-cache-ak0.pinimg.com/originals/dc/cf/3a/dccf3a1ce891e593fcc0df6629d742e7.jpg diff --git a/db/seeds.rb b/db/seeds.rb index 463d593dd3..d79f6a9c2e 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -15,7 +15,6 @@ merchant_failures = [] CSV.foreach(MERCHANT_FILE, :headers => true) do |row| merchant = Merchant.new - merchant.id = row['id'] merchant.name = row['name'] merchant.email = row['email'] merchant.uid = row['uid'] @@ -31,22 +30,51 @@ puts "#{merchant_failures.length} merchants failed to save" +CATEGORY_FILE = Rails.root.join('db', 'seed_data', 'categories.csv') +puts "Loading raw category data from #{CATEGORY_FILE}" + +category_failures = [] +CSV.foreach(CATEGORY_FILE, :headers => true) do |row| + category = Category.new + category.name = row['name'] + puts "Created category: #{category.inspect}" + successful = category.save + if !successful + category_failures << category + end +end + +puts "Added #{Category.count} category records" +puts "#{category_failures.length} categories failed to save" + + PRODUCT_FILE = Rails.root.join('db', 'seed_data', 'products.csv') puts "Loading raw product data from #{PRODUCT_FILE}" product_failures = [] CSV.foreach(PRODUCT_FILE, :headers => true) do |row| + category = Category.find_by(name: row['category_name']) + + if category.nil? + puts "Category does not exist: #{row['category_name']}" + puts "Product #{row['name']} was not created!!!" + next + end + product = Product.new - product.id = row['id'] - product.merchant_id = Merchant.find_by("RANDOM()").limit(1) + product.name = row['name'] + product.merchant = Merchant.order("RANDOM()").first product.inventory = row['inventory'] product.price = row['price'] + product.categories << Category.find_by(name: row['category_name']) product.description = row['description'] product.visible = row['visible'] product.image_url = row['image_url'] + puts "Created product: #{product.inspect}" successful = product.save + if !successful product_failures << product end @@ -57,23 +85,6 @@ -CATEGORY_FILE = Rails.root.join('db', 'seed_data', 'categories.csv') -puts "Loading raw category data from #{CATEGORY_FILE}" - -category_failures = [] -CSV.foreach(CATEGORY_FILE, :headers => true) do |row| - category = Category.new - category.id = row['id'] - category.name = row['name'] - puts "Created category: #{category.inspect}" - successful = category.save - if !successful - category_failures << category - end -end - -puts "Added #{Category.count} category records" -puts "#{category_failures.length} categories failed to save" From cfe5e0a1411e9c62d39320334dc3c80b17f96699 Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Wed, 18 Oct 2017 19:30:15 -0700 Subject: [PATCH 044/382] Add .env file with (tamira's) client ID and secret. Add the dotenv-rails gem to the Gemfile --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 6a6de03758..7f3e29a423 100644 --- a/Gemfile +++ b/Gemfile @@ -50,6 +50,7 @@ group :development do # 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 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem From e66c45f3345eefffdf64328aad32f1c5abb6a606 Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Wed, 18 Oct 2017 19:36:41 -0700 Subject: [PATCH 045/382] Commented out other login paths because I thought they might interger with the provided (but not showbn) login rout that Omniauth provides --- config/routes.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index a35c46038e..ba24ba4867 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -27,8 +27,9 @@ get '/auth/:provider/callback', to: 'merchants#login', as: 'auth_callback' -get '/login', to: 'merchants#login', as: 'login' -post '/login', to: 'merchants#login' +# NOTE: I commented out these routes because I don't think we need them since we have the login through OAuth.... +# get '/login', to: 'merchants#login', as: 'login' +# post '/login', to: 'merchants#login' post '/logout', to: 'merchants#logout', as: 'logout' end From 8da80d4bd8024a9c0289b2316fbdf709718cf102 Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Wed, 18 Oct 2017 19:45:47 -0700 Subject: [PATCH 046/382] Change .self_from_auth_hash to only set merchant.name to the nickname passed in by github --- app/models/merchant.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/merchant.rb b/app/models/merchant.rb index f9ca7073cc..cf2d869890 100644 --- a/app/models/merchant.rb +++ b/app/models/merchant.rb @@ -5,7 +5,8 @@ def self.from_auth_hash(provider, auth_hash) merchant = new merchant.provider = provider merchant.uid = auth_hash['uid'] - merchant.name = auth_hash['info']['name'] + # NOTE: we should only set merchant.name to one thing, and since we don't have a username for merchant, we will just set 'name' to the 'nickname' passed in my rails + # merchant.name = auth_hash['info']['name'] merchant.email = auth_hash['info']['email'] merchant.name = auth_hash['info']['nickname'] From 321dc9493fdd680ab94444a3b5e0336612e879c7 Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Wed, 18 Oct 2017 19:49:26 -0700 Subject: [PATCH 047/382] Edited save_and_flash to be protected method and uncommented save_and_flash from login action in merchant --- app/controllers/application_controller.rb | 5 +++-- app/controllers/merchants_controller.rb | 14 +++++++------- app/models/merchant.rb | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 89ec624ba1..568c588139 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,7 +1,8 @@ class ApplicationController < ActionController::Base protect_from_forgery with: :exception - # protected + protected + # def require_login # @merchant = Merchant.find_by(id: session[:user_id]) # unless @merchant @@ -15,7 +16,7 @@ def save_and_flash(model) result = model.save if result flash[:status] = :success - flash[:message] = "sucessfully saved #{model.class}" + flash[:message] = "Sucessfully saved #{model.class}" else flash.now[:status] = :failure flash.now[:message] = "Failed to save #{model.class}" diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rb index 8fe5dca7b3..ba2a53676e 100644 --- a/app/controllers/merchants_controller.rb +++ b/app/controllers/merchants_controller.rb @@ -8,15 +8,15 @@ def login auth_hash = request.env['omniauth.auth'] if auth_hash['uid'] - @merchant = Merchant.find_by(provider: params[:provider], uid: auth_hash[:uid]) + merchant = Merchant.find_by(provider: params[:provider], uid: auth_hash['uid']) - if @merchant.nil? + if merchant.nil? #user has not logged in before #create a new record in the DB - @merchant = Merchant.from_auth_hash(params[:provider], auth_hash) - # save_and_flash(user) + merchant = Merchant.from_auth_hash(params[:provider], auth_hash) + save_and_flash(user) - if @merchant.save + if merchant.save flash[:status] = :success flash[:message] = "successfully created a new merchant #{@merchant.name}" else @@ -25,9 +25,9 @@ def login else flash[:status] = :success - flash[:message] = "successfully logged in as returning merchant #{@merchant.name}" + flash[:message] = "successfully logged in as returning merchant #{merchant.name}" end - session[:merchant_id] = @merchant.id + session[:merchant_id] = merchant.id redirect_to root_path end end diff --git a/app/models/merchant.rb b/app/models/merchant.rb index cf2d869890..a1340a674f 100644 --- a/app/models/merchant.rb +++ b/app/models/merchant.rb @@ -10,6 +10,6 @@ def self.from_auth_hash(provider, auth_hash) merchant.email = auth_hash['info']['email'] merchant.name = auth_hash['info']['nickname'] - return merchant -end + return merchant + end end From 33fac4d5923f82cf938758b593763ed701c164ed Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Wed, 18 Oct 2017 19:54:18 -0700 Subject: [PATCH 048/382] Edited login action in merchant to match what we learned in class --- app/controllers/merchants_controller.rb | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rb index ba2a53676e..a9ff621137 100644 --- a/app/controllers/merchants_controller.rb +++ b/app/controllers/merchants_controller.rb @@ -15,23 +15,19 @@ def login #create a new record in the DB merchant = Merchant.from_auth_hash(params[:provider], auth_hash) save_and_flash(user) - - if merchant.save - flash[:status] = :success - flash[:message] = "successfully created a new merchant #{@merchant.name}" - else - flash[:status] = :failure - end - else flash[:status] = :success - flash[:message] = "successfully logged in as returning merchant #{merchant.name}" - end - session[:merchant_id] = merchant.id - redirect_to root_path - end + flash[:message] = "Succesfully logged in as returning merchant #{merchant.name}" + end # if/else + + else + flash[:status] = :failure + flash[:message] = "Could not create user from data provided by Github" + end # if/else + redirect_to rott_path end + def logout session[:merchant_id] = nil flash[:status] = :success From 364b3a77d133f845dd80c98f8c1266fe2c18793b Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Wed, 18 Oct 2017 20:02:35 -0700 Subject: [PATCH 049/382] Commented out buttons to login and logout in application.html.erb because they were throwing errors --- app/views/layouts/application.html.erb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 22ba5a36a5..55b32defd4 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -26,10 +26,12 @@
<% if @login_merchant %> - <%= link_to "My Account: Logged in as #{@login_merchant.username}", user_path(@login_merchant), class: "button"%> + <%# NOTE: I commented out the link below because it was raising an error TV %> + <%# link_to "My Account: Logged in as #{@login_merchant.username}", user_path(@login_merchant), class: "button"%> <%= link_to "Log Out", logout_path, method: :post, class: "button" %> <% else %> - <%= link_to "Log In", login_url, class: "button float-right" %> + <%# NOTE: I commented out the link below because it was raising an error TV %> + <%# link_to "Log In", login_url, class: "button float-right" %> <%= link_to "Merchant Sign up through GitHub", auth_callback_path(:github), class: "button" %> <%end%>
From 2929cd1caa9311e7a6c8d0c94fabdd9ed66485e1 Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Wed, 18 Oct 2017 20:20:39 -0700 Subject: [PATCH 050/382] Add flash section to application.html.erb --- app/views/layouts/application.html.erb | 36 ++++++++++++++++++++------ 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 55b32defd4..d55aaf3644 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -37,14 +37,34 @@ - -
- <% flash.each do |name, message| %> -
<%= message %>
- <% end %> -
- - <%= yield %> +
+ <% if flash[:message] %> +
+
+ <% if flash[:status] == :failure %> +

+ <% else %> +

+ <% end %> + <%= flash[:message] %> +

+ <% if flash[:details] %> +
    + <% flash[:details].each do |field, problems| %> + <% problems.each do |problem| %> +
  • + <%=field %>: + <%= problem %> +
    • + <% end %> + <%end %> +
+ <% end %> +
+
+ <% end %> + <%= yield %> +
From 551c46b8c88fc6e41279914905b865b0f2561a90 Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Wed, 18 Oct 2017 20:25:13 -0700 Subject: [PATCH 051/382] Log in and out fucntionality works for Merchant --- app/controllers/merchants_controller.rb | 4 ++-- app/views/layouts/application.html.erb | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rb index a9ff621137..8f8d5c6559 100644 --- a/app/controllers/merchants_controller.rb +++ b/app/controllers/merchants_controller.rb @@ -14,7 +14,7 @@ def login #user has not logged in before #create a new record in the DB merchant = Merchant.from_auth_hash(params[:provider], auth_hash) - save_and_flash(user) + save_and_flash(merchant) else flash[:status] = :success flash[:message] = "Succesfully logged in as returning merchant #{merchant.name}" @@ -24,7 +24,7 @@ def login flash[:status] = :failure flash[:message] = "Could not create user from data provided by Github" end # if/else - redirect_to rott_path + redirect_to root_path end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index d55aaf3644..74a171ccbf 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -37,6 +37,7 @@ + <%# NOTE: replaced the incomplete flash section with a complete flash section TV%>
<% if flash[:message] %>
From a2f74bf52defbdb894e63b8a5e1a6edbffc50bb0 Mon Sep 17 00:00:00 2001 From: Diane Lenertz Date: Wed, 18 Oct 2017 20:38:01 -0700 Subject: [PATCH 052/382] finished seed data, added order_item, order, and review seed data --- db/seeds.rb | 110 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 65 insertions(+), 45 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index d79f6a9c2e..0ace8fb9bd 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -88,52 +88,72 @@ -# ORDER_FILE = Rails.root.join('db', 'seed_data', 'orders.csv') -# puts "Loading raw order data from #{ORDER_FILE}" -# -# order_failures = [] -# CSV.foreach(ORDER_FILE, :headers => true) do |row| -# order = Order.new -# order.id = row['id'] -# order.cc_name = row['cc_name'] -# order.cc_number = row['cc_number'] -# order.cc_exp = row['cc_exp'] -# order.cc_cvv = row['cc_cvv'] -# order.address = row['address'] -# order.zip = row['zip'] -# order.email = row['email'] -# order.date_submitted = Date.strptime(row['date'], '%Y-%m-%d') -# order.status = row['status'] -# puts "Created order: #{order.inspect}" -# successful = order.save -# if !successful -# order_failures << order -# end -# end +ORDER_FILE = Rails.root.join('db', 'seed_data', 'orders.csv') +puts "Loading raw order data from #{ORDER_FILE}" + +order_failures = [] +CSV.foreach(ORDER_FILE, :headers => true) do |row| + order = Order.new + order.cc_name = row['cc_name'] + order.cc_number = row['cc_number'] + order.cc_exp = rand(10.years).seconds.from_now + order.cc_cvv = row['cc_cvv'] + order.address = row['address'] + order.zip = row['zip'] + order.email = row['email'] + order.date_submitted = Date.today + order.status = row['status'] + puts "Created order: #{order.inspect}" + successful = order.save + if !successful + order_failures << order + end +end # -# puts "Added #{Order.count} order records" -# puts "#{order_failures.length} orders failed to save" +puts "Added #{Order.count} order records" +puts "#{order_failures.length} orders failed to save" -# ORDERITEM_FILE = Rails.root.join('db', 'seed_data', 'orderitems.csv') -# puts "Loading raw order-item data from #{ORDERITEM_FILE}" -# -# orderitem_failures = [] -# CSV.foreach(ORDERITEM_FILE, :headers => true) do |row| -# orderitem = Orderitem.new -# orderitem.id = row['id'] -# orderitem.product_id = row['product_id'] -# orderitem.order_id = row['order_id'] -# orderitem.quantity = row['quantity'] -# orderitem.cost = row['cost'] -# orderitem.shipped_status = row['shipped_status'] -# puts "Created orderitem: #{orderitem.inspect}" -# successful = orderitem.save -# if !successful -# orderitem_failures << orderitem -# end -# end -# -# puts "Added #{OrderItem.count} orderitem records" -# puts "#{orderitem_failures.length} orderitems failed to save" +ORDERITEM_FILE = Rails.root.join('db', 'seed_data', 'orderitems.csv') +puts "Loading raw order-item data from #{ORDERITEM_FILE}" + +orderitem_failures = [] +CSV.foreach(ORDERITEM_FILE, :headers => true) do |row| + orderitem = OrderItem.new + orderitem.product_id = Product.order("RANDOM()").first.id + orderitem.order_id = Order.order("RANDOM()").first.id + orderitem.quantity = row['quantity'] + orderitem.cost = row['cost'] + orderitem.shipped_status = row['shipped_status'] + puts "Created orderitem: #{orderitem.inspect}" + successful = orderitem.save + if !successful + orderitem_failures << orderitem + end +end + +puts "Added #{OrderItem.count} orderitem records" +puts "#{orderitem_failures.length} orderitems failed to save" + + + + +REVIEW_FILE = Rails.root.join('db', 'seed_data', 'reviews.csv') +puts "Loading raw review data from #{REVIEW_FILE}" + +review_failures = [] +CSV.foreach(REVIEW_FILE, :headers => true) do |row| + review = Review.new + review.product_id = Product.order("RANDOM()").first.id + review.description = row['description'] + review.rating = rand(1..5) + puts "Created review: #{review.inspect}" + successful = review.save + if !successful + review_failures << review + end +end + +puts "Added #{Review.count} review records" +puts "#{review_failures.length} review failed to save" From 66c2b1b06408631e9ef537c00de7f7fee2773ec8 Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Wed, 18 Oct 2017 20:38:23 -0700 Subject: [PATCH 053/382] Edited application.html.erb file's login and logout buttons to match the routes --- app/controllers/merchants_controller.rb | 2 ++ app/views/layouts/application.html.erb | 17 +++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rb index 8f8d5c6559..d6ffe06568 100644 --- a/app/controllers/merchants_controller.rb +++ b/app/controllers/merchants_controller.rb @@ -20,6 +20,8 @@ def login flash[:message] = "Succesfully logged in as returning merchant #{merchant.name}" end # if/else + session[:merchant_id] = merchant.id + else flash[:status] = :failure flash[:message] = "Could not create user from data provided by Github" diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 74a171ccbf..b193c4be35 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -24,16 +24,17 @@ <%= link_to "Add a New Product", new_product_path, class: "button" %> + <%# NOTE: I changed the log in and out buttons to work with the login routes that we have. I haven't added logout functionality yet so that link is NOT functional yet!%>
- <% if @login_merchant %> - <%# NOTE: I commented out the link below because it was raising an error TV %> - <%# link_to "My Account: Logged in as #{@login_merchant.username}", user_path(@login_merchant), class: "button"%> - <%= link_to "Log Out", logout_path, method: :post, class: "button" %> + <% if session[:merchant_id] %> +

+ Logged in as + <%= Merchant.find(session[:merchant_id]).name %> +

+ <%= link_to "Log out", logout_path, class: "button" %> <% else %> - <%# NOTE: I commented out the link below because it was raising an error TV %> - <%# link_to "Log In", login_url, class: "button float-right" %> - <%= link_to "Merchant Sign up through GitHub", auth_callback_path(:github), class: "button" %> - <%end%> + <%= link_to "Log in", '/auth/github', class: "button" %> + <% end %>
From d6fb605745d22ac5207e5fc0a0733c749e749948 Mon Sep 17 00:00:00 2001 From: Tamira Vojnar Date: Wed, 18 Oct 2017 20:45:31 -0700 Subject: [PATCH 054/382] Edited logout rout to be GET instead of POST --- config/routes.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index ba24ba4867..c4103944b1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -27,9 +27,9 @@ get '/auth/:provider/callback', to: 'merchants#login', as: 'auth_callback' -# NOTE: I commented out these routes because I don't think we need them since we have the login through OAuth.... +# NOTE: I commented out these routes because I don't think we need them since we have the login through OAuth.... # get '/login', to: 'merchants#login', as: 'login' # post '/login', to: 'merchants#login' -post '/logout', to: 'merchants#logout', as: 'logout' +get '/logout', to: 'merchants#logout', as: 'logout' end From 00fd6fe9cedcc05daad153b8149604f6481daedc Mon Sep 17 00:00:00 2001 From: Diane Lenertz Date: Wed, 18 Oct 2017 21:09:25 -0700 Subject: [PATCH 055/382] add simplecov, everyone must bundle install --- coverage/.last_run.json | 5 + coverage/.resultset.json | 540 +++ coverage/.resultset.json.lock | 0 coverage/assets/0.10.2/application.css | 799 ++++ coverage/assets/0.10.2/application.js | 1707 ++++++++ coverage/assets/0.10.2/colorbox/border.png | Bin 0 -> 163 bytes coverage/assets/0.10.2/colorbox/controls.png | Bin 0 -> 2033 bytes coverage/assets/0.10.2/colorbox/loading.gif | Bin 0 -> 9427 bytes .../0.10.2/colorbox/loading_background.png | Bin 0 -> 166 bytes coverage/assets/0.10.2/favicon_green.png | Bin 0 -> 1009 bytes coverage/assets/0.10.2/favicon_red.png | Bin 0 -> 1009 bytes coverage/assets/0.10.2/favicon_yellow.png | Bin 0 -> 1009 bytes coverage/assets/0.10.2/loading.gif | Bin 0 -> 7247 bytes coverage/assets/0.10.2/magnify.png | Bin 0 -> 1301 bytes .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 0 -> 180 bytes .../images/ui-bg_flat_75_ffffff_40x100.png | Bin 0 -> 178 bytes .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 0 -> 120 bytes .../images/ui-bg_glass_65_ffffff_1x400.png | Bin 0 -> 105 bytes .../images/ui-bg_glass_75_dadada_1x400.png | Bin 0 -> 111 bytes .../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 0 -> 110 bytes .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin 0 -> 119 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 0 -> 101 bytes .../images/ui-icons_222222_256x240.png | Bin 0 -> 4369 bytes .../images/ui-icons_2e83ff_256x240.png | Bin 0 -> 4369 bytes .../images/ui-icons_454545_256x240.png | Bin 0 -> 4369 bytes .../images/ui-icons_888888_256x240.png | Bin 0 -> 4369 bytes .../images/ui-icons_cd0a0a_256x240.png | Bin 0 -> 4369 bytes coverage/index.html | 3593 +++++++++++++++++ 28 files changed, 6644 insertions(+) create mode 100644 coverage/.last_run.json create mode 100644 coverage/.resultset.json create mode 100644 coverage/.resultset.json.lock create mode 100644 coverage/assets/0.10.2/application.css create mode 100644 coverage/assets/0.10.2/application.js create mode 100644 coverage/assets/0.10.2/colorbox/border.png create mode 100644 coverage/assets/0.10.2/colorbox/controls.png create mode 100644 coverage/assets/0.10.2/colorbox/loading.gif create mode 100644 coverage/assets/0.10.2/colorbox/loading_background.png create mode 100644 coverage/assets/0.10.2/favicon_green.png create mode 100644 coverage/assets/0.10.2/favicon_red.png create mode 100644 coverage/assets/0.10.2/favicon_yellow.png create mode 100644 coverage/assets/0.10.2/loading.gif create mode 100644 coverage/assets/0.10.2/magnify.png create mode 100644 coverage/assets/0.10.2/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png create mode 100644 coverage/assets/0.10.2/smoothness/images/ui-bg_flat_75_ffffff_40x100.png create mode 100644 coverage/assets/0.10.2/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png create mode 100644 coverage/assets/0.10.2/smoothness/images/ui-bg_glass_65_ffffff_1x400.png create mode 100644 coverage/assets/0.10.2/smoothness/images/ui-bg_glass_75_dadada_1x400.png create mode 100644 coverage/assets/0.10.2/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png create mode 100644 coverage/assets/0.10.2/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png create mode 100644 coverage/assets/0.10.2/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png create mode 100644 coverage/assets/0.10.2/smoothness/images/ui-icons_222222_256x240.png create mode 100644 coverage/assets/0.10.2/smoothness/images/ui-icons_2e83ff_256x240.png create mode 100644 coverage/assets/0.10.2/smoothness/images/ui-icons_454545_256x240.png create mode 100644 coverage/assets/0.10.2/smoothness/images/ui-icons_888888_256x240.png create mode 100644 coverage/assets/0.10.2/smoothness/images/ui-icons_cd0a0a_256x240.png create mode 100644 coverage/index.html diff --git a/coverage/.last_run.json b/coverage/.last_run.json new file mode 100644 index 0000000000..217fe13185 --- /dev/null +++ b/coverage/.last_run.json @@ -0,0 +1,5 @@ +{ + "result": { + "covered_percent": 43.48 + } +} diff --git a/coverage/.resultset.json b/coverage/.resultset.json new file mode 100644 index 0000000000..db493074a8 --- /dev/null +++ b/coverage/.resultset.json @@ -0,0 +1,540 @@ +{ + "MiniTest": { + "coverage": { + "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/app/controllers/merchants_controller.rb": [ + 1, + null, + null, + null, + null, + null, + 1, + 0, + null, + 0, + 0, + null, + 0, + null, + null, + 0, + null, + null, + 0, + 0, + 0, + null, + 0, + null, + null, + null, + 0, + 0, + null, + 0, + 0, + null, + null, + null, + 1, + 0, + 0, + 0, + 0, + null, + null + ], + "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/app/controllers/application_controller.rb": [ + 1, + 1, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + 1, + 0, + 0, + 0, + 0, + null, + 0, + 0, + 0, + null, + 0, + null, + null, + 1, + 1, + 0, + null, + 0, + null, + null, + null, + null, + null, + null, + null + ], + "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/test/controllers/products_controller_test.rb": [ + 1, + null, + 1, + 1, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + 1, + 1, + 0, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + 1, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + 1, + null, + 0, + null, + null, + null, + null, + 0, + 0, + 0, + null, + 0, + 0, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null + ], + "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/app/controllers/products_controller.rb": [ + null, + 1, + null, + 1, + 0, + null, + null, + 1, + 0, + 0, + 0, + null, + 0, + null, + null, + null, + null, + 1, + 0, + 0, + 0, + 0, + null, + 0, + null, + null, + 0, + null, + null, + null, + null, + 1, + 0, + 0, + 0, + 0, + 0, + null, + null, + null, + 0, + 0, + 0, + null, + 0, + null, + null, + 0, + null, + null, + null, + 1, + 0, + 0, + 0, + null, + null, + null, + 1, + 0, + null, + 0, + 0, + 0, + null, + null, + 0, + null, + null, + null, + null, + 1, + 0, + 0, + 0, + null, + 0, + null, + null, + null, + null, + null, + 1, + null, + null, + null, + 1, + null, + 0, + 0, + 0, + 0, + 0, + null, + null, + null, + null, + null, + null, + null, + null, + null, + 1, + null, + 1, + 0, + null + ], + "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/test/controllers/review_controller_test.rb": [ + 1, + null, + 1, + null, + null, + null, + null + ], + "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/app/controllers/review_controller.rb": [ + 1, + null, + 1, + 0, + null, + null, + 1, + null, + null, + 0, + 0, + null, + 0, + 0, + 0, + 0, + 0, + 0, + null, + null, + null, + 0, + null, + 0, + 0, + 0, + 0, + null, + null, + 0, + 0, + 0, + null, + null, + null, + null, + null, + null, + null, + 1, + null, + 1, + 0, + null, + null + ], + "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/test/models/category_test.rb": [ + 1, + null, + 1, + 1, + null, + 1, + 0, + null, + null + ], + "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/app/models/category.rb": [ + 1, + 1, + null + ], + "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/app/models/application_record.rb": [ + 1, + 1, + null + ], + "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/test/models/merchant_test.rb": [ + 1, + null, + 1, + 1, + null, + 1, + 0, + null, + null + ], + "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/app/models/merchant.rb": [ + 1, + 1, + null, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + null, + 0, + null, + null + ], + "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/test/models/order_item_test.rb": [ + 1, + null, + 1, + 1, + null, + 1, + 0, + null, + null + ], + "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/app/models/order_item.rb": [ + 1, + 1, + 1, + null, + null + ], + "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/test/models/order_test.rb": [ + 1, + null, + 1, + 1, + null, + 1, + 0, + null, + null + ], + "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/app/models/order.rb": [ + 1, + 1, + null + ], + "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/test/models/product_test.rb": [ + 1, + null, + 1, + 1, + null, + 1, + 0, + null, + null + ], + "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/app/models/product.rb": [ + 1, + 1, + 1, + 1, + 1, + null, + 1, + 1, + null, + null + ], + "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/test/models/review_test.rb": [ + 1, + null, + 1, + 1, + null, + 1, + 0, + null, + null + ], + "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/app/models/review.rb": [ + 1, + 1, + null, + 1, + null + ] + }, + "timestamp": 1508386024 + } +} diff --git a/coverage/.resultset.json.lock b/coverage/.resultset.json.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/coverage/assets/0.10.2/application.css b/coverage/assets/0.10.2/application.css new file mode 100644 index 0000000000..d86560434d --- /dev/null +++ b/coverage/assets/0.10.2/application.css @@ -0,0 +1,799 @@ +/* ----------------------------------------------------------------------- + + + Blueprint CSS Framework 0.9 + http://blueprintcss.org + + * Copyright (c) 2007-Present. See LICENSE for more info. + * See README for instructions on how to use Blueprint. + * For credits and origins, see AUTHORS. + * This is a compressed file. See the sources in the 'src' directory. + +----------------------------------------------------------------------- */ + +/* reset.css */ + +html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section {margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;} +article, aside, dialog, figure, footer, header, hgroup, nav, section {display:block;} +body {line-height:1.5;} +table {border-collapse:separate;border-spacing:0;} +caption, th, td {text-align:left;font-weight:normal;} +table, td, th {vertical-align:middle;} +blockquote:before, blockquote:after, q:before, q:after {content:"";} +blockquote, q {quotes:"" "";} +a img {border:none;} + +/* typography.css */ +html {font-size:100.01%;} +body {font-size:82%;color:#222;background:#fff;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;} +h1, h2, h3, h4, h5, h6 {font-weight:normal;color:#111;} +h1 {font-size:3em;line-height:1;margin-bottom:0.5em;} +h2 {font-size:2em;margin-bottom:0.75em;} +h3 {font-size:1.5em;line-height:1;margin-bottom:1em;} +h4 {font-size:1.2em;line-height:1.25;margin-bottom:1.25em;} +h5 {font-size:1em;font-weight:bold;margin-bottom:1.5em;} +h6 {font-size:1em;font-weight:bold;} +h1 img, h2 img, h3 img, h4 img, h5 img, h6 img {margin:0;} +p {margin:0 0 1.5em;} +p img.left {float:left;margin:1.5em 1.5em 1.5em 0;padding:0;} +p img.right {float:right;margin:1.5em 0 1.5em 1.5em;} +a:focus, a:hover {color:#000;} +a {color:#009;text-decoration:underline;} +blockquote {margin:1.5em;color:#666;font-style:italic;} +strong {font-weight:bold;} +em, dfn {font-style:italic;} +dfn {font-weight:bold;} +sup, sub {line-height:0;} +abbr, acronym {border-bottom:1px dotted #666;} +address {margin:0 0 1.5em;font-style:italic;} +del {color:#666;} +pre {margin:1.5em 0;white-space:pre;} +pre, code, tt {font:1em 'andale mono', 'lucida console', monospace;line-height:1.5;} +li ul, li ol {margin:0;} +ul, ol {margin:0 1.5em 1.5em 0;padding-left:3.333em;} +ul {list-style-type:disc;} +ol {list-style-type:decimal;} +dl {margin:0 0 1.5em 0;} +dl dt {font-weight:bold;} +dd {margin-left:1.5em;} +table {margin-bottom:1.4em;width:100%;} +th {font-weight:bold;} +thead th {background:#c3d9ff;} +th, td, caption {padding:4px 10px 4px 5px;} +tr.even td {background:#efefef;} +tfoot {font-style:italic;} +caption {background:#eee;} +.small {font-size:.8em;margin-bottom:1.875em;line-height:1.875em;} +.large {font-size:1.2em;line-height:2.5em;margin-bottom:1.25em;} +.hide {display:none;} +.quiet {color:#666;} +.loud {color:#000;} +.highlight {background:#ff0;} +.added {background:#060;color:#fff;} +.removed {background:#900;color:#fff;} +.first {margin-left:0;padding-left:0;} +.last {margin-right:0;padding-right:0;} +.top {margin-top:0;padding-top:0;} +.bottom {margin-bottom:0;padding-bottom:0;} + +/* forms.css */ +label {font-weight:bold;} +fieldset {padding:1.4em;margin:0 0 1.5em 0;border:1px solid #ccc;} +legend {font-weight:bold;font-size:1.2em;} +input[type=text], input[type=password], input.text, input.title, textarea, select {background-color:#fff;border:1px solid #bbb;} +input[type=text]:focus, input[type=password]:focus, input.text:focus, input.title:focus, textarea:focus, select:focus {border-color:#666;} +input[type=text], input[type=password], input.text, input.title, textarea, select {margin:0.5em 0;} +input.text, input.title {width:300px;padding:5px;} +input.title {font-size:1.5em;} +textarea {width:390px;height:250px;padding:5px;} +input[type=checkbox], input[type=radio], input.checkbox, input.radio {position:relative;top:.25em;} +form.inline {line-height:3;} +form.inline p {margin-bottom:0;} +.error, .notice, .success {padding:.8em;margin-bottom:1em;border:2px solid #ddd;} +.error {background:#FBE3E4;color:#8a1f11;border-color:#FBC2C4;} +.notice {background:#FFF6BF;color:#514721;border-color:#FFD324;} +.success {background:#E6EFC2;color:#264409;border-color:#C6D880;} +.error a {color:#8a1f11;} +.notice a {color:#514721;} +.success a {color:#264409;} +.box {padding:1.5em;margin-bottom:1.5em;background:#E5ECF9;} +hr {background:#ddd;color:#ddd;clear:both;float:none;width:100%;height:.1em;margin:0 0 1.45em;border:none;} +hr.space {background:#fff;color:#fff;visibility:hidden;} +.clearfix:after, .container:after {content:"\0020";display:block;height:0;clear:both;visibility:hidden;overflow:hidden;} +.clearfix, .container {display:block;} +.clear {clear:both;} +/* +github.com style (c) Vasily Polovnyov +*/ + + +pre code { +} + +pre .comment, +pre .template_comment, +pre .diff .header, +pre .javadoc { + color: #998; + font-style: italic +} + +pre .keyword, +pre .css .rule .keyword, +pre .winutils, +pre .javascript .title, +pre .lisp .title { + color: #000; + font-weight: bold +} + +pre .number, +pre .hexcolor { + color: #458 +} + + +pre .string, +pre .tag .value, +pre .phpdoc, +pre .tex .formula { + color: #d14 +} + +pre .subst { + color: #712; +} + +pre .constant, +pre .title, +pre .id { + color: #900; + font-weight: bold +} + +pre .javascript .title, +pre .lisp .title, +pre .subst { + font-weight: normal +} + +pre .class .title, +pre .haskell .label, +pre .tex .command { + color: #458; + font-weight: bold +} + +pre .tag, +pre .tag .title, +pre .rules .property, +pre .django .tag .keyword { + color: #000080; + font-weight: normal +} + +pre .attribute, +pre .variable, +pre .instancevar, +pre .lisp .body { + color: #008080 +} + +pre .regexp { + color: #009926 +} + +pre .class { + color: #458; + font-weight: bold +} + +pre .symbol, +pre .ruby .symbol .string, +pre .ruby .symbol .keyword, +pre .ruby .symbol .keymethods, +pre .lisp .keyword, +pre .tex .special, +pre .input_number { + color: #990073 +} + +pre .builtin, +pre .built_in, +pre .lisp .title { + color: #0086b3 +} + +pre .preprocessor, +pre .pi, +pre .doctype, +pre .shebang, +pre .cdata { + color: #999; + font-weight: bold +} + +pre .deletion { + background: #fdd +} + +pre .addition { + background: #dfd +} + +pre .diff .change { + background: #0086b3 +} + +pre .chunk { + color: #aaa +} + +pre .tex .formula { + opacity: 0.5; +} +/* + * jQuery UI CSS Framework @VERSION + * + * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Theming/API + */ + +/* Layout helpers +----------------------------------*/ + +.ui-helper-hidden { display: none; } +.ui-helper-hidden-accessible { position: absolute; left: -99999999px; } +.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } +.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } +.ui-helper-clearfix { display: inline-block; } +/* required comment for clearfix to work in Opera \*/ +* html .ui-helper-clearfix { height:1%; } +.ui-helper-clearfix { display:block; } +/* end clearfix */ +.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } + + +/* Interaction Cues +----------------------------------*/ +.ui-state-disabled { cursor: default !important; } + + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; } + + +/* Misc visuals +----------------------------------*/ + +/* Overlays */ +.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } + + +/* + * jQuery UI CSS Framework @VERSION + * + * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Theming/API + * + * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px + */ + + +/* Component containers +----------------------------------*/ +.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; } +.ui-widget .ui-widget { font-size: 1em; } +.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; } +.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; } +.ui-widget-content a { color: #222222; } +.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; } +.ui-widget-header a { color: #222222; } + +/* Interaction states +----------------------------------*/ +.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; } +.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; } +.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; } +.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; } +.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; } +.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; } +.ui-widget :active { outline: none; } + +/* Interaction Cues +----------------------------------*/ +.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; } +.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; } +.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; } +.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; } +.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; } +.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; } +.ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; } +.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; } + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); } +.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); } +.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); } +.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); } +.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); } +.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); } +.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); } +.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); } + +/* positioning */ +.ui-icon-carat-1-n { background-position: 0 0; } +.ui-icon-carat-1-ne { background-position: -16px 0; } +.ui-icon-carat-1-e { background-position: -32px 0; } +.ui-icon-carat-1-se { background-position: -48px 0; } +.ui-icon-carat-1-s { background-position: -64px 0; } +.ui-icon-carat-1-sw { background-position: -80px 0; } +.ui-icon-carat-1-w { background-position: -96px 0; } +.ui-icon-carat-1-nw { background-position: -112px 0; } +.ui-icon-carat-2-n-s { background-position: -128px 0; } +.ui-icon-carat-2-e-w { background-position: -144px 0; } +.ui-icon-triangle-1-n { background-position: 0 -16px; } +.ui-icon-triangle-1-ne { background-position: -16px -16px; } +.ui-icon-triangle-1-e { background-position: -32px -16px; } +.ui-icon-triangle-1-se { background-position: -48px -16px; } +.ui-icon-triangle-1-s { background-position: -64px -16px; } +.ui-icon-triangle-1-sw { background-position: -80px -16px; } +.ui-icon-triangle-1-w { background-position: -96px -16px; } +.ui-icon-triangle-1-nw { background-position: -112px -16px; } +.ui-icon-triangle-2-n-s { background-position: -128px -16px; } +.ui-icon-triangle-2-e-w { background-position: -144px -16px; } +.ui-icon-arrow-1-n { background-position: 0 -32px; } +.ui-icon-arrow-1-ne { background-position: -16px -32px; } +.ui-icon-arrow-1-e { background-position: -32px -32px; } +.ui-icon-arrow-1-se { background-position: -48px -32px; } +.ui-icon-arrow-1-s { background-position: -64px -32px; } +.ui-icon-arrow-1-sw { background-position: -80px -32px; } +.ui-icon-arrow-1-w { background-position: -96px -32px; } +.ui-icon-arrow-1-nw { background-position: -112px -32px; } +.ui-icon-arrow-2-n-s { background-position: -128px -32px; } +.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } +.ui-icon-arrow-2-e-w { background-position: -160px -32px; } +.ui-icon-arrow-2-se-nw { background-position: -176px -32px; } +.ui-icon-arrowstop-1-n { background-position: -192px -32px; } +.ui-icon-arrowstop-1-e { background-position: -208px -32px; } +.ui-icon-arrowstop-1-s { background-position: -224px -32px; } +.ui-icon-arrowstop-1-w { background-position: -240px -32px; } +.ui-icon-arrowthick-1-n { background-position: 0 -48px; } +.ui-icon-arrowthick-1-ne { background-position: -16px -48px; } +.ui-icon-arrowthick-1-e { background-position: -32px -48px; } +.ui-icon-arrowthick-1-se { background-position: -48px -48px; } +.ui-icon-arrowthick-1-s { background-position: -64px -48px; } +.ui-icon-arrowthick-1-sw { background-position: -80px -48px; } +.ui-icon-arrowthick-1-w { background-position: -96px -48px; } +.ui-icon-arrowthick-1-nw { background-position: -112px -48px; } +.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } +.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } +.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } +.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } +.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } +.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } +.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } +.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } +.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } +.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } +.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } +.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } +.ui-icon-arrowreturn-1-w { background-position: -64px -64px; } +.ui-icon-arrowreturn-1-n { background-position: -80px -64px; } +.ui-icon-arrowreturn-1-e { background-position: -96px -64px; } +.ui-icon-arrowreturn-1-s { background-position: -112px -64px; } +.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } +.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } +.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } +.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } +.ui-icon-arrow-4 { background-position: 0 -80px; } +.ui-icon-arrow-4-diag { background-position: -16px -80px; } +.ui-icon-extlink { background-position: -32px -80px; } +.ui-icon-newwin { background-position: -48px -80px; } +.ui-icon-refresh { background-position: -64px -80px; } +.ui-icon-shuffle { background-position: -80px -80px; } +.ui-icon-transfer-e-w { background-position: -96px -80px; } +.ui-icon-transferthick-e-w { background-position: -112px -80px; } +.ui-icon-folder-collapsed { background-position: 0 -96px; } +.ui-icon-folder-open { background-position: -16px -96px; } +.ui-icon-document { background-position: -32px -96px; } +.ui-icon-document-b { background-position: -48px -96px; } +.ui-icon-note { background-position: -64px -96px; } +.ui-icon-mail-closed { background-position: -80px -96px; } +.ui-icon-mail-open { background-position: -96px -96px; } +.ui-icon-suitcase { background-position: -112px -96px; } +.ui-icon-comment { background-position: -128px -96px; } +.ui-icon-person { background-position: -144px -96px; } +.ui-icon-print { background-position: -160px -96px; } +.ui-icon-trash { background-position: -176px -96px; } +.ui-icon-locked { background-position: -192px -96px; } +.ui-icon-unlocked { background-position: -208px -96px; } +.ui-icon-bookmark { background-position: -224px -96px; } +.ui-icon-tag { background-position: -240px -96px; } +.ui-icon-home { background-position: 0 -112px; } +.ui-icon-flag { background-position: -16px -112px; } +.ui-icon-calendar { background-position: -32px -112px; } +.ui-icon-cart { background-position: -48px -112px; } +.ui-icon-pencil { background-position: -64px -112px; } +.ui-icon-clock { background-position: -80px -112px; } +.ui-icon-disk { background-position: -96px -112px; } +.ui-icon-calculator { background-position: -112px -112px; } +.ui-icon-zoomin { background-position: -128px -112px; } +.ui-icon-zoomout { background-position: -144px -112px; } +.ui-icon-search { background-position: -160px -112px; } +.ui-icon-wrench { background-position: -176px -112px; } +.ui-icon-gear { background-position: -192px -112px; } +.ui-icon-heart { background-position: -208px -112px; } +.ui-icon-star { background-position: -224px -112px; } +.ui-icon-link { background-position: -240px -112px; } +.ui-icon-cancel { background-position: 0 -128px; } +.ui-icon-plus { background-position: -16px -128px; } +.ui-icon-plusthick { background-position: -32px -128px; } +.ui-icon-minus { background-position: -48px -128px; } +.ui-icon-minusthick { background-position: -64px -128px; } +.ui-icon-close { background-position: -80px -128px; } +.ui-icon-closethick { background-position: -96px -128px; } +.ui-icon-key { background-position: -112px -128px; } +.ui-icon-lightbulb { background-position: -128px -128px; } +.ui-icon-scissors { background-position: -144px -128px; } +.ui-icon-clipboard { background-position: -160px -128px; } +.ui-icon-copy { background-position: -176px -128px; } +.ui-icon-contact { background-position: -192px -128px; } +.ui-icon-image { background-position: -208px -128px; } +.ui-icon-video { background-position: -224px -128px; } +.ui-icon-script { background-position: -240px -128px; } +.ui-icon-alert { background-position: 0 -144px; } +.ui-icon-info { background-position: -16px -144px; } +.ui-icon-notice { background-position: -32px -144px; } +.ui-icon-help { background-position: -48px -144px; } +.ui-icon-check { background-position: -64px -144px; } +.ui-icon-bullet { background-position: -80px -144px; } +.ui-icon-radio-off { background-position: -96px -144px; } +.ui-icon-radio-on { background-position: -112px -144px; } +.ui-icon-pin-w { background-position: -128px -144px; } +.ui-icon-pin-s { background-position: -144px -144px; } +.ui-icon-play { background-position: 0 -160px; } +.ui-icon-pause { background-position: -16px -160px; } +.ui-icon-seek-next { background-position: -32px -160px; } +.ui-icon-seek-prev { background-position: -48px -160px; } +.ui-icon-seek-end { background-position: -64px -160px; } +.ui-icon-seek-start { background-position: -80px -160px; } +/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */ +.ui-icon-seek-first { background-position: -80px -160px; } +.ui-icon-stop { background-position: -96px -160px; } +.ui-icon-eject { background-position: -112px -160px; } +.ui-icon-volume-off { background-position: -128px -160px; } +.ui-icon-volume-on { background-position: -144px -160px; } +.ui-icon-power { background-position: 0 -176px; } +.ui-icon-signal-diag { background-position: -16px -176px; } +.ui-icon-signal { background-position: -32px -176px; } +.ui-icon-battery-0 { background-position: -48px -176px; } +.ui-icon-battery-1 { background-position: -64px -176px; } +.ui-icon-battery-2 { background-position: -80px -176px; } +.ui-icon-battery-3 { background-position: -96px -176px; } +.ui-icon-circle-plus { background-position: 0 -192px; } +.ui-icon-circle-minus { background-position: -16px -192px; } +.ui-icon-circle-close { background-position: -32px -192px; } +.ui-icon-circle-triangle-e { background-position: -48px -192px; } +.ui-icon-circle-triangle-s { background-position: -64px -192px; } +.ui-icon-circle-triangle-w { background-position: -80px -192px; } +.ui-icon-circle-triangle-n { background-position: -96px -192px; } +.ui-icon-circle-arrow-e { background-position: -112px -192px; } +.ui-icon-circle-arrow-s { background-position: -128px -192px; } +.ui-icon-circle-arrow-w { background-position: -144px -192px; } +.ui-icon-circle-arrow-n { background-position: -160px -192px; } +.ui-icon-circle-zoomin { background-position: -176px -192px; } +.ui-icon-circle-zoomout { background-position: -192px -192px; } +.ui-icon-circle-check { background-position: -208px -192px; } +.ui-icon-circlesmall-plus { background-position: 0 -208px; } +.ui-icon-circlesmall-minus { background-position: -16px -208px; } +.ui-icon-circlesmall-close { background-position: -32px -208px; } +.ui-icon-squaresmall-plus { background-position: -48px -208px; } +.ui-icon-squaresmall-minus { background-position: -64px -208px; } +.ui-icon-squaresmall-close { background-position: -80px -208px; } +.ui-icon-grip-dotted-vertical { background-position: 0 -224px; } +.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } +.ui-icon-grip-solid-vertical { background-position: -32px -224px; } +.ui-icon-grip-solid-horizontal { background-position: -48px -224px; } +.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } +.ui-icon-grip-diagonal-se { background-position: -80px -224px; } + + +/* Misc visuals +----------------------------------*/ + +/* Corner radius */ +.ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; } +.ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; } +.ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; } +.ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } +.ui-corner-top { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; } +.ui-corner-bottom { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } +.ui-corner-right { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } +.ui-corner-left { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; } +.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; } + +/* Overlays */ +.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); } +.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; } +/* + ColorBox Core Style: + The following CSS is consistent between example themes and should not be altered. +*/ +#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;} +#cboxOverlay{position:fixed; width:100%; height:100%;} +#cboxMiddleLeft, #cboxBottomLeft{clear:left;} +#cboxContent{position:relative;} +#cboxLoadedContent{overflow:auto;} +#cboxTitle{margin:0;} +#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;} +#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;} +.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none;} +.cboxIframe{width:100%; height:100%; display:block; border:0;} +#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box;} + +/* + User Style: + Change the following styles to modify the appearance of ColorBox. They are + ordered & tabbed in a way that represents the nesting of the generated HTML. +*/ +#cboxOverlay{background:#000;} +#colorbox{} + #cboxTopLeft{width:14px; height:14px; background:url(colorbox/controls.png) no-repeat 0 0;} + #cboxTopCenter{height:14px; background:url(colorbox/border.png) repeat-x top left;} + #cboxTopRight{width:14px; height:14px; background:url(colorbox/controls.png) no-repeat -36px 0;} + #cboxBottomLeft{width:14px; height:43px; background:url(colorbox/controls.png) no-repeat 0 -32px;} + #cboxBottomCenter{height:43px; background:url(colorbox/border.png) repeat-x bottom left;} + #cboxBottomRight{width:14px; height:43px; background:url(colorbox/controls.png) no-repeat -36px -32px;} + #cboxMiddleLeft{width:14px; background:url(colorbox/controls.png) repeat-y -175px 0;} + #cboxMiddleRight{width:14px; background:url(colorbox/controls.png) repeat-y -211px 0;} + #cboxContent{background:#fff; overflow:visible;} + .cboxIframe{background:#fff;} + #cboxError{padding:50px; border:1px solid #ccc;} + #cboxLoadedContent{margin-bottom:5px;} + #cboxLoadingOverlay{background:url(colorbox/loading_background.png) no-repeat center center;} + #cboxLoadingGraphic{background:url(colorbox/loading.gif) no-repeat center center;} + #cboxTitle{position:absolute; bottom:-25px; left:0; text-align:center; width:100%; font-weight:bold; color:#7C7C7C;} + #cboxCurrent{position:absolute; bottom:-25px; left:58px; font-weight:bold; color:#7C7C7C;} + + #cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{position:absolute; bottom:-29px; background:url(colorbox/controls.png) no-repeat 0px 0px; width:23px; height:23px; text-indent:-9999px;} + #cboxPrevious{left:0px; background-position: -51px -25px;} + #cboxPrevious:hover{background-position:-51px 0px;} + #cboxNext{left:27px; background-position:-75px -25px;} + #cboxNext:hover{background-position:-75px 0px;} + #cboxClose{right:0; background-position:-100px -25px;} + #cboxClose:hover{background-position:-100px 0px;} + + .cboxSlideshow_on #cboxSlideshow{background-position:-125px 0px; right:27px;} + .cboxSlideshow_on #cboxSlideshow:hover{background-position:-150px 0px;} + .cboxSlideshow_off #cboxSlideshow{background-position:-150px -25px; right:27px;} + .cboxSlideshow_off #cboxSlideshow:hover{background-position:-125px 0px;} +#loading { + position: fixed; + left: 40%; + top: 50%; } + +a { + color: #333333; + text-decoration: none; } + a:hover { + color: black; + text-decoration: underline; } + +body { + font-family: "Lucida Grande", Helvetica, "Helvetica Neue", Arial, sans-serif; + padding: 12px; + background-color: #333333; } + +h1, h2, h3, h4 { + color: #1c2324; + margin: 0; + padding: 0; + margin-bottom: 12px; } + +table { + width: 100%; } + +#content { + clear: left; + background-color: white; + border: 2px solid #dddddd; + border-top: 8px solid #dddddd; + padding: 18px; + -webkit-border-bottom-left-radius: 5px; + -webkit-border-bottom-right-radius: 5px; + -webkit-border-top-right-radius: 5px; + -moz-border-radius-bottomleft: 5px; + -moz-border-radius-bottomright: 5px; + -moz-border-radius-topright: 5px; + border-bottom-left-radius: 5px; + border-bottom-right-radius: 5px; + border-top-right-radius: 5px; } + +.dataTables_filter, .dataTables_info { + padding: 2px 6px; } + +abbr.timeago { + text-decoration: none; + border: none; + font-weight: bold; } + +.timestamp { + float: right; + color: #dddddd; } + +.group_tabs { + list-style: none; + float: left; + margin: 0; + padding: 0; } + .group_tabs li { + display: inline; + float: left; } + .group_tabs li a { + font-family: Helvetica, Arial, sans-serif; + display: block; + float: left; + text-decoration: none; + padding: 4px 8px; + background-color: #aaaaaa; + background: -webkit-gradient(linear, 0 0, 0 bottom, from(#dddddd), to(#aaaaaa)); + background: -moz-linear-gradient(#dddddd, #aaaaaa); + background: linear-gradient(#dddddd, #aaaaaa); + text-shadow: #e5e5e5 1px 1px 0px; + border-bottom: none; + color: #333333; + font-weight: bold; + margin-right: 8px; + border-top: 1px solid #efefef; + -webkit-border-top-left-radius: 2px; + -webkit-border-top-right-radius: 2px; + -moz-border-radius-topleft: 2px; + -moz-border-radius-topright: 2px; + border-top-left-radius: 2px; + border-top-right-radius: 2px; } + .group_tabs li a:hover { + background-color: #cccccc; + background: -webkit-gradient(linear, 0 0, 0 bottom, from(#eeeeee), to(#aaaaaa)); + background: -moz-linear-gradient(#eeeeee, #aaaaaa); + background: linear-gradient(#eeeeee, #aaaaaa); } + .group_tabs li a:active { + padding-top: 5px; + padding-bottom: 3px; } + .group_tabs li.active a { + color: black; + text-shadow: white 1px 1px 0px; + background-color: #dddddd; + background: -webkit-gradient(linear, 0 0, 0 bottom, from(white), to(#dddddd)); + background: -moz-linear-gradient(white, #dddddd); + background: linear-gradient(white, #dddddd); } + +.file_list { + margin-bottom: 18px; } + +a.src_link { + background: url("./magnify.png") no-repeat left 50%; + padding-left: 18px; } + +tr, td { + margin: 0; + padding: 0; } + +th { + white-space: nowrap; } + th.ui-state-default { + cursor: pointer; } + th span.ui-icon { + float: left; } + +td { + padding: 4px 8px; } + td.strong { + font-weight: bold; } + +.source_table h3, .source_table h4 { + padding: 0; + margin: 0; + margin-bottom: 4px; } +.source_table .header { + padding: 10px; } +.source_table pre { + margin: 0; + padding: 0; + white-space: normal; + color: black; + font-family: "Monaco", "Inconsolata", "Consolas", monospace; } +.source_table code { + color: black; + font-family: "Monaco", "Inconsolata", "Consolas", monospace; } +.source_table pre { + background-color: #333333; } + .source_table pre ol { + margin: 0px; + padding: 0px; + margin-left: 45px; + font-size: 12px; + color: white; } + .source_table pre li { + margin: 0px; + padding: 2px 6px; + border-left: 5px solid white; } + .source_table pre li code { + white-space: pre; + white-space: pre-wrap; } + .source_table pre .hits { + float: right; + margin-left: 10px; + padding: 2px 4px; + background-color: #444444; + background: -webkit-gradient(linear, 0 0, 0 bottom, from(#222222), to(#666666)); + background: -moz-linear-gradient(#222222, #666666); + background: linear-gradient(#222222, #666666); + color: white; + font-family: Helvetica, "Helvetica Neue", Arial, sans-serif; + font-size: 10px; + font-weight: bold; + text-align: center; + border-radius: 6px; } + +#footer { + color: #dddddd; + font-size: 12px; + font-weight: bold; + margin-top: 12px; + text-align: right; } + #footer a { + color: #eeeeee; + text-decoration: underline; } + #footer a:hover { + color: white; + text-decoration: none; } + +.green { + color: #009900; } + +.red { + color: #990000; } + +.yellow { + color: #ddaa00; } + +.source_table .covered { + border-color: #009900; } +.source_table .missed { + border-color: #990000; } +.source_table .never { + border-color: black; } +.source_table .skipped { + border-color: #ffcc00; } +.source_table .covered:nth-child(odd) { + background-color: #cdf2cd; } +.source_table .covered:nth-child(even) { + background-color: #dbf2db; } +.source_table .missed:nth-child(odd) { + background-color: #f7c0c0; } +.source_table .missed:nth-child(even) { + background-color: #f7cfcf; } +.source_table .never:nth-child(odd) { + background-color: #efefef; } +.source_table .never:nth-child(even) { + background-color: #f4f4f4; } +.source_table .skipped:nth-child(odd) { + background-color: #fbf0c0; } +.source_table .skipped:nth-child(even) { + background-color: #fbffcf; } + + + diff --git a/coverage/assets/0.10.2/application.js b/coverage/assets/0.10.2/application.js new file mode 100644 index 0000000000..fe65d88219 --- /dev/null +++ b/coverage/assets/0.10.2/application.js @@ -0,0 +1,1707 @@ +/*! + * jQuery JavaScript Library v1.6.2 + * http://jquery.com/ + * + * Copyright 2011, John Resig + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * Includes Sizzle.js + * http://sizzlejs.com/ + * Copyright 2011, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * + * Date: Thu Jun 30 14:16:56 2011 -0400 + */ + +(function(a,b){function cv(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cs(a){if(!cg[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ch||(ch=c.createElement("iframe"),ch.frameBorder=ch.width=ch.height=0),b.appendChild(ch);if(!ci||!ch.createElement)ci=(ch.contentWindow||ch.contentDocument).document,ci.write((c.compatMode==="CSS1Compat"?"":"")+""),ci.close();d=ci.createElement(a),ci.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ch)}cg[a]=e}return cg[a]}function cr(a,b){var c={};f.each(cm.concat.apply([],cm.slice(0,b)),function(){c[this]=a});return c}function cq(){cn=b}function cp(){setTimeout(cq,0);return cn=f.now()}function cf(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ce(){try{return new a.XMLHttpRequest}catch(b){}}function b$(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g0){c!=="border"&&f.each(e,function(){c||(d-=parseFloat(f.css(a,"padding"+this))||0),c==="margin"?d+=parseFloat(f.css(a,c+this))||0:d-=parseFloat(f.css(a,"border"+this+"Width"))||0});return d+"px"}d=bx(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0,c&&f.each(e,function(){d+=parseFloat(f.css(a,"padding"+this))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+this+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+this))||0)});return d+"px"}function bm(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(be,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bl(a){f.nodeName(a,"input")?bk(a):"getElementsByTagName"in a&&f.grep(a.getElementsByTagName("input"),bk)}function bk(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bj(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function bi(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bh(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c=f.expando,d=f.data(a),e=f.data(b,d);if(d=d[c]){var g=d.events;e=e[c]=f.extend({},d);if(g){delete e.handle,e.events={};for(var h in g)for(var i=0,j=g[h].length;i=0===c})}function V(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function N(a,b){return(a&&a!=="*"?a+".":"")+b.replace(z,"`").replace(A,"&")}function M(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;ic)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function K(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function E(){return!0}function D(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"$1-$2").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=/-([a-z])/ig,x=function(a,b){return b.toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;A.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!A){A=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a);return c===b||D.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(b,c,d){a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),d=c.documentElement,(!d||!d.nodeName||d.nodeName==="parsererror")&&e.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;c
a",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=a.getElementsByTagName("input")[0],k={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,k.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,k.optDisabled=!h.disabled;try{delete a.test}catch(v){k.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function(){k.noCloneEvent=!1}),a.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),k.radioValue=i.value==="t",i.setAttribute("checked","checked"),a.appendChild(i),l=c.createDocumentFragment(),l.appendChild(a.firstChild),k.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",m=c.getElementsByTagName("body")[0],o=c.createElement(m?"div":"body"),p={visibility:"hidden",width:0,height:0,border:0,margin:0},m&&f.extend(p,{position:"absolute",left:-1e3,top:-1e3});for(t in p)o.style[t]=p[t];o.appendChild(a),n=m||b,n.insertBefore(o,n.firstChild),k.appendChecked=i.checked,k.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,k.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="
",k.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="
t
",q=a.getElementsByTagName("td"),u=q[0].offsetHeight===0,q[0].style.display="",q[1].style.display="none",k.reliableHiddenOffsets=u&&q[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",a.appendChild(j),k.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0),o.innerHTML="",n.removeChild(o);if(a.attachEvent)for(t in{submit:1,change:1,focusin:1})s="on"+t,u=s in a,u||(a.setAttribute(s,"return;"),u=typeof a[s]=="function"),k[t+"Bubbles"]=u;o=l=g=h=m=j=a=i=null;return k}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([a-z])([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g=f.expando,h=typeof c=="string",i,j=a.nodeType,k=j?f.cache:a,l=j?a[f.expando]:a[f.expando]&&f.expando;if((!l||e&&l&&!k[l][g])&&h&&d===b)return;l||(j?a[f.expando]=l=++f.uuid:l=f.expando),k[l]||(k[l]={},j||(k[l].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?k[l][g]=f.extend(k[l][g],c):k[l]=f.extend(k[l],c);i=k[l],e&&(i[g]||(i[g]={}),i=i[g]),d!==b&&(i[f.camelCase(c)]=d);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[f.camelCase(c)]||i[c]:i}},removeData:function(b,c,d){if(!!f.acceptData(b)){var e=f.expando,g=b.nodeType,h=g?f.cache:b,i=g?b[f.expando]:f.expando;if(!h[i])return;if(c){var j=d?h[i][e]:h[i];if(j){delete j[c];if(!l(j))return}}if(d){delete h[i][e];if(!l(h[i]))return}var k=h[i][e];f.support.deleteExpando||h!=a?delete h[i]:h[i]=null,k?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=k):g&&(f.support.deleteExpando?delete b[f.expando]:b.removeAttribute?b.removeAttribute(f.expando):b[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;d=e.value;return typeof d=="string"?d.replace(p,""):d==null?"":d}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);j&&(c=f.attrFix[c]||c,i=f.attrHooks[c],i||(t.test(c)?i=w:v&&c!=="className"&&(f.nodeName(a,"form")||u.test(c))&&(i=v)));if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j&&(h=i.get(a,c))!==null)return h;h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.support.getSetAttribute?a.removeAttribute(b):(f.attr(a,b,""),a.removeAttributeNode(a.getAttributeNode(b))),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},tabIndex:{get:function(a){var c=a.getAttributeNode("tabIndex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}},value:{get:function(a,b){if(v&&f.nodeName(a,"button"))return v.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(v&&f.nodeName(a,"button"))return v.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);i&&(c=f.propFix[c]||c,h=f.propHooks[c]);return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==b?g:a[c]},propHooks:{}}),w={get:function(a,c){return f.prop(a,c)?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},f.support.getSetAttribute||(f.attrFix=f.propFix,v=f.attrHooks.name=f.attrHooks.title=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,c){var d=a.getAttributeNode(c);if(d){d.nodeValue=b;return b}}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var x=/\.(.*)$/,y=/^(?:textarea|input|select)$/i,z=/\./g,A=/ /g,B=/[^\w\s.|`]/g,C=function(a){return a.replace(B,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=D;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=D);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),C).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j=0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i. +shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d!=null?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},J=function(c){var d=c.target,e,g;if(!!y.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=I(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:J,beforedeactivate:J,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&J.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&J.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",I(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in H)f.event.add(this,c+".specialChange",H[c]);return y.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return y.test(this.nodeName)}},H=f.event.special.change.filters,H.focus=H.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g0)for(h=g;h0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=T.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a=="string")return f.inArray(this[0],a?f(a):this.parent().children());return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(V(c[0])||V(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=S.call(arguments);O.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!U[a]?f.unique(e):e,(this.length>1||Q.test(d))&&P.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var X=/ jQuery\d+="(?:\d+|null)"/g,Y=/^\s+/,Z=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,$=/<([\w:]+)/,_=/",""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]};bf.optgroup=bf.option,bf.tbody=bf.tfoot=bf.colgroup=bf.caption=bf.thead,bf.th=bf.td,f.support.htmlSerialize||(bf._default=[1,"div
","
"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(X,""):null;if(typeof a=="string"&&!bb.test(a)&&(f.support.leadingWhitespace||!Y.test(a))&&!bf[($.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Z,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j +)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bi(a,d),e=bj(a),g=bj(d);for(h=0;e[h];++h)bi(e[h],g[h])}if(b){bh(a,d);if(c){e=bj(a),g=bj(d);for(h=0;e[h];++h)bh(e[h],g[h])}}e=g=null;return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!ba.test(k))k=b.createTextNode(k);else{k=k.replace(Z,"<$1>");var l=($.exec(k)||["",""])[1].toLowerCase(),m=bf[l]||bf._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=_.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&Y.test(k)&&o.insertBefore(b.createTextNode(Y.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bo.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle;c.zoom=1;var e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.filter=bn.test(g)?g.replace(bn,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bx(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(by=function(a,c){var d,e,g;c=c.replace(bp,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bz=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bq.test(d)&&br.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bx=by||bz,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bB=/%20/g,bC=/\[\]$/,bD=/\r?\n/g,bE=/#.*$/,bF=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bG=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bH=/^(?:about|app|app\-storage|.+\-extension|file|widget):$/,bI=/^(?:GET|HEAD)$/,bJ=/^\/\//,bK=/\?/,bL=/)<[^<]*)*<\/script>/gi,bM=/^(?:select|textarea)/i,bN=/\s+/,bO=/([?&])_=[^&]*/,bP=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bQ=f.fn.load,bR={},bS={},bT,bU;try{bT=e.href}catch(bV){bT=c.createElement("a"),bT.href="",bT=bT.href}bU=bP.exec(bT.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bQ)return bQ.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
").append(c.replace(bL,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bM.test(this.nodeName)||bG.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bD,"\r\n")}}):{name:b.name,value:c.replace(bD,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?f.extend(!0,a,f.ajaxSettings,b):(b=a,a=f.extend(!0,f.ajaxSettings,b));for(var c in{context:1,url:1})c in b?a[c]=b[c]:c in f.ajaxSettings&&(a[c]=f.ajaxSettings[c]);return a},ajaxSettings:{url:bT,isLocal:bH.test(bU[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML}},ajaxPrefilter:bW(bR),ajaxTransport:bW(bS),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a?4:0;var o,r,u,w=l?bZ(d,v,l):b,x,y;if(a>=200&&a<300||a===304){if(d.ifModified){if(x=v.getResponseHeader("Last-Modified"))f.lastModified[k]=x;if(y=v.getResponseHeader("Etag"))f.etag[k]=y}if(a===304)c="notmodified",o=!0;else try{r=b$(d,w),c="success",o=!0}catch(z){c="parsererror",u=z}}else{u=c;if(!c||a)c="error",a<0&&(a=0)}v.status=a,v.statusText=c,o?h.resolveWith(e,[r,c,v]):h.rejectWith(e,[v,c,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,c]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bF.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bE,"").replace(bJ,bU[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bN),d.crossDomain==null&&(r=bP.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bU[1]&&r[2]==bU[2]&&(r[3]||(r[1]==="http:"?80:443))==(bU[3]||(bU[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bX(bR,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bI.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bK.test(d.url)?"&":"?")+d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bO,"$1_="+x);d.url=y+(y===d.url?(bK.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", */*; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bX(bS,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){status<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)bY(g,a[g],c,e);return d.join("&").replace(bB,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var b_=f.now(),ca=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+b_++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ca.test(b.url)||e&&ca.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ca,l),b.url===j&&(e&&(k=k.replace(ca,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cb=a.ActiveXObject?function(){for(var a in cd)cd[a](0,1)}:!1,cc=0,cd;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ce()||cf()}:ce,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cb&&delete cd[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cc,cb&&(cd||(cd={},f(a).unload(cb)),cd[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cg={},ch,ci,cj=/^(?:toggle|show|hide)$/,ck=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cl,cm=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cn,co=a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||a.oRequestAnimationFrame;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cr("show",3),a,b,c);for(var g=0,h=this.length;g=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b
";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cu.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cu.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cv(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cv(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a&&a.style?parseFloat(f.css(a,d,"padding")):null},f.fn["outer"+c]=function(a){var b=this[0];return b&&b.style?parseFloat(f.css(b,d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c];return e.document.compatMode==="CSS1Compat"&&g||e.document.body["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var h=f.css(e,d),i=parseFloat(h);return f.isNaN(i)?h:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window); +var hljs=new function(){function l(o){return o.replace(/&/gm,"&").replace(/"}while(x.length||y.length){var u=t().splice(0,1)[0];v+=l(w.substr(q,u.offset-q));q=u.offset;if(u.event=="start"){v+=r(u.node);s.push(u.node)}else{if(u.event=="stop"){var p=s.length;do{p--;var o=s[p];v+=("")}while(o!=u.node);s.splice(p,1);while(p'+l(K[0])+""}else{M+=l(K[0])}O=N.lR.lastIndex;K=N.lR.exec(L)}M+=l(L.substr(O,L.length-O));return M}function J(r,L){if(L.sL&&d[L.sL]){var K=f(L.sL,r);s+=K.keyword_count;return K.value}else{return E(r,L)}}function H(L,r){var K=L.cN?'':"";if(L.rB){p+=K;L.buffer=""}else{if(L.eB){p+=l(r)+K;L.buffer=""}else{p+=K;L.buffer=r}}B.push(L);A+=L.r}function D(N,K,P){var Q=B[B.length-1];if(P){p+=J(Q.buffer+N,Q);return false}var L=y(K,Q);if(L){p+=J(Q.buffer+N,Q);H(L,K);return L.rB}var r=v(B.length-1,K);if(r){var M=Q.cN?"":"";if(Q.rE){p+=J(Q.buffer+N,Q)+M}else{if(Q.eE){p+=J(Q.buffer+N,Q)+M+l(K)}else{p+=J(Q.buffer+N+K,Q)+M}}while(r>1){M=B[B.length-2].cN?"":"";p+=M;r--;B.length--}var O=B[B.length-1];B.length--;B[B.length-1].buffer="";if(O.starts){H(O.starts,"")}return Q.rE}if(w(K,Q)){throw"Illegal"}}var G=d[I];var B=[G.dM];var A=0;var s=0;var p="";try{var u=0;G.dM.buffer="";do{var x=q(C,u);var t=D(x[0],x[1],x[2]);u+=x[0].length;if(!t){u+=x[1].length}}while(!x[2]);if(B.length>1){throw"Illegal"}return{language:I,r:A,keyword_count:s,value:p}}catch(F){if(F=="Illegal"){return{language:null,r:0,keyword_count:0,value:l(C)}}else{throw F}}}function h(){function o(t,s,u){if(t.compiled){return}if(!u){t.bR=c(s,t.b?t.b:"\\B|\\b");if(!t.e&&!t.eW){t.e="\\B|\\b"}if(t.e){t.eR=c(s,t.e)}}if(t.i){t.iR=c(s,t.i)}if(t.r==undefined){t.r=1}if(t.k){t.lR=c(s,t.l||hljs.IR,true)}for(var r in t.k){if(!t.k.hasOwnProperty(r)){continue}if(t.k[r] instanceof Object){t.kG=t.k}else{t.kG={keyword:t.k}}break}if(!t.c){t.c=[]}t.compiled=true;for(var q=0;qx.keyword_count+x.r){x=u}if(u.keyword_count+u.r>w.keyword_count+w.r){x=w;w=u}}}var s=t.className;if(!s.match(w.language)){s=s?(s+" "+w.language):w.language}var o=b(t);if(o.length){var q=document.createElement("pre");q.innerHTML=w.value;w.value=k(o,b(q),A)}if(y){w.value=w.value.replace(/^((<[^>]+>|\t)+)/gm,function(B,E,D,C){return E.replace(/\t/g,y)})}if(p){w.value=w.value.replace(/\n/g,"
")}if(/MSIE [678]/.test(navigator.userAgent)&&t.tagName=="CODE"&&t.parentNode.tagName=="PRE"){var q=t.parentNode;var v=document.createElement("div");v.innerHTML="
"+w.value+"
";t=v.firstChild.firstChild;v.firstChild.cN=q.cN;q.parentNode.replaceChild(v.firstChild,q)}else{t.innerHTML=w.value}t.className=s;t.dataset={};t.dataset.result={language:w.language,kw:w.keyword_count,re:w.r};if(x&&x.language){t.dataset.second_best={language:x.language,kw:x.keyword_count,re:x.r}}}function j(){if(j.called){return}j.called=true;e();var q=document.getElementsByTagName("pre");for(var o=0;o|>=|>>|>>=|>>>|>>>=|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~";this.BE={b:"\\\\.",r:0};this.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[this.BE],r:0};this.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[this.BE],r:0};this.CLCM={cN:"comment",b:"//",e:"$"};this.CBLCLM={cN:"comment",b:"/\\*",e:"\\*/"};this.HCM={cN:"comment",b:"#",e:"$"};this.NM={cN:"number",b:this.NR,r:0};this.CNM={cN:"number",b:this.CNR,r:0};this.inherit=function(o,r){var q={};for(var p in o){q[p]=o[p]}if(r){for(var p in r){q[p]=r[p]}}return q}}();hljs.LANGUAGES.ruby=function(){var g="[a-zA-Z_][a-zA-Z0-9_]*(\\!|\\?)?";var a="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?";var n={keyword:{and:1,"false":1,then:1,defined:1,module:1,"in":1,"return":1,redo:1,"if":1,BEGIN:1,retry:1,end:1,"for":1,"true":1,self:1,when:1,next:1,until:1,"do":1,begin:1,unless:1,END:1,rescue:1,nil:1,"else":1,"break":1,undef:1,not:1,"super":1,"class":1,"case":1,require:1,yield:1,alias:1,"while":1,ensure:1,elsif:1,or:1,def:1},keymethods:{__id__:1,__send__:1,abort:1,abs:1,"all?":1,allocate:1,ancestors:1,"any?":1,arity:1,assoc:1,at:1,at_exit:1,autoload:1,"autoload?":1,"between?":1,binding:1,binmode:1,"block_given?":1,call:1,callcc:1,caller:1,capitalize:1,"capitalize!":1,casecmp:1,"catch":1,ceil:1,center:1,chomp:1,"chomp!":1,chop:1,"chop!":1,chr:1,"class":1,class_eval:1,"class_variable_defined?":1,class_variables:1,clear:1,clone:1,close:1,close_read:1,close_write:1,"closed?":1,coerce:1,collect:1,"collect!":1,compact:1,"compact!":1,concat:1,"const_defined?":1,const_get:1,const_missing:1,const_set:1,constants:1,count:1,crypt:1,"default":1,default_proc:1,"delete":1,"delete!":1,delete_at:1,delete_if:1,detect:1,display:1,div:1,divmod:1,downcase:1,"downcase!":1,downto:1,dump:1,dup:1,each:1,each_byte:1,each_index:1,each_key:1,each_line:1,each_pair:1,each_value:1,each_with_index:1,"empty?":1,entries:1,eof:1,"eof?":1,"eql?":1,"equal?":1,"eval":1,exec:1,exit:1,"exit!":1,extend:1,fail:1,fcntl:1,fetch:1,fileno:1,fill:1,find:1,find_all:1,first:1,flatten:1,"flatten!":1,floor:1,flush:1,for_fd:1,foreach:1,fork:1,format:1,freeze:1,"frozen?":1,fsync:1,getc:1,gets:1,global_variables:1,grep:1,gsub:1,"gsub!":1,"has_key?":1,"has_value?":1,hash:1,hex:1,id:1,include:1,"include?":1,included_modules:1,index:1,indexes:1,indices:1,induced_from:1,inject:1,insert:1,inspect:1,instance_eval:1,instance_method:1,instance_methods:1,"instance_of?":1,"instance_variable_defined?":1,instance_variable_get:1,instance_variable_set:1,instance_variables:1,"integer?":1,intern:1,invert:1,ioctl:1,"is_a?":1,isatty:1,"iterator?":1,join:1,"key?":1,keys:1,"kind_of?":1,lambda:1,last:1,length:1,lineno:1,ljust:1,load:1,local_variables:1,loop:1,lstrip:1,"lstrip!":1,map:1,"map!":1,match:1,max:1,"member?":1,merge:1,"merge!":1,method:1,"method_defined?":1,method_missing:1,methods:1,min:1,module_eval:1,modulo:1,name:1,nesting:1,"new":1,next:1,"next!":1,"nil?":1,nitems:1,"nonzero?":1,object_id:1,oct:1,open:1,pack:1,partition:1,pid:1,pipe:1,pop:1,popen:1,pos:1,prec:1,prec_f:1,prec_i:1,print:1,printf:1,private_class_method:1,private_instance_methods:1,"private_method_defined?":1,private_methods:1,proc:1,protected_instance_methods:1,"protected_method_defined?":1,protected_methods:1,public_class_method:1,public_instance_methods:1,"public_method_defined?":1,public_methods:1,push:1,putc:1,puts:1,quo:1,raise:1,rand:1,rassoc:1,read:1,read_nonblock:1,readchar:1,readline:1,readlines:1,readpartial:1,rehash:1,reject:1,"reject!":1,remainder:1,reopen:1,replace:1,require:1,"respond_to?":1,reverse:1,"reverse!":1,reverse_each:1,rewind:1,rindex:1,rjust:1,round:1,rstrip:1,"rstrip!":1,scan:1,seek:1,select:1,send:1,set_trace_func:1,shift:1,singleton_method_added:1,singleton_methods:1,size:1,sleep:1,slice:1,"slice!":1,sort:1,"sort!":1,sort_by:1,split:1,sprintf:1,squeeze:1,"squeeze!":1,srand:1,stat:1,step:1,store:1,strip:1,"strip!":1,sub:1,"sub!":1,succ:1,"succ!":1,sum:1,superclass:1,swapcase:1,"swapcase!":1,sync:1,syscall:1,sysopen:1,sysread:1,sysseek:1,system:1,syswrite:1,taint:1,"tainted?":1,tell:1,test:1,"throw":1,times:1,to_a:1,to_ary:1,to_f:1,to_hash:1,to_i:1,to_int:1,to_io:1,to_proc:1,to_s:1,to_str:1,to_sym:1,tr:1,"tr!":1,tr_s:1,"tr_s!":1,trace_var:1,transpose:1,trap:1,truncate:1,"tty?":1,type:1,ungetc:1,uniq:1,"uniq!":1,unpack:1,unshift:1,untaint:1,untrace_var:1,upcase:1,"upcase!":1,update:1,upto:1,"value?":1,values:1,values_at:1,warn:1,write:1,write_nonblock:1,"zero?":1,zip:1}};var h={cN:"yardoctag",b:"@[A-Za-z]+"};var d={cN:"comment",b:"#",e:"$",c:[h]};var c={cN:"comment",b:"^\\=begin",e:"^\\=end",c:[h],r:10};var b={cN:"comment",b:"^__END__",e:"\\n$"};var u={cN:"subst",b:"#\\{",e:"}",l:g,k:n};var p=[hljs.BE,u];var s={cN:"string",b:"'",e:"'",c:p,r:0};var r={cN:"string",b:'"',e:'"',c:p,r:0};var q={cN:"string",b:"%[qw]?\\(",e:"\\)",c:p,r:10};var o={cN:"string",b:"%[qw]?\\[",e:"\\]",c:p,r:10};var m={cN:"string",b:"%[qw]?{",e:"}",c:p,r:10};var l={cN:"string",b:"%[qw]?<",e:">",c:p,r:10};var k={cN:"string",b:"%[qw]?/",e:"/",c:p,r:10};var j={cN:"string",b:"%[qw]?%",e:"%",c:p,r:10};var i={cN:"string",b:"%[qw]?-",e:"-",c:p,r:10};var t={cN:"string",b:"%[qw]?\\|",e:"\\|",c:p,r:10};var e={cN:"function",b:"\\bdef\\s+",e:" |$|;",l:g,k:n,c:[{cN:"title",b:a,l:g,k:n},{cN:"params",b:"\\(",e:"\\)",l:g,k:n},d,c,b]};var f={cN:"identifier",b:g,l:g,k:n,r:0};var v=[d,c,b,s,r,q,o,m,l,k,j,i,t,{cN:"class",b:"\\b(class|module)\\b",e:"$|;",k:{"class":1,module:1},c:[{cN:"title",b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?",r:0},{cN:"inheritance",b:"<\\s*",c:[{cN:"parent",b:"("+hljs.IR+"::)?"+hljs.IR}]},d,c,b]},e,{cN:"constant",b:"(::)?([A-Z]\\w*(::)?)+",r:0},{cN:"symbol",b:":",c:[s,r,q,o,m,l,k,j,i,t,f],r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{cN:"number",b:"\\?\\w"},{cN:"variable",b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},f,{b:"("+hljs.RSR+")\\s*",c:[d,c,b,{cN:"regexp",b:"/",e:"/[a-z]*",i:"\\n",c:[hljs.BE]}],r:0}];u.c=v;e.c[1].c=v;return{dM:{l:g,k:n,c:v}}}(); +/*! + Colorbox v1.5.13 - 2014-08-04 + jQuery lightbox and modal window plugin + (c) 2014 Jack Moore - http://www.jacklmoore.com/colorbox + license: http://www.opensource.org/licenses/mit-license.php + */ + +(function ($, document, window) { + var + // Default settings object. + // See http://jacklmoore.com/colorbox for details. + defaults = { + // data sources + html: false, + photo: false, + iframe: false, + inline: false, + + // behavior and appearance + transition: "elastic", + speed: 300, + fadeOut: 300, + width: false, + initialWidth: "600", + innerWidth: false, + maxWidth: false, + height: false, + initialHeight: "450", + innerHeight: false, + maxHeight: false, + scalePhotos: true, + scrolling: true, + opacity: 0.9, + preloading: true, + className: false, + overlayClose: true, + escKey: true, + arrowKey: true, + top: false, + bottom: false, + left: false, + right: false, + fixed: false, + data: undefined, + closeButton: true, + fastIframe: true, + open: false, + reposition: true, + loop: true, + slideshow: false, + slideshowAuto: true, + slideshowSpeed: 2500, + slideshowStart: "start slideshow", + slideshowStop: "stop slideshow", + photoRegex: /\.(gif|png|jp(e|g|eg)|bmp|ico|webp|jxr|svg)((#|\?).*)?$/i, + + // alternate image paths for high-res displays + retinaImage: false, + retinaUrl: false, + retinaSuffix: '@2x.$1', + + // internationalization + current: "image {current} of {total}", + previous: "previous", + next: "next", + close: "close", + xhrError: "This content failed to load.", + imgError: "This image failed to load.", + + // accessbility + returnFocus: true, + trapFocus: true, + + // callbacks + onOpen: false, + onLoad: false, + onComplete: false, + onCleanup: false, + onClosed: false, + + rel: function() { + return this.rel; + }, + href: function() { + // using this.href would give the absolute url, when the href may have been inteded as a selector (e.g. '#container') + return $(this).attr('href'); + }, + title: function() { + return this.title; + } + }, + + // Abstracting the HTML and event identifiers for easy rebranding + colorbox = 'colorbox', + prefix = 'cbox', + boxElement = prefix + 'Element', + + // Events + event_open = prefix + '_open', + event_load = prefix + '_load', + event_complete = prefix + '_complete', + event_cleanup = prefix + '_cleanup', + event_closed = prefix + '_closed', + event_purge = prefix + '_purge', + + // Cached jQuery Object Variables + $overlay, + $box, + $wrap, + $content, + $topBorder, + $leftBorder, + $rightBorder, + $bottomBorder, + $related, + $window, + $loaded, + $loadingBay, + $loadingOverlay, + $title, + $current, + $slideshow, + $next, + $prev, + $close, + $groupControls, + $events = $(''), // $({}) would be prefered, but there is an issue with jQuery 1.4.2 + + // Variables for cached values or use across multiple functions + settings, + interfaceHeight, + interfaceWidth, + loadedHeight, + loadedWidth, + index, + photo, + open, + active, + closing, + loadingTimer, + publicMethod, + div = "div", + requests = 0, + previousCSS = {}, + init; + + // **************** + // HELPER FUNCTIONS + // **************** + + // Convenience function for creating new jQuery objects + function $tag(tag, id, css) { + var element = document.createElement(tag); + + if (id) { + element.id = prefix + id; + } + + if (css) { + element.style.cssText = css; + } + + return $(element); + } + + // Get the window height using innerHeight when available to avoid an issue with iOS + // http://bugs.jquery.com/ticket/6724 + function winheight() { + return window.innerHeight ? window.innerHeight : $(window).height(); + } + + function Settings(element, options) { + if (options !== Object(options)) { + options = {}; + } + + this.cache = {}; + this.el = element; + + this.value = function(key) { + var dataAttr; + + if (this.cache[key] === undefined) { + dataAttr = $(this.el).attr('data-cbox-'+key); + + if (dataAttr !== undefined) { + this.cache[key] = dataAttr; + } else if (options[key] !== undefined) { + this.cache[key] = options[key]; + } else if (defaults[key] !== undefined) { + this.cache[key] = defaults[key]; + } + } + + return this.cache[key]; + }; + + this.get = function(key) { + var value = this.value(key); + return $.isFunction(value) ? value.call(this.el, this) : value; + }; + } + + // Determine the next and previous members in a group. + function getIndex(increment) { + var + max = $related.length, + newIndex = (index + increment) % max; + + return (newIndex < 0) ? max + newIndex : newIndex; + } + + // Convert '%' and 'px' values to integers + function setSize(size, dimension) { + return Math.round((/%/.test(size) ? ((dimension === 'x' ? $window.width() : winheight()) / 100) : 1) * parseInt(size, 10)); + } + + // Checks an href to see if it is a photo. + // There is a force photo option (photo: true) for hrefs that cannot be matched by the regex. + function isImage(settings, url) { + return settings.get('photo') || settings.get('photoRegex').test(url); + } + + function retinaUrl(settings, url) { + return settings.get('retinaUrl') && window.devicePixelRatio > 1 ? url.replace(settings.get('photoRegex'), settings.get('retinaSuffix')) : url; + } + + function trapFocus(e) { + if ('contains' in $box[0] && !$box[0].contains(e.target) && e.target !== $overlay[0]) { + e.stopPropagation(); + $box.focus(); + } + } + + function setClass(str) { + if (setClass.str !== str) { + $box.add($overlay).removeClass(setClass.str).addClass(str); + setClass.str = str; + } + } + + function getRelated(rel) { + index = 0; + + if (rel && rel !== false && rel !== 'nofollow') { + $related = $('.' + boxElement).filter(function () { + var options = $.data(this, colorbox); + var settings = new Settings(this, options); + return (settings.get('rel') === rel); + }); + index = $related.index(settings.el); + + // Check direct calls to Colorbox. + if (index === -1) { + $related = $related.add(settings.el); + index = $related.length - 1; + } + } else { + $related = $(settings.el); + } + } + + function trigger(event) { + // for external use + $(document).trigger(event); + // for internal use + $events.triggerHandler(event); + } + + var slideshow = (function(){ + var active, + className = prefix + "Slideshow_", + click = "click." + prefix, + timeOut; + + function clear () { + clearTimeout(timeOut); + } + + function set() { + if (settings.get('loop') || $related[index + 1]) { + clear(); + timeOut = setTimeout(publicMethod.next, settings.get('slideshowSpeed')); + } + } + + function start() { + $slideshow + .html(settings.get('slideshowStop')) + .unbind(click) + .one(click, stop); + + $events + .bind(event_complete, set) + .bind(event_load, clear); + + $box.removeClass(className + "off").addClass(className + "on"); + } + + function stop() { + clear(); + + $events + .unbind(event_complete, set) + .unbind(event_load, clear); + + $slideshow + .html(settings.get('slideshowStart')) + .unbind(click) + .one(click, function () { + publicMethod.next(); + start(); + }); + + $box.removeClass(className + "on").addClass(className + "off"); + } + + function reset() { + active = false; + $slideshow.hide(); + clear(); + $events + .unbind(event_complete, set) + .unbind(event_load, clear); + $box.removeClass(className + "off " + className + "on"); + } + + return function(){ + if (active) { + if (!settings.get('slideshow')) { + $events.unbind(event_cleanup, reset); + reset(); + } + } else { + if (settings.get('slideshow') && $related[1]) { + active = true; + $events.one(event_cleanup, reset); + if (settings.get('slideshowAuto')) { + start(); + } else { + stop(); + } + $slideshow.show(); + } + } + }; + + }()); + + + function launch(element) { + var options; + + if (!closing) { + + options = $(element).data(colorbox); + + settings = new Settings(element, options); + + getRelated(settings.get('rel')); + + if (!open) { + open = active = true; // Prevents the page-change action from queuing up if the visitor holds down the left or right keys. + + setClass(settings.get('className')); + + // Show colorbox so the sizes can be calculated in older versions of jQuery + $box.css({visibility:'hidden', display:'block', opacity:''}); + + $loaded = $tag(div, 'LoadedContent', 'width:0; height:0; overflow:hidden; visibility:hidden'); + $content.css({width:'', height:''}).append($loaded); + + // Cache values needed for size calculations + interfaceHeight = $topBorder.height() + $bottomBorder.height() + $content.outerHeight(true) - $content.height(); + interfaceWidth = $leftBorder.width() + $rightBorder.width() + $content.outerWidth(true) - $content.width(); + loadedHeight = $loaded.outerHeight(true); + loadedWidth = $loaded.outerWidth(true); + + // Opens inital empty Colorbox prior to content being loaded. + var initialWidth = setSize(settings.get('initialWidth'), 'x'); + var initialHeight = setSize(settings.get('initialHeight'), 'y'); + var maxWidth = settings.get('maxWidth'); + var maxHeight = settings.get('maxHeight'); + + settings.w = (maxWidth !== false ? Math.min(initialWidth, setSize(maxWidth, 'x')) : initialWidth) - loadedWidth - interfaceWidth; + settings.h = (maxHeight !== false ? Math.min(initialHeight, setSize(maxHeight, 'y')) : initialHeight) - loadedHeight - interfaceHeight; + + $loaded.css({width:'', height:settings.h}); + publicMethod.position(); + + trigger(event_open); + settings.get('onOpen'); + + $groupControls.add($title).hide(); + + $box.focus(); + + if (settings.get('trapFocus')) { + // Confine focus to the modal + // Uses event capturing that is not supported in IE8- + if (document.addEventListener) { + + document.addEventListener('focus', trapFocus, true); + + $events.one(event_closed, function () { + document.removeEventListener('focus', trapFocus, true); + }); + } + } + + // Return focus on closing + if (settings.get('returnFocus')) { + $events.one(event_closed, function () { + $(settings.el).focus(); + }); + } + } + + var opacity = parseFloat(settings.get('opacity')); + $overlay.css({ + opacity: opacity === opacity ? opacity : '', + cursor: settings.get('overlayClose') ? 'pointer' : '', + visibility: 'visible' + }).show(); + + if (settings.get('closeButton')) { + $close.html(settings.get('close')).appendTo($content); + } else { + $close.appendTo('
'); // replace with .detach() when dropping jQuery < 1.4 + } + + load(); + } + } + + // Colorbox's markup needs to be added to the DOM prior to being called + // so that the browser will go ahead and load the CSS background images. + function appendHTML() { + if (!$box && document.body) { + init = false; + $window = $(window); + $box = $tag(div).attr({ + id: colorbox, + 'class': $.support.opacity === false ? prefix + 'IE' : '', // class for optional IE8 & lower targeted CSS. + role: 'dialog', + tabindex: '-1' + }).hide(); + $overlay = $tag(div, "Overlay").hide(); + $loadingOverlay = $([$tag(div, "LoadingOverlay")[0],$tag(div, "LoadingGraphic")[0]]); + $wrap = $tag(div, "Wrapper"); + $content = $tag(div, "Content").append( + $title = $tag(div, "Title"), + $current = $tag(div, "Current"), + $prev = $('
diff --git a/coverage/.last_run.json b/coverage/.last_run.json index 217fe13185..66cc4f3e72 100644 --- a/coverage/.last_run.json +++ b/coverage/.last_run.json @@ -1,5 +1,5 @@ { "result": { - "covered_percent": 43.48 + "covered_percent": 28.02 } } diff --git a/coverage/.resultset.json b/coverage/.resultset.json index db493074a8..1eb6ecf3e4 100644 --- a/coverage/.resultset.json +++ b/coverage/.resultset.json @@ -1,11 +1,11 @@ { "MiniTest": { "coverage": { - "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/app/controllers/merchants_controller.rb": [ + "/Users/kzell/Documents/Ada/betsy/app/controllers/merchants_controller.rb": [ 1, null, - null, - null, + 1, + 0, null, null, 1, @@ -18,21 +18,19 @@ null, null, 0, - null, - null, 0, + null, 0, 0, null, - 0, null, + 0, null, null, 0, 0, null, 0, - 0, null, null, null, @@ -44,10 +42,11 @@ null, null ], - "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/app/controllers/application_controller.rb": [ + "/Users/kzell/Documents/Ada/betsy/app/controllers/application_controller.rb": [ 1, 1, null, + 1, null, null, null, @@ -84,183 +83,27 @@ null, null ], - "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/test/controllers/products_controller_test.rb": [ - 1, + "/Users/kzell/Documents/Ada/betsy/app/controllers/products_controller.rb": [ null, 1, - 1, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, null, 1, - 1, 0, null, null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - 1, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, 1, - null, 0, - null, - null, - null, - null, 0, 0, 0, null, 0, 0, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null - ], - "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/app/controllers/products_controller.rb": [ - null, - 1, - null, - 1, - 0, - null, - null, - 1, - 0, 0, 0, null, - 0, null, + 0, null, null, null, @@ -268,22 +111,16 @@ 0, 0, 0, - 0, null, 0, null, null, - 0, - null, - null, - null, null, 1, 0, 0, 0, - 0, - 0, + null, null, null, null, @@ -355,16 +192,7 @@ 0, null ], - "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/test/controllers/review_controller_test.rb": [ - 1, - null, - 1, - null, - null, - null, - null - ], - "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/app/controllers/review_controller.rb": [ + "/Users/kzell/Documents/Ada/betsy/app/controllers/review_controller.rb": [ 1, null, 1, @@ -411,45 +239,33 @@ null, null ], - "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/test/models/category_test.rb": [ - 1, - null, - 1, - 1, - null, - 1, - 0, - null, - null - ], - "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/app/models/category.rb": [ + "/Users/kzell/Documents/Ada/betsy/app/models/category.rb": [ 1, 1, null ], - "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/app/models/application_record.rb": [ + "/Users/kzell/Documents/Ada/betsy/app/models/application_record.rb": [ 1, 1, null ], - "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/test/models/merchant_test.rb": [ - 1, - null, + "/Users/kzell/Documents/Ada/betsy/app/models/merchant.rb": [ 1, 1, null, 1, 0, + 0, + 0, null, - null - ], - "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/app/models/merchant.rb": [ - 1, - 1, null, - 1, 0, 0, + null, + 0, + null, + null, + 1, 0, 0, 0, @@ -457,54 +273,39 @@ null, 0, null, - null - ], - "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/test/models/order_item_test.rb": [ - 1, - null, - 1, - 1, null, 1, 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + null, null, - null - ], - "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/app/models/order_item.rb": [ - 1, - 1, - 1, null, null ], - "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/test/models/order_test.rb": [ + "/Users/kzell/Documents/Ada/betsy/app/models/order_item.rb": [ 1, - null, 1, 1, null, - 1, - 0, - null, null ], - "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/app/models/order.rb": [ + "/Users/kzell/Documents/Ada/betsy/app/models/order.rb": [ 1, 1, null ], - "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/test/models/product_test.rb": [ - 1, - null, - 1, - 1, - null, - 1, - 0, - null, - null - ], - "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/app/models/product.rb": [ + "/Users/kzell/Documents/Ada/betsy/app/models/product.rb": [ 1, 1, 1, @@ -516,25 +317,52 @@ null, null ], - "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/test/models/review_test.rb": [ - 1, - null, + "/Users/kzell/Documents/Ada/betsy/app/models/review.rb": [ 1, 1, null, 1, - 0, - null, null ], - "/Users/dianelenertz/Desktop/Atom/Ada_Week_11/betsy/app/models/review.rb": [ - 1, - 1, - null, - 1, - null + "/Users/kzell/Documents/Ada/betsy/app/channels/application_cable/channel.rb": [ + 0, + 0, + 0, + 0 + ], + "/Users/kzell/Documents/Ada/betsy/app/channels/application_cable/connection.rb": [ + 0, + 0, + 0, + 0 + ], + "/Users/kzell/Documents/Ada/betsy/app/helpers/application_helper.rb": [ + 0, + 0 + ], + "/Users/kzell/Documents/Ada/betsy/app/helpers/merchants_helper.rb": [ + 0, + 0 + ], + "/Users/kzell/Documents/Ada/betsy/app/helpers/products_helper.rb": [ + 0, + 0 + ], + "/Users/kzell/Documents/Ada/betsy/app/helpers/review_helper.rb": [ + 0, + 0 + ], + "/Users/kzell/Documents/Ada/betsy/app/jobs/application_job.rb": [ + 0, + 0 + ], + "/Users/kzell/Documents/Ada/betsy/app/mailers/application_mailer.rb": [ + 0, + 0, + 0, + 0 ] }, - "timestamp": 1508386024 + "timestamp": 1508394366 } } diff --git a/coverage/index.html b/coverage/index.html index eaba17e085..691b67b270 100644 --- a/coverage/index.html +++ b/coverage/index.html @@ -14,27 +14,27 @@ loading