From 3963d77b0de441588ee3dac74f76ec2b285880ac Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Tue, 9 Jun 2020 11:37:18 -0700 Subject: [PATCH 001/350] Rails new --- .browserslistrc | 1 + .gitignore | 36 + .ruby-version | 1 + Gemfile | 78 + Gemfile.lock | 298 + Guardfile | 9 + Rakefile | 6 + app/assets/config/manifest.js | 2 + app/assets/images/.keep | 0 app/assets/stylesheets/application.scss | 16 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/helpers/application_helper.rb | 2 + app/javascript/channels/consumer.js | 6 + app/javascript/channels/index.js | 5 + app/javascript/packs/application.js | 18 + app/jobs/application_job.rb | 7 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/application.html.erb | 15 + app/views/layouts/mailer.html.erb | 13 + app/views/layouts/mailer.text.erb | 1 + babel.config.js | 72 + bin/bundle | 114 + bin/rails | 9 + bin/rake | 9 + bin/setup | 36 + bin/spring | 17 + bin/webpack | 18 + bin/webpack-dev-server | 18 + bin/yarn | 11 + config.ru | 5 + config/application.rb | 23 + config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 + config/environment.rb | 5 + config/environments/development.rb | 62 + config/environments/production.rb | 112 + config/environments/test.rb | 49 + config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/assets.rb | 14 + config/initializers/backtrace_silencers.rb | 7 + .../initializers/content_security_policy.rb | 30 + 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 | 38 + config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 + config/webpack/development.js | 5 + config/webpack/environment.js | 12 + config/webpack/production.js | 5 + config/webpack/test.js | 5 + config/webpacker.yml | 96 + db/seeds.rb | 7 + lib/assets/.keep | 0 lib/tasks/.keep | 0 log/.keep | 0 package.json | 18 + postcss.config.js | 12 + 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 + storage/.keep | 0 test/application_system_test_case.rb | 5 + .../application_cable/connection_test.rb | 11 + 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 | 21 + tmp/.keep | 0 tmp/pids/.keep | 0 vendor/.keep | 0 yarn.lock | 7631 +++++++++++++++++ 93 files changed, 9437 insertions(+) create mode 100644 .browserslistrc create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/assets/config/manifest.js create mode 100644 app/assets/images/.keep create mode 100644 app/assets/stylesheets/application.scss 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/javascript/channels/consumer.js create mode 100644 app/javascript/channels/index.js create mode 100644 app/javascript/packs/application.js 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 100644 babel.config.js 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/webpack create mode 100755 bin/webpack-dev-server 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/credentials.yml.enc 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/action_view.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/content_security_policy.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/spring.rb create mode 100644 config/storage.yml create mode 100644 config/webpack/development.js create mode 100644 config/webpack/environment.js create mode 100644 config/webpack/production.js create mode 100644 config/webpack/test.js create mode 100644 config/webpacker.yml 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 postcss.config.js 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 storage/.keep create mode 100644 test/application_system_test_case.rb create mode 100644 test/channels/application_cable/connection_test.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 tmp/pids/.keep create mode 100644 vendor/.keep create mode 100644 yarn.lock diff --git a/.browserslistrc b/.browserslistrc new file mode 100644 index 0000000000..e94f8140cc --- /dev/null +++ b/.browserslistrc @@ -0,0 +1 @@ +defaults diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..f22dd34725 --- /dev/null +++ b/.gitignore @@ -0,0 +1,36 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore pidfiles, but keep the directory. +/tmp/pids/* +!/tmp/pids/ +!/tmp/pids/.keep + +# Ignore uploaded files in development. +/storage/* +!/storage/.keep + +/public/assets +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key + +/public/packs +/public/packs-test +/node_modules +/yarn-error.log +yarn-debug.log* +.yarn-integrity diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000000..57cf282ebb --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.6.5 diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000000..bf513ff7ce --- /dev/null +++ b/Gemfile @@ -0,0 +1,78 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.6.5' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 6.0.3', '>= 6.0.3.1' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 4.1' +# Use SCSS for stylesheets +gem 'sass-rails', '>= 6' +# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker +gem 'webpacker', '~> 4.0' +# 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.7' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use Active Model has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Active Storage variant +# gem 'image_processing', '~> 1.2' + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.4.2', require: false + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + # Access an interactive console on exception pages or by calling 'console' anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '~> 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +group :test do + # Adds support for Capybara system testing and selenium driver + gem 'capybara', '>= 2.15' + gem 'selenium-webdriver' + # Easy installation and use of web drivers to run system tests with browsers + gem 'webdrivers' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +gem 'jquery-rails' +gem 'jquery-turbolinks' +gem 'bootstrap' +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'guard' + gem 'guard-minitest' + gem 'debase', '>= 0.2.4.1' + gem 'ruby-debug-ide', '>= 0.7.0' +end + +group :development do + gem 'better_errors' + 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..4961154df0 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,298 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (6.0.3.1) + actionpack (= 6.0.3.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + mail (>= 2.7.1) + actionmailer (6.0.3.1) + actionpack (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.0.3.1) + actionview (= 6.0.3.1) + activesupport (= 6.0.3.1) + rack (~> 2.0, >= 2.0.8) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.0.3.1) + actionpack (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + nokogiri (>= 1.8.5) + actionview (6.0.3.1) + activesupport (= 6.0.3.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.3.1) + activesupport (= 6.0.3.1) + globalid (>= 0.3.6) + activemodel (6.0.3.1) + activesupport (= 6.0.3.1) + activerecord (6.0.3.1) + activemodel (= 6.0.3.1) + activesupport (= 6.0.3.1) + activestorage (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) + marcel (~> 0.3.1) + activesupport (6.0.3.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + ansi (1.5.0) + autoprefixer-rails (9.7.6) + execjs + better_errors (2.7.1) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) + bindex (0.8.1) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + bootsnap (1.4.6) + msgpack (~> 1.0) + bootstrap (4.5.0) + autoprefixer-rails (>= 9.1.0) + popper_js (>= 1.14.3, < 2) + sassc-rails (>= 2.0.0) + builder (3.2.4) + byebug (11.1.3) + capybara (3.32.2) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.5) + xpath (~> 3.2) + childprocess (3.0.0) + coderay (1.1.3) + concurrent-ruby (1.1.6) + crass (1.0.6) + debase (0.2.4.1) + debase-ruby_core_source (>= 0.10.2) + debase-ruby_core_source (0.10.9) + debug_inspector (0.0.3) + erubi (1.9.0) + execjs (2.7.0) + ffi (1.13.1) + formatador (0.2.5) + globalid (0.4.2) + activesupport (>= 4.2.0) + guard (2.16.2) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) + i18n (1.8.3) + concurrent-ruby (~> 1.0) + jbuilder (2.10.0) + activesupport (>= 5.0.0) + jquery-rails (4.4.0) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + listen (3.2.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + loofah (2.5.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.2.5) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (1.0.0) + mimemagic (0.3.5) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.14.1) + minitest-rails (6.0.1) + minitest (~> 5.10) + railties (~> 6.0.0) + minitest-reporters (1.4.2) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.3.3) + nenv (0.3.0) + nio4r (2.5.2) + nokogiri (1.10.9) + mini_portile2 (~> 2.4.0) + notiffany (0.1.3) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.2.3) + popper_js (1.16.0) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + public_suffix (4.0.5) + puma (4.3.5) + nio4r (~> 2.0) + rack (2.2.2) + rack-proxy (0.6.5) + rack + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (6.0.3.1) + actioncable (= 6.0.3.1) + actionmailbox (= 6.0.3.1) + actionmailer (= 6.0.3.1) + actionpack (= 6.0.3.1) + actiontext (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) + activemodel (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + bundler (>= 1.3.0) + railties (= 6.0.3.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (6.0.3.1) + actionpack (= 6.0.3.1) + activesupport (= 6.0.3.1) + method_source + rake (>= 0.8.7) + thor (>= 0.20.3, < 2.0) + rake (13.0.1) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) + regexp_parser (1.7.1) + ruby-debug-ide (0.7.2) + rake (>= 0.8.1) + ruby-progressbar (1.10.1) + rubyzip (2.3.0) + sass-rails (6.0.0) + sassc-rails (~> 2.1, >= 2.1.1) + sassc (2.4.0) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt + selenium-webdriver (3.142.7) + childprocess (>= 0.5, < 4.0) + rubyzip (>= 1.2.2) + shellany (0.0.1) + spring (2.1.0) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (4.0.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (1.0.1) + thread_safe (0.3.6) + tilt (2.0.10) + turbolinks (5.2.1) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + tzinfo (1.2.7) + thread_safe (~> 0.1) + web-console (4.0.2) + actionview (>= 6.0.0) + activemodel (>= 6.0.0) + bindex (>= 0.4.0) + railties (>= 6.0.0) + webdrivers (4.4.1) + nokogiri (~> 1.6) + rubyzip (>= 1.3.0) + selenium-webdriver (>= 3.0, < 4.0) + webpacker (4.2.2) + activesupport (>= 4.2) + rack-proxy (>= 0.6.1) + railties (>= 4.2) + websocket-driver (0.7.2) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + xpath (3.2.0) + nokogiri (~> 1.8) + zeitwerk (2.3.0) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + bootsnap (>= 1.4.2) + bootstrap + byebug + capybara (>= 2.15) + debase (>= 0.2.4.1) + guard + guard-minitest + jbuilder (~> 2.7) + jquery-rails + jquery-turbolinks + listen (~> 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 4.1) + rails (~> 6.0.3, >= 6.0.3.1) + ruby-debug-ide (>= 0.7.0) + sass-rails (>= 6) + selenium-webdriver + spring + spring-watcher-listen (~> 2.0.0) + turbolinks (~> 5) + tzinfo-data + web-console (>= 3.3.0) + webdrivers + webpacker (~> 4.0) + +RUBY VERSION + ruby 2.6.5p114 + +BUNDLED WITH + 2.1.4 diff --git a/Guardfile b/Guardfile new file mode 100644 index 0000000000..e34f706f4a --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end 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..591819335f --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,2 @@ +//= link_tree ../images +//= 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/stylesheets/application.scss b/app/assets/stylesheets/application.scss new file mode 100644 index 0000000000..3d573122ff --- /dev/null +++ b/app/assets/stylesheets/application.scss @@ -0,0 +1,16 @@ +/* + * 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. + * + */ +/* Custom bootstrap variables must be set or imported *before* bootstrap. */ +@import "bootstrap"; +@import "**/*"; 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..09705d12ab --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::Base +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/javascript/channels/consumer.js b/app/javascript/channels/consumer.js new file mode 100644 index 0000000000..0eceb59b18 --- /dev/null +++ b/app/javascript/channels/consumer.js @@ -0,0 +1,6 @@ +// 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. + +import { createConsumer } from "@rails/actioncable" + +export default createConsumer() diff --git a/app/javascript/channels/index.js b/app/javascript/channels/index.js new file mode 100644 index 0000000000..0cfcf74919 --- /dev/null +++ b/app/javascript/channels/index.js @@ -0,0 +1,5 @@ +// Load all the channels within this directory and all subdirectories. +// Channel files must be named *_channel.js. + +const channels = require.context('.', true, /_channel\.js$/) +channels.keys().forEach(channels) diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js new file mode 100644 index 0000000000..b2f85adf51 --- /dev/null +++ b/app/javascript/packs/application.js @@ -0,0 +1,18 @@ +// This file is automatically compiled by Webpack, along with any other files +// present in this directory. You're encouraged to place your actual application logic in +// a relevant structure within app/javascript and only use these pack files to reference +// that code so it'll be compiled. + +require("@rails/ujs").start() +require("turbolinks").start() +require("@rails/activestorage").start() +require("channels") +import "bootstrap" + + +// Uncomment to copy all static images under ../images to the output folder and reference +// them with the image_pack_tag helper in views (e.g <%= image_pack_tag 'rails.png' %>) +// or the `imagePath` JavaScript helper below. +// +// const images = require.context('../images', true) +// const imagePath = (name) => images(name, true) diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 0000000000..d394c3d106 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,7 @@ +class ApplicationJob < ActiveJob::Base + # Automatically retry jobs that encountered a deadlock + # retry_on ActiveRecord::Deadlocked + + # Most jobs are safe to ignore if the underlying records are no longer available + # discard_on ActiveJob::DeserializationError +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..74961e61a4 --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,15 @@ + + + + Betsy + <%= csrf_meta_tags %> + <%= csp_meta_tag %> + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_pack_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/babel.config.js b/babel.config.js new file mode 100644 index 0000000000..12f98da5af --- /dev/null +++ b/babel.config.js @@ -0,0 +1,72 @@ +module.exports = function(api) { + var validEnv = ['development', 'test', 'production'] + var currentEnv = api.env() + var isDevelopmentEnv = api.env('development') + var isProductionEnv = api.env('production') + var isTestEnv = api.env('test') + + if (!validEnv.includes(currentEnv)) { + throw new Error( + 'Please specify a valid `NODE_ENV` or ' + + '`BABEL_ENV` environment variables. Valid values are "development", ' + + '"test", and "production". Instead, received: ' + + JSON.stringify(currentEnv) + + '.' + ) + } + + return { + presets: [ + isTestEnv && [ + '@babel/preset-env', + { + targets: { + node: 'current' + } + } + ], + (isProductionEnv || isDevelopmentEnv) && [ + '@babel/preset-env', + { + forceAllTransforms: true, + useBuiltIns: 'entry', + corejs: 3, + modules: false, + exclude: ['transform-typeof-symbol'] + } + ] + ].filter(Boolean), + plugins: [ + 'babel-plugin-macros', + '@babel/plugin-syntax-dynamic-import', + isTestEnv && 'babel-plugin-dynamic-import-node', + '@babel/plugin-transform-destructuring', + [ + '@babel/plugin-proposal-class-properties', + { + loose: true + } + ], + [ + '@babel/plugin-proposal-object-rest-spread', + { + useBuiltIns: true + } + ], + [ + '@babel/plugin-transform-runtime', + { + helpers: false, + regenerator: true, + corejs: false + } + ], + [ + '@babel/plugin-transform-regenerator', + { + async: false + } + ] + ].filter(Boolean) + } +} diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 0000000000..a71368e323 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,114 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'bundle' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +require "rubygems" + +m = Module.new do + module_function + + def invoked_as_script? + File.expand_path($0) == File.expand_path(__FILE__) + end + + def env_var_version + ENV["BUNDLER_VERSION"] + end + + def cli_arg_version + return unless invoked_as_script? # don't want to hijack other binstubs + return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update` + bundler_version = nil + update_index = nil + ARGV.each_with_index do |a, i| + if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN + bundler_version = a + end + next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/ + bundler_version = $1 + update_index = i + end + bundler_version + end + + def gemfile + gemfile = ENV["BUNDLE_GEMFILE"] + return gemfile if gemfile && !gemfile.empty? + + File.expand_path("../../Gemfile", __FILE__) + end + + def lockfile + lockfile = + case File.basename(gemfile) + when "gems.rb" then gemfile.sub(/\.rb$/, gemfile) + else "#{gemfile}.lock" + end + File.expand_path(lockfile) + end + + def lockfile_version + return unless File.file?(lockfile) + lockfile_contents = File.read(lockfile) + return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/ + Regexp.last_match(1) + end + + def bundler_version + @bundler_version ||= + env_var_version || cli_arg_version || + lockfile_version + end + + def bundler_requirement + return "#{Gem::Requirement.default}.a" unless bundler_version + + bundler_gem_version = Gem::Version.new(bundler_version) + + requirement = bundler_gem_version.approximate_recommendation + + return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0") + + requirement += ".a" if bundler_gem_version.prerelease? + + requirement + end + + def load_bundler! + ENV["BUNDLE_GEMFILE"] ||= gemfile + + activate_bundler + end + + def activate_bundler + gem_error = activation_error_handling do + gem "bundler", bundler_requirement + end + return if gem_error.nil? + require_error = activation_error_handling do + require "bundler/version" + end + return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION)) + warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`" + exit 42 + end + + def activation_error_handling + yield + nil + rescue StandardError, LoadError => e + e + end +end + +m.load_bundler! + +if m.invoked_as_script? + load Gem.bin_path("bundler", "bundle") +end 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..5853b5ea87 --- /dev/null +++ b/bin/setup @@ -0,0 +1,36 @@ +#!/usr/bin/env ruby +require 'fileutils' + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +FileUtils.chdir APP_ROOT do + # This script is a way to setup or update your development environment automatically. + # This script is idempotent, so that you can run it at anytime and get an expectable outcome. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # Install JavaScript dependencies + # system('bin/yarn') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # FileUtils.cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:prepare' + + 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..d89ee495fa --- /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/webpack b/bin/webpack new file mode 100755 index 0000000000..1031168d01 --- /dev/null +++ b/bin/webpack @@ -0,0 +1,18 @@ +#!/usr/bin/env ruby + +ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development" +ENV["NODE_ENV"] ||= "development" + +require "pathname" +ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", + Pathname.new(__FILE__).realpath) + +require "bundler/setup" + +require "webpacker" +require "webpacker/webpack_runner" + +APP_ROOT = File.expand_path("..", __dir__) +Dir.chdir(APP_ROOT) do + Webpacker::WebpackRunner.run(ARGV) +end diff --git a/bin/webpack-dev-server b/bin/webpack-dev-server new file mode 100755 index 0000000000..dd9662737a --- /dev/null +++ b/bin/webpack-dev-server @@ -0,0 +1,18 @@ +#!/usr/bin/env ruby + +ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development" +ENV["NODE_ENV"] ||= "development" + +require "pathname" +ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", + Pathname.new(__FILE__).realpath) + +require "bundler/setup" + +require "webpacker" +require "webpacker/dev_server_runner" + +APP_ROOT = File.expand_path("..", __dir__) +Dir.chdir(APP_ROOT) do + Webpacker::DevServerRunner.run(ARGV) +end diff --git a/bin/yarn b/bin/yarn new file mode 100755 index 0000000000..460dd565b4 --- /dev/null +++ b/bin/yarn @@ -0,0 +1,11 @@ +#!/usr/bin/env ruby +APP_ROOT = File.expand_path('..', __dir__) +Dir.chdir(APP_ROOT) do + begin + exec "yarnpkg", *ARGV + 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..39167e2e9a --- /dev/null +++ b/config/application.rb @@ -0,0 +1,23 @@ +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 + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 6.0 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 0000000000..b9e460cef3 --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 0000000000..f2a452f546 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: test + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: betsy_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 0000000000..5211e48aba --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +OXhUSIo6xwpyZNnB6wA0fYJTNGX/uhEvjOqsiZXspPQVtl5kXVSR9b1ZgpYWQvi4uR0BIBumQZFkacviNxJ4siq+dRidyO1diOUz1JZsD/qCIu8lEHDiuKrBlg7ec23q0HyvGMKJGn+nmkJ4AlAZHjQ7Ji+62fMB6McLc+rgwc/K6bWanVQiTK8h//2WiaEeGxgKP+renbMqCloQbVWtFk+yh0hLuR/m4Fw48YE4skBG9FqhvjOO2ABbq9OQJWvg2bkUn692usOTgIc3Iw/gBYkbERBoh0d0c5CQNKlXSok9OoxWTE2z1En+vfaxh7VfInVpbqlNAYTFN+xFypl3LzpKvA5XJkkMYBAfP89zZ/teTRMTxjPg5E1HYvaRBABGdN5K/MZYXUheq1VQFRvZ179E60gcWO6b9a6K--4h/uDieFKVIs8gON--PTl3z8mi8GJ1XH6lSiRo9w== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 0000000000..8b9bc23f0c --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.3 and up are supported. +# +# Install the pg driver: +# gem install pg +# On macOS with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On macOS 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 + # https://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/credentials.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 https://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..66df51f6fc --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,62 @@ +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. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + config.action_controller.enable_fragment_cache_logging = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # 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 + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + # 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..cd0d255545 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,112 @@ +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 + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = 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 CSS using a preprocessor. + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # 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 + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # 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_production" + + 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 + + # Inserts middleware to perform automatic connection switching. + # The `database_selector` hash is used to pass options to the DatabaseSelector + # middleware. The `delay` is used to determine how long to wait after a write + # to send a subsequent read to the primary. + # + # The `database_resolver` class is used by the middleware to determine which + # database is appropriate to use based on the time delay. + # + # The `database_resolver_context` class is used by the middleware to set + # timestamps for the last write to the primary. The resolver uses the context + # class timestamps to determine how long to wait before reading from the + # replica. + # + # By default Rails will store a last write timestamp in the session. The + # DatabaseSelector middleware is designed as such you can define your own + # strategy for connection switching and pass that into the middleware through + # these configuration options. + # config.active_record.database_selector = { delay: 2.seconds } + # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver + # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 0000000000..0cb24249b5 --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,49 @@ +# 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! + +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + config.cache_classes = false + config.action_view.cache_template_loading = 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.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + config.cache_store = :null_store + + # 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 + + # Store uploaded files on the local file system in a temporary directory. + config.active_storage.service = :test + + 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/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 0000000000..142d382f87 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false 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/content_security_policy.rb b/config/initializers/content_security_policy.rb new file mode 100644 index 0000000000..35d0f26fcd --- /dev/null +++ b/config/initializers/content_security_policy.rb @@ -0,0 +1,30 @@ +# Be sure to restart your server when you modify this file. + +# Define an application-wide content security policy +# For further information see the following documentation +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy + +# Rails.application.config.content_security_policy do |policy| +# policy.default_src :self, :https +# policy.font_src :self, :https, :data +# policy.img_src :self, :https, :data +# policy.object_src :none +# policy.script_src :self, :https +# policy.style_src :self, :https +# # If you are using webpack-dev-server then specify webpack-dev-server host +# policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development? + +# # Specify URI for violation reports +# # policy.report_uri "/csp-violation-report-endpoint" +# end + +# If you are using UJS then enable automatic nonce generation +# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) } + +# Set the nonce only to specific directives +# Rails.application.config.content_security_policy_nonce_directives = %w(script-src) + +# Report CSP violations to a specified URI +# For further information see the following documentation: +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only +# Rails.application.config.content_security_policy_report_only = true 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..cf9b342d0a --- /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 https://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..5ed4437744 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,38 @@ +# 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. +# +max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count } +threads min_threads_count, max_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 `pidfile` that Puma will use. +pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked web server 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. +# +# preload_app! + +# 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..c06383a172 --- /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 https://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 0000000000..db5bf1307a --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +Spring.watch( + ".ruby-version", + ".rbenv-vars", + "tmp/restart.txt", + "tmp/caching-dev.txt" +) diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 0000000000..d32f76e8fb --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/config/webpack/development.js b/config/webpack/development.js new file mode 100644 index 0000000000..c5edff94ad --- /dev/null +++ b/config/webpack/development.js @@ -0,0 +1,5 @@ +process.env.NODE_ENV = process.env.NODE_ENV || 'development' + +const environment = require('./environment') + +module.exports = environment.toWebpackConfig() diff --git a/config/webpack/environment.js b/config/webpack/environment.js new file mode 100644 index 0000000000..48103041f7 --- /dev/null +++ b/config/webpack/environment.js @@ -0,0 +1,12 @@ +const { environment } = require('@rails/webpacker') + +module.exports = environment +const webpack = require('webpack') +environment.plugins.append( + 'Provide', + new webpack.ProvidePlugin({ + $: 'jquery', + jQuery: 'jquery', + Popper: ['popper.js', 'default'] + }) +) diff --git a/config/webpack/production.js b/config/webpack/production.js new file mode 100644 index 0000000000..be0f53aacf --- /dev/null +++ b/config/webpack/production.js @@ -0,0 +1,5 @@ +process.env.NODE_ENV = process.env.NODE_ENV || 'production' + +const environment = require('./environment') + +module.exports = environment.toWebpackConfig() diff --git a/config/webpack/test.js b/config/webpack/test.js new file mode 100644 index 0000000000..c5edff94ad --- /dev/null +++ b/config/webpack/test.js @@ -0,0 +1,5 @@ +process.env.NODE_ENV = process.env.NODE_ENV || 'development' + +const environment = require('./environment') + +module.exports = environment.toWebpackConfig() diff --git a/config/webpacker.yml b/config/webpacker.yml new file mode 100644 index 0000000000..8581ac0472 --- /dev/null +++ b/config/webpacker.yml @@ -0,0 +1,96 @@ +# Note: You must restart bin/webpack-dev-server for changes to take effect + +default: &default + source_path: app/javascript + source_entry_path: packs + public_root_path: public + public_output_path: packs + cache_path: tmp/cache/webpacker + check_yarn_integrity: false + webpack_compile_output: true + + # Additional paths webpack should lookup modules + # ['app/assets', 'engine/foo/app/assets'] + resolved_paths: [] + + # Reload manifest.json on all requests so we reload latest compiled packs + cache_manifest: false + + # Extract and emit a css file + extract_css: false + + static_assets_extensions: + - .jpg + - .jpeg + - .png + - .gif + - .tiff + - .ico + - .svg + - .eot + - .otf + - .ttf + - .woff + - .woff2 + + extensions: + - .mjs + - .js + - .sass + - .scss + - .css + - .module.sass + - .module.scss + - .module.css + - .png + - .svg + - .gif + - .jpeg + - .jpg + +development: + <<: *default + compile: true + + # Verifies that correct packages and versions are installed by inspecting package.json, yarn.lock, and node_modules + check_yarn_integrity: true + + # Reference: https://webpack.js.org/configuration/dev-server/ + dev_server: + https: false + host: localhost + port: 3035 + public: localhost:3035 + hmr: false + # Inline should be set to true if using HMR + inline: true + overlay: true + compress: true + disable_host_check: true + use_local_ip: false + quiet: false + pretty: false + headers: + 'Access-Control-Allow-Origin': '*' + watch_options: + ignored: '**/node_modules/**' + + +test: + <<: *default + compile: true + + # Compile test packs to a separate directory + public_output_path: packs-test + +production: + <<: *default + + # Production depends on precompilation of packs prior to booting for performance. + compile: false + + # Extract and emit a css file + extract_css: true + + # Cache manifest.json for performance + cache_manifest: true 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..7ae6822064 --- /dev/null +++ b/package.json @@ -0,0 +1,18 @@ +{ + "name": "betsy", + "private": true, + "dependencies": { + "@rails/actioncable": "^6.0.0", + "@rails/activestorage": "^6.0.0", + "@rails/ujs": "^6.0.0", + "@rails/webpacker": "4.2.2", + "bootstrap": "^4.5.0", + "jquery": "^3.5.1", + "popper.js": "^1.16.1", + "turbolinks": "^5.2.0" + }, + "version": "0.1.0", + "devDependencies": { + "webpack-dev-server": "^3.11.0" + } +} diff --git a/postcss.config.js b/postcss.config.js new file mode 100644 index 0000000000..aa5998a809 --- /dev/null +++ b/postcss.config.js @@ -0,0 +1,12 @@ +module.exports = { + plugins: [ + require('postcss-import'), + require('postcss-flexbugs-fixes'), + require('postcss-preset-env')({ + autoprefixer: { + flexbox: 'no-2009' + }, + stage: 3 + }) + ] +} 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..c19f78ab68 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See https://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 0000000000..e69de29bb2 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/channels/application_cable/connection_test.rb b/test/channels/application_cable/connection_test.rb new file mode 100644 index 0000000000..800405f15e --- /dev/null +++ b/test/channels/application_cable/connection_test.rb @@ -0,0 +1,11 @@ +require "test_helper" + +class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase + # test "connects with cookies" do + # cookies.signed[:user_id] = 42 + # + # connect + # + # assert_equal connection.user_id, "42" + # end +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..b19af0d5bd --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,21 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +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 +) + +class ActiveSupport::TestCase + # Run tests in parallel with specified workers + # parallelize(workers: :number_of_processors) # causes out of order output. + + # 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/tmp/pids/.keep b/tmp/pids/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/yarn.lock b/yarn.lock new file mode 100644 index 0000000000..bf8b9444e1 --- /dev/null +++ b/yarn.lock @@ -0,0 +1,7631 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.1.tgz#d5481c5095daa1c57e16e54c6f9198443afb49ff" + integrity sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw== + dependencies: + "@babel/highlight" "^7.10.1" + +"@babel/compat-data@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.10.1.tgz#b1085ffe72cd17bf2c0ee790fc09f9626011b2db" + integrity sha512-CHvCj7So7iCkGKPRFUfryXIkU2gSBw7VSZFYLsqVhrS47269VK2Hfi9S/YcublPMW8k1u2bQBlbDruoQEm4fgw== + dependencies: + browserslist "^4.12.0" + invariant "^2.2.4" + semver "^5.5.0" + +"@babel/core@^7.7.2": + version "7.10.2" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.2.tgz#bd6786046668a925ac2bd2fd95b579b92a23b36a" + integrity sha512-KQmV9yguEjQsXqyOUGKjS4+3K8/DlOCE2pZcq4augdQmtTy5iv5EHtmMSJ7V4c1BIPjuwtZYqYLCq9Ga+hGBRQ== + dependencies: + "@babel/code-frame" "^7.10.1" + "@babel/generator" "^7.10.2" + "@babel/helper-module-transforms" "^7.10.1" + "@babel/helpers" "^7.10.1" + "@babel/parser" "^7.10.2" + "@babel/template" "^7.10.1" + "@babel/traverse" "^7.10.1" + "@babel/types" "^7.10.2" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.1" + json5 "^2.1.2" + lodash "^4.17.13" + resolve "^1.3.2" + semver "^5.4.1" + source-map "^0.5.0" + +"@babel/generator@^7.10.1", "@babel/generator@^7.10.2": + version "7.10.2" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.2.tgz#0fa5b5b2389db8bfdfcc3492b551ee20f5dd69a9" + integrity sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA== + dependencies: + "@babel/types" "^7.10.2" + jsesc "^2.5.1" + lodash "^4.17.13" + source-map "^0.5.0" + +"@babel/helper-annotate-as-pure@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.1.tgz#f6d08acc6f70bbd59b436262553fb2e259a1a268" + integrity sha512-ewp3rvJEwLaHgyWGe4wQssC2vjks3E80WiUe2BpMb0KhreTjMROCbxXcEovTrbeGVdQct5VjQfrv9EgC+xMzCw== + dependencies: + "@babel/types" "^7.10.1" + +"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.1.tgz#0ec7d9be8174934532661f87783eb18d72290059" + integrity sha512-cQpVq48EkYxUU0xozpGCLla3wlkdRRqLWu1ksFMXA9CM5KQmyyRpSEsYXbao7JUkOw/tAaYKCaYyZq6HOFYtyw== + dependencies: + "@babel/helper-explode-assignable-expression" "^7.10.1" + "@babel/types" "^7.10.1" + +"@babel/helper-compilation-targets@^7.10.2": + version "7.10.2" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.2.tgz#a17d9723b6e2c750299d2a14d4637c76936d8285" + integrity sha512-hYgOhF4To2UTB4LTaZepN/4Pl9LD4gfbJx8A34mqoluT8TLbof1mhUlYuNWTEebONa8+UlCC4X0TEXu7AOUyGA== + dependencies: + "@babel/compat-data" "^7.10.1" + browserslist "^4.12.0" + invariant "^2.2.4" + levenary "^1.1.1" + semver "^5.5.0" + +"@babel/helper-create-class-features-plugin@^7.10.1": + version "7.10.2" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.2.tgz#7474295770f217dbcf288bf7572eb213db46ee67" + integrity sha512-5C/QhkGFh1vqcziq1vAL6SI9ymzUp8BCYjFpvYVhWP4DlATIb3u5q3iUd35mvlyGs8fO7hckkW7i0tmH+5+bvQ== + dependencies: + "@babel/helper-function-name" "^7.10.1" + "@babel/helper-member-expression-to-functions" "^7.10.1" + "@babel/helper-optimise-call-expression" "^7.10.1" + "@babel/helper-plugin-utils" "^7.10.1" + "@babel/helper-replace-supers" "^7.10.1" + "@babel/helper-split-export-declaration" "^7.10.1" + +"@babel/helper-create-regexp-features-plugin@^7.10.1", "@babel/helper-create-regexp-features-plugin@^7.8.3": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.1.tgz#1b8feeab1594cbcfbf3ab5a3bbcabac0468efdbd" + integrity sha512-Rx4rHS0pVuJn5pJOqaqcZR4XSgeF9G/pO/79t+4r7380tXFJdzImFnxMU19f83wjSrmKHq6myrM10pFHTGzkUA== + dependencies: + "@babel/helper-annotate-as-pure" "^7.10.1" + "@babel/helper-regex" "^7.10.1" + regexpu-core "^4.7.0" + +"@babel/helper-define-map@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.1.tgz#5e69ee8308648470dd7900d159c044c10285221d" + integrity sha512-+5odWpX+OnvkD0Zmq7panrMuAGQBu6aPUgvMzuMGo4R+jUOvealEj2hiqI6WhxgKrTpFoFj0+VdsuA8KDxHBDg== + dependencies: + "@babel/helper-function-name" "^7.10.1" + "@babel/types" "^7.10.1" + lodash "^4.17.13" + +"@babel/helper-explode-assignable-expression@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.1.tgz#e9d76305ee1162ca467357ae25df94f179af2b7e" + integrity sha512-vcUJ3cDjLjvkKzt6rHrl767FeE7pMEYfPanq5L16GRtrXIoznc0HykNW2aEYkcnP76P0isoqJ34dDMFZwzEpJg== + dependencies: + "@babel/traverse" "^7.10.1" + "@babel/types" "^7.10.1" + +"@babel/helper-function-name@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz#92bd63829bfc9215aca9d9defa85f56b539454f4" + integrity sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ== + dependencies: + "@babel/helper-get-function-arity" "^7.10.1" + "@babel/template" "^7.10.1" + "@babel/types" "^7.10.1" + +"@babel/helper-get-function-arity@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz#7303390a81ba7cb59613895a192b93850e373f7d" + integrity sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw== + dependencies: + "@babel/types" "^7.10.1" + +"@babel/helper-hoist-variables@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.1.tgz#7e77c82e5dcae1ebf123174c385aaadbf787d077" + integrity sha512-vLm5srkU8rI6X3+aQ1rQJyfjvCBLXP8cAGeuw04zeAM2ItKb1e7pmVmLyHb4sDaAYnLL13RHOZPLEtcGZ5xvjg== + dependencies: + "@babel/types" "^7.10.1" + +"@babel/helper-member-expression-to-functions@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz#432967fd7e12a4afef66c4687d4ca22bc0456f15" + integrity sha512-u7XLXeM2n50gb6PWJ9hoO5oO7JFPaZtrh35t8RqKLT1jFKj9IWeD1zrcrYp1q1qiZTdEarfDWfTIP8nGsu0h5g== + dependencies: + "@babel/types" "^7.10.1" + +"@babel/helper-module-imports@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz#dd331bd45bccc566ce77004e9d05fe17add13876" + integrity sha512-SFxgwYmZ3HZPyZwJRiVNLRHWuW2OgE5k2nrVs6D9Iv4PPnXVffuEHy83Sfx/l4SqF+5kyJXjAyUmrG7tNm+qVg== + dependencies: + "@babel/types" "^7.10.1" + +"@babel/helper-module-transforms@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz#24e2f08ee6832c60b157bb0936c86bef7210c622" + integrity sha512-RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg== + dependencies: + "@babel/helper-module-imports" "^7.10.1" + "@babel/helper-replace-supers" "^7.10.1" + "@babel/helper-simple-access" "^7.10.1" + "@babel/helper-split-export-declaration" "^7.10.1" + "@babel/template" "^7.10.1" + "@babel/types" "^7.10.1" + lodash "^4.17.13" + +"@babel/helper-optimise-call-expression@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz#b4a1f2561870ce1247ceddb02a3860fa96d72543" + integrity sha512-a0DjNS1prnBsoKx83dP2falChcs7p3i8VMzdrSbfLhuQra/2ENC4sbri34dz/rWmDADsmF1q5GbfaXydh0Jbjg== + dependencies: + "@babel/types" "^7.10.1" + +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.1", "@babel/helper-plugin-utils@^7.8.0": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz#ec5a5cf0eec925b66c60580328b122c01230a127" + integrity sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA== + +"@babel/helper-regex@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.1.tgz#021cf1a7ba99822f993222a001cc3fec83255b96" + integrity sha512-7isHr19RsIJWWLLFn21ubFt223PjQyg1HY7CZEMRr820HttHPpVvrsIN3bUOo44DEfFV4kBXO7Abbn9KTUZV7g== + dependencies: + lodash "^4.17.13" + +"@babel/helper-remap-async-to-generator@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.1.tgz#bad6aaa4ff39ce8d4b82ccaae0bfe0f7dbb5f432" + integrity sha512-RfX1P8HqsfgmJ6CwaXGKMAqbYdlleqglvVtht0HGPMSsy2V6MqLlOJVF/0Qyb/m2ZCi2z3q3+s6Pv7R/dQuZ6A== + dependencies: + "@babel/helper-annotate-as-pure" "^7.10.1" + "@babel/helper-wrap-function" "^7.10.1" + "@babel/template" "^7.10.1" + "@babel/traverse" "^7.10.1" + "@babel/types" "^7.10.1" + +"@babel/helper-replace-supers@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz#ec6859d20c5d8087f6a2dc4e014db7228975f13d" + integrity sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.10.1" + "@babel/helper-optimise-call-expression" "^7.10.1" + "@babel/traverse" "^7.10.1" + "@babel/types" "^7.10.1" + +"@babel/helper-simple-access@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz#08fb7e22ace9eb8326f7e3920a1c2052f13d851e" + integrity sha512-VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw== + dependencies: + "@babel/template" "^7.10.1" + "@babel/types" "^7.10.1" + +"@babel/helper-split-export-declaration@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz#c6f4be1cbc15e3a868e4c64a17d5d31d754da35f" + integrity sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g== + dependencies: + "@babel/types" "^7.10.1" + +"@babel/helper-validator-identifier@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz#5770b0c1a826c4f53f5ede5e153163e0318e94b5" + integrity sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw== + +"@babel/helper-wrap-function@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.10.1.tgz#956d1310d6696257a7afd47e4c42dfda5dfcedc9" + integrity sha512-C0MzRGteVDn+H32/ZgbAv5r56f2o1fZSA/rj/TYo8JEJNHg+9BdSmKBUND0shxWRztWhjlT2cvHYuynpPsVJwQ== + dependencies: + "@babel/helper-function-name" "^7.10.1" + "@babel/template" "^7.10.1" + "@babel/traverse" "^7.10.1" + "@babel/types" "^7.10.1" + +"@babel/helpers@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.1.tgz#a6827b7cb975c9d9cef5fd61d919f60d8844a973" + integrity sha512-muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw== + dependencies: + "@babel/template" "^7.10.1" + "@babel/traverse" "^7.10.1" + "@babel/types" "^7.10.1" + +"@babel/highlight@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.1.tgz#841d098ba613ba1a427a2b383d79e35552c38ae0" + integrity sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg== + dependencies: + "@babel/helper-validator-identifier" "^7.10.1" + chalk "^2.0.0" + js-tokens "^4.0.0" + +"@babel/parser@^7.10.1", "@babel/parser@^7.10.2": + version "7.10.2" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.2.tgz#871807f10442b92ff97e4783b9b54f6a0ca812d0" + integrity sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ== + +"@babel/plugin-proposal-async-generator-functions@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.1.tgz#6911af5ba2e615c4ff3c497fe2f47b35bf6d7e55" + integrity sha512-vzZE12ZTdB336POZjmpblWfNNRpMSua45EYnRigE2XsZxcXcIyly2ixnTJasJE4Zq3U7t2d8rRF7XRUuzHxbOw== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + "@babel/helper-remap-async-to-generator" "^7.10.1" + "@babel/plugin-syntax-async-generators" "^7.8.0" + +"@babel/plugin-proposal-class-properties@^7.10.1", "@babel/plugin-proposal-class-properties@^7.7.0": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.1.tgz#046bc7f6550bb08d9bd1d4f060f5f5a4f1087e01" + integrity sha512-sqdGWgoXlnOdgMXU+9MbhzwFRgxVLeiGBqTrnuS7LC2IBU31wSsESbTUreT2O418obpfPdGUR2GbEufZF1bpqw== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.10.1" + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/plugin-proposal-dynamic-import@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.1.tgz#e36979dc1dc3b73f6d6816fc4951da2363488ef0" + integrity sha512-Cpc2yUVHTEGPlmiQzXj026kqwjEQAD9I4ZC16uzdbgWgitg/UHKHLffKNCQZ5+y8jpIZPJcKcwsr2HwPh+w3XA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + "@babel/plugin-syntax-dynamic-import" "^7.8.0" + +"@babel/plugin-proposal-json-strings@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.1.tgz#b1e691ee24c651b5a5e32213222b2379734aff09" + integrity sha512-m8r5BmV+ZLpWPtMY2mOKN7wre6HIO4gfIiV+eOmsnZABNenrt/kzYBwrh+KOfgumSWpnlGs5F70J8afYMSJMBg== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + "@babel/plugin-syntax-json-strings" "^7.8.0" + +"@babel/plugin-proposal-nullish-coalescing-operator@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.1.tgz#02dca21673842ff2fe763ac253777f235e9bbf78" + integrity sha512-56cI/uHYgL2C8HVuHOuvVowihhX0sxb3nnfVRzUeVHTWmRHTZrKuAh/OBIMggGU/S1g/1D2CRCXqP+3u7vX7iA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" + +"@babel/plugin-proposal-numeric-separator@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.1.tgz#a9a38bc34f78bdfd981e791c27c6fdcec478c123" + integrity sha512-jjfym4N9HtCiNfyyLAVD8WqPYeHUrw4ihxuAynWj6zzp2gf9Ey2f7ImhFm6ikB3CLf5Z/zmcJDri6B4+9j9RsA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + "@babel/plugin-syntax-numeric-separator" "^7.10.1" + +"@babel/plugin-proposal-object-rest-spread@^7.10.1", "@babel/plugin-proposal-object-rest-spread@^7.6.2": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.1.tgz#cba44908ac9f142650b4a65b8aa06bf3478d5fb6" + integrity sha512-Z+Qri55KiQkHh7Fc4BW6o+QBuTagbOp9txE+4U1i79u9oWlf2npkiDx+Rf3iK3lbcHBuNy9UOkwuR5wOMH3LIQ== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + "@babel/plugin-syntax-object-rest-spread" "^7.8.0" + "@babel/plugin-transform-parameters" "^7.10.1" + +"@babel/plugin-proposal-optional-catch-binding@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.1.tgz#c9f86d99305f9fa531b568ff5ab8c964b8b223d2" + integrity sha512-VqExgeE62YBqI3ogkGoOJp1R6u12DFZjqwJhqtKc2o5m1YTUuUWnos7bZQFBhwkxIFpWYJ7uB75U7VAPPiKETA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" + +"@babel/plugin-proposal-optional-chaining@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.1.tgz#15f5d6d22708629451a91be28f8facc55b0e818c" + integrity sha512-dqQj475q8+/avvok72CF3AOSV/SGEcH29zT5hhohqqvvZ2+boQoOr7iGldBG5YXTO2qgCgc2B3WvVLUdbeMlGA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + "@babel/plugin-syntax-optional-chaining" "^7.8.0" + +"@babel/plugin-proposal-private-methods@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.1.tgz#ed85e8058ab0fe309c3f448e5e1b73ca89cdb598" + integrity sha512-RZecFFJjDiQ2z6maFprLgrdnm0OzoC23Mx89xf1CcEsxmHuzuXOdniEuI+S3v7vjQG4F5sa6YtUp+19sZuSxHg== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.10.1" + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/plugin-proposal-unicode-property-regex@^7.10.1", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.1.tgz#dc04feb25e2dd70c12b05d680190e138fa2c0c6f" + integrity sha512-JjfngYRvwmPwmnbRZyNiPFI8zxCZb8euzbCG/LxyKdeTb59tVciKo9GK9bi6JYKInk1H11Dq9j/zRqIH4KigfQ== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.10.1" + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/plugin-syntax-async-generators@^7.8.0": + version "7.8.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" + integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-class-properties@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.1.tgz#d5bc0645913df5b17ad7eda0fa2308330bde34c5" + integrity sha512-Gf2Yx/iRs1JREDtVZ56OrjjgFHCaldpTnuy9BHla10qyVT3YkIIGEtoDWhyop0ksu1GvNjHIoYRBqm3zoR1jyQ== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/plugin-syntax-dynamic-import@^7.2.0", "@babel/plugin-syntax-dynamic-import@^7.8.0": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" + integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-json-strings@^7.8.0": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" + integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" + integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-numeric-separator@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.1.tgz#25761ee7410bc8cf97327ba741ee94e4a61b7d99" + integrity sha512-uTd0OsHrpe3tH5gRPTxG8Voh99/WCU78vIm5NMRYPAqC8lR4vajt6KkCAknCHrx24vkPdd/05yfdGSB4EIY2mg== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/plugin-syntax-object-rest-spread@^7.8.0": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" + integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-optional-catch-binding@^7.8.0": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" + integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-optional-chaining@^7.8.0": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" + integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-top-level-await@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.1.tgz#8b8733f8c57397b3eaa47ddba8841586dcaef362" + integrity sha512-hgA5RYkmZm8FTFT3yu2N9Bx7yVVOKYT6yEdXXo6j2JTm0wNxgqaGeQVaSHRjhfnQbX91DtjFB6McRFSlcJH3xQ== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/plugin-transform-arrow-functions@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.1.tgz#cb5ee3a36f0863c06ead0b409b4cc43a889b295b" + integrity sha512-6AZHgFJKP3DJX0eCNJj01RpytUa3SOGawIxweHkNX2L6PYikOZmoh5B0d7hIHaIgveMjX990IAa/xK7jRTN8OA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/plugin-transform-async-to-generator@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.1.tgz#e5153eb1a3e028f79194ed8a7a4bf55f862b2062" + integrity sha512-XCgYjJ8TY2slj6SReBUyamJn3k2JLUIiiR5b6t1mNCMSvv7yx+jJpaewakikp0uWFQSF7ChPPoe3dHmXLpISkg== + dependencies: + "@babel/helper-module-imports" "^7.10.1" + "@babel/helper-plugin-utils" "^7.10.1" + "@babel/helper-remap-async-to-generator" "^7.10.1" + +"@babel/plugin-transform-block-scoped-functions@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.1.tgz#146856e756d54b20fff14b819456b3e01820b85d" + integrity sha512-B7K15Xp8lv0sOJrdVAoukKlxP9N59HS48V1J3U/JGj+Ad+MHq+am6xJVs85AgXrQn4LV8vaYFOB+pr/yIuzW8Q== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/plugin-transform-block-scoping@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.1.tgz#47092d89ca345811451cd0dc5d91605982705d5e" + integrity sha512-8bpWG6TtF5akdhIm/uWTyjHqENpy13Fx8chg7pFH875aNLwX8JxIxqm08gmAT+Whe6AOmaTeLPe7dpLbXt+xUw== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + lodash "^4.17.13" + +"@babel/plugin-transform-classes@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.1.tgz#6e11dd6c4dfae70f540480a4702477ed766d733f" + integrity sha512-P9V0YIh+ln/B3RStPoXpEQ/CoAxQIhRSUn7aXqQ+FZJ2u8+oCtjIXR3+X0vsSD8zv+mb56K7wZW1XiDTDGiDRQ== + dependencies: + "@babel/helper-annotate-as-pure" "^7.10.1" + "@babel/helper-define-map" "^7.10.1" + "@babel/helper-function-name" "^7.10.1" + "@babel/helper-optimise-call-expression" "^7.10.1" + "@babel/helper-plugin-utils" "^7.10.1" + "@babel/helper-replace-supers" "^7.10.1" + "@babel/helper-split-export-declaration" "^7.10.1" + globals "^11.1.0" + +"@babel/plugin-transform-computed-properties@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.1.tgz#59aa399064429d64dce5cf76ef9b90b7245ebd07" + integrity sha512-mqSrGjp3IefMsXIenBfGcPXxJxweQe2hEIwMQvjtiDQ9b1IBvDUjkAtV/HMXX47/vXf14qDNedXsIiNd1FmkaQ== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/plugin-transform-destructuring@^7.10.1", "@babel/plugin-transform-destructuring@^7.6.0": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.1.tgz#abd58e51337815ca3a22a336b85f62b998e71907" + integrity sha512-V/nUc4yGWG71OhaTH705pU8ZSdM6c1KmmLP8ys59oOYbT7RpMYAR3MsVOt6OHL0WzG7BlTU076va9fjJyYzJMA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/plugin-transform-dotall-regex@^7.10.1", "@babel/plugin-transform-dotall-regex@^7.4.4": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.1.tgz#920b9fec2d78bb57ebb64a644d5c2ba67cc104ee" + integrity sha512-19VIMsD1dp02RvduFUmfzj8uknaO3uiHHF0s3E1OHnVsNj8oge8EQ5RzHRbJjGSetRnkEuBYO7TG1M5kKjGLOA== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.10.1" + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/plugin-transform-duplicate-keys@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.1.tgz#c900a793beb096bc9d4d0a9d0cde19518ffc83b9" + integrity sha512-wIEpkX4QvX8Mo9W6XF3EdGttrIPZWozHfEaDTU0WJD/TDnXMvdDh30mzUl/9qWhnf7naicYartcEfUghTCSNpA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/plugin-transform-exponentiation-operator@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.1.tgz#279c3116756a60dd6e6f5e488ba7957db9c59eb3" + integrity sha512-lr/przdAbpEA2BUzRvjXdEDLrArGRRPwbaF9rvayuHRvdQ7lUTTkZnhZrJ4LE2jvgMRFF4f0YuPQ20vhiPYxtA== + dependencies: + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.1" + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/plugin-transform-for-of@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.1.tgz#ff01119784eb0ee32258e8646157ba2501fcfda5" + integrity sha512-US8KCuxfQcn0LwSCMWMma8M2R5mAjJGsmoCBVwlMygvmDUMkTCykc84IqN1M7t+agSfOmLYTInLCHJM+RUoz+w== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/plugin-transform-function-name@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.1.tgz#4ed46fd6e1d8fde2a2ec7b03c66d853d2c92427d" + integrity sha512-//bsKsKFBJfGd65qSNNh1exBy5Y9gD9ZN+DvrJ8f7HXr4avE5POW6zB7Rj6VnqHV33+0vXWUwJT0wSHubiAQkw== + dependencies: + "@babel/helper-function-name" "^7.10.1" + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/plugin-transform-literals@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.1.tgz#5794f8da82846b22e4e6631ea1658bce708eb46a" + integrity sha512-qi0+5qgevz1NHLZroObRm5A+8JJtibb7vdcPQF1KQE12+Y/xxl8coJ+TpPW9iRq+Mhw/NKLjm+5SHtAHCC7lAw== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/plugin-transform-member-expression-literals@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.1.tgz#90347cba31bca6f394b3f7bd95d2bbfd9fce2f39" + integrity sha512-UmaWhDokOFT2GcgU6MkHC11i0NQcL63iqeufXWfRy6pUOGYeCGEKhvfFO6Vz70UfYJYHwveg62GS83Rvpxn+NA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/plugin-transform-modules-amd@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.1.tgz#65950e8e05797ebd2fe532b96e19fc5482a1d52a" + integrity sha512-31+hnWSFRI4/ACFr1qkboBbrTxoBIzj7qA69qlq8HY8p7+YCzkCT6/TvQ1a4B0z27VeWtAeJd6pr5G04dc1iHw== + dependencies: + "@babel/helper-module-transforms" "^7.10.1" + "@babel/helper-plugin-utils" "^7.10.1" + babel-plugin-dynamic-import-node "^2.3.3" + +"@babel/plugin-transform-modules-commonjs@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz#d5ff4b4413ed97ffded99961056e1fb980fb9301" + integrity sha512-AQG4fc3KOah0vdITwt7Gi6hD9BtQP/8bhem7OjbaMoRNCH5Djx42O2vYMfau7QnAzQCa+RJnhJBmFFMGpQEzrg== + dependencies: + "@babel/helper-module-transforms" "^7.10.1" + "@babel/helper-plugin-utils" "^7.10.1" + "@babel/helper-simple-access" "^7.10.1" + babel-plugin-dynamic-import-node "^2.3.3" + +"@babel/plugin-transform-modules-systemjs@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.1.tgz#9962e4b0ac6aaf2e20431ada3d8ec72082cbffb6" + integrity sha512-ewNKcj1TQZDL3YnO85qh9zo1YF1CHgmSTlRQgHqe63oTrMI85cthKtZjAiZSsSNjPQ5NCaYo5QkbYqEw1ZBgZA== + dependencies: + "@babel/helper-hoist-variables" "^7.10.1" + "@babel/helper-module-transforms" "^7.10.1" + "@babel/helper-plugin-utils" "^7.10.1" + babel-plugin-dynamic-import-node "^2.3.3" + +"@babel/plugin-transform-modules-umd@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.1.tgz#ea080911ffc6eb21840a5197a39ede4ee67b1595" + integrity sha512-EIuiRNMd6GB6ulcYlETnYYfgv4AxqrswghmBRQbWLHZxN4s7mupxzglnHqk9ZiUpDI4eRWewedJJNj67PWOXKA== + dependencies: + "@babel/helper-module-transforms" "^7.10.1" + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/plugin-transform-named-capturing-groups-regex@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz#a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c" + integrity sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.8.3" + +"@babel/plugin-transform-new-target@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.1.tgz#6ee41a5e648da7632e22b6fb54012e87f612f324" + integrity sha512-MBlzPc1nJvbmO9rPr1fQwXOM2iGut+JC92ku6PbiJMMK7SnQc1rytgpopveE3Evn47gzvGYeCdgfCDbZo0ecUw== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/plugin-transform-object-super@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.1.tgz#2e3016b0adbf262983bf0d5121d676a5ed9c4fde" + integrity sha512-WnnStUDN5GL+wGQrJylrnnVlFhFmeArINIR9gjhSeYyvroGhBrSAXYg/RHsnfzmsa+onJrTJrEClPzgNmmQ4Gw== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + "@babel/helper-replace-supers" "^7.10.1" + +"@babel/plugin-transform-parameters@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz#b25938a3c5fae0354144a720b07b32766f683ddd" + integrity sha512-tJ1T0n6g4dXMsL45YsSzzSDZCxiHXAQp/qHrucOq5gEHncTA3xDxnd5+sZcoQp+N1ZbieAaB8r/VUCG0gqseOg== + dependencies: + "@babel/helper-get-function-arity" "^7.10.1" + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/plugin-transform-property-literals@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.1.tgz#cffc7315219230ed81dc53e4625bf86815b6050d" + integrity sha512-Kr6+mgag8auNrgEpbfIWzdXYOvqDHZOF0+Bx2xh4H2EDNwcbRb9lY6nkZg8oSjsX+DH9Ebxm9hOqtKW+gRDeNA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/plugin-transform-regenerator@^7.10.1", "@babel/plugin-transform-regenerator@^7.7.0": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.1.tgz#10e175cbe7bdb63cc9b39f9b3f823c5c7c5c5490" + integrity sha512-B3+Y2prScgJ2Bh/2l9LJxKbb8C8kRfsG4AdPT+n7ixBHIxJaIG8bi8tgjxUMege1+WqSJ+7gu1YeoMVO3gPWzw== + dependencies: + regenerator-transform "^0.14.2" + +"@babel/plugin-transform-reserved-words@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.1.tgz#0fc1027312b4d1c3276a57890c8ae3bcc0b64a86" + integrity sha512-qN1OMoE2nuqSPmpTqEM7OvJ1FkMEV+BjVeZZm9V9mq/x1JLKQ4pcv8riZJMNN3u2AUGl0ouOMjRr2siecvHqUQ== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/plugin-transform-runtime@^7.6.2": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.1.tgz#fd1887f749637fb2ed86dc278e79eb41df37f4b1" + integrity sha512-4w2tcglDVEwXJ5qxsY++DgWQdNJcCCsPxfT34wCUwIf2E7dI7pMpH8JczkMBbgBTNzBX62SZlNJ9H+De6Zebaw== + dependencies: + "@babel/helper-module-imports" "^7.10.1" + "@babel/helper-plugin-utils" "^7.10.1" + resolve "^1.8.1" + semver "^5.5.1" + +"@babel/plugin-transform-shorthand-properties@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.1.tgz#e8b54f238a1ccbae482c4dce946180ae7b3143f3" + integrity sha512-AR0E/lZMfLstScFwztApGeyTHJ5u3JUKMjneqRItWeEqDdHWZwAOKycvQNCasCK/3r5YXsuNG25funcJDu7Y2g== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/plugin-transform-spread@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.1.tgz#0c6d618a0c4461a274418460a28c9ccf5239a7c8" + integrity sha512-8wTPym6edIrClW8FI2IoaePB91ETOtg36dOkj3bYcNe7aDMN2FXEoUa+WrmPc4xa1u2PQK46fUX2aCb+zo9rfw== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/plugin-transform-sticky-regex@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.1.tgz#90fc89b7526228bed9842cff3588270a7a393b00" + integrity sha512-j17ojftKjrL7ufX8ajKvwRilwqTok4q+BjkknmQw9VNHnItTyMP5anPFzxFJdCQs7clLcWpCV3ma+6qZWLnGMA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + "@babel/helper-regex" "^7.10.1" + +"@babel/plugin-transform-template-literals@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.1.tgz#914c7b7f4752c570ea00553b4284dad8070e8628" + integrity sha512-t7B/3MQf5M1T9hPCRG28DNGZUuxAuDqLYS03rJrIk2prj/UV7Z6FOneijhQhnv/Xa039vidXeVbvjK2SK5f7Gg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.10.1" + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/plugin-transform-typeof-symbol@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.1.tgz#60c0239b69965d166b80a84de7315c1bc7e0bb0e" + integrity sha512-qX8KZcmbvA23zDi+lk9s6hC1FM7jgLHYIjuLgULgc8QtYnmB3tAVIYkNoKRQ75qWBeyzcoMoK8ZQmogGtC/w0g== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/plugin-transform-unicode-escapes@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.1.tgz#add0f8483dab60570d9e03cecef6c023aa8c9940" + integrity sha512-zZ0Poh/yy1d4jeDWpx/mNwbKJVwUYJX73q+gyh4bwtG0/iUlzdEu0sLMda8yuDFS6LBQlT/ST1SJAR6zYwXWgw== + dependencies: + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/plugin-transform-unicode-regex@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.1.tgz#6b58f2aea7b68df37ac5025d9c88752443a6b43f" + integrity sha512-Y/2a2W299k0VIUdbqYm9X2qS6fE0CUBhhiPpimK6byy7OJ/kORLlIX+J6UrjgNu5awvs62k+6RSslxhcvVw2Tw== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.10.1" + "@babel/helper-plugin-utils" "^7.10.1" + +"@babel/preset-env@^7.7.1": + version "7.10.2" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.10.2.tgz#715930f2cf8573b0928005ee562bed52fb65fdfb" + integrity sha512-MjqhX0RZaEgK/KueRzh+3yPSk30oqDKJ5HP5tqTSB1e2gzGS3PLy7K0BIpnp78+0anFuSwOeuCf1zZO7RzRvEA== + dependencies: + "@babel/compat-data" "^7.10.1" + "@babel/helper-compilation-targets" "^7.10.2" + "@babel/helper-module-imports" "^7.10.1" + "@babel/helper-plugin-utils" "^7.10.1" + "@babel/plugin-proposal-async-generator-functions" "^7.10.1" + "@babel/plugin-proposal-class-properties" "^7.10.1" + "@babel/plugin-proposal-dynamic-import" "^7.10.1" + "@babel/plugin-proposal-json-strings" "^7.10.1" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.10.1" + "@babel/plugin-proposal-numeric-separator" "^7.10.1" + "@babel/plugin-proposal-object-rest-spread" "^7.10.1" + "@babel/plugin-proposal-optional-catch-binding" "^7.10.1" + "@babel/plugin-proposal-optional-chaining" "^7.10.1" + "@babel/plugin-proposal-private-methods" "^7.10.1" + "@babel/plugin-proposal-unicode-property-regex" "^7.10.1" + "@babel/plugin-syntax-async-generators" "^7.8.0" + "@babel/plugin-syntax-class-properties" "^7.10.1" + "@babel/plugin-syntax-dynamic-import" "^7.8.0" + "@babel/plugin-syntax-json-strings" "^7.8.0" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" + "@babel/plugin-syntax-numeric-separator" "^7.10.1" + "@babel/plugin-syntax-object-rest-spread" "^7.8.0" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" + "@babel/plugin-syntax-optional-chaining" "^7.8.0" + "@babel/plugin-syntax-top-level-await" "^7.10.1" + "@babel/plugin-transform-arrow-functions" "^7.10.1" + "@babel/plugin-transform-async-to-generator" "^7.10.1" + "@babel/plugin-transform-block-scoped-functions" "^7.10.1" + "@babel/plugin-transform-block-scoping" "^7.10.1" + "@babel/plugin-transform-classes" "^7.10.1" + "@babel/plugin-transform-computed-properties" "^7.10.1" + "@babel/plugin-transform-destructuring" "^7.10.1" + "@babel/plugin-transform-dotall-regex" "^7.10.1" + "@babel/plugin-transform-duplicate-keys" "^7.10.1" + "@babel/plugin-transform-exponentiation-operator" "^7.10.1" + "@babel/plugin-transform-for-of" "^7.10.1" + "@babel/plugin-transform-function-name" "^7.10.1" + "@babel/plugin-transform-literals" "^7.10.1" + "@babel/plugin-transform-member-expression-literals" "^7.10.1" + "@babel/plugin-transform-modules-amd" "^7.10.1" + "@babel/plugin-transform-modules-commonjs" "^7.10.1" + "@babel/plugin-transform-modules-systemjs" "^7.10.1" + "@babel/plugin-transform-modules-umd" "^7.10.1" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3" + "@babel/plugin-transform-new-target" "^7.10.1" + "@babel/plugin-transform-object-super" "^7.10.1" + "@babel/plugin-transform-parameters" "^7.10.1" + "@babel/plugin-transform-property-literals" "^7.10.1" + "@babel/plugin-transform-regenerator" "^7.10.1" + "@babel/plugin-transform-reserved-words" "^7.10.1" + "@babel/plugin-transform-shorthand-properties" "^7.10.1" + "@babel/plugin-transform-spread" "^7.10.1" + "@babel/plugin-transform-sticky-regex" "^7.10.1" + "@babel/plugin-transform-template-literals" "^7.10.1" + "@babel/plugin-transform-typeof-symbol" "^7.10.1" + "@babel/plugin-transform-unicode-escapes" "^7.10.1" + "@babel/plugin-transform-unicode-regex" "^7.10.1" + "@babel/preset-modules" "^0.1.3" + "@babel/types" "^7.10.2" + browserslist "^4.12.0" + core-js-compat "^3.6.2" + invariant "^2.2.2" + levenary "^1.1.1" + semver "^5.5.0" + +"@babel/preset-modules@^0.1.3": + version "0.1.3" + resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72" + integrity sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" + "@babel/plugin-transform-dotall-regex" "^7.4.4" + "@babel/types" "^7.4.4" + esutils "^2.0.2" + +"@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4": + version "7.10.2" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.2.tgz#d103f21f2602497d38348a32e008637d506db839" + integrity sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg== + dependencies: + regenerator-runtime "^0.13.4" + +"@babel/template@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.1.tgz#e167154a94cb5f14b28dc58f5356d2162f539811" + integrity sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig== + dependencies: + "@babel/code-frame" "^7.10.1" + "@babel/parser" "^7.10.1" + "@babel/types" "^7.10.1" + +"@babel/traverse@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.1.tgz#bbcef3031e4152a6c0b50147f4958df54ca0dd27" + integrity sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ== + dependencies: + "@babel/code-frame" "^7.10.1" + "@babel/generator" "^7.10.1" + "@babel/helper-function-name" "^7.10.1" + "@babel/helper-split-export-declaration" "^7.10.1" + "@babel/parser" "^7.10.1" + "@babel/types" "^7.10.1" + debug "^4.1.0" + globals "^11.1.0" + lodash "^4.17.13" + +"@babel/types@^7.10.1", "@babel/types@^7.10.2", "@babel/types@^7.4.4": + version "7.10.2" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.2.tgz#30283be31cad0dbf6fb00bd40641ca0ea675172d" + integrity sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng== + dependencies: + "@babel/helper-validator-identifier" "^7.10.1" + lodash "^4.17.13" + to-fast-properties "^2.0.0" + +"@csstools/convert-colors@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7" + integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw== + +"@rails/actioncable@^6.0.0": + version "6.0.3" + resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.0.3.tgz#722b4b639936129307ddbab3a390f6bcacf3e7bc" + integrity sha512-I01hgqxxnOgOtJTGlq0ZsGJYiTEEiSGVEGQn3vimZSqEP1HqzyFNbzGTq14Xdyeow2yGJjygjoFF1pmtE+SQaw== + +"@rails/activestorage@^6.0.0": + version "6.0.3" + resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-6.0.3.tgz#401d2a28ecb7167cdb5e830ffddaa17c308c31aa" + integrity sha512-YdNwyfryHlcKj7Ruix89wZ2aiN3KTYULdW1Y/hNlHJlrY2/PXjT2YBTzZiVd+dcjrwHBsXV2rExdy+Z/lsrlEg== + dependencies: + spark-md5 "^3.0.0" + +"@rails/ujs@^6.0.0": + version "6.0.3" + resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.0.3.tgz#e68a03278e30daea6a110aac5dfa33c60c53055d" + integrity sha512-CM9OEvoN9eXkaX7PXEnbsQLULJ97b9rVmwliZbz/iBOERLJ68Rk3ClJe+fQEMKU4CBZfky2lIRnfslOdUs9SLQ== + +"@rails/webpacker@4.2.2": + version "4.2.2" + resolved "https://registry.yarnpkg.com/@rails/webpacker/-/webpacker-4.2.2.tgz#b9dd3235fdf4d0badbda8e33f6ebee742a9f3abb" + integrity sha512-jzw7qMfSCLdrt9j1X+2IvXjf63huXYqeIPwLujXa9pYFvxtEstbVYRDivuLhiDokzih+PrYpB+dLTGBNgVsnpw== + dependencies: + "@babel/core" "^7.7.2" + "@babel/plugin-proposal-class-properties" "^7.7.0" + "@babel/plugin-proposal-object-rest-spread" "^7.6.2" + "@babel/plugin-syntax-dynamic-import" "^7.2.0" + "@babel/plugin-transform-destructuring" "^7.6.0" + "@babel/plugin-transform-regenerator" "^7.7.0" + "@babel/plugin-transform-runtime" "^7.6.2" + "@babel/preset-env" "^7.7.1" + "@babel/runtime" "^7.7.2" + babel-loader "^8.0.6" + babel-plugin-dynamic-import-node "^2.3.0" + babel-plugin-macros "^2.6.1" + case-sensitive-paths-webpack-plugin "^2.2.0" + compression-webpack-plugin "^3.0.0" + core-js "^3.4.0" + css-loader "^3.2.0" + file-loader "^4.2.0" + flatted "^2.0.1" + glob "^7.1.6" + js-yaml "^3.13.1" + mini-css-extract-plugin "^0.8.0" + node-sass "^4.13.0" + optimize-css-assets-webpack-plugin "^5.0.3" + path-complete-extname "^1.0.0" + pnp-webpack-plugin "^1.5.0" + postcss-flexbugs-fixes "^4.1.0" + postcss-import "^12.0.1" + postcss-loader "^3.0.0" + postcss-preset-env "^6.7.0" + postcss-safe-parser "^4.0.1" + regenerator-runtime "^0.13.3" + sass-loader "7.3.1" + style-loader "^1.0.0" + terser-webpack-plugin "^2.2.1" + webpack "^4.41.2" + webpack-assets-manifest "^3.1.1" + webpack-cli "^3.3.10" + webpack-sources "^1.4.3" + +"@types/glob@^7.1.1": + version "7.1.2" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.2.tgz#06ca26521353a545d94a0adc74f38a59d232c987" + integrity sha512-VgNIkxK+j7Nz5P7jvUZlRvhuPSmsEfS03b0alKcq5V/STUKAa3Plemsn5mrQUO7am6OErJ4rhGEGJbACclrtRA== + dependencies: + "@types/minimatch" "*" + "@types/node" "*" + +"@types/json-schema@^7.0.4": + version "7.0.5" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.5.tgz#dcce4430e64b443ba8945f0290fb564ad5bac6dd" + integrity sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ== + +"@types/minimatch@*": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" + integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== + +"@types/node@*": + version "14.0.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.12.tgz#9c1d8ffb8084e8936603a6122a7649e40e68e04b" + integrity sha512-/sjzehvjkkpvLpYtN6/2dv5kg41otMGuHQUt9T2aiAuIfleCQRQHXXzF1eAw/qkZTj5Kcf4JSTf7EIizHocy6Q== + +"@types/parse-json@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" + integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== + +"@types/q@^1.5.1": + version "1.5.4" + resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" + integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug== + +"@webassemblyjs/ast@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964" + integrity sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA== + dependencies: + "@webassemblyjs/helper-module-context" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/wast-parser" "1.9.0" + +"@webassemblyjs/floating-point-hex-parser@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4" + integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA== + +"@webassemblyjs/helper-api-error@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2" + integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw== + +"@webassemblyjs/helper-buffer@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00" + integrity sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA== + +"@webassemblyjs/helper-code-frame@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz#647f8892cd2043a82ac0c8c5e75c36f1d9159f27" + integrity sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA== + dependencies: + "@webassemblyjs/wast-printer" "1.9.0" + +"@webassemblyjs/helper-fsm@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz#c05256b71244214671f4b08ec108ad63b70eddb8" + integrity sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw== + +"@webassemblyjs/helper-module-context@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz#25d8884b76839871a08a6c6f806c3979ef712f07" + integrity sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g== + dependencies: + "@webassemblyjs/ast" "1.9.0" + +"@webassemblyjs/helper-wasm-bytecode@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790" + integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw== + +"@webassemblyjs/helper-wasm-section@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346" + integrity sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-buffer" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/wasm-gen" "1.9.0" + +"@webassemblyjs/ieee754@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4" + integrity sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg== + dependencies: + "@xtuc/ieee754" "^1.2.0" + +"@webassemblyjs/leb128@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95" + integrity sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw== + dependencies: + "@xtuc/long" "4.2.2" + +"@webassemblyjs/utf8@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab" + integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w== + +"@webassemblyjs/wasm-edit@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf" + integrity sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-buffer" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/helper-wasm-section" "1.9.0" + "@webassemblyjs/wasm-gen" "1.9.0" + "@webassemblyjs/wasm-opt" "1.9.0" + "@webassemblyjs/wasm-parser" "1.9.0" + "@webassemblyjs/wast-printer" "1.9.0" + +"@webassemblyjs/wasm-gen@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c" + integrity sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/ieee754" "1.9.0" + "@webassemblyjs/leb128" "1.9.0" + "@webassemblyjs/utf8" "1.9.0" + +"@webassemblyjs/wasm-opt@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61" + integrity sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-buffer" "1.9.0" + "@webassemblyjs/wasm-gen" "1.9.0" + "@webassemblyjs/wasm-parser" "1.9.0" + +"@webassemblyjs/wasm-parser@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e" + integrity sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-api-error" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/ieee754" "1.9.0" + "@webassemblyjs/leb128" "1.9.0" + "@webassemblyjs/utf8" "1.9.0" + +"@webassemblyjs/wast-parser@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz#3031115d79ac5bd261556cecc3fa90a3ef451914" + integrity sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/floating-point-hex-parser" "1.9.0" + "@webassemblyjs/helper-api-error" "1.9.0" + "@webassemblyjs/helper-code-frame" "1.9.0" + "@webassemblyjs/helper-fsm" "1.9.0" + "@xtuc/long" "4.2.2" + +"@webassemblyjs/wast-printer@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899" + integrity sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/wast-parser" "1.9.0" + "@xtuc/long" "4.2.2" + +"@xtuc/ieee754@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" + integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== + +"@xtuc/long@4.2.2": + version "4.2.2" + resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" + integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== + +abbrev@1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== + +accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: + version "1.3.7" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" + integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== + dependencies: + mime-types "~2.1.24" + negotiator "0.6.2" + +acorn@^6.4.1: + version "6.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474" + integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA== + +aggregate-error@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz#db2fe7246e536f40d9b5442a39e117d7dd6a24e0" + integrity sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA== + dependencies: + clean-stack "^2.0.0" + indent-string "^4.0.0" + +ajv-errors@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d" + integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ== + +ajv-keywords@^3.1.0, ajv-keywords@^3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da" + integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ== + +ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.5.5: + version "6.12.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd" + integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +alphanum-sort@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" + integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM= + +amdefine@>=0.0.4: + version "1.0.1" + resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" + integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= + +ansi-colors@^3.0.0: + version "3.2.4" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf" + integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA== + +ansi-html@0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" + integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4= + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= + +ansi-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" + integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= + +ansi-regex@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" + integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== + +ansi-styles@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" + integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= + +ansi-styles@^3.2.0, ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +anymatch@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" + integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw== + dependencies: + micromatch "^3.1.4" + normalize-path "^2.1.1" + +anymatch@~3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" + integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + +aproba@^1.0.3, aproba@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" + integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== + +are-we-there-yet@~1.1.2: + version "1.1.5" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" + integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" + +argparse@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== + dependencies: + sprintf-js "~1.0.2" + +arr-diff@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" + integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= + +arr-flatten@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" + integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== + +arr-union@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" + integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= + +array-find-index@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" + integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E= + +array-flatten@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= + +array-flatten@^2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" + integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== + +array-union@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" + integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk= + dependencies: + array-uniq "^1.0.1" + +array-uniq@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" + integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY= + +array-unique@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" + integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= + +asn1.js@^4.0.0: + version "4.10.1" + resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0" + integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw== + dependencies: + bn.js "^4.0.0" + inherits "^2.0.1" + minimalistic-assert "^1.0.0" + +asn1@~0.2.3: + version "0.2.4" + resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" + integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== + dependencies: + safer-buffer "~2.1.0" + +assert-plus@1.0.0, assert-plus@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= + +assert@^1.1.1: + version "1.5.0" + resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb" + integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA== + dependencies: + object-assign "^4.1.1" + util "0.10.3" + +assign-symbols@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" + integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= + +async-each@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" + integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== + +async-foreach@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" + integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI= + +async-limiter@~1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" + integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== + +async@^2.6.2: + version "2.6.3" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" + integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg== + dependencies: + lodash "^4.17.14" + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= + +atob@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" + integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== + +autoprefixer@^9.6.1: + version "9.8.0" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.0.tgz#68e2d2bef7ba4c3a65436f662d0a56a741e56511" + integrity sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A== + dependencies: + browserslist "^4.12.0" + caniuse-lite "^1.0.30001061" + chalk "^2.4.2" + normalize-range "^0.1.2" + num2fraction "^1.2.2" + postcss "^7.0.30" + postcss-value-parser "^4.1.0" + +aws-sign2@~0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" + integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= + +aws4@^1.8.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.0.tgz#a17b3a8ea811060e74d47d306122400ad4497ae2" + integrity sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA== + +babel-loader@^8.0.6: + version "8.1.0" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3" + integrity sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw== + dependencies: + find-cache-dir "^2.1.0" + loader-utils "^1.4.0" + mkdirp "^0.5.3" + pify "^4.0.1" + schema-utils "^2.6.5" + +babel-plugin-dynamic-import-node@^2.3.0, babel-plugin-dynamic-import-node@^2.3.3: + version "2.3.3" + resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" + integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ== + dependencies: + object.assign "^4.1.0" + +babel-plugin-macros@^2.6.1: + version "2.8.0" + resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138" + integrity sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg== + dependencies: + "@babel/runtime" "^7.7.2" + cosmiconfig "^6.0.0" + resolve "^1.12.0" + +balanced-match@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" + integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + +base64-js@^1.0.2: + version "1.3.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1" + integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g== + +base@^0.11.1: + version "0.11.2" + resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" + integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg== + dependencies: + cache-base "^1.0.1" + class-utils "^0.3.5" + component-emitter "^1.2.1" + define-property "^1.0.0" + isobject "^3.0.1" + mixin-deep "^1.2.0" + pascalcase "^0.1.1" + +batch@0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" + integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY= + +bcrypt-pbkdf@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" + integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= + dependencies: + tweetnacl "^0.14.3" + +big.js@^5.2.2: + version "5.2.2" + resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" + integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== + +binary-extensions@^1.0.0: + version "1.13.1" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" + integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== + +binary-extensions@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c" + integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow== + +bindings@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" + integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== + dependencies: + file-uri-to-path "1.0.0" + +block-stream@*: + version "0.0.9" + resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" + integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo= + dependencies: + inherits "~2.0.0" + +bluebird@^3.5.5: + version "3.7.2" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" + integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== + +bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0: + version "4.11.9" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828" + integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw== + +bn.js@^5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.2.tgz#c9686902d3c9a27729f43ab10f9d79c2004da7b0" + integrity sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA== + +body-parser@1.19.0: + version "1.19.0" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" + integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== + dependencies: + bytes "3.1.0" + content-type "~1.0.4" + debug "2.6.9" + depd "~1.1.2" + http-errors "1.7.2" + iconv-lite "0.4.24" + on-finished "~2.3.0" + qs "6.7.0" + raw-body "2.4.0" + type-is "~1.6.17" + +bonjour@^3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" + integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU= + dependencies: + array-flatten "^2.1.0" + deep-equal "^1.0.1" + dns-equal "^1.0.0" + dns-txt "^2.0.2" + multicast-dns "^6.0.1" + multicast-dns-service-types "^1.1.0" + +boolbase@^1.0.0, boolbase@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" + integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= + +bootstrap@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.0.tgz#97d9dbcb5a8972f8722c9962483543b907d9b9ec" + integrity sha512-Z93QoXvodoVslA+PWNdk23Hze4RBYIkpb5h8I2HY2Tu2h7A0LpAgLcyrhrSUyo2/Oxm2l1fRZPs1e5hnxnliXA== + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@^2.3.1, braces@^2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" + integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== + dependencies: + arr-flatten "^1.1.0" + array-unique "^0.3.2" + extend-shallow "^2.0.1" + fill-range "^4.0.0" + isobject "^3.0.1" + repeat-element "^1.1.2" + snapdragon "^0.8.1" + snapdragon-node "^2.0.1" + split-string "^3.0.2" + to-regex "^3.0.1" + +braces@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + +brorand@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" + integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= + +browserify-aes@^1.0.0, browserify-aes@^1.0.4: + version "1.2.0" + resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" + integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA== + dependencies: + buffer-xor "^1.0.3" + cipher-base "^1.0.0" + create-hash "^1.1.0" + evp_bytestokey "^1.0.3" + inherits "^2.0.1" + safe-buffer "^5.0.1" + +browserify-cipher@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0" + integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w== + dependencies: + browserify-aes "^1.0.4" + browserify-des "^1.0.0" + evp_bytestokey "^1.0.0" + +browserify-des@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c" + integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A== + dependencies: + cipher-base "^1.0.1" + des.js "^1.0.0" + inherits "^2.0.1" + safe-buffer "^5.1.2" + +browserify-rsa@^4.0.0, browserify-rsa@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524" + integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ= + dependencies: + bn.js "^4.1.0" + randombytes "^2.0.1" + +browserify-sign@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.0.tgz#545d0b1b07e6b2c99211082bf1b12cce7a0b0e11" + integrity sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA== + dependencies: + bn.js "^5.1.1" + browserify-rsa "^4.0.1" + create-hash "^1.2.0" + create-hmac "^1.1.7" + elliptic "^6.5.2" + inherits "^2.0.4" + parse-asn1 "^5.1.5" + readable-stream "^3.6.0" + safe-buffer "^5.2.0" + +browserify-zlib@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f" + integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA== + dependencies: + pako "~1.0.5" + +browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.6.4, browserslist@^4.8.5: + version "4.12.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz#06c6d5715a1ede6c51fc39ff67fd647f740b656d" + integrity sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg== + dependencies: + caniuse-lite "^1.0.30001043" + electron-to-chromium "^1.3.413" + node-releases "^1.1.53" + pkg-up "^2.0.0" + +buffer-from@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" + integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + +buffer-indexof@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c" + integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g== + +buffer-xor@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" + integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk= + +buffer@^4.3.0: + version "4.9.2" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8" + integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg== + dependencies: + base64-js "^1.0.2" + ieee754 "^1.1.4" + isarray "^1.0.0" + +builtin-status-codes@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" + integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= + +bytes@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" + integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= + +bytes@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" + integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== + +cacache@^12.0.2: + version "12.0.4" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" + integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ== + dependencies: + bluebird "^3.5.5" + chownr "^1.1.1" + figgy-pudding "^3.5.1" + glob "^7.1.4" + graceful-fs "^4.1.15" + infer-owner "^1.0.3" + lru-cache "^5.1.1" + mississippi "^3.0.0" + mkdirp "^0.5.1" + move-concurrently "^1.0.1" + promise-inflight "^1.0.1" + rimraf "^2.6.3" + ssri "^6.0.1" + unique-filename "^1.1.1" + y18n "^4.0.0" + +cacache@^13.0.1: + version "13.0.1" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-13.0.1.tgz#a8000c21697089082f85287a1aec6e382024a71c" + integrity sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w== + dependencies: + chownr "^1.1.2" + figgy-pudding "^3.5.1" + fs-minipass "^2.0.0" + glob "^7.1.4" + graceful-fs "^4.2.2" + infer-owner "^1.0.4" + lru-cache "^5.1.1" + minipass "^3.0.0" + minipass-collect "^1.0.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.2" + mkdirp "^0.5.1" + move-concurrently "^1.0.1" + p-map "^3.0.0" + promise-inflight "^1.0.1" + rimraf "^2.7.1" + ssri "^7.0.0" + unique-filename "^1.1.1" + +cache-base@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" + integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ== + dependencies: + collection-visit "^1.0.0" + component-emitter "^1.2.1" + get-value "^2.0.6" + has-value "^1.0.0" + isobject "^3.0.1" + set-value "^2.0.0" + to-object-path "^0.3.0" + union-value "^1.0.0" + unset-value "^1.0.0" + +caller-callsite@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134" + integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ= + dependencies: + callsites "^2.0.0" + +caller-path@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4" + integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ= + dependencies: + caller-callsite "^2.0.0" + +callsites@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" + integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA= + +callsites@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== + +camelcase-keys@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7" + integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc= + dependencies: + camelcase "^2.0.0" + map-obj "^1.0.0" + +camelcase@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" + integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= + +camelcase@^5.0.0, camelcase@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" + integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== + +caniuse-api@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" + integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw== + dependencies: + browserslist "^4.0.0" + caniuse-lite "^1.0.0" + lodash.memoize "^4.1.2" + lodash.uniq "^4.5.0" + +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001043, caniuse-lite@^1.0.30001061: + version "1.0.30001079" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001079.tgz#ed3e5225cd9a6850984fdd88bf24ce45d69b9c22" + integrity sha512-2KaYheg0iOY+CMmDuAB3DHehrXhhb4OZU4KBVGDr/YKyYAcpudaiUQ9PJ9rxrPlKEoJ3ATasQ5AN48MqpwS43Q== + +case-sensitive-paths-webpack-plugin@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.3.0.tgz#23ac613cc9a856e4f88ff8bb73bbb5e989825cf7" + integrity sha512-/4YgnZS8y1UXXmC02xD5rRrBEu6T5ub+mQHLNRj0fzTRbgdBYhsNo2V5EqwgqrExjxsjtF/OpAKAMkKsxbD5XQ== + +caseless@~0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" + integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= + +chalk@2.4.2, chalk@^2.0, chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chalk@^1.1.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= + dependencies: + ansi-styles "^2.2.1" + escape-string-regexp "^1.0.2" + has-ansi "^2.0.0" + strip-ansi "^3.0.0" + supports-color "^2.0.0" + +chokidar@^2.1.8: + version "2.1.8" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" + integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg== + dependencies: + anymatch "^2.0.0" + async-each "^1.0.1" + braces "^2.3.2" + glob-parent "^3.1.0" + inherits "^2.0.3" + is-binary-path "^1.0.0" + is-glob "^4.0.0" + normalize-path "^3.0.0" + path-is-absolute "^1.0.0" + readdirp "^2.2.1" + upath "^1.1.1" + optionalDependencies: + fsevents "^1.2.7" + +chokidar@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz#b30611423ce376357c765b9b8f904b9fba3c0be8" + integrity sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ== + dependencies: + anymatch "~3.1.1" + braces "~3.0.2" + glob-parent "~5.1.0" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.4.0" + optionalDependencies: + fsevents "~2.1.2" + +chownr@^1.1.1, chownr@^1.1.2: + version "1.1.4" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" + integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== + +chrome-trace-event@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4" + integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ== + dependencies: + tslib "^1.9.0" + +cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" + integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q== + dependencies: + inherits "^2.0.1" + safe-buffer "^5.0.1" + +class-utils@^0.3.5: + version "0.3.6" + resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" + integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg== + dependencies: + arr-union "^3.1.0" + define-property "^0.2.5" + isobject "^3.0.0" + static-extend "^0.1.1" + +clean-stack@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" + integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== + +cliui@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" + integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA== + dependencies: + string-width "^3.1.0" + strip-ansi "^5.2.0" + wrap-ansi "^5.1.0" + +clone-deep@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" + integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== + dependencies: + is-plain-object "^2.0.4" + kind-of "^6.0.2" + shallow-clone "^3.0.0" + +coa@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3" + integrity sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA== + dependencies: + "@types/q" "^1.5.1" + chalk "^2.4.1" + q "^1.1.2" + +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + +collection-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" + integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA= + dependencies: + map-visit "^1.0.0" + object-visit "^1.0.0" + +color-convert@^1.9.0, color-convert@^1.9.1: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + +color-name@^1.0.0: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +color-string@^1.5.2: + version "1.5.3" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc" + integrity sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw== + dependencies: + color-name "^1.0.0" + simple-swizzle "^0.2.2" + +color@^3.0.0: + version "3.1.2" + resolved "https://registry.yarnpkg.com/color/-/color-3.1.2.tgz#68148e7f85d41ad7649c5fa8c8106f098d229e10" + integrity sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg== + dependencies: + color-convert "^1.9.1" + color-string "^1.5.2" + +combined-stream@^1.0.6, combined-stream@~1.0.6: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + +commander@^2.20.0: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + +commondir@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" + integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= + +component-emitter@^1.2.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" + integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== + +compressible@~2.0.16: + version "2.0.18" + resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" + integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg== + dependencies: + mime-db ">= 1.43.0 < 2" + +compression-webpack-plugin@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-3.1.0.tgz#9f510172a7b5fae5aad3b670652e8bd7997aeeca" + integrity sha512-iqTHj3rADN4yHwXMBrQa/xrncex/uEQy8QHlaTKxGchT/hC0SdlJlmL/5eRqffmWq2ep0/Romw6Ld39JjTR/ug== + dependencies: + cacache "^13.0.1" + find-cache-dir "^3.0.0" + neo-async "^2.5.0" + schema-utils "^2.6.1" + serialize-javascript "^2.1.2" + webpack-sources "^1.0.1" + +compression@^1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" + integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ== + dependencies: + accepts "~1.3.5" + bytes "3.0.0" + compressible "~2.0.16" + debug "2.6.9" + on-headers "~1.0.2" + safe-buffer "5.1.2" + vary "~1.1.2" + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +concat-stream@^1.5.0: + version "1.6.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" + integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== + dependencies: + buffer-from "^1.0.0" + inherits "^2.0.3" + readable-stream "^2.2.2" + typedarray "^0.0.6" + +connect-history-api-fallback@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" + integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg== + +console-browserify@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" + integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA== + +console-control-strings@^1.0.0, console-control-strings@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= + +constants-browserify@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" + integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U= + +content-disposition@0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" + integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== + dependencies: + safe-buffer "5.1.2" + +content-type@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" + integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== + +convert-source-map@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" + integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== + dependencies: + safe-buffer "~5.1.1" + +cookie-signature@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= + +cookie@0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" + integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== + +copy-concurrently@^1.0.0: + version "1.0.5" + resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" + integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A== + dependencies: + aproba "^1.1.1" + fs-write-stream-atomic "^1.0.8" + iferr "^0.1.5" + mkdirp "^0.5.1" + rimraf "^2.5.4" + run-queue "^1.0.0" + +copy-descriptor@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" + integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= + +core-js-compat@^3.6.2: + version "3.6.5" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.5.tgz#2a51d9a4e25dfd6e690251aa81f99e3c05481f1c" + integrity sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng== + dependencies: + browserslist "^4.8.5" + semver "7.0.0" + +core-js@^3.4.0: + version "3.6.5" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a" + integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA== + +core-util-is@1.0.2, core-util-is@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + +cosmiconfig@^5.0.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" + integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA== + dependencies: + import-fresh "^2.0.0" + is-directory "^0.3.1" + js-yaml "^3.13.1" + parse-json "^4.0.0" + +cosmiconfig@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" + integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg== + dependencies: + "@types/parse-json" "^4.0.0" + import-fresh "^3.1.0" + parse-json "^5.0.0" + path-type "^4.0.0" + yaml "^1.7.2" + +create-ecdh@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff" + integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw== + dependencies: + bn.js "^4.1.0" + elliptic "^6.0.0" + +create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" + integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg== + dependencies: + cipher-base "^1.0.1" + inherits "^2.0.1" + md5.js "^1.3.4" + ripemd160 "^2.0.1" + sha.js "^2.4.0" + +create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: + version "1.1.7" + resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff" + integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg== + dependencies: + cipher-base "^1.0.3" + create-hash "^1.1.0" + inherits "^2.0.1" + ripemd160 "^2.0.0" + safe-buffer "^5.0.1" + sha.js "^2.4.8" + +cross-spawn@6.0.5, cross-spawn@^6.0.0: + version "6.0.5" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" + integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== + dependencies: + nice-try "^1.0.4" + path-key "^2.0.1" + semver "^5.5.0" + shebang-command "^1.2.0" + which "^1.2.9" + +cross-spawn@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" + integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI= + dependencies: + lru-cache "^4.0.1" + which "^1.2.9" + +crypto-browserify@^3.11.0: + version "3.12.0" + resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" + integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg== + dependencies: + browserify-cipher "^1.0.0" + browserify-sign "^4.0.0" + create-ecdh "^4.0.0" + create-hash "^1.1.0" + create-hmac "^1.1.0" + diffie-hellman "^5.0.0" + inherits "^2.0.1" + pbkdf2 "^3.0.3" + public-encrypt "^4.0.0" + randombytes "^2.0.0" + randomfill "^1.0.3" + +css-blank-pseudo@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz#dfdefd3254bf8a82027993674ccf35483bfcb3c5" + integrity sha512-LHz35Hr83dnFeipc7oqFDmsjHdljj3TQtxGGiNWSOsTLIAubSm4TEz8qCaKFpk7idaQ1GfWscF4E6mgpBysA1w== + dependencies: + postcss "^7.0.5" + +css-color-names@0.0.4, css-color-names@^0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0" + integrity sha1-gIrcLnnPhHOAabZGyyDsJ762KeA= + +css-declaration-sorter@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz#c198940f63a76d7e36c1e71018b001721054cb22" + integrity sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA== + dependencies: + postcss "^7.0.1" + timsort "^0.3.0" + +css-has-pseudo@^0.10.0: + version "0.10.0" + resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-0.10.0.tgz#3c642ab34ca242c59c41a125df9105841f6966ee" + integrity sha512-Z8hnfsZu4o/kt+AuFzeGpLVhFOGO9mluyHBaA2bA8aCGTwah5sT3WV/fTHH8UNZUytOIImuGPrl/prlb4oX4qQ== + dependencies: + postcss "^7.0.6" + postcss-selector-parser "^5.0.0-rc.4" + +css-loader@^3.2.0: + version "3.5.3" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.5.3.tgz#95ac16468e1adcd95c844729e0bb167639eb0bcf" + integrity sha512-UEr9NH5Lmi7+dguAm+/JSPovNjYbm2k3TK58EiwQHzOHH5Jfq1Y+XoP2bQO6TMn7PptMd0opxxedAWcaSTRKHw== + dependencies: + camelcase "^5.3.1" + cssesc "^3.0.0" + icss-utils "^4.1.1" + loader-utils "^1.2.3" + normalize-path "^3.0.0" + postcss "^7.0.27" + postcss-modules-extract-imports "^2.0.0" + postcss-modules-local-by-default "^3.0.2" + postcss-modules-scope "^2.2.0" + postcss-modules-values "^3.0.0" + postcss-value-parser "^4.0.3" + schema-utils "^2.6.6" + semver "^6.3.0" + +css-prefers-color-scheme@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-3.1.1.tgz#6f830a2714199d4f0d0d0bb8a27916ed65cff1f4" + integrity sha512-MTu6+tMs9S3EUqzmqLXEcgNRbNkkD/TGFvowpeoWJn5Vfq7FMgsmRQs9X5NXAURiOBmOxm/lLjsDNXDE6k9bhg== + dependencies: + postcss "^7.0.5" + +css-select-base-adapter@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7" + integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w== + +css-select@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef" + integrity sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ== + dependencies: + boolbase "^1.0.0" + css-what "^3.2.1" + domutils "^1.7.0" + nth-check "^1.0.2" + +css-tree@1.0.0-alpha.37: + version "1.0.0-alpha.37" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22" + integrity sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg== + dependencies: + mdn-data "2.0.4" + source-map "^0.6.1" + +css-tree@1.0.0-alpha.39: + version "1.0.0-alpha.39" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.39.tgz#2bff3ffe1bb3f776cf7eefd91ee5cba77a149eeb" + integrity sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA== + dependencies: + mdn-data "2.0.6" + source-map "^0.6.1" + +css-what@^3.2.1: + version "3.3.0" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.3.0.tgz#10fec696a9ece2e591ac772d759aacabac38cd39" + integrity sha512-pv9JPyatiPaQ6pf4OvD/dbfm0o5LviWmwxNWzblYf/1u9QZd0ihV+PMwy5jdQWQ3349kZmKEx9WXuSka2dM4cg== + +cssdb@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-4.4.0.tgz#3bf2f2a68c10f5c6a08abd92378331ee803cddb0" + integrity sha512-LsTAR1JPEM9TpGhl/0p3nQecC2LJ0kD8X5YARu1hk/9I1gril5vDtMZyNxcEpxxDj34YNck/ucjuoUd66K03oQ== + +cssesc@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703" + integrity sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg== + +cssesc@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" + integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== + +cssnano-preset-default@^4.0.7: + version "4.0.7" + resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz#51ec662ccfca0f88b396dcd9679cdb931be17f76" + integrity sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA== + dependencies: + css-declaration-sorter "^4.0.1" + cssnano-util-raw-cache "^4.0.1" + postcss "^7.0.0" + postcss-calc "^7.0.1" + postcss-colormin "^4.0.3" + postcss-convert-values "^4.0.1" + postcss-discard-comments "^4.0.2" + postcss-discard-duplicates "^4.0.2" + postcss-discard-empty "^4.0.1" + postcss-discard-overridden "^4.0.1" + postcss-merge-longhand "^4.0.11" + postcss-merge-rules "^4.0.3" + postcss-minify-font-values "^4.0.2" + postcss-minify-gradients "^4.0.2" + postcss-minify-params "^4.0.2" + postcss-minify-selectors "^4.0.2" + postcss-normalize-charset "^4.0.1" + postcss-normalize-display-values "^4.0.2" + postcss-normalize-positions "^4.0.2" + postcss-normalize-repeat-style "^4.0.2" + postcss-normalize-string "^4.0.2" + postcss-normalize-timing-functions "^4.0.2" + postcss-normalize-unicode "^4.0.1" + postcss-normalize-url "^4.0.1" + postcss-normalize-whitespace "^4.0.2" + postcss-ordered-values "^4.1.2" + postcss-reduce-initial "^4.0.3" + postcss-reduce-transforms "^4.0.2" + postcss-svgo "^4.0.2" + postcss-unique-selectors "^4.0.1" + +cssnano-util-get-arguments@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz#ed3a08299f21d75741b20f3b81f194ed49cc150f" + integrity sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8= + +cssnano-util-get-match@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz#c0e4ca07f5386bb17ec5e52250b4f5961365156d" + integrity sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0= + +cssnano-util-raw-cache@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz#b26d5fd5f72a11dfe7a7846fb4c67260f96bf282" + integrity sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA== + dependencies: + postcss "^7.0.0" + +cssnano-util-same-parent@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz#574082fb2859d2db433855835d9a8456ea18bbf3" + integrity sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q== + +cssnano@^4.1.10: + version "4.1.10" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.10.tgz#0ac41f0b13d13d465487e111b778d42da631b8b2" + integrity sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ== + dependencies: + cosmiconfig "^5.0.0" + cssnano-preset-default "^4.0.7" + is-resolvable "^1.0.0" + postcss "^7.0.0" + +csso@^4.0.2: + version "4.0.3" + resolved "https://registry.yarnpkg.com/csso/-/csso-4.0.3.tgz#0d9985dc852c7cc2b2cacfbbe1079014d1a8e903" + integrity sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ== + dependencies: + css-tree "1.0.0-alpha.39" + +currently-unhandled@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" + integrity sha1-mI3zP+qxke95mmE2nddsF635V+o= + dependencies: + array-find-index "^1.0.1" + +cyclist@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" + integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk= + +dashdash@^1.12.0: + version "1.14.1" + resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" + integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= + dependencies: + assert-plus "^1.0.0" + +debug@2.6.9, debug@^2.2.0, debug@^2.3.3: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +debug@^3.0.0, debug@^3.1.1, debug@^3.2.5: + version "3.2.6" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" + integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== + dependencies: + ms "^2.1.1" + +debug@^4.1.0, debug@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" + integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== + dependencies: + ms "^2.1.1" + +decamelize@^1.1.2, decamelize@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" + integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= + +decode-uri-component@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" + integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= + +deep-equal@^1.0.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" + integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g== + dependencies: + is-arguments "^1.0.4" + is-date-object "^1.0.1" + is-regex "^1.0.4" + object-is "^1.0.1" + object-keys "^1.1.1" + regexp.prototype.flags "^1.2.0" + +default-gateway@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b" + integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA== + dependencies: + execa "^1.0.0" + ip-regex "^2.1.0" + +define-properties@^1.1.2, define-properties@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" + integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== + dependencies: + object-keys "^1.0.12" + +define-property@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" + integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= + dependencies: + is-descriptor "^0.1.0" + +define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" + integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY= + dependencies: + is-descriptor "^1.0.0" + +define-property@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" + integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ== + dependencies: + is-descriptor "^1.0.2" + isobject "^3.0.1" + +del@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4" + integrity sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ== + dependencies: + "@types/glob" "^7.1.1" + globby "^6.1.0" + is-path-cwd "^2.0.0" + is-path-in-cwd "^2.0.0" + p-map "^2.0.0" + pify "^4.0.1" + rimraf "^2.6.3" + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= + +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + +depd@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= + +des.js@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843" + integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA== + dependencies: + inherits "^2.0.1" + minimalistic-assert "^1.0.0" + +destroy@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" + integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= + +detect-file@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" + integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= + +detect-node@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" + integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw== + +diffie-hellman@^5.0.0: + version "5.0.3" + resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" + integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg== + dependencies: + bn.js "^4.1.0" + miller-rabin "^4.0.0" + randombytes "^2.0.0" + +dns-equal@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" + integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0= + +dns-packet@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a" + integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg== + dependencies: + ip "^1.1.0" + safe-buffer "^5.0.1" + +dns-txt@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6" + integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY= + dependencies: + buffer-indexof "^1.0.0" + +dom-serializer@0: + version "0.2.2" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" + integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g== + dependencies: + domelementtype "^2.0.1" + entities "^2.0.0" + +domain-browser@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" + integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA== + +domelementtype@1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" + integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== + +domelementtype@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz#1f8bdfe91f5a78063274e803b4bdcedf6e94f94d" + integrity sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ== + +domutils@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" + integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg== + dependencies: + dom-serializer "0" + domelementtype "1" + +dot-prop@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz#c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb" + integrity sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A== + dependencies: + is-obj "^2.0.0" + +duplexify@^3.4.2, duplexify@^3.6.0: + version "3.7.1" + resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309" + integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g== + dependencies: + end-of-stream "^1.0.0" + inherits "^2.0.1" + readable-stream "^2.0.0" + stream-shift "^1.0.0" + +ecc-jsbn@~0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" + integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= + dependencies: + jsbn "~0.1.0" + safer-buffer "^2.1.0" + +ee-first@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= + +electron-to-chromium@^1.3.413: + version "1.3.465" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.465.tgz#d692e5c383317570c2bd82092a24a0308c6ccf29" + integrity sha512-K/lUeT3NLAsJ5SHRDhK3/zd0tw7OUllYD8w+fTOXm6ljCPsp2qq+vMzxpLo8u1M27ZjZAjRbsA6rirvne2nAMQ== + +elliptic@^6.0.0, elliptic@^6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762" + integrity sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw== + dependencies: + bn.js "^4.4.0" + brorand "^1.0.1" + hash.js "^1.0.0" + hmac-drbg "^1.0.0" + inherits "^2.0.1" + minimalistic-assert "^1.0.0" + minimalistic-crypto-utils "^1.0.0" + +emoji-regex@^7.0.1: + version "7.0.3" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" + integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== + +emojis-list@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" + integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k= + +emojis-list@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" + integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== + +encodeurl@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + +end-of-stream@^1.0.0, end-of-stream@^1.1.0: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + +enhanced-resolve@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f" + integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng== + dependencies: + graceful-fs "^4.1.2" + memory-fs "^0.4.0" + tapable "^1.0.0" + +enhanced-resolve@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz#2937e2b8066cd0fe7ce0990a98f0d71a35189f66" + integrity sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA== + dependencies: + graceful-fs "^4.1.2" + memory-fs "^0.5.0" + tapable "^1.0.0" + +entities@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f" + integrity sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ== + +errno@^0.1.3, errno@~0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618" + integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg== + dependencies: + prr "~1.0.1" + +error-ex@^1.2.0, error-ex@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== + dependencies: + is-arrayish "^0.2.1" + +es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.5: + version "1.17.5" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9" + integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg== + dependencies: + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + is-callable "^1.1.5" + is-regex "^1.0.5" + object-inspect "^1.7.0" + object-keys "^1.1.1" + object.assign "^4.1.0" + string.prototype.trimleft "^2.1.1" + string.prototype.trimright "^2.1.1" + +es-to-primitive@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== + dependencies: + is-callable "^1.1.4" + is-date-object "^1.0.1" + is-symbol "^1.0.2" + +escape-html@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= + +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + +eslint-scope@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848" + integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg== + dependencies: + esrecurse "^4.1.0" + estraverse "^4.1.1" + +esprima@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + +esrecurse@^4.1.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf" + integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ== + dependencies: + estraverse "^4.1.0" + +estraverse@^4.1.0, estraverse@^4.1.1: + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== + +esutils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== + +etag@~1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= + +eventemitter3@^4.0.0: + version "4.0.4" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384" + integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ== + +events@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59" + integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg== + +eventsource@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0" + integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ== + dependencies: + original "^1.0.0" + +evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02" + integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA== + dependencies: + md5.js "^1.3.4" + safe-buffer "^5.1.1" + +execa@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" + integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA== + dependencies: + cross-spawn "^6.0.0" + get-stream "^4.0.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + +expand-brackets@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" + integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI= + dependencies: + debug "^2.3.3" + define-property "^0.2.5" + extend-shallow "^2.0.1" + posix-character-classes "^0.1.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +expand-tilde@^2.0.0, expand-tilde@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502" + integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI= + dependencies: + homedir-polyfill "^1.0.1" + +express@^4.17.1: + version "4.17.1" + resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" + integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== + dependencies: + accepts "~1.3.7" + array-flatten "1.1.1" + body-parser "1.19.0" + content-disposition "0.5.3" + content-type "~1.0.4" + cookie "0.4.0" + cookie-signature "1.0.6" + debug "2.6.9" + depd "~1.1.2" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + finalhandler "~1.1.2" + fresh "0.5.2" + merge-descriptors "1.0.1" + methods "~1.1.2" + on-finished "~2.3.0" + parseurl "~1.3.3" + path-to-regexp "0.1.7" + proxy-addr "~2.0.5" + qs "6.7.0" + range-parser "~1.2.1" + safe-buffer "5.1.2" + send "0.17.1" + serve-static "1.14.1" + setprototypeof "1.1.1" + statuses "~1.5.0" + type-is "~1.6.18" + utils-merge "1.0.1" + vary "~1.1.2" + +extend-shallow@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" + integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= + dependencies: + is-extendable "^0.1.0" + +extend-shallow@^3.0.0, extend-shallow@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" + integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg= + dependencies: + assign-symbols "^1.0.0" + is-extendable "^1.0.1" + +extend@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== + +extglob@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" + integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw== + dependencies: + array-unique "^0.3.2" + define-property "^1.0.0" + expand-brackets "^2.1.4" + extend-shallow "^2.0.1" + fragment-cache "^0.2.1" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +extsprintf@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" + integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= + +extsprintf@^1.2.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" + integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= + +fast-deep-equal@^3.1.1: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-json-stable-stringify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + +faye-websocket@^0.10.0: + version "0.10.0" + resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4" + integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ= + dependencies: + websocket-driver ">=0.5.1" + +faye-websocket@~0.11.1: + version "0.11.3" + resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e" + integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA== + dependencies: + websocket-driver ">=0.5.1" + +figgy-pudding@^3.5.1: + version "3.5.2" + resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" + integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw== + +file-loader@^4.2.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-4.3.0.tgz#780f040f729b3d18019f20605f723e844b8a58af" + integrity sha512-aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA== + dependencies: + loader-utils "^1.2.3" + schema-utils "^2.5.0" + +file-uri-to-path@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" + integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== + +fill-range@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" + integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= + dependencies: + extend-shallow "^2.0.1" + is-number "^3.0.0" + repeat-string "^1.6.1" + to-regex-range "^2.1.0" + +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + +finalhandler@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== + dependencies: + debug "2.6.9" + encodeurl "~1.0.2" + escape-html "~1.0.3" + on-finished "~2.3.0" + parseurl "~1.3.3" + statuses "~1.5.0" + unpipe "~1.0.0" + +find-cache-dir@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7" + integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ== + dependencies: + commondir "^1.0.1" + make-dir "^2.0.0" + pkg-dir "^3.0.0" + +find-cache-dir@^3.0.0, find-cache-dir@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880" + integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ== + dependencies: + commondir "^1.0.1" + make-dir "^3.0.2" + pkg-dir "^4.1.0" + +find-up@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" + integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8= + dependencies: + path-exists "^2.0.0" + pinkie-promise "^2.0.0" + +find-up@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" + integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= + dependencies: + locate-path "^2.0.0" + +find-up@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" + integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== + dependencies: + locate-path "^3.0.0" + +find-up@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + +findup-sync@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1" + integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg== + dependencies: + detect-file "^1.0.0" + is-glob "^4.0.0" + micromatch "^3.0.4" + resolve-dir "^1.0.1" + +flatted@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138" + integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== + +flatten@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b" + integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg== + +flush-write-stream@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8" + integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w== + dependencies: + inherits "^2.0.3" + readable-stream "^2.3.6" + +follow-redirects@^1.0.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.11.0.tgz#afa14f08ba12a52963140fe43212658897bc0ecb" + integrity sha512-KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA== + dependencies: + debug "^3.0.0" + +for-in@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" + integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= + +forever-agent@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" + integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= + +form-data@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" + integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.6" + mime-types "^2.1.12" + +forwarded@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" + integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= + +fragment-cache@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" + integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk= + dependencies: + map-cache "^0.2.2" + +fresh@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= + +from2@^2.1.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" + integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8= + dependencies: + inherits "^2.0.1" + readable-stream "^2.0.0" + +fs-minipass@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" + integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== + dependencies: + minipass "^3.0.0" + +fs-write-stream-atomic@^1.0.8: + version "1.0.10" + resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9" + integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk= + dependencies: + graceful-fs "^4.1.2" + iferr "^0.1.5" + imurmurhash "^0.1.4" + readable-stream "1 || 2" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +fsevents@^1.2.7: + version "1.2.13" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38" + integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw== + dependencies: + bindings "^1.5.0" + nan "^2.12.1" + +fsevents@~2.1.2: + version "2.1.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e" + integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ== + +fstream@^1.0.0, fstream@^1.0.12: + version "1.0.12" + resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045" + integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg== + dependencies: + graceful-fs "^4.1.2" + inherits "~2.0.0" + mkdirp ">=0.5 0" + rimraf "2" + +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + +gauge@~2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= + dependencies: + aproba "^1.0.3" + console-control-strings "^1.0.0" + has-unicode "^2.0.0" + object-assign "^4.1.0" + signal-exit "^3.0.0" + string-width "^1.0.1" + strip-ansi "^3.0.1" + wide-align "^1.1.0" + +gaze@^1.0.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a" + integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g== + dependencies: + globule "^1.0.0" + +gensync@^1.0.0-beta.1: + version "1.0.0-beta.1" + resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269" + integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg== + +get-caller-file@^2.0.1: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + +get-stdin@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" + integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4= + +get-stream@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" + integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== + dependencies: + pump "^3.0.0" + +get-value@^2.0.3, get-value@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" + integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= + +getpass@^0.1.1: + version "0.1.7" + resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" + integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= + dependencies: + assert-plus "^1.0.0" + +glob-parent@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" + integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4= + dependencies: + is-glob "^3.1.0" + path-dirname "^1.0.0" + +glob-parent@~5.1.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229" + integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ== + dependencies: + is-glob "^4.0.1" + +glob@^7.0.0, glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.1.1: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +global-modules@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" + integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A== + dependencies: + global-prefix "^3.0.0" + +global-modules@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea" + integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg== + dependencies: + global-prefix "^1.0.1" + is-windows "^1.0.1" + resolve-dir "^1.0.0" + +global-prefix@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe" + integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4= + dependencies: + expand-tilde "^2.0.2" + homedir-polyfill "^1.0.1" + ini "^1.3.4" + is-windows "^1.0.1" + which "^1.2.14" + +global-prefix@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" + integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg== + dependencies: + ini "^1.3.5" + kind-of "^6.0.2" + which "^1.3.1" + +globals@^11.1.0: + version "11.12.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" + integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== + +globby@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c" + integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw= + dependencies: + array-union "^1.0.1" + glob "^7.0.3" + object-assign "^4.0.1" + pify "^2.0.0" + pinkie-promise "^2.0.0" + +globule@^1.0.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/globule/-/globule-1.3.2.tgz#d8bdd9e9e4eef8f96e245999a5dee7eb5d8529c4" + integrity sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA== + dependencies: + glob "~7.1.1" + lodash "~4.17.10" + minimatch "~3.0.2" + +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.2.2: + version "4.2.4" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" + integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== + +handle-thing@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" + integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg== + +har-schema@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" + integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= + +har-validator@~5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" + integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g== + dependencies: + ajv "^6.5.5" + har-schema "^2.0.0" + +has-ansi@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" + integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= + dependencies: + ansi-regex "^2.0.0" + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +has-symbols@^1.0.0, has-symbols@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" + integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== + +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + +has-value@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" + integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8= + dependencies: + get-value "^2.0.3" + has-values "^0.1.4" + isobject "^2.0.0" + +has-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" + integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc= + dependencies: + get-value "^2.0.6" + has-values "^1.0.0" + isobject "^3.0.0" + +has-values@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" + integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E= + +has-values@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" + integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8= + dependencies: + is-number "^3.0.0" + kind-of "^4.0.0" + +has@^1.0.0, has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + dependencies: + function-bind "^1.1.1" + +hash-base@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33" + integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA== + dependencies: + inherits "^2.0.4" + readable-stream "^3.6.0" + safe-buffer "^5.2.0" + +hash.js@^1.0.0, hash.js@^1.0.3: + version "1.1.7" + resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42" + integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA== + dependencies: + inherits "^2.0.3" + minimalistic-assert "^1.0.1" + +hex-color-regex@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" + integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== + +hmac-drbg@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" + integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE= + dependencies: + hash.js "^1.0.3" + minimalistic-assert "^1.0.0" + minimalistic-crypto-utils "^1.0.1" + +homedir-polyfill@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" + integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA== + dependencies: + parse-passwd "^1.0.0" + +hosted-git-info@^2.1.4: + version "2.8.8" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" + integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== + +hpack.js@^2.1.6: + version "2.1.6" + resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" + integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI= + dependencies: + inherits "^2.0.1" + obuf "^1.0.0" + readable-stream "^2.0.1" + wbuf "^1.1.0" + +hsl-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e" + integrity sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4= + +hsla-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38" + integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg= + +html-comment-regex@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7" + integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ== + +html-entities@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44" + integrity sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA== + +http-deceiver@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" + integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc= + +http-errors@1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" + integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== + dependencies: + depd "~1.1.2" + inherits "2.0.3" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + +http-errors@~1.6.2: + version "1.6.3" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" + integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0= + dependencies: + depd "~1.1.2" + inherits "2.0.3" + setprototypeof "1.1.0" + statuses ">= 1.4.0 < 2" + +http-errors@~1.7.2: + version "1.7.3" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" + integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== + dependencies: + depd "~1.1.2" + inherits "2.0.4" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + +http-parser-js@>=0.5.1: + version "0.5.2" + resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.2.tgz#da2e31d237b393aae72ace43882dd7e270a8ff77" + integrity sha512-opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ== + +http-proxy-middleware@0.19.1: + version "0.19.1" + resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a" + integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q== + dependencies: + http-proxy "^1.17.0" + is-glob "^4.0.0" + lodash "^4.17.11" + micromatch "^3.1.10" + +http-proxy@^1.17.0: + version "1.18.1" + resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" + integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ== + dependencies: + eventemitter3 "^4.0.0" + follow-redirects "^1.0.0" + requires-port "^1.0.0" + +http-signature@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" + integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= + dependencies: + assert-plus "^1.0.0" + jsprim "^1.2.2" + sshpk "^1.7.0" + +https-browserify@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" + integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= + +iconv-lite@0.4.24: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + dependencies: + safer-buffer ">= 2.1.2 < 3" + +icss-utils@^4.0.0, icss-utils@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467" + integrity sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA== + dependencies: + postcss "^7.0.14" + +ieee754@^1.1.4: + version "1.1.13" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" + integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg== + +iferr@^0.1.5: + version "0.1.5" + resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" + integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= + +import-cwd@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9" + integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk= + dependencies: + import-from "^2.1.0" + +import-fresh@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546" + integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY= + dependencies: + caller-path "^2.0.0" + resolve-from "^3.0.0" + +import-fresh@^3.1.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66" + integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ== + dependencies: + parent-module "^1.0.0" + resolve-from "^4.0.0" + +import-from@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1" + integrity sha1-M1238qev/VOqpHHUuAId7ja387E= + dependencies: + resolve-from "^3.0.0" + +import-local@2.0.0, import-local@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d" + integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ== + dependencies: + pkg-dir "^3.0.0" + resolve-cwd "^2.0.0" + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + +in-publish@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.1.tgz#948b1a535c8030561cea522f73f78f4be357e00c" + integrity sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ== + +indent-string@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" + integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA= + dependencies: + repeating "^2.0.0" + +indent-string@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== + +indexes-of@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" + integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc= + +infer-owner@^1.0.3, infer-owner@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" + integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +inherits@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" + integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE= + +inherits@2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= + +ini@^1.3.4, ini@^1.3.5: + version "1.3.5" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" + integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== + +internal-ip@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907" + integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg== + dependencies: + default-gateway "^4.2.0" + ipaddr.js "^1.9.0" + +interpret@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296" + integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw== + +invariant@^2.2.2, invariant@^2.2.4: + version "2.2.4" + resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" + integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== + dependencies: + loose-envify "^1.0.0" + +invert-kv@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02" + integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA== + +ip-regex@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" + integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= + +ip@^1.1.0, ip@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" + integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= + +ipaddr.js@1.9.1, ipaddr.js@^1.9.0: + version "1.9.1" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" + integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== + +is-absolute-url@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6" + integrity sha1-UFMN+4T8yap9vnhS6Do3uTufKqY= + +is-absolute-url@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698" + integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q== + +is-accessor-descriptor@^0.1.6: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" + integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= + dependencies: + kind-of "^3.0.2" + +is-accessor-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" + integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ== + dependencies: + kind-of "^6.0.0" + +is-arguments@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3" + integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA== + +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= + +is-arrayish@^0.3.1: + version "0.3.2" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" + integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== + +is-binary-path@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" + integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg= + dependencies: + binary-extensions "^1.0.0" + +is-binary-path@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== + dependencies: + binary-extensions "^2.0.0" + +is-buffer@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" + integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== + +is-callable@^1.1.4, is-callable@^1.1.5: + version "1.2.0" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb" + integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw== + +is-color-stop@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345" + integrity sha1-z/9HGu5N1cnhWFmPvhKWe1za00U= + dependencies: + css-color-names "^0.0.4" + hex-color-regex "^1.1.0" + hsl-regex "^1.0.0" + hsla-regex "^1.0.0" + rgb-regex "^1.0.1" + rgba-regex "^1.0.0" + +is-data-descriptor@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" + integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= + dependencies: + kind-of "^3.0.2" + +is-data-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" + integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ== + dependencies: + kind-of "^6.0.0" + +is-date-object@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" + integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== + +is-descriptor@^0.1.0: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" + integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg== + dependencies: + is-accessor-descriptor "^0.1.6" + is-data-descriptor "^0.1.4" + kind-of "^5.0.0" + +is-descriptor@^1.0.0, is-descriptor@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" + integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== + dependencies: + is-accessor-descriptor "^1.0.0" + is-data-descriptor "^1.0.0" + kind-of "^6.0.2" + +is-directory@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" + integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= + +is-extendable@^0.1.0, is-extendable@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" + integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= + +is-extendable@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" + integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== + dependencies: + is-plain-object "^2.0.4" + +is-extglob@^2.1.0, is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + +is-finite@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3" + integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w== + +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= + dependencies: + number-is-nan "^1.0.0" + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + +is-glob@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" + integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo= + dependencies: + is-extglob "^2.1.0" + +is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" + integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== + dependencies: + is-extglob "^2.1.1" + +is-number@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" + integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= + dependencies: + kind-of "^3.0.2" + +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + +is-obj@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" + integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== + +is-path-cwd@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb" + integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ== + +is-path-in-cwd@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb" + integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ== + dependencies: + is-path-inside "^2.1.0" + +is-path-inside@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2" + integrity sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg== + dependencies: + path-is-inside "^1.0.2" + +is-plain-obj@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" + integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4= + +is-plain-object@^2.0.3, is-plain-object@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== + dependencies: + isobject "^3.0.1" + +is-regex@^1.0.4, is-regex@^1.0.5: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz#ece38e389e490df0dc21caea2bd596f987f767ff" + integrity sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw== + dependencies: + has-symbols "^1.0.1" + +is-resolvable@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" + integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg== + +is-stream@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" + integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= + +is-svg@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz#9321dbd29c212e5ca99c4fa9794c714bcafa2f75" + integrity sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ== + dependencies: + html-comment-regex "^1.1.0" + +is-symbol@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937" + integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ== + dependencies: + has-symbols "^1.0.1" + +is-typedarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= + +is-utf8@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" + integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI= + +is-windows@^1.0.1, is-windows@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" + integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== + +is-wsl@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" + integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= + +isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + +isobject@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" + integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= + dependencies: + isarray "1.0.0" + +isobject@^3.0.0, isobject@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= + +isstream@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" + integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= + +jest-worker@^25.4.0: + version "25.5.0" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.5.0.tgz#2611d071b79cea0f43ee57a3d118593ac1547db1" + integrity sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw== + dependencies: + merge-stream "^2.0.0" + supports-color "^7.0.0" + +jquery@^3.5.1: + version "3.5.1" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5" + integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg== + +js-base64@^2.1.8: + version "2.5.2" + resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.2.tgz#313b6274dda718f714d00b3330bbae6e38e90209" + integrity sha512-Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ== + +"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +js-yaml@^3.13.1: + version "3.14.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482" + integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +jsbn@~0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" + integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= + +jsesc@^2.5.1: + version "2.5.2" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" + integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== + +jsesc@~0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" + integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= + +json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" + integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + +json-schema@0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" + integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= + +json-stringify-safe@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= + +json3@^3.3.2: + version "3.3.3" + resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81" + integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA== + +json5@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" + integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== + dependencies: + minimist "^1.2.0" + +json5@^2.1.2: + version "2.1.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43" + integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA== + dependencies: + minimist "^1.2.5" + +jsprim@^1.2.2: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" + integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= + dependencies: + assert-plus "1.0.0" + extsprintf "1.3.0" + json-schema "0.2.3" + verror "1.10.0" + +killable@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892" + integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg== + +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: + version "3.2.2" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" + integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= + dependencies: + is-buffer "^1.1.5" + +kind-of@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" + integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc= + dependencies: + is-buffer "^1.1.5" + +kind-of@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" + integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== + +kind-of@^6.0.0, kind-of@^6.0.2: + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== + +last-call-webpack-plugin@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz#9742df0e10e3cf46e5c0381c2de90d3a7a2d7555" + integrity sha512-7KI2l2GIZa9p2spzPIVZBYyNKkN+e/SQPpnjlTiPhdbDW3F86tdKKELxKpzJ5sgU19wQWsACULZmpTPYHeWO5w== + dependencies: + lodash "^4.17.5" + webpack-sources "^1.1.0" + +lcid@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf" + integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA== + dependencies: + invert-kv "^2.0.0" + +leven@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" + integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== + +levenary@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz#842a9ee98d2075aa7faeedbe32679e9205f46f77" + integrity sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ== + dependencies: + leven "^3.1.0" + +lines-and-columns@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" + integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= + +load-json-file@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" + integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA= + dependencies: + graceful-fs "^4.1.2" + parse-json "^2.2.0" + pify "^2.0.0" + pinkie-promise "^2.0.0" + strip-bom "^2.0.0" + +loader-runner@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" + integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw== + +loader-utils@1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7" + integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA== + dependencies: + big.js "^5.2.2" + emojis-list "^2.0.0" + json5 "^1.0.1" + +loader-utils@^1.0.1, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" + integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^1.0.1" + +loader-utils@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" + integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^2.1.2" + +locate-path@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" + integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4= + dependencies: + p-locate "^2.0.0" + path-exists "^3.0.0" + +locate-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" + integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== + dependencies: + p-locate "^3.0.0" + path-exists "^3.0.0" + +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + +lodash._reinterpolate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" + integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= + +lodash.get@^4.0: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" + integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= + +lodash.has@^4.0: + version "4.5.2" + resolved "https://registry.yarnpkg.com/lodash.has/-/lodash.has-4.5.2.tgz#d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862" + integrity sha1-0Z9NwQlQWMzL4rDN9O4P5Ko3yGI= + +lodash.memoize@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" + integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= + +lodash.template@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" + integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A== + dependencies: + lodash._reinterpolate "^3.0.0" + lodash.templatesettings "^4.0.0" + +lodash.templatesettings@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33" + integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ== + dependencies: + lodash._reinterpolate "^3.0.0" + +lodash.uniq@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" + integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= + +lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.5, lodash@~4.17.10: + version "4.17.15" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" + integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== + +loglevel@^1.6.8: + version "1.6.8" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171" + integrity sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA== + +loose-envify@^1.0.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== + dependencies: + js-tokens "^3.0.0 || ^4.0.0" + +loud-rejection@^1.0.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" + integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8= + dependencies: + currently-unhandled "^0.4.1" + signal-exit "^3.0.0" + +lru-cache@^4.0.1: + version "4.1.5" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" + integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== + dependencies: + pseudomap "^1.0.2" + yallist "^2.1.2" + +lru-cache@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" + integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== + dependencies: + yallist "^3.0.2" + +make-dir@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" + integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA== + dependencies: + pify "^4.0.1" + semver "^5.6.0" + +make-dir@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== + dependencies: + semver "^6.0.0" + +map-age-cleaner@^0.1.1: + version "0.1.3" + resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" + integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w== + dependencies: + p-defer "^1.0.0" + +map-cache@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" + integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= + +map-obj@^1.0.0, map-obj@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" + integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= + +map-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" + integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48= + dependencies: + object-visit "^1.0.0" + +md5.js@^1.3.4: + version "1.3.5" + resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" + integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg== + dependencies: + hash-base "^3.0.0" + inherits "^2.0.1" + safe-buffer "^5.1.2" + +mdn-data@2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b" + integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA== + +mdn-data@2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.6.tgz#852dc60fcaa5daa2e8cf6c9189c440ed3e042978" + integrity sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA== + +media-typer@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= + +mem@^4.0.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178" + integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w== + dependencies: + map-age-cleaner "^0.1.1" + mimic-fn "^2.0.0" + p-is-promise "^2.0.0" + +memory-fs@^0.4.0, memory-fs@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" + integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI= + dependencies: + errno "^0.1.3" + readable-stream "^2.0.1" + +memory-fs@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c" + integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA== + dependencies: + errno "^0.1.3" + readable-stream "^2.0.1" + +meow@^3.7.0: + version "3.7.0" + resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" + integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs= + dependencies: + camelcase-keys "^2.0.0" + decamelize "^1.1.2" + loud-rejection "^1.0.0" + map-obj "^1.0.1" + minimist "^1.1.3" + normalize-package-data "^2.3.4" + object-assign "^4.0.1" + read-pkg-up "^1.0.1" + redent "^1.0.0" + trim-newlines "^1.0.0" + +merge-descriptors@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" + integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= + +merge-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== + +methods@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" + integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= + +micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4: + version "3.1.10" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" + integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + braces "^2.3.1" + define-property "^2.0.2" + extend-shallow "^3.0.2" + extglob "^2.0.4" + fragment-cache "^0.2.1" + kind-of "^6.0.2" + nanomatch "^1.2.9" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.2" + +miller-rabin@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d" + integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA== + dependencies: + bn.js "^4.0.0" + brorand "^1.0.1" + +mime-db@1.44.0, "mime-db@>= 1.43.0 < 2": + version "1.44.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" + integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg== + +mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: + version "2.1.27" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f" + integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w== + dependencies: + mime-db "1.44.0" + +mime@1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" + integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== + +mime@^2.4.4: + version "2.4.6" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1" + integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA== + +mimic-fn@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== + +mini-css-extract-plugin@^0.8.0: + version "0.8.2" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.2.tgz#a875e169beb27c88af77dd962771c9eedc3da161" + integrity sha512-a3Y4of27Wz+mqK3qrcd3VhYz6cU0iW5x3Sgvqzbj+XmlrSizmvu8QQMl5oMYJjgHOC4iyt+w7l4umP+dQeW3bw== + dependencies: + loader-utils "^1.1.0" + normalize-url "1.9.1" + schema-utils "^1.0.0" + webpack-sources "^1.1.0" + +minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" + integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== + +minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" + integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= + +minimatch@^3.0.4, minimatch@~3.0.2: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + +minipass-collect@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" + integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA== + dependencies: + minipass "^3.0.0" + +minipass-flush@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" + integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw== + dependencies: + minipass "^3.0.0" + +minipass-pipeline@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.3.tgz#55f7839307d74859d6e8ada9c3ebe72cec216a34" + integrity sha512-cFOknTvng5vqnwOpDsZTWhNll6Jf8o2x+/diplafmxpuIymAjzoOolZG0VvQf3V2HgqzJNhnuKHYp2BqDgz8IQ== + dependencies: + minipass "^3.0.0" + +minipass@^3.0.0, minipass@^3.1.1: + version "3.1.3" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd" + integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg== + dependencies: + yallist "^4.0.0" + +mississippi@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" + integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA== + dependencies: + concat-stream "^1.5.0" + duplexify "^3.4.2" + end-of-stream "^1.1.0" + flush-write-stream "^1.0.0" + from2 "^2.1.0" + parallel-transform "^1.1.0" + pump "^3.0.0" + pumpify "^1.3.3" + stream-each "^1.1.0" + through2 "^2.0.0" + +mixin-deep@^1.2.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" + integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== + dependencies: + for-in "^1.0.2" + is-extendable "^1.0.1" + +"mkdirp@>=0.5 0", mkdirp@^0.5, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + +move-concurrently@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" + integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I= + dependencies: + aproba "^1.1.1" + copy-concurrently "^1.0.0" + fs-write-stream-atomic "^1.0.8" + mkdirp "^0.5.1" + rimraf "^2.5.4" + run-queue "^1.0.3" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +ms@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" + integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== + +ms@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +multicast-dns-service-types@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901" + integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE= + +multicast-dns@^6.0.1: + version "6.2.3" + resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229" + integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g== + dependencies: + dns-packet "^1.3.1" + thunky "^1.0.2" + +nan@^2.12.1, nan@^2.13.2: + version "2.14.1" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01" + integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw== + +nanomatch@^1.2.9: + version "1.2.13" + resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" + integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + define-property "^2.0.2" + extend-shallow "^3.0.2" + fragment-cache "^0.2.1" + is-windows "^1.0.2" + kind-of "^6.0.2" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +negotiator@0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" + integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== + +neo-async@^2.5.0, neo-async@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" + integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== + +nice-try@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" + integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== + +node-forge@0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz#d624050edbb44874adca12bb9a52ec63cb782579" + integrity sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ== + +node-gyp@^3.8.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c" + integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA== + dependencies: + fstream "^1.0.0" + glob "^7.0.3" + graceful-fs "^4.1.2" + mkdirp "^0.5.0" + nopt "2 || 3" + npmlog "0 || 1 || 2 || 3 || 4" + osenv "0" + request "^2.87.0" + rimraf "2" + semver "~5.3.0" + tar "^2.0.0" + which "1" + +node-libs-browser@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425" + integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q== + dependencies: + assert "^1.1.1" + browserify-zlib "^0.2.0" + buffer "^4.3.0" + console-browserify "^1.1.0" + constants-browserify "^1.0.0" + crypto-browserify "^3.11.0" + domain-browser "^1.1.1" + events "^3.0.0" + https-browserify "^1.0.0" + os-browserify "^0.3.0" + path-browserify "0.0.1" + process "^0.11.10" + punycode "^1.2.4" + querystring-es3 "^0.2.0" + readable-stream "^2.3.3" + stream-browserify "^2.0.1" + stream-http "^2.7.2" + string_decoder "^1.0.0" + timers-browserify "^2.0.4" + tty-browserify "0.0.0" + url "^0.11.0" + util "^0.11.0" + vm-browserify "^1.0.1" + +node-releases@^1.1.53: + version "1.1.58" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.58.tgz#8ee20eef30fa60e52755fcc0942def5a734fe935" + integrity sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg== + +node-sass@^4.13.0: + version "4.14.1" + resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.14.1.tgz#99c87ec2efb7047ed638fb4c9db7f3a42e2217b5" + integrity sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g== + dependencies: + async-foreach "^0.1.3" + chalk "^1.1.1" + cross-spawn "^3.0.0" + gaze "^1.0.0" + get-stdin "^4.0.1" + glob "^7.0.3" + in-publish "^2.0.0" + lodash "^4.17.15" + meow "^3.7.0" + mkdirp "^0.5.1" + nan "^2.13.2" + node-gyp "^3.8.0" + npmlog "^4.0.0" + request "^2.88.0" + sass-graph "2.2.5" + stdout-stream "^1.4.0" + "true-case-path" "^1.0.2" + +"nopt@2 || 3": + version "3.0.6" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" + integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k= + dependencies: + abbrev "1" + +normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" + integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== + dependencies: + hosted-git-info "^2.1.4" + resolve "^1.10.0" + semver "2 || 3 || 4 || 5" + validate-npm-package-license "^3.0.1" + +normalize-path@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" + integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= + dependencies: + remove-trailing-separator "^1.0.1" + +normalize-path@^3.0.0, normalize-path@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + +normalize-range@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" + integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= + +normalize-url@1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c" + integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw= + dependencies: + object-assign "^4.0.1" + prepend-http "^1.0.0" + query-string "^4.1.0" + sort-keys "^1.0.0" + +normalize-url@^3.0.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" + integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== + +npm-run-path@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" + integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= + dependencies: + path-key "^2.0.0" + +"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0: + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.3" + set-blocking "~2.0.0" + +nth-check@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" + integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg== + dependencies: + boolbase "~1.0.0" + +num2fraction@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" + integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4= + +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= + +oauth-sign@~0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" + integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== + +object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + +object-copy@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" + integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw= + dependencies: + copy-descriptor "^0.1.0" + define-property "^0.2.5" + kind-of "^3.0.3" + +object-inspect@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67" + integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw== + +object-is@^1.0.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.2.tgz#c5d2e87ff9e119f78b7a088441519e2eec1573b6" + integrity sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + +object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== + +object-visit@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" + integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs= + dependencies: + isobject "^3.0.0" + +object.assign@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da" + integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w== + dependencies: + define-properties "^1.1.2" + function-bind "^1.1.1" + has-symbols "^1.0.0" + object-keys "^1.0.11" + +object.getownpropertydescriptors@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649" + integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + +object.pick@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" + integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= + dependencies: + isobject "^3.0.1" + +object.values@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e" + integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + function-bind "^1.1.1" + has "^1.0.3" + +obuf@^1.0.0, obuf@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" + integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== + +on-finished@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= + dependencies: + ee-first "1.1.1" + +on-headers@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" + integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== + +once@^1.3.0, once@^1.3.1, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +opn@^5.5.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc" + integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA== + dependencies: + is-wsl "^1.1.0" + +optimize-css-assets-webpack-plugin@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.3.tgz#e2f1d4d94ad8c0af8967ebd7cf138dcb1ef14572" + integrity sha512-q9fbvCRS6EYtUKKSwI87qm2IxlyJK5b4dygW1rKUBT6mMDhdG5e5bZT63v6tnJR9F9FB/H5a0HTmtw+laUBxKA== + dependencies: + cssnano "^4.1.10" + last-call-webpack-plugin "^3.0.0" + +original@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f" + integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg== + dependencies: + url-parse "^1.4.3" + +os-browserify@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" + integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= + +os-homedir@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" + integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= + +os-locale@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a" + integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q== + dependencies: + execa "^1.0.0" + lcid "^2.0.0" + mem "^4.0.0" + +os-tmpdir@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= + +osenv@0: + version "0.1.5" + resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" + integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== + dependencies: + os-homedir "^1.0.0" + os-tmpdir "^1.0.0" + +p-defer@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" + integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww= + +p-finally@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" + integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= + +p-is-promise@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e" + integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg== + +p-limit@^1.1.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" + integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q== + dependencies: + p-try "^1.0.0" + +p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + +p-locate@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" + integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM= + dependencies: + p-limit "^1.1.0" + +p-locate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" + integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== + dependencies: + p-limit "^2.0.0" + +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + +p-map@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175" + integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw== + +p-map@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d" + integrity sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ== + dependencies: + aggregate-error "^3.0.0" + +p-retry@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz#316b4c8893e2c8dc1cfa891f406c4b422bebf328" + integrity sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w== + dependencies: + retry "^0.12.0" + +p-try@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" + integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= + +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== + +pako@~1.0.5: + version "1.0.11" + resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" + integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw== + +parallel-transform@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc" + integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg== + dependencies: + cyclist "^1.0.1" + inherits "^2.0.3" + readable-stream "^2.1.5" + +parent-module@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== + dependencies: + callsites "^3.0.0" + +parse-asn1@^5.0.0, parse-asn1@^5.1.5: + version "5.1.5" + resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz#003271343da58dc94cace494faef3d2147ecea0e" + integrity sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ== + dependencies: + asn1.js "^4.0.0" + browserify-aes "^1.0.0" + create-hash "^1.1.0" + evp_bytestokey "^1.0.0" + pbkdf2 "^3.0.3" + safe-buffer "^5.1.1" + +parse-json@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" + integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck= + dependencies: + error-ex "^1.2.0" + +parse-json@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" + integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= + dependencies: + error-ex "^1.3.1" + json-parse-better-errors "^1.0.1" + +parse-json@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz#73e5114c986d143efa3712d4ea24db9a4266f60f" + integrity sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw== + dependencies: + "@babel/code-frame" "^7.0.0" + error-ex "^1.3.1" + json-parse-better-errors "^1.0.1" + lines-and-columns "^1.1.6" + +parse-passwd@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" + integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY= + +parseurl@~1.3.2, parseurl@~1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== + +pascalcase@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" + integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= + +path-browserify@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a" + integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ== + +path-complete-extname@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/path-complete-extname/-/path-complete-extname-1.0.0.tgz#f889985dc91000c815515c0bfed06c5acda0752b" + integrity sha512-CVjiWcMRdGU8ubs08YQVzhutOR5DEfO97ipRIlOGMK5Bek5nQySknBpuxVAVJ36hseTNs+vdIcv57ZrWxH7zvg== + +path-dirname@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" + integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA= + +path-exists@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" + integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s= + dependencies: + pinkie-promise "^2.0.0" + +path-exists@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" + integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= + +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +path-is-inside@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" + integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= + +path-key@^2.0.0, path-key@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" + integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= + +path-parse@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" + integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== + +path-to-regexp@0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= + +path-type@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" + integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE= + dependencies: + graceful-fs "^4.1.2" + pify "^2.0.0" + pinkie-promise "^2.0.0" + +path-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== + +pbkdf2@^3.0.3: + version "3.1.1" + resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz#cb8724b0fada984596856d1a6ebafd3584654b94" + integrity sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg== + dependencies: + create-hash "^1.1.2" + create-hmac "^1.1.4" + ripemd160 "^2.0.1" + safe-buffer "^5.0.1" + sha.js "^2.4.8" + +performance-now@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" + integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= + +picomatch@^2.0.4, picomatch@^2.2.1: + version "2.2.2" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" + integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== + +pify@^2.0.0, pify@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" + integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= + +pify@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" + integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== + +pinkie-promise@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" + integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o= + dependencies: + pinkie "^2.0.0" + +pinkie@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" + integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= + +pkg-dir@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" + integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw== + dependencies: + find-up "^3.0.0" + +pkg-dir@^4.1.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== + dependencies: + find-up "^4.0.0" + +pkg-up@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f" + integrity sha1-yBmscoBZpGHKscOImivjxJoATX8= + dependencies: + find-up "^2.1.0" + +pnp-webpack-plugin@^1.5.0: + version "1.6.4" + resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz#c9711ac4dc48a685dabafc86f8b6dd9f8df84149" + integrity sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg== + dependencies: + ts-pnp "^1.1.6" + +popper.js@^1.16.1: + version "1.16.1" + resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b" + integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ== + +portfinder@^1.0.26: + version "1.0.26" + resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.26.tgz#475658d56ca30bed72ac7f1378ed350bd1b64e70" + integrity sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ== + dependencies: + async "^2.6.2" + debug "^3.1.1" + mkdirp "^0.5.1" + +posix-character-classes@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" + integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= + +postcss-attribute-case-insensitive@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz#d93e46b504589e94ac7277b0463226c68041a880" + integrity sha512-clkFxk/9pcdb4Vkn0hAHq3YnxBQ2p0CGD1dy24jN+reBck+EWxMbxSUqN4Yj7t0w8csl87K6p0gxBe1utkJsYA== + dependencies: + postcss "^7.0.2" + postcss-selector-parser "^6.0.2" + +postcss-calc@^7.0.1: + version "7.0.2" + resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.2.tgz#504efcd008ca0273120568b0792b16cdcde8aac1" + integrity sha512-rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ== + dependencies: + postcss "^7.0.27" + postcss-selector-parser "^6.0.2" + postcss-value-parser "^4.0.2" + +postcss-color-functional-notation@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-2.0.1.tgz#5efd37a88fbabeb00a2966d1e53d98ced93f74e0" + integrity sha512-ZBARCypjEDofW4P6IdPVTLhDNXPRn8T2s1zHbZidW6rPaaZvcnCS2soYFIQJrMZSxiePJ2XIYTlcb2ztr/eT2g== + dependencies: + postcss "^7.0.2" + postcss-values-parser "^2.0.0" + +postcss-color-gray@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/postcss-color-gray/-/postcss-color-gray-5.0.0.tgz#532a31eb909f8da898ceffe296fdc1f864be8547" + integrity sha512-q6BuRnAGKM/ZRpfDascZlIZPjvwsRye7UDNalqVz3s7GDxMtqPY6+Q871liNxsonUw8oC61OG+PSaysYpl1bnw== + dependencies: + "@csstools/convert-colors" "^1.4.0" + postcss "^7.0.5" + postcss-values-parser "^2.0.0" + +postcss-color-hex-alpha@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-5.0.3.tgz#a8d9ca4c39d497c9661e374b9c51899ef0f87388" + integrity sha512-PF4GDel8q3kkreVXKLAGNpHKilXsZ6xuu+mOQMHWHLPNyjiUBOr75sp5ZKJfmv1MCus5/DWUGcK9hm6qHEnXYw== + dependencies: + postcss "^7.0.14" + postcss-values-parser "^2.0.1" + +postcss-color-mod-function@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/postcss-color-mod-function/-/postcss-color-mod-function-3.0.3.tgz#816ba145ac11cc3cb6baa905a75a49f903e4d31d" + integrity sha512-YP4VG+xufxaVtzV6ZmhEtc+/aTXH3d0JLpnYfxqTvwZPbJhWqp8bSY3nfNzNRFLgB4XSaBA82OE4VjOOKpCdVQ== + dependencies: + "@csstools/convert-colors" "^1.4.0" + postcss "^7.0.2" + postcss-values-parser "^2.0.0" + +postcss-color-rebeccapurple@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-4.0.1.tgz#c7a89be872bb74e45b1e3022bfe5748823e6de77" + integrity sha512-aAe3OhkS6qJXBbqzvZth2Au4V3KieR5sRQ4ptb2b2O8wgvB3SJBsdG+jsn2BZbbwekDG8nTfcCNKcSfe/lEy8g== + dependencies: + postcss "^7.0.2" + postcss-values-parser "^2.0.0" + +postcss-colormin@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-4.0.3.tgz#ae060bce93ed794ac71264f08132d550956bd381" + integrity sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw== + dependencies: + browserslist "^4.0.0" + color "^3.0.0" + has "^1.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-convert-values@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz#ca3813ed4da0f812f9d43703584e449ebe189a7f" + integrity sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ== + dependencies: + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-custom-media@^7.0.8: + version "7.0.8" + resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-7.0.8.tgz#fffd13ffeffad73621be5f387076a28b00294e0c" + integrity sha512-c9s5iX0Ge15o00HKbuRuTqNndsJUbaXdiNsksnVH8H4gdc+zbLzr/UasOwNG6CTDpLFekVY4672eWdiiWu2GUg== + dependencies: + postcss "^7.0.14" + +postcss-custom-properties@^8.0.11: + version "8.0.11" + resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-8.0.11.tgz#2d61772d6e92f22f5e0d52602df8fae46fa30d97" + integrity sha512-nm+o0eLdYqdnJ5abAJeXp4CEU1c1k+eB2yMCvhgzsds/e0umabFrN6HoTy/8Q4K5ilxERdl/JD1LO5ANoYBeMA== + dependencies: + postcss "^7.0.17" + postcss-values-parser "^2.0.1" + +postcss-custom-selectors@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-5.1.2.tgz#64858c6eb2ecff2fb41d0b28c9dd7b3db4de7fba" + integrity sha512-DSGDhqinCqXqlS4R7KGxL1OSycd1lydugJ1ky4iRXPHdBRiozyMHrdu0H3o7qNOCiZwySZTUI5MV0T8QhCLu+w== + dependencies: + postcss "^7.0.2" + postcss-selector-parser "^5.0.0-rc.3" + +postcss-dir-pseudo-class@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-5.0.0.tgz#6e3a4177d0edb3abcc85fdb6fbb1c26dabaeaba2" + integrity sha512-3pm4oq8HYWMZePJY+5ANriPs3P07q+LW6FAdTlkFH2XqDdP4HeeJYMOzn0HYLhRSjBO3fhiqSwwU9xEULSrPgw== + dependencies: + postcss "^7.0.2" + postcss-selector-parser "^5.0.0-rc.3" + +postcss-discard-comments@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz#1fbabd2c246bff6aaad7997b2b0918f4d7af4033" + integrity sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg== + dependencies: + postcss "^7.0.0" + +postcss-discard-duplicates@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz#3fe133cd3c82282e550fc9b239176a9207b784eb" + integrity sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ== + dependencies: + postcss "^7.0.0" + +postcss-discard-empty@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz#c8c951e9f73ed9428019458444a02ad90bb9f765" + integrity sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w== + dependencies: + postcss "^7.0.0" + +postcss-discard-overridden@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz#652aef8a96726f029f5e3e00146ee7a4e755ff57" + integrity sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg== + dependencies: + postcss "^7.0.0" + +postcss-double-position-gradients@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-1.0.0.tgz#fc927d52fddc896cb3a2812ebc5df147e110522e" + integrity sha512-G+nV8EnQq25fOI8CH/B6krEohGWnF5+3A6H/+JEpOncu5dCnkS1QQ6+ct3Jkaepw1NGVqqOZH6lqrm244mCftA== + dependencies: + postcss "^7.0.5" + postcss-values-parser "^2.0.0" + +postcss-env-function@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/postcss-env-function/-/postcss-env-function-2.0.2.tgz#0f3e3d3c57f094a92c2baf4b6241f0b0da5365d7" + integrity sha512-rwac4BuZlITeUbiBq60h/xbLzXY43qOsIErngWa4l7Mt+RaSkT7QBjXVGTcBHupykkblHMDrBFh30zchYPaOUw== + dependencies: + postcss "^7.0.2" + postcss-values-parser "^2.0.0" + +postcss-flexbugs-fixes@^4.1.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.1.tgz#9218a65249f30897deab1033aced8578562a6690" + integrity sha512-9SiofaZ9CWpQWxOwRh1b/r85KD5y7GgvsNt1056k6OYLvWUun0czCvogfJgylC22uJTwW1KzY3Gz65NZRlvoiQ== + dependencies: + postcss "^7.0.26" + +postcss-focus-visible@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/postcss-focus-visible/-/postcss-focus-visible-4.0.0.tgz#477d107113ade6024b14128317ade2bd1e17046e" + integrity sha512-Z5CkWBw0+idJHSV6+Bgf2peDOFf/x4o+vX/pwcNYrWpXFrSfTkQ3JQ1ojrq9yS+upnAlNRHeg8uEwFTgorjI8g== + dependencies: + postcss "^7.0.2" + +postcss-focus-within@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-focus-within/-/postcss-focus-within-3.0.0.tgz#763b8788596cee9b874c999201cdde80659ef680" + integrity sha512-W0APui8jQeBKbCGZudW37EeMCjDeVxKgiYfIIEo8Bdh5SpB9sxds/Iq8SEuzS0Q4YFOlG7EPFulbbxujpkrV2w== + dependencies: + postcss "^7.0.2" + +postcss-font-variant@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-4.0.0.tgz#71dd3c6c10a0d846c5eda07803439617bbbabacc" + integrity sha512-M8BFYKOvCrI2aITzDad7kWuXXTm0YhGdP9Q8HanmN4EF1Hmcgs1KK5rSHylt/lUJe8yLxiSwWAHdScoEiIxztg== + dependencies: + postcss "^7.0.2" + +postcss-gap-properties@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-2.0.0.tgz#431c192ab3ed96a3c3d09f2ff615960f902c1715" + integrity sha512-QZSqDaMgXCHuHTEzMsS2KfVDOq7ZFiknSpkrPJY6jmxbugUPTuSzs/vuE5I3zv0WAS+3vhrlqhijiprnuQfzmg== + dependencies: + postcss "^7.0.2" + +postcss-image-set-function@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-3.0.1.tgz#28920a2f29945bed4c3198d7df6496d410d3f288" + integrity sha512-oPTcFFip5LZy8Y/whto91L9xdRHCWEMs3e1MdJxhgt4jy2WYXfhkng59fH5qLXSCPN8k4n94p1Czrfe5IOkKUw== + dependencies: + postcss "^7.0.2" + postcss-values-parser "^2.0.0" + +postcss-import@^12.0.1: + version "12.0.1" + resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.1.tgz#cf8c7ab0b5ccab5649024536e565f841928b7153" + integrity sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw== + dependencies: + postcss "^7.0.1" + postcss-value-parser "^3.2.3" + read-cache "^1.0.0" + resolve "^1.1.7" + +postcss-initial@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.2.tgz#f018563694b3c16ae8eaabe3c585ac6319637b2d" + integrity sha512-ugA2wKonC0xeNHgirR4D3VWHs2JcU08WAi1KFLVcnb7IN89phID6Qtg2RIctWbnvp1TM2BOmDtX8GGLCKdR8YA== + dependencies: + lodash.template "^4.5.0" + postcss "^7.0.2" + +postcss-lab-function@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-2.0.1.tgz#bb51a6856cd12289ab4ae20db1e3821ef13d7d2e" + integrity sha512-whLy1IeZKY+3fYdqQFuDBf8Auw+qFuVnChWjmxm/UhHWqNHZx+B99EwxTvGYmUBqe3Fjxs4L1BoZTJmPu6usVg== + dependencies: + "@csstools/convert-colors" "^1.4.0" + postcss "^7.0.2" + postcss-values-parser "^2.0.0" + +postcss-load-config@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.0.tgz#c84d692b7bb7b41ddced94ee62e8ab31b417b003" + integrity sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q== + dependencies: + cosmiconfig "^5.0.0" + import-cwd "^2.0.0" + +postcss-loader@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d" + integrity sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA== + dependencies: + loader-utils "^1.1.0" + postcss "^7.0.0" + postcss-load-config "^2.0.0" + schema-utils "^1.0.0" + +postcss-logical@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-3.0.0.tgz#2495d0f8b82e9f262725f75f9401b34e7b45d5b5" + integrity sha512-1SUKdJc2vuMOmeItqGuNaC+N8MzBWFWEkAnRnLpFYj1tGGa7NqyVBujfRtgNa2gXR+6RkGUiB2O5Vmh7E2RmiA== + dependencies: + postcss "^7.0.2" + +postcss-media-minmax@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/postcss-media-minmax/-/postcss-media-minmax-4.0.0.tgz#b75bb6cbc217c8ac49433e12f22048814a4f5ed5" + integrity sha512-fo9moya6qyxsjbFAYl97qKO9gyre3qvbMnkOZeZwlsW6XYFsvs2DMGDlchVLfAd8LHPZDxivu/+qW2SMQeTHBw== + dependencies: + postcss "^7.0.2" + +postcss-merge-longhand@^4.0.11: + version "4.0.11" + resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz#62f49a13e4a0ee04e7b98f42bb16062ca2549e24" + integrity sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw== + dependencies: + css-color-names "0.0.4" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + stylehacks "^4.0.0" + +postcss-merge-rules@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz#362bea4ff5a1f98e4075a713c6cb25aefef9a650" + integrity sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ== + dependencies: + browserslist "^4.0.0" + caniuse-api "^3.0.0" + cssnano-util-same-parent "^4.0.0" + postcss "^7.0.0" + postcss-selector-parser "^3.0.0" + vendors "^1.0.0" + +postcss-minify-font-values@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz#cd4c344cce474343fac5d82206ab2cbcb8afd5a6" + integrity sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg== + dependencies: + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-minify-gradients@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz#93b29c2ff5099c535eecda56c4aa6e665a663471" + integrity sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q== + dependencies: + cssnano-util-get-arguments "^4.0.0" + is-color-stop "^1.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-minify-params@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz#6b9cef030c11e35261f95f618c90036d680db874" + integrity sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg== + dependencies: + alphanum-sort "^1.0.0" + browserslist "^4.0.0" + cssnano-util-get-arguments "^4.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + uniqs "^2.0.0" + +postcss-minify-selectors@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz#e2e5eb40bfee500d0cd9243500f5f8ea4262fbd8" + integrity sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g== + dependencies: + alphanum-sort "^1.0.0" + has "^1.0.0" + postcss "^7.0.0" + postcss-selector-parser "^3.0.0" + +postcss-modules-extract-imports@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e" + integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ== + dependencies: + postcss "^7.0.5" + +postcss-modules-local-by-default@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz#e8a6561be914aaf3c052876377524ca90dbb7915" + integrity sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ== + dependencies: + icss-utils "^4.1.1" + postcss "^7.0.16" + postcss-selector-parser "^6.0.2" + postcss-value-parser "^4.0.0" + +postcss-modules-scope@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz#385cae013cc7743f5a7d7602d1073a89eaae62ee" + integrity sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ== + dependencies: + postcss "^7.0.6" + postcss-selector-parser "^6.0.0" + +postcss-modules-values@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz#5b5000d6ebae29b4255301b4a3a54574423e7f10" + integrity sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg== + dependencies: + icss-utils "^4.0.0" + postcss "^7.0.6" + +postcss-nesting@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-7.0.1.tgz#b50ad7b7f0173e5b5e3880c3501344703e04c052" + integrity sha512-FrorPb0H3nuVq0Sff7W2rnc3SmIcruVC6YwpcS+k687VxyxO33iE1amna7wHuRVzM8vfiYofXSBHNAZ3QhLvYg== + dependencies: + postcss "^7.0.2" + +postcss-normalize-charset@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz#8b35add3aee83a136b0471e0d59be58a50285dd4" + integrity sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g== + dependencies: + postcss "^7.0.0" + +postcss-normalize-display-values@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz#0dbe04a4ce9063d4667ed2be476bb830c825935a" + integrity sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ== + dependencies: + cssnano-util-get-match "^4.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-normalize-positions@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz#05f757f84f260437378368a91f8932d4b102917f" + integrity sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA== + dependencies: + cssnano-util-get-arguments "^4.0.0" + has "^1.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-normalize-repeat-style@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz#c4ebbc289f3991a028d44751cbdd11918b17910c" + integrity sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q== + dependencies: + cssnano-util-get-arguments "^4.0.0" + cssnano-util-get-match "^4.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-normalize-string@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz#cd44c40ab07a0c7a36dc5e99aace1eca4ec2690c" + integrity sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA== + dependencies: + has "^1.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-normalize-timing-functions@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz#8e009ca2a3949cdaf8ad23e6b6ab99cb5e7d28d9" + integrity sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A== + dependencies: + cssnano-util-get-match "^4.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-normalize-unicode@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz#841bd48fdcf3019ad4baa7493a3d363b52ae1cfb" + integrity sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg== + dependencies: + browserslist "^4.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-normalize-url@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz#10e437f86bc7c7e58f7b9652ed878daaa95faae1" + integrity sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA== + dependencies: + is-absolute-url "^2.0.0" + normalize-url "^3.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-normalize-whitespace@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz#bf1d4070fe4fcea87d1348e825d8cc0c5faa7d82" + integrity sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA== + dependencies: + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-ordered-values@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz#0cf75c820ec7d5c4d280189559e0b571ebac0eee" + integrity sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw== + dependencies: + cssnano-util-get-arguments "^4.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-overflow-shorthand@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-2.0.0.tgz#31ecf350e9c6f6ddc250a78f0c3e111f32dd4c30" + integrity sha512-aK0fHc9CBNx8jbzMYhshZcEv8LtYnBIRYQD5i7w/K/wS9c2+0NSR6B3OVMu5y0hBHYLcMGjfU+dmWYNKH0I85g== + dependencies: + postcss "^7.0.2" + +postcss-page-break@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/postcss-page-break/-/postcss-page-break-2.0.0.tgz#add52d0e0a528cabe6afee8b46e2abb277df46bf" + integrity sha512-tkpTSrLpfLfD9HvgOlJuigLuk39wVTbbd8RKcy8/ugV2bNBUW3xU+AIqyxhDrQr1VUj1RmyJrBn1YWrqUm9zAQ== + dependencies: + postcss "^7.0.2" + +postcss-place@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-4.0.1.tgz#e9f39d33d2dc584e46ee1db45adb77ca9d1dcc62" + integrity sha512-Zb6byCSLkgRKLODj/5mQugyuj9bvAAw9LqJJjgwz5cYryGeXfFZfSXoP1UfveccFmeq0b/2xxwcTEVScnqGxBg== + dependencies: + postcss "^7.0.2" + postcss-values-parser "^2.0.0" + +postcss-preset-env@^6.7.0: + version "6.7.0" + resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-6.7.0.tgz#c34ddacf8f902383b35ad1e030f178f4cdf118a5" + integrity sha512-eU4/K5xzSFwUFJ8hTdTQzo2RBLbDVt83QZrAvI07TULOkmyQlnYlpwep+2yIK+K+0KlZO4BvFcleOCCcUtwchg== + dependencies: + autoprefixer "^9.6.1" + browserslist "^4.6.4" + caniuse-lite "^1.0.30000981" + css-blank-pseudo "^0.1.4" + css-has-pseudo "^0.10.0" + css-prefers-color-scheme "^3.1.1" + cssdb "^4.4.0" + postcss "^7.0.17" + postcss-attribute-case-insensitive "^4.0.1" + postcss-color-functional-notation "^2.0.1" + postcss-color-gray "^5.0.0" + postcss-color-hex-alpha "^5.0.3" + postcss-color-mod-function "^3.0.3" + postcss-color-rebeccapurple "^4.0.1" + postcss-custom-media "^7.0.8" + postcss-custom-properties "^8.0.11" + postcss-custom-selectors "^5.1.2" + postcss-dir-pseudo-class "^5.0.0" + postcss-double-position-gradients "^1.0.0" + postcss-env-function "^2.0.2" + postcss-focus-visible "^4.0.0" + postcss-focus-within "^3.0.0" + postcss-font-variant "^4.0.0" + postcss-gap-properties "^2.0.0" + postcss-image-set-function "^3.0.1" + postcss-initial "^3.0.0" + postcss-lab-function "^2.0.1" + postcss-logical "^3.0.0" + postcss-media-minmax "^4.0.0" + postcss-nesting "^7.0.0" + postcss-overflow-shorthand "^2.0.0" + postcss-page-break "^2.0.0" + postcss-place "^4.0.1" + postcss-pseudo-class-any-link "^6.0.0" + postcss-replace-overflow-wrap "^3.0.0" + postcss-selector-matches "^4.0.0" + postcss-selector-not "^4.0.0" + +postcss-pseudo-class-any-link@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-6.0.0.tgz#2ed3eed393b3702879dec4a87032b210daeb04d1" + integrity sha512-lgXW9sYJdLqtmw23otOzrtbDXofUdfYzNm4PIpNE322/swES3VU9XlXHeJS46zT2onFO7V1QFdD4Q9LiZj8mew== + dependencies: + postcss "^7.0.2" + postcss-selector-parser "^5.0.0-rc.3" + +postcss-reduce-initial@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz#7fd42ebea5e9c814609639e2c2e84ae270ba48df" + integrity sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA== + dependencies: + browserslist "^4.0.0" + caniuse-api "^3.0.0" + has "^1.0.0" + postcss "^7.0.0" + +postcss-reduce-transforms@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz#17efa405eacc6e07be3414a5ca2d1074681d4e29" + integrity sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg== + dependencies: + cssnano-util-get-match "^4.0.0" + has "^1.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-replace-overflow-wrap@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-3.0.0.tgz#61b360ffdaedca84c7c918d2b0f0d0ea559ab01c" + integrity sha512-2T5hcEHArDT6X9+9dVSPQdo7QHzG4XKclFT8rU5TzJPDN7RIRTbO9c4drUISOVemLj03aezStHCR2AIcr8XLpw== + dependencies: + postcss "^7.0.2" + +postcss-safe-parser@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz#a6d4e48f0f37d9f7c11b2a581bf00f8ba4870b96" + integrity sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g== + dependencies: + postcss "^7.0.26" + +postcss-selector-matches@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/postcss-selector-matches/-/postcss-selector-matches-4.0.0.tgz#71c8248f917ba2cc93037c9637ee09c64436fcff" + integrity sha512-LgsHwQR/EsRYSqlwdGzeaPKVT0Ml7LAT6E75T8W8xLJY62CE4S/l03BWIt3jT8Taq22kXP08s2SfTSzaraoPww== + dependencies: + balanced-match "^1.0.0" + postcss "^7.0.2" + +postcss-selector-not@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-4.0.0.tgz#c68ff7ba96527499e832724a2674d65603b645c0" + integrity sha512-W+bkBZRhqJaYN8XAnbbZPLWMvZD1wKTu0UxtFKdhtGjWYmxhkUneoeOhRJKdAE5V7ZTlnbHfCR+6bNwK9e1dTQ== + dependencies: + balanced-match "^1.0.0" + postcss "^7.0.2" + +postcss-selector-parser@^3.0.0: + version "3.1.2" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz#b310f5c4c0fdaf76f94902bbaa30db6aa84f5270" + integrity sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA== + dependencies: + dot-prop "^5.2.0" + indexes-of "^1.0.1" + uniq "^1.0.1" + +postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4: + version "5.0.0" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz#249044356697b33b64f1a8f7c80922dddee7195c" + integrity sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ== + dependencies: + cssesc "^2.0.0" + indexes-of "^1.0.1" + uniq "^1.0.1" + +postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c" + integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg== + dependencies: + cssesc "^3.0.0" + indexes-of "^1.0.1" + uniq "^1.0.1" + +postcss-svgo@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.2.tgz#17b997bc711b333bab143aaed3b8d3d6e3d38258" + integrity sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw== + dependencies: + is-svg "^3.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + svgo "^1.0.0" + +postcss-unique-selectors@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz#9446911f3289bfd64c6d680f073c03b1f9ee4bac" + integrity sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg== + dependencies: + alphanum-sort "^1.0.0" + postcss "^7.0.0" + uniqs "^2.0.0" + +postcss-value-parser@^3.0.0, postcss-value-parser@^3.2.3: + version "3.3.1" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" + integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== + +postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.0.3, postcss-value-parser@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" + integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== + +postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz#da8b472d901da1e205b47bdc98637b9e9e550e5f" + integrity sha512-2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg== + dependencies: + flatten "^1.0.2" + indexes-of "^1.0.1" + uniq "^1.0.1" + +postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.30, postcss@^7.0.5, postcss@^7.0.6: + version "7.0.32" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d" + integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw== + dependencies: + chalk "^2.4.2" + source-map "^0.6.1" + supports-color "^6.1.0" + +prepend-http@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" + integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= + +private@^0.1.8: + version "0.1.8" + resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" + integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg== + +process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + +process@^0.11.10: + version "0.11.10" + resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" + integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI= + +promise-inflight@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" + integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM= + +proxy-addr@~2.0.5: + version "2.0.6" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf" + integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw== + dependencies: + forwarded "~0.1.2" + ipaddr.js "1.9.1" + +prr@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" + integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY= + +pseudomap@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" + integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= + +psl@^1.1.28: + version "1.8.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" + integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== + +public-encrypt@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0" + integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q== + dependencies: + bn.js "^4.1.0" + browserify-rsa "^4.0.0" + create-hash "^1.1.0" + parse-asn1 "^5.0.0" + randombytes "^2.0.1" + safe-buffer "^5.1.2" + +pump@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" + integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +pumpify@^1.3.3: + version "1.5.1" + resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce" + integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ== + dependencies: + duplexify "^3.6.0" + inherits "^2.0.3" + pump "^2.0.0" + +punycode@1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" + integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= + +punycode@^1.2.4: + version "1.4.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" + integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= + +punycode@^2.1.0, punycode@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + +q@^1.1.2: + version "1.5.1" + resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" + integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= + +qs@6.7.0: + version "6.7.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" + integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== + +qs@~6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" + integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== + +query-string@^4.1.0: + version "4.3.4" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb" + integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s= + dependencies: + object-assign "^4.1.0" + strict-uri-encode "^1.0.0" + +querystring-es3@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" + integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM= + +querystring@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" + integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= + +querystringify@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e" + integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA== + +randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" + integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== + dependencies: + safe-buffer "^5.1.0" + +randomfill@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458" + integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw== + dependencies: + randombytes "^2.0.5" + safe-buffer "^5.1.0" + +range-parser@^1.2.1, range-parser@~1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== + +raw-body@2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" + integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== + dependencies: + bytes "3.1.0" + http-errors "1.7.2" + iconv-lite "0.4.24" + unpipe "1.0.0" + +read-cache@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" + integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q= + dependencies: + pify "^2.3.0" + +read-pkg-up@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" + integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI= + dependencies: + find-up "^1.0.0" + read-pkg "^1.0.0" + +read-pkg@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" + integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg= + dependencies: + load-json-file "^1.0.0" + normalize-package-data "^2.3.2" + path-type "^1.0.0" + +"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +readable-stream@^3.0.6, readable-stream@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +readdirp@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" + integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ== + dependencies: + graceful-fs "^4.1.11" + micromatch "^3.1.10" + readable-stream "^2.0.2" + +readdirp@~3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz#9fdccdf9e9155805449221ac645e8303ab5b9ada" + integrity sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ== + dependencies: + picomatch "^2.2.1" + +redent@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde" + integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94= + dependencies: + indent-string "^2.1.0" + strip-indent "^1.0.1" + +regenerate-unicode-properties@^8.2.0: + version "8.2.0" + resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec" + integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA== + dependencies: + regenerate "^1.4.0" + +regenerate@^1.4.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.1.tgz#cad92ad8e6b591773485fbe05a485caf4f457e6f" + integrity sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A== + +regenerator-runtime@^0.13.3, regenerator-runtime@^0.13.4: + version "0.13.5" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697" + integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA== + +regenerator-transform@^0.14.2: + version "0.14.4" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7" + integrity sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw== + dependencies: + "@babel/runtime" "^7.8.4" + private "^0.1.8" + +regex-not@^1.0.0, regex-not@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" + integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== + dependencies: + extend-shallow "^3.0.2" + safe-regex "^1.1.0" + +regexp.prototype.flags@^1.2.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75" + integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + +regexpu-core@^4.7.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938" + integrity sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ== + dependencies: + regenerate "^1.4.0" + regenerate-unicode-properties "^8.2.0" + regjsgen "^0.5.1" + regjsparser "^0.6.4" + unicode-match-property-ecmascript "^1.0.4" + unicode-match-property-value-ecmascript "^1.2.0" + +regjsgen@^0.5.1: + version "0.5.2" + resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733" + integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A== + +regjsparser@^0.6.4: + version "0.6.4" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272" + integrity sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw== + dependencies: + jsesc "~0.5.0" + +remove-trailing-separator@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" + integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= + +repeat-element@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" + integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g== + +repeat-string@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= + +repeating@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" + integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo= + dependencies: + is-finite "^1.0.0" + +request@^2.87.0, request@^2.88.0: + version "2.88.2" + resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" + integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.8.0" + caseless "~0.12.0" + combined-stream "~1.0.6" + extend "~3.0.2" + forever-agent "~0.6.1" + form-data "~2.3.2" + har-validator "~5.1.3" + http-signature "~1.2.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.19" + oauth-sign "~0.9.0" + performance-now "^2.1.0" + qs "~6.5.2" + safe-buffer "^5.1.2" + tough-cookie "~2.5.0" + tunnel-agent "^0.6.0" + uuid "^3.3.2" + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= + +require-main-filename@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" + integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== + +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= + +resolve-cwd@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a" + integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo= + dependencies: + resolve-from "^3.0.0" + +resolve-dir@^1.0.0, resolve-dir@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43" + integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M= + dependencies: + expand-tilde "^2.0.0" + global-modules "^1.0.0" + +resolve-from@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" + integrity sha1-six699nWiBvItuZTM17rywoYh0g= + +resolve-from@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== + +resolve-url@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" + integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= + +resolve@^1.1.7, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.3.2, resolve@^1.8.1: + version "1.17.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444" + integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== + dependencies: + path-parse "^1.0.6" + +ret@~0.1.10: + version "0.1.15" + resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" + integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== + +retry@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" + integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs= + +rgb-regex@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1" + integrity sha1-wODWiC3w4jviVKR16O3UGRX+rrE= + +rgba-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" + integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= + +rimraf@2, rimraf@^2.5.4, rimraf@^2.6.3, rimraf@^2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + +ripemd160@^2.0.0, ripemd160@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c" + integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA== + dependencies: + hash-base "^3.0.0" + inherits "^2.0.1" + +run-queue@^1.0.0, run-queue@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47" + integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec= + dependencies: + aproba "^1.1.1" + +safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + +safe-regex@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" + integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4= + dependencies: + ret "~0.1.10" + +"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +sass-graph@2.2.5: + version "2.2.5" + resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.5.tgz#a981c87446b8319d96dce0671e487879bd24c2e8" + integrity sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag== + dependencies: + glob "^7.0.0" + lodash "^4.0.0" + scss-tokenizer "^0.2.3" + yargs "^13.3.2" + +sass-loader@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.3.1.tgz#a5bf68a04bcea1c13ff842d747150f7ab7d0d23f" + integrity sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA== + dependencies: + clone-deep "^4.0.1" + loader-utils "^1.0.1" + neo-async "^2.5.0" + pify "^4.0.1" + semver "^6.3.0" + +sax@~1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== + +schema-utils@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770" + integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g== + dependencies: + ajv "^6.1.0" + ajv-errors "^1.0.0" + ajv-keywords "^3.1.0" + +schema-utils@^2.5.0, schema-utils@^2.6.1, schema-utils@^2.6.5, schema-utils@^2.6.6: + version "2.7.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" + integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A== + dependencies: + "@types/json-schema" "^7.0.4" + ajv "^6.12.2" + ajv-keywords "^3.4.1" + +scss-tokenizer@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" + integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE= + dependencies: + js-base64 "^2.1.8" + source-map "^0.4.2" + +select-hose@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" + integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= + +selfsigned@^1.10.7: + version "1.10.7" + resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.7.tgz#da5819fd049d5574f28e88a9bcc6dbc6e6f3906b" + integrity sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA== + dependencies: + node-forge "0.9.0" + +"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + +semver@7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" + integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== + +semver@^6.0.0, semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + +semver@~5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" + integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8= + +send@0.17.1: + version "0.17.1" + resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" + integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== + dependencies: + debug "2.6.9" + depd "~1.1.2" + destroy "~1.0.4" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + fresh "0.5.2" + http-errors "~1.7.2" + mime "1.6.0" + ms "2.1.1" + on-finished "~2.3.0" + range-parser "~1.2.1" + statuses "~1.5.0" + +serialize-javascript@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61" + integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ== + +serialize-javascript@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.1.0.tgz#8bf3a9170712664ef2561b44b691eafe399214ea" + integrity sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg== + dependencies: + randombytes "^2.1.0" + +serve-index@^1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" + integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk= + dependencies: + accepts "~1.3.4" + batch "0.6.1" + debug "2.6.9" + escape-html "~1.0.3" + http-errors "~1.6.2" + mime-types "~2.1.17" + parseurl "~1.3.2" + +serve-static@1.14.1: + version "1.14.1" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" + integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== + dependencies: + encodeurl "~1.0.2" + escape-html "~1.0.3" + parseurl "~1.3.3" + send "0.17.1" + +set-blocking@^2.0.0, set-blocking@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= + +set-value@^2.0.0, set-value@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" + integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.3" + split-string "^3.0.1" + +setimmediate@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" + integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= + +setprototypeof@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" + integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ== + +setprototypeof@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" + integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== + +sha.js@^2.4.0, sha.js@^2.4.8: + version "2.4.11" + resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" + integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ== + dependencies: + inherits "^2.0.1" + safe-buffer "^5.0.1" + +shallow-clone@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" + integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== + dependencies: + kind-of "^6.0.2" + +shebang-command@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" + integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= + dependencies: + shebang-regex "^1.0.0" + +shebang-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" + integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= + +signal-exit@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" + integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== + +simple-swizzle@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" + integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo= + dependencies: + is-arrayish "^0.3.1" + +snapdragon-node@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" + integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw== + dependencies: + define-property "^1.0.0" + isobject "^3.0.0" + snapdragon-util "^3.0.1" + +snapdragon-util@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" + integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ== + dependencies: + kind-of "^3.2.0" + +snapdragon@^0.8.1: + version "0.8.2" + resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" + integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg== + dependencies: + base "^0.11.1" + debug "^2.2.0" + define-property "^0.2.5" + extend-shallow "^2.0.1" + map-cache "^0.2.2" + source-map "^0.5.6" + source-map-resolve "^0.5.0" + use "^3.1.0" + +sockjs-client@1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz#c9f2568e19c8fd8173b4997ea3420e0bb306c7d5" + integrity sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g== + dependencies: + debug "^3.2.5" + eventsource "^1.0.7" + faye-websocket "~0.11.1" + inherits "^2.0.3" + json3 "^3.3.2" + url-parse "^1.4.3" + +sockjs@0.3.20: + version "0.3.20" + resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz#b26a283ec562ef8b2687b44033a4eeceac75d855" + integrity sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA== + dependencies: + faye-websocket "^0.10.0" + uuid "^3.4.0" + websocket-driver "0.6.5" + +sort-keys@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" + integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0= + dependencies: + is-plain-obj "^1.0.0" + +source-list-map@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" + integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== + +source-map-resolve@^0.5.0: + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" + integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== + dependencies: + atob "^2.1.2" + decode-uri-component "^0.2.0" + resolve-url "^0.2.1" + source-map-url "^0.4.0" + urix "^0.1.0" + +source-map-support@~0.5.12: + version "0.5.19" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" + integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map-url@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" + integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= + +source-map@^0.4.2: + version "0.4.4" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" + integrity sha1-66T12pwNyZneaAMti092FzZSA2s= + dependencies: + amdefine ">=0.0.4" + +source-map@^0.5.0, source-map@^0.5.6: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + +source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +spark-md5@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.1.tgz#83a0e255734f2ab4e5c466e5a2cfc9ba2aa2124d" + integrity sha512-0tF3AGSD1ppQeuffsLDIOWlKUd3lS92tFxcsrh5Pe3ZphhnoK+oXIBTzOAThZCiuINZLvpiLH/1VS1/ANEJVig== + +spdx-correct@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" + integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w== + dependencies: + spdx-expression-parse "^3.0.0" + spdx-license-ids "^3.0.0" + +spdx-exceptions@^2.1.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" + integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== + +spdx-expression-parse@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" + integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== + dependencies: + spdx-exceptions "^2.1.0" + spdx-license-ids "^3.0.0" + +spdx-license-ids@^3.0.0: + version "3.0.5" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654" + integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q== + +spdy-transport@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" + integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw== + dependencies: + debug "^4.1.0" + detect-node "^2.0.4" + hpack.js "^2.1.6" + obuf "^1.1.2" + readable-stream "^3.0.6" + wbuf "^1.7.3" + +spdy@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" + integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA== + dependencies: + debug "^4.1.0" + handle-thing "^2.0.0" + http-deceiver "^1.2.7" + select-hose "^2.0.0" + spdy-transport "^3.0.0" + +split-string@^3.0.1, split-string@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" + integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== + dependencies: + extend-shallow "^3.0.0" + +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + +sshpk@^1.7.0: + version "1.16.1" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" + integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg== + dependencies: + asn1 "~0.2.3" + assert-plus "^1.0.0" + bcrypt-pbkdf "^1.0.0" + dashdash "^1.12.0" + ecc-jsbn "~0.1.1" + getpass "^0.1.1" + jsbn "~0.1.0" + safer-buffer "^2.0.2" + tweetnacl "~0.14.0" + +ssri@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8" + integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA== + dependencies: + figgy-pudding "^3.5.1" + +ssri@^7.0.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-7.1.0.tgz#92c241bf6de82365b5c7fb4bd76e975522e1294d" + integrity sha512-77/WrDZUWocK0mvA5NTRQyveUf+wsrIc6vyrxpS8tVvYBcX215QbafrJR3KtkpskIzoFLqqNuuYQvxaMjXJ/0g== + dependencies: + figgy-pudding "^3.5.1" + minipass "^3.1.1" + +stable@^0.1.8: + version "0.1.8" + resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" + integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== + +static-extend@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" + integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY= + dependencies: + define-property "^0.2.5" + object-copy "^0.1.0" + +"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= + +stdout-stream@^1.4.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de" + integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA== + dependencies: + readable-stream "^2.0.1" + +stream-browserify@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b" + integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg== + dependencies: + inherits "~2.0.1" + readable-stream "^2.0.2" + +stream-each@^1.1.0: + version "1.2.3" + resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae" + integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw== + dependencies: + end-of-stream "^1.1.0" + stream-shift "^1.0.0" + +stream-http@^2.7.2: + version "2.8.3" + resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc" + integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw== + dependencies: + builtin-status-codes "^3.0.0" + inherits "^2.0.1" + readable-stream "^2.3.6" + to-arraybuffer "^1.0.0" + xtend "^4.0.0" + +stream-shift@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" + integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== + +strict-uri-encode@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" + integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM= + +string-width@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +"string-width@^1.0.2 || 2": + version "2.1.1" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" + integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== + dependencies: + is-fullwidth-code-point "^2.0.0" + strip-ansi "^4.0.0" + +string-width@^3.0.0, string-width@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" + integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== + dependencies: + emoji-regex "^7.0.1" + is-fullwidth-code-point "^2.0.0" + strip-ansi "^5.1.0" + +string.prototype.trimend@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913" + integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + +string.prototype.trimleft@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc" + integrity sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + string.prototype.trimstart "^1.0.0" + +string.prototype.trimright@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3" + integrity sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + string.prototype.trimend "^1.0.0" + +string.prototype.trimstart@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54" + integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + +string_decoder@^1.0.0, string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + +strip-ansi@^3.0.0, strip-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + dependencies: + ansi-regex "^2.0.0" + +strip-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= + dependencies: + ansi-regex "^3.0.0" + +strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" + integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== + dependencies: + ansi-regex "^4.1.0" + +strip-bom@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" + integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4= + dependencies: + is-utf8 "^0.2.0" + +strip-eof@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" + integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= + +strip-indent@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" + integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI= + dependencies: + get-stdin "^4.0.1" + +style-loader@^1.0.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.2.1.tgz#c5cbbfbf1170d076cfdd86e0109c5bba114baa1a" + integrity sha512-ByHSTQvHLkWE9Ir5+lGbVOXhxX10fbprhLvdg96wedFZb4NDekDPxVKv5Fwmio+QcMlkkNfuK+5W1peQ5CUhZg== + dependencies: + loader-utils "^2.0.0" + schema-utils "^2.6.6" + +stylehacks@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5" + integrity sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g== + dependencies: + browserslist "^4.0.0" + postcss "^7.0.0" + postcss-selector-parser "^3.0.0" + +supports-color@6.1.0, supports-color@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" + integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== + dependencies: + has-flag "^3.0.0" + +supports-color@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= + +supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + +supports-color@^7.0.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" + integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g== + dependencies: + has-flag "^4.0.0" + +svgo@^1.0.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167" + integrity sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw== + dependencies: + chalk "^2.4.1" + coa "^2.0.2" + css-select "^2.0.0" + css-select-base-adapter "^0.1.1" + css-tree "1.0.0-alpha.37" + csso "^4.0.2" + js-yaml "^3.13.1" + mkdirp "~0.5.1" + object.values "^1.1.0" + sax "~1.2.4" + stable "^0.1.8" + unquote "~1.1.1" + util.promisify "~1.0.0" + +tapable@^1.0.0, tapable@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" + integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== + +tar@^2.0.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40" + integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA== + dependencies: + block-stream "*" + fstream "^1.0.12" + inherits "2" + +terser-webpack-plugin@^1.4.3: + version "1.4.4" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.4.tgz#2c63544347324baafa9a56baaddf1634c8abfc2f" + integrity sha512-U4mACBHIegmfoEe5fdongHESNJWqsGU+W0S/9+BmYGVQDw1+c2Ow05TpMhxjPK1sRb7cuYq1BPl1e5YHJMTCqA== + dependencies: + cacache "^12.0.2" + find-cache-dir "^2.1.0" + is-wsl "^1.1.0" + schema-utils "^1.0.0" + serialize-javascript "^3.1.0" + source-map "^0.6.1" + terser "^4.1.2" + webpack-sources "^1.4.0" + worker-farm "^1.7.0" + +terser-webpack-plugin@^2.2.1: + version "2.3.7" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.7.tgz#4910ff5d1a872168cc7fa6cd3749e2b0d60a8a0b" + integrity sha512-xzYyaHUNhzgaAdBsXxk2Yvo/x1NJdslUaussK3fdpBbvttm1iIwU+c26dj9UxJcwk2c5UWt5F55MUTIA8BE7Dg== + dependencies: + cacache "^13.0.1" + find-cache-dir "^3.3.1" + jest-worker "^25.4.0" + p-limit "^2.3.0" + schema-utils "^2.6.6" + serialize-javascript "^3.1.0" + source-map "^0.6.1" + terser "^4.6.12" + webpack-sources "^1.4.3" + +terser@^4.1.2, terser@^4.6.12: + version "4.7.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.7.0.tgz#15852cf1a08e3256a80428e865a2fa893ffba006" + integrity sha512-Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw== + dependencies: + commander "^2.20.0" + source-map "~0.6.1" + source-map-support "~0.5.12" + +through2@^2.0.0: + version "2.0.5" + resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" + integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== + dependencies: + readable-stream "~2.3.6" + xtend "~4.0.1" + +thunky@^1.0.2: + version "1.1.0" + resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" + integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA== + +timers-browserify@^2.0.4: + version "2.0.11" + resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.11.tgz#800b1f3eee272e5bc53ee465a04d0e804c31211f" + integrity sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ== + dependencies: + setimmediate "^1.0.4" + +timsort@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" + integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= + +to-arraybuffer@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" + integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M= + +to-fast-properties@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= + +to-object-path@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" + integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= + dependencies: + kind-of "^3.0.2" + +to-regex-range@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" + integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= + dependencies: + is-number "^3.0.0" + repeat-string "^1.6.1" + +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + +to-regex@^3.0.1, to-regex@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" + integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw== + dependencies: + define-property "^2.0.2" + extend-shallow "^3.0.2" + regex-not "^1.0.2" + safe-regex "^1.1.0" + +toidentifier@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" + integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== + +tough-cookie@~2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" + integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== + dependencies: + psl "^1.1.28" + punycode "^2.1.1" + +trim-newlines@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" + integrity sha1-WIeWa7WCpFA6QetST301ARgVphM= + +"true-case-path@^1.0.2": + version "1.0.3" + resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d" + integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew== + dependencies: + glob "^7.1.2" + +ts-pnp@^1.1.6: + version "1.2.0" + resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92" + integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw== + +tslib@^1.9.0: + version "1.13.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" + integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q== + +tty-browserify@0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" + integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY= + +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= + dependencies: + safe-buffer "^5.0.1" + +turbolinks@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/turbolinks/-/turbolinks-5.2.0.tgz#e6877a55ea5c1cb3bb225f0a4ae303d6d32ff77c" + integrity sha512-pMiez3tyBo6uRHFNNZoYMmrES/IaGgMhQQM+VFF36keryjb5ms0XkVpmKHkfW/4Vy96qiGW3K9bz0tF5sK9bBw== + +tweetnacl@^0.14.3, tweetnacl@~0.14.0: + version "0.14.5" + resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" + integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= + +type-is@~1.6.17, type-is@~1.6.18: + version "1.6.18" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" + integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== + dependencies: + media-typer "0.3.0" + mime-types "~2.1.24" + +typedarray@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= + +unicode-canonical-property-names-ecmascript@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" + integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ== + +unicode-match-property-ecmascript@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c" + integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg== + dependencies: + unicode-canonical-property-names-ecmascript "^1.0.4" + unicode-property-aliases-ecmascript "^1.0.4" + +unicode-match-property-value-ecmascript@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531" + integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ== + +unicode-property-aliases-ecmascript@^1.0.4: + version "1.1.0" + resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4" + integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg== + +union-value@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" + integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== + dependencies: + arr-union "^3.1.0" + get-value "^2.0.6" + is-extendable "^0.1.1" + set-value "^2.0.1" + +uniq@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" + integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8= + +uniqs@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02" + integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI= + +unique-filename@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" + integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ== + dependencies: + unique-slug "^2.0.0" + +unique-slug@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c" + integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w== + dependencies: + imurmurhash "^0.1.4" + +unpipe@1.0.0, unpipe@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= + +unquote@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544" + integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ= + +unset-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" + integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk= + dependencies: + has-value "^0.3.1" + isobject "^3.0.0" + +upath@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" + integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== + +uri-js@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" + integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ== + dependencies: + punycode "^2.1.0" + +urix@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" + integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= + +url-parse@^1.4.3: + version "1.4.7" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278" + integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg== + dependencies: + querystringify "^2.1.1" + requires-port "^1.0.0" + +url@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" + integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= + dependencies: + punycode "1.3.2" + querystring "0.2.0" + +use@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" + integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== + +util-deprecate@^1.0.1, util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + +util.promisify@~1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee" + integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.2" + has-symbols "^1.0.1" + object.getownpropertydescriptors "^2.1.0" + +util@0.10.3: + version "0.10.3" + resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" + integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk= + dependencies: + inherits "2.0.1" + +util@^0.11.0: + version "0.11.1" + resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61" + integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ== + dependencies: + inherits "2.0.3" + +utils-merge@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= + +uuid@^3.3.2, uuid@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" + integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== + +v8-compile-cache@2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe" + integrity sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w== + +validate-npm-package-license@^3.0.1: + version "3.0.4" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" + integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== + dependencies: + spdx-correct "^3.0.0" + spdx-expression-parse "^3.0.0" + +vary@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" + integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= + +vendors@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e" + integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w== + +verror@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" + integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= + dependencies: + assert-plus "^1.0.0" + core-util-is "1.0.2" + extsprintf "^1.2.0" + +vm-browserify@^1.0.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" + integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== + +watchpack-chokidar2@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz#9948a1866cbbd6cb824dea13a7ed691f6c8ddff0" + integrity sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA== + dependencies: + chokidar "^2.1.8" + +watchpack@^1.6.1: + version "1.7.2" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.2.tgz#c02e4d4d49913c3e7e122c3325365af9d331e9aa" + integrity sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g== + dependencies: + graceful-fs "^4.1.2" + neo-async "^2.5.0" + optionalDependencies: + chokidar "^3.4.0" + watchpack-chokidar2 "^2.0.0" + +wbuf@^1.1.0, wbuf@^1.7.3: + version "1.7.3" + resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" + integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA== + dependencies: + minimalistic-assert "^1.0.0" + +webpack-assets-manifest@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/webpack-assets-manifest/-/webpack-assets-manifest-3.1.1.tgz#39bbc3bf2ee57fcd8ba07cda51c9ba4a3c6ae1de" + integrity sha512-JV9V2QKc5wEWQptdIjvXDUL1ucbPLH2f27toAY3SNdGZp+xSaStAgpoMcvMZmqtFrBc9a5pTS1058vxyMPOzRQ== + dependencies: + chalk "^2.0" + lodash.get "^4.0" + lodash.has "^4.0" + mkdirp "^0.5" + schema-utils "^1.0.0" + tapable "^1.0.0" + webpack-sources "^1.0.0" + +webpack-cli@^3.3.10: + version "3.3.11" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.11.tgz#3bf21889bf597b5d82c38f215135a411edfdc631" + integrity sha512-dXlfuml7xvAFwYUPsrtQAA9e4DOe58gnzSxhgrO/ZM/gyXTBowrsYeubyN4mqGhYdpXMFNyQ6emjJS9M7OBd4g== + dependencies: + chalk "2.4.2" + cross-spawn "6.0.5" + enhanced-resolve "4.1.0" + findup-sync "3.0.0" + global-modules "2.0.0" + import-local "2.0.0" + interpret "1.2.0" + loader-utils "1.2.3" + supports-color "6.1.0" + v8-compile-cache "2.0.3" + yargs "13.2.4" + +webpack-dev-middleware@^3.7.2: + version "3.7.2" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz#0019c3db716e3fa5cecbf64f2ab88a74bab331f3" + integrity sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw== + dependencies: + memory-fs "^0.4.1" + mime "^2.4.4" + mkdirp "^0.5.1" + range-parser "^1.2.1" + webpack-log "^2.0.0" + +webpack-dev-server@^3.11.0: + version "3.11.0" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz#8f154a3bce1bcfd1cc618ef4e703278855e7ff8c" + integrity sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg== + dependencies: + ansi-html "0.0.7" + bonjour "^3.5.0" + chokidar "^2.1.8" + compression "^1.7.4" + connect-history-api-fallback "^1.6.0" + debug "^4.1.1" + del "^4.1.1" + express "^4.17.1" + html-entities "^1.3.1" + http-proxy-middleware "0.19.1" + import-local "^2.0.0" + internal-ip "^4.3.0" + ip "^1.1.5" + is-absolute-url "^3.0.3" + killable "^1.0.1" + loglevel "^1.6.8" + opn "^5.5.0" + p-retry "^3.0.1" + portfinder "^1.0.26" + schema-utils "^1.0.0" + selfsigned "^1.10.7" + semver "^6.3.0" + serve-index "^1.9.1" + sockjs "0.3.20" + sockjs-client "1.4.0" + spdy "^4.0.2" + strip-ansi "^3.0.1" + supports-color "^6.1.0" + url "^0.11.0" + webpack-dev-middleware "^3.7.2" + webpack-log "^2.0.0" + ws "^6.2.1" + yargs "^13.3.2" + +webpack-log@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f" + integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg== + dependencies: + ansi-colors "^3.0.0" + uuid "^3.3.2" + +webpack-sources@^1.0.0, webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" + integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== + dependencies: + source-list-map "^2.0.0" + source-map "~0.6.1" + +webpack@^4.41.2: + version "4.43.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.43.0.tgz#c48547b11d563224c561dad1172c8aa0b8a678e6" + integrity sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-module-context" "1.9.0" + "@webassemblyjs/wasm-edit" "1.9.0" + "@webassemblyjs/wasm-parser" "1.9.0" + acorn "^6.4.1" + ajv "^6.10.2" + ajv-keywords "^3.4.1" + chrome-trace-event "^1.0.2" + enhanced-resolve "^4.1.0" + eslint-scope "^4.0.3" + json-parse-better-errors "^1.0.2" + loader-runner "^2.4.0" + loader-utils "^1.2.3" + memory-fs "^0.4.1" + micromatch "^3.1.10" + mkdirp "^0.5.3" + neo-async "^2.6.1" + node-libs-browser "^2.2.1" + schema-utils "^1.0.0" + tapable "^1.1.3" + terser-webpack-plugin "^1.4.3" + watchpack "^1.6.1" + webpack-sources "^1.4.1" + +websocket-driver@0.6.5: + version "0.6.5" + resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36" + integrity sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY= + dependencies: + websocket-extensions ">=0.1.1" + +websocket-driver@>=0.5.1: + version "0.7.4" + resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" + integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== + dependencies: + http-parser-js ">=0.5.1" + safe-buffer ">=5.1.0" + websocket-extensions ">=0.1.1" + +websocket-extensions@>=0.1.1: + version "0.1.4" + resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" + integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== + +which-module@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" + integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= + +which@1, which@^1.2.14, which@^1.2.9, which@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== + dependencies: + isexe "^2.0.0" + +wide-align@^1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" + integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== + dependencies: + string-width "^1.0.2 || 2" + +worker-farm@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8" + integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw== + dependencies: + errno "~0.1.7" + +wrap-ansi@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" + integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q== + dependencies: + ansi-styles "^3.2.0" + string-width "^3.0.0" + strip-ansi "^5.0.0" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +ws@^6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb" + integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA== + dependencies: + async-limiter "~1.0.0" + +xtend@^4.0.0, xtend@~4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== + +y18n@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" + integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== + +yallist@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" + integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= + +yallist@^3.0.2: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" + integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yaml@^1.7.2: + version "1.10.0" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e" + integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg== + +yargs-parser@^13.1.0, yargs-parser@^13.1.2: + version "13.1.2" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" + integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + +yargs@13.2.4: + version "13.2.4" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83" + integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg== + dependencies: + cliui "^5.0.0" + find-up "^3.0.0" + get-caller-file "^2.0.1" + os-locale "^3.1.0" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^3.0.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^13.1.0" + +yargs@^13.3.2: + version "13.3.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" + integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw== + dependencies: + cliui "^5.0.0" + find-up "^3.0.0" + get-caller-file "^2.0.1" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^3.0.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^13.1.2" From 761bfdb4bc6b2067c9d136d90c938ca5872424f0 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 9 Jun 2020 17:15:14 -0700 Subject: [PATCH 002/350] generated Pages controller --- app/assets/stylesheets/pages.scss | 3 +++ app/controllers/pages_controller.rb | 5 +++++ app/helpers/pages_helper.rb | 2 ++ test/controllers/pages_controller_test.rb | 7 +++++++ 4 files changed, 17 insertions(+) create mode 100644 app/assets/stylesheets/pages.scss create mode 100644 app/controllers/pages_controller.rb create mode 100644 app/helpers/pages_helper.rb create mode 100644 test/controllers/pages_controller_test.rb diff --git a/app/assets/stylesheets/pages.scss b/app/assets/stylesheets/pages.scss new file mode 100644 index 0000000000..2962555127 --- /dev/null +++ b/app/assets/stylesheets/pages.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Pages controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: https://sass-lang.com/ diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb new file mode 100644 index 0000000000..53e2337985 --- /dev/null +++ b/app/controllers/pages_controller.rb @@ -0,0 +1,5 @@ +class PagesController < ApplicationController + def index + + end +end diff --git a/app/helpers/pages_helper.rb b/app/helpers/pages_helper.rb new file mode 100644 index 0000000000..2c057fd054 --- /dev/null +++ b/app/helpers/pages_helper.rb @@ -0,0 +1,2 @@ +module PagesHelper +end diff --git a/test/controllers/pages_controller_test.rb b/test/controllers/pages_controller_test.rb new file mode 100644 index 0000000000..3120874cc7 --- /dev/null +++ b/test/controllers/pages_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe PagesController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 3608ff5865643eddbb625cf6c9a1e92473bc8c2f Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Tue, 9 Jun 2020 18:06:49 -0700 Subject: [PATCH 003/350] Generated review controller and updated routes file --- app/assets/stylesheets/reviews.scss | 3 ++ app/controllers/reviews_controller.rb | 10 +++++++ app/helpers/reviews_helper.rb | 2 ++ config/routes.rb | 31 +++++++++++++++++++++ test/controllers/reviews_controller_test.rb | 7 +++++ 5 files changed, 53 insertions(+) create mode 100644 app/assets/stylesheets/reviews.scss create mode 100644 app/controllers/reviews_controller.rb create mode 100644 app/helpers/reviews_helper.rb create mode 100644 test/controllers/reviews_controller_test.rb diff --git a/app/assets/stylesheets/reviews.scss b/app/assets/stylesheets/reviews.scss new file mode 100644 index 0000000000..6457abefb6 --- /dev/null +++ b/app/assets/stylesheets/reviews.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Reviews controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: https://sass-lang.com/ diff --git a/app/controllers/reviews_controller.rb b/app/controllers/reviews_controller.rb new file mode 100644 index 0000000000..115cbcfeaa --- /dev/null +++ b/app/controllers/reviews_controller.rb @@ -0,0 +1,10 @@ +class ReviewsController < ApplicationController + + def new + @review = Review.new + end + + def create + # do stuff + end +end diff --git a/app/helpers/reviews_helper.rb b/app/helpers/reviews_helper.rb new file mode 100644 index 0000000000..682b7b1abc --- /dev/null +++ b/app/helpers/reviews_helper.rb @@ -0,0 +1,2 @@ +module ReviewsHelper +end diff --git a/config/routes.rb b/config/routes.rb index c06383a172..e2c4db1a69 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,34 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + resources :reviews, only: [:new, :create] end diff --git a/test/controllers/reviews_controller_test.rb b/test/controllers/reviews_controller_test.rb new file mode 100644 index 0000000000..444c98848f --- /dev/null +++ b/test/controllers/reviews_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe ReviewsController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From b1aaf87140cad8f2bc88a59d1ea92d66db0ef4d4 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Tue, 9 Jun 2020 18:07:26 -0700 Subject: [PATCH 004/350] Generated review model --- app/models/review.rb | 2 ++ db/migrate/20200610003245_create_reviews.rb | 10 ++++++++++ test/models/review_test.rb | 7 +++++++ 3 files changed, 19 insertions(+) create mode 100644 app/models/review.rb create mode 100644 db/migrate/20200610003245_create_reviews.rb create mode 100644 test/models/review_test.rb 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/20200610003245_create_reviews.rb b/db/migrate/20200610003245_create_reviews.rb new file mode 100644 index 0000000000..3dba803ace --- /dev/null +++ b/db/migrate/20200610003245_create_reviews.rb @@ -0,0 +1,10 @@ +class CreateReviews < ActiveRecord::Migration[6.0] + def change + create_table :reviews do |t| + t.string :content + t.integer :rating, default: 1 + + t.timestamps + end + end +end diff --git a/test/models/review_test.rb b/test/models/review_test.rb new file mode 100644 index 0000000000..626fa522d8 --- /dev/null +++ b/test/models/review_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Review do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 27c692e5fb745dc1fe3906c1c3fc9cd681cf4f32 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 9 Jun 2020 18:15:29 -0700 Subject: [PATCH 005/350] added pages#index action and set homepage default --- config/routes.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index c06383a172..80cafbeed4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,6 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html + root to: "pages#index" + + resources :pages only[:index] end From 7bd1dfc3f0320bc6ce0b01ea55742ba71c174fd5 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 9 Jun 2020 18:23:04 -0700 Subject: [PATCH 006/350] set homepage default and added pages#index route --- config/routes.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 80cafbeed4..0003d1530a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,5 @@ Rails.application.routes.draw do - # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html root to: "pages#index" - resources :pages only[:index] + resources :pages, only: :index end From edf9e61121af735060fd703dbf3e9c858c59f4a1 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 9 Jun 2020 18:23:40 -0700 Subject: [PATCH 007/350] added barebones homepage --- app/assets/stylesheets/pages.scss | 19 +++++++++++++++++++ app/controllers/pages_controller.rb | 1 - app/views/pages/index.html.erb | 9 +++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 app/views/pages/index.html.erb diff --git a/app/assets/stylesheets/pages.scss b/app/assets/stylesheets/pages.scss index 2962555127..deff538233 100644 --- a/app/assets/stylesheets/pages.scss +++ b/app/assets/stylesheets/pages.scss @@ -1,3 +1,22 @@ // Place all the styles related to the Pages controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: https://sass-lang.com/ + +// Fonts +@import url('https://fonts.googleapis.com/css2?family=Old+Standard+TT:ital,wght@0,400;0,700;1,400&display=swap'); + +.homepage { + font-family: 'Old Standard TT', serif; + text-align: center; +} + +.homepage-header { + font-weight: 700; + font-size: 90px; +} + +.homepage-byline { + font-weight: 400; + font-style: italic; + color: #7f7f7f; +} \ No newline at end of file diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 53e2337985..39848c624f 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -1,5 +1,4 @@ class PagesController < ApplicationController def index - end end diff --git a/app/views/pages/index.html.erb b/app/views/pages/index.html.erb new file mode 100644 index 0000000000..1b24e86e5a --- /dev/null +++ b/app/views/pages/index.html.erb @@ -0,0 +1,9 @@ +
+
+ Outdoorsy +
+ +
+

Shop for a piece of the outdoors regardless of your budget

+
+
\ No newline at end of file From 3ee410b51ee8597807b4129d6471e135c18ce2f1 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Tue, 9 Jun 2020 18:28:06 -0700 Subject: [PATCH 008/350] Generated Categories controller and updated routes. --- app/assets/stylesheets/categories.scss | 3 +++ app/controllers/categories_controller.rb | 27 +++++++++++++++++++ app/helpers/categories_helper.rb | 2 ++ config/routes.rb | 18 +++++++++++++ .../controllers/categories_controller_test.rb | 7 +++++ 5 files changed, 57 insertions(+) create mode 100644 app/assets/stylesheets/categories.scss create mode 100644 app/controllers/categories_controller.rb create mode 100644 app/helpers/categories_helper.rb create mode 100644 test/controllers/categories_controller_test.rb diff --git a/app/assets/stylesheets/categories.scss b/app/assets/stylesheets/categories.scss new file mode 100644 index 0000000000..068dd1a3b9 --- /dev/null +++ b/app/assets/stylesheets/categories.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Categories controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: https://sass-lang.com/ diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb new file mode 100644 index 0000000000..1cecc6f514 --- /dev/null +++ b/app/controllers/categories_controller.rb @@ -0,0 +1,27 @@ +class CategoriesController < ApplicationController + + def index + @categories = Category.all + end + + def new + @category = Category.new + end + + def create + @category = Category.new(category_params) + if @category.save + # flash[:status] = :success + # flash[:result_text] = "Successfully created #{@media_category.singularize} #{@work.id}" + # redirect_to root + else + flash[:status] = :failure + flash[:result_text] = "Could not create category" + # flash[:messages] = @category.errors.messages + # render :new, status: :bad_request + end + end + + def show + end +end diff --git a/app/helpers/categories_helper.rb b/app/helpers/categories_helper.rb new file mode 100644 index 0000000000..e06f31554c --- /dev/null +++ b/app/helpers/categories_helper.rb @@ -0,0 +1,2 @@ +module CategoriesHelper +end diff --git a/config/routes.rb b/config/routes.rb index c06383a172..c95a1e1104 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,21 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html + + + + + + + + + + + + + + + + + + resources :categories, only: [:new, :create, :show, :index] end diff --git a/test/controllers/categories_controller_test.rb b/test/controllers/categories_controller_test.rb new file mode 100644 index 0000000000..fc964739f0 --- /dev/null +++ b/test/controllers/categories_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CategoriesController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From fa253e267f562f534a4fcf0982282f8c355d8a45 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Tue, 9 Jun 2020 18:31:41 -0700 Subject: [PATCH 009/350] Generated category model --- app/models/category.rb | 2 ++ db/migrate/20200610013109_create_categories.rb | 9 +++++++++ test/models/category_test.rb | 7 +++++++ 3 files changed, 18 insertions(+) create mode 100644 app/models/category.rb create mode 100644 db/migrate/20200610013109_create_categories.rb create mode 100644 test/models/category_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/db/migrate/20200610013109_create_categories.rb b/db/migrate/20200610013109_create_categories.rb new file mode 100644 index 0000000000..12f3e12dad --- /dev/null +++ b/db/migrate/20200610013109_create_categories.rb @@ -0,0 +1,9 @@ +class CreateCategories < ActiveRecord::Migration[6.0] + def change + create_table :categories do |t| + t.string :category_name + + t.timestamps + end + end +end diff --git a/test/models/category_test.rb b/test/models/category_test.rb new file mode 100644 index 0000000000..841a2edc6d --- /dev/null +++ b/test/models/category_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Category do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 60a72abb9e16059d7fb4b6d763d4ae77dd50139c Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 9 Jun 2020 18:36:05 -0700 Subject: [PATCH 010/350] added test to ensure homepage can be reached and is the default page --- test/controllers/pages_controller_test.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/controllers/pages_controller_test.rb b/test/controllers/pages_controller_test.rb index 3120874cc7..38fdf1847f 100644 --- a/test/controllers/pages_controller_test.rb +++ b/test/controllers/pages_controller_test.rb @@ -1,7 +1,9 @@ require "test_helper" describe PagesController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + it "can get the homepage and is the root path" do + get root_path + + must_respond_with :success + end end From cecd6f2453200cb81a3ed039db4e11e7ec8f1d50 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 9 Jun 2020 18:38:17 -0700 Subject: [PATCH 011/350] Added routes for orders and orderitems --- config/routes.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index c06383a172..27bb0b9b49 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,10 @@ Rails.application.routes.draw do - # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html + root to: 'homepages#index' + + resources :orderitems, only: [:edit, :destroy] + patch 'orderitems/:id', to: 'orderitems#update' + + resources :orders, only: [:show, :edit] + get '/cart', to: 'orders#cart', as: 'cart' + patch '/orders/:id', to: 'orders#update' end From 24497bf2cb4e86603befd2fbf3ec614323f12403 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Tue, 9 Jun 2020 18:38:42 -0700 Subject: [PATCH 012/350] Added relationship to category model --- app/models/category.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/category.rb b/app/models/category.rb index 54cb6aee3f..01faa53084 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 From b458f73ced33705700a0eba424e6d3581230494a Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 9 Jun 2020 18:39:28 -0700 Subject: [PATCH 013/350] generated Products controller --- app/assets/stylesheets/products.scss | 3 +++ app/controllers/products_controller.rb | 2 ++ app/helpers/products_helper.rb | 2 ++ test/controllers/products_controller_test.rb | 7 +++++++ 4 files changed, 14 insertions(+) create mode 100644 app/assets/stylesheets/products.scss create mode 100644 app/controllers/products_controller.rb create mode 100644 app/helpers/products_helper.rb create mode 100644 test/controllers/products_controller_test.rb diff --git a/app/assets/stylesheets/products.scss b/app/assets/stylesheets/products.scss new file mode 100644 index 0000000000..8f0ca888eb --- /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: https://sass-lang.com/ diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb new file mode 100644 index 0000000000..f1ad12ddea --- /dev/null +++ b/app/controllers/products_controller.rb @@ -0,0 +1,2 @@ +class ProductsController < ApplicationController +end diff --git a/app/helpers/products_helper.rb b/app/helpers/products_helper.rb new file mode 100644 index 0000000000..ab5c42b325 --- /dev/null +++ b/app/helpers/products_helper.rb @@ -0,0 +1,2 @@ +module ProductsHelper +end diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb new file mode 100644 index 0000000000..1c0716685f --- /dev/null +++ b/test/controllers/products_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe ProductsController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 590f5e767456be575737b608fae98228ea515aee Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 9 Jun 2020 18:40:05 -0700 Subject: [PATCH 014/350] Added methods cart, update for orders controller --- app/controllers/orders_controller.rb | 50 ++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 app/controllers/orders_controller.rb diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb new file mode 100644 index 0000000000..0a0dfe7d36 --- /dev/null +++ b/app/controllers/orders_controller.rb @@ -0,0 +1,50 @@ +class OrdersController < ApplicationController + # product model made then collab for update order quantity + + # Find order or display message if cart is empty + def cart + if session[:order_id] + @order = Order.find_by(id: session[:order_id]) + else + flash[:status] = :failure + flash[:result_text] = "Cart is empty" + redirect_back fallback_location: root_path + return + end + end + + # Process order after payment info has been addded + def update + @order.orderitems.each do |oderitem| + if !orderitem.valid? + flash[:status] = :failure + flash[:result_text] = "Some items in your cart are no longer available" + flash[:messages] = orderitem.errors.messages + end + if flash[:status] == :failure + return redirect_to cart_path + end + end + + # Change status and clear cart + @order.status = "paid" + if @order.update(order_params) + @order.reduce_stock + session[:order_id] = nil + redirect_to order_path(@order.id) + return + else + flash.now[:status] = :failure + flash.now[:result_text] = "Review and Resubmit" + flash.now[:messages] = orderitem.errors.messages + + render :edit, status: :bad_request + return + end + end + + private + def order_params + params.require(:order).permit(:email, :mailing_address, :cc_number, :cvv, :expiration, :zip) + end +end From 4c89cc2adac7cfdd6d7a61eed714d13960873194 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 9 Jun 2020 18:45:39 -0700 Subject: [PATCH 015/350] Added order and orderitem model --- app/models/order.rb | 2 ++ app/models/orderitem.rb | 2 ++ test/models/order_test.rb | 7 +++++++ test/models/orderitem_test.rb | 7 +++++++ 4 files changed, 18 insertions(+) create mode 100644 app/models/order.rb create mode 100644 app/models/orderitem.rb create mode 100644 test/models/order_test.rb create mode 100644 test/models/orderitem_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/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/test/models/order_test.rb b/test/models/order_test.rb new file mode 100644 index 0000000000..59ceb9a253 --- /dev/null +++ b/test/models/order_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Order do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/models/orderitem_test.rb b/test/models/orderitem_test.rb new file mode 100644 index 0000000000..48dc4d1fbd --- /dev/null +++ b/test/models/orderitem_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Orderitem do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 432e18af9c761fd8e555248a2b2b9a4650326c4c Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 9 Jun 2020 18:46:11 -0700 Subject: [PATCH 016/350] Added order and orderitem test controllers --- test/controllers/orderitems_controller_test.rb | 7 +++++++ test/controllers/orders_controller_test.rb | 7 +++++++ 2 files changed, 14 insertions(+) create mode 100644 test/controllers/orderitems_controller_test.rb create mode 100644 test/controllers/orders_controller_test.rb diff --git a/test/controllers/orderitems_controller_test.rb b/test/controllers/orderitems_controller_test.rb new file mode 100644 index 0000000000..152a3451f1 --- /dev/null +++ b/test/controllers/orderitems_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe OrderitemsController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/controllers/orders_controller_test.rb b/test/controllers/orders_controller_test.rb new file mode 100644 index 0000000000..4b01cc1988 --- /dev/null +++ b/test/controllers/orders_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe OrdersController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 859ec1a8e8443d80114ce7a409586a4c83f4f33b Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 9 Jun 2020 18:46:54 -0700 Subject: [PATCH 017/350] order and orderitems stylesheets --- app/assets/stylesheets/orderitems.scss | 3 +++ app/assets/stylesheets/orders.scss | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 app/assets/stylesheets/orderitems.scss create mode 100644 app/assets/stylesheets/orders.scss diff --git a/app/assets/stylesheets/orderitems.scss b/app/assets/stylesheets/orderitems.scss new file mode 100644 index 0000000000..a4a1341b27 --- /dev/null +++ b/app/assets/stylesheets/orderitems.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Orderitems controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: https://sass-lang.com/ diff --git a/app/assets/stylesheets/orders.scss b/app/assets/stylesheets/orders.scss new file mode 100644 index 0000000000..e8c23c2250 --- /dev/null +++ b/app/assets/stylesheets/orders.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Orders controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: https://sass-lang.com/ From 91c2a5d2051e1e425dae1b4086f483de28660159 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 9 Jun 2020 18:47:22 -0700 Subject: [PATCH 018/350] Added order and orderitem app/helpers --- db/migrate/20200610004212_create_orders.rb | 8 ++++++++ db/migrate/20200610004226_create_orderitems.rb | 8 ++++++++ 2 files changed, 16 insertions(+) create mode 100644 db/migrate/20200610004212_create_orders.rb create mode 100644 db/migrate/20200610004226_create_orderitems.rb diff --git a/db/migrate/20200610004212_create_orders.rb b/db/migrate/20200610004212_create_orders.rb new file mode 100644 index 0000000000..dd44c637db --- /dev/null +++ b/db/migrate/20200610004212_create_orders.rb @@ -0,0 +1,8 @@ +class CreateOrders < ActiveRecord::Migration[6.0] + def change + create_table :orders do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20200610004226_create_orderitems.rb b/db/migrate/20200610004226_create_orderitems.rb new file mode 100644 index 0000000000..07fdc2e9f2 --- /dev/null +++ b/db/migrate/20200610004226_create_orderitems.rb @@ -0,0 +1,8 @@ +class CreateOrderitems < ActiveRecord::Migration[6.0] + def change + create_table :orderitems do |t| + + t.timestamps + end + end +end From d1867de88a250d766bf8ae735d6b984f0235d295 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 9 Jun 2020 18:53:38 -0700 Subject: [PATCH 019/350] Added show method for orders controller --- app/controllers/orderitems_controller.rb | 2 ++ app/controllers/orders_controller.rb | 11 +++++++++++ app/helpers/orderitems_helper.rb | 2 ++ app/helpers/orders_helper.rb | 2 ++ 4 files changed, 17 insertions(+) create mode 100644 app/controllers/orderitems_controller.rb create mode 100644 app/helpers/orderitems_helper.rb create mode 100644 app/helpers/orders_helper.rb diff --git a/app/controllers/orderitems_controller.rb b/app/controllers/orderitems_controller.rb new file mode 100644 index 0000000000..bcac78bc17 --- /dev/null +++ b/app/controllers/orderitems_controller.rb @@ -0,0 +1,2 @@ +class OrderitemsController < ApplicationController +end diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index 0a0dfe7d36..005c7a07c4 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -43,6 +43,17 @@ def update end end + # Confirmation page for order + def show + if @order.status == "pending" + flash[:status] = :failure + flash[:result_text] = "Your order is being process" + flash[:messages] = @order.errors.messages + redirect_to root root_path + return + end + end + private def order_params params.require(:order).permit(:email, :mailing_address, :cc_number, :cvv, :expiration, :zip) diff --git a/app/helpers/orderitems_helper.rb b/app/helpers/orderitems_helper.rb new file mode 100644 index 0000000000..c74e407d1c --- /dev/null +++ b/app/helpers/orderitems_helper.rb @@ -0,0 +1,2 @@ +module OrderitemsHelper +end diff --git a/app/helpers/orders_helper.rb b/app/helpers/orders_helper.rb new file mode 100644 index 0000000000..443227fd48 --- /dev/null +++ b/app/helpers/orders_helper.rb @@ -0,0 +1,2 @@ +module OrdersHelper +end From 77070c9adecf8e3db3c7b2261283054e1c7cbda8 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 9 Jun 2020 19:00:03 -0700 Subject: [PATCH 020/350] Added private functions in orders controller --- app/controllers/orders_controller.rb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index 005c7a07c4..4d2e408fb0 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -54,8 +54,27 @@ def show end end + def merchant_order + unless @order.is_order_of(session[:merchant_id]) && @order.status != 'pending' + flash[:status] = :failure + flash[:result_text] = "You do not have access to this page" + redirect_back fallback_location: root_path + return + end + end + private def order_params params.require(:order).permit(:email, :mailing_address, :cc_number, :cvv, :expiration, :zip) end + + def find_order_from_session + @order = Order.find_by(id: session[:order_id]) + return head :not_found if @order.nil? + end + + def find_order_from_params + @order = Order.find_by(id: params[:id]) + return head :not_found if @order.nil? + end end From 5aadae9b4c59fde357764c53e205ea6e9f22a41e Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Tue, 9 Jun 2020 19:11:34 -0700 Subject: [PATCH 021/350] Added relationship and rating validations to review model --- app/models/review.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/models/review.rb b/app/models/review.rb index b2ca4935ed..a9e23a7f37 100644 --- a/app/models/review.rb +++ b/app/models/review.rb @@ -1,2 +1,11 @@ class Review < ApplicationRecord + belongs_to :product + + validates :rating, presence: true, numericality: { + only_integer: true, + greater_than_or_equal_to: 1, + less_than_or_equal_to: 5 + } + +# validates NOT merchant id end From fd1f33282da791e37a179f40efdaba2d5775130f Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 9 Jun 2020 19:36:36 -0700 Subject: [PATCH 022/350] Added orderitems create method --- app/controllers/orderitems_controller.rb | 40 ++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/app/controllers/orderitems_controller.rb b/app/controllers/orderitems_controller.rb index bcac78bc17..cb441f1595 100644 --- a/app/controllers/orderitems_controller.rb +++ b/app/controllers/orderitems_controller.rb @@ -1,2 +1,42 @@ class OrderitemsController < ApplicationController + before_action + + # create a new order or add to existing- do we want this? + def create + if session[:order_id] && Order.find_by(id: session[:order_id]) + @order = Order.find_by(id: session[:order_id]) + else + @order = Order.new(status: "pending") + unless @order.save + flash[:status] = :failure + flash[:result_text] = "Couldn't create order, try again later" + flash[:messages] = orderitem.errors.messages + end + session[:order_id] = @order.id + end + + # Increase quantity of desired product + @orderitem = Orderitem.find_by(order_id: session[:order_id], product_id: params[:product_id]) + if @orderitem + @orderitem.quantity += params[:orderitem][:quantity].to_i + else + @orderitem = Orderitem.new( + quantity: params[:orderitem][:quantity], + product_id: params[:product_id], + order_id: @order.id, + shipped: false + ) + end + + if @orderitem.save + flash[:status] = :success + flash[:result_text] = "#{orderitem.product.name} was added to cart" + else + flash[:status] = :failure + flash[:result_text] = "Error adding #{orderitem.product.name} to cart" + flash[:messages] = @orderitem.errors.messages + end + redirect_back fallback_location: root_path + return + end end From 14c743dff42b16d374368f2bf41d3c73419c9d14 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 9 Jun 2020 19:54:54 -0700 Subject: [PATCH 023/350] Added update method for orderitems controller --- app/controllers/orderitems_controller.rb | 25 ++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/app/controllers/orderitems_controller.rb b/app/controllers/orderitems_controller.rb index cb441f1595..922ac87888 100644 --- a/app/controllers/orderitems_controller.rb +++ b/app/controllers/orderitems_controller.rb @@ -39,4 +39,29 @@ def create redirect_back fallback_location: root_path return end + + def edit ; end + + # comment here + def update + if @orderitem.order.status == "pending" + if @orderitem.update(quantity: params[:orderitem][:quantity]) + flash[:status] = :success + flash[:result_text] = "Update sucessful" + redirect_to cart_path + return + else + flash.now[:status] = :failure + flash.now[:result_text] = "Error updating the item" + flash.now[:messages] = @orderitem.errors.messages + render :edit, status: :bad_request + return + end + else + flash[:status] = :failure + flash[:result_text] = "Cannot update a #{@orderitem.order.status} order" + redirect_to root_path + end + end + end From 496e88c4fca4822e2903e9dfaa945391204e22dd Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 9 Jun 2020 19:59:38 -0700 Subject: [PATCH 024/350] Added destroy method to orderitems controller --- app/controllers/orderitems_controller.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/controllers/orderitems_controller.rb b/app/controllers/orderitems_controller.rb index 922ac87888..f6adec5e3f 100644 --- a/app/controllers/orderitems_controller.rb +++ b/app/controllers/orderitems_controller.rb @@ -64,4 +64,14 @@ def update end end + # comment here + def destroy + if @orderitem.order.status == "pending" + @orderitem.destroy + flash[:status] = :success + flash[:result_text] = "#{@orderitem.product.name} was removed from your cart" + redirect_to root_path + end + end + end From e166c72fcecc2754bf0445311453a7d4104c7133 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 9 Jun 2020 21:40:54 -0700 Subject: [PATCH 025/350] Added shipped method for orderitems controller --- app/controllers/orderitems_controller.rb | 32 +++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/app/controllers/orderitems_controller.rb b/app/controllers/orderitems_controller.rb index f6adec5e3f..cc0df9c99d 100644 --- a/app/controllers/orderitems_controller.rb +++ b/app/controllers/orderitems_controller.rb @@ -1,5 +1,5 @@ class OrderitemsController < ApplicationController - before_action + before_action: find_orderitem, only: [:edit, :update, :destroy, :mark_shipped] # create a new order or add to existing- do we want this? def create @@ -70,8 +70,38 @@ def destroy @orderitem.destroy flash[:status] = :success flash[:result_text] = "#{@orderitem.product.name} was removed from your cart" + redirect_to cart_path + else + flash[:status] = :failure + flash[:result_text] = "Cannot delete items" redirect_to root_path end end + # comment here + def mark_shipped + if @orderitem.order.status == "paid" && @orderitem.shipped == false + @orderitem.shipped = true + @orderitem.save + flash[:status] = :success + flash[:result_text] = "#{@orderitem.product.name} - shipped" + @orderitem.order.mark_as_complete? + redirect_back fallback_location: root_path + + elsif @orderitem.order.status == "paid" && @orderitem.shipped == true + flash[:status] = :failure + flash[:result_text] = "#{@orderitem.shipped}- shipped" + redirect_back fallback_location: root_path + else + flash[:status] = :failure + flash[:result_text] = "Cannot perform this action for a #{@orderitem.order.status} order" + redirect_to root_path + end + end + + private + def find_orderitem + @orderitem = Orderitem.find_by(id: params[:id]) + head :not_found unless @orderitem + end end From e1bc31617efd33b92b907c78f4d09ef0b5156b80 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 9 Jun 2020 21:42:19 -0700 Subject: [PATCH 026/350] Added shipped to routes --- config/routes.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 27bb0b9b49..51d831cac9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,8 +1,9 @@ Rails.application.routes.draw do root to: 'homepages#index' - + resources :orderitems, only: [:edit, :destroy] patch 'orderitems/:id', to: 'orderitems#update' + patch 'orderitems/:id/mark_shipped', to: 'orderitems#markshipped', as: 'mark_shipped' resources :orders, only: [:show, :edit] get '/cart', to: 'orders#cart', as: 'cart' From 53738dc04af0e7f76bbf8e9c40ec77b87c4dd337 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 9 Jun 2020 21:48:15 -0700 Subject: [PATCH 027/350] Updated orders controller --- app/controllers/orders_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index 4d2e408fb0..f9eee2ec6d 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -1,5 +1,8 @@ class OrdersController < ApplicationController - # product model made then collab for update order quantity + # todo -product model made then collab for update order quantity + before_action :require_login, only: [:merchant_order] + before_action :find_order_from_session, only: [:edit, :update] + before_action :find_order_from_params, only: [:show, :merchant_order] # Find order or display message if cart is empty def cart @@ -54,6 +57,7 @@ def show end end + # comment here def merchant_order unless @order.is_order_of(session[:merchant_id]) && @order.status != 'pending' flash[:status] = :failure From 79926846df1061ef0f1e7e41772b38f504eb9734 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 9 Jun 2020 21:54:59 -0700 Subject: [PATCH 028/350] Added method for order model --- app/models/order.rb | 57 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/app/models/order.rb b/app/models/order.rb index 10281b3450..1e4c2925d9 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -1,2 +1,59 @@ class Order < ApplicationRecord + has_many :orderitems + has_many :products, through: :orderitems + + validates :status, presence: true, inclusion: { + in: %w(pending paid complete cancel), + message: "%{value} is not a valid status" + } + + validates :orderitems, length: { minimum: 1, message: "Your cart is empty" }, on: :update + validates :email, presence: true, on: :update + validates :address, presence: true, on: :update + validates :cc_name, presence: true, on: :update + validates :cc_num, presence: true, numericality: { only_integer: true }, length: { minimum: 4 }, on: :update + validates :cvv, presence: true, numericality: { only_integer: true }, on: :update + validates :cc_exp, presence: true, on: :update + validates :zip, presence: true, numericality: { only_integer: true }, on: :update + + def reduce_stock + self.orderitems.each do |orderitem| + orderitem.product.stock -= orderitem.quantity + orderitem.product.save + end + end + + def return_stock + self.orderitems.each do |orderitem| + if !orderitem.product.retired + orderitem.product.stock += orderitem.quantity + orderitem.product.save + end + end + end + + def total + total_cost = 0 + + self.orderitems.each do |orderitem| + total_cost += orderitem.subtotal + end + + return total_cost + end + + def mark_as_complete? + if self.status == "paid" && self.orderitems.find_by(shipped: false).nil? + self.status = "complete" + self.save + end + end + + def is_order_of(merch_id) + if self.products.find_by(merchant_id: merch_id).nil? + return false + end + + return true + end end From df22e40754b7e29615c27e67a01abfc75437b211 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 9 Jun 2020 21:59:43 -0700 Subject: [PATCH 029/350] Added orderitem model --- app/models/orderitem.rb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/app/models/orderitem.rb b/app/models/orderitem.rb index ebe5c835d9..01983fc7ba 100644 --- a/app/models/orderitem.rb +++ b/app/models/orderitem.rb @@ -1,2 +1,23 @@ class Orderitem < ApplicationRecord + belongs_to :product + belongs_to :order + + validates :quantity, presence: true, numericality: { only_integer: true, greater_than: 0} + validates :shipped, inclusion: { in: [true, false],message: "shipped status : true or false"} + + # validate :in_stock + # validate :not_retired + + # def subtotal + # + # end + + private + # def in_stock + # + # end + + # def not_retired + # + # end end From c8059b4afce40a9bbf9d02273bab50bfb06d054d Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 9 Jun 2020 23:51:45 -0700 Subject: [PATCH 030/350] added all CRUD routes for Products controller --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index c06383a172..dd40ad4c1b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,3 @@ Rails.application.routes.draw do - # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html + resources :products end From b422790e5b8c0ee4c61b74226700a4dcdaf48786 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Wed, 10 Jun 2020 00:01:26 -0700 Subject: [PATCH 031/350] added CRUD functions, need to confirm relation to OrderItems --- app/controllers/merchants_controller.rb | 50 +++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 app/controllers/merchants_controller.rb diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rb new file mode 100644 index 0000000000..1292be68e5 --- /dev/null +++ b/app/controllers/merchants_controller.rb @@ -0,0 +1,50 @@ +class MerchantsController < ApplicationController + before_action :require_login, except: [:index, :destroy, :create] + + def index + @merchants = Merchant.all + end + + def create + auth_hash = request.env["omniauth.auth"] + merchant = Merchant.find_by(uid: auth_hash[:uid], provider: "github") + + if merchant + flash[:status] = :success + flash[:result_text] = "Returning merchant: #{merchant.username}." + else + merchant = Merchant.build_from_github(auth_hash) + if merchant.save + flash[:status] = :success + flash[:result_text] = "You are logged in as new merchant: #{merchant.username}." + else + flash[:status] = :failure + flash[:result_text] = "Failure: Could not create new merchant account" + flash[:messages] = merchant.errors.messages + return redirect_to root_path + end + end + session[:merchant_id] = merchant.id + return redirect_to root_path + end + + def destroy + session[:merchant_id] = nil + flash[:status] = :success + flash[:result_text] = "You've successfully logged out as #{merchant.username}." + redirect_to root_path + return + end + + def current + @current_merchant = Merchant.find_by(id: session[:merchant_id]) + end + + #need to track OrderItems + + private + + def merchant_params + + end +end From dec466a147cd15ea38a821b73836b08d084218d6 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Wed, 10 Jun 2020 00:06:55 -0700 Subject: [PATCH 032/350] added relationships, validations, and notes on class methods --- app/models/merchant.rb | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 app/models/merchant.rb diff --git a/app/models/merchant.rb b/app/models/merchant.rb new file mode 100644 index 0000000000..64a71afde9 --- /dev/null +++ b/app/models/merchant.rb @@ -0,0 +1,33 @@ +class Merchant < ApplicationRecord + has_many :products + + validates :username, presence: true, uniqueness: true + validates :merchant_id, uniqueness: true, presence: true + validates :email, uniqueness: true, presence: true + + # custom mthod to create new merchant + def self.build_from_github(auth_hash) + merchant = Merchant.new + merchant.uid = auth_hash[:uid] + merchant.provider = "github" + merchant.username = auth_hash["info"]["nickname"] + merchant.email = auth_hash["info"]["email"] + return merchant + end + + # need to work with OrderItem + def self.total_revenue + + end + + def find.all_orders + + + end + + # need to work with OrderItem + def revenue_by_status(status) + + end + +end From e74fc74b576a2c99cfb6d829a44983f16ea7e1a7 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 10 Jun 2020 00:13:58 -0700 Subject: [PATCH 033/350] created Product model --- app/models/product.rb | 2 ++ db/migrate/20200610071324_create_products.rb | 13 +++++++++++++ test/models/product_test.rb | 7 +++++++ 3 files changed, 22 insertions(+) create mode 100644 app/models/product.rb create mode 100644 db/migrate/20200610071324_create_products.rb create mode 100644 test/models/product_test.rb 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/20200610071324_create_products.rb b/db/migrate/20200610071324_create_products.rb new file mode 100644 index 0000000000..12ff407fa1 --- /dev/null +++ b/db/migrate/20200610071324_create_products.rb @@ -0,0 +1,13 @@ +class CreateProducts < ActiveRecord::Migration[6.0] + def change + create_table :products do |t| + t.string :product_name + t.string :description + t.float :price + t.string :photo_url + t.bigint :available_quantity + + t.timestamps + end + end +end diff --git a/test/models/product_test.rb b/test/models/product_test.rb new file mode 100644 index 0000000000..6977718e14 --- /dev/null +++ b/test/models/product_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Product do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From a3dc73a54dfa8d1fe9e6c23b8a25d6046c0e1b60 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 10 Jun 2020 00:14:49 -0700 Subject: [PATCH 034/350] added all 7 CRUD Products controller actions, strong params, and find_product controller filter --- app/controllers/products_controller.rb | 72 ++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index f1ad12ddea..ada5a2e669 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -1,2 +1,74 @@ class ProductsController < ApplicationController + before_action :find_product, only: [:show, :update, :edit, :destroy] + + def index + # paginate / kaminari gem will be helpful in the case there are numerous products + @products = Product.all + end + + def show + if @product.nil? + flash[:error] = "Product has either been deleted, sold out, or not found." + redirect_to root_path + return + end + end + + def new + @product = Product.new + end + + def create + @product = Product.create(product_params) + if @product.id? + redirect_to root_path + else + render :new + end + + rescue ActionController::ParameterMissing + redirect_to new_product_path + end + + def update + if @product.nil? + head :not_found + return + elsif @product.update(product_params) + redirect_to products_path(@product) + return + else + render :edit + return + end + end + + def edit + if @product.nil? + redirect_to products_path(@product) + return + end + end + + def destroy + if @product.nil? + redirect_to products_path + return + end + + @product.destroy + + redirect_to products_path + return + end + + private + def find_product + # TODO: need to add case for when product cannot be found, to DRY up code + @product = Product.find_by(id: params[:id]) + end + + def product_params + return params.require(:product).permit(:product_name, :price, :description, :photo_url, :available_quantity, :merchant_id) + end end From c30f8056b1b6279f7e9b4d643296ef12196ad24a Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 10 Jun 2020 00:22:16 -0700 Subject: [PATCH 035/350] added validations --- app/models/product.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/models/product.rb b/app/models/product.rb index 35a85acab3..2db6763184 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -1,2 +1,8 @@ class Product < ApplicationRecord + validates :name, presence: true, uniqueness: true + validates :price, numericality: { greater_than_or_equal_to: 0 } + + belongs_to :merchant + has_and_belongs_to_many :categories + has_many :reviews end From 1149e4f45b7d8ed3470cb586fa01e96b0c9263e3 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 10 Jun 2020 10:23:30 -0700 Subject: [PATCH 036/350] Changed homepages to pages in routes file --- config/routes.rb | 2 +- db/schema.rb | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 db/schema.rb diff --git a/config/routes.rb b/config/routes.rb index 51d831cac9..28db81019e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,5 @@ Rails.application.routes.draw do - root to: 'homepages#index' + root to: 'pages#index' resources :orderitems, only: [:edit, :destroy] patch 'orderitems/:id', to: 'orderitems#update' diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000000..edeed95ffb --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,37 @@ +# 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. +# +# This file is the source Rails uses to define your schema when running `rails +# db:schema:load`. When creating a new database, `rails db:schema:load` tends to +# be faster and is potentially less error prone than running all of your +# migrations from scratch. Old migrations may fail to apply correctly if those +# migrations use external dependencies or application code. +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2020_06_10_063347) 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 "username" + t.string "email" + t.bigint "merchant_id" + t.bigint "provider" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + + create_table "orderitems", force: :cascade do |t| + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + + create_table "orders", force: :cascade do |t| + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + +end From d0f868e1dd8a3831d265884e00efcff6835da139 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 10 Jun 2020 11:13:03 -0700 Subject: [PATCH 037/350] Created csv for products seeds. --- .DS_Store | Bin 0 -> 8196 bytes db/.DS_Store | Bin 0 -> 6148 bytes db/products.csv | 31 +++++++++++++++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 .DS_Store create mode 100644 db/.DS_Store create mode 100644 db/products.csv diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..a0252a2411186347dd359048000e6d76d69bf8ea GIT binary patch literal 8196 zcmeHM-EPw`6h2-{muy2T64J(9ZjiW`&?Yv9gpf+vgm!_1D1r+>ThfLtEKRC5T^XgQ zH@w4m1m1)<;1#&%0pL4!m>jnicZg|r6(7g`KHKLz&W}?f67_y-gJ_kA92{(`i^!%V zZs%hn&E+*WU6|f3e1^y2O@XY4q%y{mrR-0P|tOA!( z0lq(YIM~*5J62ZSI*`dN0Bjl6GNCMA{$V|?fUV_rtSoAfgrdSKs>rt(BHud*MMrxr z$B&g&bP{r8^plS)@*RrEw;sZia1u3TZEh8?3QQ`%d-oFg)S=E^T-d+gN6W2WGD+Gp z1;7OqQcSn0Nhu}tmLfXD**oeP?5_s91ZG4@5hYd(R7LOCz)*v(seGj}?>Gz2!qtU0jiYqX$o#C|tNYzo zeD>7Oj)J`WJWb>CvLC#N!ohy^`lB?-{3r>#k{q={KwiI$l2$sXr~RbWll?SQgX6f4 zyI)-y4!1V9*1XMoqcv~1y}gd&ox7uv>#W?|c(8ZSKK(HKIQn!3KafOzd!%J`ex83p zN&0ru=q7QR95NWkB4QZg2W1f5CLKe`Hnj|uIGVaj^Yj>;wv2yFVG%8(s-u^RXp9hJ z^`{8AV_iCxYb=?$E;+(F1B=cktH6aPoFDFlklEzrz8O`;wt;*%dK!34Izx@D@ zc)%T2=zV`%GNQ6vvYdS+qX!)0iJ2{GY*2B%Yn&6;c(HYFdGE}9>+uemQ{f&BXIqf7 zLOEo}2^syF3Njl0>NLl0{_D4VHr-qSSHKl;1zdq272uhzRva06?FzU8uE16S-5&yr zV$9eXrmcfjdIAvj8l8;3UYeB?GRBOZAtN*~D$%HtpBQ3v_J^DoGj@hXhvdhH^@) vSZ-O=G_O;KMt^V#U_ Date: Wed, 10 Jun 2020 11:21:30 -0700 Subject: [PATCH 038/350] Updated schema to account for reviews and categories. --- db/schema.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/db/schema.rb b/db/schema.rb index edeed95ffb..eb949ce1d0 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -15,6 +15,12 @@ # 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 "category_name" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + create_table "merchants", force: :cascade do |t| t.string "username" t.string "email" @@ -34,4 +40,11 @@ t.datetime "updated_at", precision: 6, null: false end + create_table "reviews", force: :cascade do |t| + t.string "content" + t.integer "rating", default: 1 + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + end From 1fcb89a7c89aa6690a8eed47db507bf0cec8023e Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 10 Jun 2020 11:22:48 -0700 Subject: [PATCH 039/350] Updated schema to account for products --- db/schema.rb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index eb949ce1d0..0e794b0543 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: 2020_06_10_063347) do +ActiveRecord::Schema.define(version: 2020_06_10_071324) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -40,6 +40,16 @@ t.datetime "updated_at", precision: 6, null: false end + create_table "products", force: :cascade do |t| + t.string "product_name" + t.string "description" + t.float "price" + t.string "photo_url" + t.bigint "available_quantity" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + create_table "reviews", force: :cascade do |t| t.string "content" t.integer "rating", default: 1 From 19f72ea984b1872af56f55b74b67a9ed570ff609 Mon Sep 17 00:00:00 2001 From: denisseai Date: Wed, 10 Jun 2020 11:23:49 -0700 Subject: [PATCH 040/350] deleted cancel option --- app/models/order.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/order.rb b/app/models/order.rb index 1e4c2925d9..2ed7d44fb1 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -3,7 +3,7 @@ class Order < ApplicationRecord has_many :products, through: :orderitems validates :status, presence: true, inclusion: { - in: %w(pending paid complete cancel), + in: %w(pending paid complete), message: "%{value} is not a valid status" } From eaf011b8a0577f480882ce1dbbce6b42cec3bdfb Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 10 Jun 2020 11:36:08 -0700 Subject: [PATCH 041/350] Added seeds script to aid in seeding db. --- db/seeds.rb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index 1beea2accd..a4f3cfb552 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,7 +1,9 @@ -# 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) +require "csv" +media_file = Rails.root.join("db", "products.csv") + +CSV.foreach(media_file, headers: true, header_converters: :symbol, converters: :all) do |row| + data = Hash[row.headers.zip(row.fields)] + puts data + Product.create!(data) +end + From 5efadf2fc8a0f904d4fc1aa3622154dad9508fff Mon Sep 17 00:00:00 2001 From: denisseai Date: Wed, 10 Jun 2020 12:08:25 -0700 Subject: [PATCH 042/350] Added foreign keys for orderitems --- db/schema.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index edeed95ffb..125c121131 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -33,5 +33,6 @@ t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false end - + add_foreign_key "orderitems", "orders" + add_foreign_key "orderitems", "products" end From 48b8b07f6abbba1d3f25649ae901602f253de18a Mon Sep 17 00:00:00 2001 From: denisseai Date: Wed, 10 Jun 2020 12:19:09 -0700 Subject: [PATCH 043/350] added notes with todo --- app/models/order.rb | 33 +++++++++++-------- db/migrate/20200610004212_create_orders.rb | 9 +++++ .../20200610004226_create_orderitems.rb | 1 + db/schema.rb | 4 +-- 4 files changed, 31 insertions(+), 16 deletions(-) diff --git a/app/models/order.rb b/app/models/order.rb index 2ed7d44fb1..4e885bffd8 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -1,3 +1,7 @@ +#todo +# create a shipped column (bool) maybe product needs that 'retired' column on it's side +# create a table with orders info and migrate + class Order < ApplicationRecord has_many :orderitems has_many :products, through: :orderitems @@ -16,21 +20,22 @@ class Order < ApplicationRecord validates :cc_exp, presence: true, on: :update validates :zip, presence: true, numericality: { only_integer: true }, on: :update - def reduce_stock - self.orderitems.each do |orderitem| - orderitem.product.stock -= orderitem.quantity - orderitem.product.save - end - end + # review after seeding + # def reduce_stock + # self.orderitems.each do |orderitem| + # orderitem.product.stock -= orderitem.quantity + # orderitem.product.save + # end + # end - def return_stock - self.orderitems.each do |orderitem| - if !orderitem.product.retired - orderitem.product.stock += orderitem.quantity - orderitem.product.save - end - end - end + # def return_stock + # self.orderitems.each do |orderitem| + # if !orderitem.product.retired + # orderitem.product.stock += orderitem.quantity + # orderitem.product.save + # end + # end + # end def total total_cost = 0 diff --git a/db/migrate/20200610004212_create_orders.rb b/db/migrate/20200610004212_create_orders.rb index dd44c637db..bb596dc55c 100644 --- a/db/migrate/20200610004212_create_orders.rb +++ b/db/migrate/20200610004212_create_orders.rb @@ -1,6 +1,15 @@ class CreateOrders < ActiveRecord::Migration[6.0] def change create_table :orders do |t| + # check w/becca for naming variables + # t.string :email + # t.string :address + # t.string :cc_name + # t.string :cc_num + # t.string :cvv + # t.string :cc_exp + # t.string :zip + # t.string :status t.timestamps end diff --git a/db/migrate/20200610004226_create_orderitems.rb b/db/migrate/20200610004226_create_orderitems.rb index 07fdc2e9f2..145fd26c25 100644 --- a/db/migrate/20200610004226_create_orderitems.rb +++ b/db/migrate/20200610004226_create_orderitems.rb @@ -1,6 +1,7 @@ class CreateOrderitems < ActiveRecord::Migration[6.0] def change create_table :orderitems do |t| + t.integer :quantity # or available_quantity t.timestamps end diff --git a/db/schema.rb b/db/schema.rb index 125c121131..11e9f79ab1 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -33,6 +33,6 @@ t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false end - add_foreign_key "orderitems", "orders" - add_foreign_key "orderitems", "products" + # add_foreign_key "orderitems", "orders" + # add_foreign_key "orderitems", "products" end From c31044ee66e4cc6466ffe6e93565e206a9441d90 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 10 Jun 2020 13:26:02 -0700 Subject: [PATCH 044/350] basic index view for listing products --- app/views/pages/index.html.erb | 1 + app/views/products/index.html.erb | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 app/views/products/index.html.erb diff --git a/app/views/pages/index.html.erb b/app/views/pages/index.html.erb index 1b24e86e5a..9d047b7e38 100644 --- a/app/views/pages/index.html.erb +++ b/app/views/pages/index.html.erb @@ -5,5 +5,6 @@

Shop for a piece of the outdoors regardless of your budget

+ <%= link_to "View all products", products_path, :class => "btn btn-dark"%>
\ No newline at end of file diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb new file mode 100644 index 0000000000..7b9ea0420e --- /dev/null +++ b/app/views/products/index.html.erb @@ -0,0 +1,3 @@ +<% @products.each do |product| %> +

<%= product.product_name %>

+<% end %> \ No newline at end of file From f70bc4e7b0429deb2155ec5e17d69029988cc151 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 10 Jun 2020 13:26:30 -0700 Subject: [PATCH 045/350] removed troublesome entries that prevented seeding --- db/products.csv | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/db/products.csv b/db/products.csv index 2eb97fd3c5..cb2501f2a9 100644 --- a/db/products.csv +++ b/db/products.csv @@ -1,8 +1,6 @@ product_name,available_quantity,price,photo_url,description -Mount Rainier,3,500000,https://images.unsplash.com/photo-1565395414487-fb0445bd3596?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=668&q=80, "Ascending to 14,410 feet above sea level, Mount Rainier stands as an icon in the Washington landscape. An active volcano, Mount Rainier is the most glaciated peak in the contiguous U.S.A., spawning five major rivers. Subalpine wildflower meadows ring the icy volcano while ancient forest cloaks Mount Rainier’s lower slopes. Wildlife abounds in the park’s ecosystems. A lifetime of discovery awaits." -Ebey's Landing,8,3800,https://images.unsplash.com/photo-1566592264818-a466b3394ee0?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=660&q=80,"This stunning landscape at the gateway to Puget Sound, with its rich farmland and promising seaport, lured the earliest American pioneers north of the Columbia River to Ebey’s Landing. Today Ebey’s Landing National Historical Reserve preserves the historical, agricultural and cultural traditions of both Native and Euro-American – while offering spectacular opportunities for recreation." +Mount Rainier,3,500000,https://images.unsplash.com/photo-1565395414487-fb0445bd3596?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=668&q=80,"Ascending to 14,410 feet above sea level, Mount Rainier stands as an icon in the Washington landscape. An active volcano, Mount Rainier is the most glaciated peak in the contiguous U.S.A., spawning five major rivers. Subalpine wildflower meadows ring the icy volcano while ancient forest cloaks Mount Rainier’s lower slopes. Wildlife abounds in the park’s ecosystems. A lifetime of discovery awaits." Fort Vancouver,15,950,https://www.nps.gov/common/uploads/grid_builder/fova/crop16_9/E1BCCCF0-A157-32A2-352205A499D482A2.jpg?width=950&quality=90&mode=crop,"Located on the north bank of the Columbia River, in sight of snowy mountain peaks and a vibrant urban landscape, this park has a rich cultural past. From a frontier fur trading post, to a powerful military legacy, the magic of flight, and the origin of the American Pacific Northwest, history is shared at four unique sites. Discover stories of transition, settlement, conflict, and community." -Skagway Smuggler's Cove,2,125,https://www.nps.gov/klgo/planyourvisit/images/Smugglers-Cove.JPG?maxwidth=1200&maxheight=1200&autorotate=false,"Skagway is situated in the heart of coastal Alaska. This area offers ocean views, mountain peaks, boreal forest, lakes, waterfalls, and more." Lake Roosevelt,47,3895,https://www.nps.gov/common/uploads/grid_builder/laro/crop16_9/A2DE7DC1-1DD8-B71B-0B6321848C7B5621.jpg?width=950&quality=90&mode=crop,"In 1941 the Grand Coulee Dam was built on the Columbia River as part of the Columbia River Basin project, creating a 130-mile long lake. Named for President Franklin D. Roosevelt, Lake Roosevelt National Recreation Area provides opportunities for boating, fishing, swimming, camping, canoeing, hunting and visiting historic Fort Spokane and St. Paul's Mission." North Cascades,1,69383,https://images.unsplash.com/photo-1556046858-0c109614642b?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=1350&q=80,"Less than three hours from Seattle, an alpine landscape beckons. Discover communities of life adapted to moisture in the west and recurring fire in the east. Explore jagged peaks crowned by more than 300 glaciers. Listen to cascading waters in forested valleys. Witness a landscape sensitive to the Earth's changing climate. Help steward the ecological heart of the Cascades." Olympic,4,77000,https://www.nps.gov/common/uploads/grid_builder/olym/crop16_9/B78FFBA7-B378-2599-5128D730E80406CE.jpg?width=950&quality=90&mode=crop,"With its incredible range of precipitation and elevation, diversity is the hallmark of Olympic National Park. Encompassing nearly a million acres, the park protects a vast wilderness, thousands of years of human history, and several distinctly different ecosystems, including glacier-capped mountains, old-growth temperate rain forests, and over 70 miles of wild coastline. Come explore!" From b16af7d7efad1da0810b9e2c4b7d667b1eb6c6bd Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 10 Jun 2020 13:26:50 -0700 Subject: [PATCH 046/350] added function to seed data from 'products.csv' --- db/seeds.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index a4f3cfb552..62f2ce03ac 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,9 +1,8 @@ require "csv" -media_file = Rails.root.join("db", "products.csv") +products_file = Rails.root.join("db", "products.csv") -CSV.foreach(media_file, headers: true, header_converters: :symbol, converters: :all) do |row| +CSV.foreach(products_file, headers: true, header_converters: :symbol, converters: :all) do |row| data = Hash[row.headers.zip(row.fields)] puts data Product.create!(data) end - From 1823b81484db02a9c86f52cfbd37f9db74f7194f Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 10 Jun 2020 13:35:33 -0700 Subject: [PATCH 047/350] fix validation for "product_name" --- app/models/product.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/product.rb b/app/models/product.rb index 2db6763184..0504e8e7ba 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -1,8 +1,8 @@ class Product < ApplicationRecord - validates :name, presence: true, uniqueness: true + validates :product_name, presence: true, uniqueness: true validates :price, numericality: { greater_than_or_equal_to: 0 } - belongs_to :merchant + # belongs_to :merchant has_and_belongs_to_many :categories has_many :reviews end From bfac9bff111b0b7fcdc5b85f365e881553a90d42 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 10 Jun 2020 14:18:50 -0700 Subject: [PATCH 048/350] "Dropped ill-named join products-categories table, remade correct migration." --- app/models/category.rb | 3 ++- .../20200610203149_relate_categories_to_products.rb | 5 +++++ .../20200610204945_create_categories_products_join.rb | 8 ++++++++ .../20200610210957_remove_categories_products_join.rb | 5 +++++ .../20200610211317_create_categories_products.rb | 8 ++++++++ db/schema.rb | 11 ++++++++++- 6 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20200610203149_relate_categories_to_products.rb create mode 100644 db/migrate/20200610204945_create_categories_products_join.rb create mode 100644 db/migrate/20200610210957_remove_categories_products_join.rb create mode 100644 db/migrate/20200610211317_create_categories_products.rb diff --git a/app/models/category.rb b/app/models/category.rb index 01faa53084..68960db28e 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -1,3 +1,4 @@ class Category < ApplicationRecord - # has_and_belongs_to_many :products + has_and_belongs_to_many :products + end diff --git a/db/migrate/20200610203149_relate_categories_to_products.rb b/db/migrate/20200610203149_relate_categories_to_products.rb new file mode 100644 index 0000000000..c8b42c2b1c --- /dev/null +++ b/db/migrate/20200610203149_relate_categories_to_products.rb @@ -0,0 +1,5 @@ +class RelateCategoriesToProducts < ActiveRecord::Migration[6.0] + def change + add_reference :categories, :products, index: true + end +end diff --git a/db/migrate/20200610204945_create_categories_products_join.rb b/db/migrate/20200610204945_create_categories_products_join.rb new file mode 100644 index 0000000000..bcbe889705 --- /dev/null +++ b/db/migrate/20200610204945_create_categories_products_join.rb @@ -0,0 +1,8 @@ +class CreateCategoriesProducts < ActiveRecord::Migration[6.0] + def change + create_table :categories_products do |t| + t.belongs_to :category, index: true + t.belongs_to :product, index: true + end + end +end diff --git a/db/migrate/20200610210957_remove_categories_products_join.rb b/db/migrate/20200610210957_remove_categories_products_join.rb new file mode 100644 index 0000000000..b0d461a262 --- /dev/null +++ b/db/migrate/20200610210957_remove_categories_products_join.rb @@ -0,0 +1,5 @@ +class RemoveCategoriesProductsJoin < ActiveRecord::Migration[6.0] + def change + drop_table :categories_products_joins + end +end diff --git a/db/migrate/20200610211317_create_categories_products.rb b/db/migrate/20200610211317_create_categories_products.rb new file mode 100644 index 0000000000..bcbe889705 --- /dev/null +++ b/db/migrate/20200610211317_create_categories_products.rb @@ -0,0 +1,8 @@ +class CreateCategoriesProducts < ActiveRecord::Migration[6.0] + def change + create_table :categories_products do |t| + t.belongs_to :category, index: true + t.belongs_to :product, index: true + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 0e794b0543..27fc656232 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: 2020_06_10_071324) do +ActiveRecord::Schema.define(version: 2020_06_10_211317) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -19,6 +19,15 @@ t.string "category_name" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.bigint "products_id" + t.index ["products_id"], name: "index_categories_on_products_id" + end + + create_table "categories_products", force: :cascade do |t| + t.bigint "category_id" + t.bigint "product_id" + t.index ["category_id"], name: "index_categories_products_on_category_id" + t.index ["product_id"], name: "index_categories_products_on_product_id" end create_table "merchants", force: :cascade do |t| From 67678aa4dd3bcdbf528786e138842a365ba1824b Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 10 Jun 2020 15:43:06 -0700 Subject: [PATCH 049/350] changed product attribute "available_quantity" to "stock" --- app/controllers/products_controller.rb | 2 +- .../20200610223722_change_available_quantity_to_stock.rb | 5 +++++ db/schema.rb | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20200610223722_change_available_quantity_to_stock.rb diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index ada5a2e669..6ac83171b8 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -69,6 +69,6 @@ def find_product end def product_params - return params.require(:product).permit(:product_name, :price, :description, :photo_url, :available_quantity, :merchant_id) + return params.require(:product).permit(:product_name, :price, :description, :photo_url, :stock, :merchant_id) end end diff --git a/db/migrate/20200610223722_change_available_quantity_to_stock.rb b/db/migrate/20200610223722_change_available_quantity_to_stock.rb new file mode 100644 index 0000000000..079dff85e4 --- /dev/null +++ b/db/migrate/20200610223722_change_available_quantity_to_stock.rb @@ -0,0 +1,5 @@ +class ChangeAvailableQuantityToStock < ActiveRecord::Migration[6.0] + def change + rename_column :products, :available_quantity, :stock + end +end diff --git a/db/schema.rb b/db/schema.rb index 27fc656232..960da3017c 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: 2020_06_10_211317) do +ActiveRecord::Schema.define(version: 2020_06_10_223722) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -54,7 +54,7 @@ t.string "description" t.float "price" t.string "photo_url" - t.bigint "available_quantity" + t.bigint "stock" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false end From 0fcd8a521729f4cdff2bed5a3289efec7090fc6d Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 10 Jun 2020 16:15:45 -0700 Subject: [PATCH 050/350] Fixed products-reviews relations in schema and create action in review controller --- app/controllers/reviews_controller.rb | 27 ++++++++++++++++++- app/models/review.rb | 10 +++---- .../20200610212040_create_products_reviews.rb | 8 ++++++ ...200610212237_relate_products_to_reviews.rb | 5 ++++ ...5449_remove_products_reviews_join_table.rb | 5 ++++ ...0200610225854_relate_productsto_reviews.rb | 5 ++++ db/schema.rb | 7 ++++- 7 files changed, 60 insertions(+), 7 deletions(-) create mode 100644 db/migrate/20200610212040_create_products_reviews.rb create mode 100644 db/migrate/20200610212237_relate_products_to_reviews.rb create mode 100644 db/migrate/20200610225449_remove_products_reviews_join_table.rb create mode 100644 db/migrate/20200610225854_relate_productsto_reviews.rb diff --git a/app/controllers/reviews_controller.rb b/app/controllers/reviews_controller.rb index 115cbcfeaa..cc457a24e8 100644 --- a/app/controllers/reviews_controller.rb +++ b/app/controllers/reviews_controller.rb @@ -5,6 +5,31 @@ def new end def create - # do stuff + # should we check for merchant_id in this action, or take care of in review validations?? + # rescue ActionController::ParameterMissing + # redirect_to new_review_path + + if params[:product_id].nil? + # correct behavior? + redirect_to root_path, notice: 'Review unable to be created' + return + end + + @review = Review.new(review_params) + @review.product_id = params[:product_id] + + if @review.save + flash[:success] = "Review added successfully" + redirect_to product_path(params[:product_id]) + else + # different path??? + redirect_to root_path, notice: 'Problem: Review was not made.' + end + end + + private + + def review_params + return params.require(:review).permit(:content, :rating) end end diff --git a/app/models/review.rb b/app/models/review.rb index a9e23a7f37..d4d6613711 100644 --- a/app/models/review.rb +++ b/app/models/review.rb @@ -1,11 +1,11 @@ class Review < ApplicationRecord belongs_to :product - validates :rating, presence: true, numericality: { - only_integer: true, - greater_than_or_equal_to: 1, - less_than_or_equal_to: 5 - } + # validates :rating, presence: true, numericality: { + # only_integer: true, + # greater_than_or_equal_to: 1, + # less_than_or_equal_to: 5 + # } # validates NOT merchant id end diff --git a/db/migrate/20200610212040_create_products_reviews.rb b/db/migrate/20200610212040_create_products_reviews.rb new file mode 100644 index 0000000000..30e8ad6c6a --- /dev/null +++ b/db/migrate/20200610212040_create_products_reviews.rb @@ -0,0 +1,8 @@ +class CreateProductsReviews < ActiveRecord::Migration[6.0] + def change + create_table :products_reviews do |t| + t.belongs_to :product, index: true + t.belongs_to :review, index: true + end + end +end diff --git a/db/migrate/20200610212237_relate_products_to_reviews.rb b/db/migrate/20200610212237_relate_products_to_reviews.rb new file mode 100644 index 0000000000..2078b41eaa --- /dev/null +++ b/db/migrate/20200610212237_relate_products_to_reviews.rb @@ -0,0 +1,5 @@ +class RelateProductsToReviews < ActiveRecord::Migration[6.0] + def change + add_reference :products, :reviews, index: true + end +end diff --git a/db/migrate/20200610225449_remove_products_reviews_join_table.rb b/db/migrate/20200610225449_remove_products_reviews_join_table.rb new file mode 100644 index 0000000000..73caa97dfb --- /dev/null +++ b/db/migrate/20200610225449_remove_products_reviews_join_table.rb @@ -0,0 +1,5 @@ +class RemoveProductsReviewsJoinTable < ActiveRecord::Migration[6.0] + def change + drop_table :products_reviews + end +end diff --git a/db/migrate/20200610225854_relate_productsto_reviews.rb b/db/migrate/20200610225854_relate_productsto_reviews.rb new file mode 100644 index 0000000000..335626a311 --- /dev/null +++ b/db/migrate/20200610225854_relate_productsto_reviews.rb @@ -0,0 +1,5 @@ +class RelateProductstoReviews < ActiveRecord::Migration[6.0] + def change + add_reference :reviews, :product, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 27fc656232..a1728ef1bf 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: 2020_06_10_211317) do +ActiveRecord::Schema.define(version: 2020_06_10_225854) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -57,6 +57,8 @@ t.bigint "available_quantity" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.bigint "reviews_id" + t.index ["reviews_id"], name: "index_products_on_reviews_id" end create_table "reviews", force: :cascade do |t| @@ -64,6 +66,9 @@ t.integer "rating", default: 1 t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.bigint "product_id" + t.index ["product_id"], name: "index_reviews_on_product_id" end + add_foreign_key "reviews", "products" end From dc670ffca867c417a5839b96c7370bd54b8b39c3 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 10 Jun 2020 16:48:29 -0700 Subject: [PATCH 051/350] added product and merchant relations --- app/models/merchant.rb | 7 ++++--- app/models/product.rb | 2 +- config/routes.rb | 1 + db/migrate/20200610232816_relate_merchant_to_products.rb | 5 +++++ db/migrate/20200610233957_remove_merchant_id_column.rb | 5 +++++ db/schema.rb | 6 ++++-- 6 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 db/migrate/20200610232816_relate_merchant_to_products.rb create mode 100644 db/migrate/20200610233957_remove_merchant_id_column.rb diff --git a/app/models/merchant.rb b/app/models/merchant.rb index 64a71afde9..a625b5aec7 100644 --- a/app/models/merchant.rb +++ b/app/models/merchant.rb @@ -2,7 +2,8 @@ class Merchant < ApplicationRecord has_many :products validates :username, presence: true, uniqueness: true - validates :merchant_id, uniqueness: true, presence: true + # remove? + # validates :merchant_id, uniqueness: true, presence: true validates :email, uniqueness: true, presence: true # custom mthod to create new merchant @@ -20,10 +21,10 @@ def self.total_revenue end - def find.all_orders + # def find.all_orders - end + # end # need to work with OrderItem def revenue_by_status(status) diff --git a/app/models/product.rb b/app/models/product.rb index 0504e8e7ba..5b1b1f6e26 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -2,7 +2,7 @@ class Product < ApplicationRecord validates :product_name, presence: true, uniqueness: true validates :price, numericality: { greater_than_or_equal_to: 0 } - # belongs_to :merchant + belongs_to :merchant has_and_belongs_to_many :categories has_many :reviews end diff --git a/config/routes.rb b/config/routes.rb index a85acf221a..23b07331eb 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,6 +3,7 @@ resources :pages, only: :index resources :products + resources :merchants resources :orderitems, only: [:edit, :destroy] patch 'orderitems/:id', to: 'orderitems#update' diff --git a/db/migrate/20200610232816_relate_merchant_to_products.rb b/db/migrate/20200610232816_relate_merchant_to_products.rb new file mode 100644 index 0000000000..df7c6d2d6e --- /dev/null +++ b/db/migrate/20200610232816_relate_merchant_to_products.rb @@ -0,0 +1,5 @@ +class RelateMerchantToProducts < ActiveRecord::Migration[6.0] + def change + add_reference :products, :merchant, foreign_key:true + end +end diff --git a/db/migrate/20200610233957_remove_merchant_id_column.rb b/db/migrate/20200610233957_remove_merchant_id_column.rb new file mode 100644 index 0000000000..b5544bbd41 --- /dev/null +++ b/db/migrate/20200610233957_remove_merchant_id_column.rb @@ -0,0 +1,5 @@ +class RemoveMerchantIdColumn < ActiveRecord::Migration[6.0] + def change + remove_column :merchants, :merchant_id + end +end diff --git a/db/schema.rb b/db/schema.rb index a5fdb96d12..bf83730ffd 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: 2020_06_10_225854) do +ActiveRecord::Schema.define(version: 2020_06_10_233957) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -33,7 +33,6 @@ create_table "merchants", force: :cascade do |t| t.string "username" t.string "email" - t.bigint "merchant_id" t.bigint "provider" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false @@ -58,6 +57,8 @@ t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false t.bigint "reviews_id" + t.bigint "merchant_id" + t.index ["merchant_id"], name: "index_products_on_merchant_id" t.index ["reviews_id"], name: "index_products_on_reviews_id" end @@ -70,5 +71,6 @@ t.index ["product_id"], name: "index_reviews_on_product_id" end + add_foreign_key "products", "merchants" add_foreign_key "reviews", "products" end From a30505fba8bf0d80349d554ca9f2d80e7cfc5848 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 10 Jun 2020 17:11:22 -0700 Subject: [PATCH 052/350] added favicon --- app/assets/images/favicon.png | Bin 0 -> 2803 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/assets/images/favicon.png diff --git a/app/assets/images/favicon.png b/app/assets/images/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..0ce9fa56db15806014aaeba723737eedeb9e292c GIT binary patch literal 2803 zcmVY!t2IUWB9OdN$w4hKNPzLNkf#G3kDI&CnHrYIOlg&Pk ze`N1wpV{5)t}sKs|0KV2&*OK#zwi0obI)0r$2{gSk9o}F6AMx30ao{KYg3fac4-Oy z;jh1c=#@f`mn{lPfMFQ=h&S}QM6?0N{90h~-bWvG7jn#Op%k)nw?|$Yo;*OMI;DQS zkmJn-1yg{_wNtC88F~w7i7Fn^(OVvS?1AAzjhihBrhtk?$1f*#@&KhiIdx^B#+(ZZ zLV#fyI#TR5?bep2$TK0hs_*>s%L*~>Tu=}K+!LY8fJT6digLcO>k3LsOU%b*AE#W9 zcLH3lof?wsO?$hs8He4@r_Ve!Qb!1`-nj9?@_dgy7v!CQ@|xi>aE#TltU2(cSbtV zyMx-6&aB#Jq5@UO>j+PNX=ew$E2as)aQjv?O*52kr@n>Q~Iu*0-Jzx{$p-KvF^tY5o&rY+nyFffqyeCAAm-%_*#sE4^l z-^6Sxu=tg0fg*tRwiZrw^~SWlXxrB4guCpy7hl_&?f90tINjghZE6A2Wu|kPlLGP;eG|!4pa;~efKq^l`Z`WKWmVF)+l#BZo`0(Mh`+~Ft7>1$y1HtDJVheBv;mKR=PL{1Y z3!$VJQ6>Zc*c`zZlm?4{?_HPp6dzV=m3 zLu9z?u5Id!L|h{I;Lz&{b*6m2gff7J#XV@c)ihfd)C^yev|m@vmn^}yxYsUe7Y-6=V|?o>@@LG>a^O3Tx#p{}(H!YV+*`*A7=g+c^^fuwC4 zI=azqcGGMM2Qej55>Qb+bQ$5REvwBzUE9)Goz4UTfwQEH1=WjCwbaW~QB{i5s34GH z8CX<}#>G*&0Qt@S{{EEGOG-d|^qZEf$SL~q&~z)6)pa;a%2H|}UIiZ|bglGsV&dXEPO-eu^q8|?-1SO^AET~$9MN1?%UIklgKgZ0UDRk>}j+*d{F*Y=eYSALOVYXc0Pmu^s)VD6h<}5Os*7$<@m*VTh z5D*=G-R{V0vy%%{Rg3H@r3~U88YC19qF5{`a=~=uXG?@Iy|ZjyvNB>zA$Io}Mp1N~ z2muN2{Uy17=4ONVO_FDPl<|>aG)+sH3#R zedbd*f>1EX@UcNq6iOP=bd+6apXB9-}U`JqYpEA zAQ`-4BUIGX$Ee^x2VX-cCN4YMPbafb|N~Pyi~bk6%Fad%vadnLi%7 zHBkZ4@J&ueA9~;kpBtph12DbkXkL0klr19%uWGm?vaxRMTNzMW6_rT|K7sUsoP;z= z%Nbe<0s_8CMvfoBGcpwGgb>tkYzlulrgyG>c^iih?(=$&k2*j`eyphiJo(szzdh$% zV~dc|T6a>%+lnq81lbhbvGf6cft-{uDUiPK-@x=cdH>({Fgo-hc4slp;&L1%WjKmU zaTb^1C@M{Ra1y@+0#lQW97~+IKwvF#uz1}`k2*U6?gS>G6?@|x0DA*iDI7`Z=$tfxg6I2!>{deAajY;nqBOiW{ zIB_AU?rNrW^$8SLS7bElFvf)7s%v`J{XD5}sai=X#rI#@bFmcS2f(Z&h5|wM-TxC!@D7jS9U8?mIL!E<8}HC4P|27eY|Eq=EL;E=p=EvuX<*2XVtSz31E~ zgqSr!WW0#(dilvSkfGawPi5TL|S)C=@y<2p+ihgpKbO(#LtsV;-Mu{12TRny_{1K}`Sv002ovPDHLk FV1nsaV8s9c literal 0 HcmV?d00001 From 6187786c3bdbdfa2fedca96bc5890ed4c1bfef5b Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 10 Jun 2020 17:12:18 -0700 Subject: [PATCH 053/350] added favicon and changed title tag from "Betsy" to "Outdoorsy" --- app/views/layouts/application.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 74961e61a4..3b50aacddb 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,12 +1,13 @@ - Betsy + Outdoorsy <%= csrf_meta_tags %> <%= csp_meta_tag %> <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> + <%= favicon_link_tag 'favicon.png' %> From 07192251e369e6e3f06991ea1280d27c74c35886 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 10 Jun 2020 17:12:45 -0700 Subject: [PATCH 054/350] other files to make favicon appear --- .DS_Store | Bin 8196 -> 8196 bytes app/.DS_Store | Bin 0 -> 6148 bytes app/assets/.DS_Store | Bin 0 -> 6148 bytes app/assets/images/.DS_Store | Bin 0 -> 6148 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/.DS_Store create mode 100644 app/assets/.DS_Store create mode 100644 app/assets/images/.DS_Store diff --git a/.DS_Store b/.DS_Store index a0252a2411186347dd359048000e6d76d69bf8ea..2b1f83f08a110e12b27579be1207639e3317b7f3 100644 GIT binary patch delta 67 zcmZp1XmOa}&nUeyU^hRb^kg0ZO#x;v36mP0@Qy6B{%EIz$ei diff --git a/app/.DS_Store b/app/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..c32883842752acf742ff9e4a68f0123bb24f31f0 GIT binary patch literal 6148 zcmeHKISv9b4733uBpOP}e1RWC2wuPkI6EYYg?=mE#nTuc1!$pz0yJJZlQ^ENc8Yi{ zB09h9XCf038Nm(ZYD3p--@IeJj3^L}GtScNo857HIvqRNuLH&%%0?PIhey6`(5L_v zpaN8Y3Q&QME0862H2(O>Jdg@dfnQg^?uP<5tch))UmX~{1pp2ZcEj9z31G1RuqL*F zh`==`Eo-SGgIZ^>C@T@>TmJ_T0OZc1q z|Cz)U6`%rtrGO3=tHm6jl(n_U%pabM+2j!Q2{DI1*iZOpaKt9AWLlX_VAN=AQhkj&#r)d9}3*CCXRvr>A>JE0C0}58|L0i z0E-2HHE|3?1g1d+2351g(4Zq;GOs3%fk79|=0o#l%??HVcAQ^4U9<*rqykjnUV)cb zwpRaF@L&4>dlFYvfC~I81$5rO_Z^;;wRQ41tF;BbhFi`RZicy2FnBozdO60z%JIUJ bBCpsS`!#V4bUNZr2l8jYbfHm!zgFM|YL^v< literal 0 HcmV?d00001 diff --git a/app/assets/images/.DS_Store b/app/assets/images/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 Date: Wed, 10 Jun 2020 17:29:36 -0700 Subject: [PATCH 055/350] set viewport to be responsive --- app/views/layouts/application.html.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 3b50aacddb..7c40d4bf89 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -8,6 +8,7 @@ <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> <%= favicon_link_tag 'favicon.png' %> + From 3c1918376ad3c2e9ead6b813f816435751b6f5f3 Mon Sep 17 00:00:00 2001 From: denisseai Date: Wed, 10 Jun 2020 19:07:41 -0700 Subject: [PATCH 056/350] migrated merchant and order --- app/models/merchant.rb | 3 ++- app/models/order.rb | 18 ++++++++++-------- .../20200611012452_relate_merchant_to_order.rb | 5 +++++ .../20200611014346_add_columns_to_order.rb | 13 +++++++++++++ db/schema.rb | 13 ++++++++++++- 5 files changed, 42 insertions(+), 10 deletions(-) create mode 100644 db/migrate/20200611012452_relate_merchant_to_order.rb create mode 100644 db/migrate/20200611014346_add_columns_to_order.rb diff --git a/app/models/merchant.rb b/app/models/merchant.rb index a625b5aec7..107543299f 100644 --- a/app/models/merchant.rb +++ b/app/models/merchant.rb @@ -1,7 +1,8 @@ class Merchant < ApplicationRecord has_many :products + has_many :orders - validates :username, presence: true, uniqueness: true + #validates :username, presence: true, uniqueness: true # remove? # validates :merchant_id, uniqueness: true, presence: true validates :email, uniqueness: true, presence: true diff --git a/app/models/order.rb b/app/models/order.rb index 1e4c2925d9..cbce304f30 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -2,19 +2,21 @@ class Order < ApplicationRecord has_many :orderitems has_many :products, through: :orderitems + belongs_to :merchant + validates :status, presence: true, inclusion: { in: %w(pending paid complete cancel), message: "%{value} is not a valid status" } - validates :orderitems, length: { minimum: 1, message: "Your cart is empty" }, on: :update - validates :email, presence: true, on: :update - validates :address, presence: true, on: :update - validates :cc_name, presence: true, on: :update - validates :cc_num, presence: true, numericality: { only_integer: true }, length: { minimum: 4 }, on: :update - validates :cvv, presence: true, numericality: { only_integer: true }, on: :update - validates :cc_exp, presence: true, on: :update - validates :zip, presence: true, numericality: { only_integer: true }, on: :update + # validates :orderitems, length: { minimum: 1, message: "Your cart is empty" }, on: :update + # validates :email, presence: true, on: :update + # validates :address, presence: true, on: :update + # validates :cc_name, presence: true, on: :update + # validates :cc_num, presence: true, numericality: { only_integer: true }, length: { minimum: 4 }, on: :update + # validates :cvv, presence: true, numericality: { only_integer: true }, on: :update + # validates :cc_exp, presence: true, on: :update + # validates :zip, presence: true, numericality: { only_integer: true }, on: :update def reduce_stock self.orderitems.each do |orderitem| diff --git a/db/migrate/20200611012452_relate_merchant_to_order.rb b/db/migrate/20200611012452_relate_merchant_to_order.rb new file mode 100644 index 0000000000..88f3dfc34c --- /dev/null +++ b/db/migrate/20200611012452_relate_merchant_to_order.rb @@ -0,0 +1,5 @@ +class RelateMerchantToOrder < ActiveRecord::Migration[6.0] + def change + add_reference :merchants, :order, index: true + end +end diff --git a/db/migrate/20200611014346_add_columns_to_order.rb b/db/migrate/20200611014346_add_columns_to_order.rb new file mode 100644 index 0000000000..14332d782d --- /dev/null +++ b/db/migrate/20200611014346_add_columns_to_order.rb @@ -0,0 +1,13 @@ +class AddColumnsToOrder < ActiveRecord::Migration[6.0] + def change + add_column :orders, :total, :float + add_column :orders, :status, :string + add_column :orders, :email, :string + add_column :orders, :address, :string + add_column :orders, :cc_name, :string + add_column :orders, :cc_num, :bigint + add_column :orders, :cvv, :integer + add_column :orders, :cc_exp, :integer + add_column :orders, :zip, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index bf83730ffd..ae87e7bd84 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: 2020_06_10_233957) do +ActiveRecord::Schema.define(version: 2020_06_11_014346) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -36,6 +36,8 @@ t.bigint "provider" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.bigint "order_id" + t.index ["order_id"], name: "index_merchants_on_order_id" end create_table "orderitems", force: :cascade do |t| @@ -46,6 +48,15 @@ create_table "orders", force: :cascade do |t| t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.float "total" + t.string "status" + t.string "email" + t.string "address" + t.string "cc_name" + t.bigint "cc_num" + t.integer "cvv" + t.integer "cc_exp" + t.integer "zip" end create_table "products", force: :cascade do |t| From 996647d1acf27481bac48c749064b98f8b978949 Mon Sep 17 00:00:00 2001 From: denisseai Date: Wed, 10 Jun 2020 19:13:55 -0700 Subject: [PATCH 057/350] added column to orderitems --- db/migrate/20200611021301_add_columns_to_orderitems.rb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 db/migrate/20200611021301_add_columns_to_orderitems.rb diff --git a/db/migrate/20200611021301_add_columns_to_orderitems.rb b/db/migrate/20200611021301_add_columns_to_orderitems.rb new file mode 100644 index 0000000000..df33d3dfbd --- /dev/null +++ b/db/migrate/20200611021301_add_columns_to_orderitems.rb @@ -0,0 +1,5 @@ +class AddColumnsToOrderitems < ActiveRecord::Migration[6.0] + def change + add_column :orderitems, :shipped, :boolean + end +end From 63141a82bcf91a719c37b436eff214d8a16faa60 Mon Sep 17 00:00:00 2001 From: denisseai Date: Wed, 10 Jun 2020 19:20:14 -0700 Subject: [PATCH 058/350] Made migrations for orderitems --- ...200611021708_add_order_id_to_orderitems.rb | 5 ++ ...0611021903_add_product_id_to_orderitems.rb | 5 ++ db/schema.rb | 62 +++++++++++++++++-- 3 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20200611021708_add_order_id_to_orderitems.rb create mode 100644 db/migrate/20200611021903_add_product_id_to_orderitems.rb diff --git a/db/migrate/20200611021708_add_order_id_to_orderitems.rb b/db/migrate/20200611021708_add_order_id_to_orderitems.rb new file mode 100644 index 0000000000..dcecf53efd --- /dev/null +++ b/db/migrate/20200611021708_add_order_id_to_orderitems.rb @@ -0,0 +1,5 @@ +class AddOrderIdToOrderitems < ActiveRecord::Migration[6.0] + def change + add_reference :orderitems, :order, index: true + end +end diff --git a/db/migrate/20200611021903_add_product_id_to_orderitems.rb b/db/migrate/20200611021903_add_product_id_to_orderitems.rb new file mode 100644 index 0000000000..32d4736f67 --- /dev/null +++ b/db/migrate/20200611021903_add_product_id_to_orderitems.rb @@ -0,0 +1,5 @@ +class AddProductIdToOrderitems < ActiveRecord::Migration[6.0] + def change + add_reference :orderitems, :product, index: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 11e9f79ab1..9166394150 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,29 +10,83 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_06_10_063347) do +ActiveRecord::Schema.define(version: 2020_06_11_021903) 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 "category_name" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.bigint "products_id" + t.index ["products_id"], name: "index_categories_on_products_id" + end + + create_table "categories_products", force: :cascade do |t| + t.bigint "category_id" + t.bigint "product_id" + t.index ["category_id"], name: "index_categories_products_on_category_id" + t.index ["product_id"], name: "index_categories_products_on_product_id" + end + create_table "merchants", force: :cascade do |t| t.string "username" t.string "email" - t.bigint "merchant_id" t.bigint "provider" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.bigint "order_id" + t.index ["order_id"], name: "index_merchants_on_order_id" end create_table "orderitems", force: :cascade do |t| t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.boolean "shipped" + t.bigint "order_id" + t.bigint "product_id" + t.index ["order_id"], name: "index_orderitems_on_order_id" + t.index ["product_id"], name: "index_orderitems_on_product_id" end create_table "orders", force: :cascade do |t| t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.float "total" + t.string "status" + t.string "email" + t.string "address" + t.string "cc_name" + t.bigint "cc_num" + t.integer "cvv" + t.integer "cc_exp" + t.integer "zip" + end + + create_table "products", force: :cascade do |t| + t.string "product_name" + t.string "description" + t.float "price" + t.string "photo_url" + t.bigint "stock" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.bigint "reviews_id" + t.bigint "merchant_id" + t.index ["merchant_id"], name: "index_products_on_merchant_id" + t.index ["reviews_id"], name: "index_products_on_reviews_id" end - # add_foreign_key "orderitems", "orders" - # add_foreign_key "orderitems", "products" + + create_table "reviews", force: :cascade do |t| + t.string "content" + t.integer "rating", default: 1 + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.bigint "product_id" + t.index ["product_id"], name: "index_reviews_on_product_id" + end + + add_foreign_key "products", "merchants" + add_foreign_key "reviews", "products" end From ce361094085106a0b8a4ed1e1bc0ce2c01e9b7fd Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 11 Jun 2020 01:25:06 -0700 Subject: [PATCH 059/350] created barebones navigation bar, default padding for content, and sticky footer --- app/assets/stylesheets/application.scss | 98 +++++++++++++++++++++---- app/assets/stylesheets/pages.scss | 19 ----- app/views/layouts/application.html.erb | 55 +++++++++++++- app/views/pages/index.html.erb | 10 +-- 4 files changed, 138 insertions(+), 44 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 3d573122ff..346c0354af 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,16 +1,86 @@ -/* - * 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. - * - */ -/* Custom bootstrap variables must be set or imported *before* bootstrap. */ @import "bootstrap"; @import "**/*"; + +/* Fonts */ +@import url('https://fonts.googleapis.com/css2?family=Rubik:wght@300;400&display=swap'); +@import url('https://fonts.googleapis.com/css2?family=Old+Standard+TT:ital,wght@0,400;0,700;1,400&display=swap'); + +/* Header */ +header { + padding: 30px; + font-size: 20px; + max-width: 100%; +} + +.header-logo, a{ + font-family: 'Old Standard TT', serif; + font-weight: 700; + font-size: 90px; + color: #000; +} + +.header-logo:hover { + text-decoration: none; + color: #6d6d6d; +} + +.header-byline { + font-family: 'Old Standard TT', serif; + font-weight: 400; + font-style: italic; + color: #7f7f7f; +} + +/* Navigation */ +.nav-item-custom { + font-family: 'Rubik', sans-serif; + text-transform: uppercase; +} + +.nav-link-custom, a { + font-family: 'Rubik', sans-serif; + color: black; + font-size: 20px; + font-weight: 300; +} + +.nav-link-custom:hover { + text-decoration: none; + color: #7f7f7f; +} + +/* Content */ + +html { + height: 100%; +} + +.content { + padding: 40px 70px 60px 70px; +} + +body { + min-height: 100%; + display: grid; + grid-template-rows: 1fr auto; + overflow-x: hidden; + font-family: 'Rubik', sans-serif; +} + + +/* Footer */ +.footer { + padding: 30px; + text-transform: uppercase; + text-align: center; + font-family: 'Rubik', sans-serif; + background-color: rgb(206, 206, 206); + color: white; +} + +// allows for sticky footer when placed in body class +.wrapper { + min-height: 100%; + display: grid; + grid-template-rows: auto 1fr auto; +} \ No newline at end of file diff --git a/app/assets/stylesheets/pages.scss b/app/assets/stylesheets/pages.scss index deff538233..2962555127 100644 --- a/app/assets/stylesheets/pages.scss +++ b/app/assets/stylesheets/pages.scss @@ -1,22 +1,3 @@ // Place all the styles related to the Pages controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: https://sass-lang.com/ - -// Fonts -@import url('https://fonts.googleapis.com/css2?family=Old+Standard+TT:ital,wght@0,400;0,700;1,400&display=swap'); - -.homepage { - font-family: 'Old Standard TT', serif; - text-align: center; -} - -.homepage-header { - font-weight: 700; - font-size: 90px; -} - -.homepage-byline { - font-weight: 400; - font-style: italic; - color: #7f7f7f; -} \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 7c40d4bf89..cd9f6d5fd3 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -11,7 +11,58 @@ - - <%= yield %> + + + <%# Header %> +
+ +
+ + <%# Content %> +
+ <%= yield %> +
+ + + <%# Footer %> +
Footer, Gretchen Granola Girls, icon attributions, disclaimer
+ + diff --git a/app/views/pages/index.html.erb b/app/views/pages/index.html.erb index 9d047b7e38..139597f9cb 100644 --- a/app/views/pages/index.html.erb +++ b/app/views/pages/index.html.erb @@ -1,10 +1,2 @@ -
-
- Outdoorsy -
-
-

Shop for a piece of the outdoors regardless of your budget

- <%= link_to "View all products", products_path, :class => "btn btn-dark"%> -
-
\ No newline at end of file + From 12749c239aa0730e843ce26d222f22aa91bd6711 Mon Sep 17 00:00:00 2001 From: denisseai Date: Thu, 11 Jun 2020 12:49:55 -0700 Subject: [PATCH 060/350] Added test for orders --- app/controllers/orders_controller.rb | 3 +++ db/schema.rb | 3 ++- test/controllers/orders_controller_test.rb | 25 +++++++++++++++++++--- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index f9eee2ec6d..f55c0adff2 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -16,6 +16,9 @@ def cart end end + #todo create payment information form + def edit ; end + # Process order after payment info has been addded def update @order.orderitems.each do |oderitem| diff --git a/db/schema.rb b/db/schema.rb index 9166394150..971dc1c61b 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: 2020_06_11_021903) do +ActiveRecord::Schema.define(version: 2020_06_11_170125) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -74,6 +74,7 @@ t.datetime "updated_at", precision: 6, null: false t.bigint "reviews_id" t.bigint "merchant_id" + t.boolean "retired" t.index ["merchant_id"], name: "index_products_on_merchant_id" t.index ["reviews_id"], name: "index_products_on_reviews_id" end diff --git a/test/controllers/orders_controller_test.rb b/test/controllers/orders_controller_test.rb index 4b01cc1988..577bea9391 100644 --- a/test/controllers/orders_controller_test.rb +++ b/test/controllers/orders_controller_test.rb @@ -1,7 +1,26 @@ require "test_helper" describe OrdersController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + let(:valid_params){ + { + order:{ + email: "test@gmail.com", + address: "123 test avenue", + cc_name: "Jane Doe", + cc_num: 12345, + cvv: 123, + cc_exp: "06/2020", + zip: 987654, + }, + } + } + + describe "empty cart" do + it "redirects to root path and provides a message" do + get cart_path + must_respond_with :redirect + must_redirect_to root_path + expect(flash[:status]).must_equal :failure + end + end end From aa12cf76faecc08afaecc34125d0403e6b0b645b Mon Sep 17 00:00:00 2001 From: denisseai Date: Thu, 11 Jun 2020 13:27:08 -0700 Subject: [PATCH 061/350] Added some yml files in fixtures --- test/fixtures/orderitems.yml | 25 +++++++++++++++++++ test/fixtures/orders.yml | 18 ++++++++++++++ test/fixtures/products.yml | 48 ++++++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+) create mode 100644 test/fixtures/orderitems.yml create mode 100644 test/fixtures/orders.yml create mode 100644 test/fixtures/products.yml diff --git a/test/fixtures/orderitems.yml b/test/fixtures/orderitems.yml new file mode 100644 index 0000000000..7323403a85 --- /dev/null +++ b/test/fixtures/orderitems.yml @@ -0,0 +1,25 @@ +rx_bar: + quantity: 3 + order: order1 + product: rx bar + shipped: false +snow: + quantity: 1 + order: order1 + product: snow pass + shipped: false +nature_valley: + quantity: 2 + order: order2 + product: nature valley + shipped: false +rainer: + quantity: 1 + order: order2 + product: mount rainer + shipped: false +discover: + quantity: 1 + order: order2 + product: discover pass + shipped: false diff --git a/test/fixtures/orders.yml b/test/fixtures/orders.yml new file mode 100644 index 0000000000..227f309c86 --- /dev/null +++ b/test/fixtures/orders.yml @@ -0,0 +1,18 @@ +order1: + email: nature@gmail.com + address: 1234 pine dr. + cc_name: squirrel pinenut + cc_num: 4140837365242638 + cvv: 123 + cc_exp: 02/22 + zip: 90210 + status: pending +order2: + email: cherry@gmail.com + address: 1234 central park street + cc_name: Pink Cherry + cc_num: 4140837365242639 + cvv: 123 + cc_exp: 02/23 + zip: 90210 + status: paid \ No newline at end of file diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml new file mode 100644 index 0000000000..9293750451 --- /dev/null +++ b/test/fixtures/products.yml @@ -0,0 +1,48 @@ +rx_bar: + name: RxBar + description: Simple ingredients + price: 2.45 + photo_url: + stock: 3 + merchant: Nena + retired: false +kind: + name: KIND bar + description: GF bar + price: 1.45 + photo_url: + stock: 5 + merchant: Nena + retired: true +nature: + name: Nature Valley + description: Crunchy Granola Oats n Honey + price: 1.25 + photo_url: + stock: 8 + merchant: Nena + retired: false +rainer: + name: Mount Rainer + description: Volcano + price: 5000 + photo_url: + stock: 1 + merchant: Max + retired: false +discover: + name: Discover Pass + description: Parking pass for local parks + price: 40 + photo_url: + stock: 30 + merchant: Max + retired: false +snow: + name: Snow Pass + description: Parking pass for local parks in winter + price: 25 + photo_url: + stock: 15 + merchant: Max + retired: false \ No newline at end of file From b019af119ba054a5ad8c8acd14cc4a92e8d3d59a Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 11 Jun 2020 13:48:50 -0700 Subject: [PATCH 062/350] removed merchants-order association --- db/migrate/20200611204628_remove_merchant_order_reference.rb | 5 +++++ db/schema.rb | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20200611204628_remove_merchant_order_reference.rb diff --git a/db/migrate/20200611204628_remove_merchant_order_reference.rb b/db/migrate/20200611204628_remove_merchant_order_reference.rb new file mode 100644 index 0000000000..507aca0df3 --- /dev/null +++ b/db/migrate/20200611204628_remove_merchant_order_reference.rb @@ -0,0 +1,5 @@ +class RemoveMerchantOrderReference < ActiveRecord::Migration[6.0] + def change + remove_reference :merchants, :order, index: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 9166394150..1c8d0f686f 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: 2020_06_11_021903) do +ActiveRecord::Schema.define(version: 2020_06_11_204628) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -36,8 +36,6 @@ t.bigint "provider" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false - t.bigint "order_id" - t.index ["order_id"], name: "index_merchants_on_order_id" end create_table "orderitems", force: :cascade do |t| @@ -74,6 +72,7 @@ t.datetime "updated_at", precision: 6, null: false t.bigint "reviews_id" t.bigint "merchant_id" + t.boolean "retired" t.index ["merchant_id"], name: "index_products_on_merchant_id" t.index ["reviews_id"], name: "index_products_on_reviews_id" end From 2f7def438f7c3771ec0339c59d6bc17c8dd12ce4 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 11 Jun 2020 13:55:03 -0700 Subject: [PATCH 063/350] fixed relationship between orders and merchant --- .../20200611204918_add_reference_order_to_merchants.rb | 5 +++++ db/schema.rb | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20200611204918_add_reference_order_to_merchants.rb diff --git a/db/migrate/20200611204918_add_reference_order_to_merchants.rb b/db/migrate/20200611204918_add_reference_order_to_merchants.rb new file mode 100644 index 0000000000..a00781cb0d --- /dev/null +++ b/db/migrate/20200611204918_add_reference_order_to_merchants.rb @@ -0,0 +1,5 @@ +class AddReferenceOrderToMerchants < ActiveRecord::Migration[6.0] + def change + add_reference :orders, :merchant, index: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 1c8d0f686f..a704ac4cfe 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: 2020_06_11_204628) do +ActiveRecord::Schema.define(version: 2020_06_11_204918) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -60,6 +60,8 @@ t.integer "cvv" t.integer "cc_exp" t.integer "zip" + t.bigint "merchant_id" + t.index ["merchant_id"], name: "index_orders_on_merchant_id" end create_table "products", force: :cascade do |t| From 3e51b0122fe89b95fa06ae434e246e3db66130ad Mon Sep 17 00:00:00 2001 From: denisseai Date: Thu, 11 Jun 2020 13:57:44 -0700 Subject: [PATCH 064/350] updated migrations --- db/migrate/20200610004212_create_orders.rb | 17 ++++++++--------- db/migrate/20200610004226_create_orderitems.rb | 3 +-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/db/migrate/20200610004212_create_orders.rb b/db/migrate/20200610004212_create_orders.rb index bb596dc55c..acca02171d 100644 --- a/db/migrate/20200610004212_create_orders.rb +++ b/db/migrate/20200610004212_create_orders.rb @@ -1,15 +1,14 @@ class CreateOrders < ActiveRecord::Migration[6.0] def change create_table :orders do |t| - # check w/becca for naming variables - # t.string :email - # t.string :address - # t.string :cc_name - # t.string :cc_num - # t.string :cvv - # t.string :cc_exp - # t.string :zip - # t.string :status + t.string :email + t.string :address + t.string :cc_name + t.string :cc_num + t.string :cvv + t.string :cc_exp + t.string :zip + t.string :status t.timestamps end diff --git a/db/migrate/20200610004226_create_orderitems.rb b/db/migrate/20200610004226_create_orderitems.rb index 145fd26c25..c13914bc73 100644 --- a/db/migrate/20200610004226_create_orderitems.rb +++ b/db/migrate/20200610004226_create_orderitems.rb @@ -1,8 +1,7 @@ class CreateOrderitems < ActiveRecord::Migration[6.0] def change create_table :orderitems do |t| - t.integer :quantity # or available_quantity - + t.integer :quantity t.timestamps end end From c4c79d995b04cf7eec347d4ee1ff81634c9d5479 Mon Sep 17 00:00:00 2001 From: denisseai Date: Thu, 11 Jun 2020 14:11:33 -0700 Subject: [PATCH 065/350] Added quantity column to orderitem --- db/migrate/20200611210431_add_column_to_orderitems.rb | 5 +++++ db/schema.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20200611210431_add_column_to_orderitems.rb diff --git a/db/migrate/20200611210431_add_column_to_orderitems.rb b/db/migrate/20200611210431_add_column_to_orderitems.rb new file mode 100644 index 0000000000..cd0d4269e6 --- /dev/null +++ b/db/migrate/20200611210431_add_column_to_orderitems.rb @@ -0,0 +1,5 @@ +class AddColumnToOrderitems < ActiveRecord::Migration[6.0] + def change + add_column :orderitems, :quantity, :bigint + end +end diff --git a/db/schema.rb b/db/schema.rb index a704ac4cfe..18708393bf 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: 2020_06_11_204918) do +ActiveRecord::Schema.define(version: 2020_06_11_210431) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -44,6 +44,7 @@ t.boolean "shipped" t.bigint "order_id" t.bigint "product_id" + t.bigint "quantity" t.index ["order_id"], name: "index_orderitems_on_order_id" t.index ["product_id"], name: "index_orderitems_on_product_id" end From 004ca2dccbe02445ff6967a684befde372014c60 Mon Sep 17 00:00:00 2001 From: denisseai Date: Thu, 11 Jun 2020 19:10:37 -0700 Subject: [PATCH 066/350] Added typo --- app/controllers/orderitems_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/orderitems_controller.rb b/app/controllers/orderitems_controller.rb index cc0df9c99d..e1ce5b0c23 100644 --- a/app/controllers/orderitems_controller.rb +++ b/app/controllers/orderitems_controller.rb @@ -1,5 +1,5 @@ class OrderitemsController < ApplicationController - before_action: find_orderitem, only: [:edit, :update, :destroy, :mark_shipped] + before_action :find_orderitem, only: [:edit, :update, :destroy, :mark_shipped] # create a new order or add to existing- do we want this? def create From 53ac899d06c13922527d44d477e3017e7fe9f7b0 Mon Sep 17 00:00:00 2001 From: denisseai Date: Thu, 11 Jun 2020 19:11:04 -0700 Subject: [PATCH 067/350] Uncommented methods for order model --- app/models/order.rb | 30 +++++++++---------- app/models/orderitem.rb | 26 +++++++++------- config/routes.rb | 1 + db/schema.rb | 8 +++-- .../controllers/orderitems_controller_test.rb | 28 +++++++++++++++-- test/fixtures/orderitems.yml | 20 ++++++------- test/fixtures/products.yml | 24 +++++++-------- 7 files changed, 83 insertions(+), 54 deletions(-) diff --git a/app/models/order.rb b/app/models/order.rb index 4e885bffd8..e21b7d16ac 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -21,21 +21,21 @@ class Order < ApplicationRecord validates :zip, presence: true, numericality: { only_integer: true }, on: :update # review after seeding - # def reduce_stock - # self.orderitems.each do |orderitem| - # orderitem.product.stock -= orderitem.quantity - # orderitem.product.save - # end - # end + def reduce_stock + self.orderitems.each do |orderitem| + orderitem.product.stock -= orderitem.quantity + orderitem.product.save + end + end - # def return_stock - # self.orderitems.each do |orderitem| - # if !orderitem.product.retired - # orderitem.product.stock += orderitem.quantity - # orderitem.product.save - # end - # end - # end + def return_stock + self.orderitems.each do |orderitem| + if !orderitem.product.retired + orderitem.product.stock += orderitem.quantity + orderitem.product.save + end + end + end def total total_cost = 0 @@ -58,7 +58,7 @@ def is_order_of(merch_id) if self.products.find_by(merchant_id: merch_id).nil? return false end - + return true end end diff --git a/app/models/orderitem.rb b/app/models/orderitem.rb index 01983fc7ba..42d65108f6 100644 --- a/app/models/orderitem.rb +++ b/app/models/orderitem.rb @@ -5,19 +5,23 @@ class Orderitem < ApplicationRecord validates :quantity, presence: true, numericality: { only_integer: true, greater_than: 0} validates :shipped, inclusion: { in: [true, false],message: "shipped status : true or false"} - # validate :in_stock - # validate :not_retired + validate :in_stock + validate :not_retired - # def subtotal - # - # end + def subtotal + return (self.quantity) * (self.product.price) + end private - # def in_stock - # - # end + def in_stock + if quantity && product && quantity > product.stock + errors.add(:quantity, "order exceeds in-stock inventory") + end + end - # def not_retired - # - # end + def not_retired + if product && product.retired + errors.add(:product_id, "#{product.name} is no longer available") + end + end end diff --git a/config/routes.rb b/config/routes.rb index 494706abb9..1343821d8e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,4 +9,5 @@ resources :orders, only: [:show, :edit] get '/cart', to: 'orders#cart', as: 'cart' patch '/orders/:id', to: 'orders#update' + get '/orders/:id/merchant_order', to: 'orders#merchant_order', as: 'merchant_order' end diff --git a/db/schema.rb b/db/schema.rb index 9166394150..18708393bf 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: 2020_06_11_021903) do +ActiveRecord::Schema.define(version: 2020_06_11_210431) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -36,8 +36,6 @@ t.bigint "provider" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false - t.bigint "order_id" - t.index ["order_id"], name: "index_merchants_on_order_id" end create_table "orderitems", force: :cascade do |t| @@ -46,6 +44,7 @@ t.boolean "shipped" t.bigint "order_id" t.bigint "product_id" + t.bigint "quantity" t.index ["order_id"], name: "index_orderitems_on_order_id" t.index ["product_id"], name: "index_orderitems_on_product_id" end @@ -62,6 +61,8 @@ t.integer "cvv" t.integer "cc_exp" t.integer "zip" + t.bigint "merchant_id" + t.index ["merchant_id"], name: "index_orders_on_merchant_id" end create_table "products", force: :cascade do |t| @@ -74,6 +75,7 @@ t.datetime "updated_at", precision: 6, null: false t.bigint "reviews_id" t.bigint "merchant_id" + t.boolean "retired" t.index ["merchant_id"], name: "index_products_on_merchant_id" t.index ["reviews_id"], name: "index_products_on_reviews_id" end diff --git a/test/controllers/orderitems_controller_test.rb b/test/controllers/orderitems_controller_test.rb index 152a3451f1..5335ec39f0 100644 --- a/test/controllers/orderitems_controller_test.rb +++ b/test/controllers/orderitems_controller_test.rb @@ -1,7 +1,29 @@ require "test_helper" describe OrderitemsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + let(:existing_orderitem) { orderitems(:snow) } + + let(:update_hash){ + { + orderitem: { + quantity: 1, + }, + } + } + + describe "create function" do + it "can create a new Orderitem with valid data" do + expect { + post product_orderitems_path(product_id: products(:rx_bar).id), params: update_hash + }.must_change "Orderitem.count", 1 + + expect(session[:order_id]).wont_be_nil + + new_orderitem = Orderitem.last + + expect(new_orderitem.product.product_name).must_equal "RxBar" + expect(new_orderitem.order.orderitems.count).must_equal 1 + must_respond_with :redirect + end + end end diff --git a/test/fixtures/orderitems.yml b/test/fixtures/orderitems.yml index 7323403a85..750651cc09 100644 --- a/test/fixtures/orderitems.yml +++ b/test/fixtures/orderitems.yml @@ -1,25 +1,25 @@ rx_bar: quantity: 3 - order: order1 - product: rx bar + order_id: order1 + product_id: RxBar shipped: false snow: quantity: 1 - order: order1 - product: snow pass + order_id: order1 + product_id: snow pass shipped: false nature_valley: quantity: 2 - order: order2 - product: nature valley + order_id: order2 + product_id: nature valley shipped: false rainer: quantity: 1 - order: order2 - product: mount rainer + order_id: order2 + product_id: mount rainer shipped: false discover: quantity: 1 - order: order2 - product: discover pass + order_id: order2 + product_id: discover pass shipped: false diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml index 9293750451..8d7418e684 100644 --- a/test/fixtures/products.yml +++ b/test/fixtures/products.yml @@ -1,48 +1,48 @@ rx_bar: - name: RxBar + product_name: RxBar description: Simple ingredients price: 2.45 photo_url: stock: 3 - merchant: Nena + merchant_id: Nena retired: false kind: - name: KIND bar + product_name: KIND bar description: GF bar price: 1.45 photo_url: stock: 5 - merchant: Nena + merchant_id: Nena retired: true nature: - name: Nature Valley + product_name: Nature Valley description: Crunchy Granola Oats n Honey price: 1.25 photo_url: stock: 8 - merchant: Nena + merchant_id: Nena retired: false rainer: - name: Mount Rainer + product_name: Mount Rainer description: Volcano price: 5000 photo_url: stock: 1 - merchant: Max + merchant_id: Max retired: false discover: - name: Discover Pass + product_name: Discover Pass description: Parking pass for local parks price: 40 photo_url: stock: 30 - merchant: Max + merchant_id: Max retired: false snow: - name: Snow Pass + product_name: Snow Pass description: Parking pass for local parks in winter price: 25 photo_url: stock: 15 - merchant: Max + merchant_id: Max retired: false \ No newline at end of file From 2744e26bc750dd8fae3ddf86235afd662259cd7a Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Thu, 11 Jun 2020 20:41:57 -0700 Subject: [PATCH 068/350] Added csv files and updated seed script to make product-category associations. --- db/categories.csv | 9 +++++ db/category-product-assignments.csv | 37 ++++++++++++++++++ db/merchants.csv | 6 +++ db/products.csv | 58 ++++++++++++++--------------- db/seeds.rb | 36 ++++++++++++++++++ 5 files changed, 117 insertions(+), 29 deletions(-) create mode 100644 db/categories.csv create mode 100644 db/category-product-assignments.csv create mode 100644 db/merchants.csv diff --git a/db/categories.csv b/db/categories.csv new file mode 100644 index 0000000000..b6261bfefb --- /dev/null +++ b/db/categories.csv @@ -0,0 +1,9 @@ +id,category_name +1,mountains +2,trails +3,snacks +4,gear +5,national parks +6,parking permits +7,islands +8,lakes \ No newline at end of file diff --git a/db/category-product-assignments.csv b/db/category-product-assignments.csv new file mode 100644 index 0000000000..4dd41ec579 --- /dev/null +++ b/db/category-product-assignments.csv @@ -0,0 +1,37 @@ +product_id,category_id +1,1 +2,5 +2,6 +3,8 +4,1 +4,5 +5,1 +5,5 +6,7 +7,1 +7,5 +8,2 +9,2 +10,5 +10,2 +11,2 +11,7 +12,2 +12,7 +13,2 +14,2 +14,5 +15,3 +16,3 +17,3 +18,3 +19,3 +20,3 +21,3 +22,3 +23,4 +24,4 +25,4 +26,4 +27,4 +28,4 \ No newline at end of file diff --git a/db/merchants.csv b/db/merchants.csv new file mode 100644 index 0000000000..637406bfbc --- /dev/null +++ b/db/merchants.csv @@ -0,0 +1,6 @@ +username,email +Hikin Ricky,ricky@tickytav.com +Bikin Bobby,bobby@bobcat.com +Trailin Trinity,tt3@email.com +Fishin Fiona,fishyswishy@mail.com +Susan Swimmin,suzyswims@email.com \ No newline at end of file diff --git a/db/products.csv b/db/products.csv index cb2501f2a9..13947ecbd1 100644 --- a/db/products.csv +++ b/db/products.csv @@ -1,29 +1,29 @@ -product_name,available_quantity,price,photo_url,description -Mount Rainier,3,500000,https://images.unsplash.com/photo-1565395414487-fb0445bd3596?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=668&q=80,"Ascending to 14,410 feet above sea level, Mount Rainier stands as an icon in the Washington landscape. An active volcano, Mount Rainier is the most glaciated peak in the contiguous U.S.A., spawning five major rivers. Subalpine wildflower meadows ring the icy volcano while ancient forest cloaks Mount Rainier’s lower slopes. Wildlife abounds in the park’s ecosystems. A lifetime of discovery awaits." -Fort Vancouver,15,950,https://www.nps.gov/common/uploads/grid_builder/fova/crop16_9/E1BCCCF0-A157-32A2-352205A499D482A2.jpg?width=950&quality=90&mode=crop,"Located on the north bank of the Columbia River, in sight of snowy mountain peaks and a vibrant urban landscape, this park has a rich cultural past. From a frontier fur trading post, to a powerful military legacy, the magic of flight, and the origin of the American Pacific Northwest, history is shared at four unique sites. Discover stories of transition, settlement, conflict, and community." -Lake Roosevelt,47,3895,https://www.nps.gov/common/uploads/grid_builder/laro/crop16_9/A2DE7DC1-1DD8-B71B-0B6321848C7B5621.jpg?width=950&quality=90&mode=crop,"In 1941 the Grand Coulee Dam was built on the Columbia River as part of the Columbia River Basin project, creating a 130-mile long lake. Named for President Franklin D. Roosevelt, Lake Roosevelt National Recreation Area provides opportunities for boating, fishing, swimming, camping, canoeing, hunting and visiting historic Fort Spokane and St. Paul's Mission." -North Cascades,1,69383,https://images.unsplash.com/photo-1556046858-0c109614642b?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=1350&q=80,"Less than three hours from Seattle, an alpine landscape beckons. Discover communities of life adapted to moisture in the west and recurring fire in the east. Explore jagged peaks crowned by more than 300 glaciers. Listen to cascading waters in forested valleys. Witness a landscape sensitive to the Earth's changing climate. Help steward the ecological heart of the Cascades." -Olympic,4,77000,https://www.nps.gov/common/uploads/grid_builder/olym/crop16_9/B78FFBA7-B378-2599-5128D730E80406CE.jpg?width=950&quality=90&mode=crop,"With its incredible range of precipitation and elevation, diversity is the hallmark of Olympic National Park. Encompassing nearly a million acres, the park protects a vast wilderness, thousands of years of human history, and several distinctly different ecosystems, including glacier-capped mountains, old-growth temperate rain forests, and over 70 miles of wild coastline. Come explore!" -San Juan Island,1,24999,https://images.unsplash.com/photo-1459881128886-544963e934a9?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=668&q=80,"San Juan Island is well known for splendid vistas, saltwater shore, quiet woodlands, orca whales and one of the last remaining native prairies in the Puget Sound/Northern Straits region. But it was also here in 1859 that the United States and Great Britain nearly went to war over possession of the island, the crisis ignited by the death of a pig." -Blue Ridge Province,50,300,https://www.nps.gov/common/uploads/stories/images/nri/20161020/articles/E982D9AD-1DD8-B71B-0BAF7CB81040A92A/E982D9AD-1DD8-B71B-0BAF7CB81040A92A.JPG,"The Blue Ridge province is a mountainous belt stretching from Pennsylvania southwest to Georgia. In the north, the Blue Ridge is as narrow as 20 km (13 mi), but increases in width and relief to the south reaching 113 km (70 mi) and peaks above 1,800 m (6,000 ft). The Blue Ridge province includes several mountain ranges, particularly the Black Mountains, which include the highest peak in the eastern United States: Mt Mitchell at 2037 m (6684 ft)." -Nugget Falls Trail,12,400,https://imagesvc.meredithcorp.io/v3/mm/image?url=https%3A%2F%2Fstatic.onecms.io%2Fwp-content%2Fuploads%2Fsites%2F28%2F2017%2F04%2F23-mendenhall-glacier-visitor-center-juneau-alaska-BESTHIKE0407.jpg,"Nugget Falls Trail in Juneau, Alaska is an epicenter of hiking around the Mendenhall Glacier and the Tongass National Forest. The area is a nature-lover's paradise with visitors often spotting bald eagles, sockeye salmon, and black bear cubs." -Appalachian Trail - Shenandoah National Park,3,600,https://imagesvc.meredithcorp.io/v3/mm/image?url=https%3A%2F%2Fstatic.onecms.io%2Fwp-content%2Fuploads%2Fsites%2F28%2F2017%2F04%2F20-shenandoah-national-park-virginia-BESTHIKE0407.jpg,"Shenandoah National Park in Virginia is located just 75 miles from the hustle and bustle of Washington, D.C. The park consists of 200,000 acres of protected lands that are home to deer, songbirds, and a clear, star-speckled night sky." -Burroughs Mountain Hike - Mount Rainier National Park,10,7950,https://imagesvc.meredithcorp.io/v3/mm/image?url=https%3A%2F%2Fstatic.onecms.io%2Fwp-content%2Fuploads%2Fsites%2F28%2F2017%2F04%2F19-mount-rainier-national-park-washington-BESTHIKE0407.jpg,"Mount Rainier National Park has more than 260 miles of maintained trails that lead visitors through peaceful old-growth forest, river valleys, and subalpine meadows. Check out the Burroughs Mountain hike for stunning views of Mount Rainer and the alpine landscape." -Halema'uma'u Trail - Hawai'i Volcanoes National Park,5,111000,https://imagesvc.meredithcorp.io/v3/mm/image?url=https%3A%2F%2Fstatic.onecms.io%2Fwp-content%2Fuploads%2Fsites%2F28%2F2017%2F04%2F18-hawaii-volcanoes-national-park-BESTHIKE0407.jpg,"Hawai'i Volcanoes National Park has several trails available to visitors, including Earthquake Trail and Waldron Ledge, which is an easy 1-mile hike that allows visitors to take in the beautiful ocean views, and the Halema'uma'u Trail, a 1-mile hike descending 425 feet at the southern edge of Kīlauea Caldera that takes visitors through a rain forest." -Kalalau Trail - Ha'ena State Park,1,82000,https://imagesvc.meredithcorp.io/v3/mm/image?url=https%3A%2F%2Fstatic.onecms.io%2Fwp-content%2Fuploads%2Fsites%2F28%2F2017%2F04%2F13-kalalau-trail-hanalei-hawaii-BESTHIKE0407.jpg,"Kalalau Trail in Ha'ena State Park on the island of Kauai runs just about 11 miles along the island's north shore from Keʻe Beach to the Kalalau Valley. Visitors be warned: The trail is very difficult and dangerous. The trek takes hikers through streams and hills and provides stunning views of the crystal blue oceans surrounding the island." -Canyon to Rim Loop - Smith Rock State Park,6,300,https://imagesvc.meredithcorp.io/v3/mm/image?url=https%3A%2F%2Fstatic.onecms.io%2Fwp-content%2Fuploads%2Fsites%2F28%2F2017%2F04%2F11-smith-rock-state-park-oregon-BESTHIKE0407.jpg,"Smith Rock State Park in Oregon has hikes ranging from 2 to 7 miles and easy to moderately difficult terrain. The park suggests visitors arrive early in the morning for sightings of geese and ducks on the banks of the river, and later in the afternoon to catch a glimpse of a beautiful blue heron perched on a rock in the river. If you look closely, you may even spot a cougar or two." -Grinnell Glacier Trail - Glacier National Park,17,4995,https://imagesvc.meredithcorp.io/v3/mm/image?url=https%3A%2F%2Fstatic.onecms.io%2Fwp-content%2Fuploads%2Fsites%2F28%2F2017%2F04%2F7-glacier-national-park-montana-BESTHIKE0407.jpg,"Glacier National Park in Montana is the headwaters for streams that flow to the Pacific Ocean, the Gulf of Mexico, and the Hudson Bay. The park is home to 71 species of mammals, from the tiny pygmy shrew to the majestic elk, and a variety of birds and reptiles for visitors to spot along the way." -Peanut Butter Pretzels,80,5,https://nuts.com/images/rackcdn/ed910ae2d60f0d25bcb8-80550f96b5feb12604f4f720bfefb46d.ssl.cf1.rackcdn.com/64e7554f03633f29-ldy6WEBz-zoom.jpg,"And just when you thought it couldn’t get any better than a spoonful of peanut butter, someone thought to put a crunch salty pretzel around it! Peanut butter pretzels are SO good. They make a great trail snack because they’re crunchy, salty, and full of fat to keep you full for hours!" -Chewy Coconut Cashew Granola Bars,25,7,https://www.ambitiouskitchen.com/wp-content/uploads/2015/01/IMG_6832-001-725x725.jpg,"Gluten free granola bars packed with cashews, almond butter, coconut, cranberries and chia seeds. No bake, healthy and wholesome!" -Superfood Brownie Energy Bars,3,10,https://www.ambitiouskitchen.com/wp-content/uploads/2017/10/energybars-4-1064x1064.jpg,"No bake superfood brownie energy bars packed with pistachios, pecans, walnuts, chia seeds, coconut and dried fruit! Topped with dark chocolate and sea salt. The perfect nutritious healthy dessert." -Banana Bread Granola,15,4,https://minimalistbaker.com/wp-content/uploads/2014/01/Banana-Bread-Granola-with-Walnuts-and-Flax-MINIMALISTBAKER.COM-healthy-vegan-glutenfree.jpg,"Crunchy, nutty, not too sweet, super fragrant, JUST like banana bread, & loaded with healthy fats, Omega-3s & 6s, protein ,and fiber. Basically the best thing since sliced (banana) bread." -Sizzlin Smoked Beef Jerky,2,9,https://gbc-cdn-public-media.azureedge.net/img67866.1426x713.jpg,"Beef jerky makes a great hiking snack because it’s high in protein. It’s a really nice change of pace from some of the more sugary hiking snacks." -Mango Energy Bites,11,8,https://minimalistbaker.com/wp-content/uploads/2016/05/AMAZING-naturally-sweet-Dried-Mango-ENERGY-BITES-6-ingredients-fiber-and-protein-rich-SO-delicious-vegan-glutenfree-mango-recipe-healthy-minimalistbaker.jpg,"Easy, 6-ingredient mango energy bites with dates, coconut, hemp seeds, and lime zest! Perfectly sweet, tender, and so full of natural energy, you'll be able to hike a thousand miles in two tics." -Trail Nuggest Pro Bars,23,18,https://cdn.shopify.com/s/files/1/1515/2714/products/trailnuggets-bars-trailnuggets-pro-13736158429247_grande.jpg?v=1575725341,"We’re excited to announce Trailnuggets PRO, a new protein variation of our Trailnuggets bars. Trailnuggets PRO take the simple foundation of the GO energy bars and add plant protein to create a more snackable, more robust bar for people who need a great tasting snack with sustained energy!" -Plantain Chips,90,14,https://www.preciouscore.com/wp-content/uploads/2018/03/Homemade-Plantain-Chips.jpg,"These plantain chips are so crispy, plantain-y and so addictive! I think the world should be talking about the awesomeness of plantain chips! Plantains are naturally vegan, gluten-free and have a distinct taste. They are seriously yummy in every way and they are loaded with nutrients!" -Salomon Quest Backpacking Boot,5,225,https://content.backcountry.com/images/items/900/SAL/SAL016P/PHASHA.jpg,"Durable and comfortable hiking boots for backpacking, fully sealed Gore-Tex for dry comfort all day, cushioning offers improved stability and ride, redesigned lug design provides grip on all surfaces. Durable leather upper for long-lasting wear, removable Ortholite footbeds absorb shock." -Atlas Snowshoes Elektra 2-Piece Lockjaw Snowshoe Poles,1,140,https://content.backcountry.com/images/items/900/ATL/ATL000W/GRA.jpg,"Adjustable alloy shaft, lockjaw locking mechanism, comfort ergonomic grip and strap, trekking basket, steel tip to keep you secure." -Scarpa Mescalito Shoe,2,175,https://content.backcountry.com/images/items/900/SCR/SCR007A/TITBL.jpg,"An approach shoe for hiking into remote alpine areas. Vibram sole provides traction over sketchy sections of rock, suede upper adds bombproof durability when scrambling up scree fields, rubber toe rand resists abrasion during alpine approaches, lace to toe construction creates performance fit on long hikes." -Asolo Apex Shoe,6,260,https://content.backcountry.com/images/items/900/ASO/ASO003D/DONBL.jpg,"Technical approach shoe for trails and talus fields. Durable suede upper is water-resistant, vibram rubber sole offers grip on slick slabs, EVA midsole and anti-shock insert keep foot comfortable all day." -SmartWool Hike Light Crew Sock,30,14,https://content.backcountry.com/images/items/900/SWL/SWL0113/BLSTE.jpg,"Hiking socks for warm climates, Merino wool manages temperature and moisture. Synthetic materials increase durability. Naturally resists the buildup of odors. Definitely a sturdy sock you need to add to your sock drawer." -Smartwool PhD Outdoor Light Micro Sock,18,11,https://content.backcountry.com/images/items/900/SWL/SWL00N9/BOR.jpg,"A smart sock built for comfort during high-output outdoor activity. Indestructawool construction for durability and comfort. Merino wool blend offers temperature and moisture regulation. Mesh venting increases breathability. Light half cushioning provides shock absorption." \ No newline at end of file +merchant_id,product_name,stock,price,photo_url,description +1,Mount Rainier,3,500000,https://images.unsplash.com/photo-1565395414487-fb0445bd3596?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=668&q=80,"Ascending to 14,410 feet above sea level, Mount Rainier stands as an icon in the Washington landscape. An active volcano, Mount Rainier is the most glaciated peak in the contiguous U.S.A., spawning five major rivers. Subalpine wildflower meadows ring the icy volcano while ancient forest cloaks Mount Rainier’s lower slopes. Wildlife abounds in the park’s ecosystems. A lifetime of discovery awaits." +2,Fort Vancouver,15,950,https://www.nps.gov/common/uploads/grid_builder/fova/crop16_9/E1BCCCF0-A157-32A2-352205A499D482A2.jpg?width=950&quality=90&mode=crop,"Located on the north bank of the Columbia River, in sight of snowy mountain peaks and a vibrant urban landscape, this park has a rich cultural past. From a frontier fur trading post, to a powerful military legacy, the magic of flight, and the origin of the American Pacific Northwest, history is shared at four unique sites. Discover stories of transition, settlement, conflict, and community." +3,Lake Roosevelt,47,3895,https://www.nps.gov/common/uploads/grid_builder/laro/crop16_9/A2DE7DC1-1DD8-B71B-0B6321848C7B5621.jpg?width=950&quality=90&mode=crop,"In 1941 the Grand Coulee Dam was built on the Columbia River as part of the Columbia River Basin project, creating a 130-mile long lake. Named for President Franklin D. Roosevelt, Lake Roosevelt National Recreation Area provides opportunities for boating, fishing, swimming, camping, canoeing, hunting and visiting historic Fort Spokane and St. Paul's Mission." +4,North Cascades,1,69383,https://images.unsplash.com/photo-1556046858-0c109614642b?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=1350&q=80,"Less than three hours from Seattle, an alpine landscape beckons. Discover communities of life adapted to moisture in the west and recurring fire in the east. Explore jagged peaks crowned by more than 300 glaciers. Listen to cascading waters in forested valleys. Witness a landscape sensitive to the Earth's changing climate. Help steward the ecological heart of the Cascades." +5,Olympic,4,77000,https://www.nps.gov/common/uploads/grid_builder/olym/crop16_9/B78FFBA7-B378-2599-5128D730E80406CE.jpg?width=950&quality=90&mode=crop,"With its incredible range of precipitation and elevation, diversity is the hallmark of Olympic National Park. Encompassing nearly a million acres, the park protects a vast wilderness, thousands of years of human history, and several distinctly different ecosystems, including glacier-capped mountains, old-growth temperate rain forests, and over 70 miles of wild coastline. Come explore!" +1,San Juan Island,1,24999,https://images.unsplash.com/photo-1459881128886-544963e934a9?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=668&q=80,"San Juan Island is well known for splendid vistas, saltwater shore, quiet woodlands, orca whales and one of the last remaining native prairies in the Puget Sound/Northern Straits region. But it was also here in 1859 that the United States and Great Britain nearly went to war over possession of the island, the crisis ignited by the death of a pig." +2,Blue Ridge Province,50,300,https://www.nps.gov/common/uploads/stories/images/nri/20161020/articles/E982D9AD-1DD8-B71B-0BAF7CB81040A92A/E982D9AD-1DD8-B71B-0BAF7CB81040A92A.JPG,"The Blue Ridge province is a mountainous belt stretching from Pennsylvania southwest to Georgia. In the north, the Blue Ridge is as narrow as 20 km (13 mi), but increases in width and relief to the south reaching 113 km (70 mi) and peaks above 1,800 m (6,000 ft). The Blue Ridge province includes several mountain ranges, particularly the Black Mountains, which include the highest peak in the eastern United States: Mt Mitchell at 2037 m (6684 ft)." +3,Nugget Falls Trail,12,400,https://imagesvc.meredithcorp.io/v3/mm/image?url=https%3A%2F%2Fstatic.onecms.io%2Fwp-content%2Fuploads%2Fsites%2F28%2F2017%2F04%2F23-mendenhall-glacier-visitor-center-juneau-alaska-BESTHIKE0407.jpg,"Nugget Falls Trail in Juneau, Alaska is an epicenter of hiking around the Mendenhall Glacier and the Tongass National Forest. The area is a nature-lover's paradise with visitors often spotting bald eagles, sockeye salmon, and black bear cubs." +4,Appalachian Trail - Shenandoah National Park,3,600,https://imagesvc.meredithcorp.io/v3/mm/image?url=https%3A%2F%2Fstatic.onecms.io%2Fwp-content%2Fuploads%2Fsites%2F28%2F2017%2F04%2F20-shenandoah-national-park-virginia-BESTHIKE0407.jpg,"Shenandoah National Park in Virginia is located just 75 miles from the hustle and bustle of Washington, D.C. The park consists of 200,000 acres of protected lands that are home to deer, songbirds, and a clear, star-speckled night sky." +5,Burroughs Mountain Hike - Mount Rainier National Park,10,7950,https://imagesvc.meredithcorp.io/v3/mm/image?url=https%3A%2F%2Fstatic.onecms.io%2Fwp-content%2Fuploads%2Fsites%2F28%2F2017%2F04%2F19-mount-rainier-national-park-washington-BESTHIKE0407.jpg,"Mount Rainier National Park has more than 260 miles of maintained trails that lead visitors through peaceful old-growth forest, river valleys, and subalpine meadows. Check out the Burroughs Mountain hike for stunning views of Mount Rainer and the alpine landscape." +1,Halema'uma'u Trail - Hawai'i Volcanoes National Park,5,111000,https://imagesvc.meredithcorp.io/v3/mm/image?url=https%3A%2F%2Fstatic.onecms.io%2Fwp-content%2Fuploads%2Fsites%2F28%2F2017%2F04%2F18-hawaii-volcanoes-national-park-BESTHIKE0407.jpg,"Hawai'i Volcanoes National Park has several trails available to visitors, including Earthquake Trail and Waldron Ledge, which is an easy 1-mile hike that allows visitors to take in the beautiful ocean views, and the Halema'uma'u Trail, a 1-mile hike descending 425 feet at the southern edge of Kīlauea Caldera that takes visitors through a rain forest." +2,Kalalau Trail - Ha'ena State Park,1,82000,https://imagesvc.meredithcorp.io/v3/mm/image?url=https%3A%2F%2Fstatic.onecms.io%2Fwp-content%2Fuploads%2Fsites%2F28%2F2017%2F04%2F13-kalalau-trail-hanalei-hawaii-BESTHIKE0407.jpg,"Kalalau Trail in Ha'ena State Park on the island of Kauai runs just about 11 miles along the island's north shore from Keʻe Beach to the Kalalau Valley. Visitors be warned: The trail is very difficult and dangerous. The trek takes hikers through streams and hills and provides stunning views of the crystal blue oceans surrounding the island." +3,Canyon to Rim Loop - Smith Rock State Park,6,300,https://imagesvc.meredithcorp.io/v3/mm/image?url=https%3A%2F%2Fstatic.onecms.io%2Fwp-content%2Fuploads%2Fsites%2F28%2F2017%2F04%2F11-smith-rock-state-park-oregon-BESTHIKE0407.jpg,"Smith Rock State Park in Oregon has hikes ranging from 2 to 7 miles and easy to moderately difficult terrain. The park suggests visitors arrive early in the morning for sightings of geese and ducks on the banks of the river, and later in the afternoon to catch a glimpse of a beautiful blue heron perched on a rock in the river. If you look closely, you may even spot a cougar or two." +4,Grinnell Glacier Trail - Glacier National Park,17,4995,https://imagesvc.meredithcorp.io/v3/mm/image?url=https%3A%2F%2Fstatic.onecms.io%2Fwp-content%2Fuploads%2Fsites%2F28%2F2017%2F04%2F7-glacier-national-park-montana-BESTHIKE0407.jpg,"Glacier National Park in Montana is the headwaters for streams that flow to the Pacific Ocean, the Gulf of Mexico, and the Hudson Bay. The park is home to 71 species of mammals, from the tiny pygmy shrew to the majestic elk, and a variety of birds and reptiles for visitors to spot along the way." +5,Peanut Butter Pretzels,80,5,https://nuts.com/images/rackcdn/ed910ae2d60f0d25bcb8-80550f96b5feb12604f4f720bfefb46d.ssl.cf1.rackcdn.com/64e7554f03633f29-ldy6WEBz-zoom.jpg,"And just when you thought it couldn’t get any better than a spoonful of peanut butter, someone thought to put a crunch salty pretzel around it! Peanut butter pretzels are SO good. They make a great trail snack because they’re crunchy, salty, and full of fat to keep you full for hours!" +1,Chewy Coconut Cashew Granola Bars,25,7,https://www.ambitiouskitchen.com/wp-content/uploads/2015/01/IMG_6832-001-725x725.jpg,"Gluten free granola bars packed with cashews, almond butter, coconut, cranberries and chia seeds. No bake, healthy and wholesome!" +2,Superfood Brownie Energy Bars,3,10,https://www.ambitiouskitchen.com/wp-content/uploads/2017/10/energybars-4-1064x1064.jpg,"No bake superfood brownie energy bars packed with pistachios, pecans, walnuts, chia seeds, coconut and dried fruit! Topped with dark chocolate and sea salt. The perfect nutritious healthy dessert." +3,Banana Bread Granola,15,4,https://minimalistbaker.com/wp-content/uploads/2014/01/Banana-Bread-Granola-with-Walnuts-and-Flax-MINIMALISTBAKER.COM-healthy-vegan-glutenfree.jpg,"Crunchy, nutty, not too sweet, super fragrant, JUST like banana bread, & loaded with healthy fats, Omega-3s & 6s, protein ,and fiber. Basically the best thing since sliced (banana) bread." +4,Sizzlin Smoked Beef Jerky,2,9,https://gbc-cdn-public-media.azureedge.net/img67866.1426x713.jpg,"Beef jerky makes a great hiking snack because it’s high in protein. It’s a really nice change of pace from some of the more sugary hiking snacks." +5,Mango Energy Bites,11,8,https://minimalistbaker.com/wp-content/uploads/2016/05/AMAZING-naturally-sweet-Dried-Mango-ENERGY-BITES-6-ingredients-fiber-and-protein-rich-SO-delicious-vegan-glutenfree-mango-recipe-healthy-minimalistbaker.jpg,"Easy, 6-ingredient mango energy bites with dates, coconut, hemp seeds, and lime zest! Perfectly sweet, tender, and so full of natural energy, you'll be able to hike a thousand miles in two tics." +1,Trail Nuggest Pro Bars,23,18,https://cdn.shopify.com/s/files/1/1515/2714/products/trailnuggets-bars-trailnuggets-pro-13736158429247_grande.jpg?v=1575725341,"We’re excited to announce Trailnuggets PRO, a new protein variation of our Trailnuggets bars. Trailnuggets PRO take the simple foundation of the GO energy bars and add plant protein to create a more snackable, more robust bar for people who need a great tasting snack with sustained energy!" +2,Plantain Chips,90,14,https://www.preciouscore.com/wp-content/uploads/2018/03/Homemade-Plantain-Chips.jpg,"These plantain chips are so crispy, plantain-y and so addictive! I think the world should be talking about the awesomeness of plantain chips! Plantains are naturally vegan, gluten-free and have a distinct taste. They are seriously yummy in every way and they are loaded with nutrients!" +3,Salomon Quest Backpacking Boot,5,225,https://content.backcountry.com/images/items/900/SAL/SAL016P/PHASHA.jpg,"Durable and comfortable hiking boots for backpacking, fully sealed Gore-Tex for dry comfort all day, cushioning offers improved stability and ride, redesigned lug design provides grip on all surfaces. Durable leather upper for long-lasting wear, removable Ortholite footbeds absorb shock." +4,Atlas Snowshoes Elektra 2-Piece Lockjaw Snowshoe Poles,1,140,https://content.backcountry.com/images/items/900/ATL/ATL000W/GRA.jpg,"Adjustable alloy shaft, lockjaw locking mechanism, comfort ergonomic grip and strap, trekking basket, steel tip to keep you secure." +5,Scarpa Mescalito Shoe,2,175,https://content.backcountry.com/images/items/900/SCR/SCR007A/TITBL.jpg,"An approach shoe for hiking into remote alpine areas. Vibram sole provides traction over sketchy sections of rock, suede upper adds bombproof durability when scrambling up scree fields, rubber toe rand resists abrasion during alpine approaches, lace to toe construction creates performance fit on long hikes." +1,Asolo Apex Shoe,6,260,https://content.backcountry.com/images/items/900/ASO/ASO003D/DONBL.jpg,"Technical approach shoe for trails and talus fields. Durable suede upper is water-resistant, vibram rubber sole offers grip on slick slabs, EVA midsole and anti-shock insert keep foot comfortable all day." +2,SmartWool Hike Light Crew Sock,30,14,https://content.backcountry.com/images/items/900/SWL/SWL0113/BLSTE.jpg,"Hiking socks for warm climates, Merino wool manages temperature and moisture. Synthetic materials increase durability. Naturally resists the buildup of odors. Definitely a sturdy sock you need to add to your sock drawer." +3,Smartwool PhD Outdoor Light Micro Sock,18,11,https://content.backcountry.com/images/items/900/SWL/SWL00N9/BOR.jpg,"A smart sock built for comfort during high-output outdoor activity. Indestructawool construction for durability and comfort. Merino wool blend offers temperature and moisture regulation. Mesh venting increases breathability. Light half cushioning provides shock absorption." \ No newline at end of file diff --git a/db/seeds.rb b/db/seeds.rb index 62f2ce03ac..e9577845eb 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,8 +1,44 @@ require "csv" products_file = Rails.root.join("db", "products.csv") +categories_file = Rails.root.join("db", "categories.csv") +merchants_file = Rails.root.join("db", "merchants.csv") +catetory_product_file = Rails.root.join("db", "category-product-assignments.csv") +# create merchants from csv +CSV.foreach(merchants_file, headers: true, header_converters: :symbol, converters: :all) do |row| + data = Hash[row.headers.zip(row.fields)] + puts data + Merchant.create!(data) +end + +# create products from csv CSV.foreach(products_file, headers: true, header_converters: :symbol, converters: :all) do |row| data = Hash[row.headers.zip(row.fields)] puts data Product.create!(data) end + +# create categories from csv +CSV.foreach(categories_file, headers: true, header_converters: :symbol, converters: :all) do |row| + data = Hash[row.headers.zip(row.fields)] + puts data + Category.create!(data) +end + +# Add categories to products + +# puts "BEFORE FIRST: #{Product.first.categories.count}" +# puts "BEFORE LAST: #{Product.last.categories.count}" + +CSV.foreach(catetory_product_file, headers: true, header_converters: :symbol, converters: :all) do |row| + product_id = row[0] + category_id = row[1] + + selected_product = Product.find_by(id: product_id) + selected_category = Category.find_by(id: category_id) + + selected_product.categories << selected_category +end + +# puts "FIRST: #{Product.first.categories.count}" +# puts "LAST: #{Product.last.categories.count}" \ No newline at end of file From dbb580c65839a421a7dd6a91924f25da7c49f2e4 Mon Sep 17 00:00:00 2001 From: denisseai Date: Thu, 11 Jun 2020 21:05:51 -0700 Subject: [PATCH 069/350] testing --- .../controllers/orderitems_controller_test.rb | 6 ++--- test/fixtures/orderitems.yml | 22 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/test/controllers/orderitems_controller_test.rb b/test/controllers/orderitems_controller_test.rb index 5335ec39f0..933d2721e0 100644 --- a/test/controllers/orderitems_controller_test.rb +++ b/test/controllers/orderitems_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe OrderitemsController do - let(:existing_orderitem) { orderitems(:snow) } + let(:existing_orderitem) { orderitems(:rxbar) } let(:update_hash){ { @@ -14,14 +14,14 @@ describe "create function" do it "can create a new Orderitem with valid data" do expect { - post product_orderitems_path(product_id: products(:rx_bar).id), params: update_hash + post product_orderitems_path(product_id: products(:cliff).id), params: update_hash }.must_change "Orderitem.count", 1 expect(session[:order_id]).wont_be_nil new_orderitem = Orderitem.last - expect(new_orderitem.product.product_name).must_equal "RxBar" + expect(new_orderitem.product.name).must_equal "Cliff" expect(new_orderitem.order.orderitems.count).must_equal 1 must_respond_with :redirect end diff --git a/test/fixtures/orderitems.yml b/test/fixtures/orderitems.yml index 750651cc09..40f533b0df 100644 --- a/test/fixtures/orderitems.yml +++ b/test/fixtures/orderitems.yml @@ -1,25 +1,25 @@ -rx_bar: +rxbar: quantity: 3 - order_id: order1 - product_id: RxBar + order: order1 + product: RxBar shipped: false snow: quantity: 1 - order_id: order1 - product_id: snow pass + order: order1 + product: snow_pass shipped: false nature_valley: quantity: 2 - order_id: order2 - product_id: nature valley + order: order2 + product: nature_valley shipped: false rainer: quantity: 1 - order_id: order2 - product_id: mount rainer + order: order2 + product: mount_rainer shipped: false discover: quantity: 1 - order_id: order2 - product_id: discover pass + order: order2 + product_id: discover_pass shipped: false From 8e3ae49584aeb003b0a80e03b5efd2863c2b1527 Mon Sep 17 00:00:00 2001 From: denisseai Date: Thu, 11 Jun 2020 21:32:40 -0700 Subject: [PATCH 070/350] added trial test --- app/controllers/orders_controller.rb | 2 +- app/models/order.rb | 45 +++++++++++----------- test/controllers/orders_controller_test.rb | 13 +++++++ 3 files changed, 36 insertions(+), 24 deletions(-) diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index f55c0adff2..c776ed88a5 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -72,7 +72,7 @@ def merchant_order private def order_params - params.require(:order).permit(:email, :mailing_address, :cc_number, :cvv, :expiration, :zip) + params.require(:order).permit(:email, :address, :cc_name, :cc_num, :cvv, :cc_exp, :zip) end def find_order_from_session diff --git a/app/models/order.rb b/app/models/order.rb index db3c628266..3c2644bb22 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -13,31 +13,30 @@ class Order < ApplicationRecord message: "%{value} is not a valid status" } - # validates :orderitems, length: { minimum: 1, message: "Your cart is empty" }, on: :update - # validates :email, presence: true, on: :update - # validates :address, presence: true, on: :update - # validates :cc_name, presence: true, on: :update - # validates :cc_num, presence: true, numericality: { only_integer: true }, length: { minimum: 4 }, on: :update - # validates :cvv, presence: true, numericality: { only_integer: true }, on: :update - # validates :cc_exp, presence: true, on: :update - # validates :zip, presence: true, numericality: { only_integer: true }, on: :update + validates :orderitems, length: { minimum: 1, message: "Your cart is empty" }, on: :update + validates :email, presence: true, on: :update + validates :address, presence: true, on: :update + validates :cc_name, presence: true, on: :update + validates :cc_num, presence: true, numericality: { only_integer: true }, length: { minimum: 4 }, on: :update + validates :cvv, presence: true, numericality: { only_integer: true }, on: :update + validates :cc_exp, presence: true, on: :update + validates :zip, presence: true, numericality: { only_integer: true }, on: :update - # review after seeding - # def reduce_stock - # self.orderitems.each do |orderitem| - # orderitem.product.stock -= orderitem.quantity - # orderitem.product.save - # end - # end + def reduce_stock + self.orderitems.each do |orderitem| + orderitem.product.stock -= orderitem.quantity + orderitem.product.save + end + end - # def return_stock - # self.orderitems.each do |orderitem| - # if !orderitem.product.retired - # orderitem.product.stock += orderitem.quantity - # orderitem.product.save - # end - # end - # end + def return_stock + self.orderitems.each do |orderitem| + if !orderitem.product.retired + orderitem.product.stock += orderitem.quantity + orderitem.product.save + end + end + end def total total_cost = 0 diff --git a/test/controllers/orders_controller_test.rb b/test/controllers/orders_controller_test.rb index 577bea9391..b59f0687eb 100644 --- a/test/controllers/orders_controller_test.rb +++ b/test/controllers/orders_controller_test.rb @@ -23,4 +23,17 @@ expect(flash[:status]).must_equal :failure end end + describe "show" do + it "returns not found for the show action with an invalid ID" do + get order_path(id: -1) + must_respond_with :not_found + end + end + describe "initialized cart/orders" do + before do + post product_orderitems_path(product_id: products(:nature).id), params: { orderitem: { quantity: 2, }, } + post product_orderitems_path(product_id: products(:cliff).id), params: { orderitem: { quantity: 1, }, } + post product_orderitems_path(product_id: products(:chewy).id), params: { orderitem: { quantity: 3, }, } + end + end end From 1f3886c521ef02b1d9c430152072aceed290fb36 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 11 Jun 2020 21:54:19 -0700 Subject: [PATCH 071/350] fixed products yml file by adding "product_" to "name" to match products table column --- test/fixtures/products.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml index 9293750451..92cfab551e 100644 --- a/test/fixtures/products.yml +++ b/test/fixtures/products.yml @@ -1,5 +1,5 @@ rx_bar: - name: RxBar + product_name: RxBar description: Simple ingredients price: 2.45 photo_url: @@ -7,7 +7,7 @@ rx_bar: merchant: Nena retired: false kind: - name: KIND bar + product_name: KIND bar description: GF bar price: 1.45 photo_url: @@ -15,15 +15,15 @@ kind: merchant: Nena retired: true nature: - name: Nature Valley + product_name: Nature Valley description: Crunchy Granola Oats n Honey price: 1.25 photo_url: stock: 8 merchant: Nena retired: false -rainer: - name: Mount Rainer +rainier: + product_name: Mount Rainier description: Volcano price: 5000 photo_url: @@ -31,7 +31,7 @@ rainer: merchant: Max retired: false discover: - name: Discover Pass + product_name: Discover Pass description: Parking pass for local parks price: 40 photo_url: @@ -39,7 +39,7 @@ discover: merchant: Max retired: false snow: - name: Snow Pass + product_name: Snow Pass description: Parking pass for local parks in winter price: 25 photo_url: From aa557c6421b0abd600b384dc67910b11de32eba9 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 11 Jun 2020 21:54:47 -0700 Subject: [PATCH 072/350] products#index tests created and pass --- test/controllers/products_controller_test.rb | 23 +++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb index 1c0716685f..801130736a 100644 --- a/test/controllers/products_controller_test.rb +++ b/test/controllers/products_controller_test.rb @@ -1,7 +1,24 @@ require "test_helper" describe ProductsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + before do + @invalid_product_id = -1 + end + + describe "index" do + it "responds with success when there are many passengers saved" do + Product.create(product_name: 'Smartwool Socks', price: 20.00) + Product.create(product_name: 'Cliff Coffee Bar', price: 2.00) + + get "/products" + + must_respond_with :success + end + + it "responds with success when there are no passengers saved" do + get "/products" + + must_respond_with :success + end + end end From b0b0ca9582e88a1d7943330980eb92265800688a Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 11 Jun 2020 23:15:54 -0700 Subject: [PATCH 073/350] minimal show all products completed --- app/assets/stylesheets/application.scss | 12 ++++++++++ app/views/products/index.html.erb | 32 ++++++++++++++++++++++--- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 346c0354af..5dd7c1f334 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -67,6 +67,18 @@ body { font-family: 'Rubik', sans-serif; } +.catalog__header, .catalog__secondary-header { + text-transform: uppercase; +} +.catalog__secondary-header { + color: rgb(206, 206, 206); +} + +/* Auto Crop Photos */ +.embed-responsive .card-img-top { + object-fit: cover; +} + /* Footer */ .footer { diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index 7b9ea0420e..711e06bb71 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -1,3 +1,29 @@ -<% @products.each do |product| %> -

<%= product.product_name %>

-<% end %> \ No newline at end of file +
+

All Products

+

## results

+
+
+
+ <% @products.each do |product| %> +
+
+
+ alt=<%= product.product_name%>> +
+
+
<%= product.product_name %>
+
+ $<%= product.price %> +
+
+ Rating: ##/5 (# of reviews) +
+ +
+
+
+ <% end %> +
+
+
+ From 7a5144149ecd6aeb0db0681bb3e882f562c943b7 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 11 Jun 2020 23:55:38 -0700 Subject: [PATCH 074/350] added local navigation link, catalog now 4 items per row by default --- app/assets/stylesheets/application.scss | 11 ++++++++++- app/views/products/index.html.erb | 5 +++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 5dd7c1f334..ed00e21a16 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -39,7 +39,7 @@ header { .nav-link-custom, a { font-family: 'Rubik', sans-serif; - color: black; + color: #000; font-size: 20px; font-weight: 300; } @@ -49,6 +49,15 @@ header { color: #7f7f7f; } +.local-navigation, a { + color: rgb(206, 206, 206); +} + +.local-navigation:hover { + color: #000; + text-decoration: none; +} + /* Content */ html { diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index 711e06bb71..a54445b4ea 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -1,11 +1,12 @@ -
+
+
<%= link_to "< HOME", root_path, class: "local-navigation" %>

All Products

## results

<% @products.each do |product| %> -
+
alt=<%= product.product_name%>> From 2b1cc31e48a949b42e5de3333694e5e6f3c357e2 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Fri, 12 Jun 2020 09:30:50 -0700 Subject: [PATCH 075/350] Removed unnecessary db relations for categories and products. --- ...162515_remove_products_idfrom_categories.rb | 5 +++++ ...612162737_remove_reviews_idfrom_products.rb | 5 +++++ db/schema.rb | 18 +----------------- 3 files changed, 11 insertions(+), 17 deletions(-) create mode 100644 db/migrate/20200612162515_remove_products_idfrom_categories.rb create mode 100644 db/migrate/20200612162737_remove_reviews_idfrom_products.rb diff --git a/db/migrate/20200612162515_remove_products_idfrom_categories.rb b/db/migrate/20200612162515_remove_products_idfrom_categories.rb new file mode 100644 index 0000000000..dd9e3e479c --- /dev/null +++ b/db/migrate/20200612162515_remove_products_idfrom_categories.rb @@ -0,0 +1,5 @@ +class RemoveProductsIdfromCategories < ActiveRecord::Migration[6.0] + def change + remove_reference :categories, :products, index: true + end +end diff --git a/db/migrate/20200612162737_remove_reviews_idfrom_products.rb b/db/migrate/20200612162737_remove_reviews_idfrom_products.rb new file mode 100644 index 0000000000..9abb257432 --- /dev/null +++ b/db/migrate/20200612162737_remove_reviews_idfrom_products.rb @@ -0,0 +1,5 @@ +class RemoveReviewsIdfromProducts < ActiveRecord::Migration[6.0] + def change + remove_reference :products, :reviews, index: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 18708393bf..98aa9a8397 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,16 +1,4 @@ -# 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. -# -# This file is the source Rails uses to define your schema when running `rails -# db:schema:load`. When creating a new database, `rails db:schema:load` tends to -# be faster and is potentially less error prone than running all of your -# migrations from scratch. Old migrations may fail to apply correctly if those -# migrations use external dependencies or application code. -# -# It's strongly recommended that you check this file into your version control system. - -ActiveRecord::Schema.define(version: 2020_06_11_210431) do +ActiveRecord::Schema.define(version: 2020_06_12_162737) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -19,8 +7,6 @@ t.string "category_name" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false - t.bigint "products_id" - t.index ["products_id"], name: "index_categories_on_products_id" end create_table "categories_products", force: :cascade do |t| @@ -73,11 +59,9 @@ t.bigint "stock" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false - t.bigint "reviews_id" t.bigint "merchant_id" t.boolean "retired" t.index ["merchant_id"], name: "index_products_on_merchant_id" - t.index ["reviews_id"], name: "index_products_on_reviews_id" end create_table "reviews", force: :cascade do |t| From 6664db5c590773ace16db866d36cdd55ae331968 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Fri, 12 Jun 2020 09:55:39 -0700 Subject: [PATCH 076/350] added 0Auth --- config/routes.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 23b07331eb..a2fedd27bb 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -15,4 +15,9 @@ resources :reviews, only: [:new, :create] resources :categories, only: [:new, :create, :show, :index] + + resources :merchants + get "/auth/github", as: "github_login" + get "/auth/github/callback", to: "merchants#create", as: "auth_callback" + delete "/logout", to: "merchants#destroy", as: "logout" end From f3ee4823eab46e71761524bd8b9f6392a70c52a0 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Fri, 12 Jun 2020 09:56:09 -0700 Subject: [PATCH 077/350] 0Auth added --- Gemfile.lock | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index 4961154df0..8b2bdf77e4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,8 +92,14 @@ GEM debase-ruby_core_source (>= 0.10.2) debase-ruby_core_source (0.10.9) debug_inspector (0.0.3) + dotenv (2.7.5) + dotenv-rails (2.7.5) + dotenv (= 2.7.5) + railties (>= 3.2, < 6.1) erubi (1.9.0) execjs (2.7.0) + faraday (1.0.1) + multipart-post (>= 1.2, < 3) ffi (1.13.1) formatador (0.2.5) globalid (0.4.2) @@ -111,6 +117,7 @@ GEM guard-minitest (2.4.6) guard-compat (~> 1.2) minitest (>= 3.0) + hashie (4.1.0) i18n (1.8.3) concurrent-ruby (~> 1.0) jbuilder (2.10.0) @@ -122,6 +129,7 @@ GEM jquery-turbolinks (2.1.0) railties (>= 3.1.0) turbolinks + jwt (2.2.1) listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -147,6 +155,9 @@ GEM minitest (>= 5.0) ruby-progressbar msgpack (1.3.3) + multi_json (1.14.1) + multi_xml (0.6.0) + multipart-post (2.1.1) nenv (0.3.0) nio4r (2.5.2) nokogiri (1.10.9) @@ -154,6 +165,21 @@ GEM notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) + oauth2 (1.4.4) + faraday (>= 0.8, < 2.0) + jwt (>= 1.0, < 3.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) + rack (>= 1.2, < 3) + omniauth (1.9.1) + hashie (>= 3.4.6) + rack (>= 1.6.2, < 3) + omniauth-github (1.4.0) + omniauth (~> 1.5) + omniauth-oauth2 (>= 1.4.0, < 2.0) + omniauth-oauth2 (1.6.0) + oauth2 (~> 1.1) + omniauth (~> 1.9) pg (1.2.3) popper_js (1.16.0) pry (0.13.1) @@ -268,6 +294,7 @@ DEPENDENCIES byebug capybara (>= 2.15) debase (>= 0.2.4.1) + dotenv-rails guard guard-minitest jbuilder (~> 2.7) @@ -276,6 +303,8 @@ DEPENDENCIES listen (~> 3.2) minitest-rails minitest-reporters + omniauth + omniauth-github pg (>= 0.18, < 2.0) pry-rails puma (~> 4.1) From 879a4e8e9f97e86e0fc714a5095c2d880d07ebb6 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Fri, 12 Jun 2020 09:56:27 -0700 Subject: [PATCH 078/350] 0Auth --- Gemfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Gemfile b/Gemfile index bf513ff7ce..1f72aa044e 100644 --- a/Gemfile +++ b/Gemfile @@ -24,11 +24,14 @@ gem 'jbuilder', '~> 2.7' # Use Active Storage variant # gem 'image_processing', '~> 1.2' +gem "omniauth" +gem "omniauth-github" # Reduces boot times through caching; required in config/boot.rb gem 'bootsnap', '>= 1.4.2', require: false group :development, :test do + gem 'dotenv-rails' # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] end From 63fcb5caa3bb4c1cd029e2496102c9f4332ad7d7 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Fri, 12 Jun 2020 09:57:32 -0700 Subject: [PATCH 079/350] 0Auth added --- config/initializers/omniauth.rb | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 config/initializers/omniauth.rb diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb new file mode 100644 index 0000000000..aab6482b4b --- /dev/null +++ b/config/initializers/omniauth.rb @@ -0,0 +1,4 @@ +# config/initializers/omniauth.rb +Rails.application.config.middleware.use OmniAuth::Builder do + provider :github, ENV["GITHUB_CLIENT_ID"], ENV["GITHUB_CLIENT_SECRET"], scope: "user:email" +end \ No newline at end of file From 35557a0006e67233682df21936a4ae41da14d01e Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Fri, 12 Jun 2020 10:14:45 -0700 Subject: [PATCH 080/350] show product test made and pass --- app/controllers/products_controller.rb | 2 +- app/views/products/show.html.erb | 0 test/controllers/products_controller_test.rb | 17 +++++++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 app/views/products/show.html.erb diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 6ac83171b8..73bb29237c 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -9,7 +9,7 @@ def index def show if @product.nil? flash[:error] = "Product has either been deleted, sold out, or not found." - redirect_to root_path + head :not_found return 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/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb index 801130736a..7bf5b05822 100644 --- a/test/controllers/products_controller_test.rb +++ b/test/controllers/products_controller_test.rb @@ -21,4 +21,21 @@ must_respond_with :success end end + + + describe "show" do + it "responds with success when showing an existing valid product" do + valid_product_id = products(:rainier).id + + get "/products/#{valid_product_id}" + + must_respond_with :success + end + + it "responds with 404 with an invalid product id" do + get "/products/#{@invalid_product_id}" + + must_respond_with :not_found + end + end end From c025fa86f8b4779c4135c4aa95ff20a5b13397e6 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Fri, 12 Jun 2020 10:14:59 -0700 Subject: [PATCH 081/350] Added has_many relation in product.rb for orderitems. --- app/models/product.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/models/product.rb b/app/models/product.rb index 5b1b1f6e26..05d89cc2ad 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -5,4 +5,8 @@ class Product < ApplicationRecord belongs_to :merchant has_and_belongs_to_many :categories has_many :reviews + + has_many :orderitems + # product.orders => all the orders that a product has been attached to + has_many :orders, through: :orderitems end From 62ce66d7077c556a2a27ae02e49751006b2b4144 Mon Sep 17 00:00:00 2001 From: denisseai Date: Fri, 12 Jun 2020 10:36:59 -0700 Subject: [PATCH 082/350] Chaged data type for cc_exp in orders --- ...00612173351_change_column_data_type_orders.rb | 5 +++++ db/schema.rb | 16 ++++++++++++++-- test/controllers/orders_controller_test.rb | 3 ++- 3 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20200612173351_change_column_data_type_orders.rb diff --git a/db/migrate/20200612173351_change_column_data_type_orders.rb b/db/migrate/20200612173351_change_column_data_type_orders.rb new file mode 100644 index 0000000000..41d6ea73a8 --- /dev/null +++ b/db/migrate/20200612173351_change_column_data_type_orders.rb @@ -0,0 +1,5 @@ +class ChangeColumnDataTypeOrders < ActiveRecord::Migration[6.0] + def change + change_column :orders, :cc_exp, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 98aa9a8397..bb3ca8a393 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,4 +1,16 @@ -ActiveRecord::Schema.define(version: 2020_06_12_162737) do +# 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. +# +# This file is the source Rails uses to define your schema when running `rails +# db:schema:load`. When creating a new database, `rails db:schema:load` tends to +# be faster and is potentially less error prone than running all of your +# migrations from scratch. Old migrations may fail to apply correctly if those +# migrations use external dependencies or application code. +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2020_06_12_173351) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -45,7 +57,7 @@ t.string "cc_name" t.bigint "cc_num" t.integer "cvv" - t.integer "cc_exp" + t.string "cc_exp" t.integer "zip" t.bigint "merchant_id" t.index ["merchant_id"], name: "index_orders_on_merchant_id" diff --git a/test/controllers/orders_controller_test.rb b/test/controllers/orders_controller_test.rb index b59f0687eb..af274badf8 100644 --- a/test/controllers/orders_controller_test.rb +++ b/test/controllers/orders_controller_test.rb @@ -1,4 +1,5 @@ require "test_helper" +require "pry" describe OrdersController do let(:valid_params){ @@ -14,7 +15,7 @@ }, } } - +binding.pry describe "empty cart" do it "redirects to root path and provides a message" do get cart_path From 79be6f355f1b71a45f5c0c6170bb44921b144483 Mon Sep 17 00:00:00 2001 From: denisseai Date: Fri, 12 Jun 2020 11:32:07 -0700 Subject: [PATCH 083/350] Worked on orders controller test --- app/controllers/orders_controller.rb | 2 +- test/controllers/orders_controller_test.rb | 10 +++++++--- test/test_helper.rb | 9 ++++++++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index c776ed88a5..cd7582ff6b 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -55,7 +55,7 @@ def show flash[:status] = :failure flash[:result_text] = "Your order is being process" flash[:messages] = @order.errors.messages - redirect_to root root_path + redirect_to root_path return end end diff --git a/test/controllers/orders_controller_test.rb b/test/controllers/orders_controller_test.rb index af274badf8..9184324ac0 100644 --- a/test/controllers/orders_controller_test.rb +++ b/test/controllers/orders_controller_test.rb @@ -15,20 +15,24 @@ }, } } -binding.pry - describe "empty cart" do - it "redirects to root path and provides a message" do + describe "cart" do + it "redirects to root path and provides a message if cart is empty" do get cart_path must_respond_with :redirect must_redirect_to root_path expect(flash[:status]).must_equal :failure end + it "finds the correct order id for a valid cart" do + # has at least one orderitem + + end end describe "show" do it "returns not found for the show action with an invalid ID" do get order_path(id: -1) must_respond_with :not_found end + it "returns valid ID" end describe "initialized cart/orders" do before do diff --git a/test/test_helper.rb b/test/test_helper.rb index b19af0d5bd..44db9b0ece 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -17,5 +17,12 @@ 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... + # helper method to set session for a valid order + def valid_order + # empty_order = Order.new(status: "pending", ) + # orderItem = fixture data for an orderitem + # orderItem.order_id = empty_order.id + # # maybe need merchant id?? + # orderitem.save + end end From 92bb5c30dab0eae70333f1aef161409805216e60 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Fri, 12 Jun 2020 11:35:47 -0700 Subject: [PATCH 084/350] Removed Merchant_ID reference from Order model. --- app/models/merchant.rb | 1 - app/models/order.rb | 2 -- ...200612183310_remove_merchant_i_dfrom_order.rb | 5 +++++ db/schema.rb | 16 +++++++++++++--- 4 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 db/migrate/20200612183310_remove_merchant_i_dfrom_order.rb diff --git a/app/models/merchant.rb b/app/models/merchant.rb index 107543299f..5016f224f1 100644 --- a/app/models/merchant.rb +++ b/app/models/merchant.rb @@ -1,6 +1,5 @@ class Merchant < ApplicationRecord has_many :products - has_many :orders #validates :username, presence: true, uniqueness: true # remove? diff --git a/app/models/order.rb b/app/models/order.rb index 07c25c2378..e21b7d16ac 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -6,8 +6,6 @@ class Order < ApplicationRecord has_many :orderitems has_many :products, through: :orderitems - belongs_to :merchant - validates :status, presence: true, inclusion: { in: %w(pending paid complete), message: "%{value} is not a valid status" diff --git a/db/migrate/20200612183310_remove_merchant_i_dfrom_order.rb b/db/migrate/20200612183310_remove_merchant_i_dfrom_order.rb new file mode 100644 index 0000000000..5a18d3bf2b --- /dev/null +++ b/db/migrate/20200612183310_remove_merchant_i_dfrom_order.rb @@ -0,0 +1,5 @@ +class RemoveMerchantIDfromOrder < ActiveRecord::Migration[6.0] + def change + remove_reference :orders, :merchant, index: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 98aa9a8397..d7b41dc947 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,4 +1,16 @@ -ActiveRecord::Schema.define(version: 2020_06_12_162737) do +# 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. +# +# This file is the source Rails uses to define your schema when running `rails +# db:schema:load`. When creating a new database, `rails db:schema:load` tends to +# be faster and is potentially less error prone than running all of your +# migrations from scratch. Old migrations may fail to apply correctly if those +# migrations use external dependencies or application code. +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2020_06_12_183310) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -47,8 +59,6 @@ t.integer "cvv" t.integer "cc_exp" t.integer "zip" - t.bigint "merchant_id" - t.index ["merchant_id"], name: "index_orders_on_merchant_id" end create_table "products", force: :cascade do |t| From f6215758a38e5acb6d1f0803fdd2744e5488bd68 Mon Sep 17 00:00:00 2001 From: denisseai Date: Fri, 12 Jun 2020 11:38:00 -0700 Subject: [PATCH 085/350] changed data type for orderitems cc_exp --- db/schema.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index d7b41dc947..b1350afde2 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -57,7 +57,7 @@ t.string "cc_name" t.bigint "cc_num" t.integer "cvv" - t.integer "cc_exp" + t.string "cc_exp" t.integer "zip" end From 7ecf9bebeed805d297fd2c6e946381283fe6de12 Mon Sep 17 00:00:00 2001 From: denisseai Date: Fri, 12 Jun 2020 11:45:40 -0700 Subject: [PATCH 086/350] fixed merge conflict --- db/schema.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 020d1e6998..b1350afde2 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,11 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -<<<<<<< HEAD -ActiveRecord::Schema.define(version: 2020_06_12_173351) do -======= ActiveRecord::Schema.define(version: 2020_06_12_183310) do ->>>>>>> master # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" From 453ec73f9d051e3fed539b14c7ef0ebd5e2911d1 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Fri, 12 Jun 2020 12:06:03 -0700 Subject: [PATCH 087/350] modified styling of catalog item cards --- app/assets/stylesheets/application.scss | 38 ++++++++++++++++++++++++- app/views/products/index.html.erb | 13 +++++---- 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index ed00e21a16..c744454046 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -76,13 +76,49 @@ body { font-family: 'Rubik', sans-serif; } -.catalog__header, .catalog__secondary-header { +.catalog__header, .catalog__secondary-header, .catalog__detail-header { text-transform: uppercase; + font-weight: 300; +} + +.catalog__detail-header { + color: rgb(126, 126, 126); } + .catalog__secondary-header { color: rgb(206, 206, 206); } +.catalog__card-title-button { + background-color: #161616; + padding: 5px; + border: none; + text-transform: uppercase; + color: #fff; + font-weight: 300; + white-space: normal; + min-width: 100%; +} + +.catalog__card-title-button:hover { + background-color: #fff; + color: #000000; +} + + +.catalog__product-title, a { + color: #fff; +} + +.catalog__product-title:hover { + text-decoration: none; + color: #000; +} + +.catalog__body-text { + font-weight: 300; +} + /* Auto Crop Photos */ .embed-responsive .card-img-top { object-fit: cover; diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index a54445b4ea..b392f07b19 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -1,7 +1,7 @@
<%= link_to "< HOME", root_path, class: "local-navigation" %>

All Products

-

## results

+

## results

@@ -11,12 +11,15 @@
alt=<%= product.product_name%>>
+
-
<%= product.product_name %>
-
- $<%= product.price %> +
+
<%= button_to product.product_name, product_path(product.id), method: :get, class: "catalog__card-title-button text-left"%>
+
+
+ $<%= product.price%>
-
+
Rating: ##/5 (# of reviews)
From ce9a35dae4e5a7640de11e7a80b410aec2fd09d6 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Fri, 12 Jun 2020 12:52:57 -0700 Subject: [PATCH 088/350] added view edge case for when there are no products in the database --- app/views/products/index.html.erb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index b392f07b19..b752cb8c08 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -3,6 +3,7 @@

All Products

## results

+<% if @products.length > 0 %>
<% @products.each do |product| %> @@ -31,3 +32,7 @@
+<% else %> +

No products in the system!

+<% end %> + From cc5f4c70f95f48f39d733697deb3c26b8773c000 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Fri, 12 Jun 2020 12:53:24 -0700 Subject: [PATCH 089/350] added view page for product detail page --- app/assets/stylesheets/application.scss | 55 ++++++++++++++++++------- app/views/products/show.html.erb | 43 +++++++++++++++++++ 2 files changed, 83 insertions(+), 15 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index c744454046..2d9993d362 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -89,23 +89,12 @@ body { color: rgb(206, 206, 206); } -.catalog__card-title-button { - background-color: #161616; - padding: 5px; - border: none; - text-transform: uppercase; - color: #fff; - font-weight: 300; - white-space: normal; - min-width: 100%; -} -.catalog__card-title-button:hover { - background-color: #fff; - color: #000000; +.catalog__description-text, .catalog__review-text { + font-weight: 300; + font-size: 18px; } - .catalog__product-title, a { color: #fff; } @@ -115,8 +104,9 @@ body { color: #000; } -.catalog__body-text { +.catalog__body-text, .catalog__description-title, .catalog__review-title { font-weight: 300; + text-transform: uppercase; } /* Auto Crop Photos */ @@ -124,6 +114,41 @@ body { object-fit: cover; } +/* Buttons */ + +.catalog__card-title-button { + background-color: #161616; + padding: 5px; + border: none; + text-transform: uppercase; + color: #fff; + font-weight: 300; + white-space: normal; + min-width: 100%; +} + +.catalog__card-title-button:hover { + background-color: #fff; + color: #000000; +} + +.catalog__add-to-cart-button { + background-color: #fff; + color: #000000; + padding: 5px; + border: solid; + border-width: thin; + border-color: #161616; + text-transform: uppercase; + font-weight: 300; + white-space: normal; + min-width: 25%; +} + +.catalog__add-to-cart-button:hover { + background-color: #161616; + color: #fff; +} /* Footer */ .footer { diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index e69de29bb2..5be7b1af60 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -0,0 +1,43 @@ +<%# Product Description Header %> +
<%= link_to "< HOME", root_path, class: "local-navigation" %>
+
<%= link_to "< ALL PRODUCTS", products_path, class: "local-navigation" %>
+

<%= @product.product_name %>

+

RATING: ##/5 (# of reviews)

+

Sold by: <%= link_to "MERCHANT MOTHER NATURE", root_path, class: "catalog__detail-header" %>

+
Categories: TODO-LOOP TO LIST CATEGORIES
+ +
+ +<%# Product Picture and Description %> +
+
+
+
+ alt=<%= @product.product_name%>> +
+
+
+

$<%= @product.price %>

+

Description

+
<%= @product.description %>
+ +
+ <%# mini form to "add to card", link to order, and send up params of current product to be an orderitem %> +

Quantity ▭

+ <%= button_to "add to cart", root_path, method: :get, class: "catalog__add-to-cart-button" %> + +
+
+
+
+ +<%# Product Reviews %> +
+

Reviews

+
+ <% if !@product.reviews.empty? %> +
Reviews exist you just haven't put a loop to place the reviews here
+ <% else %> +
No reviews yet
+ <% end %> +
\ No newline at end of file From 7cacd1ffaf3137247033615030d9dbbf3d793ee7 Mon Sep 17 00:00:00 2001 From: denisseai Date: Fri, 12 Jun 2020 13:01:11 -0700 Subject: [PATCH 090/350] Added tests to orders_controller_test --- test/controllers/orders_controller_test.rb | 54 ++++++++++++++++++---- test/fixtures/orderitems.yml | 7 +-- test/fixtures/products.yml | 10 +--- test/test_helper.rb | 20 +++++--- 4 files changed, 64 insertions(+), 27 deletions(-) diff --git a/test/controllers/orders_controller_test.rb b/test/controllers/orders_controller_test.rb index 9184324ac0..e189d0ef0f 100644 --- a/test/controllers/orders_controller_test.rb +++ b/test/controllers/orders_controller_test.rb @@ -22,23 +22,57 @@ must_redirect_to root_path expect(flash[:status]).must_equal :failure end - it "finds the correct order id for a valid cart" do - # has at least one orderitem + it "returns not found when trying to edit" do + get edit_order_path(id: Order.first.id) + must_respond_with :not_found + end + + it "returns not found when trying to update" do + expect { patch order_path(id: Order.first.id), params: valid_params }.wont_change "Order.count" + must_respond_with :not_found end + + # it "finds the correct order id for a valid cart" do + # # make an order + # valid_order = make_order + # # we can check the session[order_id] to be set + # puts "HERE IS VALID_ORDER: #{valid_order.status}" + # expect(session[:order_id]).wont_be_nil + # expect(@order).wont_be_nil + # expect(@order.id).must_equal session[:order_id] + # end end describe "show" do - it "returns not found for the show action with an invalid ID" do + it "returns not found for the show action with an invalid id" do get order_path(id: -1) must_respond_with :not_found end - it "returns valid ID" - end - describe "initialized cart/orders" do - before do - post product_orderitems_path(product_id: products(:nature).id), params: { orderitem: { quantity: 2, }, } - post product_orderitems_path(product_id: products(:cliff).id), params: { orderitem: { quantity: 1, }, } - post product_orderitems_path(product_id: products(:chewy).id), params: { orderitem: { quantity: 3, }, } + + it "redirects for orders with a valid id" do + get order_path(id: orders(:order1)) + must_redirect_to root_path + expect(flash[:status]).must_equal :failure end + + #ActionController::MissingExactTemplate: OrdersController#show is missing a template for request formats: text/html + # it "responds with success for valid orders with paid status" do + # get order_path(id: orders(:order2)) + # must_respond_with :success + # end + end + + # describe "initialized cart" do + # before do + # # path that connects product and orderitems? + # post comment? (product_id: products(:nature_valley).id), params: { orderitem: { quantity: 2, }, } + # end + # describe "cart" do + # it "returns success for an existing session order id" do + # get cart_path + # must_respond_with :success + # end + # end + # end end diff --git a/test/fixtures/orderitems.yml b/test/fixtures/orderitems.yml index 40f533b0df..1b1bd5f611 100644 --- a/test/fixtures/orderitems.yml +++ b/test/fixtures/orderitems.yml @@ -1,7 +1,8 @@ rxbar: quantity: 3 order: order1 - product: RxBar + # if we have trouble, change product to product_id to mirror the table for orderitems + product: rx_bar shipped: false snow: quantity: 1 @@ -16,10 +17,10 @@ nature_valley: rainer: quantity: 1 order: order2 - product: mount_rainer + product: rainer shipped: false discover: quantity: 1 order: order2 - product_id: discover_pass + product: discover shipped: false diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml index 8d7418e684..b5b1bb064e 100644 --- a/test/fixtures/products.yml +++ b/test/fixtures/products.yml @@ -4,7 +4,6 @@ rx_bar: price: 2.45 photo_url: stock: 3 - merchant_id: Nena retired: false kind: product_name: KIND bar @@ -12,15 +11,13 @@ kind: price: 1.45 photo_url: stock: 5 - merchant_id: Nena retired: true -nature: +nature_valley: product_name: Nature Valley description: Crunchy Granola Oats n Honey price: 1.25 photo_url: stock: 8 - merchant_id: Nena retired: false rainer: product_name: Mount Rainer @@ -28,7 +25,6 @@ rainer: price: 5000 photo_url: stock: 1 - merchant_id: Max retired: false discover: product_name: Discover Pass @@ -36,13 +32,11 @@ discover: price: 40 photo_url: stock: 30 - merchant_id: Max retired: false -snow: +snow_pass: product_name: Snow Pass description: Parking pass for local parks in winter price: 25 photo_url: stock: 15 - merchant_id: Max retired: false \ No newline at end of file diff --git a/test/test_helper.rb b/test/test_helper.rb index 44db9b0ece..ea268b3ee1 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,3 +1,4 @@ +require "pry" ENV['RAILS_ENV'] ||= 'test' require_relative '../config/environment' require 'rails/test_help' @@ -18,11 +19,18 @@ class ActiveSupport::TestCase fixtures :all # helper method to set session for a valid order - def valid_order - # empty_order = Order.new(status: "pending", ) - # orderItem = fixture data for an orderitem - # orderItem.order_id = empty_order.id - # # maybe need merchant id?? - # orderitem.save + def make_order + # empty_order = Order.new(status: "pending") + # orderitem = orderitems(:rainer) + # # orderitem.order_id = empty_order.id + # orderitem.save! + # @order = Order.find_by(id: orderitem.order.id) + # return @order + + orderitem = Orderitem.create!(quantity: 1, order: orders(:order2), product: products(:rainer), shipped: false) + @order = Order.find_by(id: orderitem.order.id) + # expect id = 2 + puts "ORDER ID: #{@order.id}" + return @order end end From 8596d732d74d34d80c1ec1e3acef5da995dc52b4 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Fri, 12 Jun 2020 13:22:32 -0700 Subject: [PATCH 091/350] increased padding for description and review containers --- app/views/products/show.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 5be7b1af60..8bd29da981 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -9,7 +9,7 @@
<%# Product Picture and Description %> -
+
@@ -32,7 +32,7 @@
<%# Product Reviews %> -
+

Reviews

<% if !@product.reviews.empty? %> From 5b4771541c4c799333a789a2020e7c246cab5afd Mon Sep 17 00:00:00 2001 From: denisseai Date: Fri, 12 Jun 2020 13:32:12 -0700 Subject: [PATCH 092/350] added order model test --- test/fixtures/orders.yml | 4 +- test/models/order_test.rb | 87 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 87 insertions(+), 4 deletions(-) diff --git a/test/fixtures/orders.yml b/test/fixtures/orders.yml index 227f309c86..8a471f64fa 100644 --- a/test/fixtures/orders.yml +++ b/test/fixtures/orders.yml @@ -15,4 +15,6 @@ order2: cvv: 123 cc_exp: 02/23 zip: 90210 - status: paid \ No newline at end of file + status: paid +pending_order: + status: pending \ No newline at end of file diff --git a/test/models/order_test.rb b/test/models/order_test.rb index 59ceb9a253..407291cec8 100644 --- a/test/models/order_test.rb +++ b/test/models/order_test.rb @@ -1,7 +1,88 @@ require "test_helper" describe Order do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + let(:paid_order) { orders(:order2) } + let(:pending_order) { orders(:pending_order) } + + describe "validation" do + it "will not allow Orders to have no status" do + paid_order.status = nil + + expect(paid_order.valid?).must_equal false + expect(paid_order.errors.messages).must_include :status + expect(paid_order.errors.messages[:status]).must_include "can't be blank" + end + end + + it "cannot have a status other than pending, paid or complete" do + paid_order.status = "pending" + expect(paid_order.valid?).must_equal true + + paid_order.status = "paid" + expect(paid_order.valid?).must_equal true + + paid_order.status = "complete" + expect(paid_order.valid?).must_equal true + + paid_order.status = "gretchen" + expect(paid_order.valid?).must_equal false + expect(paid_order.errors.messages).must_include :status + expect(paid_order.errors.messages[:status]).must_include "gretchen is not a valid status" + end + + it "can update an Order" do + expect{ Orderitem.create(quantity: 1, order: pending_order, product: products(:rainer), shipped: false) }.must_change "pending_order.orderitems.count", 1 + + expect{ + pending_order.update( + email: "lady@gmail.com", + address: "2020 my house street", + cc_name: "Butterfly Cherry", + cc_num: 41658214563, + cvv: 589, + cc_exp: "02/2023", + zip: 98028, + status: "paid" + ) + }.wont_change "Order.count" + + expect(pending_order.email).must_equal "lady@gmail.com" + expect(pending_order.address).must_equal "2020 my house street" + expect(pending_order.cc_name).must_equal "Butterfly Cherry" + expect(pending_order.cc_num).must_equal 41658214563 + expect(pending_order.cvv).must_equal 589 + expect(pending_order.cc_exp).must_equal "02/2023" + expect(pending_order.zip).must_equal 98028 + expect(pending_order.status).must_equal "paid" + expect(pending_order.orderitems.length).must_equal 1 + end + + it "cannot update an Order" do + expect(pending_order.orderitems.count).must_equal 0 + + expect( + pending_order.update( + email: "lady@gmail.com", + address: "2020 my house street", + cc_name: "Butterfly Cherry", + cc_num: 41658214563, + cvv: 589, + cc_exp: "02/2023", + zip: 98028, + status: "paid" + ) + ).must_equal false + + updated_order = Order.find_by(id: pending_order.id) + + expect(updated_order.email).must_be_nil + expect(updated_order.address).must_be_nil + expect(updated_order.cc_name).must_be_nil + expect(updated_order.cc_num).must_be_nil + expect(updated_order.cvv).must_be_nil + expect(updated_order.cc_exp).must_be_nil + expect(updated_order.zip).must_be_nil + expect(updated_order.status).must_equal "pending" + + end end From cfcdf16229466b4c91924c1232d957bd4b2d9c94 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Fri, 12 Jun 2020 14:02:39 -0700 Subject: [PATCH 093/350] fixed indentation of product details content --- app/views/products/show.html.erb | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 8bd29da981..8c399ecd04 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -1,16 +1,19 @@ <%# Product Description Header %> -
<%= link_to "< HOME", root_path, class: "local-navigation" %>
-
<%= link_to "< ALL PRODUCTS", products_path, class: "local-navigation" %>
-

<%= @product.product_name %>

-

RATING: ##/5 (# of reviews)

-

Sold by: <%= link_to "MERCHANT MOTHER NATURE", root_path, class: "catalog__detail-header" %>

-
Categories: TODO-LOOP TO LIST CATEGORIES
+
+
<%= link_to "< HOME", root_path, class: "local-navigation" %>
+
<%= link_to "< ALL PRODUCTS", products_path, class: "local-navigation" %>
+

<%= @product.product_name %>

+

RATING: ##/5 (# of reviews)

+

Sold by: <%= link_to "MERCHANT MOTHER NATURE", root_path, class: "catalog__detail-header" %>

+
Categories: TODO-LOOP TO LIST CATEGORIES
+ +
+
-
<%# Product Picture and Description %>
-
+
alt=<%= @product.product_name%>> @@ -29,7 +32,6 @@
-
<%# Product Reviews %>
@@ -40,4 +42,5 @@ <% else %>
No reviews yet
<% end %> -
\ No newline at end of file +
+
From 1cf4ecbf50c0222936461a89b2c7d8e9c21f2076 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Fri, 12 Jun 2020 14:03:01 -0700 Subject: [PATCH 094/350] added dropdown menu for product categories --- app/assets/stylesheets/application.scss | 4 ++++ app/views/layouts/application.html.erb | 15 +++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 2d9993d362..d3fb2acc26 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -58,6 +58,10 @@ header { text-decoration: none; } +.navbar-nav li:hover>.dropdown-menu { + display: block; +} + /* Content */ html { diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index cd9f6d5fd3..dec43e594f 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -42,12 +42,23 @@
  • <%= link_to "View all merchants", root_path, class: "nav-link-custom py-0 text-uppercase mr-5" %>
    • -
  • - <%= link_to "Cart", root_path, class: "nav-link-custom py-0 text-uppercase mr-5" %> +
  • + +
    + A + B + C + D +
  • <%= link_to "Sign-in", root_path, class: "nav-link-custom py-0 text-uppercase mr-5" %>
    • +
  • + <%= link_to "Cart", root_path, class: "nav-link-custom py-0 text-uppercase mr-5" %> +
    • From 4f6fcfbfb3dcb83bc2b00212654658ee51157820 Mon Sep 17 00:00:00 2001 From: denisseai Date: Fri, 12 Jun 2020 14:56:37 -0700 Subject: [PATCH 095/350] modified cart show page if empty, psuedocode for other order actions, added to order#update and order#show --- app/controllers/orders_controller.rb | 31 +++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index cd7582ff6b..fee71b7fd7 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -11,17 +11,21 @@ def cart else flash[:status] = :failure flash[:result_text] = "Cart is empty" - redirect_back fallback_location: root_path + # redirect_to :show return end end #todo create payment information form + # enter payment details, find order_id from session + # changes status on order from complete to paid def edit ; end # Process order after payment info has been addded + # order items model: add, remove + # use orderitems model methods in order controller to add/remove orderitem in order def update - @order.orderitems.each do |oderitem| + @order.orderitems.each do |orderitem| if !orderitem.valid? flash[:status] = :failure flash[:result_text] = "Some items in your cart are no longer available" @@ -32,6 +36,19 @@ def update end end + # #def update + # @order.orderitems.each do |orderitem| + # if !orderitem.valid? + # flash.now[:status] = :failure + # flash.now[:result_text] = "Sorry. Some of the items in your cart are no longer available." + # flash.now[:messages] = orderitem.errors.messages + # end + + # if flash.now[:status] == :failure + # return redirect_to cart_path + # end + # end + # Change status and clear cart @order.status = "paid" if @order.update(order_params) @@ -49,14 +66,22 @@ def update end end - # Confirmation page for order + # Confirmation page for order : for all statuses ? def show + if @order.id < 0 + head :not_found + end + if @order.status == "pending" flash[:status] = :failure flash[:result_text] = "Your order is being process" flash[:messages] = @order.errors.messages redirect_to root_path return + elsif @order.status == "paid" + flash[:status] = :success + # maybe add result text, maybe not? + redirect_to order_path(@order.id) end end From 879966198d86f4ee3f3baaae9a62e02d1c933961 Mon Sep 17 00:00:00 2001 From: denisseai Date: Fri, 12 Jun 2020 14:57:15 -0700 Subject: [PATCH 096/350] edited resources for orders controller --- config/routes.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 4e3fa00fd2..14a76204f8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,9 +9,9 @@ patch 'orderitems/:id', to: 'orderitems#update' patch 'orderitems/:id/mark_shipped', to: 'orderitems#markshipped', as: 'mark_shipped' - resources :orders, only: [:show, :edit] - get '/cart', to: 'orders#cart', as: 'cart' - patch '/orders/:id', to: 'orders#update' + resources :orders, only: [:show, :edit, :update] + get '/orders/:id/cart', to: 'orders#cart', as: 'cart' + # need custom route for place order? resources :reviews, only: [:new, :create] resources :categories, only: [:new, :create, :show, :index] From ac16e427e0f9ae2357bc7086ffa8ccb4139c0f2b Mon Sep 17 00:00:00 2001 From: denisseai Date: Fri, 12 Jun 2020 14:58:14 -0700 Subject: [PATCH 097/350] working nominal case for order#show --- test/controllers/orders_controller_test.rb | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/test/controllers/orders_controller_test.rb b/test/controllers/orders_controller_test.rb index e189d0ef0f..8e0df04344 100644 --- a/test/controllers/orders_controller_test.rb +++ b/test/controllers/orders_controller_test.rb @@ -50,9 +50,12 @@ end it "redirects for orders with a valid id" do - get order_path(id: orders(:order1)) - must_redirect_to root_path - expect(flash[:status]).must_equal :failure + order_id = orders(:order1).id + puts "ORDER ID: #{order_id}" + + get order_path(id: order_id) + must_redirect_to order_path(order_id) + expect(flash[:status]).must_equal :success end #ActionController::MissingExactTemplate: OrdersController#show is missing a template for request formats: text/html @@ -62,17 +65,4 @@ # end end - - # describe "initialized cart" do - # before do - # # path that connects product and orderitems? - # post comment? (product_id: products(:nature_valley).id), params: { orderitem: { quantity: 2, }, } - # end - # describe "cart" do - # it "returns success for an existing session order id" do - # get cart_path - # must_respond_with :success - # end - # end - # end end From 4779a835590bb47b1131279085ef2377677c56ca Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Fri, 12 Jun 2020 15:22:32 -0700 Subject: [PATCH 098/350] added count of results --- app/views/products/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index b752cb8c08..76a0405b81 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -1,7 +1,7 @@
    <%= link_to "< HOME", root_path, class: "local-navigation" %>

    All Products

    -

    ## results

    +

    <%= @products.count %> results

    <% if @products.length > 0 %>
    From 8d355fde71bb15047274bfd00581ba1dfab03d8d Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Fri, 12 Jun 2020 15:22:51 -0700 Subject: [PATCH 099/350] navigation bar changed to partials --- app/views/layouts/_navigation-bar.html.erb | 42 ++++++++++++++++++++ app/views/layouts/application.html.erb | 45 +--------------------- 2 files changed, 43 insertions(+), 44 deletions(-) create mode 100644 app/views/layouts/_navigation-bar.html.erb diff --git a/app/views/layouts/_navigation-bar.html.erb b/app/views/layouts/_navigation-bar.html.erb new file mode 100644 index 0000000000..4e91f8f31b --- /dev/null +++ b/app/views/layouts/_navigation-bar.html.erb @@ -0,0 +1,42 @@ +
    + <%#

    Logo

    %> + + +
    \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index dec43e594f..f11f99d1a4 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -18,50 +18,7 @@ From 8c1e7966e68469bb48a874a4c69c2c23c5e16634 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Sat, 13 Jun 2020 11:23:41 -0700 Subject: [PATCH 100/350] added before action filter `set_categories` to access category collection throughout app --- app/controllers/application_controller.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 09705d12ab..fb81dac639 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,7 @@ class ApplicationController < ActionController::Base + before_action :set_categories + + def set_categories + @categories = Category.all + end end From d080e3e29e9761e56e74c0fb32b33ba4080c5b2d Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Sat, 13 Jun 2020 11:25:00 -0700 Subject: [PATCH 101/350] modified products#index to filter products by category through passing of params by views --- app/controllers/products_controller.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 73bb29237c..93616d8045 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -2,8 +2,14 @@ class ProductsController < ApplicationController before_action :find_product, only: [:show, :update, :edit, :destroy] def index - # paginate / kaminari gem will be helpful in the case there are numerous products - @products = Product.all + if params[:category_name] + # NOTE TO SELF DO NOT EVER USE WHERE, FIND_BY IS THE WAY TO GO + @products = Category.find_by(category_name: params[:category_name]).products + @collection_name = params[:category_name] + else + @products = Product.all + @collection_name = "all products" + end end def show @@ -11,7 +17,7 @@ def show flash[:error] = "Product has either been deleted, sold out, or not found." head :not_found return - end + end end def new From da7577fb525daff9a47c7e99921953c2c80b3537 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Sat, 13 Jun 2020 11:25:37 -0700 Subject: [PATCH 102/350] rendered partial for navigation bar and added dropdown for categories --- app/views/layouts/_navigation-bar.html.erb | 8 ++++---- app/views/layouts/application.html.erb | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/views/layouts/_navigation-bar.html.erb b/app/views/layouts/_navigation-bar.html.erb index 4e91f8f31b..b27c515ccc 100644 --- a/app/views/layouts/_navigation-bar.html.erb +++ b/app/views/layouts/_navigation-bar.html.erb @@ -25,10 +25,10 @@ Categories
    - A - B - C - D + <% collection.each do |category| %> + <%= link_to category.category_name, products_path(category_name: category.category_name), class: "dropdown-item nav-link-custom text-uppercase" %> + <% end %> +
  • diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f11f99d1a4..2a921eebfa 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -18,14 +18,13 @@ <%# Content %> -
    - <%= yield %> -
    + <%= yield %> + <%# Footer %> From 82ba1d62a58a8b611078c95451484d444480bb79 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Sat, 13 Jun 2020 11:26:19 -0700 Subject: [PATCH 103/350] modified padding of product detail page --- app/views/products/show.html.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 8c399ecd04..64a3fa11aa 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -1,3 +1,4 @@ +
    <%# Product Description Header %>
    <%= link_to "< HOME", root_path, class: "local-navigation" %>
    @@ -44,3 +45,4 @@ <% end %>
    +
    • \ No newline at end of file From 39d2a5eb961fc1c5986b8bcc0b2276f930c86f4e Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Sat, 13 Jun 2020 11:27:32 -0700 Subject: [PATCH 104/350] modified content padding from application.html.erb to each content page, added local navigation to product#index page --- app/views/products/index.html.erb | 68 ++++++++++++++++--------------- 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index 76a0405b81..fbc2dc2609 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -1,38 +1,42 @@ -
    -
    <%= link_to "< HOME", root_path, class: "local-navigation" %>
    -

    All Products

    -

    <%= @products.count %> results

    -
    -<% if @products.length > 0 %> -
    -
    - <% @products.each do |product| %> -
    -
    -
    - alt=<%= product.product_name%>> -
    +
    +
    +
    <%= link_to "< HOME", root_path, class: "local-navigation" %>
    + <% if @collection_name != "all products" %> +
    <%= link_to "< ALL PRODUCTS", products_path, class: "local-navigation" %>
    + <% end %> +

    <%=@collection_name%>

    +

    <%= @products.count %> results

    +
    + <% if @products.length > 0 %> +
    +
    + <% @products.each do |product| %> +
    +
    +
    + alt=<%= product.product_name%>> +
    -
    -
    -
    <%= button_to product.product_name, product_path(product.id), method: :get, class: "catalog__card-title-button text-left"%>
    -
    -
    - $<%= product.price%> -
    -
    - Rating: ##/5 (# of reviews) -
    +
    +
    +
    <%= button_to product.product_name, product_path(product.id), method: :get, class: "catalog__card-title-button text-left"%>
    +
    +
    + $<%= product.price%> +
    +
    + Rating: ##/5 (# of reviews) +
    +
    -
    - <% end %> -
    + <% end %> +
    +
    -
    - -<% else %> -

    No products in the system!

    -<% end %> + <% else %> +

    No products in the system!

    + <% end %> +
    From e7573060a6ab675bc469e03a9e592f9aafe33a7e Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Sat, 13 Jun 2020 11:27:52 -0700 Subject: [PATCH 105/350] partial for each browse by category picture and link --- app/views/pages/_browse-by-category.html.erb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 app/views/pages/_browse-by-category.html.erb diff --git a/app/views/pages/_browse-by-category.html.erb b/app/views/pages/_browse-by-category.html.erb new file mode 100644 index 0000000000..ae625f26a0 --- /dev/null +++ b/app/views/pages/_browse-by-category.html.erb @@ -0,0 +1,6 @@ +
    +
    + alt="category"> + <%= link_to category_name, products_path(category_name: category_name), method: :get, class: "browse-by-category__link" %> +
    +
    \ No newline at end of file From 6120ac7082c01f6676a2dc4176e3bcad2eb7e150 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Sat, 13 Jun 2020 11:28:19 -0700 Subject: [PATCH 106/350] added styling classes for jumbotron and browse by class items --- app/assets/stylesheets/application.scss | 57 +++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index d3fb2acc26..6a3e3e66fc 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -31,6 +31,63 @@ header { color: #7f7f7f; } +/* Homepage */ +.jumbotron-custom { + background-image: url(https://i.imgur.com/u2oPC.jpg); + background-size: cover; + height: 600px; + width: auto; +} + +.jumbotron-text { + font-family: 'Old Standard TT', serif; + font-weight: 400; + font-style: italic; + color: #fff; +} + +.jumbotron-disclaimer-text { + font-family: 'Rubik', sans-serif; + font-weight: 300; + text-transform: uppercase; + color: #fff; + font-size: 12px; +} + +.browse-by-category__header { + font-weight: 300; + text-transform: uppercase; +} + +.browse-by-category__image { + filter: brightness(75%); +} + +.browse-by-category__link { + text-transform: uppercase; + text-align: center; + font-weight: 300; + font-size: 25px; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + background-color: rgba(255, 255, 255, 0.808); + color: #161616; + padding: 5px; + min-width: 100%; + font-weight: 300; + white-space: normal; + border: none; + text-transform: uppercase; +} + +.browse-by-category__link:hover { + text-decoration: none; + background-color: #161616; + color: #fff; +} + /* Navigation */ .nav-item-custom { font-family: 'Rubik', sans-serif; From bdad536da2d77ed3a896b98d2655cdf74d004404 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Sat, 13 Jun 2020 11:28:45 -0700 Subject: [PATCH 107/350] added jumbotron and browse by category to homepage --- app/views/pages/index.html.erb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/app/views/pages/index.html.erb b/app/views/pages/index.html.erb index 139597f9cb..a14f42176f 100644 --- a/app/views/pages/index.html.erb +++ b/app/views/pages/index.html.erb @@ -1,2 +1,20 @@ +<%# Jumbotron %> +
    +
    +

    Shop for a piece of the outdoors regardless of your budget

    +

    DISCLAIMER: If you buy a piece of Mother Nature, you are obligated to life long service in protecting and preserving the piece of nature you own.

    +
    +
    +<%# Browse by category %> +
    +

    Browse by category

    +
    + <%= render partial: "browse-by-category", locals: {photo_url: "https://upload.wikimedia.org/wikipedia/commons/thumb/e/e7/Mount_Kita_from_Mount_Komatsu_1997-1-1.jpg/1200px-Mount_Kita_from_Mount_Komatsu_1997-1-1.jpg", category_name: "mountains"} %> + <%= render partial: "browse-by-category", locals: {photo_url: "https://images.unsplash.com/photo-1534868489953-ef37c20abb25?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=900&q=60", category_name: "national parks"} %> + <%= render partial: "browse-by-category", locals: {photo_url: "https://images.unsplash.com/photo-1533977397732-47222b2dd81f?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=1402&q=80", category_name: "islands"} %> + <%= render partial: "browse-by-category", locals: {photo_url: "https://images.unsplash.com/photo-1485809052957-5113b0ff51af?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=900&q=60", category_name: "gear"} %> + <%= render partial: "browse-by-category", locals: {photo_url: "https://about.spud.com/wrdp/wp-content/uploads/2018/05/shutterstock_1027395040.jpg", category_name: "snacks"} %> + <%= render partial: "browse-by-category", locals: {photo_url: "https://images.unsplash.com/photo-1490264496899-99b4c9c3993b?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=900&q=60", category_name: "parking permits"} %> +
    From 189be3d7a9785c6e05bf4afd0f83c8c77b1b9656 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Sat, 13 Jun 2020 14:14:57 -0700 Subject: [PATCH 108/350] added basic merchant show all page --- app/views/merchants/index.html.erb | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 app/views/merchants/index.html.erb diff --git a/app/views/merchants/index.html.erb b/app/views/merchants/index.html.erb new file mode 100644 index 0000000000..c4f30fa9ad --- /dev/null +++ b/app/views/merchants/index.html.erb @@ -0,0 +1,10 @@ +<% if @merchants.length > 0 %> + <% @merchants.each do |merchant| %> +

    photo avatar here

    +

    need to add merchant detail page and show action

    + <%= link_to merchant.username, root_path, class: "text-dark"%> + <%= link_to "all of this merchant's products", root_path, class: "text-dark" %> + <% end %> +<% else %> +

    No merchants!

    +<% end %> \ No newline at end of file From 8ccedc0c237bb180a788781552c867be01571fa1 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Sat, 13 Jun 2020 14:37:19 -0700 Subject: [PATCH 109/350] added all merchants navigation link Co-authored-by: ubeninja77 --- app/views/layouts/_navigation-bar.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_navigation-bar.html.erb b/app/views/layouts/_navigation-bar.html.erb index b27c515ccc..65dda77548 100644 --- a/app/views/layouts/_navigation-bar.html.erb +++ b/app/views/layouts/_navigation-bar.html.erb @@ -18,7 +18,7 @@ <%= link_to "All products", products_path, class: "nav-link-custom py-0 text-uppercase mr-5" %>
  • - <%= link_to "All merchants", root_path, class: "nav-link-custom py-0 text-uppercase mr-5" %> + <%= link_to "All merchants", merchants_path, class: "nav-link-custom py-0 text-uppercase mr-5" %>

    • Mountain icon by Icons8

    +
    +
    + follow us
    +
    + + + +
    + + +
    + + +
    + + + +
    © 2020 Copyright: Gretchen's Granola Girls +
    + \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f11f99d1a4..c44171fa37 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -8,6 +8,7 @@ <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> <%= favicon_link_tag 'favicon.png' %> + @@ -29,7 +30,7 @@ <%# Footer %> -
    Footer, Gretchen Granola Girls, icon attributions, disclaimer
    +
    <%= render partial: "layouts/footer" %>
    From 0788670ddc10990bbde8f539ee9b28403946cb16 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Sat, 13 Jun 2020 17:11:59 -0700 Subject: [PATCH 117/350] styled footer and added disclaimer and attributions --- app/assets/stylesheets/application.scss | 51 ++++++++++++++++++++++++- app/views/layouts/_footer.html.erb | 47 +++++++++++++++++++++++ app/views/layouts/application.html.erb | 3 +- 3 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 app/views/layouts/_footer.html.erb diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 6a3e3e66fc..1deaaf65a3 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -213,14 +213,63 @@ body { /* Footer */ .footer { - padding: 30px; + padding: 20px 0px 10px 0px; text-transform: uppercase; text-align: center; font-family: 'Rubik', sans-serif; + font-weight: 300; background-color: rgb(206, 206, 206); color: white; } +.footer__text { + font-size: 12px; +} + +.footer__link { + color: #fff; + font-size: 12px; +} + +.footer__link:hover { + text-decoration: none; + color: #161616; +} + +// Social Media Icons +.fa { + padding: 20px; + font-size: 30px; + text-align: center; + justify-content: center; + text-decoration: none; + border-radius: 50%; +} + +.fa-snapchat-ghost:hover { + text-decoration: none; + background: #fffc00; + text-shadow: -1px 0 #000, 0 1px #000, 1px 0 #000, 0 -1px #000; + color: white; +} + +.fa-twitter:hover { + text-decoration: none; + background: #55ACEE; + color: white; +} + +.fa-instagram:hover { + text-decoration: none; + color: white; + background: #f09433; + background: -moz-linear-gradient(45deg, #f09433 0%, #e6683c 25%, #dc2743 50%, #cc2366 75%, #bc1888 100%); + background: -webkit-linear-gradient(45deg, #f09433 0%,#e6683c 25%,#dc2743 50%,#cc2366 75%,#bc1888 100%); + background: linear-gradient(45deg, #f09433 0%,#e6683c 25%,#dc2743 50%,#cc2366 75%,#bc1888 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f09433', endColorstr='#bc1888',GradientType=1 ); +} + + // allows for sticky footer when placed in body class .wrapper { min-height: 100%; diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb new file mode 100644 index 0000000000..bbf7e8cc0d --- /dev/null +++ b/app/views/layouts/_footer.html.erb @@ -0,0 +1,47 @@ +<%# Footer, Gretchen Granola Girls, icon attributions, disclaimer %> + + +
    + + +
    + + +
    + DISCLAIMER +
    +

    This is not a real website if you didn't know that you can't buy a piece of mountain.

    +
    +
    + CONTACT +
    +

    + 13TH ADA COHORT STREET
    + SEATTLE, WA 98118
    + +1 234-567-8910
    + OUTDOORSY@ADADEV.ORG

    +
    +
    + ATTRIBUTIONS +
    +

    Favicon: Mountain icon by Icons8

    +
    +
    + follow us
    +
    + + + +
    + + +
    + + +
    + + + +
    © 2020 Copyright: Gretchen's Granola Girls +
    + \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 2a921eebfa..62612d14d0 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -8,6 +8,7 @@ <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> <%= favicon_link_tag 'favicon.png' %> + @@ -28,7 +29,7 @@ <%# Footer %> -
    Footer, Gretchen Granola Girls, icon attributions, disclaimer
    +
    <%= render partial: "layouts/footer" %>
    From c119bbed614ad58cede96a68a9bc5ca2d6c9c94b Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Sat, 13 Jun 2020 19:50:35 -0700 Subject: [PATCH 118/350] Updates .gitignore to ignore DS store. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index f22dd34725..26e56c0469 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,5 @@ /yarn-error.log yarn-debug.log* .yarn-integrity + +.DS_Store \ No newline at end of file From 8def7d3aae31f6c6c013404f2dbcb092fd8d272c Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Sat, 13 Jun 2020 19:52:16 -0700 Subject: [PATCH 119/350] Removed DS_Store files --- .DS_Store | Bin 8196 -> 0 bytes db/.DS_Store | Bin 6148 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store delete mode 100644 db/.DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 2b1f83f08a110e12b27579be1207639e3317b7f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHM-EPw`6h2-{muy2632BqK$qf=06WYXnkPuQSo6s(h5JhkSXlt6Vg{4W=BrBs7 z^@evCkHDMo2D}3IJOF&h@g^tj;0B>dvn%^J_IHkbzGEkGN<^ZWd8r+-T^|NGZhCFhM7-B|FG)5%G9V9*V)#IDn3xgzGS@|wzD%C5sS<9NU z=C01YX&uCaR@zRpq}lGj;;X0a^uSg1=V0@!-gaLE{$RI$<53)??I7~|QaSK^KwiHL zA}<~^<1F$LX{VKUSe9+syY)dR$I$7@ zg%OfpM9XmN=!GI0BZOF17^|emq1W|n=w+ByAG6~nI5`qWSl6fk6HJS-u(TL6DyIG7 z=mZ}Ns0A$i7$f_%3s1S0@eImafW0m0^%RqBY#Kk`Hqb9`3V2)4yN>-DQ$i`2N$~sY z<`eL~V4(&J8REzsbV}Y~os0Jx2NpfUEDtfismw|?bi57xHa(;*dIC9RjYuAJjalhS zjOa-oit`cdy^gNJZ*WU#3CBL_xC(IHY4*c&aUAmO4@1-)Kv}1u0{HDle?pt*zl?(^E*As80S#2A AEdT%j diff --git a/db/.DS_Store b/db/.DS_Store deleted file mode 100644 index a07eea30ac0afa1a0f52a0c174da4b7e2aec06e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKyG{c!5S)cb9D*VplrE`|sA;Sy6x93xxrYEL=ukqaui+o~M?L~(y(YRNC($8< zb|ZV%-W~fqQv3iQvrT;gOaT-uilWYlY4>PoFDFlklEzrz8O`;wt;*%dK!34Izx@D@ zc)%T2=zV`%GNQ6vvYdS+qX!)0iJ2{GY*2B%Yn&6;c(HYFdGE}9>+uemQ{f&BXIqf7 zLOEo}2^syF3Njl0>NLl0{_D4VHr-qSSHKl;1zdq272uhzRva06?FzU8uE16S-5&yr zV$9eXrmcfjdIAvj8l8;3UYeB?GRBOZAtN*~D$%HtpBQ3v_J^DoGj@hXhvdhH^@) vSZ-O=G_O;KMt^V#U_ Date: Sat, 13 Jun 2020 19:57:00 -0700 Subject: [PATCH 120/350] Fixed rainier typo in orderitem.yml, wrote orderitem model tests for relations, most validations, and subtotal. --- app/models/orderitem.rb | 11 ++-- test/fixtures/orderitems.yml | 6 +- test/models/orderitem_test.rb | 107 +++++++++++++++++++++++++++++++++- 3 files changed, 113 insertions(+), 11 deletions(-) diff --git a/app/models/orderitem.rb b/app/models/orderitem.rb index 42d65108f6..a7e394f682 100644 --- a/app/models/orderitem.rb +++ b/app/models/orderitem.rb @@ -3,16 +3,17 @@ class Orderitem < ApplicationRecord belongs_to :order validates :quantity, presence: true, numericality: { only_integer: true, greater_than: 0} - validates :shipped, inclusion: { in: [true, false],message: "shipped status : true or false"} - - validate :in_stock - validate :not_retired + validates :shipped, inclusion: { in: [true, false], message: "shipped status : true or false"} + # validates :in_stock + # validates :not_retired def subtotal - return (self.quantity) * (self.product.price) + subtotal = (self.quantity) * (self.product.price) + return subtotal.round(2) end private + def in_stock if quantity && product && quantity > product.stock errors.add(:quantity, "order exceeds in-stock inventory") diff --git a/test/fixtures/orderitems.yml b/test/fixtures/orderitems.yml index 1b1bd5f611..75abb719fc 100644 --- a/test/fixtures/orderitems.yml +++ b/test/fixtures/orderitems.yml @@ -14,13 +14,13 @@ nature_valley: order: order2 product: nature_valley shipped: false -rainer: +rainier: quantity: 1 order: order2 - product: rainer + product: rainier shipped: false discover: quantity: 1 order: order2 product: discover - shipped: false + shipped: true diff --git a/test/models/orderitem_test.rb b/test/models/orderitem_test.rb index 48dc4d1fbd..6092b48a5f 100644 --- a/test/models/orderitem_test.rb +++ b/test/models/orderitem_test.rb @@ -1,7 +1,108 @@ require "test_helper" describe Orderitem do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "relations" do + before do + @orderitem = orderitems(:rxbar) + end + + it "belongs to an order" do + expect(@orderitem.order_id).must_equal orders(:order1).id + end + + it "belongs to a product" do + expect(@orderitem.product_id).must_equal products(:rx_bar).id + end + end + + describe "validations" do + before do + @orderitem = orderitems(:rxbar) + end + + # QUANTITY VALIDATIONS: + it "is valid with a valid integer quantity" do + expect(@orderitem.valid?).must_equal true + expect(@orderitem.quantity).must_be_kind_of Integer + expect(@orderitem.quantity).must_equal 3 + end + + it "is invalid without a quantity" do + @orderitem.quantity = nil + @result = @orderitem.valid? + + expect(@result).must_equal false + end + + it "is invalid with a quantity integer value less than or equal to 0" do + # 0 quantity + @orderitem.quantity = 0 + @result = @orderitem.valid? + + expect(@result).must_equal false + + # Negative quantity + @orderitem.quantity = -1 + @result = @orderitem.valid? + + expect(@result).must_equal false + end + + it "is invalid with an incorrect quantity data type" do + @orderitem.quantity = "FIVE" + @result = @orderitem.valid? + + expect(@result).must_equal false + end + + # SHIPPED VALIDATIONS: + # test message content??????????? + it "is valid with a false shipped status" do + expect(@orderitem.valid?).must_equal true + expect(@orderitem.shipped.class).must_equal FalseClass + expect(@orderitem.shipped).must_equal false + end + + # test message content??????????? + it "is valid with a true shipped status" do + @orderitem = orderitems(:discover) + + expect(@orderitem.valid?).must_equal true + expect(@orderitem.shipped.class).must_equal TrueClass + expect(@orderitem.shipped).must_equal true + end + + # TODO::: IN_STOCK VALIDATIONS + + + # TODO::: NOT_RETIRED VALIDATIONS + + + end + + # CUSTOM METHODS + describe "subtotal" do + before do + @orderitem = orderitems(:rxbar) + end + + it "correctly calculates the subtotal from an orderitem's corresponding product" do + # 3 rx_bars * $2.45 + expect(@orderitem.quantity).must_equal 3 + expect(@orderitem.product.price).must_equal 2.45 + expect(@orderitem.subtotal).must_equal 7.35 + end + + it "returns 0 when the quantity is 0" do + # 0 quantity + @orderitem.quantity = 0 + expect(@orderitem.quantity).must_equal 0 + expect(@orderitem.product.price).must_equal 2.45 + expect(@orderitem.subtotal).must_equal 0 + end + + # Any edge test cases???? + + + end end From f934f519eadb59f29b742f2f7cf404768e8d44a1 Mon Sep 17 00:00:00 2001 From: denisseai Date: Sun, 14 Jun 2020 18:11:33 -0700 Subject: [PATCH 121/350] Fized typo in 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 c1871d2bfb..b5b1bb064e 100644 --- a/test/fixtures/products.yml +++ b/test/fixtures/products.yml @@ -19,8 +19,8 @@ nature_valley: photo_url: stock: 8 retired: false -rainier: - product_name: Mount Rainier +rainer: + product_name: Mount Rainer description: Volcano price: 5000 photo_url: From 2bbfbfb59316ead91ff4d684a3a64715cfe1369b Mon Sep 17 00:00:00 2001 From: denisseai Date: Sun, 14 Jun 2020 18:11:58 -0700 Subject: [PATCH 122/350] Added tests to models/order --- test/models/order_test.rb | 130 +++++++++++++++++++++++++++++++++++++- 1 file changed, 129 insertions(+), 1 deletion(-) diff --git a/test/models/order_test.rb b/test/models/order_test.rb index 407291cec8..ad6ed6a44f 100644 --- a/test/models/order_test.rb +++ b/test/models/order_test.rb @@ -14,7 +14,7 @@ end end - it "cannot have a status other than pending, paid or complete" do + it "cannot have a status other than pending, paid, cancel or complete" do paid_order.status = "pending" expect(paid_order.valid?).must_equal true @@ -24,6 +24,10 @@ paid_order.status = "complete" expect(paid_order.valid?).must_equal true + #why is cancel not working + # paid_order.status = "cancel" + # expect(paid_order.valid?).must_equal true + paid_order.status = "gretchen" expect(paid_order.valid?).must_equal false expect(paid_order.errors.messages).must_include :status @@ -83,6 +87,130 @@ expect(updated_order.cc_exp).must_be_nil expect(updated_order.zip).must_be_nil expect(updated_order.status).must_equal "pending" + end + + it "will outputs errors if updating Orders without orderitems" do + updated_order = pending_order.update( + email: "lady@gmail.com", + address: "2020 my house street", + cc_name: "Butterfly Cherry", + cc_num: 41658214563, + cvv: 589, + cc_exp: "02/2023", + zip: 98028, + status: "paid" + ) + expect(updated_order).must_equal false + expect(pending_order.errors.messages).must_include :orderitems + expect(pending_order.errors.messages[:orderitems]).must_include "Your cart is empty" + end + + #low hanging fruit :P + describe "All attributes must be present when updating" do + before do + expect{ Orderitem.create(quantity: 1, order: pending_order, product: products(:rainer), shipped: false) }.must_change "pending_order.orderitems.count", 1 + + @updated_order = pending_order.update( + status: "paid" + ) + end + + it "will not update an Order without an email" do + expect(@updated_order).must_equal false + expect(pending_order.errors.messages).must_include :email + expect(pending_order.errors.messages[:email]).must_include "can't be blank" + end + + it "will not update an Order without an address" do + expect(@updated_order).must_equal false + expect(pending_order.errors.messages).must_include :address + expect(pending_order.errors.messages[:address]).must_include "can't be blank" + end + + it "will not update an Order without a cc_name" do + expect(@updated_order).must_equal false + expect(pending_order.errors.messages).must_include :cc_name + expect(pending_order.errors.messages[:cc_name]).must_include "can't be blank" + end + + it "will not update an Order without a cc_num" do + expect(@updated_order).must_equal false + expect(pending_order.errors.messages).must_include :cc_num + expect(pending_order.errors.messages[:cc_num]).must_include "can't be blank" + end + + it "cannot update an Order with a non-numerical cc_num" do + updated_order = paid_order.update(cc_num: "abc") + + expect(updated_order).must_equal false + expect(paid_order.errors.messages).must_include :cc_num + expect(paid_order.errors.messages[:cc_num]).must_include "is not a number" + end + + it "cannot update an Order with a cc_num that is a float" do + updated_order = paid_order.update(cc_num: 123.4) + + expect(updated_order).must_equal false + expect(paid_order.errors.messages).must_include :cc_num + expect(paid_order.errors.messages[:cc_num]).must_include "must be an integer" + end + + it "cannot update an Order with a cc_num with less than 4 digits" do + updated_order = paid_order.update(cc_num: 123) + + expect(updated_order).must_equal false + expect(paid_order.errors.messages).must_include :cc_num + expect(paid_order.errors.messages[:cc_num]).must_include "is too short (minimum is 4 characters)" + end + + it "will not update an Order without a cvv" do + expect(@updated_order).must_equal false + expect(pending_order.errors.messages).must_include :cvv + expect(pending_order.errors.messages[:cvv]).must_include "can't be blank" + end + + it "cannot update an Order with a cvv that is a float" do + updated_order = paid_order.update(cvv: 0.0) + + expect(updated_order).must_equal false + expect(paid_order.errors.messages).must_include :cvv + expect(paid_order.errors.messages[:cvv]).must_include "must be an integer" + end + + it "cannot update an Order with a non-numerical cvv" do + updated_order = paid_order.update(cvv: "abc") + + expect(updated_order).must_equal false + expect(paid_order.errors.messages).must_include :cvv + expect(paid_order.errors.messages[:cvv]).must_include "is not a number" + end + + it "will not update an Order ithout a cc_exp" do + expect(@updated_order).must_equal false + expect(pending_order.errors.messages).must_include :cc_exp + expect(pending_order.errors.messages[:cc_exp]).must_include "can't be blank" + end + it "will not update an Order ithout a zip" do + expect(@updated_order).must_equal false + expect(pending_order.errors.messages).must_include :zip + expect(pending_order.errors.messages[:zip]).must_include "can't be blank" + end + + it "cannot update an Order with a non-numerical zip" do + updated_order = paid_order.update(zip: "abc") + + expect(updated_order).must_equal false + expect(paid_order.errors.messages).must_include :zip + expect(paid_order.errors.messages[:zip]).must_include "is not a number" + end + + it "cannot update an Order with a zip that is a float" do + updated_order = paid_order.update(zip: 0.0) + + expect(updated_order).must_equal false + expect(paid_order.errors.messages).must_include :zip + expect(paid_order.errors.messages[:zip]).must_include "must be an integer" + end end end From ebc2493c9bb0fcffd2dd6a539ea9693e58d462ac Mon Sep 17 00:00:00 2001 From: denisseai Date: Sun, 14 Jun 2020 19:06:06 -0700 Subject: [PATCH 123/350] Added relationship tests in models/order --- test/models/order_test.rb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/test/models/order_test.rb b/test/models/order_test.rb index ad6ed6a44f..b00d2b386d 100644 --- a/test/models/order_test.rb +++ b/test/models/order_test.rb @@ -213,4 +213,22 @@ expect(paid_order.errors.messages[:zip]).must_include "must be an integer" end end + + describe "relationships" do + it "has many orderitems" do + expect(paid_order.orderitems.count).must_be :>, 1 + + paid_order.orderitems.each do |orderitem| + expect(orderitem).must_be_instance_of Orderitem + end + end + + it "has many products" do + expect(paid_order.products.count).must_be :>, 1 + + paid_order.products.each do |product| + expect(product).must_be_instance_of Product + end + end + end end From 3505f14c763233f45232001c2cd14bc1e8fff38c Mon Sep 17 00:00:00 2001 From: denisseai Date: Sun, 14 Jun 2020 19:33:50 -0700 Subject: [PATCH 124/350] Changed variable name to product_name in orderitems controller --- app/controllers/orderitems_controller.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/orderitems_controller.rb b/app/controllers/orderitems_controller.rb index e1ce5b0c23..805252a6d6 100644 --- a/app/controllers/orderitems_controller.rb +++ b/app/controllers/orderitems_controller.rb @@ -30,10 +30,10 @@ def create if @orderitem.save flash[:status] = :success - flash[:result_text] = "#{orderitem.product.name} was added to cart" + flash[:result_text] = "#{orderitem.product.product_name} was added to cart" else flash[:status] = :failure - flash[:result_text] = "Error adding #{orderitem.product.name} to cart" + flash[:result_text] = "Error adding #{orderitem.product.product_name} to cart" flash[:messages] = @orderitem.errors.messages end redirect_back fallback_location: root_path @@ -69,7 +69,7 @@ def destroy if @orderitem.order.status == "pending" @orderitem.destroy flash[:status] = :success - flash[:result_text] = "#{@orderitem.product.name} was removed from your cart" + flash[:result_text] = "#{@orderitem.product.product_name} was removed from your cart" redirect_to cart_path else flash[:status] = :failure @@ -84,7 +84,7 @@ def mark_shipped @orderitem.shipped = true @orderitem.save flash[:status] = :success - flash[:result_text] = "#{@orderitem.product.name} - shipped" + flash[:result_text] = "#{@orderitem.product.product_name} - shipped" @orderitem.order.mark_as_complete? redirect_back fallback_location: root_path From 66a0ffbe2b091764415410751b7dd3ee76b8bbcb Mon Sep 17 00:00:00 2001 From: denisseai Date: Sun, 14 Jun 2020 19:39:25 -0700 Subject: [PATCH 125/350] Added more tests to models/order --- app/controllers/orderitems_controller.rb | 2 +- app/models/order.rb | 4 ++-- test/models/order_test.rb | 22 +++++++++++++++++++--- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/app/controllers/orderitems_controller.rb b/app/controllers/orderitems_controller.rb index 805252a6d6..6818cb8b1e 100644 --- a/app/controllers/orderitems_controller.rb +++ b/app/controllers/orderitems_controller.rb @@ -64,7 +64,7 @@ def update end end - # comment here + # comment here- video said about a difference between destroy and delete def destroy if @orderitem.order.status == "pending" @orderitem.destroy diff --git a/app/models/order.rb b/app/models/order.rb index e21b7d16ac..ed46967361 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -7,7 +7,7 @@ class Order < ApplicationRecord has_many :products, through: :orderitems validates :status, presence: true, inclusion: { - in: %w(pending paid complete), + in: %w(pending paid complete cancel), message: "%{value} is not a valid status" } @@ -20,7 +20,7 @@ class Order < ApplicationRecord validates :cc_exp, presence: true, on: :update validates :zip, presence: true, numericality: { only_integer: true }, on: :update - # review after seeding + # custom methods def reduce_stock self.orderitems.each do |orderitem| orderitem.product.stock -= orderitem.quantity diff --git a/test/models/order_test.rb b/test/models/order_test.rb index b00d2b386d..e528ee4094 100644 --- a/test/models/order_test.rb +++ b/test/models/order_test.rb @@ -24,9 +24,8 @@ paid_order.status = "complete" expect(paid_order.valid?).must_equal true - #why is cancel not working - # paid_order.status = "cancel" - # expect(paid_order.valid?).must_equal true + paid_order.status = "cancel" + expect(paid_order.valid?).must_equal true paid_order.status = "gretchen" expect(paid_order.valid?).must_equal false @@ -231,4 +230,21 @@ end end end + + describe "custom methods" do + # describe "reduce_stock" do + # it "will reduce the number of product stock by orderitem quantity" do + # expect(products(:rx_bar).stock).must_equal 3 + # expect(products(:kind).stock).must_equal 5 + + # paid_order.reduce_stock + + # updated_rx_bar = Product.find_by(id: products(:rx_bar).id) + # updated_kind = Product.find_by(id: products(:kind).id) + + # expect(updated_rx_bar.stock).must_equal 2 + # expect(updated_kind.stock).must_equal 4 + # end + # end + end end From d7adc5c73d27b549cb4583c4baf84efe5aa32b1b Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Sun, 14 Jun 2020 22:26:02 -0700 Subject: [PATCH 126/350] Cleaned orderitem model and tests. --- app/models/orderitem.rb | 19 ++++++++++++++++--- test/models/orderitem_test.rb | 12 ++++-------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/app/models/orderitem.rb b/app/models/orderitem.rb index a7e394f682..b11a5add1f 100644 --- a/app/models/orderitem.rb +++ b/app/models/orderitem.rb @@ -3,7 +3,8 @@ class Orderitem < ApplicationRecord belongs_to :order validates :quantity, presence: true, numericality: { only_integer: true, greater_than: 0} - validates :shipped, inclusion: { in: [true, false], message: "shipped status : true or false"} + # do we need below? + validates :shipped, inclusion: { in: [true, false], message: "shipped status : must be true or false"} # validates :in_stock # validates :not_retired @@ -14,8 +15,20 @@ def subtotal private - def in_stock - if quantity && product && quantity > product.stock + # mark_shipped for order (Order in charge of gateway: check this item shipped, check if can mark complete on whole order) + # check if the order is complete? + # if so, + # order.mark_item_shipped(id) + # can mark whole order complete + + # def marked_shipped + # single orderitem change shipped status + # end + + + def enough_stock + # call product's in_stock? + if quantity && product && product.enough_stock?(quantity) errors.add(:quantity, "order exceeds in-stock inventory") end end diff --git a/test/models/orderitem_test.rb b/test/models/orderitem_test.rb index 6092b48a5f..2e7de80e3e 100644 --- a/test/models/orderitem_test.rb +++ b/test/models/orderitem_test.rb @@ -7,11 +7,11 @@ end it "belongs to an order" do - expect(@orderitem.order_id).must_equal orders(:order1).id + expect(@orderitem.order).must_equal orders(:order1) end it "belongs to a product" do - expect(@orderitem.product_id).must_equal products(:rx_bar).id + expect(@orderitem.product).must_equal products(:rx_bar) end end @@ -56,14 +56,14 @@ end # SHIPPED VALIDATIONS: - # test message content??????????? + # test message content???? it "is valid with a false shipped status" do expect(@orderitem.valid?).must_equal true expect(@orderitem.shipped.class).must_equal FalseClass expect(@orderitem.shipped).must_equal false end - # test message content??????????? + # test message content???? it "is valid with a true shipped status" do @orderitem = orderitems(:discover) @@ -100,9 +100,5 @@ expect(@orderitem.product.price).must_equal 2.45 expect(@orderitem.subtotal).must_equal 0 end - - # Any edge test cases???? - - end end From a734fd11ce085c67d71beefa411bc1edf0539a56 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Sun, 14 Jun 2020 22:30:03 -0700 Subject: [PATCH 127/350] Added return in #create, added controller tests for all but #mark_shipped, fixed routes to reflect nesting in orders --- app/controllers/orderitems_controller.rb | 39 ++--- config/routes.rb | 17 +- .../controllers/orderitems_controller_test.rb | 151 ++++++++++++++++-- 3 files changed, 170 insertions(+), 37 deletions(-) diff --git a/app/controllers/orderitems_controller.rb b/app/controllers/orderitems_controller.rb index e1ce5b0c23..5f02d881e1 100644 --- a/app/controllers/orderitems_controller.rb +++ b/app/controllers/orderitems_controller.rb @@ -1,7 +1,8 @@ class OrderitemsController < ApplicationController - before_action :find_orderitem, only: [:edit, :update, :destroy, :mark_shipped] + before_action :find_orderitem, only: [:update, :destroy, :mark_shipped] - # create a new order or add to existing- do we want this? + # create a new orderitem + # add to existing order if order exists; if not, create new order and add this orderitem to it def create if session[:order_id] && Order.find_by(id: session[:order_id]) @order = Order.find_by(id: session[:order_id]) @@ -10,7 +11,8 @@ def create unless @order.save flash[:status] = :failure flash[:result_text] = "Couldn't create order, try again later" - flash[:messages] = orderitem.errors.messages + # flash[:messages] = orderitem.errors.messages + return end session[:order_id] = @order.id end @@ -20,6 +22,7 @@ def create if @orderitem @orderitem.quantity += params[:orderitem][:quantity].to_i else + # need to create new Orderitem @orderitem = Orderitem.new( quantity: params[:orderitem][:quantity], product_id: params[:product_id], @@ -30,31 +33,29 @@ def create if @orderitem.save flash[:status] = :success - flash[:result_text] = "#{orderitem.product.name} was added to cart" + flash[:result_text] = "Added #{@orderitem.product.product_name} to cart!" else flash[:status] = :failure - flash[:result_text] = "Error adding #{orderitem.product.name} to cart" + flash[:result_text] = "Error adding #{@orderitem.product.product_name} to cart." flash[:messages] = @orderitem.errors.messages end - redirect_back fallback_location: root_path - return - end - def edit ; end + # continue shopping at same point or go back to root? + redirect_to cart_path(id: session[:order_id]) + end - # comment here def update if @orderitem.order.status == "pending" if @orderitem.update(quantity: params[:orderitem][:quantity]) flash[:status] = :success - flash[:result_text] = "Update sucessful" + flash[:result_text] = "Update successful" redirect_to cart_path return else flash.now[:status] = :failure flash.now[:result_text] = "Error updating the item" flash.now[:messages] = @orderitem.errors.messages - render :edit, status: :bad_request + redirect_to cart_path return end else @@ -64,13 +65,13 @@ def update end end - # comment here + def destroy if @orderitem.order.status == "pending" @orderitem.destroy flash[:status] = :success - flash[:result_text] = "#{@orderitem.product.name} was removed from your cart" - redirect_to cart_path + flash[:result_text] = "#{@orderitem.product.product_name} was removed from your cart" + redirect_to cart_path(order_id: session[:id]) else flash[:status] = :failure flash[:result_text] = "Cannot delete items" @@ -78,14 +79,16 @@ def destroy end end - # comment here + def mark_shipped + # put into model test if @orderitem.order.status == "paid" && @orderitem.shipped == false @orderitem.shipped = true @orderitem.save flash[:status] = :success - flash[:result_text] = "#{@orderitem.product.name} - shipped" - @orderitem.order.mark_as_complete? + flash[:result_text] = "#{ @orderitem.product.product_name } - shipped" + # @orderitem.order.mark_as_complete! + redirect_back fallback_location: root_path elsif @orderitem.order.status == "paid" && @orderitem.shipped == true diff --git a/config/routes.rb b/config/routes.rb index 14a76204f8..895d5f6787 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,23 +2,24 @@ root to: 'pages#index' resources :pages, only: :index - resources :products - resources :merchants + resources :products do + resources :orderitems, only: [:create] + end - resources :orderitems, only: [:edit, :destroy] - patch 'orderitems/:id', to: 'orderitems#update' - patch 'orderitems/:id/mark_shipped', to: 'orderitems#markshipped', as: 'mark_shipped' + resources :orderitems, only: [:update, :destroy] + patch 'orderitems/:id/mark_shipped', to: 'orderitems#mark_shipped', as: 'mark_shipped' resources :orders, only: [:show, :edit, :update] get '/orders/:id/cart', to: 'orders#cart', as: 'cart' # need custom route for place order? - resources :reviews, only: [:new, :create] - resources :categories, only: [:new, :create, :show, :index] - resources :merchants + get "/auth/github", as: "github_login" get "/auth/github/callback", to: "merchants#create", as: "auth_callback" delete "/logout", to: "merchants#destroy", as: "logout" get '/orders/:id/merchant_order', to: 'orders#merchant_order', as: 'merchant_order' + + resources :reviews, only: [:new, :create] + resources :categories, only: [:new, :create, :show, :index] end diff --git a/test/controllers/orderitems_controller_test.rb b/test/controllers/orderitems_controller_test.rb index 933d2721e0..a33edf84cf 100644 --- a/test/controllers/orderitems_controller_test.rb +++ b/test/controllers/orderitems_controller_test.rb @@ -3,27 +3,156 @@ describe OrderitemsController do let(:existing_orderitem) { orderitems(:rxbar) } - let(:update_hash){ + let(:update_hash) { { orderitem: { - quantity: 1, - }, + quantity: 1 + } } } - describe "create function" do - it "can create a new Orderitem with valid data" do + describe "create" do + it "can create a new orderitem with valid data" do + before_count = Orderitem.count + post product_orderitems_path(product_id: products(:snow_pass).id), params: update_hash + + expect(Orderitem.count).must_equal before_count + 1 + expect(session[:order_id]).wont_be_nil + + last_orderitem = Orderitem.last + + expect(last_orderitem.product).must_equal products(:snow_pass) + expect(last_orderitem.order.orderitems.count).must_equal 1 + must_respond_with :redirect + must_redirect_to cart_path(last_orderitem.order) + end + + it "can increment the quantity of existing orderitem" do + product_to_buy = products(:snow_pass) + + params = { + orderitem: { + quantity: 1, + shipped: false + } + } + + before_count_orderitem = Orderitem.count + before_count_order = Order.count + + post product_orderitems_path(product_id: products(:snow_pass).id), params: params + expect(Order.count).must_equal before_count_order + 1 + + post product_orderitems_path(product_id: products(:snow_pass).id), params: params + expect(Order.count).must_equal before_count_order + 1 + + expect(Orderitem.count).must_equal before_count_orderitem + 1 + expect(Orderitem.last.quantity).must_equal 2 + end + + it "does something if the product is out of stock????" do + # create product with 0 stock + # expect create post will return 400 + # should not create orderitem (check same count) + end + end + + describe "update" do + it "succeeds for valid data and an extant orderitem ID" do expect { - post product_orderitems_path(product_id: products(:cliff).id), params: update_hash - }.must_change "Orderitem.count", 1 + patch orderitem_path(existing_orderitem), params: update_hash + }.wont_change "Orderitem.count" + + updated_item = Orderitem.find_by(id: existing_orderitem.id) - expect(session[:order_id]).wont_be_nil + expect(updated_item.quantity).must_equal 1 + must_respond_with :redirect + must_redirect_to cart_path(order_id: session[:order_id]) + end - new_orderitem = Orderitem.last + it "redirects to cart path without updating given bad data" do + bogus_update_hash = { + orderitem: { + quantity: -1 + } + } + + expect { + patch orderitem_path(existing_orderitem), params: bogus_update_hash + }.wont_change "Orderitem.count" - expect(new_orderitem.product.name).must_equal "Cliff" - expect(new_orderitem.order.orderitems.count).must_equal 1 must_respond_with :redirect + must_redirect_to cart_path(order_id: session[:order_id]) end + + it "redirects to cart path without updating given valid data but not pending status" do + # DO WE NEED TO CHECK OTHER STATUSES AS WELL???? + update_hash = { + orderitem: { + quantity: 1 + } + } + + existing_orderitem.order.update!(status: "complete") + before_quantity = existing_orderitem.quantity + + expect { + patch orderitem_path(existing_orderitem), params: update_hash + }.wont_change "Orderitem.count" + + expect(existing_orderitem.quantity).must_equal before_quantity + + must_respond_with :redirect + must_redirect_to root_path + end + + it "responds with 404 when orderitem does not exist" do + orderitem = orderitems(:rxbar) + orderitem.destroy! + patch orderitem_path(orderitem), params: update_hash + must_respond_with :not_found + end + end + + describe "destroy" do + it "deletes item for existing orderitem with pending status, and redirects" do + before_count = Orderitem.count + + delete orderitem_path(existing_orderitem) + + expect(Orderitem.count).must_equal before_count - 1 + must_redirect_to cart_path(order_id: session[:order_id]) + end + + it "fails to delete existing orderitem without an order status of pending, and redirects" do + # DO WE NEED TO CHECK OTHER STATUSES AS WELL???? + before_count = Orderitem.count + existing_orderitem.order.status = "complete" + existing_orderitem.order.save! + + delete orderitem_path(existing_orderitem) + + expect(Orderitem.count).must_equal before_count + must_redirect_to root_path + end + + it "responds with 404 when orderitem does not exist" do + orderitem = orderitems(:rxbar) + orderitem.destroy! + delete orderitem_path(orderitem) + must_respond_with :not_found + end + end + + describe "mark_shipped" do + it "can correctly change shipped status for existing orderitem" do + end + + # it "responds with 404 when orderitem does not exist" do + # orderitem = orderitems(:rxbar) + # orderitem.destroy! + # # change to right path::: delete orderitem_path(orderitem) + # must_respond_with :not_found + # end end end From 943a83b07c081b63f9f0e0ed135111399df78cca Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Sun, 14 Jun 2020 22:36:31 -0700 Subject: [PATCH 128/350] WIP: model methods --- app/models/order.rb | 18 ++++++++++-------- test/test_helper.rb | 44 ++++++++++++++++++++++++++++++++++---------- 2 files changed, 44 insertions(+), 18 deletions(-) diff --git a/app/models/order.rb b/app/models/order.rb index e21b7d16ac..ce0d11b958 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -47,18 +47,20 @@ def total return total_cost end - def mark_as_complete? + def mark_as_complete! if self.status == "paid" && self.orderitems.find_by(shipped: false).nil? self.status = "complete" - self.save + self.save! + else + raise Exception, "Order is not paid or all items haven't shipped" end end - def is_order_of(merch_id) - if self.products.find_by(merchant_id: merch_id).nil? - return false - end + # def is_order_of(merch_id) + # if self.products.find_by(merchant_id: merch_id).nil? + # return false + # end - return true - end + # return true + # end end diff --git a/test/test_helper.rb b/test/test_helper.rb index ea268b3ee1..38006974e9 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -20,17 +20,41 @@ class ActiveSupport::TestCase # helper method to set session for a valid order def make_order - # empty_order = Order.new(status: "pending") - # orderitem = orderitems(:rainer) - # # orderitem.order_id = empty_order.id - # orderitem.save! - # @order = Order.find_by(id: orderitem.order.id) - # return @order - - orderitem = Orderitem.create!(quantity: 1, order: orders(:order2), product: products(:rainer), shipped: false) - @order = Order.find_by(id: orderitem.order.id) + # new_order = Order.create!( + # status: "pending", + # total: 5, + # email: "greenleaf@gmail.com", + # address: "1516 Mesa Verde", + # cc_name: "Mastercard", + # cc_num: 8788082, + # cvv: 572, + # cc_exp: "06/20", + # zip: 74804 + # ) + + # orderitem = Orderitem.create!( + # quantity: 1, + # order: new_order, + # product: products(:rainier), + # shipped: false + # ) + + # new_order.orderitems << orderitem + + # if new_order.save! + # session[:order_id] = new_order.id + # puts "SESSION ID: #{session[:order_id]}" + # puts "COUNT: #{new_order.orderitems.count}" + # else + # puts "ORDER FAILED TO SAVE" + # end + + # return new_order + + orderitem = Orderitem.create!(quantity: 1, order: orders(:order2), product: products(:rainier), shipped: false) + @order = Order.find_by(id: orderitem.order_id) # expect id = 2 - puts "ORDER ID: #{@order.id}" + puts "HERE IS ORDER ID: #{@order.id}" return @order end end From e0f190f653a115244663d4b712e9e127021868a6 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Mon, 15 Jun 2020 13:14:12 -0700 Subject: [PATCH 129/350] added merch show, current, total_rev and total_rev_by_status) --- .env | 2 ++ app/controllers/merchants_controller.rb | 25 +++++++++++++++++-- app/models/merchant.rb | 32 +++++++++++++++---------- config/routes.rb | 4 ++-- 4 files changed, 47 insertions(+), 16 deletions(-) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 0000000000..4162b7643e --- /dev/null +++ b/.env @@ -0,0 +1,2 @@ +GITHUB_CLIENT_ID: 388fe0f534f57dd0a8e2 +GITHUB_CLIENT_SECRET: 68c30c05bbf7939bdcd1354de55c636203d2acaf \ No newline at end of file diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rb index 1292be68e5..ab28b29bc2 100644 --- a/app/controllers/merchants_controller.rb +++ b/app/controllers/merchants_controller.rb @@ -37,10 +37,31 @@ def destroy end def current - @current_merchant = Merchant.find_by(id: session[:merchant_id]) + if session[:merchant_id] == nil + flash[:error] = "No merchant logged in." + redirect_to root_path + return + else + @merchant = Merchant.find_by(id: session[:merchant_id]) + redirect_to merchant_path(session[:merchant_id]) + return + end end - #need to track OrderItems + def show + @merchant = Merchant.find_by(id: params[:id]) + if @merchant.nil? + flash[:error] = "Invaid merchant credentials." + redirect_to root_path + return + end + + if @merchant.id != (session[:merchant_id]) + flash[:error] = "You must log in to view the merchant dashboard." + redirect_to root_path + return + end + private diff --git a/app/models/merchant.rb b/app/models/merchant.rb index 107543299f..6d7d674e06 100644 --- a/app/models/merchant.rb +++ b/app/models/merchant.rb @@ -16,20 +16,28 @@ def self.build_from_github(auth_hash) merchant.email = auth_hash["info"]["email"] return merchant end - - # need to work with OrderItem - def self.total_revenue - + + def total_revenue + total_rev = 0 + self.products.each do |product| + product.order_items.each do |item| + total += item.subtotal + end + end + return total_rev end - # def find.all_orders - - - # end - - # need to work with OrderItem - def revenue_by_status(status) - + # double check on edge cases i.e. nil or pending order + def total_revenue_by_status(status) + total_rev_status = 0 + self.products.each do |product| + product.order_items.each do |item| + if item.order.status == status + total += item.subtotal + end + end + end + return total_rev_status end end diff --git a/config/routes.rb b/config/routes.rb index 4e3fa00fd2..d2e437c68e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,7 +3,6 @@ resources :pages, only: :index resources :products - resources :merchants resources :orderitems, only: [:edit, :destroy] patch 'orderitems/:id', to: 'orderitems#update' @@ -16,7 +15,8 @@ resources :reviews, only: [:new, :create] resources :categories, only: [:new, :create, :show, :index] - resources :merchants + resources :merchants except: [:index, :edit, :update] + get "/auth/github", as: "github_login" get "/auth/github/callback", to: "merchants#create", as: "auth_callback" delete "/logout", to: "merchants#destroy", as: "logout" From e95f1cd085a8a8da5a5058391f3594b0c82be224 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Mon, 15 Jun 2020 13:58:09 -0700 Subject: [PATCH 130/350] added validations for user name --- app/models/merchant.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/models/merchant.rb b/app/models/merchant.rb index 6d7d674e06..8366c35194 100644 --- a/app/models/merchant.rb +++ b/app/models/merchant.rb @@ -2,9 +2,7 @@ class Merchant < ApplicationRecord has_many :products has_many :orders - #validates :username, presence: true, uniqueness: true - # remove? - # validates :merchant_id, uniqueness: true, presence: true + validates :username, presence: true, uniqueness: true validates :email, uniqueness: true, presence: true # custom mthod to create new merchant @@ -20,7 +18,7 @@ def self.build_from_github(auth_hash) def total_revenue total_rev = 0 self.products.each do |product| - product.order_items.each do |item| + product.orderitems.each do |item| total += item.subtotal end end @@ -31,7 +29,7 @@ def total_revenue def total_revenue_by_status(status) total_rev_status = 0 self.products.each do |product| - product.order_items.each do |item| + product.orderitems.each do |item| if item.order.status == status total += item.subtotal end From 65aa3a49c0fd7398ccde1646a83ace384ddc50ce Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Mon, 15 Jun 2020 14:24:56 -0700 Subject: [PATCH 131/350] added more merchants --- db/merchants.csv | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/db/merchants.csv b/db/merchants.csv index 637406bfbc..08c0b71b4a 100644 --- a/db/merchants.csv +++ b/db/merchants.csv @@ -3,4 +3,8 @@ Hikin Ricky,ricky@tickytav.com Bikin Bobby,bobby@bobcat.com Trailin Trinity,tt3@email.com Fishin Fiona,fishyswishy@mail.com -Susan Swimmin,suzyswims@email.com \ No newline at end of file +Susan Swimmin,suzyswims@email.com +Chris Harley,chriz@mail.com +Rhymin Rudy,Rudester@email.com +Taco Cat,TacoCat@email.com +Skydiving Susan,SuzieK@email.com \ No newline at end of file From 7d6ab39229a05ec4be09883caa314bb0da0c8bb9 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Mon, 15 Jun 2020 14:48:37 -0700 Subject: [PATCH 132/350] added require login filter for adding new product --- app/controllers/application_controller.rb | 11 +++++++++++ app/controllers/products_controller.rb | 1 + 2 files changed, 12 insertions(+) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index fb81dac639..9b4a6bfbe5 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -4,4 +4,15 @@ class ApplicationController < ActionController::Base def set_categories @categories = Category.all end + + def current_user + @current_user = Merchant.find_by(id: session[:uid]) + end + + def require_login + if current_user.nil? + flash[:error] = "A problem occurred: You must log in to do that" + redirect_back(fallback_location: root_path) + end + end end diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 260826978a..15477ff576 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -1,5 +1,6 @@ class ProductsController < ApplicationController before_action :find_product, only: [:show, :update, :edit, :destroy] + before_action :require_login, only: [:new] def index if params[:category_name] From 56cb71a9e9e0606f06e45dd9486a9fd18f86601e Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Mon, 15 Jun 2020 14:48:46 -0700 Subject: [PATCH 133/350] added flash view --- app/views/layouts/application.html.erb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 62612d14d0..ef633080e5 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -24,6 +24,23 @@ <%# Content %> +
    + <% flash.each do |name, message| %> + <% if name == "success" %> + + <% else %> + + <% end %> + <% end %> +
    <%= yield %> From 2373c720e18df91674fd2aa7d7a56cabb788e4d8 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Mon, 15 Jun 2020 14:48:59 -0700 Subject: [PATCH 134/350] added new product button on merchant dashboard --- app/views/merchants/show.html.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/merchants/show.html.erb b/app/views/merchants/show.html.erb index c7da267d6e..ecb3c4494e 100644 --- a/app/views/merchants/show.html.erb +++ b/app/views/merchants/show.html.erb @@ -19,6 +19,7 @@

    On Outdoorsy since: <%= @merchant.created_at.strftime("%B %d, %Y") %>

    Contact: <%= @merchant.email %>
    + <%= button_to "Add New Product", new_product_path, method: :get, class: "btn btn-primary" %>
    From 38d861318a8ed1e7fbc778e69ec0c04f0c5eedd3 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Mon, 15 Jun 2020 14:49:06 -0700 Subject: [PATCH 135/350] barebones new product page --- app/views/products/new.html.erb | 1 + 1 file changed, 1 insertion(+) create mode 100644 app/views/products/new.html.erb diff --git a/app/views/products/new.html.erb b/app/views/products/new.html.erb new file mode 100644 index 0000000000..e096471ae1 --- /dev/null +++ b/app/views/products/new.html.erb @@ -0,0 +1 @@ +

    New product form here

    \ No newline at end of file From f802fcd233a561eb7773f1b00e17c9efd6cf53d6 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Mon, 15 Jun 2020 15:00:09 -0700 Subject: [PATCH 136/350] fixed merge conflicts --- app/controllers/orderitems_controller.rb | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/app/controllers/orderitems_controller.rb b/app/controllers/orderitems_controller.rb index fa7924cf6b..072b9e5988 100644 --- a/app/controllers/orderitems_controller.rb +++ b/app/controllers/orderitems_controller.rb @@ -65,21 +65,15 @@ def update end end -<<<<<<< HEAD - # comment here- video said about a difference between destroy and delete -======= - ->>>>>>> 06-BR-orderItems def destroy if @orderitem.order.status == "pending" @orderitem.destroy flash[:status] = :success flash[:result_text] = "#{@orderitem.product.product_name} was removed from your cart" -<<<<<<< HEAD + + # TODO: choose correct redirect redirect_to cart_path -======= - redirect_to cart_path(order_id: session[:id]) ->>>>>>> 06-BR-orderItems + # redirect_to cart_path(order_id: session[:id]) else flash[:status] = :failure flash[:result_text] = "Cannot delete items" @@ -94,14 +88,9 @@ def mark_shipped @orderitem.shipped = true @orderitem.save flash[:status] = :success -<<<<<<< HEAD - flash[:result_text] = "#{@orderitem.product.product_name} - shipped" - @orderitem.order.mark_as_complete? -======= flash[:result_text] = "#{ @orderitem.product.product_name } - shipped" # @orderitem.order.mark_as_complete! ->>>>>>> 06-BR-orderItems redirect_back fallback_location: root_path elsif @orderitem.order.status == "paid" && @orderitem.shipped == true From 7af1312327839417cff4881fcf0ace80fe5f833d Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Mon, 15 Jun 2020 16:25:45 -0700 Subject: [PATCH 137/350] got Oauth login to work --- .gitignore | 5 ++++- Gemfile | 1 + Gemfile.lock | 4 ++++ app/controllers/merchants_controller.rb | 17 ++++++++++++----- app/views/layouts/_navigation-bar.html.erb | 9 +++++++-- config/routes.rb | 4 ++-- ...15231336_add_uid_and_provider_to_merchant.rb | 5 +++++ db/schema.rb | 3 ++- 8 files changed, 37 insertions(+), 11 deletions(-) create mode 100644 db/migrate/20200615231336_add_uid_and_provider_to_merchant.rb diff --git a/.gitignore b/.gitignore index 26e56c0469..811401913f 100644 --- a/.gitignore +++ b/.gitignore @@ -35,4 +35,7 @@ yarn-debug.log* .yarn-integrity -.DS_Store \ No newline at end of file +.DS_Store + +# Ignore client id and secret +.env \ No newline at end of file diff --git a/Gemfile b/Gemfile index 1f72aa044e..05c7c98fb9 100644 --- a/Gemfile +++ b/Gemfile @@ -26,6 +26,7 @@ gem 'jbuilder', '~> 2.7' # gem 'image_processing', '~> 1.2' gem "omniauth" gem "omniauth-github" +gem "omniauth-rails_csrf_protection" # Reduces boot times through caching; required in config/boot.rb gem 'bootsnap', '>= 1.4.2', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 8b2bdf77e4..bbe704161e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -180,6 +180,9 @@ GEM omniauth-oauth2 (1.6.0) oauth2 (~> 1.1) omniauth (~> 1.9) + omniauth-rails_csrf_protection (0.1.2) + actionpack (>= 4.2) + omniauth (>= 1.3.1) pg (1.2.3) popper_js (1.16.0) pry (0.13.1) @@ -305,6 +308,7 @@ DEPENDENCIES minitest-reporters omniauth omniauth-github + omniauth-rails_csrf_protection pg (>= 0.18, < 2.0) pry-rails puma (~> 4.1) diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rb index f6fdf979dc..6e9ec7c467 100644 --- a/app/controllers/merchants_controller.rb +++ b/app/controllers/merchants_controller.rb @@ -39,14 +39,21 @@ def create return redirect_to root_path end - def destroy - session[:merchant_id] = nil - flash[:status] = :success - flash[:result_text] = "You've successfully logged out as #{merchant.username}." + def logout + session[:uid] = nil + flash[:success] = "Successfully logged out" redirect_to root_path - return + return end + # def destroy + # session[:uid] = nil + # flash[:status] = :success + # flash[:result_text] = "You've successfully logged out as #{merchant.username}." + # redirect_to root_path + # return + # end + def current @current_merchant = Merchant.find_by(id: session[:merchant_id]) end diff --git a/app/views/layouts/_navigation-bar.html.erb b/app/views/layouts/_navigation-bar.html.erb index 65dda77548..482c7ead4e 100644 --- a/app/views/layouts/_navigation-bar.html.erb +++ b/app/views/layouts/_navigation-bar.html.erb @@ -32,10 +32,15 @@
  • - <%= link_to "Sign-in", root_path, class: "nav-link-custom py-0 text-uppercase mr-5" %> + <%# Sign-In %> + <%= link_to "Sign-in", github_login_path, method: :post, class: "nav-link-custom py-0 text-uppercase mr-5"%>
  • - <%= link_to "Cart", root_path, class: "nav-link-custom py-0 text-uppercase mr-5" %> + <%# Sign-In %> + <%= link_to "Logout", logout_path, method: :delete, class: "nav-link-custom py-0 text-uppercase mr-5"%> +
    • +
  • + <%# <%= link_to "Cart", cart_path, class: "nav-link-custom py-0 text-uppercase mr-5" %> %>
    • diff --git a/config/routes.rb b/config/routes.rb index 895d5f6787..25ed05c06e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -15,9 +15,9 @@ resources :merchants - get "/auth/github", as: "github_login" + post "/auth/github", as: "github_login" get "/auth/github/callback", to: "merchants#create", as: "auth_callback" - delete "/logout", to: "merchants#destroy", as: "logout" + delete "/logout", to: "merchants#logout", as: "logout" get '/orders/:id/merchant_order', to: 'orders#merchant_order', as: 'merchant_order' resources :reviews, only: [:new, :create] diff --git a/db/migrate/20200615231336_add_uid_and_provider_to_merchant.rb b/db/migrate/20200615231336_add_uid_and_provider_to_merchant.rb new file mode 100644 index 0000000000..a23468b9d5 --- /dev/null +++ b/db/migrate/20200615231336_add_uid_and_provider_to_merchant.rb @@ -0,0 +1,5 @@ +class AddUidAndProviderToMerchant < ActiveRecord::Migration[6.0] + def change + add_column :merchants, :uid, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index b1350afde2..accf4356d6 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: 2020_06_12_183310) do +ActiveRecord::Schema.define(version: 2020_06_15_231336) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -34,6 +34,7 @@ t.bigint "provider" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.integer "uid" end create_table "orderitems", force: :cascade do |t| From 8057be6a7e3eb1a2ce389289c4d5a77b2f253c98 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Mon, 15 Jun 2020 16:42:05 -0700 Subject: [PATCH 138/350] fixed footer spacing when no items in the system --- app/views/merchants/show.html.erb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/merchants/show.html.erb b/app/views/merchants/show.html.erb index ecb3c4494e..cad5b122f4 100644 --- a/app/views/merchants/show.html.erb +++ b/app/views/merchants/show.html.erb @@ -22,6 +22,7 @@ <%= button_to "Add New Product", new_product_path, method: :get, class: "btn btn-primary" %> + <%# Merchant List of Products %>
    @@ -55,10 +56,10 @@ <% end %>
    - - <% else %>

    No items in the system!

    <% end %> + + \ No newline at end of file From 441dc026f413de9d3e45d6d9afa7f7fcd4e66b4f Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Mon, 15 Jun 2020 18:33:57 -0700 Subject: [PATCH 139/350] Added psuedocode planning for edit and update. --- app/controllers/orders_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index fee71b7fd7..2ae7d35271 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -16,16 +16,16 @@ def cart end end - #todo create payment information form + #renders payment information form # enter payment details, find order_id from session - # changes status on order from complete to paid - def edit ; end + def edit; end # Process order after payment info has been addded # order items model: add, remove # use orderitems model methods in order controller to add/remove orderitem in order def update @order.orderitems.each do |orderitem| + # check enough_stock from product model*** if !orderitem.valid? flash[:status] = :failure flash[:result_text] = "Some items in your cart are no longer available" From 432105613f1ed1eae4805001185671cd66caf134 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Mon, 15 Jun 2020 18:35:00 -0700 Subject: [PATCH 140/350] Revisited enough_stock method and planning --- app/models/orderitem.rb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/models/orderitem.rb b/app/models/orderitem.rb index b11a5add1f..1d660da25a 100644 --- a/app/models/orderitem.rb +++ b/app/models/orderitem.rb @@ -5,7 +5,7 @@ class Orderitem < ApplicationRecord validates :quantity, presence: true, numericality: { only_integer: true, greater_than: 0} # do we need below? validates :shipped, inclusion: { in: [true, false], message: "shipped status : must be true or false"} - # validates :in_stock + # validates :enough_stock, exclusion false?****** # validates :not_retired def subtotal @@ -21,14 +21,13 @@ def subtotal # order.mark_item_shipped(id) # can mark whole order complete - # def marked_shipped - # single orderitem change shipped status + # def marked_item_shipped + # single orderitem change shipped status # end - def enough_stock - # call product's in_stock? - if quantity && product && product.enough_stock?(quantity) + # correct syntax?? + if !self.product.enough_stock?(quantity) errors.add(:quantity, "order exceeds in-stock inventory") end end From 8c78e2255dc6b94c9ad6f5c8c80b7a4ad8321b69 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Mon, 15 Jun 2020 18:36:02 -0700 Subject: [PATCH 141/350] Added enough_stock? model method on Product --- app/models/product.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/models/product.rb b/app/models/product.rb index 05d89cc2ad..9b8c1dcfb4 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -9,4 +9,8 @@ class Product < ApplicationRecord has_many :orderitems # product.orders => all the orders that a product has been attached to has_many :orders, through: :orderitems + + def enough_stock?(quantity) + return self.quantity >= quantity + end end From d3758a3fc36c84674d7a90407779e9ca7aee0db6 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Mon, 15 Jun 2020 19:25:55 -0700 Subject: [PATCH 142/350] Changed creating order from orderitems controller to application controller set_current_order method, added view changes. --- app/controllers/application_controller.rb | 20 ++++++++++++++++++++ app/controllers/orders_controller.rb | 7 +++---- app/views/layouts/_navigation-bar.html.erb | 4 +--- app/views/orders/cart.html.erb | 5 +++++ config/routes.rb | 4 ++-- 5 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 app/views/orders/cart.html.erb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 9b4a6bfbe5..34fa03486d 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,10 +1,30 @@ class ApplicationController < ActionController::Base before_action :set_categories + before_action :set_current_order def set_categories @categories = Category.all end + def set_current_order + @order = Order.find_by(id: session[:order_id]) + + if @order && @order.status == "pending" + @order.id = session[:order_id] + else + # create new order + @order = Order.new(status: "pending") + unless @order.save + flash[:status] = :failure + flash[:result_text] = "Couldn't create order, try again later" + flash[:messages] = order.errors.messages + return + end + + session[:order_id] = @order.id + end + end + def current_user @current_user = Merchant.find_by(id: session[:uid]) end diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index 2ae7d35271..03f832c980 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -8,11 +8,10 @@ class OrdersController < ApplicationController def cart if session[:order_id] @order = Order.find_by(id: session[:order_id]) + session[:order_id] = @order.id else - flash[:status] = :failure - flash[:result_text] = "Cart is empty" - # redirect_to :show - return + flash[:result_text] = "Couldn't create order, try again later" + # flash[:messages] = order.errors.messages end end diff --git a/app/views/layouts/_navigation-bar.html.erb b/app/views/layouts/_navigation-bar.html.erb index 482c7ead4e..0d9f27f083 100644 --- a/app/views/layouts/_navigation-bar.html.erb +++ b/app/views/layouts/_navigation-bar.html.erb @@ -32,15 +32,13 @@
  • - <%# Sign-In %> <%= link_to "Sign-in", github_login_path, method: :post, class: "nav-link-custom py-0 text-uppercase mr-5"%>
  • - <%# Sign-In %> <%= link_to "Logout", logout_path, method: :delete, class: "nav-link-custom py-0 text-uppercase mr-5"%>
  • - <%# <%= link_to "Cart", cart_path, class: "nav-link-custom py-0 text-uppercase mr-5" %> %> + <%= link_to "Cart", cart_path(@order), class: "nav-link-custom py-0 text-uppercase mr-5" %>
    • diff --git a/app/views/orders/cart.html.erb b/app/views/orders/cart.html.erb new file mode 100644 index 0000000000..f24385b75c --- /dev/null +++ b/app/views/orders/cart.html.erb @@ -0,0 +1,5 @@ +<% if @order.nil? %> +

    You have an empty cart!

    +<% else %> +

    HERE IS YOUR ORDER: <% @order.id %>

    +<% end %> \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 25ed05c06e..c4cc58adca 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,9 +9,9 @@ resources :orderitems, only: [:update, :destroy] patch 'orderitems/:id/mark_shipped', to: 'orderitems#mark_shipped', as: 'mark_shipped' - resources :orders, only: [:show, :edit, :update] + resources :orders, only: [:new, :show, :edit, :update] get '/orders/:id/cart', to: 'orders#cart', as: 'cart' - # need custom route for place order? + get '/orders/:id/cart/success', to: 'orders#submit', as: 'confirm_submit' resources :merchants From 423f29737db30da6dabff6e6aa0141410f1523e0 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Mon, 15 Jun 2020 19:49:18 -0700 Subject: [PATCH 143/350] Amended migration name to match heroku expectations. --- db/migrate/20200610204945_create_categories_products_join.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20200610204945_create_categories_products_join.rb b/db/migrate/20200610204945_create_categories_products_join.rb index bcbe889705..82dfdf6bad 100644 --- a/db/migrate/20200610204945_create_categories_products_join.rb +++ b/db/migrate/20200610204945_create_categories_products_join.rb @@ -1,4 +1,4 @@ -class CreateCategoriesProducts < ActiveRecord::Migration[6.0] +class CreateCategoriesProductsJoin < ActiveRecord::Migration[6.0] def change create_table :categories_products do |t| t.belongs_to :category, index: true From 4f296a45620683f4e2385cd77668cf241dfd7b1a Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Mon, 15 Jun 2020 19:55:20 -0700 Subject: [PATCH 144/350] Second time's the charm for heroku? --- db/migrate/20200610210957_remove_categories_products_join.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20200610210957_remove_categories_products_join.rb b/db/migrate/20200610210957_remove_categories_products_join.rb index b0d461a262..e43d31d446 100644 --- a/db/migrate/20200610210957_remove_categories_products_join.rb +++ b/db/migrate/20200610210957_remove_categories_products_join.rb @@ -1,5 +1,5 @@ class RemoveCategoriesProductsJoin < ActiveRecord::Migration[6.0] def change - drop_table :categories_products_joins + drop_table :categories_products_join end end From 5329235b0f74b4385f4ac51536e94fdf4cf2780f Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Mon, 15 Jun 2020 19:59:24 -0700 Subject: [PATCH 145/350] Renamed join table to be finally removed --- db/migrate/20200610210957_remove_categories_products_join.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20200610210957_remove_categories_products_join.rb b/db/migrate/20200610210957_remove_categories_products_join.rb index e43d31d446..4d59dbf2be 100644 --- a/db/migrate/20200610210957_remove_categories_products_join.rb +++ b/db/migrate/20200610210957_remove_categories_products_join.rb @@ -1,5 +1,5 @@ class RemoveCategoriesProductsJoin < ActiveRecord::Migration[6.0] def change - drop_table :categories_products_join + drop_table :categories_products end end From 719246f75d57f4ef318e812cac0759cb9a096721 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Mon, 15 Jun 2020 20:07:45 -0700 Subject: [PATCH 146/350] Changed add_columns to change_columns in order migration. --- .../20200611014346_add_columns_to_order.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/db/migrate/20200611014346_add_columns_to_order.rb b/db/migrate/20200611014346_add_columns_to_order.rb index 14332d782d..f2178f5c59 100644 --- a/db/migrate/20200611014346_add_columns_to_order.rb +++ b/db/migrate/20200611014346_add_columns_to_order.rb @@ -1,13 +1,13 @@ class AddColumnsToOrder < ActiveRecord::Migration[6.0] def change add_column :orders, :total, :float - add_column :orders, :status, :string - add_column :orders, :email, :string - add_column :orders, :address, :string - add_column :orders, :cc_name, :string - add_column :orders, :cc_num, :bigint - add_column :orders, :cvv, :integer - add_column :orders, :cc_exp, :integer - add_column :orders, :zip, :integer + change_column :orders, :status, :string + change_column :orders, :email, :string + change_column :orders, :address, :string + change_column :orders, :cc_name, :string + change_column :orders, :cc_num, :bigint + change_column :orders, :cvv, :integer + change_column :orders, :cc_exp, :integer + change_column :orders, :zip, :integer end end From 19ee0f5dd0678fb60bcac05ae6f3f4cd41eea3b1 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Mon, 15 Jun 2020 20:17:11 -0700 Subject: [PATCH 147/350] Used sql for typecasting strings into integers for various columns on order. --- db/migrate/20200611014346_add_columns_to_order.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/db/migrate/20200611014346_add_columns_to_order.rb b/db/migrate/20200611014346_add_columns_to_order.rb index f2178f5c59..ffb5f3e3e7 100644 --- a/db/migrate/20200611014346_add_columns_to_order.rb +++ b/db/migrate/20200611014346_add_columns_to_order.rb @@ -5,9 +5,9 @@ def change change_column :orders, :email, :string change_column :orders, :address, :string change_column :orders, :cc_name, :string - change_column :orders, :cc_num, :bigint - change_column :orders, :cvv, :integer - change_column :orders, :cc_exp, :integer - change_column :orders, :zip, :integer + change_column :orders, :cc_num, :string + change_column :orders, :cvv, 'integer USING CAST(cvv AS integer)' + change_column :orders, :cc_exp, 'integer USING CAST(cc_exp AS integer)' + change_column :orders, :zip, 'integer USING CAST(zip AS integer)' end end From da804cd82fd24185a9533574cd713d385ead6a2b Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Mon, 15 Jun 2020 20:24:09 -0700 Subject: [PATCH 148/350] Changed datatypes for migrations. --- db/migrate/20200611014346_add_columns_to_order.rb | 1 - db/migrate/20200611210431_add_column_to_orderitems.rb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/db/migrate/20200611014346_add_columns_to_order.rb b/db/migrate/20200611014346_add_columns_to_order.rb index ffb5f3e3e7..7f86622e02 100644 --- a/db/migrate/20200611014346_add_columns_to_order.rb +++ b/db/migrate/20200611014346_add_columns_to_order.rb @@ -7,7 +7,6 @@ def change change_column :orders, :cc_name, :string change_column :orders, :cc_num, :string change_column :orders, :cvv, 'integer USING CAST(cvv AS integer)' - change_column :orders, :cc_exp, 'integer USING CAST(cc_exp AS integer)' change_column :orders, :zip, 'integer USING CAST(zip AS integer)' end end diff --git a/db/migrate/20200611210431_add_column_to_orderitems.rb b/db/migrate/20200611210431_add_column_to_orderitems.rb index cd0d4269e6..d5263eb9d6 100644 --- a/db/migrate/20200611210431_add_column_to_orderitems.rb +++ b/db/migrate/20200611210431_add_column_to_orderitems.rb @@ -1,5 +1,5 @@ class AddColumnToOrderitems < ActiveRecord::Migration[6.0] def change - add_column :orderitems, :quantity, :bigint + change_column :orderitems, :quantity, 'bigint USING CAST(quantity AS bigint)' end end From a3236fb87302e856ce90ede1737d7162b69edd41 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Mon, 15 Jun 2020 21:17:01 -0700 Subject: [PATCH 149/350] added total_revenue and total_revenue by status --- app/models/merchant.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/merchant.rb b/app/models/merchant.rb index 8366c35194..b98d247678 100644 --- a/app/models/merchant.rb +++ b/app/models/merchant.rb @@ -5,7 +5,7 @@ class Merchant < ApplicationRecord validates :username, presence: true, uniqueness: true validates :email, uniqueness: true, presence: true - # custom mthod to create new merchant + # method to create new merchant using github login def self.build_from_github(auth_hash) merchant = Merchant.new merchant.uid = auth_hash[:uid] From 69826c4decc3e281c9666bee70c91d1e023f278e Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Tue, 16 Jun 2020 08:48:04 -0700 Subject: [PATCH 150/350] added merchants to seed db --- db/merchants.csv | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/db/merchants.csv b/db/merchants.csv index 08c0b71b4a..9818c3ed4e 100644 --- a/db/merchants.csv +++ b/db/merchants.csv @@ -4,7 +4,9 @@ Bikin Bobby,bobby@bobcat.com Trailin Trinity,tt3@email.com Fishin Fiona,fishyswishy@mail.com Susan Swimmin,suzyswims@email.com -Chris Harley,chriz@mail.com -Rhymin Rudy,Rudester@email.com +Canoein Chris,chriz_@mail.com +Raftin Rudy,Rudester@email.com Taco Cat,TacoCat@email.com -Skydiving Susan,SuzieK@email.com \ No newline at end of file +Skydivin Susan,SuzieK@email.com +Backpackin Brad,backpackfun@email.com +Horsebackin Hannah,abyssinianlove@mail.com \ No newline at end of file From 0f2b453cca96c87ee2585ff8fda2ff0a1470431d Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Tue, 16 Jun 2020 09:12:19 -0700 Subject: [PATCH 151/350] added test for the merch model, trying to get tests to pass --- app/controllers/merchants_controller.rb | 2 +- config/routes.rb | 2 +- test/models/merchant_test.rb | 67 +++++++++++++++++++++++-- 3 files changed, 66 insertions(+), 5 deletions(-) diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rb index ab28b29bc2..2034b67e4f 100644 --- a/app/controllers/merchants_controller.rb +++ b/app/controllers/merchants_controller.rb @@ -61,7 +61,7 @@ def show redirect_to root_path return end - + end private diff --git a/config/routes.rb b/config/routes.rb index d2e437c68e..2d569ca931 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -15,7 +15,7 @@ resources :reviews, only: [:new, :create] resources :categories, only: [:new, :create, :show, :index] - resources :merchants except: [:index, :edit, :update] + resources :merchants, except: [:index, :edit, :update] get "/auth/github", as: "github_login" get "/auth/github/callback", to: "merchants#create", as: "auth_callback" diff --git a/test/models/merchant_test.rb b/test/models/merchant_test.rb index ca3d6ca9b2..448e9e835f 100644 --- a/test/models/merchant_test.rb +++ b/test/models/merchant_test.rb @@ -1,7 +1,68 @@ require "test_helper" describe Merchant do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + let (:merchant) {merchant(:canoeing_chris)} + + describe "validations" do + + it "is valid with all fields present and valid" do + expect(merchant.valid?).must_equal true + end + + it 'is invalid without an email address' do + merchant.email = nil + + expect(merchant.valid?).must_equal false + expect(merchant.errors.messages).must_include :email + end + + it 'is invalid without a unique email address' do + invalid_merchant = Merchant.create(username: "new merchant", email: " ") + + expect(invalid_merchant.valid?).must_equal false + expect(invalid_merchant.errors.messages).must_include :email + end + + describe "relations" do + it "can have one or many products" do + merchant.must_respond_to :products + merchant.products.each do |product| + product.must_be_kind_of Product + end + end + + it "can have one or more order items through products" do + merchant.must_respond_to :order_items + merchant.order_items.each do |order_item| + order_item.must_be_kind_of OrderItem + end + end + end + end + + describe "custom methods made" do + describe "total_revenue" do + it "calculates the total revenue" do + # need to validate how much they have in their total revenue + expect(merchant(:canoeing_chris).total_revenue).must_equal 11.11 + end + + it "returns 0 if the merchant has made no sales" do + expect(merchant(:canoeing_chris).total_revenue).must_equal 0 + end + end + + describe "revenue_by_status" do + it "calculates the total revenue by status passed in" do + # verif the must_equal to the two following + expect(merchant(:trailin_trinity).total_revenue_by_status("paid")).must_equal 11.15 + expect(merchant(:fishin_fiona).total_revenue_by_status("pending")).must_equal 831.06 + end + + it "will return 0 for a non-existing status" do + # verify the n/a message + expect(merchant(:canoeing_chris).total_revenue_by_status("n/a")).must_equal 0.0 + end + end + end end From f2445d47ba2696d20257b7a3988cd19b48220ff9 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Tue, 16 Jun 2020 10:09:36 -0700 Subject: [PATCH 152/350] Added mark_item_shipped! in orderitem model, updated orderitem controller mark_shipped route to accommodate. --- app/controllers/orderitems_controller.rb | 13 ++++------ app/models/orderitem.rb | 30 ++++++++++-------------- 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/app/controllers/orderitems_controller.rb b/app/controllers/orderitems_controller.rb index 5f02d881e1..b40d241e52 100644 --- a/app/controllers/orderitems_controller.rb +++ b/app/controllers/orderitems_controller.rb @@ -65,7 +65,6 @@ def update end end - def destroy if @orderitem.order.status == "pending" @orderitem.destroy @@ -79,21 +78,16 @@ def destroy end end - def mark_shipped - # put into model test if @orderitem.order.status == "paid" && @orderitem.shipped == false - @orderitem.shipped = true - @orderitem.save + @orderitem.mark_item_shipped! flash[:status] = :success - flash[:result_text] = "#{ @orderitem.product.product_name } - shipped" + flash[:result_text] = "#{ @orderitem.product.product_name } has shipped!" # @orderitem.order.mark_as_complete! - redirect_back fallback_location: root_path - elsif @orderitem.order.status == "paid" && @orderitem.shipped == true flash[:status] = :failure - flash[:result_text] = "#{@orderitem.shipped}- shipped" + flash[:result_text] = "#{ @orderitem.product.product_name } has already shipped." redirect_back fallback_location: root_path else flash[:status] = :failure @@ -103,6 +97,7 @@ def mark_shipped end private + def find_orderitem @orderitem = Orderitem.find_by(id: params[:id]) head :not_found unless @orderitem diff --git a/app/models/orderitem.rb b/app/models/orderitem.rb index b11a5add1f..7eaef298f3 100644 --- a/app/models/orderitem.rb +++ b/app/models/orderitem.rb @@ -3,32 +3,28 @@ class Orderitem < ApplicationRecord belongs_to :order validates :quantity, presence: true, numericality: { only_integer: true, greater_than: 0} - # do we need below? - validates :shipped, inclusion: { in: [true, false], message: "shipped status : must be true or false"} - # validates :in_stock - # validates :not_retired + # when should we call shipped validation below? + validates :shipped, inclusion: { in: [true, false], message: "shipped status : must be true or false" } + + validate :in_stock, on: [:create, :update] + validate :not_retired, on: [:create, :update] def subtotal subtotal = (self.quantity) * (self.product.price) return subtotal.round(2) end - private - - # mark_shipped for order (Order in charge of gateway: check this item shipped, check if can mark complete on whole order) - # check if the order is complete? - # if so, - # order.mark_item_shipped(id) - # can mark whole order complete - - # def marked_shipped - # single orderitem change shipped status - # end + def mark_item_shipped! + # change shipped status for single orderitem + self.shipped = true + self.save! + end + private def enough_stock - # call product's in_stock? - if quantity && product && product.enough_stock?(quantity) + # correct syntax?? + if !self.product.enough_stock?(quantity) errors.add(:quantity, "order exceeds in-stock inventory") end end From a2a88b8151548974687cc662f4fdab36b3710528 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 16 Jun 2020 12:01:31 -0700 Subject: [PATCH 153/350] changed uid to merchant_id for current user --- app/controllers/application_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 34fa03486d..8b0ec4e283 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -26,7 +26,7 @@ def set_current_order end def current_user - @current_user = Merchant.find_by(id: session[:uid]) + @current_user = Merchant.find_by(id: session[:merchant_id]) end def require_login From adb3a89ca40337abf5b7c0f536fe2c6679fc7d0f Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 16 Jun 2020 12:02:23 -0700 Subject: [PATCH 154/350] changed logout session from uid to merchant_id --- app/controllers/merchants_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rb index 6e9ec7c467..ffff4fc7c4 100644 --- a/app/controllers/merchants_controller.rb +++ b/app/controllers/merchants_controller.rb @@ -40,7 +40,7 @@ def create end def logout - session[:uid] = nil + session[:merchant_id] = nil flash[:success] = "Successfully logged out" redirect_to root_path return From 49f996d45491e7420db42fcc81e236b9e206e048 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 16 Jun 2020 12:03:19 -0700 Subject: [PATCH 155/350] Changed method from delete to post for logout --- app/views/layouts/_navigation-bar.html.erb | 2 +- config/routes.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/_navigation-bar.html.erb b/app/views/layouts/_navigation-bar.html.erb index 0d9f27f083..3b8b02d5e7 100644 --- a/app/views/layouts/_navigation-bar.html.erb +++ b/app/views/layouts/_navigation-bar.html.erb @@ -35,7 +35,7 @@ <%= link_to "Sign-in", github_login_path, method: :post, class: "nav-link-custom py-0 text-uppercase mr-5"%>
  • - <%= link_to "Logout", logout_path, method: :delete, class: "nav-link-custom py-0 text-uppercase mr-5"%> + <%= link_to "Logout", logout_path, method: :post, class: "nav-link-custom py-0 text-uppercase mr-5"%>
  • <%= link_to "Cart", cart_path(@order), class: "nav-link-custom py-0 text-uppercase mr-5" %> diff --git a/config/routes.rb b/config/routes.rb index c4cc58adca..f284a4e442 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -17,7 +17,7 @@ post "/auth/github", as: "github_login" get "/auth/github/callback", to: "merchants#create", as: "auth_callback" - delete "/logout", to: "merchants#logout", as: "logout" + post "/logout", to: "merchants#logout", as: "logout" get '/orders/:id/merchant_order', to: 'orders#merchant_order', as: 'merchant_order' resources :reviews, only: [:new, :create] From d50a9dbe44cd9d1e119ba35160bd4e02574560d1 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 16 Jun 2020 12:03:54 -0700 Subject: [PATCH 156/350] Changed provider data type from bigibt to string --- db/migrate/20200616184933_change_provider_column_datatype.rb | 5 +++++ db/schema.rb | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20200616184933_change_provider_column_datatype.rb diff --git a/db/migrate/20200616184933_change_provider_column_datatype.rb b/db/migrate/20200616184933_change_provider_column_datatype.rb new file mode 100644 index 0000000000..9d1113b4aa --- /dev/null +++ b/db/migrate/20200616184933_change_provider_column_datatype.rb @@ -0,0 +1,5 @@ +class ChangeProviderColumnDatatype < ActiveRecord::Migration[6.0] + def change + change_column :merchants, :provider, :string #'string USING CAST(provider AS string)' + end +end diff --git a/db/schema.rb b/db/schema.rb index accf4356d6..0b585403a2 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: 2020_06_15_231336) do +ActiveRecord::Schema.define(version: 2020_06_16_184933) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -31,7 +31,7 @@ create_table "merchants", force: :cascade do |t| t.string "username" t.string "email" - t.bigint "provider" + t.string "provider" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false t.integer "uid" From a9a8eebdd2c3e1fb231800fc3c0ed4b33c84d22d Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Tue, 16 Jun 2020 12:51:54 -0700 Subject: [PATCH 157/350] Fixed cart.html.erb for demo, changed cancel to cancelled status in order. --- app/models/order.rb | 5 +++-- app/views/orders/cart.html.erb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/models/order.rb b/app/models/order.rb index ed46967361..dd437e3a1b 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -47,11 +47,12 @@ def total return total_cost end - def mark_as_complete? + def mark_as_complete! if self.status == "paid" && self.orderitems.find_by(shipped: false).nil? self.status = "complete" - self.save + self.save! end + # need else statement?? end def is_order_of(merch_id) diff --git a/app/views/orders/cart.html.erb b/app/views/orders/cart.html.erb index f24385b75c..8598bcf824 100644 --- a/app/views/orders/cart.html.erb +++ b/app/views/orders/cart.html.erb @@ -1,5 +1,5 @@ <% if @order.nil? %>

    You have an empty cart!

    <% else %> -

    HERE IS YOUR ORDER: <% @order.id %>

    +

    HERE IS YOUR ORDER: <%= @order.id %>

    <% end %> \ No newline at end of file From bc4c5070ec4617f505f436be37ff05db4b7fd188 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Tue, 16 Jun 2020 12:55:23 -0700 Subject: [PATCH 158/350] Commented out is_merch_of --- app/models/order.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/models/order.rb b/app/models/order.rb index dd437e3a1b..0a9767c76e 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -7,7 +7,7 @@ class Order < ApplicationRecord has_many :products, through: :orderitems validates :status, presence: true, inclusion: { - in: %w(pending paid complete cancel), + in: %w(pending paid complete cancelled), message: "%{value} is not a valid status" } @@ -55,11 +55,11 @@ def mark_as_complete! # need else statement?? end - def is_order_of(merch_id) - if self.products.find_by(merchant_id: merch_id).nil? - return false - end + # def is_order_of(merch_id) + # if self.products.find_by(merchant_id: merch_id).nil? + # return false + # end - return true - end + # return true + # end end From bfd382cc2e4fdd4af91dd62c9b61df89e0edc186 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 13:05:09 -0700 Subject: [PATCH 159/350] fixed flash message layout --- app/controllers/merchants_controller.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rb index ffff4fc7c4..5ecef52bca 100644 --- a/app/controllers/merchants_controller.rb +++ b/app/controllers/merchants_controller.rb @@ -21,15 +21,12 @@ def create merchant = Merchant.find_by(uid: auth_hash[:uid], provider: "github") if merchant - flash[:status] = :success - flash[:result_text] = "Returning merchant: #{merchant.username}." + flash[:result_text] = "Returning merchant: #{merchant.username}" else merchant = Merchant.build_from_github(auth_hash) if merchant.save - flash[:status] = :success flash[:result_text] = "You are logged in as new merchant: #{merchant.username}." else - flash[:status] = :failure flash[:result_text] = "Failure: Could not create new merchant account" flash[:messages] = merchant.errors.messages return redirect_to root_path From 5324a12502863d1f345f099e79ec4bf201ed66f3 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 13:05:18 -0700 Subject: [PATCH 160/350] added light text for flash messages --- app/assets/stylesheets/application.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 1deaaf65a3..575af4bbc6 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -170,6 +170,10 @@ body { text-transform: uppercase; } +.light-text { + font-weight: 300; +} + /* Auto Crop Photos */ .embed-responsive .card-img-top { object-fit: cover; @@ -246,6 +250,10 @@ body { border-radius: 50%; } +.fa-custom { + padding: 0px +} + .fa-snapchat-ghost:hover { text-decoration: none; background: #fffc00; From 1db38093eda3edfb3e3fcb7867ecc5c82d2882fc Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 13:07:17 -0700 Subject: [PATCH 161/350] added sign in button that shows when not logged in, logout and user profile buttons show when logged in, also added icons to go with navlinks --- app/views/layouts/_navigation-bar.html.erb | 38 +++++++++++++++++----- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/app/views/layouts/_navigation-bar.html.erb b/app/views/layouts/_navigation-bar.html.erb index 3b8b02d5e7..a6c3898269 100644 --- a/app/views/layouts/_navigation-bar.html.erb +++ b/app/views/layouts/_navigation-bar.html.erb @@ -15,15 +15,21 @@ <%# Navigation Links %>
    • - <%= link_to "All products", products_path, class: "nav-link-custom py-0 text-uppercase mr-5" %> + + <%= link_to "All products", products_path, class: "nav-link-custom py-0 text-uppercase mr-5 ml-1" %> +
    • - <%= link_to "All merchants", merchants_path, class: "nav-link-custom py-0 text-uppercase mr-5" %> + + <%= link_to "All merchants", merchants_path, class: "nav-link-custom py-0 text-uppercase mr-5 ml-1" %> +
    • - + + +
      <% collection.each do |category| %> <%= link_to category.category_name, products_path(category_name: category.category_name), class: "dropdown-item nav-link-custom text-uppercase" %> @@ -31,15 +37,31 @@
      • + <% if session[:merchant_id] %>
    • - <%= link_to "Sign-in", github_login_path, method: :post, class: "nav-link-custom py-0 text-uppercase mr-5"%> + <% @current_user = Merchant.find_by(id: session[:merchant_id]) %> + + <%= link_to @current_user.username, merchant_path(session[:merchant_id]), class: "nav-link-custom py-0 text-uppercase mr-5 ml-1" %> +
    • - <%= link_to "Logout", logout_path, method: :post, class: "nav-link-custom py-0 text-uppercase mr-5"%> + + <%= link_to "Logout", logout_path, method: :post, class: "nav-link-custom py-0 text-uppercase mr-5 ml-1"%> +
      • + <% else %>
    • - <%= link_to "Cart", cart_path(@order), class: "nav-link-custom py-0 text-uppercase mr-5" %> + + <%= link_to "Sign-in", github_login_path, method: :post, class: "nav-link-custom py-0 text-uppercase mr-5 ml-1"%> +
      • + <% end %> +
    • + + <%= link_to "Cart", cart_path(@order), class: "nav-link-custom py-0 text-uppercase mr-5 ml-1" %> + +
      • +
    \ No newline at end of file From 9a3f47cdde331550d4852e65ff49d8c0365b3198 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 13:07:31 -0700 Subject: [PATCH 162/350] fixed color codes for flash messages --- app/views/layouts/application.html.erb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index ef633080e5..e305a80691 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -24,16 +24,22 @@ <%# Content %> -
    +
    <% flash.each do |name, message| %> <% if name == "success" %> - - <%= f.submit "Add to Cart" %> + <%= f.submit "Add to Cart", class: "catalog__add-to-cart-button"%> <% end %> From 048ec609157d09ec928758cb2ee6a6b4227566c7 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 17:27:28 -0700 Subject: [PATCH 174/350] padding fixed for edit order page --- app/views/orders/edit.html.erb | 90 +++++++++++++++++----------------- 1 file changed, 46 insertions(+), 44 deletions(-) diff --git a/app/views/orders/edit.html.erb b/app/views/orders/edit.html.erb index 77ff4179a1..47a97f0330 100644 --- a/app/views/orders/edit.html.erb +++ b/app/views/orders/edit.html.erb @@ -1,46 +1,48 @@ -
    -

    Checkout

    -
    - <%= form_with model: @order do |f| %> - -
    - <%= f.label :cc_name, 'Name' %> - <%= f.text_field :cc_name, class:"form-control" %> -
    - -
    - <%= f.label :email %> - <%= f.text_field :email, class:"form-control" %> -
    - -
    - <%= f.label :address %> - <%= f.text_field :address, class:"form-control" %> -
    - -
    - <%= f.label :cc_num, 'Credit Card Number' %> - <%= f.text_field :cc_num, class:"form-control" %> -
    - -
    - <%= f.label :cc_exp, 'Expiration Date' %> - <%= f.text_field :cc_exp, class:"form-control" %> -
    - -
    - <%= f.label :cvv, 'CVV' %> - <%= f.text_field :cvv, class:"form-control" %> -
    - -
    - <%= f.label :zip, 'Billing Zip Code' %> - <%= f.text_field :zip, class:"form-control" %> -
    - -
    - <%= f.submit "Confirm", class:"btn btn-primary" %> -
    - <% end %> +
    +
    +

    Checkout

    +
    + <%= form_with model: @order do |f| %> + +
    + <%= f.label :cc_name, 'Name' %> + <%= f.text_field :cc_name, class:"form-control" %> +
    + +
    + <%= f.label :email %> + <%= f.text_field :email, class:"form-control" %> +
    + +
    + <%= f.label :address %> + <%= f.text_field :address, class:"form-control" %> +
    + +
    + <%= f.label :cc_num, 'Credit Card Number' %> + <%= f.text_field :cc_num, class:"form-control" %> +
    + +
    + <%= f.label :cc_exp, 'Expiration Date' %> + <%= f.text_field :cc_exp, class:"form-control" %> +
    + +
    + <%= f.label :cvv, 'CVV' %> + <%= f.text_field :cvv, class:"form-control" %> +
    + +
    + <%= f.label :zip, 'Billing Zip Code' %> + <%= f.text_field :zip, class:"form-control" %> +
    + +
    + <%= f.submit "Confirm", class:"btn btn-primary" %> +
    + <% end %> +
    \ No newline at end of file From e5de2fd8cbc315a662f4cd3259b669bf7ffbd7b8 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 17:27:43 -0700 Subject: [PATCH 175/350] adjusted cart styling --- app/views/orders/cart.html.erb | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/app/views/orders/cart.html.erb b/app/views/orders/cart.html.erb index 38deaf73cd..959f04c8ef 100644 --- a/app/views/orders/cart.html.erb +++ b/app/views/orders/cart.html.erb @@ -1,29 +1,32 @@ +
    <% if @order.nil? %>

    You have an empty cart!

    <% else %>
    -

    YOUR CART

    +

    YOUR CART

    <% @order.orderitems.each do |orderitem| %> - + <% end %> @@ -34,10 +37,11 @@
    -

    TOTAL $<%= number_with_precision(@order.total, :precision => 2) %>

    -

    <%= link_to 'Checkout', edit_order_path(id: @order.id), class:"btn btn-primary" %>

    +

    TOTAL $<%= number_with_precision(@order.total, :precision => 2) %>

    +

    <%= button_to 'Checkout', edit_order_path(id: @order.id), class:"cart__checkout-button" %>

    <% end %> + From fe9f1284604c1e97fd63adbf1a2b1f81b285a8aa Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 17:28:03 -0700 Subject: [PATCH 176/350] added number_with_precision to display prices properly --- app/views/products/index.html.erb | 2 +- app/views/products/show.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index fbc2dc2609..d3d65b310b 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -22,7 +22,7 @@
    <%= button_to product.product_name, product_path(product.id), method: :get, class: "catalog__card-title-button text-left"%>
    - $<%= product.price%> + $<%= number_with_precision(product.price, :precision => 2, :delimiter => ',')%>
    Rating: ##/5 (# of reviews) diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 54284ab535..f54b4ddbb8 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -21,7 +21,7 @@
    -

    $<%= @product.price %>

    +

    $<%= number_with_precision(@product.price, :precision => 2, :delimiter => ',') %>

    Description

    <%= @product.description %>
    From 0076a7e1eb13dd6a7694602876902dda182e5104 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 17:28:36 -0700 Subject: [PATCH 177/350] added classes for cart styling --- app/assets/stylesheets/application.scss | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 575af4bbc6..f9b31696b2 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -165,15 +165,25 @@ body { color: #000; } -.catalog__body-text, .catalog__description-title, .catalog__review-title { +.catalog__body-text, .catalog__description-title, .catalog__review-title, .cart__title, .cart__text { font-weight: 300; text-transform: uppercase; } +.cart__text a { + color: #000; +} + .light-text { font-weight: 300; } +.cart__img { + max-width: 20%; + max-height: 20%; +} + + /* Auto Crop Photos */ .embed-responsive .card-img-top { object-fit: cover; @@ -197,7 +207,7 @@ body { color: #000000; } -.catalog__add-to-cart-button { +.catalog__add-to-cart-button, .cart__checkout-button { background-color: #fff; color: #000000; padding: 5px; @@ -210,7 +220,7 @@ body { min-width: 25%; } -.catalog__add-to-cart-button:hover { +.catalog__add-to-cart-button:hover, .cart__checkout-button:hover { background-color: #161616; color: #fff; } From 63439e060196403d1288d2f6e3c905cc5f13204e Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 17:29:41 -0700 Subject: [PATCH 178/350] added precision and comma delimiter to total price --- app/views/orders/cart.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/orders/cart.html.erb b/app/views/orders/cart.html.erb index 959f04c8ef..22412735cd 100644 --- a/app/views/orders/cart.html.erb +++ b/app/views/orders/cart.html.erb @@ -37,7 +37,7 @@
    -

    TOTAL $<%= number_with_precision(@order.total, :precision => 2) %>

    +

    TOTAL $<%= number_with_precision(@order.total, :precision => 2, :delimiter => ',') %>

    <%= button_to 'Checkout', edit_order_path(id: @order.id), class:"cart__checkout-button" %>

    From bb8b06fd8bba223571f055ce7f9c37bd16f26335 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 17:30:25 -0700 Subject: [PATCH 179/350] product link changed from white to black --- app/views/orders/cart.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/orders/cart.html.erb b/app/views/orders/cart.html.erb index 22412735cd..63d5501956 100644 --- a/app/views/orders/cart.html.erb +++ b/app/views/orders/cart.html.erb @@ -15,7 +15,7 @@
    - + + @@ -55,16 +56,27 @@ - + + <% end %> From c623b735a2331c2932f08025f9dac9d50bb73182 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 14:29:50 -0700 Subject: [PATCH 307/350] added cancel_order and mark_as_complete methods for order --- app/models/order.rb | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/app/models/order.rb b/app/models/order.rb index 8326a242bc..f31df08e8f 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -16,6 +16,17 @@ class Order < ApplicationRecord validates :cc_exp, presence: true, on: :update validates :zip, presence: true, numericality: { only_integer: true }, on: :update + def cancel_order + # return_stock + self.return_stock + + # delete order items from this order + self.orderitems.destroy_all + + # mark order :status as cancelled + self.update_attribute(:status, "cancelled") + end + def reduce_stock self.orderitems.each do |orderitem| orderitem.product.stock -= orderitem.quantity @@ -23,7 +34,6 @@ def reduce_stock end end - # TODO: delete this method if we never end up using for cancelling orders def return_stock self.orderitems.each do |orderitem| if !orderitem.product.retired @@ -45,12 +55,8 @@ def total def mark_as_complete! if self.status == "paid" && self.orderitems.find_by(shipped: false).nil? - self.status = "complete" - self.save! - else - raise Exception, "Order is not paid or all items haven't shipped" + self.update_attribute(:status, "complete") end - # need else statement?? end def change_to_paid! @@ -82,12 +88,4 @@ def checkout # self.clear_cart return true end - - # def is_order_of(merch_id) - # if self.products.find_by(merchant_id: merch_id).nil? - # return false - # end - - # return true - # end end From 18c0868dc7098a56d3a8d484187038810b2128da Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 14:30:38 -0700 Subject: [PATCH 308/350] cancel order and mark as complete order --- app/controllers/orders_controller.rb | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index 8e5a14e485..649c175d97 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -3,7 +3,7 @@ class OrdersController < ApplicationController before_action :require_login, only: [:index] before_action :find_order_from_session, only: [:edit, :update, :cart] # delete merch order from 6 if not used eventually ***** - before_action :find_order_from_params, only: [:show, :merchant_order, :success] + before_action :find_order_from_params, only: [:show, :merchant_order, :success, :cancel] # Renders details page for order already paid for (or cancelled?) @@ -14,7 +14,9 @@ def index @total_revenue = @merchant.total_revenue end - def show ; end + def show + @order.mark_as_complete! + end # Renders payment information form def edit ; end @@ -54,6 +56,21 @@ def cart ; end # Shows confirmation page for recently placed order def success ; end + # Marks order as cancelled + def cancel + if @order.status == "paid" && @order.orderitems.find_by(shipped: true).nil? + @order.cancel_order + flash[:success] = "Your order, #{ @order.id }, has been cancelled!" + redirect_back fallback_location: root_path + elsif @order.status == "paid" && @order.orderitems.find_by(shipped: false).nil? + flash[:failure] = "Cannot cancel an order that has already been shipped" + redirect_back fallback_location: root_path + else + flash[:failure] = "Cannot perform this action" + redirect_to root_path + end + end + # deleted view file and route # def merchant_order # unless @order.is_order_of(session[:merchant_id]) && @order.status != 'pending' From 35cf9cad78cdf2990a743a8c0bd33a6176d17a19 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 14:31:00 -0700 Subject: [PATCH 309/350] mark item as shipped for orderitem --- app/models/orderitem.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/models/orderitem.rb b/app/models/orderitem.rb index e7b1ea2551..2f747a4cb7 100644 --- a/app/models/orderitem.rb +++ b/app/models/orderitem.rb @@ -15,9 +15,7 @@ def subtotal end def mark_item_shipped! - # change shipped status for single orderitem - self.shipped = true - self.save! + self.update_attribute(:shipped, true) end # private From 55c8862e8d1da7900192d8f33efb4633f3d51f71 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 14:31:31 -0700 Subject: [PATCH 310/350] merchant all_order method checks to mark order as complete with mark_as_complete --- app/models/merchant.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/models/merchant.rb b/app/models/merchant.rb index 656505840c..fae0ae22c5 100644 --- a/app/models/merchant.rb +++ b/app/models/merchant.rb @@ -33,12 +33,18 @@ def total_revenue end def all_orders + # finds merchant's orders and also checks if they can be marked complete (sorry Chris) merchant_orders = [] Order.all.each do |order| order.orderitems.each do |item| if item.product.merchant_id == self.id order = Order.find_by(id: item.order_id) + + if order.orderitems.find_by(shipped: false).nil? + order.mark_as_complete! + end + merchant_orders << order break end From 61a65e9e7f255ea1014f569bff59d08bb4c80510 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 14:31:58 -0700 Subject: [PATCH 311/350] cancel order button added and functioning on confirmation page --- app/views/orders/success.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/orders/success.html.erb b/app/views/orders/success.html.erb index 8bde643e57..5964f82d36 100644 --- a/app/views/orders/success.html.erb +++ b/app/views/orders/success.html.erb @@ -43,7 +43,6 @@ - @@ -59,6 +58,8 @@

    ORDER TOTAL: $<%= number_with_precision(@order.total, :precision => 2, :delimiter => ',') %>

    +
    + <%= link_to "Cancel Order", cancel_path(@order), method: :patch, data: {confirm: "Are you sure you want to cancel this order?"}, class: "cart__remove-button" %> From bb3c17a787fea445833d43dc19e9b998da9b9f05 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 14:32:10 -0700 Subject: [PATCH 312/350] added cancel custom route for order --- config/routes.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index e898fcb0d5..cbaee949f2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,15 +7,14 @@ patch :retired, on: :member #products/1/retired end - resources :orderitems, only: [:update, :destroy] do - patch :status, on: :member #products/1/status - end + resources :orderitems, only: [:update, :destroy] patch 'orderitems/:id/mark_shipped', to: 'orderitems#mark_shipped', as: 'mark_shipped' resources :orders, only: [:index, :new, :show, :edit, :update, :cancel] # # below for checkout success confirmation page get '/orders/:id/cart/success', to: 'orders#success', as: 'success' get '/orders/:id/cart', to: 'orders#cart', as: 'cart' + patch '/orders/:id/cancel', to: 'orders#cancel', as: 'cancel' resources :merchants From 4d58452fc8cf72255af2a9275fc48ee1c03e4620 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Thu, 18 Jun 2020 16:27:22 -0700 Subject: [PATCH 313/350] Fixed tests in merchant_test, added guard for prohibited statuses in total_revenue model method. --- app/models/merchant.rb | 53 ++++++++++---------- test/fixtures/orderitems.yml | 1 - test/models/merchant_test.rb | 95 ++++++++++++++++++++++-------------- 3 files changed, 84 insertions(+), 65 deletions(-) diff --git a/app/models/merchant.rb b/app/models/merchant.rb index fae0ae22c5..336a098352 100644 --- a/app/models/merchant.rb +++ b/app/models/merchant.rb @@ -14,17 +14,35 @@ def self.build_from_github(auth_hash) return merchant end - def total_revenue - # TODO: remove cancelled order from consideration - revenue = 0 - orders = self.all_orders - - orders.each do |order| + def revenue_by_status(status) + revenue_by_status = 0 + orders_of_a_status = self.order_status(status) + + orders_of_a_status.each do |order| order.orderitems.each do |item| if item.product.merchant_id == self.id product = Product.find_by(id: item.product_id) price = product.price - revenue += price + revenue_by_status += price + end + end + end + + return revenue_by_status + end + + def total_revenue + revenue = 0 + orders = self.all_orders + + orders.each do |order| + if (order.status != "cancelled") && (order.status != "pending") + order.orderitems.each do |item| + if item.product.merchant_id == self.id + product = Product.find_by(id: item.product_id) + price = product.price + revenue += price + end end end end @@ -33,7 +51,7 @@ def total_revenue end def all_orders - # finds merchant's orders and also checks if they can be marked complete (sorry Chris) + # finds merchant's orders and checks if they can be marked complete merchant_orders = [] Order.all.each do |order| @@ -55,7 +73,6 @@ def all_orders end def order_status(status) - # return all of the merchant's orders with a certain status orders = self.all_orders status_orders = [] @@ -67,22 +84,4 @@ def order_status(status) return status_orders end - - - def revenue_by_status(status) - revenue_by_status = 0 - orders_of_a_status = self.order_status(status) - - orders_of_a_status.each do |order| - order.orderitems.each do |item| - if item.product.merchant_id == self.id - product = Product.find_by(id: item.product_id) - price = product.price - revenue_by_status += price - end - end - end - - return revenue_by_status - end end \ No newline at end of file diff --git a/test/fixtures/orderitems.yml b/test/fixtures/orderitems.yml index 11704eff82..dcc35ec7f0 100644 --- a/test/fixtures/orderitems.yml +++ b/test/fixtures/orderitems.yml @@ -1,7 +1,6 @@ rxbar: quantity: 3 order: order1 - # if we have trouble, change product to product_id to mirror the table for orderitems product: rx_bar shipped: false snow: diff --git a/test/models/merchant_test.rb b/test/models/merchant_test.rb index 54ba83f457..dcbfc0f36a 100644 --- a/test/models/merchant_test.rb +++ b/test/models/merchant_test.rb @@ -39,9 +39,9 @@ end end - # test products *** + # ASK ABOUT TESTING PRODUCTS??? it "can have one or more order items through products" do - merchant.must_respond_to :orderitems + merchant.must_respond_to :orderitem merchant.orderitems.each do |order_item| order_item.must_be_kind_of OrderItem @@ -74,12 +74,54 @@ end end + describe "revenue_by_status" do + it "returns the correct total revenue for a merchant's products sold in an order of a given status" do + merchant = merchants(:greta) + + expect(merchant.revenue_by_status("complete")).must_be_kind_of Float + expect(merchant.revenue_by_status("complete")).must_equal 25 + expect(merchant.revenue_by_status("pending")).must_equal 25 + expect(merchant.revenue_by_status("cancelled")).must_equal 0 + end + + it "returns 0 if there is no revenue associated with merchant orders of a certain status" do + merchant = merchants(:greta) + + expect(merchant.revenue_by_status("cancelled")).must_equal 0 + end + + it "will return 0 for a non-existing status" do + merchant = merchants(:greta) + + expect(merchant.revenue_by_status("n/a")).must_be_kind_of Integer + expect(merchant.revenue_by_status("n/a")).must_equal 0 + end + end + describe "total_revenue" do it "correctly calculates the total revenue for a merchant" do merchant = merchants(:greta) - # 2.45 for rxbar in order3 + 5,000 for rainier in order4 + 5,000 for rainier in order5 - # formatting for money correct??? - expect(merchant.total_revenue).must_equal 10002.45 + expect(merchant.total_revenue).must_equal 25 + end + + it "does not include revenue from orders that are pending or cancelled" do + merchant = merchants(:bob) + + paid_total = merchant.revenue_by_status("paid") + complete_total = merchant.revenue_by_status("complete") + projected_total = complete_total + paid_total + + # Bob has 5 orders, 2 of which are pending or cancelled + expect(merchant.all_orders.count).must_equal 5 + expect(merchant.order_status("pending").length).must_equal 1 + expect(merchant.order_status("cancelled").length).must_equal 1 + + # Bob would have earned $5,002.45 on his pending and cancelled orders + expect(merchant.revenue_by_status("pending")).must_equal 2.45 + expect(merchant.revenue_by_status("cancelled")).must_equal 5000 + + # expect Bob's total to match calculated total for only relevant orders + expect(merchant.total_revenue).must_equal projected_total end it "returns 0 if a merchant has not sold any products" do @@ -93,12 +135,14 @@ it "finds all the orders containing at least one item from a merchant" do merchant = merchants(:greta) merchant2 = merchants(:bob) + merchant3 = merchants(:no_products_merchant) - # from fixtures, greta's products (snow_pass) are in 3 separate orders - # while bob's products are in 4 orders + # from fixtures, Greta's products (snow_pass) are in 2 separate orders + # while Bob's products are in 5 orders expect(merchant.all_orders).must_be_kind_of Array - expect(merchant.all_orders.length).must_equal 3 - expect(merchant2.all_orders.length).must_equal 4 + expect(merchant.all_orders.length).must_equal 2 + expect(merchant2.all_orders.length).must_equal 5 + expect(merchant3.all_orders.length).must_equal 0 end it "returns an empty array if there are no items from that merchant in any order" do @@ -113,38 +157,15 @@ merchant = merchants(:greta) expect(merchant.order_status("complete")).must_be_kind_of Array - expect(merchant.order_status("complete").length).must_equal 2 - expect(merchant.order_status("cancelled").length).must_equal 1 + expect(merchant.order_status("complete").length).must_equal 1 + expect(merchant.order_status("pending").length).must_equal 1 end it "returns an empty collection if there are no merchant orders of a certain status" do merchant = merchants(:greta) - # greta does not have any pending orders... - expect(merchant.order_status("pending")).must_be_kind_of Array - expect(merchant.order_status("pending").length).must_equal 0 - end - end - - describe "revenue_by_status" do - it "returns the correct total revenue for a merchant's products sold in an order of a given status" do - merchant = merchants(:greta) - - expect(merchant.revenue_by_status("complete")).must_equal 5002.45 - - # NOT SURE IF THIS IS CORRECT FOR CANCELLED ORDER REVENUE???? (DELETE IF UNSURE) - expect(merchant.revenue_by_status("cancelled")).must_equal 5000 - end - - it "returns 0 if there is no revenue associated with merchant orders of a certain status" do - merchant = merchants(:greta) - # greta does not have any pending orders... (?) - expect(merchant.revenue_by_status("pending")).must_equal 0 - end - - it "will return 0 for a non-existing status" do - merchant = merchants(:greta) - expect(merchant.total_revenue_by_status("n/a")).must_be_kind_of Array - expect(merchant.total_revenue_by_status("n/a")).must_equal 0 + # greta does not have any cancelled orders + expect(merchant.order_status("cancelled")).must_be_kind_of Array + expect(merchant.order_status("cancelled").length).must_equal 0 end end end \ No newline at end of file From 21965ee5e4bcd97d9daaade46b726590dd616d50 Mon Sep 17 00:00:00 2001 From: denisseai Date: Thu, 18 Jun 2020 16:33:07 -0700 Subject: [PATCH 314/350] Added test to reviews model --- app/models/review.rb | 6 +---- test/fixtures/reviews.yml | 2 +- test/models/review_test.rb | 48 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/app/models/review.rb b/app/models/review.rb index f9ff6bbc15..925a6176a1 100644 --- a/app/models/review.rb +++ b/app/models/review.rb @@ -1,12 +1,8 @@ class Review < ApplicationRecord belongs_to :product - validates :rating, presence: true, numericality: { + validates :rating, numericality: { only_integer: true, greater_than_or_equal_to: 1, less_than_or_equal_to: 5 } - - # validates NOT merchant id - - end diff --git a/test/fixtures/reviews.yml b/test/fixtures/reviews.yml index b637068995..7c53f4a191 100644 --- a/test/fixtures/reviews.yml +++ b/test/fixtures/reviews.yml @@ -1,4 +1,4 @@ -review1: +review_one: rating: 5 content: "Great as a gift" product_id: 1 diff --git a/test/models/review_test.rb b/test/models/review_test.rb index 2c56dbaae7..398bcba8f5 100644 --- a/test/models/review_test.rb +++ b/test/models/review_test.rb @@ -1,2 +1,50 @@ require "test_helper" +describe Review do + before do + @product = products(:rx_bar) + @review = reviews(:review_one) + @review.product_id = @product.id + end + describe "validations" do + + # rating VALIDATIONS: + it "is valid with a valid integer rating" do + expect(@review.valid?).must_equal true + expect(@review.rating).must_be_kind_of Integer + expect(@review.rating).must_equal 5 + end + + it "is invalid without a rating" do + @review.rating = nil + expect(@review.valid?).must_equal false + end + + it "is invalid with a rating outside 1 through 5" do + # 0 rating + @review.rating = 0 + @result = @review.valid? + + expect(@result).must_equal false + + # Negative rating + @review.rating = -1 + @result = @review.valid? + + expect(@result).must_equal false + + # > 5 rating + @review.rating = 6 + @result = @review.valid? + + expect(@result).must_equal false + end + + it "is invalid with an incorrect rating data type" do + @review.rating = "FIVE" + @result = @review.valid? + + expect(@result).must_equal false + end + end +end From b1779ca8ef51a880c6d0ed89ae57fdfcb42386ef Mon Sep 17 00:00:00 2001 From: denisseai Date: Thu, 18 Jun 2020 17:05:34 -0700 Subject: [PATCH 315/350] added tests for reviews controller --- app/controllers/reviews_controller.rb | 2 +- test/controllers/reviews_controller_test.rb | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/controllers/reviews_controller.rb b/app/controllers/reviews_controller.rb index 6906879ef2..b64d16ac18 100644 --- a/app/controllers/reviews_controller.rb +++ b/app/controllers/reviews_controller.rb @@ -18,7 +18,7 @@ def create private - def review_params1 + def review_params return params.require(:review).permit(:content, :rating, :product_id) end end diff --git a/test/controllers/reviews_controller_test.rb b/test/controllers/reviews_controller_test.rb index b30e93edcc..8ced2a6de4 100644 --- a/test/controllers/reviews_controller_test.rb +++ b/test/controllers/reviews_controller_test.rb @@ -29,13 +29,12 @@ expect(new_review.rating).must_equal 5 expect(new_review.product_id).must_equal products(:rx_bar).id - expect + must_redirect_to product_path(new_review.product_id) must_redirect_to product_path(products(:rx_bar).id) + + assert_equal "Review successfully added.", flash[:success] end end - # describe "review_params" do - # end end - end From 4af187dd4e8eec023247133aea872bc345da5957 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Thu, 18 Jun 2020 17:06:02 -0700 Subject: [PATCH 316/350] Added comments and fleshed out current action tests. --- app/controllers/merchants_controller.rb | 27 ++++++++++++++----- test/controllers/merchants_controller_test.rb | 27 ++++++++++++++----- 2 files changed, 41 insertions(+), 13 deletions(-) diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rb index e8827267bc..6af15fdd5d 100644 --- a/app/controllers/merchants_controller.rb +++ b/app/controllers/merchants_controller.rb @@ -1,4 +1,6 @@ class MerchantsController < ApplicationController + before_action :find_merchant_from_params, only: [:show] + before_action :find_merchant_from_session, only: [:current] # before_action :require_login, except: [:index, :destroy, :create] def index @@ -7,12 +9,13 @@ def index end def show - @merchant = Merchant.find_by(id: params[:id]) + # @merchant = Merchant.find_by(id: params[:id]) @url = "http://thecatapi.com/api/images/get?format=src&type=gif×tamp=" - if @merchant.nil? - head :not_found - return - end + + # if @merchant.nil? + # return head :not_found + # # return + # end end def create @@ -31,6 +34,7 @@ def create return redirect_to root_path end end + session[:merchant_id] = merchant.id return redirect_to root_path end @@ -48,7 +52,6 @@ def current redirect_to root_path return else - @merchant = Merchant.find_by(id: session[:merchant_id]) redirect_to merchant_path(session[:merchant_id]) return end @@ -70,5 +73,15 @@ def current # end # end - + private + + def find_merchant_from_params + @merchant = Merchant.find_by(id: params[:id]) + head :not_found unless @merchant + end + + def find_merchant_from_session + @merchant = Merchant.find_by(id: session[:merchant_id]) + head :not_found unless @merchant + end end diff --git a/test/controllers/merchants_controller_test.rb b/test/controllers/merchants_controller_test.rb index 278b74e676..db7dab0a9c 100644 --- a/test/controllers/merchants_controller_test.rb +++ b/test/controllers/merchants_controller_test.rb @@ -1,8 +1,9 @@ require "test_helper" +require "pry" describe MerchantsController do - describe "index action" do + describe "index" do it "repsonds with success" do get merchants_path @@ -10,12 +11,19 @@ end end - describe 'show action' do - it 'responds with a success when id given exists' do - - get merchants_path((:id)) + describe "show" do + it "responds with success when merchant_id is found" do + # PASS IN MERCHANT LIKE THIS?? + get merchant_path(Merchant.first.id) must_respond_with :success end + + it "returns head :not_found when merchant_id isn't found" do + # NOT SURE WHY THIS IS NOT WORKING??? + get merchant_path(nil) + + must_respond_with :not_found + end end describe "create with build_from_github" do @@ -48,9 +56,16 @@ end describe "current" do - it "responds with success when a current merchant is selected" do + it "responds with success when a merchant is currently logged in, and redirects" do + # CHECK SESSION ID get merchants_path must_respond_with :success + # FLASH ERROR + must_redirect_to merchant_path(session[:merchant_id]) + end + + it "flashes an error and redirects to root_path when no merchant is logged in" do + # TODO: THIS ONE. end end end From 1cf1a2c82fd5ab510b19c67e71d24a6c7826f392 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 17:21:23 -0700 Subject: [PATCH 317/350] fixed date --- app/views/orders/success.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/orders/success.html.erb b/app/views/orders/success.html.erb index 5964f82d36..8000adcdea 100644 --- a/app/views/orders/success.html.erb +++ b/app/views/orders/success.html.erb @@ -9,7 +9,7 @@ <% else %>

    Your Order's Current status: <%= @order.status %>

    -

    Purchase made on: <%= @order.created_at %>

    +

    Purchase made on: <%= @order.created_at.to_date %>

    - <%= image_tag "#{orderitem.product.photo_url}", alt: "#{orderitem.product.product_name}" %> + + <%= image_tag "#{orderitem.product.photo_url}", alt: "#{orderitem.product.product_name}", class: "embed-responsive embed-responsive-1by1 cart__img" %> +

    <%= link_to orderitem.product.product_name, product_path(orderitem.product), class: "text-dark, cart__text" %>

    +     		-

    <%= link_to orderitem.product.product_name, product_path(orderitem.product) %>

    -

    Quantity: <%= orderitem.quantity %>

    +

    Quantity: <%= orderitem.quantity %>

    - <%= link_to "edit", edit_order_path(id: orderitem.id) %> | - <%= link_to "delete", orderitem_path(id: orderitem.id), method: :delete, data: {confirm: "Are you sure?"} %> + <%= link_to "edit", edit_order_path(id: orderitem.id), class: "text-dark cart__text" %> | + <%= link_to "remove from cart", orderitem_path(id: orderitem.id), method: :delete, data: {confirm: "Are you sure?"}, class: "text-dark cart__text"%>

    		-

    $<%= number_with_precision(orderitem.subtotal, :precision => 2) %> ($<%= number_with_precision(orderitem.product.price, :precision => 2) %> each)

    +

    $<%= number_with_precision(orderitem.subtotal, :precision => 2, :delimiter => ',') %> ($<%= number_with_precision(orderitem.product.price, :precision => 2, :delimiter => ',') %> each)
    -

    <%= link_to orderitem.product.product_name, product_path(orderitem.product), class: "text-dark, cart__text" %>

    +

    <%= link_to orderitem.product.product_name, product_path(orderitem.product), class: "text-dark, cart__text" %>

    Quantity: <%= orderitem.quantity %>

    From 19d3811e939ff08e0e86bd588038ce3537c4372c Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 16 Jun 2020 17:31:55 -0700 Subject: [PATCH 180/350] fixed typo on app/controllers/orders --- app/controllers/orders_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index 7ca0608138..b68e16146e 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -28,11 +28,11 @@ def update if !orderitem.valid? flash[:status] = :failure flash[:result_text] = "Some items in your cart are no longer available" - flash[:messages] = orderitem.errors.messages + flash[:messages] = @orderitem.errors.messages end if flash[:status] = :failure - flash[:messages] = order.errors.messages + flash[:messages] = @order.errors.messages return redirect_to cart_path end end From ba06e8e5d72846cbbd8aaafe133f4020d96db406 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 17:34:03 -0700 Subject: [PATCH 181/350] added text for when cart is empty --- app/views/orders/cart.html.erb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/views/orders/cart.html.erb b/app/views/orders/cart.html.erb index 63d5501956..b9284fc715 100644 --- a/app/views/orders/cart.html.erb +++ b/app/views/orders/cart.html.erb @@ -1,10 +1,12 @@
    -<% if @order.nil? %> -

    You have an empty cart!

    -<% else %>

    YOUR CART

    - +<% if @order.orderitems.empty? %> +
    +

    Your cart is empty.

    +
    +
    +<% else %> From dfad7b83cc53075187f9f68606fdfc233aa3cc98 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 16 Jun 2020 18:06:22 -0700 Subject: [PATCH 182/350] Added edit method to orderitems controller --- app/controllers/orderitems_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/orderitems_controller.rb b/app/controllers/orderitems_controller.rb index 64607ee8f2..c635acaf48 100644 --- a/app/controllers/orderitems_controller.rb +++ b/app/controllers/orderitems_controller.rb @@ -1,5 +1,5 @@ class OrderitemsController < ApplicationController - before_action :find_orderitem, only: [:update, :destroy, :mark_shipped] + before_action :find_orderitem, only: [:edit, :update, :destroy, :mark_shipped] def create # Increase quantity of desired product @@ -29,6 +29,8 @@ def create redirect_to cart_path(id: session[:order_id]) end + + def edit ; end def update if @orderitem.order.status == "pending" From 85db9345e9dd93dee44479275c2919aad51c1338 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 16 Jun 2020 18:06:48 -0700 Subject: [PATCH 183/350] Added view for order to update orderitem --- app/views/orderitems/edit.html.erb | 36 ++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 app/views/orderitems/edit.html.erb diff --git a/app/views/orderitems/edit.html.erb b/app/views/orderitems/edit.html.erb new file mode 100644 index 0000000000..554f41e446 --- /dev/null +++ b/app/views/orderitems/edit.html.erb @@ -0,0 +1,36 @@ +
    +

    Update Quantity

    + +
    +
    +
    +
    <%= image_tag "#{@orderitem.product.photo_url}", alt: "#{@orderitem.product.product_name}" %>
    +
    +
    + +
    +
    +

    <%= @orderitem.product.product_name %>

    + <%= @orderitem.product.description %> +

    $<%= '%.2f' % @orderitem.product.price %>

    + + <% if @orderitem.product.retired %> +

    Not currently for sale

    + <% end %> + +
    + <%= form_with model: @orderitem do |f| %> +
    + <%= f.label :quantity %> + <%= f.select :quantity, (1..@orderitem.product.stock) %> +
    + +
    + <%= f.submit "Update Quantity", class:"btn btn-primary" %> +
    + <% end %> +
    +
    +
    +
    +
    \ No newline at end of file From c2ca2a2d0c6d0be9cff327fa58127cb5fa98f629 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 16 Jun 2020 18:09:00 -0700 Subject: [PATCH 184/350] Added edit to route resources in orderitems --- app/views/orders/cart.html.erb | 2 +- config/routes.rb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/views/orders/cart.html.erb b/app/views/orders/cart.html.erb index b9284fc715..6bb92c0f25 100644 --- a/app/views/orders/cart.html.erb +++ b/app/views/orders/cart.html.erb @@ -22,7 +22,7 @@     diff --git a/config/routes.rb b/config/routes.rb index 0b37df9d8c..2619b224d9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,9 +6,8 @@ resources :orderitems, only: [:create] end - resources :orderitems, only: [:update, :destroy] + resources :orderitems, only: [:edit, :update, :destroy] patch 'orderitems/:id/mark_shipped', to: 'orderitems#mark_shipped', as: 'mark_shipped' - patch '/orderitems/:id', to: 'orderitems#update' resources :orders, only: [:new, :show, :edit, :update, :cancel] get '/orders/:id/cart', to: 'orders#cart', as: 'cart' From 5adfcaa6044a2cf6e4c329f9460b4891a493f676 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 16 Jun 2020 18:36:55 -0700 Subject: [PATCH 185/350] Updated picture size for edit orderitem --- app/assets/stylesheets/application.scss | 5 +++++ app/views/orderitems/edit.html.erb | 13 +++---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index f9b31696b2..390416b0a9 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -183,6 +183,11 @@ body { max-height: 20%; } +.product__img { + max-width: 60%; + max-height: 60%; +} + /* Auto Crop Photos */ .embed-responsive .card-img-top { diff --git a/app/views/orderitems/edit.html.erb b/app/views/orderitems/edit.html.erb index 554f41e446..b845619fed 100644 --- a/app/views/orderitems/edit.html.erb +++ b/app/views/orderitems/edit.html.erb @@ -1,13 +1,6 @@ -
    +

    Update Quantity

    - -
    -
    -
    -
    <%= image_tag "#{@orderitem.product.photo_url}", alt: "#{@orderitem.product.product_name}" %>
    -
    -
    - + <%= image_tag "#{@orderitem.product.photo_url}", alt: "#{@orderitem.product.product_name}", class: "embed-responsive embed-responsive-1by1 product__img"%>

    <%= @orderitem.product.product_name %>

    @@ -32,5 +25,5 @@
    - +
    \ No newline at end of file From c84475e9790dbc3b9ae8f9a44df55b082c023bb7 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 19:01:06 -0700 Subject: [PATCH 186/350] updated add new product button styling --- app/views/merchants/show.html.erb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/views/merchants/show.html.erb b/app/views/merchants/show.html.erb index cad5b122f4..697f7ab008 100644 --- a/app/views/merchants/show.html.erb +++ b/app/views/merchants/show.html.erb @@ -17,9 +17,8 @@
    -

    On Outdoorsy since: <%= @merchant.created_at.strftime("%B %d, %Y") %>

    -
    Contact: <%= @merchant.email %>
    - <%= button_to "Add New Product", new_product_path, method: :get, class: "btn btn-primary" %> +

    On Outdoorsy since: <%= @merchant.created_at.strftime("%B %d, %Y") %>


    + <%= button_to "Add New Product", new_product_path, method: :get, class: "product__new-button" %>
    From 07d236c58421b45fdf385c934e9a997973dd1532 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 19:01:17 -0700 Subject: [PATCH 187/350] new product form added --- app/views/products/_form.html.erb | 39 +++++++++++++++++++++++++++++++ app/views/products/new.html.erb | 8 ++++++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 app/views/products/_form.html.erb diff --git a/app/views/products/_form.html.erb b/app/views/products/_form.html.erb new file mode 100644 index 0000000000..5971bccccf --- /dev/null +++ b/app/views/products/_form.html.erb @@ -0,0 +1,39 @@ +<% if @product.errors.any? %> + +<% end %> + +<%= form_with model: @product, class: 'create-product' do |f| %> + +
    + <%= f.label :name, class: "hidden"%> + <%= f.text_field :name, placeholder: "Name", class: 'form-control'%> +
    + +
    + <%= f.label :price, class: "hidden"%> + <%= f.text_field :price, placeholder: "Price", class: 'form-control'%> +
    + +
    + <%= f.label :stock, class: "hidden"%> + <%= f.text_field :stock, placeholder: "Stock", class: 'form-control'%> +
    + +
    + <%= f.label :photo_url, class: "hidden"%> + <%= f.text_field :photo_url, placeholder: "Photo URL", class: 'form-control'%> +
    + +
    + <%= f.label :descirption, "Description", class: "hidden" %> + <%= f.text_area :description, placeholder: "Description", class: 'form-control' %> +
    + + <%= f.submit "Add new product", class: 'product__new-button'%> +<% end %> \ No newline at end of file diff --git a/app/views/products/new.html.erb b/app/views/products/new.html.erb index e096471ae1..1444b609f0 100644 --- a/app/views/products/new.html.erb +++ b/app/views/products/new.html.erb @@ -1 +1,7 @@ -

    New product form here

    \ No newline at end of file +
    +

    Add a new product

    + <%= render partial: "form" %> +
    + + + From 12e8ee665bec7583708234fc592c61643cd699e1 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 19:01:36 -0700 Subject: [PATCH 188/350] added product new buttons styling classes --- app/assets/stylesheets/application.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index f9b31696b2..f98a51ae85 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -207,7 +207,7 @@ body { color: #000000; } -.catalog__add-to-cart-button, .cart__checkout-button { +.catalog__add-to-cart-button, .cart__checkout-button, .product__new-button { background-color: #fff; color: #000000; padding: 5px; @@ -220,7 +220,7 @@ body { min-width: 25%; } -.catalog__add-to-cart-button:hover, .cart__checkout-button:hover { +.catalog__add-to-cart-button:hover, .cart__checkout-button:hover, .product__new-button:hover { background-color: #161616; color: #fff; } From f4b163dce157d42dae04754ae121cd4013d94566 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Tue, 16 Jun 2020 19:01:48 -0700 Subject: [PATCH 189/350] Fixed orderitems controller tests, yml typos, added quantity for enough_stock methods --- app/controllers/orderitems_controller.rb | 23 ++--- app/models/order.rb | 2 +- app/models/orderitem.rb | 11 ++- app/models/product.rb | 2 +- .../controllers/orderitems_controller_test.rb | 95 ++++++++++--------- test/fixtures/products.yml | 2 +- 6 files changed, 69 insertions(+), 66 deletions(-) diff --git a/app/controllers/orderitems_controller.rb b/app/controllers/orderitems_controller.rb index 6e399597c1..16b3d025d0 100644 --- a/app/controllers/orderitems_controller.rb +++ b/app/controllers/orderitems_controller.rb @@ -2,12 +2,12 @@ class OrderitemsController < ApplicationController before_action :find_orderitem, only: [:update, :destroy, :mark_shipped] def create - # Increase quantity of desired product @orderitem = Orderitem.find_by(order_id: session[:order_id], product_id: params[:product_id]) + # increment quantity if found if @orderitem @orderitem.quantity += params[:quantity].to_i else - # need to create new Orderitem + # create new Orderitem @orderitem = Orderitem.new( quantity: params[:quantity], product_id: params[:product_id], @@ -17,13 +17,13 @@ def create end if @orderitem.save - # push orderitem into current order + # add orderitem to current order @order.orderitems << @orderitem flash[:status] = :success - flash[:result_text] = "Added #{@orderitem.product.product_name} to cart!" + flash[:result_text] = "Added #{ @orderitem.product.product_name } to cart!" else flash[:status] = :failure - flash[:result_text] = "Error adding #{@orderitem.product.product_name} to cart." + flash[:result_text] = "Error adding #{ @orderitem.product.product_name } to cart." flash[:messages] = @orderitem.errors.messages end @@ -32,16 +32,16 @@ def create def update if @orderitem.order.status == "pending" - if @orderitem.update(quantity: params[:orderitem][:quantity]) + if @orderitem.update(quantity: params[:quantity]) flash[:status] = :success flash[:result_text] = "Update successful" - redirect_to cart_path + redirect_to cart_path(session[:order_id]) return else flash.now[:status] = :failure flash.now[:result_text] = "Error updating the item" flash.now[:messages] = @orderitem.errors.messages - redirect_to cart_path + redirect_to cart_path(session[:order_id]) return end else @@ -53,13 +53,10 @@ def update def destroy if @orderitem.order.status == "pending" - @orderitem.destroy + @orderitem.destroy! flash[:status] = :success flash[:result_text] = "#{@orderitem.product.product_name} was removed from your cart" - - # TODO: choose correct redirect - redirect_to cart_path - # redirect_to cart_path(order_id: session[:id]) + redirect_to cart_path(session[:order_id]) else flash[:status] = :failure flash[:result_text] = "Cannot delete items" diff --git a/app/models/order.rb b/app/models/order.rb index 1e1737acee..6995ec64b3 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -71,7 +71,7 @@ def clear_cart # order instance method or class method? def checkout self.orderitems.each do |orderitem| - if !orderitem.enough_stock + if !orderitem.enough_stock?(orderitem.quantity) puts "THERE WASNT ENOUGH STOCK FOR #{orderitem.product.product_name}" return false end diff --git a/app/models/orderitem.rb b/app/models/orderitem.rb index 7eaef298f3..6629a86488 100644 --- a/app/models/orderitem.rb +++ b/app/models/orderitem.rb @@ -6,8 +6,8 @@ class Orderitem < ApplicationRecord # when should we call shipped validation below? validates :shipped, inclusion: { in: [true, false], message: "shipped status : must be true or false" } - validate :in_stock, on: [:create, :update] - validate :not_retired, on: [:create, :update] + # validate :enough_stock, on: [:create, :update] + # validate :not_retired, on: [:create, :update] def subtotal subtotal = (self.quantity) * (self.product.price) @@ -22,10 +22,13 @@ def mark_item_shipped! private - def enough_stock - # correct syntax?? + # edited to return bools + def enough_stock?(quantity) if !self.product.enough_stock?(quantity) errors.add(:quantity, "order exceeds in-stock inventory") + return false + else + return true end end diff --git a/app/models/product.rb b/app/models/product.rb index 9b8c1dcfb4..3c7f6dfdf7 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -11,6 +11,6 @@ class Product < ApplicationRecord has_many :orders, through: :orderitems def enough_stock?(quantity) - return self.quantity >= quantity + return self.stock >= quantity end end diff --git a/test/controllers/orderitems_controller_test.rb b/test/controllers/orderitems_controller_test.rb index a33edf84cf..349da6fc37 100644 --- a/test/controllers/orderitems_controller_test.rb +++ b/test/controllers/orderitems_controller_test.rb @@ -5,60 +5,69 @@ let(:update_hash) { { - orderitem: { - quantity: 1 - } + quantity: 1 } } describe "create" do + + # Reasonable to check set_current_order here and one other place + it "creates an order automatically" do + post product_orderitems_path(products(:snow_pass).id), params: update_hash + + expect(session[:order_id]).wont_be_nil + expect(session[:order_id]).must_equal Order.last.id + end + it "can create a new orderitem with valid data" do before_count = Orderitem.count - post product_orderitems_path(product_id: products(:snow_pass).id), params: update_hash - - expect(Orderitem.count).must_equal before_count + 1 + + item_params = { + quantity: 3, + shipped: false + } + + post product_orderitems_path(products(:discover).id), params: item_params + expect(session[:order_id]).wont_be_nil + expect(Orderitem.count).must_equal before_count + 1 last_orderitem = Orderitem.last - - expect(last_orderitem.product).must_equal products(:snow_pass) + expect(last_orderitem.order.id).must_equal session[:order_id] expect(last_orderitem.order.orderitems.count).must_equal 1 + expect(last_orderitem.product).must_equal products(:discover) must_respond_with :redirect must_redirect_to cart_path(last_orderitem.order) end - it "can increment the quantity of existing orderitem" do - product_to_buy = products(:snow_pass) - + it "can increment the quantity of orderitem already in an order" do + before_count_orderitem = Orderitem.count + params = { - orderitem: { - quantity: 1, - shipped: false - } + quantity: 1, + shipped: false } - before_count_orderitem = Orderitem.count - before_count_order = Order.count - - post product_orderitems_path(product_id: products(:snow_pass).id), params: params - expect(Order.count).must_equal before_count_order + 1 - - post product_orderitems_path(product_id: products(:snow_pass).id), params: params - expect(Order.count).must_equal before_count_order + 1 + post product_orderitems_path(products(:snow_pass).id), params: params + + # does NOT create new orderitem if product already added to order + post product_orderitems_path(products(:snow_pass).id), params: params + post product_orderitems_path(products(:snow_pass).id), params: params expect(Orderitem.count).must_equal before_count_orderitem + 1 - expect(Orderitem.last.quantity).must_equal 2 + expect(Orderitem.last.quantity).must_equal 3 end + # THIS is the one failure case test for the controller: it "does something if the product is out of stock????" do # create product with 0 stock - # expect create post will return 400 + # expect create post will have correct error behavior # should not create orderitem (check same count) end end describe "update" do - it "succeeds for valid data and an extant orderitem ID" do + it "succeeds for valid data and an existing orderitem" do expect { patch orderitem_path(existing_orderitem), params: update_hash }.wont_change "Orderitem.count" @@ -67,14 +76,12 @@ expect(updated_item.quantity).must_equal 1 must_respond_with :redirect - must_redirect_to cart_path(order_id: session[:order_id]) + must_redirect_to cart_path(session[:order_id]) end - it "redirects to cart path without updating given bad data" do + it "redirects to cart path without updating when given bad data" do bogus_update_hash = { - orderitem: { - quantity: -1 - } + quantity: -1 } expect { @@ -82,22 +89,19 @@ }.wont_change "Orderitem.count" must_respond_with :redirect - must_redirect_to cart_path(order_id: session[:order_id]) + must_redirect_to cart_path(session[:order_id]) end - it "redirects to cart path without updating given valid data but not pending status" do - # DO WE NEED TO CHECK OTHER STATUSES AS WELL???? - update_hash = { - orderitem: { + it "fails to update when status is not pending, and redirects to root_path" do + before_quantity = existing_orderitem.quantity + existing_orderitem.order.update!(status: "complete") + + valid_params = { quantity: 1 - } } - existing_orderitem.order.update!(status: "complete") - before_quantity = existing_orderitem.quantity - expect { - patch orderitem_path(existing_orderitem), params: update_hash + patch orderitem_path(existing_orderitem), params: valid_params }.wont_change "Orderitem.count" expect(existing_orderitem.quantity).must_equal before_quantity @@ -118,19 +122,18 @@ it "deletes item for existing orderitem with pending status, and redirects" do before_count = Orderitem.count - delete orderitem_path(existing_orderitem) + delete orderitem_path(existing_orderitem.id) expect(Orderitem.count).must_equal before_count - 1 - must_redirect_to cart_path(order_id: session[:order_id]) + must_redirect_to cart_path(session[:order_id]) end - it "fails to delete existing orderitem without an order status of pending, and redirects" do - # DO WE NEED TO CHECK OTHER STATUSES AS WELL???? + it "fails to delete existing orderitem without pending order status, and redirects" do before_count = Orderitem.count existing_orderitem.order.status = "complete" existing_orderitem.order.save! - delete orderitem_path(existing_orderitem) + delete orderitem_path(existing_orderitem.id) expect(Orderitem.count).must_equal before_count must_redirect_to root_path diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml index b5b1bb064e..50c2172626 100644 --- a/test/fixtures/products.yml +++ b/test/fixtures/products.yml @@ -19,7 +19,7 @@ nature_valley: photo_url: stock: 8 retired: false -rainer: +rainier: product_name: Mount Rainer description: Volcano price: 5000 From 06e1387986eed0ce974bb59a418de94f23bb5bd7 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 19:19:27 -0700 Subject: [PATCH 190/350] added simplecov coverage to gitignore --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index fee4cdb8cd..a3d3f147bb 100644 --- a/.gitignore +++ b/.gitignore @@ -39,4 +39,6 @@ yarn-debug.log* # Ignore client id and secret .env -/coverage + +# Ignore simplecov coverage +coverage From 6f3565b59bdcd530e33a4fa930da216c9357fb70 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 19:19:45 -0700 Subject: [PATCH 191/350] added test to match flash error --- test/controllers/products_controller_test.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb index 7652dad8de..0a192bbbdc 100644 --- a/test/controllers/products_controller_test.rb +++ b/test/controllers/products_controller_test.rb @@ -35,6 +35,7 @@ it "responds with 404 with an invalid product id" do get "/products/#{@invalid_product_id}" + assert_equal 'Product has either been deleted, sold out, or not found.', flash[:error] must_respond_with :not_found end end From be5fd7e70f0eea6993597f28f7d96933c8442f80 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 19:20:45 -0700 Subject: [PATCH 192/350] gitignore coverage...again --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 811401913f..adfeac7ec3 100644 --- a/.gitignore +++ b/.gitignore @@ -38,4 +38,5 @@ yarn-debug.log* .DS_Store # Ignore client id and secret -.env \ No newline at end of file +.env +coverage \ No newline at end of file From de60407efa1a16bae02f6dc0c0bb9d6e7a2f7eb5 Mon Sep 17 00:00:00 2001 From: denisseai Date: Tue, 16 Jun 2020 19:31:29 -0700 Subject: [PATCH 193/350] Added some questions --- app/controllers/orders_controller.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index b68e16146e..4599965ecd 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -16,6 +16,9 @@ def cart end end +# methods are flipped update-submit proof viewcart hiy checkout check if enough stock if enough then show cc form +# if true then reduce stock if valid + #renders payment information form # enter payment details, find order_id from session def edit; end @@ -58,8 +61,11 @@ def show end # we call this method when user submits payment form + # only checking for stock how does the submit know about validations + #if order.valid? def submit result = @order.checkout + #this will never fail if result flash[:result_text] = "Order successfully paid!" redirect_to order_path(@order.id) From 4635e0f9290def08d0427daf551faa7fa57dfbc4 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Tue, 16 Jun 2020 21:25:00 -0700 Subject: [PATCH 194/350] Added errors to form edit view. --- app/views/orders/edit.html.erb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/views/orders/edit.html.erb b/app/views/orders/edit.html.erb index 47a97f0330..aecb9d93e8 100644 --- a/app/views/orders/edit.html.erb +++ b/app/views/orders/edit.html.erb @@ -1,6 +1,13 @@

    Checkout

    +
    <%= form_with model: @order do |f| %> From 0b9898820ef8c8bd5ccbf48836435d08ca2e1e9c Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Tue, 16 Jun 2020 21:26:26 -0700 Subject: [PATCH 195/350] Cleaned cart.html.erb and added get method to see updated quantities --- app/views/orders/cart.html.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/orders/cart.html.erb b/app/views/orders/cart.html.erb index 6bb92c0f25..332f770b94 100644 --- a/app/views/orders/cart.html.erb +++ b/app/views/orders/cart.html.erb @@ -17,13 +17,13 @@
    @@ -40,7 +40,7 @@

    TOTAL $<%= number_with_precision(@order.total, :precision => 2, :delimiter => ',') %>

    -

    <%= button_to 'Checkout', edit_order_path(id: @order.id), class:"cart__checkout-button" %>

    +

    <%= button_to 'Checkout', edit_order_path(@order.id), method: :get, class:"cart__checkout-button" %>

    From 3230d537c043ff423ce1ec155af2e7cd00ec7ca0 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Tue, 16 Jun 2020 21:29:30 -0700 Subject: [PATCH 196/350] Enough stock questions and validation experiments --- app/controllers/orderitems_controller.rb | 56 ++++++++++++----------- app/controllers/orders_controller.rb | 57 +++++++++++++++--------- app/models/orderitem.rb | 13 +++--- 3 files changed, 75 insertions(+), 51 deletions(-) diff --git a/app/controllers/orderitems_controller.rb b/app/controllers/orderitems_controller.rb index 3dd9284466..a62ec8876a 100644 --- a/app/controllers/orderitems_controller.rb +++ b/app/controllers/orderitems_controller.rb @@ -16,41 +16,47 @@ def create ) end - if @orderitem.save - # add orderitem to current order - @order.orderitems << @orderitem - flash[:status] = :success - flash[:result_text] = "Added #{ @orderitem.product.product_name } to cart!" + if @orderitem.enough_stock?(params[:quantity].to_i) && @orderitem.not_retired? + if @orderitem.save! + # add orderitem to current order + @order.orderitems << @orderitem + flash[:status] = :success + flash[:result_text] = "Added #{ @orderitem.product.product_name } to cart!" + redirect_to cart_path(id: session[:order_id]) + else + flash[:status] = :failure + flash[:result_text] = "Error adding #{ @orderitem.product.product_name } to cart." + flash[:messages] = @orderitem.errors.messages + end else flash[:status] = :failure - flash[:result_text] = "Error adding #{ @orderitem.product.product_name } to cart." - flash[:messages] = @orderitem.errors.messages + flash[:result_text] = "Error adding #{ @orderitem.product.product_name } to cart. Either retired or not enough items." end - - redirect_to cart_path(id: session[:order_id]) end def edit ; end def update - if @orderitem.order.status == "pending" - if @orderitem.update(quantity: params[:quantity]) - flash[:status] = :success - flash[:result_text] = "Update successful" - redirect_to cart_path(session[:order_id]) - return + # if @orderitem.enough_stock?(params[:quantity].to_i) && @orderitem.not_retired? + if @orderitem.order.status == "pending" + if @orderitem.update(quantity: params[:orderitem][:quantity]) + flash[:status] = :success + flash[:result_text] = "Update successful" + redirect_to cart_path(session[:order_id]) + return + else + flash.now[:status] = :failure + flash.now[:result_text] = "Error updating the item" + flash.now[:messages] = @orderitem.errors.messages + redirect_to cart_path(session[:order_id]) + return + end else - flash.now[:status] = :failure - flash.now[:result_text] = "Error updating the item" - flash.now[:messages] = @orderitem.errors.messages - redirect_to cart_path(session[:order_id]) - return + flash[:status] = :failure + flash[:result_text] = "Cannot update a #{@orderitem.order.status} order" + redirect_to root_path end - else - flash[:status] = :failure - flash[:result_text] = "Cannot update a #{@orderitem.order.status} order" - redirect_to root_path - end + # end end def destroy diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index 4599965ecd..9c268d99de 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -23,24 +23,38 @@ def cart # enter payment details, find order_id from session def edit; end - # this is called when user clicks the "checkout" button on cart page + # UPDATE should be called when user tries to submit payment (edit is new) def update - # all fields must be valid; validations run on save to db - need extra code for this? @order.orderitems.each do |orderitem| # check enough_stock from product model*** - if !orderitem.valid? + if orderitem.save! + # we update the order somehow + else flash[:status] = :failure - flash[:result_text] = "Some items in your cart are no longer available" - flash[:messages] = @orderitem.errors.messages - end - - if flash[:status] = :failure + flash[:result_text] = "heeyyyyyy y no validations" flash[:messages] = @order.errors.messages - return redirect_to cart_path + return end end + + result = @order.checkout + if result == true + flash[:result_text] = "Order successfully paid!" + redirect_to order_path(@order.id) + else + render :edit, status: :bad_request + flash[:status] = :failure + flash[:result_text] = "submit line 76 in orders_controller" + flash[:messages] = @order.errors.messages + end end + # flash[:status] = :failure + # flash[:result_text] = "Some items in your cart are no longer available" + # flash[:messages] = @orderitem.errors.messages + # end + + # Confirmation page for order : for all statuses ? def show if @order.id < 0 @@ -63,18 +77,19 @@ def show # we call this method when user submits payment form # only checking for stock how does the submit know about validations #if order.valid? - def submit - result = @order.checkout - #this will never fail - if result - flash[:result_text] = "Order successfully paid!" - redirect_to order_path(@order.id) - else - render :edit, status: :bad_request - flash[:status] = :failure - flash[:messages] = @order.errors.messages - end - end + # def submit + # result = @order.checkout + # #this will never fail + # if result + # flash[:result_text] = "Order successfully paid!" + # redirect_to order_path(@order.id) + # else + # render :edit, status: :bad_request + # flash[:status] = :failure + # flash[:result_text] = "submit line 76 in orders_controller" + # flash[:messages] = @order.errors.messages + # end + # end # need to add route for this to work def merchant_order diff --git a/app/models/orderitem.rb b/app/models/orderitem.rb index 6629a86488..5ab37d309e 100644 --- a/app/models/orderitem.rb +++ b/app/models/orderitem.rb @@ -6,8 +6,8 @@ class Orderitem < ApplicationRecord # when should we call shipped validation below? validates :shipped, inclusion: { in: [true, false], message: "shipped status : must be true or false" } - # validate :enough_stock, on: [:create, :update] - # validate :not_retired, on: [:create, :update] + validate :enough_stock, on: :update + validate :not_retired, on: :update def subtotal subtotal = (self.quantity) * (self.product.price) @@ -20,10 +20,10 @@ def mark_item_shipped! self.save! end - private + private # edited to return bools - def enough_stock?(quantity) + def enough_stock if !self.product.enough_stock?(quantity) errors.add(:quantity, "order exceeds in-stock inventory") return false @@ -32,9 +32,12 @@ def enough_stock?(quantity) end end - def not_retired + def not_retired? if product && product.retired errors.add(:product_id, "#{product.name} is no longer available") + return false + else + return true end end end From 0d903318a27e34f2c67271b8c07b3d6fbe5a7b6e Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 21:30:31 -0700 Subject: [PATCH 197/350] update quantity functional by adding nested params --- app/controllers/orderitems_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/orderitems_controller.rb b/app/controllers/orderitems_controller.rb index 3dd9284466..dd248af9fe 100644 --- a/app/controllers/orderitems_controller.rb +++ b/app/controllers/orderitems_controller.rb @@ -34,7 +34,7 @@ def edit ; end def update if @orderitem.order.status == "pending" - if @orderitem.update(quantity: params[:quantity]) + if @orderitem.update(quantity: params[:orderitem][:quantity]) flash[:status] = :success flash[:result_text] = "Update successful" redirect_to cart_path(session[:order_id]) From 4a8749cf40f4628e6327a1536a262f0a041e6397 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 22:14:55 -0700 Subject: [PATCH 198/350] removed showing categories of a product --- app/views/products/show.html.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index f54b4ddbb8..5dd967af05 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -6,7 +6,6 @@

    <%= @product.product_name %>

    RATING: ##/5 (# of reviews)

    Sold by: <%= link_to "MERCHANT MOTHER NATURE", root_path, class: "catalog__detail-header" %>

    -
    Categories: TODO-LOOP TO LIST CATEGORIES
    From 154a63b79acd6eb9b19afcba91de55eea3d71fdf Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 22:15:15 -0700 Subject: [PATCH 199/350] added hidden field to automatically add merchant_id and now have functioning form --- app/views/products/_form.html.erb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/views/products/_form.html.erb b/app/views/products/_form.html.erb index 5971bccccf..e07d989d4a 100644 --- a/app/views/products/_form.html.erb +++ b/app/views/products/_form.html.erb @@ -10,29 +10,31 @@ <%= form_with model: @product, class: 'create-product' do |f| %> -
    - <%= f.label :name, class: "hidden"%> - <%= f.text_field :name, placeholder: "Name", class: 'form-control'%> + <%= f.hidden_field :merchant_id, value: session[:merchant_id] %> + +
    + <%= f.label :product_name, class: "hidden"%> + <%= f.text_field :product_name, placeholder: "Product name", class: 'form-control'%>
    <%= f.label :price, class: "hidden"%> - <%= f.text_field :price, placeholder: "Price", class: 'form-control'%> + <%= f.text_field :price, placeholder: "Price", class: 'form-control', required: true%>
    <%= f.label :stock, class: "hidden"%> - <%= f.text_field :stock, placeholder: "Stock", class: 'form-control'%> + <%= f.text_field :stock, placeholder: "Stock", class: 'form-control', required: true%>
    <%= f.label :photo_url, class: "hidden"%> - <%= f.text_field :photo_url, placeholder: "Photo URL", class: 'form-control'%> + <%= f.text_field :photo_url, placeholder: "Photo URL", class: 'form-control', required: true%>
    <%= f.label :descirption, "Description", class: "hidden" %> - <%= f.text_area :description, placeholder: "Description", class: 'form-control' %> + <%= f.text_area :description, placeholder: "Description", class: 'form-control', required: true %>
    <%= f.submit "Add new product", class: 'product__new-button'%> From 56e4b4a97d2bec56906a8424c3be132574a50226 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 23:03:15 -0700 Subject: [PATCH 200/350] fixed form group width --- app/assets/stylesheets/application.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 77b6172f1a..f6f15d8b73 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -298,4 +298,11 @@ body { min-height: 100%; display: grid; grid-template-rows: auto 1fr auto; +} + +// Forms + +.form-group { + width: 50%; + height: max-content; } \ No newline at end of file From 2e75777cf1bf2fe48587f4c8d9f90cf10b434a56 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 23:03:27 -0700 Subject: [PATCH 201/350] redirect to product path after a new product is made --- app/controllers/products_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index b0b0d39984..bc4eec3bd7 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -31,7 +31,7 @@ def create @product = Product.create(product_params) if @product.id? flash[:success] = "#{@product.product_name} successfully added." - redirect_to root_path + redirect_to product_path(@product.id) else render :new end @@ -67,6 +67,6 @@ def find_product end def product_params - return params.require(:product).permit(:product_name, :price, :description, :photo_url, :stock, :merchant_id) + return params.require(:product).permit(:product_name, :price, :description, :photo_url, :stock, :merchant_id, category_ids: []) end end From b06cae49bc434b9e2dc2413b3a7bc12d79a6a3b3 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 23:03:41 -0700 Subject: [PATCH 202/350] added place holders and ability to select categories --- app/views/products/_form.html.erb | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/app/views/products/_form.html.erb b/app/views/products/_form.html.erb index e07d989d4a..bb48ac6125 100644 --- a/app/views/products/_form.html.erb +++ b/app/views/products/_form.html.erb @@ -14,27 +14,35 @@
    <%= f.label :product_name, class: "hidden"%> - <%= f.text_field :product_name, placeholder: "Product name", class: 'form-control'%> + <%= f.text_field :product_name, placeholder: "E.g. Mount Fuji", class: 'form-control'%>
    <%= f.label :price, class: "hidden"%> - <%= f.text_field :price, placeholder: "Price", class: 'form-control', required: true%> + <%= f.text_field :price, placeholder: "E.g. 10000000.99", class: 'form-control', required: true%>
    <%= f.label :stock, class: "hidden"%> - <%= f.text_field :stock, placeholder: "Stock", class: 'form-control', required: true%> + <%= f.text_field :stock, placeholder: "E.g. 20", class: 'form-control', required: true%>
    <%= f.label :photo_url, class: "hidden"%> - <%= f.text_field :photo_url, placeholder: "Photo URL", class: 'form-control', required: true%> + <%= f.text_field :photo_url, placeholder: "www.somewebsite.com/better-have-image-rights.png", class: 'form-control', required: true%>
    <%= f.label :descirption, "Description", class: "hidden" %> - <%= f.text_area :description, placeholder: "Description", class: 'form-control', required: true %> + <%= f.text_area :description, placeholder: "E.g. Air plant taiyaki tumblr williamsburg vegan mustache venmo man bun. Portland affogato bushwick, forage truffaut cold-pressed you probably haven't heard of them whatever. Subway tile echo park retro poutine church-key prism crucifix. Actually letterpress meditation fashion axe salvia. Schlitz man bun trust fund intelligentsia artisan, tattooed meggings skateboard echo park yr next level try-hard.", class: 'form-control', required: true %> +
    + +
    + + <%= f.label :categories %> + <%= collection_check_boxes(:product, :category_ids, + Category.all, :id, :category_name) %> +
    <%= f.submit "Add new product", class: 'product__new-button'%> From 14e858dec3c43d0fd45af7c0b8087dd67cb5ce71 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 23:03:54 -0700 Subject: [PATCH 203/350] styled header for new product page --- app/views/products/new.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/products/new.html.erb b/app/views/products/new.html.erb index 1444b609f0..f4102df623 100644 --- a/app/views/products/new.html.erb +++ b/app/views/products/new.html.erb @@ -1,5 +1,6 @@
    -

    Add a new product

    +

    Add a new product

    +
    <%= render partial: "form" %>
    From 6b3a4286104b7c44bf7e8ba7a961bd5861511762 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 23:04:12 -0700 Subject: [PATCH 204/350] display categories of a product on product detail page --- app/views/products/show.html.erb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 5dd967af05..f874c41f92 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -6,6 +6,11 @@

    <%= @product.product_name %>

    RATING: ##/5 (# of reviews)

    Sold by: <%= link_to "MERCHANT MOTHER NATURE", root_path, class: "catalog__detail-header" %>

    +
    Categories: + <% @product.categories.each do |category| %> + <%= category.category_name %> | + <% end %> +
    From d39dd7721c05ec3ddcfe68846d11f68919e09bd3 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 23:45:13 -0700 Subject: [PATCH 205/350] fixed footer spacing when no products in system --- app/views/products/index.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index d3d65b310b..5aee7fdb4e 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -34,9 +34,9 @@ <% end %>
    - - <% else %>

    No products in the system!

    <% end %> + + From 44e7fb7c87f2cc5ead53b80713252e202f66e601 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 23:45:52 -0700 Subject: [PATCH 206/350] added new category button --- app/views/merchants/show.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/merchants/show.html.erb b/app/views/merchants/show.html.erb index 697f7ab008..bca30d836d 100644 --- a/app/views/merchants/show.html.erb +++ b/app/views/merchants/show.html.erb @@ -18,7 +18,8 @@

    On Outdoorsy since: <%= @merchant.created_at.strftime("%B %d, %Y") %>


    - <%= button_to "Add New Product", new_product_path, method: :get, class: "product__new-button" %> + <%= button_to "Add New Product", new_product_path, method: :get, class: "product__new-button" %>
    + <%= button_to "Add New Category", new_category_path, method: :get, class: "product__new-button" %>
    From 341b9e7358d48ac4929defc52f026cadf3a6728b Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 23:46:21 -0700 Subject: [PATCH 207/350] added create category functionality only allowed when logged in --- app/controllers/categories_controller.rb | 23 +++++++++-------------- app/views/categories/new.html.erb | 23 +++++++++++++++++++++++ 2 files changed, 32 insertions(+), 14 deletions(-) create mode 100644 app/views/categories/new.html.erb diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb index 1cecc6f514..4dea8a41a8 100644 --- a/app/controllers/categories_controller.rb +++ b/app/controllers/categories_controller.rb @@ -1,27 +1,22 @@ class CategoriesController < ApplicationController - - def index - @categories = Category.all - end + before_action :require_login, only: [:new] def new @category = Category.new end def create - @category = Category.new(category_params) - if @category.save - # flash[:status] = :success - # flash[:result_text] = "Successfully created #{@media_category.singularize} #{@work.id}" - # redirect_to root + @category = Category.create(category_params) + if @category.id? + flash[:success] = "Successfully added the #{@category.category_name} category" + redirect_to merchant_path(session[:merchant_id]) else - flash[:status] = :failure flash[:result_text] = "Could not create category" - # flash[:messages] = @category.errors.messages - # render :new, status: :bad_request end end - def show - end + + def category_params + params.require(:category).permit(:category_name) +end end diff --git a/app/views/categories/new.html.erb b/app/views/categories/new.html.erb new file mode 100644 index 0000000000..4b6e3cf2d3 --- /dev/null +++ b/app/views/categories/new.html.erb @@ -0,0 +1,23 @@ +
    +

    Add a new category

    +
    + <% if @category.errors.any? %> + + <% end %> + + <%= form_with model: @category, class: 'create-category' do |f| %> + +
    + <%= f.label :category_name %> + <%= f.text_field :category_name, placeholder: "E.g. desert", class: 'form-control', required: true%> +
    + + <%= f.submit "Add new category", class: 'product__new-button'%> + <% end %> +
    From c817454c5245713a11b941af255c147577203d89 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Tue, 16 Jun 2020 23:46:30 -0700 Subject: [PATCH 208/350] removed unnecessary routes --- config/routes.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 2619b224d9..9fc15b057a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ Rails.application.routes.draw do root to: 'pages#index' - resources :pages, only: :index + resources :pages, only: [:index] resources :products, except: [:destroy] do resources :orderitems, only: [:create] @@ -21,5 +21,5 @@ get '/orders/:id/merchant_order', to: 'orders#merchant_order', as: 'merchant_order' resources :reviews, only: [:new, :create] - resources :categories, only: [:new, :create, :show, :index] + resources :categories, only: [:new, :create] end From 4c682151d4e7eb8b366aaabfec478e500bcd0c61 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 00:03:14 -0700 Subject: [PATCH 209/350] simple styling for list of categories for add new product --- app/views/products/_form.html.erb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/views/products/_form.html.erb b/app/views/products/_form.html.erb index bb48ac6125..5014105786 100644 --- a/app/views/products/_form.html.erb +++ b/app/views/products/_form.html.erb @@ -38,11 +38,12 @@
    - - <%= f.label :categories %> - <%= collection_check_boxes(:product, :category_ids, - Category.all, :id, :category_name) %> - + <%= f.label :categories %>
    + <%= collection_check_boxes(:product, :category_ids, Category.all, :id, :category_name) do |b| %> + <%= b.label class:"custom-control custom-checkbox" do%> + <%=b.check_box + b.text%> + <%end%> + <% end %>
    <%= f.submit "Add new product", class: 'product__new-button'%> From dffd82522645d87eef948d70963cbfffdf56cc1b Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 01:10:06 -0700 Subject: [PATCH 210/350] added custom route to retire a product --- config/routes.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/routes.rb b/config/routes.rb index 9fc15b057a..e8a2bf4023 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,6 +4,7 @@ resources :products, except: [:destroy] do resources :orderitems, only: [:create] + patch :retired, on: :member #products/1/retired end resources :orderitems, only: [:edit, :update, :destroy] From 3f47320ab542fafc95b1ba148567058a78fa5f2b Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 01:10:33 -0700 Subject: [PATCH 211/350] added products#retire controller action --- app/controllers/products_controller.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index bc4eec3bd7..596dc5ffc4 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -1,5 +1,5 @@ class ProductsController < ApplicationController - before_action :find_product, only: [:show, :update, :edit, :destroy] + before_action :find_product, only: [:show, :update, :edit, :destroy, :retired] before_action :require_login, only: [:new] def index @@ -60,6 +60,13 @@ def edit end end + def retired + if @product.retire! + flash[:success] = "#{@product.product_name} successfully retired!" + redirect_to merchant_path(session[:merchant_id]) #or wherever you want to redirect to + end + end + private def find_product # TODO: need to add case for when product cannot be found, to DRY up code From 3cc09a45e9a578e1d87145ea69e30ca65d591fdc Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 01:10:44 -0700 Subject: [PATCH 212/350] model method to retire a product --- app/models/product.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/models/product.rb b/app/models/product.rb index 3c7f6dfdf7..7ec310e24f 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -13,4 +13,9 @@ class Product < ApplicationRecord def enough_stock?(quantity) return self.stock >= quantity end + + def retire! + self.update_attribute(:retired, true) + end + end From 35adcbc2751359741aff4ed4f3827cb410724ce1 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 01:11:15 -0700 Subject: [PATCH 213/350] only merchant of their own products can retire an item --- app/views/merchants/show.html.erb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/views/merchants/show.html.erb b/app/views/merchants/show.html.erb index bca30d836d..cc880adf5d 100644 --- a/app/views/merchants/show.html.erb +++ b/app/views/merchants/show.html.erb @@ -44,12 +44,14 @@
    <%= button_to product.product_name, product_path(product.id), method: :get, class: "catalog__card-title-button text-left"%>
    - $<%= product.price%> + $<%= number_with_precision(product.price, :precision => 2, :delimiter => ',') %>
    Rating: ##/5 (# of reviews) -
    - +
    + <% if product.merchant_id == session[:merchant_id] %> + <%= link_to "Retire Product", retired_product_path(product), method: :patch, data: {confirm: "Are you sure you want to retire #{product.product_name}?"}, class: "product__new-button" %> + <% end %> From 837de29ddbd02b33a11bc0702b27e1e65aba50e5 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 01:11:32 -0700 Subject: [PATCH 214/350] remove product from browsing if retired --- app/views/products/index.html.erb | 34 ++++++++++++++++--------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index 5aee7fdb4e..4063f325ee 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -11,26 +11,28 @@
    <% @products.each do |product| %> -
    -
    -
    - alt=<%= product.product_name%>> -
    + <% if !product.retired %> +
    +
    +
    + alt=<%= product.product_name%>> +
    -
    -
    -
    <%= button_to product.product_name, product_path(product.id), method: :get, class: "catalog__card-title-button text-left"%>
    -
    -
    - $<%= number_with_precision(product.price, :precision => 2, :delimiter => ',')%> -
    -
    - Rating: ##/5 (# of reviews) -
    +
    +
    +
    <%= button_to product.product_name, product_path(product.id), method: :get, class: "catalog__card-title-button text-left"%>
    +
    +
    + $<%= number_with_precision(product.price, :precision => 2, :delimiter => ',')%> +
    +
    + Rating: ##/5 (# of reviews) +
    +
    -
    + <% end %> <% end %>
    From df7ecbac4f18e16897e87ef90486336e53fc260f Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 01:11:58 -0700 Subject: [PATCH 215/350] remove product from browsing if a product is retired --- app/views/products/show.html.erb | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index f874c41f92..49d007697c 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -1,4 +1,5 @@
    +<% if !@product.retired %> <%# Product Description Header %>
    <%= link_to "< HOME", root_path, class: "local-navigation" %>
    @@ -17,6 +18,9 @@ <%# Product Picture and Description %> + + +
    @@ -37,8 +41,12 @@ <%= f.label :quantity %> <%= f.select :quantity, options_for_select(1..@product.stock), {}, {class: "form-control"} %>
    - - <%= f.submit "Add to Cart", class: "catalog__add-to-cart-button"%> + <% if @product.retired %> +
    +

    This product is retired, unable to purchase.

    + <% else %> + <%= f.submit "Add to Cart", class: "catalog__add-to-cart-button"%> + <% end %> <% end %>
    @@ -55,4 +63,5 @@ <% end %>
    +<% end %>
    \ No newline at end of file From 8e148a7c82ee8a67a14d057a76a104261339755f Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 01:23:44 -0700 Subject: [PATCH 216/350] allow add new product and category only upon login --- app/views/merchants/show.html.erb | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app/views/merchants/show.html.erb b/app/views/merchants/show.html.erb index cc880adf5d..ed41939ffd 100644 --- a/app/views/merchants/show.html.erb +++ b/app/views/merchants/show.html.erb @@ -18,8 +18,10 @@

    On Outdoorsy since: <%= @merchant.created_at.strftime("%B %d, %Y") %>


    - <%= button_to "Add New Product", new_product_path, method: :get, class: "product__new-button" %>
    - <%= button_to "Add New Category", new_category_path, method: :get, class: "product__new-button" %> + <% if @current_user %> + <%= button_to "Add New Product", new_product_path, method: :get, class: "product__new-button" %>
    + <%= button_to "Add New Category", new_category_path, method: :get, class: "product__new-button" %> + <% end %>
    @@ -37,6 +39,9 @@
    alt=<%= product.product_name%>> + <% if product.retired %> +

    RETIRED

    + <% end %>
    @@ -50,7 +55,9 @@ Rating: ##/5 (# of reviews)

    <% if product.merchant_id == session[:merchant_id] %> - <%= link_to "Retire Product", retired_product_path(product), method: :patch, data: {confirm: "Are you sure you want to retire #{product.product_name}?"}, class: "product__new-button" %> + <% if !product.retired %> + <%= link_to "Retire Product", retired_product_path(product), method: :patch, data: {confirm: "Are you sure you want to retire #{product.product_name}?"}, class: "product__new-button" %> + <% end %> <% end %>
    From 5b365f389d447589a8a962ef4a8533930ff54579 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 09:07:27 -0700 Subject: [PATCH 217/350] added merchant link to product detail page --- app/views/products/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 49d007697c..2c2795f6b0 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -6,7 +6,7 @@
    <%= link_to "< ALL PRODUCTS", products_path, class: "local-navigation" %>

    <%= @product.product_name %>

    RATING: ##/5 (# of reviews)

    -

    Sold by: <%= link_to "MERCHANT MOTHER NATURE", root_path, class: "catalog__detail-header" %>

    +

    Sold by: <%= link_to @product.merchant.username, merchant_path(@product.merchant), class: "catalog__detail-header" %>

    Categories: <% @product.categories.each do |category| %> <%= category.category_name %> | From b1ca8803b5d61883051e0a1304a2e94eb7a7aebc Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 09:07:53 -0700 Subject: [PATCH 218/350] can only see add new product and category on user dashboard page not on other users --- app/views/merchants/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/merchants/show.html.erb b/app/views/merchants/show.html.erb index ed41939ffd..f6d9c3c9e1 100644 --- a/app/views/merchants/show.html.erb +++ b/app/views/merchants/show.html.erb @@ -18,7 +18,7 @@

    On Outdoorsy since: <%= @merchant.created_at.strftime("%B %d, %Y") %>


    - <% if @current_user %> + <% if @merchant.id == session[:merchant_id] %> <%= button_to "Add New Product", new_product_path, method: :get, class: "product__new-button" %>
    <%= button_to "Add New Category", new_category_path, method: :get, class: "product__new-button" %> <% end %> From f9f7948de512bdf28f6a7872e370ef7e48918d0e Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 09:08:04 -0700 Subject: [PATCH 219/350] styling for when a product is retired --- app/assets/stylesheets/application.scss | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index f6f15d8b73..4fdc5395f1 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -63,7 +63,7 @@ header { filter: brightness(75%); } -.browse-by-category__link { +.browse-by-category__link, .retired-product { text-transform: uppercase; text-align: center; font-weight: 300; @@ -150,7 +150,6 @@ body { color: rgb(206, 206, 206); } - .catalog__description-text, .catalog__review-text { font-weight: 300; font-size: 18px; @@ -305,4 +304,4 @@ body { .form-group { width: 50%; height: max-content; -} \ No newline at end of file +} From 2b15f8047a1ae7269e0e5611022abce515a6db1c Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 09:08:17 -0700 Subject: [PATCH 220/350] require login to edit a product --- app/controllers/products_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 596dc5ffc4..75a4a16be4 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -1,6 +1,6 @@ class ProductsController < ApplicationController before_action :find_product, only: [:show, :update, :edit, :destroy, :retired] - before_action :require_login, only: [:new] + before_action :require_login, only: [:new, :edit] def index if params[:category_name] From e0313224e8350b0bae94ee73ac09c448e43d8a38 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 09:36:51 -0700 Subject: [PATCH 221/350] fixed typo --- app/views/products/_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/products/_form.html.erb b/app/views/products/_form.html.erb index 5014105786..c7149ebb2c 100644 --- a/app/views/products/_form.html.erb +++ b/app/views/products/_form.html.erb @@ -33,7 +33,7 @@
    - <%= f.label :descirption, "Description", class: "hidden" %> + <%= f.label :description, "Description", class: "hidden" %> <%= f.text_area :description, placeholder: "E.g. Air plant taiyaki tumblr williamsburg vegan mustache venmo man bun. Portland affogato bushwick, forage truffaut cold-pressed you probably haven't heard of them whatever. Subway tile echo park retro poutine church-key prism crucifix. Actually letterpress meditation fashion axe salvia. Schlitz man bun trust fund intelligentsia artisan, tattooed meggings skateboard echo park yr next level try-hard.", class: 'form-control', required: true %>
    From 0fb501638e6e2280ed464bcd17e0ecf8d0b3d1d3 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Wed, 17 Jun 2020 09:41:39 -0700 Subject: [PATCH 222/350] working on getting tests to pass --- app/models/merchant.rb | 28 ++++++++++++---------- test/models/merchant_test.rb | 46 ++++++++++++++++++------------------ 2 files changed, 38 insertions(+), 36 deletions(-) diff --git a/app/models/merchant.rb b/app/models/merchant.rb index 049b75a83e..0f9700ffbd 100644 --- a/app/models/merchant.rb +++ b/app/models/merchant.rb @@ -15,26 +15,28 @@ def self.build_from_github(auth_hash) end def total_revenue - total_rev = 0 - self.products.each do |product| - product.orderitems.each do |item| - total += item.subtotal + total_revenue = 0 + + self.order_items.each do |order_item| + if order_item.order.cart_status == "paid" + total_revenue += order_item.total end end - return total_rev + + return total_revenue end # double check on edge cases i.e. nil or pending order - def total_revenue_by_status(status) - total_rev_status = 0 - self.products.each do |product| - product.orderitems.each do |item| - if item.order.status == status - total += item.subtotal - end + def revenue_by_status(status) + total_revenue = 0 + + self.order_items.each do |order_item| + if order_item.order.cart_status == status + total_revenue += order_item.total end end - return total_rev_status + + return total_revenue end end diff --git a/test/models/merchant_test.rb b/test/models/merchant_test.rb index 448e9e835f..3c02b52574 100644 --- a/test/models/merchant_test.rb +++ b/test/models/merchant_test.rb @@ -1,21 +1,13 @@ require "test_helper" describe Merchant do - let (:merchant) {merchant(:canoeing_chris)} + # let (:merchant) {merchant(:canoeing_chris)} describe "validations" do - it "is valid with all fields present and valid" do expect(merchant.valid?).must_equal true end - it 'is invalid without an email address' do - merchant.email = nil - - expect(merchant.valid?).must_equal false - expect(merchant.errors.messages).must_include :email - end - it 'is invalid without a unique email address' do invalid_merchant = Merchant.create(username: "new merchant", email: " ") @@ -30,13 +22,21 @@ product.must_be_kind_of Product end end - - it "can have one or more order items through products" do - merchant.must_respond_to :order_items - merchant.order_items.each do |order_item| - order_item.must_be_kind_of OrderItem - end - end + end + end + + describe "build_from_github" do + it "returns a merchant" do + auth_hash = OmniAuth::AuthHash.new(mock_auth_hash(merchants(:ubeninja77))) + + merchant = Merchant.build_from_github(auth_hash) + + merchant.must_be_kind_of Merchant + expect(merchant.uid).must_equal auth_hash[:uid] + expect(merchant.provider).must_equal "github" + expect(merchant.email).must_equal auth_hash["info"]["email"] + expect(merchant.nickname).must_equal auth_hash["info"]["nickname"] + expect(merchant.name).must_equal auth_hash["info"]["name"] end end @@ -47,22 +47,22 @@ expect(merchant(:canoeing_chris).total_revenue).must_equal 11.11 end - it "returns 0 if the merchant has made no sales" do - expect(merchant(:canoeing_chris).total_revenue).must_equal 0 + it "returns 0 if the merchant has no revenue" do + expect(merchant(:fishin_fiona).total_revenue).must_equal 0 end end describe "revenue_by_status" do it "calculates the total revenue by status passed in" do - # verif the must_equal to the two following + # veriyf the must_equal to the two following expect(merchant(:trailin_trinity).total_revenue_by_status("paid")).must_equal 11.15 expect(merchant(:fishin_fiona).total_revenue_by_status("pending")).must_equal 831.06 end - it "will return 0 for a non-existing status" do - # verify the n/a message - expect(merchant(:canoeing_chris).total_revenue_by_status("n/a")).must_equal 0.0 - end + # it "will return 0 for a non-existing status" do + # # verify the n/a message + # expect(merchant(:canoeing_chris).total_revenue_by_status("n/a")).must_equal 0.0 + # end end end end From 16917b4072a27788ac0808a47e4c9bc26908b0cf Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 17 Jun 2020 09:43:15 -0700 Subject: [PATCH 223/350] Progress on validations. --- app/controllers/orders_controller.rb | 3 ++- app/models/order.rb | 36 +++++++++++++++------------- app/models/orderitem.rb | 10 ++++---- 3 files changed, 27 insertions(+), 22 deletions(-) diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index 9c268d99de..35c4026c4b 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -63,12 +63,13 @@ def show if @order.status == "pending" flash[:status] = :failure - flash[:result_text] = "Your order is being process" + flash[:result_text] = "Your order is being processed" flash[:messages] = @order.errors.messages redirect_to root_path return elsif @order.status == "paid" flash[:status] = :success + flash[:result_text] = "Your order was paid!!!!!" # maybe add result text, maybe not? redirect_to order_path(@order.id) end diff --git a/app/models/order.rb b/app/models/order.rb index 6995ec64b3..97949a5980 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -13,12 +13,12 @@ class Order < ApplicationRecord validates :orderitems, length: { minimum: 1, message: "Your cart is empty" }, on: :update validates :email, presence: true, on: :update - validates :address, presence: true, on: :update - validates :cc_name, presence: true, on: :update - validates :cc_num, presence: true, numericality: { only_integer: true }, length: { minimum: 4 }, on: :update - validates :cvv, presence: true, numericality: { only_integer: true }, on: :update - validates :cc_exp, presence: true, on: :update - validates :zip, presence: true, numericality: { only_integer: true }, on: :update + # validates :address, presence: true, on: :update + # validates :cc_name, presence: true, on: :update + # validates :cc_num, presence: true, numericality: { only_integer: true }, length: { minimum: 4 }, on: :update + # validates :cvv, presence: true, numericality: { only_integer: true }, on: :update + # validates :cc_exp, presence: true, on: :update + # validates :zip, presence: true, numericality: { only_integer: true }, on: :update # custom methods def reduce_stock @@ -60,8 +60,11 @@ def mark_as_complete! def change_to_paid! # change order status to paid self.status = "paid" - self.save! - # need else statement? + if !self.save + # warn the user + return false + end + return true end def clear_cart @@ -70,20 +73,21 @@ def clear_cart # order instance method or class method? def checkout - self.orderitems.each do |orderitem| - if !orderitem.enough_stock?(orderitem.quantity) - puts "THERE WASNT ENOUGH STOCK FOR #{orderitem.product.product_name}" - return false - end - end + # self.orderitems.each do |orderitem| + # if !orderitem.enough_stock?(orderitem.quantity) + # puts "THERE WASNT ENOUGH STOCK FOR #{orderitem.product.product_name}" + # return false + # end + # end - self.reduce_stock result = self.change_to_paid! + if !result - puts "CHANGE TO PAID DID NOT WORK" return false end + self.reduce_stock + # clear cart self.clear_cart end diff --git a/app/models/orderitem.rb b/app/models/orderitem.rb index 5ab37d309e..95b735fb05 100644 --- a/app/models/orderitem.rb +++ b/app/models/orderitem.rb @@ -6,8 +6,8 @@ class Orderitem < ApplicationRecord # when should we call shipped validation below? validates :shipped, inclusion: { in: [true, false], message: "shipped status : must be true or false" } - validate :enough_stock, on: :update - validate :not_retired, on: :update + validate :enough_stock?, on: :update + validate :not_retired?, on: :update def subtotal subtotal = (self.quantity) * (self.product.price) @@ -20,12 +20,12 @@ def mark_item_shipped! self.save! end - - private + # private # edited to return bools - def enough_stock + def enough_stock? if !self.product.enough_stock?(quantity) errors.add(:quantity, "order exceeds in-stock inventory") + errors.add(:quantity, "#{quantity}") return false else return true From 87aa53b1a34e550a83043116039377acce81997e Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 10:50:06 -0700 Subject: [PATCH 224/350] added review this product button --- app/views/products/show.html.erb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 2c2795f6b0..77c498904d 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -5,7 +5,7 @@
    <%= link_to "< HOME", root_path, class: "local-navigation" %>
    <%= link_to "< ALL PRODUCTS", products_path, class: "local-navigation" %>

    <%= @product.product_name %>

    -

    RATING: ##/5 (# of reviews)

    +

    RATING: ##/5 (<%= @product.reviews.count %> review(s))

    Sold by: <%= link_to @product.merchant.username, merchant_path(@product.merchant), class: "catalog__detail-header" %>

    Categories: <% @product.categories.each do |category| %> @@ -56,8 +56,16 @@

    Reviews

    + <%# Yo! if you want to pass up params don't use that button_to, plz use link_to %> + <%= link_to "Review this product", new_review_path(product_id: @product.id), method: :get, class: "catalog__add-to-cart-button" %>

    <% if !@product.reviews.empty? %> -
    Reviews exist you just haven't put a loop to place the reviews here
    + <% @product.reviews.each do |review| %> + <%= review.created_at.strftime("%B %d, %Y") %> +

    Rating: <%= review.rating %>

    +
    +

    <%= review.content %>

    +
    + <% end %> <% else %>
    No reviews yet
    <% end %> From 04ae496850a252f9433c3e42e674252363b4baca Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 10:56:06 -0700 Subject: [PATCH 225/350] added review#new and review#create to create reviews --- app/controllers/reviews_controller.rb | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/app/controllers/reviews_controller.rb b/app/controllers/reviews_controller.rb index cc457a24e8..b64d16ac18 100644 --- a/app/controllers/reviews_controller.rb +++ b/app/controllers/reviews_controller.rb @@ -1,35 +1,24 @@ class ReviewsController < ApplicationController - def new @review = Review.new + @product_id = params[:product_id] end def create - # should we check for merchant_id in this action, or take care of in review validations?? - # rescue ActionController::ParameterMissing - # redirect_to new_review_path - - if params[:product_id].nil? - # correct behavior? - redirect_to root_path, notice: 'Review unable to be created' - return - end + @review = Review.create(review_params) - @review = Review.new(review_params) - @review.product_id = params[:product_id] - if @review.save - flash[:success] = "Review added successfully" - redirect_to product_path(params[:product_id]) + flash[:success] = "Review successfully added." + redirect_to product_path(@review.product_id) + # TODO: Render status codes else - # different path??? - redirect_to root_path, notice: 'Problem: Review was not made.' + render :new, status: :bad_request end end private def review_params - return params.require(:review).permit(:content, :rating) + return params.require(:review).permit(:content, :rating, :product_id) end end From e129c670bf30005cdfdb749634ddcda72e38f9f0 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 10:57:02 -0700 Subject: [PATCH 226/350] review only if not merchant of product, also added review display on product detail page --- app/views/products/show.html.erb | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 77c498904d..218fc13a01 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -56,19 +56,22 @@

    Reviews

    - <%# Yo! if you want to pass up params don't use that button_to, plz use link_to %> - <%= link_to "Review this product", new_review_path(product_id: @product.id), method: :get, class: "catalog__add-to-cart-button" %>

    - <% if !@product.reviews.empty? %> - <% @product.reviews.each do |review| %> - <%= review.created_at.strftime("%B %d, %Y") %> -

    Rating: <%= review.rating %>

    -
    -

    <%= review.content %>

    -
    - <% end %> - <% else %> -
    No reviews yet
    + + <% if @product.merchant_id != session[:merchant_id] %> + <%= link_to "Review this product", new_review_path(product_id: @product.id), method: :get, class: "catalog__add-to-cart-button" %>

    <% end %> + <% if !@product.reviews.empty? %> + <% @product.reviews.each do |review| %> + <%= review.created_at.strftime("%B %d, %Y") %> +

    Rating: <%= review.rating %>

    +
    +

    <%= review.content %>

    +
    + <% end %> + <% else %> +
    No reviews yet
    + <% end %> +
    <% end %> From 15366d80e0e21aee8e1d57c7e05a487b9a32e36e Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 10:57:24 -0700 Subject: [PATCH 227/350] new review for product form --- app/views/reviews/new.html.erb | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 app/views/reviews/new.html.erb diff --git a/app/views/reviews/new.html.erb b/app/views/reviews/new.html.erb new file mode 100644 index 0000000000..0e0ebafaef --- /dev/null +++ b/app/views/reviews/new.html.erb @@ -0,0 +1,29 @@ +
    +

    Add a new review

    +
    + <% if @review.errors.any? %> + + <% end %> + + <%= form_with model: @review, class: 'create-category' do |f| %> + <%= f.hidden_field :product_id, value: @product_id %> + +
    + <%= f.label :rating %> + <%= f.select :rating, [1, 2, 3, 4, 5], {}, {class: "form-control"}%> +
    + +
    + <%= f.label :content %> + <%= f.text_area :content, placeholder: "E.g. I love using my tech money to own pieces of nature. Thanks Outdoorsy!", class: 'form-control', required: true%> +
    + + <%= f.submit "Add review", class: 'product__new-button'%> + <% end %> +
    From f394f29a845248a76d243db0790acb3a00683acb Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 11:04:28 -0700 Subject: [PATCH 228/350] updated review count display --- app/views/products/show.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 218fc13a01..078d277f80 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -5,7 +5,8 @@
    <%= link_to "< HOME", root_path, class: "local-navigation" %>
    <%= link_to "< ALL PRODUCTS", products_path, class: "local-navigation" %>

    <%= @product.product_name %>

    -

    RATING: ##/5 (<%= @product.reviews.count %> review(s))

    +

    RATING: ##/5

    +

    Reviews: <%= @product.reviews.count %>

    Sold by: <%= link_to @product.merchant.username, merchant_path(@product.merchant), class: "catalog__detail-header" %>

    Categories: <% @product.categories.each do |category| %> From f446710e24cdb547b618057c35830f4a1b578fe2 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 11:07:22 -0700 Subject: [PATCH 229/350] styled list of reviews display --- app/views/products/show.html.erb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 078d277f80..c1303d4935 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -19,9 +19,6 @@ <%# Product Picture and Description %> - - -
    @@ -63,10 +60,9 @@ <% end %> <% if !@product.reviews.empty? %> <% @product.reviews.each do |review| %> - <%= review.created_at.strftime("%B %d, %Y") %> -

    Rating: <%= review.rating %>

    -
    -

    <%= review.content %>

    +
    <%= review.created_at.strftime("%B %d, %Y") %>
    +

    Rating: <%= review.rating %>

    +

    <%= review.content %>

    <% end %> <% else %> From 12ab42844448db4fdff9229d01ab9d6cbb8f0507 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 17 Jun 2020 12:43:53 -0700 Subject: [PATCH 230/350] Modified create to return @orderitem early if attempted quantity exceeds stock; deleted product model enough_stock? --- app/controllers/orderitems_controller.rb | 47 +++++++++++++++--------- app/models/orderitem.rb | 11 +++--- app/models/product.rb | 4 -- 3 files changed, 36 insertions(+), 26 deletions(-) diff --git a/app/controllers/orderitems_controller.rb b/app/controllers/orderitems_controller.rb index a62ec8876a..05f0cf4939 100644 --- a/app/controllers/orderitems_controller.rb +++ b/app/controllers/orderitems_controller.rb @@ -3,35 +3,48 @@ class OrderitemsController < ApplicationController def create @orderitem = Orderitem.find_by(order_id: session[:order_id], product_id: params[:product_id]) - # increment quantity if found + # increment quantity if found AND if it's possible to + if @orderitem - @orderitem.quantity += params[:quantity].to_i + # we need to check if we CAN increment quantity first before we do: + selected_item_from_order = @order.orderitems.find_by(product_id: @orderitem.product_id) + temp_desired_quantity = selected_item_from_order.quantity + params[:quantity].to_i + result = @orderitem.enough_stock?(temp_desired_quantity) + + if result == false + flash[:status] = :failure + # errors.add(params:quantity, "order exceeds in-stock inventory") + flash[:result_text] = "Can't add another #{@orderitem.product.product_name} to cart; not enough stock" + flash[:messages] = @orderitem.errors.messages + + return @orderitem + else + @orderitem.quantity += params[:quantity].to_i + end + else # create new Orderitem @orderitem = Orderitem.new( - quantity: params[:quantity], - product_id: params[:product_id], + quantity: params[:quantity].to_i, + product_id: params[:product_id].to_i, order_id: @order.id, shipped: false ) end - if @orderitem.enough_stock?(params[:quantity].to_i) && @orderitem.not_retired? - if @orderitem.save! - # add orderitem to current order - @order.orderitems << @orderitem - flash[:status] = :success - flash[:result_text] = "Added #{ @orderitem.product.product_name } to cart!" - redirect_to cart_path(id: session[:order_id]) - else - flash[:status] = :failure - flash[:result_text] = "Error adding #{ @orderitem.product.product_name } to cart." - flash[:messages] = @orderitem.errors.messages - end + if @orderitem.save + # add orderitem to current order + @order.orderitems << @orderitem + flash[:status] = :success + flash[:result_text] = "Added #{ @orderitem.product.product_name } to cart!" + redirect_to cart_path(session[:order_id]) else flash[:status] = :failure - flash[:result_text] = "Error adding #{ @orderitem.product.product_name } to cart. Either retired or not enough items." + flash[:result_text] = "Error adding #{ @orderitem.product.product_name } to cart." + flash[:messages] = @orderitem.errors.messages end + + return @orderitem end def edit ; end diff --git a/app/models/orderitem.rb b/app/models/orderitem.rb index 95b735fb05..e7b1ea2551 100644 --- a/app/models/orderitem.rb +++ b/app/models/orderitem.rb @@ -6,8 +6,8 @@ class Orderitem < ApplicationRecord # when should we call shipped validation below? validates :shipped, inclusion: { in: [true, false], message: "shipped status : must be true or false" } - validate :enough_stock?, on: :update - validate :not_retired?, on: :update + # validate :enough_stock_2?(quantity), on: :update + # validate :not_retired?, on: :update def subtotal subtotal = (self.quantity) * (self.product.price) @@ -21,11 +21,12 @@ def mark_item_shipped! end # private - # edited to return bools - def enough_stock? - if !self.product.enough_stock?(quantity) + + def enough_stock?(quantity) + if quantity > self.product.stock errors.add(:quantity, "order exceeds in-stock inventory") errors.add(:quantity, "#{quantity}") + # raise return false else return true diff --git a/app/models/product.rb b/app/models/product.rb index 3c7f6dfdf7..05d89cc2ad 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -9,8 +9,4 @@ class Product < ApplicationRecord has_many :orderitems # product.orders => all the orders that a product has been attached to has_many :orders, through: :orderitems - - def enough_stock?(quantity) - return self.stock >= quantity - end end From 85327b15d8d6bb0e990aa4982d1d32b5b3db82c6 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 17 Jun 2020 17:19:01 -0700 Subject: [PATCH 231/350] Cleaned code --- app/controllers/categories_controller.rb | 3 --- app/controllers/merchants_controller.rb | 8 -------- app/views/orders/merchant_order.html.erb | 13 ------------- app/views/orders/show_confirmation.html.erb | 13 ------------- 4 files changed, 37 deletions(-) delete mode 100644 app/views/orders/merchant_order.html.erb delete mode 100644 app/views/orders/show_confirmation.html.erb diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb index 1cecc6f514..33c93e903d 100644 --- a/app/controllers/categories_controller.rb +++ b/app/controllers/categories_controller.rb @@ -15,10 +15,7 @@ def create # flash[:result_text] = "Successfully created #{@media_category.singularize} #{@work.id}" # redirect_to root else - flash[:status] = :failure flash[:result_text] = "Could not create category" - # flash[:messages] = @category.errors.messages - # render :new, status: :bad_request end end diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rb index 5ecef52bca..37b8fb89b2 100644 --- a/app/controllers/merchants_controller.rb +++ b/app/controllers/merchants_controller.rb @@ -43,14 +43,6 @@ def logout return end - # def destroy - # session[:uid] = nil - # flash[:status] = :success - # flash[:result_text] = "You've successfully logged out as #{merchant.username}." - # redirect_to root_path - # return - # end - def current @current_merchant = Merchant.find_by(id: session[:merchant_id]) end diff --git a/app/views/orders/merchant_order.html.erb b/app/views/orders/merchant_order.html.erb deleted file mode 100644 index c827043731..0000000000 --- a/app/views/orders/merchant_order.html.erb +++ /dev/null @@ -1,13 +0,0 @@ -
    -

    Order Information

    - -
    -
      -
    • Name: <%= @order.cc_name %>
      • -
    • Email Address: <%= @order.email %>
      • -
    • Mailing Address: <%= @order.address %>
      • -
    • Credit Card: **** **** ****<%= @order.cc_num[-4..-1] %>
      • -
    • Expiration Date: <%= @order.cc_exp %>
      • -
    -
    -
    \ No newline at end of file diff --git a/app/views/orders/show_confirmation.html.erb b/app/views/orders/show_confirmation.html.erb deleted file mode 100644 index 7db3b5decb..0000000000 --- a/app/views/orders/show_confirmation.html.erb +++ /dev/null @@ -1,13 +0,0 @@ -
    -
      -
    • Name: <%= @order.cc_name %>
      • -
    • Shipping Address: <%= @order.address %>
      • -
    • Email: <%= @order.email %>
      • -
    - -
      -
    • Order Number: <%= @order.id %>
      • -
    • Purchased On: <%= @order.created_at.to_date %>
      • -
    • Order Status: <%= @order.status %>
      • -
    -
    \ No newline at end of file From a00bc8a3babdf3e2d8566fc4a80b4a0452d6396c Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 17 Jun 2020 17:21:17 -0700 Subject: [PATCH 232/350] Added view for order update and confirmation page (todo: fix show) --- app/views/orders/show.html.erb | 14 ++++++++++++++ app/views/orders/update.html.erb | 16 ++++++++++++++++ app/views/products/show.html.erb | 10 ++++++++++ 3 files changed, 40 insertions(+) create mode 100644 app/views/orders/show.html.erb create mode 100644 app/views/orders/update.html.erb diff --git a/app/views/orders/show.html.erb b/app/views/orders/show.html.erb new file mode 100644 index 0000000000..be8e20c62a --- /dev/null +++ b/app/views/orders/show.html.erb @@ -0,0 +1,14 @@ +

    YO THE CONFIRMATION PAGE WEEE

    +
    +
      +
    • Name: <%= @order.cc_name %>
      • +
    • Shipping Address: <%= @order.address %>
      • +
    • Email: <%= @order.email %>
      • +
    + +
      +
    • Order Number: <%= @order.id %>
      • +
    • Purchased On: <%= @order.created_at.to_date %>
      • +
    • Order Status: <%= @order.status %>
      • +
    +
    \ No newline at end of file diff --git a/app/views/orders/update.html.erb b/app/views/orders/update.html.erb new file mode 100644 index 0000000000..46e7902168 --- /dev/null +++ b/app/views/orders/update.html.erb @@ -0,0 +1,16 @@ +

    update page

    +

    <%= Order.last.orderitems.inspect %>

    + +
    +
      +
    • Name: <%= @order.cc_name %>
      • +
    • Shipping Address: <%= @order.address %>
      • +
    • Email: <%= @order.email %>
      • +
    + +
      +
    • Order Number: <%= @order.id %>
      • +
    • Purchased On: <%= @order.created_at.to_date %>
      • +
    • Order Status: <%= @order.status %>
      • +
    +
    \ No newline at end of file diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index f54b4ddbb8..0ee7fc1cd2 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -10,6 +10,16 @@
    +<%# DANGEROUS TRICK BUT AMAZING: NIL CHECK &. %> +<% if @order.orderitems.find_by(product_id: @product.id)&.errors&.any? %> + +<% end %> <%# Product Picture and Description %> From 6de0872cbab2572d710b7c3d92baf8709e5619f5 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 17 Jun 2020 17:23:31 -0700 Subject: [PATCH 233/350] Progress on order --- app/controllers/orderitems_controller.rb | 23 ++++----- test/controllers/orders_controller_test.rb | 58 ++++++++++++++++------ 2 files changed, 53 insertions(+), 28 deletions(-) diff --git a/app/controllers/orderitems_controller.rb b/app/controllers/orderitems_controller.rb index 05f0cf4939..56a0d39e3e 100644 --- a/app/controllers/orderitems_controller.rb +++ b/app/controllers/orderitems_controller.rb @@ -8,22 +8,19 @@ def create if @orderitem # we need to check if we CAN increment quantity first before we do: selected_item_from_order = @order.orderitems.find_by(product_id: @orderitem.product_id) - temp_desired_quantity = selected_item_from_order.quantity + params[:quantity].to_i + temp_desired_quantity = selected_item_from_order.quantity + params[:orderitem][:quantity].to_i result = @orderitem.enough_stock?(temp_desired_quantity) if result == false - flash[:status] = :failure - # errors.add(params:quantity, "order exceeds in-stock inventory") - flash[:result_text] = "Can't add another #{@orderitem.product.product_name} to cart; not enough stock" - flash[:messages] = @orderitem.errors.messages - - return @orderitem + flash[:result_text] = "Can't add another #{@orderitem.product.product_name} to cart; not enough stock" + flash[:messages] = @orderitem.errors.messages + redirect_back(fallback_location: root_path) && return else @orderitem.quantity += params[:quantity].to_i end else - # create new Orderitem + # create new Orderitem @orderitem = Orderitem.new( quantity: params[:quantity].to_i, product_id: params[:product_id].to_i, @@ -35,11 +32,9 @@ def create if @orderitem.save # add orderitem to current order @order.orderitems << @orderitem - flash[:status] = :success flash[:result_text] = "Added #{ @orderitem.product.product_name } to cart!" redirect_to cart_path(session[:order_id]) else - flash[:status] = :failure flash[:result_text] = "Error adding #{ @orderitem.product.product_name } to cart." flash[:messages] = @orderitem.errors.messages end @@ -54,11 +49,10 @@ def update if @orderitem.order.status == "pending" if @orderitem.update(quantity: params[:orderitem][:quantity]) flash[:status] = :success - flash[:result_text] = "Update successful" + flash[:result_text] = "Item was updated successfully!" redirect_to cart_path(session[:order_id]) return else - flash.now[:status] = :failure flash.now[:result_text] = "Error updating the item" flash.now[:messages] = @orderitem.errors.messages redirect_to cart_path(session[:order_id]) @@ -75,7 +69,6 @@ def update def destroy if @orderitem.order.status == "pending" @orderitem.destroy! - flash[:status] = :success flash[:result_text] = "#{@orderitem.product.product_name} was removed from your cart" redirect_to cart_path(session[:order_id]) else @@ -104,6 +97,10 @@ def mark_shipped end private + + def orderitem_params + # todo: make strong params + end def find_orderitem @orderitem = Orderitem.find_by(id: params[:id]) diff --git a/test/controllers/orders_controller_test.rb b/test/controllers/orders_controller_test.rb index 8e0df04344..5255aae0ca 100644 --- a/test/controllers/orders_controller_test.rb +++ b/test/controllers/orders_controller_test.rb @@ -2,9 +2,9 @@ require "pry" describe OrdersController do - let(:valid_params){ + let(:valid_params) { { - order:{ + order: { email: "test@gmail.com", address: "123 test avenue", cc_name: "Jane Doe", @@ -12,9 +12,10 @@ cvv: 123, cc_exp: "06/2020", zip: 987654, - }, + } } } + describe "cart" do it "redirects to root path and provides a message if cart is empty" do get cart_path @@ -43,20 +44,17 @@ # expect(@order.id).must_equal session[:order_id] # end end - describe "show" do - it "returns not found for the show action with an invalid id" do - get order_path(id: -1) - must_respond_with :not_found - end - it "redirects for orders with a valid id" do - order_id = orders(:order1).id - puts "ORDER ID: #{order_id}" + - get order_path(id: order_id) - must_redirect_to order_path(order_id) - expect(flash[:status]).must_equal :success - end + # it "redirects for orders with a valid id" do + # order_id = orders(:order1).id + # puts "ORDER ID: #{order_id}" + + # get order_path(id: order_id) + # must_redirect_to order_path(order_id) + # expect(flash[:status]).must_equal :success + # end #ActionController::MissingExactTemplate: OrdersController#show is missing a template for request formats: text/html # it "responds with success for valid orders with paid status" do @@ -64,5 +62,35 @@ # must_respond_with :success # end + + describe "update" do + it "updates data given valid order data, and redirects" do + # check email nil before + # provide email as params calling patch, params + # check email not nil + # check value == params value + + end + + it "renders edit and bad_request status if order fails to update" do + end + end + + describe "edit" do + it "responds with success" do + order = orders(:order1) + get edit_order_path(order.id) + must_respond_with :success + end + end + + describe "show" do + it "responds with success" do + order = orders(:order1) + get order_path(order.id) + must_respond_with :success + end end + + end From f6da6eff7f3ad898180496a7567234056f9ba500 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 17 Jun 2020 17:24:25 -0700 Subject: [PATCH 234/350] Fixed orderitem tests with nested params --- test/controllers/orderitems_controller_test.rb | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/test/controllers/orderitems_controller_test.rb b/test/controllers/orderitems_controller_test.rb index 349da6fc37..2e5bb0a4be 100644 --- a/test/controllers/orderitems_controller_test.rb +++ b/test/controllers/orderitems_controller_test.rb @@ -23,8 +23,10 @@ before_count = Orderitem.count item_params = { - quantity: 3, - shipped: false + orderitem: { + quantity: 3, + shipped: false + } } post product_orderitems_path(products(:discover).id), params: item_params @@ -44,8 +46,10 @@ before_count_orderitem = Orderitem.count params = { - quantity: 1, - shipped: false + orderitem: { + quantity: 1, + shipped: false + } } post product_orderitems_path(products(:snow_pass).id), params: params @@ -81,7 +85,9 @@ it "redirects to cart path without updating when given bad data" do bogus_update_hash = { - quantity: -1 + orderitem: { + quantity: -1 + } } expect { @@ -97,7 +103,9 @@ existing_orderitem.order.update!(status: "complete") valid_params = { + orderitem: { quantity: 1 + } } expect { From 8fe26b541ab8ae8138824ce1ad29e93065635d28 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 17 Jun 2020 21:49:38 -0700 Subject: [PATCH 235/350] Added strong params and modified extra param options for update. Added check for enough stock when creating a new orderitem. Tests. --- app/controllers/orderitems_controller.rb | 31 ++++++++++-------- .../controllers/orderitems_controller_test.rb | 32 +++++++------------ 2 files changed, 30 insertions(+), 33 deletions(-) diff --git a/app/controllers/orderitems_controller.rb b/app/controllers/orderitems_controller.rb index 56a0d39e3e..82898148ef 100644 --- a/app/controllers/orderitems_controller.rb +++ b/app/controllers/orderitems_controller.rb @@ -8,7 +8,7 @@ def create if @orderitem # we need to check if we CAN increment quantity first before we do: selected_item_from_order = @order.orderitems.find_by(product_id: @orderitem.product_id) - temp_desired_quantity = selected_item_from_order.quantity + params[:orderitem][:quantity].to_i + temp_desired_quantity = selected_item_from_order.quantity + orderitem_params[:quantity].to_i result = @orderitem.enough_stock?(temp_desired_quantity) if result == false @@ -29,25 +29,30 @@ def create ) end - if @orderitem.save - # add orderitem to current order - @order.orderitems << @orderitem - flash[:result_text] = "Added #{ @orderitem.product.product_name } to cart!" - redirect_to cart_path(session[:order_id]) - else - flash[:result_text] = "Error adding #{ @orderitem.product.product_name } to cart." - flash[:messages] = @orderitem.errors.messages + # run enough_stock one more time + if @orderitem.enough_stock?(params[:quantity].to_i) + if @orderitem.save + # add orderitem to current order + @order.orderitems << @orderitem + flash[:result_text] = "Added #{ @orderitem.product.product_name } to cart!" + redirect_to cart_path(session[:order_id]) + else + flash[:result_text] = "Error adding #{ @orderitem.product.product_name } to cart." + flash[:messages] = @orderitem.errors.messages + return + end end - + + # might not need this? return @orderitem end def edit ; end def update - # if @orderitem.enough_stock?(params[:quantity].to_i) && @orderitem.not_retired? + # TODO: MAKE SURE ORDERITEM MODEL TESTS NOT_RETIRED ********* if @orderitem.order.status == "pending" - if @orderitem.update(quantity: params[:orderitem][:quantity]) + if @orderitem.update(quantity: params[:orderitem][:quantity].to_i) flash[:status] = :success flash[:result_text] = "Item was updated successfully!" redirect_to cart_path(session[:order_id]) @@ -99,7 +104,7 @@ def mark_shipped private def orderitem_params - # todo: make strong params + params.permit(:quantity, :shipped) end def find_orderitem diff --git a/test/controllers/orderitems_controller_test.rb b/test/controllers/orderitems_controller_test.rb index 2e5bb0a4be..e638f724a8 100644 --- a/test/controllers/orderitems_controller_test.rb +++ b/test/controllers/orderitems_controller_test.rb @@ -10,7 +10,6 @@ } describe "create" do - # Reasonable to check set_current_order here and one other place it "creates an order automatically" do post product_orderitems_path(products(:snow_pass).id), params: update_hash @@ -23,10 +22,8 @@ before_count = Orderitem.count item_params = { - orderitem: { - quantity: 3, - shipped: false - } + quantity: 3, + shipped: false } post product_orderitems_path(products(:discover).id), params: item_params @@ -46,10 +43,8 @@ before_count_orderitem = Orderitem.count params = { - orderitem: { - quantity: 1, - shipped: false - } + quantity: 1, + shipped: false } post product_orderitems_path(products(:snow_pass).id), params: params @@ -62,11 +57,12 @@ expect(Orderitem.last.quantity).must_equal 3 end - # THIS is the one failure case test for the controller: - it "does something if the product is out of stock????" do - # create product with 0 stock - # expect create post will have correct error behavior - # should not create orderitem (check same count) + it "does not create an orderitem for products with 0 stock" do + zero_stock_product = products(:zero_stock_product) + + expect { + post product_orderitems_path(products(:zero_stock_product).id), params: update_hash + }.wont_change "Orderitem.count" end end @@ -85,9 +81,7 @@ it "redirects to cart path without updating when given bad data" do bogus_update_hash = { - orderitem: { - quantity: -1 - } + quantity: -1 } expect { @@ -103,9 +97,7 @@ existing_orderitem.order.update!(status: "complete") valid_params = { - orderitem: { - quantity: 1 - } + quantity: 1 } expect { From 833bfc08b7dbaf1ce4cd3541913da1ef29d15409 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 17 Jun 2020 21:50:11 -0700 Subject: [PATCH 236/350] Updated Orders Controller. --- app/controllers/orders_controller.rb | 124 +++++++++------------------ 1 file changed, 40 insertions(+), 84 deletions(-) diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index 35c4026c4b..c291d7a3e3 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -1,108 +1,64 @@ class OrdersController < ApplicationController # todo -product model made then collab for update order quantity - before_action :require_login, only: [:merchant_order] - before_action :find_order_from_session, only: [:edit, :update] - before_action :find_order_from_params, only: [:show, :merchant_order] + # before_action :require_login, only: [:merchant_order] + before_action :find_order_from_session, only: [:edit, :update, :cart] + # delete merch order from 6 if not used eventually ***** + before_action :find_order_from_params, only: [:show, :merchant_order, :success] - # Find order or display message if cart is empty - # route triggers - def cart - if session[:order_id] - @order = Order.find_by(id: session[:order_id]) - session[:order_id] = @order.id - else - flash[:result_text] = "Couldn't create order, try again later" - flash[:messages] = @order.errors.messages - end - end + # Renders details page for order already paid for (or cancelled?) + # if we want other redirect behavior, edit later****** + def show ; end -# methods are flipped update-submit proof viewcart hiy checkout check if enough stock if enough then show cc form -# if true then reduce stock if valid + # Renders payment information form + def edit ; end - #renders payment information form - # enter payment details, find order_id from session - def edit; end - - # UPDATE should be called when user tries to submit payment (edit is new) + # Called when user tries to submit payment def update - @order.orderitems.each do |orderitem| - # check enough_stock from product model*** - if orderitem.save! - # we update the order somehow + if @order.update(order_params) + + result = @order.checkout + + if result == true + flash.now[:result_text] = "(1) Order successfully paid!" + # redirect_back(fallback_location: root_path) + # redirect_to order_path(@order.id) + redirect_to success_path(id: @order.id) + reset_session + return else - flash[:status] = :failure - flash[:result_text] = "heeyyyyyy y no validations" - flash[:messages] = @order.errors.messages + # Maybe don't sweat testing this else block: 38 - 43 + # render :edit, status: :bad_request + flash[:result_text] = "Order failed to checkout." + redirect_back(fallback_location: root_path) return end - end - result = @order.checkout - if result == true - flash[:result_text] = "Order successfully paid!" - redirect_to order_path(@order.id) + # redirect_to success_path(session[:order_id]) + # return else - render :edit, status: :bad_request - flash[:status] = :failure - flash[:result_text] = "submit line 76 in orders_controller" - flash[:messages] = @order.errors.messages + # redirect_to edit_order_path(session[:order_id]) + render :edit end end - # flash[:status] = :failure - # flash[:result_text] = "Some items in your cart are no longer available" - # flash[:messages] = @orderitem.errors.messages - # end + # Shows cart currently in progress + def cart ; end + # Shows confirmation page for recently placed order + def success ; end - # Confirmation page for order : for all statuses ? - def show - if @order.id < 0 - head :not_found - end - - if @order.status == "pending" - flash[:status] = :failure - flash[:result_text] = "Your order is being processed" - flash[:messages] = @order.errors.messages - redirect_to root_path - return - elsif @order.status == "paid" - flash[:status] = :success - flash[:result_text] = "Your order was paid!!!!!" - # maybe add result text, maybe not? - redirect_to order_path(@order.id) - end - end - - # we call this method when user submits payment form - # only checking for stock how does the submit know about validations - #if order.valid? - # def submit - # result = @order.checkout - # #this will never fail - # if result - # flash[:result_text] = "Order successfully paid!" - # redirect_to order_path(@order.id) - # else - # render :edit, status: :bad_request + # deleted view file and route + # def merchant_order + # unless @order.is_order_of(session[:merchant_id]) && @order.status != 'pending' # flash[:status] = :failure - # flash[:result_text] = "submit line 76 in orders_controller" - # flash[:messages] = @order.errors.messages + # flash[:result_text] = "You do not have access to this page" + # redirect_back fallback_location: root_path + # return # end # end - # need to add route for this to work - def merchant_order - unless @order.is_order_of(session[:merchant_id]) && @order.status != 'pending' - flash[:status] = :failure - flash[:result_text] = "You do not have access to this page" - redirect_back fallback_location: root_path - return - end - end - private + def order_params params.require(:order).permit(:email, :address, :cc_name, :cc_num, :cvv, :cc_exp, :zip) end From cf32ecacf0b743771e681d36f0a5c3999105582e Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 17 Jun 2020 21:50:49 -0700 Subject: [PATCH 237/350] Added validations back in, updated methods. --- app/models/order.rb | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/app/models/order.rb b/app/models/order.rb index 97949a5980..b55322d55b 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -1,7 +1,3 @@ -#todo -# create a shipped column (bool) maybe product needs that 'retired' column on it's side -# create a table with orders info and migrate - class Order < ApplicationRecord has_many :orderitems has_many :products, through: :orderitems @@ -13,14 +9,13 @@ class Order < ApplicationRecord validates :orderitems, length: { minimum: 1, message: "Your cart is empty" }, on: :update validates :email, presence: true, on: :update - # validates :address, presence: true, on: :update - # validates :cc_name, presence: true, on: :update - # validates :cc_num, presence: true, numericality: { only_integer: true }, length: { minimum: 4 }, on: :update - # validates :cvv, presence: true, numericality: { only_integer: true }, on: :update - # validates :cc_exp, presence: true, on: :update - # validates :zip, presence: true, numericality: { only_integer: true }, on: :update - - # custom methods + validates :address, presence: true, on: :update + validates :cc_name, presence: true, on: :update + validates :cc_num, presence: true, numericality: { only_integer: true }, length: { minimum: 4 }, on: :update + validates :cvv, presence: true, numericality: { only_integer: true }, on: :update + validates :cc_exp, presence: true, on: :update + validates :zip, presence: true, numericality: { only_integer: true }, on: :update + def reduce_stock self.orderitems.each do |orderitem| orderitem.product.stock -= orderitem.quantity @@ -28,6 +23,7 @@ def reduce_stock end end + # TODO: delete this method if we never end up using for cancelling orders def return_stock self.orderitems.each do |orderitem| if !orderitem.product.retired @@ -60,26 +56,20 @@ def mark_as_complete! def change_to_paid! # change order status to paid self.status = "paid" + if !self.save - # warn the user return false + else + return true end - return true end - def clear_cart - session[:order_id] = nil - end + # def clear_cart + # session[:order_id] = nil + # set_current_order + # end - # order instance method or class method? def checkout - # self.orderitems.each do |orderitem| - # if !orderitem.enough_stock?(orderitem.quantity) - # puts "THERE WASNT ENOUGH STOCK FOR #{orderitem.product.product_name}" - # return false - # end - # end - result = self.change_to_paid! if !result @@ -89,7 +79,8 @@ def checkout self.reduce_stock # clear cart - self.clear_cart + # self.clear_cart + return true end def is_order_of(merch_id) From 164b8ae59789828a33c6909f202fe2572921dd16 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 17 Jun 2020 21:51:14 -0700 Subject: [PATCH 238/350] Added validation on stock for product model --- app/models/product.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/product.rb b/app/models/product.rb index 05d89cc2ad..1ae8741bb0 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -1,6 +1,7 @@ class Product < ApplicationRecord validates :product_name, presence: true, uniqueness: true validates :price, numericality: { greater_than_or_equal_to: 0 } + validates :stock, numericality: { greater_than_or_equal_to: 0 } belongs_to :merchant has_and_belongs_to_many :categories From 4b997051d0952d71dea87dbd899a20a5e13b3b3e Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 17 Jun 2020 21:51:56 -0700 Subject: [PATCH 239/350] Edited views for orderitems, order success --- app/views/orders/edit.html.erb | 2 -- app/views/orders/show.html.erb | 15 ++------------- app/views/orders/success.html.erb | 13 +++++++++++++ 3 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 app/views/orders/success.html.erb diff --git a/app/views/orders/edit.html.erb b/app/views/orders/edit.html.erb index aecb9d93e8..309d713ca0 100644 --- a/app/views/orders/edit.html.erb +++ b/app/views/orders/edit.html.erb @@ -3,9 +3,7 @@

    Checkout

    diff --git a/app/views/orders/show.html.erb b/app/views/orders/show.html.erb index be8e20c62a..a51717b1d0 100644 --- a/app/views/orders/show.html.erb +++ b/app/views/orders/show.html.erb @@ -1,14 +1,3 @@ -

    YO THE CONFIRMATION PAGE WEEE

    -
    -
      -
    • Name: <%= @order.cc_name %>
      • -
    • Shipping Address: <%= @order.address %>
      • -
    • Email: <%= @order.email %>
      • -
    - -
      -
    • Order Number: <%= @order.id %>
      • -
    • Purchased On: <%= @order.created_at.to_date %>
      • -
    • Order Status: <%= @order.status %>
      • -
    +
    +

    Show page for an order

    \ No newline at end of file diff --git a/app/views/orders/success.html.erb b/app/views/orders/success.html.erb new file mode 100644 index 0000000000..72806534eb --- /dev/null +++ b/app/views/orders/success.html.erb @@ -0,0 +1,13 @@ +
    +

    TODO: Order confirmation page here!

    +
    +
      +
    • Order Number: <%= @order.id %>
      • +
    • Purchased On: <%= @order.created_at.to_date %>
      • +
    • Order Status: <%= @order.status %>
      • +
    • Name: <%= @order.cc_name %>
      • +
    • Shipping Address: <%= @order.address %>
      • +
    • Email: <%= @order.email %>
      • +
    +
    +
    \ No newline at end of file From e1d5844c88a9f4c56ddd2eee8b4221432b569309 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 17 Jun 2020 21:52:12 -0700 Subject: [PATCH 240/350] Added zero stock product for testing --- test/fixtures/products.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml index 50c2172626..685013f96f 100644 --- a/test/fixtures/products.yml +++ b/test/fixtures/products.yml @@ -39,4 +39,11 @@ snow_pass: price: 25 photo_url: stock: 15 + retired: false +zero_stock_product: + product_name: Smores + description: Deliciousness in a cookie sandwich + price: 25 + photo_url: + stock: 0 retired: false \ No newline at end of file From 0d35238b5cbd17d12b3cfce4c7737a479bfee4f1 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 17 Jun 2020 21:53:09 -0700 Subject: [PATCH 241/350] Edited routes for success and merchant_orders --- config/routes.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 2619b224d9..07a91aed60 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -10,8 +10,9 @@ patch 'orderitems/:id/mark_shipped', to: 'orderitems#mark_shipped', as: 'mark_shipped' resources :orders, only: [:new, :show, :edit, :update, :cancel] + # # below for checkout success confirmation page + get '/orders/:id/cart/success', to: 'orders#success', as: 'success' get '/orders/:id/cart', to: 'orders#cart', as: 'cart' - get '/orders/:id/cart/success', to: 'orders#submit', as: 'confirm_submit' resources :merchants @@ -19,7 +20,6 @@ get "/auth/github/callback", to: "merchants#create", as: "auth_callback" post "/logout", to: "merchants#logout", as: "logout" get '/orders/:id/merchant_order', to: 'orders#merchant_order', as: 'merchant_order' - resources :reviews, only: [:new, :create] resources :categories, only: [:new, :create, :show, :index] end From f7ab07f82a9e247eca0693cea7cf9abb46f63e35 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 17 Jun 2020 21:53:41 -0700 Subject: [PATCH 242/350] Major progress for order controller tests --- test/controllers/orders_controller_test.rb | 138 +++++++++++++-------- 1 file changed, 85 insertions(+), 53 deletions(-) diff --git a/test/controllers/orders_controller_test.rb b/test/controllers/orders_controller_test.rb index 5255aae0ca..4d0a83b3bb 100644 --- a/test/controllers/orders_controller_test.rb +++ b/test/controllers/orders_controller_test.rb @@ -16,28 +16,10 @@ } } - describe "cart" do - it "redirects to root path and provides a message if cart is empty" do - get cart_path - must_respond_with :redirect - must_redirect_to root_path - expect(flash[:status]).must_equal :failure - end - - it "returns not found when trying to edit" do - get edit_order_path(id: Order.first.id) - must_respond_with :not_found - end - - it "returns not found when trying to update" do - expect { patch order_path(id: Order.first.id), params: valid_params }.wont_change "Order.count" - must_respond_with :not_found - end - - # it "finds the correct order id for a valid cart" do - # # make an order - # valid_order = make_order - # # we can check the session[order_id] to be set + # TODO: FILL THIS OUT IF POSSIBLE ***** + describe "set_current_order" do + # it "finds the correct order id for session" do + # we can check the session[order_id] to be set # puts "HERE IS VALID_ORDER: #{valid_order.status}" # expect(session[:order_id]).wont_be_nil # expect(@order).wont_be_nil @@ -45,34 +27,16 @@ # end end - - - # it "redirects for orders with a valid id" do - # order_id = orders(:order1).id - # puts "ORDER ID: #{order_id}" - - # get order_path(id: order_id) - # must_redirect_to order_path(order_id) - # expect(flash[:status]).must_equal :success - # end - - #ActionController::MissingExactTemplate: OrdersController#show is missing a template for request formats: text/html - # it "responds with success for valid orders with paid status" do - # get order_path(id: orders(:order2)) - # must_respond_with :success - # end - - - describe "update" do - it "updates data given valid order data, and redirects" do - # check email nil before - # provide email as params calling patch, params - # check email not nil - # check value == params value - + describe "show" do + it "responds with success" do + order = orders(:order1) + get order_path(order.id) + must_respond_with :success end - it "renders edit and bad_request status if order fails to update" do + it "responds with success for valid orders with paid status" do + get order_path(id: orders(:order2)) + must_respond_with :success end end @@ -84,13 +48,81 @@ end end - describe "show" do + describe "update" do + # TODO: RETURN TO THIS TEST ONCE WE KNOW WHERE TO REDIRECT + it "updates data given valid order data, and redirects" do + order = orders(:pending_order) + # fields = [:email, :address, :cc_name, :cc_num, :cvv, :cc_exp, :zip] + + # fields.each do |field| + # expect(order.field).must_be_nil + # end + + expect(order.email).must_be_nil + + valid_params = { + order: { + email: "nature@gmail.com", + address: "1234 pine dr.", + cc_name: "squirrel pinenut", + cc_num: 4140837365242638, + cvv: 123, + cc_exp: 02/22, + zip: 90210 + } + } + + patch order_path(order.id), params: valid_params + + # fields.each do |field| + # expect(order.field).wont_be_nil + # expect(order.field).must_equal valid_params[:field] + # end + + expect { + patch order_path(order.id), params: valid_params + }.wont_change Order.count + + expect{order.email}.wont_be_nil + expect(order.email).must_equal valid_params[:email] + # must_respond_with :redirect + # must_redirect_to + end + + it "renders edit and bad_request status if order fails to update" do + order = orders(:pending_order) + + puts "OUR ORDER FROM SESSION IS::::::: #{session[:order_id]}" + + expect(order.email).must_be_nil + + invalid_params = { + order: { + id: -1, + zip: 90210 + } + } + + patch order_path(order.id), params: invalid_params + + expect { + patch order_path(order.id), params: valid_params} + .wont_change Order.count + + expect(order.email).must_be_nil + must_respond_with :redirect + # TODO: COME BACK AND FIX THIS IS POSSIBLE *********** + must_redirect_to edit_order_path(session[:order_id]) + end + end + + describe "cart" do + # Add item to cart: +# - product is retired, quantity too high, or something like that (error) it "responds with success" do order = orders(:order1) - get order_path(order.id) + get cart_path(order.id) must_respond_with :success end end - - -end +end \ No newline at end of file From 5874ed3008b450dcbf434449929dab4f768a4714 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 17 Jun 2020 22:08:32 -0700 Subject: [PATCH 243/350] Deleted unnecessary flash messages. --- app/controllers/merchants_controller.rb | 1 - app/controllers/products_controller.rb | 1 - 2 files changed, 2 deletions(-) diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rb index 37b8fb89b2..20882e8ca7 100644 --- a/app/controllers/merchants_controller.rb +++ b/app/controllers/merchants_controller.rb @@ -10,7 +10,6 @@ def show @merchant = Merchant.find_by(id: params[:id]) @url = "http://thecatapi.com/api/images/get?format=src&type=gif×tamp=" if @merchant.nil? - flash[:error] = "Merchant not found." head :not_found return end diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 75a4a16be4..c81bfe4674 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -17,7 +17,6 @@ def index def show if @product.nil? - flash[:error] = "Product has either been deleted, sold out, or not found." head :not_found return end From 39f41eb99b2f2b27e7b68ebb162522037acbc2f1 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Wed, 17 Jun 2020 22:09:33 -0700 Subject: [PATCH 244/350] added testing --- app/models/merchant.rb | 14 +++++++------- test/models/merchant_test.rb | 9 ++++++++- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/app/models/merchant.rb b/app/models/merchant.rb index 0f9700ffbd..5cb81df263 100644 --- a/app/models/merchant.rb +++ b/app/models/merchant.rb @@ -9,7 +9,7 @@ def self.build_from_github(auth_hash) merchant = Merchant.new merchant.uid = auth_hash[:uid] merchant.provider = "github" - merchant.username = auth_hash["info"]["nickname"] + merchant.username = auth_hash["info"]["username"] merchant.email = auth_hash["info"]["email"] return merchant end @@ -17,9 +17,9 @@ def self.build_from_github(auth_hash) def total_revenue total_revenue = 0 - self.order_items.each do |order_item| - if order_item.order.cart_status == "paid" - total_revenue += order_item.total + self.orderitems.each do |orderitem| + if orderitem.order.cart_status == "paid" + total_revenue += orderitem.total end end @@ -30,9 +30,9 @@ def total_revenue def revenue_by_status(status) total_revenue = 0 - self.order_items.each do |order_item| - if order_item.order.cart_status == status - total_revenue += order_item.total + self.orderitems.each do |orderitem| + if orderitem.order.cart_status == status + total_revenue += orderitem.total end end diff --git a/test/models/merchant_test.rb b/test/models/merchant_test.rb index 3c02b52574..e323de8441 100644 --- a/test/models/merchant_test.rb +++ b/test/models/merchant_test.rb @@ -2,7 +2,14 @@ describe Merchant do # let (:merchant) {merchant(:canoeing_chris)} - + let(:new_merchant) { + Merchant.new( + username: "Hollerin Harriet", + email: "Holler@harriet.com", + uid: "1115", + provider: "github" + ) + } describe "validations" do it "is valid with all fields present and valid" do expect(merchant.valid?).must_equal true From 0dd1d2045c902dc0ee65a0f8dff33e0db18cfa9a Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 22:23:32 -0700 Subject: [PATCH 245/350] added dropdown that changes an orderitem's quantity --- app/views/orders/cart.html.erb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/views/orders/cart.html.erb b/app/views/orders/cart.html.erb index 332f770b94..a74cf7775e 100644 --- a/app/views/orders/cart.html.erb +++ b/app/views/orders/cart.html.erb @@ -27,6 +27,14 @@

    +
    + From 39d223a41c5234c41d9389cca0374b628c5a426b Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 22:24:50 -0700 Subject: [PATCH 246/350] removed flash status upon updating orderitem --- app/controllers/orderitems_controller.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/orderitems_controller.rb b/app/controllers/orderitems_controller.rb index 82898148ef..9cac5d4b94 100644 --- a/app/controllers/orderitems_controller.rb +++ b/app/controllers/orderitems_controller.rb @@ -53,8 +53,7 @@ def update # TODO: MAKE SURE ORDERITEM MODEL TESTS NOT_RETIRED ********* if @orderitem.order.status == "pending" if @orderitem.update(quantity: params[:orderitem][:quantity].to_i) - flash[:status] = :success - flash[:result_text] = "Item was updated successfully!" + flash[:result_text] = "#{@orderitem.product.product_name} was updated successfully!" redirect_to cart_path(session[:order_id]) return else From 82a6331017d8dfc05b9a03cfecf3dd5261e18f17 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 23:03:28 -0700 Subject: [PATCH 247/350] added cart class styling --- app/assets/stylesheets/application.scss | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 4fdc5395f1..dea5f6fdae 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -224,6 +224,25 @@ body { min-width: 25%; } +.cart__remove-button { + background-color: #fff; + color: #c21b1b; + padding: 5px; + border: solid; + border-width: thin; + border-color: #c21b1b; + text-transform: uppercase; + font-weight: 300; + white-space: normal; + min-width: 25%; +} + +.cart__remove-button:hover { + color: #fff; + background-color: #c21b1b; + +} + .catalog__add-to-cart-button:hover, .cart__checkout-button:hover, .product__new-button:hover { background-color: #161616; color: #fff; From 94300b1e47f35e5ee6e5029e3ca5f7d4c9f8f718 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 23:04:36 -0700 Subject: [PATCH 248/350] styled cart by changing updating quantity to dropdown, shifted placement of cart table attributes, added table header --- app/views/orders/cart.html.erb | 48 +++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/app/views/orders/cart.html.erb b/app/views/orders/cart.html.erb index a74cf7775e..583e8ecdfc 100644 --- a/app/views/orders/cart.html.erb +++ b/app/views/orders/cart.html.erb @@ -1,4 +1,4 @@ -
    +

    YOUR CART

    <% if @order.orderitems.empty? %> @@ -7,27 +7,30 @@
    <% else %> -

    Quantity: <%= orderitem.quantity %>

    - <%= link_to "edit", edit_order_path(id: orderitem.id), class: "text-dark cart__text" %> | + <%= link_to "edit", edit_orderitem_path(id: orderitem.id), class: "text-dark cart__text" %> | <%= link_to "remove from cart", orderitem_path(id: orderitem.id), method: :delete, data: {confirm: "Are you sure?"}, class: "text-dark cart__text"%>

    -

    <%= link_to orderitem.product.product_name, product_path(orderitem.product), class: "text-dark, cart__text" %>

    +

    <%= link_to orderitem.product.product_name, product_path(orderitem.product.id), class: "text-dark, cart__text" %>

    Quantity: <%= orderitem.quantity %>

    - <%= link_to "edit", edit_orderitem_path(id: orderitem.id), class: "text-dark cart__text" %> | - <%= link_to "remove from cart", orderitem_path(id: orderitem.id), method: :delete, data: {confirm: "Are you sure?"}, class: "text-dark cart__text"%> + <%= link_to "edit", edit_orderitem_path(orderitem.id), class: "text-dark cart__text" %> | + <%= link_to "remove from cart", orderitem_path(orderitem.id), method: :delete, data: {confirm: "Are you sure?"}, class: "text-dark cart__text"%>

    		+
    + <%= form_with model: orderitem, method: :patch do |f| %> + <%= f.select :quantity, options_for_select((1..orderitem.product.stock), orderitem.quantity), {}, { value: orderitem.quantity, onchange: "this.form.submit();", class: "form-control"}%> + <% end %> +
    +

    $<%= number_with_precision(orderitem.subtotal, :precision => 2, :delimiter => ',') %> ($<%= number_with_precision(orderitem.product.price, :precision => 2, :delimiter => ',') %> each)

    +
    + + + + + + + + + <% @order.orderitems.each do |orderitem| %> - - - - - + + + + <% end %> @@ -46,9 +55,12 @@
    -
    -

    TOTAL $<%= number_with_precision(@order.total, :precision => 2, :delimiter => ',') %>

    -

    <%= button_to 'Checkout', edit_order_path(@order.id), method: :get, class:"cart__checkout-button" %>

    +
    +
    +

    ORDER TOTAL: $<%= number_with_precision(@order.total, :precision => 2, :delimiter => ',') %>

    +
    + +

    <%= button_to 'Checkout', edit_order_path(@order.id), method: :get, class:"cart__checkout-button" %>

    From aa663c8b0ae481b45ba1479c8f73d8802e8d9fc7 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 23:04:48 -0700 Subject: [PATCH 249/350] removed redundant flash messages --- app/controllers/orderitems_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/orderitems_controller.rb b/app/controllers/orderitems_controller.rb index 9cac5d4b94..feee47c099 100644 --- a/app/controllers/orderitems_controller.rb +++ b/app/controllers/orderitems_controller.rb @@ -34,10 +34,10 @@ def create if @orderitem.save # add orderitem to current order @order.orderitems << @orderitem - flash[:result_text] = "Added #{ @orderitem.product.product_name } to cart!" + flash[:result_text] = "Added #{ @orderitem.product.product_name } to cart" redirect_to cart_path(session[:order_id]) else - flash[:result_text] = "Error adding #{ @orderitem.product.product_name } to cart." + flash[:result_text] = "Error adding #{ @orderitem.product.product_name } to cart" flash[:messages] = @orderitem.errors.messages return end From 0337c02e2c15841f9135f2ee14b0b8ab8f4eee61 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 23:06:09 -0700 Subject: [PATCH 250/350] removed orderitems#edit because changed quantity is done through dropdown on submit change in cart.html.erb --- app/views/orderitems/edit.html.erb | 29 ----------------------------- config/routes.rb | 2 +- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 app/views/orderitems/edit.html.erb diff --git a/app/views/orderitems/edit.html.erb b/app/views/orderitems/edit.html.erb deleted file mode 100644 index b845619fed..0000000000 --- a/app/views/orderitems/edit.html.erb +++ /dev/null @@ -1,29 +0,0 @@ -
    -

    Update Quantity

    - <%= image_tag "#{@orderitem.product.photo_url}", alt: "#{@orderitem.product.product_name}", class: "embed-responsive embed-responsive-1by1 product__img"%> -
    -
    -

    <%= @orderitem.product.product_name %>

    - <%= @orderitem.product.description %> -

    $<%= '%.2f' % @orderitem.product.price %>

    - - <% if @orderitem.product.retired %> -

    Not currently for sale

    - <% end %> - -
    - <%= form_with model: @orderitem do |f| %> -
    - <%= f.label :quantity %> - <%= f.select :quantity, (1..@orderitem.product.stock) %> -
    - -
    - <%= f.submit "Update Quantity", class:"btn btn-primary" %> -
    - <% end %> -
    -
    -
    - -
    \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index d2eeab6e52..de043f9f2f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,7 +7,7 @@ patch :retired, on: :member #products/1/retired end - resources :orderitems, only: [:edit, :update, :destroy] + resources :orderitems, only: [:update, :destroy] patch 'orderitems/:id/mark_shipped', to: 'orderitems#mark_shipped', as: 'mark_shipped' resources :orders, only: [:new, :show, :edit, :update, :cancel] From d70d3770cbedfa25ef0fc8bb8ed72f9097680b37 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 23:17:51 -0700 Subject: [PATCH 251/350] made errors flash smaller size --- app/assets/stylesheets/application.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index dea5f6fdae..ce6cb8e826 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -324,3 +324,8 @@ body { width: 50%; height: max-content; } + +// Errors +.errors { + width: 50%; +} \ No newline at end of file From fe1a91bbc4fc1f395048b7d698cbb2c6bdd82bb2 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 23:18:05 -0700 Subject: [PATCH 252/350] fixed errors container always showing up during checkout --- app/views/orders/edit.html.erb | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/app/views/orders/edit.html.erb b/app/views/orders/edit.html.erb index 309d713ca0..6cace38243 100644 --- a/app/views/orders/edit.html.erb +++ b/app/views/orders/edit.html.erb @@ -1,11 +1,15 @@
    -

    Checkout

    - +

    Checkout

    + <% if @order.errors.any? %> + + <% end %>
    <%= form_with model: @order do |f| %> @@ -45,7 +49,7 @@
    - <%= f.submit "Confirm", class:"btn btn-primary" %> + <%= f.submit "Confirm", class:"cart__checkout-button" %>
    <% end %>
    From 0749570a3b59d402d25b6c68ddfa13676ac218ae Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 23:40:47 -0700 Subject: [PATCH 253/350] changed redirect location to product#show page when product is succesfully updated --- app/controllers/products_controller.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index c81bfe4674..c61fb5a38a 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -44,7 +44,8 @@ def update head :not_found return elsif @product.update(product_params) - redirect_to products_path(@product) + flash[:success] = "#{@product.product_name} successfully updated" + redirect_to product_path(@product) return else render :edit @@ -54,7 +55,7 @@ def update def edit if @product.nil? - redirect_to products_path(@product) + redirect_back(fallback: root_path) return end end From d97e647fe6e9ebc07df4ea0bd567f18cd9db9e82 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 23:41:03 -0700 Subject: [PATCH 254/350] added edit product link to merchant dashboard --- app/views/merchants/show.html.erb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/views/merchants/show.html.erb b/app/views/merchants/show.html.erb index f6d9c3c9e1..0d9e6ac41d 100644 --- a/app/views/merchants/show.html.erb +++ b/app/views/merchants/show.html.erb @@ -53,6 +53,9 @@
    Rating: ##/5 (# of reviews) +

    + <%= link_to "Edit product", edit_product_path, method: :get, class: "product__new-button" %> +

    <% if product.merchant_id == session[:merchant_id] %> <% if !product.retired %> From d1a7d3d5005d922f1ca9e25e7047ac6cbf5f27f8 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 23:41:28 -0700 Subject: [PATCH 255/350] optimized partial form to be used for both products#new and products#edit --- app/views/products/_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/products/_form.html.erb b/app/views/products/_form.html.erb index c7149ebb2c..76e39f6d91 100644 --- a/app/views/products/_form.html.erb +++ b/app/views/products/_form.html.erb @@ -46,5 +46,5 @@ <% end %> - <%= f.submit "Add new product", class: 'product__new-button'%> + <%= f.submit action_name, class: 'product__new-button'%> <% end %> \ No newline at end of file From da41a55d462d76e0b9cf5b971cdc4f4c2dc04e3c Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 23:41:37 -0700 Subject: [PATCH 256/350] added products#edit page --- app/views/products/edit.html.erb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 app/views/products/edit.html.erb diff --git a/app/views/products/edit.html.erb b/app/views/products/edit.html.erb new file mode 100644 index 0000000000..269389a18c --- /dev/null +++ b/app/views/products/edit.html.erb @@ -0,0 +1,5 @@ +
    +

    Edit Product

    +
    + <%= render partial: "form", locals: { action_name: "Update Product" }%> +
    From bd6568bede2d4cc86b86cecb693056963c33d951 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 23:41:51 -0700 Subject: [PATCH 257/350] fixed products#new form button name --- app/views/products/new.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/products/new.html.erb b/app/views/products/new.html.erb index f4102df623..ce9facdafa 100644 --- a/app/views/products/new.html.erb +++ b/app/views/products/new.html.erb @@ -1,7 +1,7 @@

    Add a new product

    - <%= render partial: "form" %> + <%= render partial: "form", locals: { action_name: "Add New Product" } %>
    From 8f1da99a810cc091b9d719eed6bb3d7ac28a339a Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Wed, 17 Jun 2020 23:42:06 -0700 Subject: [PATCH 258/350] removed double label of quantity on products#show page --- app/views/products/show.html.erb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 440ff049b0..1ceaacaf10 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -43,10 +43,11 @@
    <%# mini form to "add to card", link to order, and send up params of current product to be an orderitem %> -

    Quantity

    <%= form_with model: @orderitem, url: product_orderitems_path(@product.id) do |f| %>
    - <%= f.label :quantity %> +

    + <%= f.label :quantity, class: "catalog__description-title"%> +

    <%= f.select :quantity, options_for_select(1..@product.stock), {}, {class: "form-control"} %>
    <% if @product.retired %> From 3b07158543684dd05ec6b8f14d5ed80effba10b3 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Wed, 17 Jun 2020 23:47:22 -0700 Subject: [PATCH 259/350] Modified and added new fixtures to test merchant all_orders model, implemented and passing. --- app/models/merchant.rb | 22 +++++++++++++++------- test/fixtures/merchants.yml | 9 +++++++++ test/fixtures/orderitems.yml | 15 +++++++++++++++ test/fixtures/orders.yml | 18 ++++++++++++++++++ test/fixtures/products.yml | 6 ++++++ test/models/merchant_test.rb | 21 ++++++++++++++++++--- 6 files changed, 81 insertions(+), 10 deletions(-) create mode 100644 test/fixtures/merchants.yml diff --git a/app/models/merchant.rb b/app/models/merchant.rb index 5016f224f1..9c71425010 100644 --- a/app/models/merchant.rb +++ b/app/models/merchant.rb @@ -1,9 +1,7 @@ class Merchant < ApplicationRecord has_many :products - #validates :username, presence: true, uniqueness: true - # remove? - # validates :merchant_id, uniqueness: true, presence: true + validates :username, presence: true, uniqueness: true validates :email, uniqueness: true, presence: true # custom mthod to create new merchant @@ -21,10 +19,20 @@ def self.total_revenue end - # def find.all_orders - - - # end + def all_orders + merchant_orders = [] + + Order.all.each do |order| + order.orderitems.each do |item| + if item.product.merchant_id == self.id + merchant_orders << item.order_id + break + end + end + end + + return merchant_orders + end # need to work with OrderItem def revenue_by_status(status) diff --git a/test/fixtures/merchants.yml b/test/fixtures/merchants.yml new file mode 100644 index 0000000000..851d8f6907 --- /dev/null +++ b/test/fixtures/merchants.yml @@ -0,0 +1,9 @@ +bob: + username: "Bob Hicok" + email: bob@university.com +greta: + username: "Greta the Unstoppable" + email: "stike4climate@earth.org" +no_products_merchant: + username: "Lazy Lou" + email: samIam@email.com \ No newline at end of file diff --git a/test/fixtures/orderitems.yml b/test/fixtures/orderitems.yml index 75abb719fc..2b04fc3ee4 100644 --- a/test/fixtures/orderitems.yml +++ b/test/fixtures/orderitems.yml @@ -24,3 +24,18 @@ discover: order: order2 product: discover shipped: true +rxbar2: + quantity: 1 + order: order3 + product: rx_bar + shipped: true +snow2: + quantity: 1 + order: order3 + product: snow_pass + shipped: false +rainier2: + quantity: 1 + order: order4 + product: rainier + shipped: false diff --git a/test/fixtures/orders.yml b/test/fixtures/orders.yml index 8a471f64fa..6d8964e50a 100644 --- a/test/fixtures/orders.yml +++ b/test/fixtures/orders.yml @@ -16,5 +16,23 @@ order2: cc_exp: 02/23 zip: 90210 status: paid +order3: + email: test@testing.com + address: 44 Lane St + cc_name: Bubblegum + cc_num: 285868584838333 + cvv: 963 + cc_exp: 11/26 + zip: 73224 + status: complete +order4: + email: hello@fresh.prince + address: 377 Awesome Rd + cc_name: Pineapple Grapes + cc_num: 895848357788356 + cvv: 995 + cc_exp: 01/23 + zip: 006434 + status: cancelled pending_order: status: pending \ No newline at end of file diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml index 685013f96f..7d6939d90f 100644 --- a/test/fixtures/products.yml +++ b/test/fixtures/products.yml @@ -5,6 +5,7 @@ rx_bar: photo_url: stock: 3 retired: false + merchant: bob kind: product_name: KIND bar description: GF bar @@ -12,6 +13,7 @@ kind: photo_url: stock: 5 retired: true + merchant: bob nature_valley: product_name: Nature Valley description: Crunchy Granola Oats n Honey @@ -19,6 +21,7 @@ nature_valley: photo_url: stock: 8 retired: false + merchant: bob rainier: product_name: Mount Rainer description: Volcano @@ -26,6 +29,7 @@ rainier: photo_url: stock: 1 retired: false + merchant: bob discover: product_name: Discover Pass description: Parking pass for local parks @@ -33,6 +37,7 @@ discover: photo_url: stock: 30 retired: false + merchant: bob snow_pass: product_name: Snow Pass description: Parking pass for local parks in winter @@ -40,6 +45,7 @@ snow_pass: photo_url: stock: 15 retired: false + merchant: greta zero_stock_product: product_name: Smores description: Deliciousness in a cookie sandwich diff --git a/test/models/merchant_test.rb b/test/models/merchant_test.rb index ca3d6ca9b2..30f950fa0c 100644 --- a/test/models/merchant_test.rb +++ b/test/models/merchant_test.rb @@ -1,7 +1,22 @@ require "test_helper" +require "pry" describe Merchant do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "all_orders" do + it "finds all the orders containing at least one item from a merchant" do + merchant = merchants(:greta) + merchant2 = merchants(:bob) + + # from fixtures, greta's products (snow_pass) are in 2 separate orders + # while bob's products are in 4 orders + expect(merchant.all_orders.count).must_equal 2 + expect(merchant2.all_orders.count).must_equal 4 + end + + it "returns no orders if there are no items from that merchant in any order" do + merchant = merchants(:no_products_merchant) + + expect(merchant.all_orders.count).must_equal 0 + end + end end From 1aa527c2eed6d8a4d4f847d3dc41280a453cd220 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 00:22:05 -0700 Subject: [PATCH 260/350] view to signal dashboard vs other merchant --- app/views/merchants/show.html.erb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/views/merchants/show.html.erb b/app/views/merchants/show.html.erb index 0d9e6ac41d..2dc4c1bbee 100644 --- a/app/views/merchants/show.html.erb +++ b/app/views/merchants/show.html.erb @@ -3,7 +3,13 @@
    <%= link_to "< HOME", root_path, class: "local-navigation" %>
    <%= link_to "< ALL MERCHANTS", merchants_path, class: "local-navigation" %>
    -

    <%= @merchant.username %>

    + + <% if @merchant.id == session[:merchant_id] %> +

    <%= @merchant.username %> Dashboard

    + <% else %> +

    <%= @merchant.username %> Information

    + <% end %> +
    @@ -54,7 +60,7 @@
    Rating: ##/5 (# of reviews)

    - <%= link_to "Edit product", edit_product_path, method: :get, class: "product__new-button" %> + <%= link_to "Edit product", edit_product_path(product.id), method: :get, class: "product__new-button" %>

    <% if product.merchant_id == session[:merchant_id] %> From 46d606ee7960ad19f702d6d0d3a30ecec04b2868 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 00:22:14 -0700 Subject: [PATCH 261/350] cleaned up code --- app/controllers/application_controller.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index e833c8d680..6ca1c4f1a3 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,6 +1,5 @@ class ApplicationController < ActionController::Base - before_action :set_categories - before_action :set_current_order + before_action :set_categories, :set_current_order, :current_user def set_categories @categories = Category.all From e454331b721dfc00ffb8ee9584e1d9da79fade53 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 00:22:53 -0700 Subject: [PATCH 262/350] DRY up controller actions with find_product before_action --- app/controllers/products_controller.rb | 33 ++++++++++++++++---------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index c61fb5a38a..65dc5ed8b2 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -15,12 +15,7 @@ def index end end - def show - if @product.nil? - head :not_found - return - end - end + def show ; end def new @product = Product.new @@ -36,14 +31,11 @@ def create end rescue ActionController::ParameterMissing - redirect_to new_product_path + redirect_to new_product_path end def update - if @product.nil? - head :not_found - return - elsif @product.update(product_params) + if @product.update(product_params) flash[:success] = "#{@product.product_name} successfully updated" redirect_to product_path(@product) return @@ -54,13 +46,25 @@ def update end def edit + if @product.merchant != @current_user + flash[:error] = "You cannot edit a product that you do not sell" + redirect_back(fallback_location: root_path) + return + end + if @product.nil? - redirect_back(fallback: root_path) + redirect_back(fallback_location: root_path) return end end def retired + if @product.merchant_id != @current_user + flash[:error] = "You cannot retire a product that you do not sell" + redirect_back(fallback_location: root_path) + return + end + if @product.retire! flash[:success] = "#{@product.product_name} successfully retired!" redirect_to merchant_path(session[:merchant_id]) #or wherever you want to redirect to @@ -69,8 +73,11 @@ def retired private def find_product - # TODO: need to add case for when product cannot be found, to DRY up code @product = Product.find_by(id: params[:id]) + if @product.nil? + head :not_found + return + end end def product_params From 2b4e204483786a2b61059d9793ebb0e51f9f440f Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 00:33:16 -0700 Subject: [PATCH 263/350] cannot create a review if merchant of a product --- app/controllers/reviews_controller.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/controllers/reviews_controller.rb b/app/controllers/reviews_controller.rb index b64d16ac18..7433f7dedb 100644 --- a/app/controllers/reviews_controller.rb +++ b/app/controllers/reviews_controller.rb @@ -1,7 +1,13 @@ class ReviewsController < ApplicationController def new - @review = Review.new @product_id = params[:product_id] + if Product.find_by(id: @product_id.to_i).merchant_id == session[:merchant_id] + flash[:error] = "You cannot review a product that you sell" + redirect_back(fallback_location: root_path) + return + end + + @review = Review.new end def create From b6a550e41fb955783f707c748153ab8c6d30d417 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 00:33:36 -0700 Subject: [PATCH 264/350] removed hidden review button --- app/views/products/show.html.erb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 1ceaacaf10..996ef6d371 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -66,9 +66,7 @@

    Reviews

    - <% if @product.merchant_id != session[:merchant_id] %> <%= link_to "Review this product", new_review_path(product_id: @product.id), method: :get, class: "catalog__add-to-cart-button" %>

    - <% end %> <% if !@product.reviews.empty? %> <% @product.reviews.each do |review| %>
    <%= review.created_at.strftime("%B %d, %Y") %>
    From 861b185463c71c2d9cb493f4bae8212cc0c75608 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Thu, 18 Jun 2020 00:47:42 -0700 Subject: [PATCH 265/350] working on tests to pass --- app/models/merchant.rb | 4 +-- test/models/merchant_test.rb | 51 +++++++++++++++++++++++++++--------- 2 files changed, 40 insertions(+), 15 deletions(-) diff --git a/app/models/merchant.rb b/app/models/merchant.rb index 5cb81df263..fb7d69c601 100644 --- a/app/models/merchant.rb +++ b/app/models/merchant.rb @@ -17,7 +17,7 @@ def self.build_from_github(auth_hash) def total_revenue total_revenue = 0 - self.orderitems.each do |orderitem| + self.order_items.each do |orderitem| if orderitem.order.cart_status == "paid" total_revenue += orderitem.total end @@ -30,7 +30,7 @@ def total_revenue def revenue_by_status(status) total_revenue = 0 - self.orderitems.each do |orderitem| + self.order_items.each do |orderitem| if orderitem.order.cart_status == status total_revenue += orderitem.total end diff --git a/test/models/merchant_test.rb b/test/models/merchant_test.rb index e323de8441..69572534bc 100644 --- a/test/models/merchant_test.rb +++ b/test/models/merchant_test.rb @@ -2,11 +2,11 @@ describe Merchant do # let (:merchant) {merchant(:canoeing_chris)} - let(:new_merchant) { + let(:merchant) { Merchant.new( username: "Hollerin Harriet", email: "Holler@harriet.com", - uid: "1115", + uid: 1115, provider: "github" ) } @@ -15,6 +15,7 @@ expect(merchant.valid?).must_equal true end + it 'is invalid without a unique email address' do invalid_merchant = Merchant.create(username: "new merchant", email: " ") @@ -32,38 +33,62 @@ end end - describe "build_from_github" do - it "returns a merchant" do - auth_hash = OmniAuth::AuthHash.new(mock_auth_hash(merchants(:ubeninja77))) + # describe "build_from_github" do + # it "returns a merchant" do + # auth_hash = OmniAuth::AuthHash.new(mock_auth_hash) + + # merchant = Merchant.build_from_github(auth_hash) + + # merchant.must_be_kind_of Merchant + # expect(merchant.uid).must_equal auth_hash[:uid] + # expect(merchant.provider).must_equal "github" + # expect(merchant.email).must_equal auth_hash["info"]["email"] + # expect(merchant.nickname).must_equal auth_hash["info"]["nickname"] + # expect(merchant.name).must_equal auth_hash["info"]["name"] + # end + # end + + describe "build_from_github" do + it "creates a new merchant" do + auth_hash = { + provider: "github", + uid: 1115 , + "info" => { + "email" => "merchant@email.com", + "username" => "Hollerin Harriet" + } + } merchant = Merchant.build_from_github(auth_hash) + merchant.save! + + expect(Merchant.count).must_equal 1 - merchant.must_be_kind_of Merchant + expect(merchant.provider).must_equal auth_hash[:provider] expect(merchant.uid).must_equal auth_hash[:uid] - expect(merchant.provider).must_equal "github" + expect(merchant.username).must_equal auth_hash["info"]["username"] expect(merchant.email).must_equal auth_hash["info"]["email"] - expect(merchant.nickname).must_equal auth_hash["info"]["nickname"] - expect(merchant.name).must_equal auth_hash["info"]["name"] end end + describe "custom methods made" do describe "total_revenue" do it "calculates the total revenue" do # need to validate how much they have in their total revenue - expect(merchant(:canoeing_chris).total_revenue).must_equal 11.11 + expect(merchant.total_revenue).must_equal 11.11 end it "returns 0 if the merchant has no revenue" do - expect(merchant(:fishin_fiona).total_revenue).must_equal 0 + expect(merchant.total_revenue).must_equal 0 end end describe "revenue_by_status" do it "calculates the total revenue by status passed in" do # veriyf the must_equal to the two following - expect(merchant(:trailin_trinity).total_revenue_by_status("paid")).must_equal 11.15 - expect(merchant(:fishin_fiona).total_revenue_by_status("pending")).must_equal 831.06 + expect(merchant.total_revenue_by_status("paid")).must_equal 11.15 + expect(merchant.total_revenue_by_status("pending")).must_equal 831.06 end # it "will return 0 for a non-existing status" do From eda3598a598e9a962e8ada064290922e3c6313c2 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Thu, 18 Jun 2020 00:49:26 -0700 Subject: [PATCH 266/350] deleted old code and cleaned up indentations --- test/models/merchant_test.rb | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/test/models/merchant_test.rb b/test/models/merchant_test.rb index 69572534bc..9c7b7f908b 100644 --- a/test/models/merchant_test.rb +++ b/test/models/merchant_test.rb @@ -33,21 +33,6 @@ end end - # describe "build_from_github" do - # it "returns a merchant" do - # auth_hash = OmniAuth::AuthHash.new(mock_auth_hash) - - # merchant = Merchant.build_from_github(auth_hash) - - # merchant.must_be_kind_of Merchant - # expect(merchant.uid).must_equal auth_hash[:uid] - # expect(merchant.provider).must_equal "github" - # expect(merchant.email).must_equal auth_hash["info"]["email"] - # expect(merchant.nickname).must_equal auth_hash["info"]["nickname"] - # expect(merchant.name).must_equal auth_hash["info"]["name"] - # end - # end - describe "build_from_github" do it "creates a new merchant" do auth_hash = { @@ -71,7 +56,6 @@ end end - describe "custom methods made" do describe "total_revenue" do it "calculates the total revenue" do From 66caf5396e2bf128b1650a58538e5f70d1263f0a Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 01:01:57 -0700 Subject: [PATCH 267/350] created merchant.yml for testing --- test/fixtures/merchants.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 test/fixtures/merchants.yml diff --git a/test/fixtures/merchants.yml b/test/fixtures/merchants.yml new file mode 100644 index 0000000000..0ffc8a979d --- /dev/null +++ b/test/fixtures/merchants.yml @@ -0,0 +1,4 @@ +diana: + email: wowtestingissofun@nightowl.edu + username: dnguye2 + uid: 2 \ No newline at end of file From 8a5734120f3c7d4b204a397664452c2913b853bd Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 01:02:13 -0700 Subject: [PATCH 268/350] DRY up tests, reformatted show test --- test/controllers/products_controller_test.rb | 32 ++++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb index 0a192bbbdc..b871b335d4 100644 --- a/test/controllers/products_controller_test.rb +++ b/test/controllers/products_controller_test.rb @@ -6,17 +6,17 @@ end describe "index" do - it "responds with success when there are many passengers saved" do + it "responds with success when there are many products saved" do Product.create(product_name: 'Smartwool Socks', price: 20.00) Product.create(product_name: 'Cliff Coffee Bar', price: 2.00) - get "/products" + get products_path must_respond_with :success end it "responds with success when there are no passengers saved" do - get "/products" + get products_path must_respond_with :success end @@ -25,17 +25,21 @@ describe "show" do it "responds with success when showing an existing valid product" do + # TODO + products(:snow_pass).merchant = merchants(:diana) + products(:snow_pass).save + valid_product_id = products(:snow_pass).id - get "/products/#{valid_product_id}" + + get product_path(valid_product_id) must_respond_with :success end it "responds with 404 with an invalid product id" do - get "/products/#{@invalid_product_id}" + get product_path(@invalid_product_id) - assert_equal 'Product has either been deleted, sold out, or not found.', flash[:error] must_respond_with :not_found end end @@ -47,4 +51,20 @@ must_redirect_to root_path end end + + describe "create" do + + end + + describe "update" do + + end + + describe "edit" do + + end + + describe "retired" do + + end end From 6eac820d9e4b7018eb0e60af3522dc6d9800d726 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 01:14:36 -0700 Subject: [PATCH 269/350] created and passed product#create tests --- test/controllers/products_controller_test.rb | 61 +++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb index b871b335d4..3cf934789b 100644 --- a/test/controllers/products_controller_test.rb +++ b/test/controllers/products_controller_test.rb @@ -53,9 +53,68 @@ end describe "create" do - + let (:product_hash) { + { + product: { + product_name: "Mt. Everest", + description: "Yeah that mountain", + price: 300000, + photo_url: "www.learningtoliketests.com/sort-of.png", + stock: 3, + retired: false, + merchant_id: merchants(:diana).id + } + } + } + + it "can create a new product, and responds with a redirect" do + expect { + post products_path, params: product_hash + }.must_differ 'Product.count', 1 + + must_redirect_to product_path(Product.last) + expect(Product.last.product_name).must_equal product_hash[:product][:product_name] + end + + it "does not create a product if given bad data, and responds with a redirect" do + + end + end + + # describe "create" do + # let (:passenger_hash) { + # { + # passenger: { + # name: "Cookie Monster", + # phone_num: "9999" + # } + # } + # } + + # it "can create a new passenger with valid information accurately, and redirect" do + # expect { + # post passengers_path, params: passenger_hash + # }.must_differ 'Passenger.count', 1 + + # must_redirect_to root_path + # expect(Passenger.last.name).must_equal passenger_hash[:passenger][:name] + # expect(Passenger.last.phone_num).must_equal passenger_hash[:passenger][:phone_num] + # end + + # it "does not create a passenger if the form if the form has invalid name, and responds with a redirect" do + # no_name = passenger_hash[:passenger][:name] = nil + + # expect { + # post passengers_path, params: no_name + # }.must_differ 'Passenger.count', 0 + + # must_respond_with :redirect + # must_redirect_to new_passenger_path + # end + # end + describe "update" do end From 2b6a060b73f130e0de0ba0bfcfc122c2ec796b7e Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 01:18:22 -0700 Subject: [PATCH 270/350] completed product#create edge case test --- test/controllers/products_controller_test.rb | 45 ++++---------------- 1 file changed, 9 insertions(+), 36 deletions(-) diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb index 3cf934789b..25bad2ed01 100644 --- a/test/controllers/products_controller_test.rb +++ b/test/controllers/products_controller_test.rb @@ -76,44 +76,17 @@ expect(Product.last.product_name).must_equal product_hash[:product][:product_name] end - it "does not create a product if given bad data, and responds with a redirect" do - - end - - end + it "does not create a product if given bad/insufficient data, and responds with a redirect" do + invalid_product_hash = product_hash[:product][:merchant_id] = nil + expect { + post products_path, params: invalid_product_hash + }.must_differ 'Product.count', 0 - # describe "create" do - # let (:passenger_hash) { - # { - # passenger: { - # name: "Cookie Monster", - # phone_num: "9999" - # } - # } - # } - - # it "can create a new passenger with valid information accurately, and redirect" do - # expect { - # post passengers_path, params: passenger_hash - # }.must_differ 'Passenger.count', 1 - - # must_redirect_to root_path - # expect(Passenger.last.name).must_equal passenger_hash[:passenger][:name] - # expect(Passenger.last.phone_num).must_equal passenger_hash[:passenger][:phone_num] - # end - - # it "does not create a passenger if the form if the form has invalid name, and responds with a redirect" do - # no_name = passenger_hash[:passenger][:name] = nil - - # expect { - # post passengers_path, params: no_name - # }.must_differ 'Passenger.count', 0 - - # must_respond_with :redirect - # must_redirect_to new_passenger_path - # end - # end + must_respond_with :redirect + must_redirect_to new_product_path + end + end describe "update" do From f55d1a424fd88fb61c35f61a8330c3bb50589a0e Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 01:47:48 -0700 Subject: [PATCH 271/350] created and pass all products#update tests --- test/controllers/products_controller_test.rb | 33 ++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb index 25bad2ed01..14afd4c333 100644 --- a/test/controllers/products_controller_test.rb +++ b/test/controllers/products_controller_test.rb @@ -89,7 +89,40 @@ end describe "update" do + let(:update_hash) { + { + product: { + merchant_id: merchants(:diana).id + } + } + } + it "can update an existing product with valid info and redirect" do + @product_id = products(:snow_pass).id + expect { + patch product_path(@product_id), params: update_hash + }.wont_change Product.count + + updated_item = products(:snow_pass).reload + must_redirect_to product_path(products(:snow_pass)) + expect(updated_item.merchant_id).must_equal update_hash[:product][:merchant_id] + end + + it "does not update product when given bad data" do + update_hash[:product][:merchant_id] = nil + + @product_id = products(:snow_pass).id + + expect { + patch product_path(@product_id), params: update_hash + }.wont_change Product.count + + expect { + patch product_path(@product_id), params: update_hash + }.wont_change products(:snow_pass).merchant_id + + end + end describe "edit" do From 7b494f055be21313578bff000b0d76b4ca64023d Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 02:23:52 -0700 Subject: [PATCH 272/350] products#edit tests --- test/controllers/products_controller_test.rb | 53 ++++++++++++++------ 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb index 14afd4c333..eb5c14498b 100644 --- a/test/controllers/products_controller_test.rb +++ b/test/controllers/products_controller_test.rb @@ -3,6 +3,7 @@ describe ProductsController do before do @invalid_product_id = -1 + @valid_product_id = products(:snow_pass).id end describe "index" do @@ -29,10 +30,7 @@ products(:snow_pass).merchant = merchants(:diana) products(:snow_pass).save - valid_product_id = products(:snow_pass).id - - - get product_path(valid_product_id) + get product_path(@valid_product_id) must_respond_with :success end @@ -98,9 +96,8 @@ } it "can update an existing product with valid info and redirect" do - @product_id = products(:snow_pass).id expect { - patch product_path(@product_id), params: update_hash + patch product_path(@valid_product_id), params: update_hash }.wont_change Product.count updated_item = products(:snow_pass).reload @@ -111,25 +108,53 @@ it "does not update product when given bad data" do update_hash[:product][:merchant_id] = nil - @product_id = products(:snow_pass).id - expect { - patch product_path(@product_id), params: update_hash + patch product_path(@valid_product_id), params: update_hash }.wont_change Product.count expect { - patch product_path(@product_id), params: update_hash + patch product_path(@valid_product_id), params: update_hash }.wont_change products(:snow_pass).merchant_id - end - end describe "edit" do - + it "prevents editing a product and flashes the correct message when not logged in" do + get edit_product_path(@valid_product_id) + assert_equal 'A problem occurred: You must log in to do that', flash[:error] + end + + # TODO: testing out login functionality + # it "redirects if the user editing a product's merchant is not the merchant" do + # perform_login + # @current_user = 1 + # get edit_product_path(@valid_product_id) + + # assert_equal 'User was successfully created.', flash[:error] + # end + + it "responds with success when getting the edit page for an existing, valid product" do + get edit_product_path(@valid_product_id) + + must_redirect_to root_path + end + + it "responds with redirect when getting the edit page for a non-existing product" do + get edit_product_path(@invalid_product_id) + + must_respond_with :not_found + end end describe "retired" do - + # TODO: Login permissions + # it "marks a product as retired" do + + # expect { + # patch patch retired_product_path(@valid_product_id) + # }.wont_change Product.count + + # products(:snow_pass).retired.must_equal true + # end end end From 1cee991240d67dcdde09ec8408b1e92f213c4a58 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 02:35:28 -0700 Subject: [PATCH 273/350] styled order confirmation page --- app/views/orders/success.html.erb | 75 ++++++++++++++++++++++++++----- 1 file changed, 65 insertions(+), 10 deletions(-) diff --git a/app/views/orders/success.html.erb b/app/views/orders/success.html.erb index 72806534eb..8bde643e57 100644 --- a/app/views/orders/success.html.erb +++ b/app/views/orders/success.html.erb @@ -1,13 +1,68 @@
    -

    TODO: Order confirmation page here!

    -
    -
      -
    • Order Number: <%= @order.id %>
      • -
    • Purchased On: <%= @order.created_at.to_date %>
      • -
    • Order Status: <%= @order.status %>
      • -
    • Name: <%= @order.cc_name %>
      • -
    • Shipping Address: <%= @order.address %>
      • -
    • Email: <%= @order.email %>
      • -
    +

    Order Summary

    +
    + + <% if @order.orderitems.empty? %> +
    +

    Your order is empty.

    +
    +<% else %> +

    Your Order's Current status: <%= @order.status %>

    +

    Purchase made on: <%= @order.created_at %>

    +
    ProductQuantityItem PriceItem Total
    - <%= image_tag "#{orderitem.product.photo_url}", alt: "#{orderitem.product.product_name}", class: "embed-responsive embed-responsive-1by1 cart__img" %> + + <%= image_tag "#{orderitem.product.photo_url}", alt: "#{orderitem.product.product_name}", class: "img-fluid img-thumbnail rounded-0" %> +

    <%= link_to orderitem.product.product_name, product_path(orderitem.product.id), class: "text-dark, cart__text" %>

    -     		-

    Quantity: <%= orderitem.quantity %>

    -

    - <%= link_to "edit", edit_orderitem_path(orderitem.id), class: "text-dark cart__text" %> | - <%= link_to "remove from cart", orderitem_path(orderitem.id), method: :delete, data: {confirm: "Are you sure?"}, class: "text-dark cart__text"%> -

    + <%= button_to "remove from cart", orderitem_path(orderitem.id), method: :delete, data: {confirm: "Are you sure?"}, class: "cart__remove-button"%>     		+
    <%= form_with model: orderitem, method: :patch do |f| %> <%= f.select :quantity, options_for_select((1..orderitem.product.stock), orderitem.quantity), {}, { value: orderitem.quantity, onchange: "this.form.submit();", class: "form-control"}%> @@ -35,8 +38,14 @@
    		-

    $<%= number_with_precision(orderitem.subtotal, :precision => 2, :delimiter => ',') %> ($<%= number_with_precision(orderitem.product.price, :precision => 2, :delimiter => ',') %> each)

    +     		+

    $<%= number_with_precision(orderitem.product.price, :precision => 2, :delimiter => ',') %>

    +     		+

    $<%= number_with_precision(orderitem.subtotal, :precision => 2, :delimiter => ',') %>
    + + + + + + + + + + + + <% @order.orderitems.each do |orderitem| %> + + + + + + + + + + + + + + <% end %> + + +
    ProductQuantityItem PriceItem Total
    + <%= image_tag "#{orderitem.product.photo_url}", alt: "#{orderitem.product.product_name}", class: "img-fluid img-thumbnail rounded-0" %> + +

    <%= link_to orderitem.product.product_name, product_path(orderitem.product.id), class: "text-dark, cart__text" %>

    +     		+

    + <%= orderitem.quantity %> +

    +     		+

    $<%= number_with_precision(orderitem.product.price, :precision => 2, :delimiter => ',') %>

    +     		+

    $<%= number_with_precision(orderitem.subtotal, :precision => 2, :delimiter => ',') %>

    +
    + +
    + +
    +
    +

    ORDER TOTAL: $<%= number_with_precision(@order.total, :precision => 2, :delimiter => ',') %>

    +
    + +
    + + +<% end %> + \ No newline at end of file From 070d89a03a8f832d54d900ae4ec9b742f579b4e4 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 02:49:08 -0700 Subject: [PATCH 274/350] added out of stock view --- app/views/products/show.html.erb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 996ef6d371..fcd4dfbeda 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -42,7 +42,9 @@
    <%= @product.description %>
    - <%# mini form to "add to card", link to order, and send up params of current product to be an orderitem %> + <% if @product.stock == 0 %> +

    OUT OF STOCK

    + <% else %> <%= form_with model: @orderitem, url: product_orderitems_path(@product.id) do |f| %>

    @@ -57,6 +59,7 @@ <%= f.submit "Add to Cart", class: "catalog__add-to-cart-button"%> <% end %> <% end %> + <% end %>

    From 4d10abb3d22ba0e128782f63784d6799956cbff8 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 02:49:27 -0700 Subject: [PATCH 275/350] condensed view all merchants --- app/views/merchants/index.html.erb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/merchants/index.html.erb b/app/views/merchants/index.html.erb index 022e795567..4f9eefe980 100644 --- a/app/views/merchants/index.html.erb +++ b/app/views/merchants/index.html.erb @@ -16,12 +16,13 @@
    + <% if merchant.id == session[:merchant_id] %>
    <%= button_to merchant.username, merchant_path(merchant.id), method: :get, class: "catalog__card-title-button text-left"%>
    - + <% end %>
    -
    <%= link_to "View Shop", products_path(username: merchant.username), class: "catalog__card-title-button text-left"%>
    +
    <%= link_to "#{merchant.username}'s' Shop", products_path(username: merchant.username), class: "catalog__card-title-button text-left"%>
    From 887f4a17164823c6a2b64ea2e4f8239ec8271616 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 02:50:20 -0700 Subject: [PATCH 276/350] removed typo in iteration of merchant shops --- app/views/merchants/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/merchants/index.html.erb b/app/views/merchants/index.html.erb index 4f9eefe980..31b3e9eeb6 100644 --- a/app/views/merchants/index.html.erb +++ b/app/views/merchants/index.html.erb @@ -22,7 +22,7 @@ <% end %>
    -
    <%= link_to "#{merchant.username}'s' Shop", products_path(username: merchant.username), class: "catalog__card-title-button text-left"%>
    +
    <%= link_to "#{merchant.username}'s Shop", products_path(username: merchant.username), class: "catalog__card-title-button text-left"%>
    From 5935b038164331d65087827149abd19251111922 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 02:51:37 -0700 Subject: [PATCH 277/350] modified cart is empty text --- app/views/orders/cart.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/orders/cart.html.erb b/app/views/orders/cart.html.erb index 583e8ecdfc..32f3e453d1 100644 --- a/app/views/orders/cart.html.erb +++ b/app/views/orders/cart.html.erb @@ -3,7 +3,7 @@

    YOUR CART

    <% if @order.orderitems.empty? %>
    -

    Your cart is empty.

    +

    Cart is empty

    <% else %> From 2f6a01552f5f7bced40a6309f0263870d9e58059 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 09:03:27 -0700 Subject: [PATCH 278/350] added total # of reviews --- app/views/merchants/show.html.erb | 2 +- app/views/products/index.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/merchants/show.html.erb b/app/views/merchants/show.html.erb index 2dc4c1bbee..eb59170468 100644 --- a/app/views/merchants/show.html.erb +++ b/app/views/merchants/show.html.erb @@ -58,7 +58,7 @@ $<%= number_with_precision(product.price, :precision => 2, :delimiter => ',') %>
    - Rating: ##/5 (# of reviews) + Rating: ##/5 (<%= product.reviews.count %> reviews)

    <%= link_to "Edit product", edit_product_path(product.id), method: :get, class: "product__new-button" %>
    diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index 4063f325ee..e01121b01f 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -26,7 +26,7 @@ $<%= number_with_precision(product.price, :precision => 2, :delimiter => ',')%>
    - Rating: ##/5 (# of reviews) + Rating: ##/5 (<%= product.reviews.count %> reviews)
    From ac52a4f93d37910d0849cd6258283afd3d622f36 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Thu, 18 Jun 2020 09:04:22 -0700 Subject: [PATCH 279/350] working on tests to pass --- app/controllers/merchants_controller.rb | 12 ++--- test/controllers/merchants_controller_test.rb | 52 +++++++++++++++++-- 2 files changed, 54 insertions(+), 10 deletions(-) diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rb index 20882e8ca7..0e0f4daf10 100644 --- a/app/controllers/merchants_controller.rb +++ b/app/controllers/merchants_controller.rb @@ -7,9 +7,9 @@ def index end def show - @merchant = Merchant.find_by(id: params[:id]) + @merchants = Merchant.find_by(id: params[:id]) @url = "http://thecatapi.com/api/images/get?format=src&type=gif×tamp=" - if @merchant.nil? + if @merchants.nil? head :not_found return end @@ -37,7 +37,7 @@ def create def logout session[:merchant_id] = nil - flash[:success] = "Successfully logged out" + flash[:result_text] = "Successfully logged out" redirect_to root_path return end @@ -46,11 +46,9 @@ def current @current_merchant = Merchant.find_by(id: session[:merchant_id]) end - #need to track OrderItems - private - def merchant_params + # def merchant_params - end + # end end diff --git a/test/controllers/merchants_controller_test.rb b/test/controllers/merchants_controller_test.rb index 7861d3b7c5..e3ad17a053 100644 --- a/test/controllers/merchants_controller_test.rb +++ b/test/controllers/merchants_controller_test.rb @@ -1,7 +1,53 @@ require "test_helper" describe MerchantsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + + describe "index action" do + it "repsonds with success" do + get merchants_path + + must_respond_with :success + end + end + + describe 'show action' do + it 'responds with a success when id given exists' do + + get merchants_path((:id).uid) + must_respond_with :success + end + end + + + describe "create with build_from_github" do + it "returns a merchant" do + auth_hash = OmniAuth::AuthHash.new(mock_auth_hash(merchant(:ubeninja))) + + merchant = Merchant.build_from_github(auth_hash) + + merchant.must_be_kind_of Merchant + expect(merchant.uid).must_equal auth_hash[:uid] + expect(merchant.provider).must_equal "github" + expect(merchant.email).must_equal auth_hash["info"]["email"] + expect(merchant.nickname).must_equal auth_hash["info"]["nickname"] + expect(merchant.name).must_equal auth_hash["info"]["name"] + end + end + + describe "logout" do + it "logs a merchant out of their session when they click logout" do + post logout_path + expect(flash[:result_text]).must_equal "Successfully logged out" + must_respond_with :redirect + must_redirect_to root_path + end + end + + describe "current" do + it "responds with success when a current merchant is selected" do + get merchants_path + must_respond_with :success + end + end end + From c0295674dd9b09b7560e4067251a5e23be6de4eb Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 09:20:41 -0700 Subject: [PATCH 280/350] added product model test scaffolding --- test/models/product_test.rb | 69 +++++++++++++++++++++++++++++++++++-- 1 file changed, 66 insertions(+), 3 deletions(-) diff --git a/test/models/product_test.rb b/test/models/product_test.rb index 6977718e14..f07fb88c10 100644 --- a/test/models/product_test.rb +++ b/test/models/product_test.rb @@ -1,7 +1,70 @@ require "test_helper" describe Product do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + let (:new_product) { + Product.new( + product_name: "Mt. Everest", + description: "Yeah that mountain", + price: 300000, + photo_url: "www.learningtoliketests.com/sort-of.png", + stock: 3, + retired: false, + merchant_id: merchants(:diana).id + ) + } + + # relationships + describe "relationships" do + it "belongs to merchant" do + new_product.save + new_product = Product.last + puts new_product.inspect + + expect(new_product.merchant.valid?).must_equal true + expect(new_product.merchant).must_be_instance_of Merchant + end + + it "has and belongs to many categories" do + + end + + it "has many reviews" do + + end + + it "has many orderitems" do + + end + + it "has many orders through orderitems" do + + end + end + + # validations + describe "validations" do + it "is valid when all fields are present" do + expect(new_product.valid?).must_equal true + end + + it "is invalid without a product name" do + end + + it "is invalid without a price and must be greater than 0" do + end + + it "is invalid without a stock and must be greater than 0" do + end + end + + + + # custom methods + describe "custom methods" do + describe "retire!" do + it "can change a product's retired status from false to true" do + + end + end + end end From b99d6a19cf28278bb6ab181ab11da301ccf0c2fc Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 09:21:18 -0700 Subject: [PATCH 281/350] cleaned up code --- app/models/product.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/models/product.rb b/app/models/product.rb index d86c1c64bb..64eaeaf03d 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -8,10 +8,9 @@ class Product < ApplicationRecord has_many :reviews has_many :orderitems - # product.orders => all the orders that a product has been attached to has_many :orders, through: :orderitems def retire! self.update_attribute(:retired, true) - end + end end From 52463eb85f98491be49e051ef141522ec72a3cff Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 09:50:17 -0700 Subject: [PATCH 282/350] added skeleton order detail page --- app/views/orders/show.html.erb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/views/orders/show.html.erb b/app/views/orders/show.html.erb index a51717b1d0..0955f70c55 100644 --- a/app/views/orders/show.html.erb +++ b/app/views/orders/show.html.erb @@ -1,3 +1,13 @@
    -

    Show page for an order

    +
      +
    • Name: <%= @order.cc_name %>
      • +
    • Shipping Address: <%= @order.address %>
      • +
    • Email: <%= @order.email %>
      • +
    + +
      +
    • Order Number: <%= @order.id %>
      • +
    • Purchased On: <%= @order.created_at.to_date %>
      • +
    • Order Status: <%= @order.status %>
      • +
    \ No newline at end of file From 26b775f3e3081bc285b7ccf750a42980c0c91647 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 09:50:24 -0700 Subject: [PATCH 283/350] removed update view --- app/views/orders/update.html.erb | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 app/views/orders/update.html.erb diff --git a/app/views/orders/update.html.erb b/app/views/orders/update.html.erb deleted file mode 100644 index 46e7902168..0000000000 --- a/app/views/orders/update.html.erb +++ /dev/null @@ -1,16 +0,0 @@ -

    update page

    -

    <%= Order.last.orderitems.inspect %>

    - -
    -
      -
    • Name: <%= @order.cc_name %>
      • -
    • Shipping Address: <%= @order.address %>
      • -
    • Email: <%= @order.email %>
      • -
    - -
      -
    • Order Number: <%= @order.id %>
      • -
    • Purchased On: <%= @order.created_at.to_date %>
      • -
    • Order Status: <%= @order.status %>
      • -
    -
    \ No newline at end of file From 5eae80f092a0744ffa5b1e98db8a965d0d095eca Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Thu, 18 Jun 2020 09:53:29 -0700 Subject: [PATCH 284/350] tests passing --- app/models/merchant.rb | 4 ++-- test/controllers/merchants_controller_test.rb | 22 ++++++++++++++----- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/app/models/merchant.rb b/app/models/merchant.rb index 5016f224f1..cddf500adb 100644 --- a/app/models/merchant.rb +++ b/app/models/merchant.rb @@ -11,8 +11,8 @@ def self.build_from_github(auth_hash) merchant = Merchant.new merchant.uid = auth_hash[:uid] merchant.provider = "github" - merchant.username = auth_hash["info"]["nickname"] - merchant.email = auth_hash["info"]["email"] + merchant.username = auth_hash[:info][:username] + merchant.email = auth_hash[:info][:email] return merchant end diff --git a/test/controllers/merchants_controller_test.rb b/test/controllers/merchants_controller_test.rb index e3ad17a053..cc7923bb76 100644 --- a/test/controllers/merchants_controller_test.rb +++ b/test/controllers/merchants_controller_test.rb @@ -13,7 +13,7 @@ describe 'show action' do it 'responds with a success when id given exists' do - get merchants_path((:id).uid) + get merchants_path((:id)) must_respond_with :success end end @@ -21,16 +21,26 @@ describe "create with build_from_github" do it "returns a merchant" do - auth_hash = OmniAuth::AuthHash.new(mock_auth_hash(merchant(:ubeninja))) - + #binding.pry + #auth_hash = OmniAuth::AuthHash.new(mock_auth_hash(merchants(:ubeninja))) + # need to define merchants + + auth_hash = { + uid: 123, + info: { + email: "email@mail.com", + username: "randomname", + # name: "jolly" + } + } merchant = Merchant.build_from_github(auth_hash) merchant.must_be_kind_of Merchant expect(merchant.uid).must_equal auth_hash[:uid] expect(merchant.provider).must_equal "github" - expect(merchant.email).must_equal auth_hash["info"]["email"] - expect(merchant.nickname).must_equal auth_hash["info"]["nickname"] - expect(merchant.name).must_equal auth_hash["info"]["name"] + expect(merchant.email).must_equal auth_hash[:info][:email] + expect(merchant.username).must_equal auth_hash[:info][:username] + # expect(merchant.name).must_equal auth_hash[:info][:name] end end From 49fc4862bdc0b14640092cb5c13170e0cc409267 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Thu, 18 Jun 2020 10:10:48 -0700 Subject: [PATCH 285/350] trying to get test to pass --- app/controllers/merchants_controller.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rb index 5119675d00..e592d6c222 100644 --- a/app/controllers/merchants_controller.rb +++ b/app/controllers/merchants_controller.rb @@ -69,9 +69,5 @@ def show end end - private - - def merchant_params - - end + end From 6d068d30dc4801565eac97bfc58d6d9ded29077d Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Thu, 18 Jun 2020 10:27:08 -0700 Subject: [PATCH 286/350] Progress on order_controller. --- test/controllers/orders_controller_test.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/test/controllers/orders_controller_test.rb b/test/controllers/orders_controller_test.rb index 4d0a83b3bb..3a095829b9 100644 --- a/test/controllers/orders_controller_test.rb +++ b/test/controllers/orders_controller_test.rb @@ -35,7 +35,7 @@ end it "responds with success for valid orders with paid status" do - get order_path(id: orders(:order2)) + get order_path(orders(:order2).id) must_respond_with :success end end @@ -91,8 +91,7 @@ it "renders edit and bad_request status if order fails to update" do order = orders(:pending_order) - - puts "OUR ORDER FROM SESSION IS::::::: #{session[:order_id]}" + puts "OUR ID IS::::::: #{order.id}" expect(order.email).must_be_nil @@ -107,7 +106,7 @@ expect { patch order_path(order.id), params: valid_params} - .wont_change Order.count + .wont_change "Order.count" expect(order.email).must_be_nil must_respond_with :redirect From de14baf16a5dfaccf3c9a724e94e52365dbf00d5 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Thu, 18 Jun 2020 10:27:28 -0700 Subject: [PATCH 287/350] deleted old code --- test/controllers/merchants_controller_test.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/test/controllers/merchants_controller_test.rb b/test/controllers/merchants_controller_test.rb index cc7923bb76..278b74e676 100644 --- a/test/controllers/merchants_controller_test.rb +++ b/test/controllers/merchants_controller_test.rb @@ -18,19 +18,14 @@ end end - describe "create with build_from_github" do it "returns a merchant" do - #binding.pry - #auth_hash = OmniAuth::AuthHash.new(mock_auth_hash(merchants(:ubeninja))) - # need to define merchants auth_hash = { uid: 123, info: { email: "email@mail.com", username: "randomname", - # name: "jolly" } } merchant = Merchant.build_from_github(auth_hash) @@ -40,7 +35,6 @@ expect(merchant.provider).must_equal "github" expect(merchant.email).must_equal auth_hash[:info][:email] expect(merchant.username).must_equal auth_hash[:info][:username] - # expect(merchant.name).must_equal auth_hash[:info][:name] end end From 3ae2386f07bb1841fa91ae97c576a94ad3e379ec Mon Sep 17 00:00:00 2001 From: denisseai Date: Thu, 18 Jun 2020 10:28:54 -0700 Subject: [PATCH 288/350] Added yml file for reviews --- test/controllers/reviews_controller_test.rb | 37 +++++++++++++++++++-- test/fixtures/reviews.yml | 12 +++++++ test/models/review_test.rb | 5 --- 3 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 test/fixtures/reviews.yml diff --git a/test/controllers/reviews_controller_test.rb b/test/controllers/reviews_controller_test.rb index 444c98848f..97453de246 100644 --- a/test/controllers/reviews_controller_test.rb +++ b/test/controllers/reviews_controller_test.rb @@ -1,7 +1,38 @@ require "test_helper" describe ReviewsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + require "test_helper" + + describe Review do + describe "new" do + it "" do + get new_review_path(product_id: Product.first.id) + must_respond_with :success + end + end + describe "create" do + it "can create a valid review and redirects to product page" do + valid_hash = { + review: { + rating: 5, + product: products(:rx_bar) + }, + } + expect { + post reviews_path(product_id: products(:rx_bar).id), params: valid_hash + }.must_change "Review.count", 1 + + new_review = Review.last + + expect(new_review.rating).must_equal 5 + expect(new_review.text_review).must_be_nil + expect(new_review.product_id).must_equal products(:rx_bar).id + + must_redirect_to product_path(id: products(:rx_bar).id) + end + end + describe "review_params" do + end + end + end diff --git a/test/fixtures/reviews.yml b/test/fixtures/reviews.yml new file mode 100644 index 0000000000..b637068995 --- /dev/null +++ b/test/fixtures/reviews.yml @@ -0,0 +1,12 @@ +review1: + rating: 5 + content: "Great as a gift" + product_id: 1 +review2: + rating: 4 + content: "Amazing jerky" + product_id: 2 +review3: + rating: 3 + content: "Bananas for this banana bread granola" + product_id: 3 \ No newline at end of file diff --git a/test/models/review_test.rb b/test/models/review_test.rb index 626fa522d8..b538950c2e 100644 --- a/test/models/review_test.rb +++ b/test/models/review_test.rb @@ -1,7 +1,2 @@ require "test_helper" - -describe Review do - # it "does a thing" do - # value(1+1).must_equal 2 - # end end From e3d8ddb1289f504368da390ce606c0608bdccb2c Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 10:29:05 -0700 Subject: [PATCH 289/350] changed redired for retired --- app/controllers/products_controller.rb | 28 ++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 65dc5ed8b2..6ba25f8d16 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -66,8 +66,9 @@ def retired end if @product.retire! - flash[:success] = "#{@product.product_name} successfully retired!" - redirect_to merchant_path(session[:merchant_id]) #or wherever you want to redirect to + flash[:success] = "#{@product.product_name} successfully retired!" + redirect_back(fallback_location: root_path) + # redirect_to merchant_path(session[:merchant_id]) #or wherever you want to redirect to end end @@ -84,3 +85,26 @@ def product_params return params.require(:product).permit(:product_name, :price, :description, :photo_url, :stock, :merchant_id, category_ids: []) end end + + + +# describe "edit" do +# before do +# @passenger = Passenger.create(name: 'Bojack', phone_num: '27') +# end + +# it "responds with success when getting the edit page for an existing, valid passenger" do +# valid_passenger_id = @passenger.id + +# get "/passengers/#{valid_passenger_id}/edit" + +# must_respond_with :success +# end + +# it "responds with redirect when getting the edit page for a non-existing passenger" do +# get "/passengers/#{@invalid_passenger_id}/edit" + +# must_respond_with :redirect +# must_redirect_to passengers_path +# end +# end \ No newline at end of file From 54b1486c03c3e0db0d80f06eb1e156ecd2cd90e2 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 11:55:51 -0700 Subject: [PATCH 290/350] commented out unneeded method, delete later --- app/models/order.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/models/order.rb b/app/models/order.rb index b55322d55b..8326a242bc 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -83,11 +83,11 @@ def checkout return true end - def is_order_of(merch_id) - if self.products.find_by(merchant_id: merch_id).nil? - return false - end + # def is_order_of(merch_id) + # if self.products.find_by(merchant_id: merch_id).nil? + # return false + # end - return true - end + # return true + # end end From c1fd8e4f9f89611b39e3943893380826e0e00b98 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 11:56:14 -0700 Subject: [PATCH 291/350] added orders#index --- app/controllers/orders_controller.rb | 9 ++++++++- config/routes.rb | 8 +++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index c291d7a3e3..8e5a14e485 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -1,12 +1,19 @@ class OrdersController < ApplicationController # todo -product model made then collab for update order quantity - # before_action :require_login, only: [:merchant_order] + before_action :require_login, only: [:index] before_action :find_order_from_session, only: [:edit, :update, :cart] # delete merch order from 6 if not used eventually ***** before_action :find_order_from_params, only: [:show, :merchant_order, :success] + # Renders details page for order already paid for (or cancelled?) # if we want other redirect behavior, edit later****** + def index + @merchant = Merchant.find_by(id: session[:merchant_id]) + @order_collection = @merchant.all_orders + @total_revenue = @merchant.total_revenue + end + def show ; end # Renders payment information form diff --git a/config/routes.rb b/config/routes.rb index de043f9f2f..e898fcb0d5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,10 +7,12 @@ patch :retired, on: :member #products/1/retired end - resources :orderitems, only: [:update, :destroy] + resources :orderitems, only: [:update, :destroy] do + patch :status, on: :member #products/1/status + end patch 'orderitems/:id/mark_shipped', to: 'orderitems#mark_shipped', as: 'mark_shipped' - resources :orders, only: [:new, :show, :edit, :update, :cancel] + resources :orders, only: [:index, :new, :show, :edit, :update, :cancel] # # below for checkout success confirmation page get '/orders/:id/cart/success', to: 'orders#success', as: 'success' get '/orders/:id/cart', to: 'orders#cart', as: 'cart' @@ -20,7 +22,7 @@ post "/auth/github", as: "github_login" get "/auth/github/callback", to: "merchants#create", as: "auth_callback" post "/logout", to: "merchants#logout", as: "logout" - get '/orders/:id/merchant_order', to: 'orders#merchant_order', as: 'merchant_order' + # get '/orders/:id/merchant_order', to: 'orders#merchant_order', as: 'merchant_order' resources :reviews, only: [:new, :create] resources :categories, only: [:new, :create] end From c38e17a4cac12e7c4cde5f49d74b86ad32a0b55f Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 11:56:28 -0700 Subject: [PATCH 292/350] added orders#index which serves as order dashboard --- app/views/orders/index.html.erb | 80 +++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 app/views/orders/index.html.erb diff --git a/app/views/orders/index.html.erb b/app/views/orders/index.html.erb new file mode 100644 index 0000000000..50f41034ea --- /dev/null +++ b/app/views/orders/index.html.erb @@ -0,0 +1,80 @@ +
    +

    ORDER FULFILLMENT PAGE

    +

    TOTAL REVENUE: $<%= number_with_precision(456789, :precision => 2, :delimiter => ',') %>

    +
    + +

    All orders

    + + + + <%# TODO: add column names %> + + + + +<%# On the order fulfillment page: + + Total Revenue - √ + Total Revenue by status + Total number of orders by status + Filter orders displayed by status + Link to each individual order - √ + A list of orders including at least one of my products: + DateTime the order was placed - √ + Each order item sold by me with a quantity and - √ + line-item subtotal - √ + A link to the item description page - √ + Link to transition the order item to marked as shipped - √ + The current status of the order ("pending", "paid", "complete", "cancelled") - √ %> + + + <% @order_collection.each do |order| %> + + + + + + + + + <% end %> + + +
    +

    Order ID: <%= order.id %>

    +

    Created: <%= order.created_at.strftime("%m/%d/%Y at %I:%M%p") %>
    Status: <%= order.status %>

    +
    + + <%# Orderitems Table Header %> + + + + + + + + + + <%# Orderitems Table Content %> + <% order.orderitems.each do |orderitem| %> + + + + + + + <% end %> +
    product namesubtotalquantityShip product
    +
    <%= link_to orderitem.product.product_name, product_path(orderitem.product.id), class: "text-dark, cart__text" %>
    +     		+
    $<%= number_with_precision(orderitem.subtotal, :precision => 2, :delimiter => ',') %>
    +     		+
    + <%= orderitem.quantity %> +
    +     		+ <%= link_to "TODO FUNCTIONING MARK SHIPPED", root_path, class: "catalog__add-to-cart-button" %> +
    +
    + +
    \ No newline at end of file From d59bec7393b5c8d0c611de765c54b9732845c16a Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 11:56:37 -0700 Subject: [PATCH 293/350] merchant methods for order dashboard --- app/models/merchant.rb | 55 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 47 insertions(+), 8 deletions(-) diff --git a/app/models/merchant.rb b/app/models/merchant.rb index f841d469e3..bfefc452ea 100644 --- a/app/models/merchant.rb +++ b/app/models/merchant.rb @@ -6,7 +6,7 @@ class Merchant < ApplicationRecord # custom mthod to create new merchant def self.build_from_github(auth_hash) - merchant = Merchant.new + merchant = Merchant.news merchant.uid = auth_hash[:uid] merchant.provider = "github" merchant.username = auth_hash[:info][:username] @@ -14,9 +14,21 @@ def self.build_from_github(auth_hash) return merchant end - # need to work with OrderItem - def self.total_revenue + def total_revenue + revenue = 0 + orders = self.all_orders + + orders.each do |order| + order.orderitems.each do |item| + if item.product.merchant_id == self.id + product = Product.find_by(id: item.product_id) + price = product.price + revenue += price + end + end + end + return revenue end def all_orders @@ -25,7 +37,8 @@ def all_orders Order.all.each do |order| order.orderitems.each do |item| if item.product.merchant_id == self.id - merchant_orders << item.order_id + order = Order.find_by(id: item.order_id) + merchant_orders << order break end end @@ -34,9 +47,35 @@ def all_orders return merchant_orders end - # need to work with OrderItem - def revenue_by_status(status) - + def order_status(status) + # return all of the merchant's orders with a certain status + orders = self.all_orders + status_orders = [] + + orders.each do |order| + if order.status == status + status_orders << order + end + end + + return status_orders end -end + + def revenue_by_status(status) + revenue_by_status = 0 + orders_of_a_status = self.order_status(status) + + orders_of_a_status.each do |order| + order.orderitems.each do |item| + if item.product.merchant_id == self.id + product = Product.find_by(id: item.product_id) + price = product.price + revenue_by_status += price + end + end + end + + return revenue_by_status + end +end \ No newline at end of file From 4be2e78e505dafcc5490163f4f160a7766a4137f Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 11:56:55 -0700 Subject: [PATCH 294/350] scaffolding for merchant revenue model methods --- test/models/merchant_test.rb | 61 +++++++++++++++++++++++++++++++++--- 1 file changed, 56 insertions(+), 5 deletions(-) diff --git a/test/models/merchant_test.rb b/test/models/merchant_test.rb index 30f950fa0c..d5e58aa59f 100644 --- a/test/models/merchant_test.rb +++ b/test/models/merchant_test.rb @@ -2,21 +2,72 @@ require "pry" describe Merchant do + describe "total_revenue" do + it "correctly calculates the total revenue for a merchant" do + merchant = merchants(:greta) + # 2.45 for rxbar in order3 + 5,000 for rainier in order4 + 5,000 for rainier in order5 + # formatting for money correct??? + expect(merchant.total_revenue).must_equal 10002.45 + end + + it "returns 0 if a merchant has not sold any products" do + merchant = merchants(:no_products_merchant) + + expect(merchant.total_revenue).must_equal 0 + end + end + describe "all_orders" do it "finds all the orders containing at least one item from a merchant" do merchant = merchants(:greta) merchant2 = merchants(:bob) - # from fixtures, greta's products (snow_pass) are in 2 separate orders + # from fixtures, greta's products (snow_pass) are in 3 separate orders # while bob's products are in 4 orders - expect(merchant.all_orders.count).must_equal 2 - expect(merchant2.all_orders.count).must_equal 4 + expect(merchant.all_orders).must_be_kind_of Array + expect(merchant.all_orders.length).must_equal 3 + expect(merchant2.all_orders.length).must_equal 4 end - it "returns no orders if there are no items from that merchant in any order" do + it "returns an empty array if there are no items from that merchant in any order" do merchant = merchants(:no_products_merchant) - expect(merchant.all_orders.count).must_equal 0 + expect(merchant.all_orders).must_be_kind_of Array + expect(merchant.all_orders).must_be_empty + end + end + + describe "order_status" do + it "finds all of a merchant's orders of a certain status" do + merchant = merchants(:greta) + + expect(merchant.order_status("complete").must_be_kind_of Array + expect(merchant.order_status("complete").length).must_equal 2 + expect(merchant.order_status("cancelled").length).must_equal 1 + end + + it "returns an empty collection if there are no merchant orders of a certain status" do + merchant = merchants(:greta) + # greta does not have any pending orders... (?) + expect(merchant.order_status("pending").must_be_kind_of Array + expect(merchant.order_status("pending").length).must_equal 0 + end + end + + describe "revenue_by_status" do + it "returns the correct total revenue for a merchant's products sold in an order of a given status" do + merchant = merchants(:greta) + + expect(merchant.revenue_by_status("complete").must_equal 5002.45 + + # NOT SURE IF THIS IS CORRECT FOR CANCELLED ORDER REVENUE???? (DELETE IF UNSURE) + expect(merchant.revenue_by_status("cancelled").must_equal 5000 + end + + it "returns 0 if there is no revenue associated with merchant orders of a certain status" do + merchant = merchants(:greta) + # greta does not have any pending orders... (?) + expect(merchant.order_status("pending").must_equal 0 end end end From 1faf7ce8b66604a7c53eee569aca28483431a226 Mon Sep 17 00:00:00 2001 From: Lola Llanes Date: Thu, 18 Jun 2020 11:57:07 -0700 Subject: [PATCH 295/350] added tests for validations, relationshis, and github --- app/models/merchant.rb | 25 +------------------------ test/models/merchant_test.rb | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 25 deletions(-) diff --git a/app/models/merchant.rb b/app/models/merchant.rb index fb7d69c601..5f650a21a9 100644 --- a/app/models/merchant.rb +++ b/app/models/merchant.rb @@ -14,29 +14,6 @@ def self.build_from_github(auth_hash) return merchant end - def total_revenue - total_revenue = 0 - - self.order_items.each do |orderitem| - if orderitem.order.cart_status == "paid" - total_revenue += orderitem.total - end - end - - return total_revenue - end - - # double check on edge cases i.e. nil or pending order - def revenue_by_status(status) - total_revenue = 0 - - self.order_items.each do |orderitem| - if orderitem.order.cart_status == status - total_revenue += orderitem.total - end - end - - return total_revenue - end + end diff --git a/test/models/merchant_test.rb b/test/models/merchant_test.rb index 9c7b7f908b..2b0a079267 100644 --- a/test/models/merchant_test.rb +++ b/test/models/merchant_test.rb @@ -1,7 +1,6 @@ require "test_helper" describe Merchant do - # let (:merchant) {merchant(:canoeing_chris)} let(:merchant) { Merchant.new( username: "Hollerin Harriet", @@ -15,6 +14,12 @@ expect(merchant.valid?).must_equal true end + it "is invalid without a username" do + merchant.username = nil + + expect(merchant.valid?).must_equal false + expect(merchant.errors.messages).must_include :username + end it 'is invalid without a unique email address' do invalid_merchant = Merchant.create(username: "new merchant", email: " ") @@ -30,6 +35,15 @@ product.must_be_kind_of Product end end + + + it "can have one or more order items through products" do + merchant.must_respond_to :order_items + merchant.order_items.each do |order_item| + order_item.must_be_kind_of OrderItem + end + end + end end From 88d544e57c6965f26c40bb7e7c5f1416c20210c2 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 11:57:20 -0700 Subject: [PATCH 296/350] added more fixtures --- test/fixtures/orderitems.yml | 5 +++++ test/fixtures/orders.yml | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/test/fixtures/orderitems.yml b/test/fixtures/orderitems.yml index 2b04fc3ee4..11704eff82 100644 --- a/test/fixtures/orderitems.yml +++ b/test/fixtures/orderitems.yml @@ -39,3 +39,8 @@ rainier2: order: order4 product: rainier shipped: false +rainier3: + quantity: 1 + order: order5 + product: rainier + shipped: false \ No newline at end of file diff --git a/test/fixtures/orders.yml b/test/fixtures/orders.yml index 6d8964e50a..cd6e6c8396 100644 --- a/test/fixtures/orders.yml +++ b/test/fixtures/orders.yml @@ -34,5 +34,14 @@ order4: cc_exp: 01/23 zip: 006434 status: cancelled +order5: + email: lifeisgood@good.com + address: 47 Life Ave + cc_name: Angela Kinsey + cc_num: 58483828282 + cvv: 564 + cc_exp: 11/29 + zip: 73999 + status: complete pending_order: status: pending \ No newline at end of file From b46345aff63bf62251910081b725db46dcd856ed Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 12:49:02 -0700 Subject: [PATCH 297/350] "@merchants" changed to "@merchant" --- app/controllers/merchants_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rb index 4a904807e9..987bdb7037 100644 --- a/app/controllers/merchants_controller.rb +++ b/app/controllers/merchants_controller.rb @@ -7,9 +7,9 @@ def index end def show - @merchants = Merchant.find_by(id: params[:id]) + @merchant = Merchant.find_by(id: params[:id]) @url = "http://thecatapi.com/api/images/get?format=src&type=gif×tamp=" - if @merchants.nil? + if @merchant.nil? head :not_found return end From d1faebfe253cb87998193a2fb9713d1797c35f9f Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Thu, 18 Jun 2020 12:54:39 -0700 Subject: [PATCH 298/350] Fixed typos in merchant_test, now tests run. --- test/models/merchant_test.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/models/merchant_test.rb b/test/models/merchant_test.rb index d5e58aa59f..a572584a87 100644 --- a/test/models/merchant_test.rb +++ b/test/models/merchant_test.rb @@ -41,15 +41,15 @@ it "finds all of a merchant's orders of a certain status" do merchant = merchants(:greta) - expect(merchant.order_status("complete").must_be_kind_of Array + expect(merchant.order_status("complete")).must_be_kind_of Array expect(merchant.order_status("complete").length).must_equal 2 expect(merchant.order_status("cancelled").length).must_equal 1 end it "returns an empty collection if there are no merchant orders of a certain status" do merchant = merchants(:greta) - # greta does not have any pending orders... (?) - expect(merchant.order_status("pending").must_be_kind_of Array + # greta does not have any pending orders... + expect(merchant.order_status("pending")).must_be_kind_of Array expect(merchant.order_status("pending").length).must_equal 0 end end @@ -58,16 +58,16 @@ it "returns the correct total revenue for a merchant's products sold in an order of a given status" do merchant = merchants(:greta) - expect(merchant.revenue_by_status("complete").must_equal 5002.45 + expect(merchant.revenue_by_status("complete")).must_equal 5002.45 # NOT SURE IF THIS IS CORRECT FOR CANCELLED ORDER REVENUE???? (DELETE IF UNSURE) - expect(merchant.revenue_by_status("cancelled").must_equal 5000 + expect(merchant.revenue_by_status("cancelled")).must_equal 5000 end it "returns 0 if there is no revenue associated with merchant orders of a certain status" do merchant = merchants(:greta) # greta does not have any pending orders... (?) - expect(merchant.order_status("pending").must_equal 0 + expect(merchant.order_status("pending")).must_equal 0 end end end From b7fde144404ea9ca14282c8928ed006539b2c05f Mon Sep 17 00:00:00 2001 From: denisseai Date: Thu, 18 Jun 2020 13:30:03 -0700 Subject: [PATCH 299/350] Added average rating to product model and corresponding views --- app/models/product.rb | 8 +++++ app/models/review.rb | 4 ++- app/views/products/index.html.erb | 2 +- app/views/products/show.html.erb | 2 +- test/controllers/reviews_controller_test.rb | 39 ++++++++++----------- 5 files changed, 31 insertions(+), 24 deletions(-) diff --git a/app/models/product.rb b/app/models/product.rb index d86c1c64bb..0681491ffe 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -14,4 +14,12 @@ class Product < ApplicationRecord def retire! self.update_attribute(:retired, true) end + + def average_rating + if reviews.count == 0 + return 0 + else + return self.reviews.map {|review| review.rating}.sum/self.reviews.count + end + end end diff --git a/app/models/review.rb b/app/models/review.rb index d4d6613711..4953a300b8 100644 --- a/app/models/review.rb +++ b/app/models/review.rb @@ -7,5 +7,7 @@ class Review < ApplicationRecord # less_than_or_equal_to: 5 # } -# validates NOT merchant id + # validates NOT merchant id + + end diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index 4063f325ee..8369e13788 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -26,7 +26,7 @@ $<%= number_with_precision(product.price, :precision => 2, :delimiter => ',')%>
    - Rating: ##/5 (# of reviews) + Rating: <%= product.average_rating%>/5 (<%=product.reviews.count%> of reviews)
    diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 440ff049b0..95783e5371 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -5,7 +5,7 @@
    <%= link_to "< HOME", root_path, class: "local-navigation" %>
    <%= link_to "< ALL PRODUCTS", products_path, class: "local-navigation" %>

    <%= @product.product_name %>

    -

    RATING: ##/5

    +

    RATING: <%= @product.average_rating%>/5

    Reviews: <%= @product.reviews.count %>

    Sold by: <%= link_to @product.merchant.username, merchant_path(@product.merchant), class: "catalog__detail-header" %>

    Categories: diff --git a/test/controllers/reviews_controller_test.rb b/test/controllers/reviews_controller_test.rb index 97453de246..781ec77102 100644 --- a/test/controllers/reviews_controller_test.rb +++ b/test/controllers/reviews_controller_test.rb @@ -7,31 +7,28 @@ describe "new" do it "" do get new_review_path(product_id: Product.first.id) - must_respond_with :success + assert_response :success end end - describe "create" do - it "can create a valid review and redirects to product page" do - valid_hash = { - review: { - rating: 5, - product: products(:rx_bar) - }, - } - expect { - post reviews_path(product_id: products(:rx_bar).id), params: valid_hash - }.must_change "Review.count", 1 - - new_review = Review.last - - expect(new_review.rating).must_equal 5 - expect(new_review.text_review).must_be_nil - expect(new_review.product_id).must_equal products(:rx_bar).id - - must_redirect_to product_path(id: products(:rx_bar).id) + + def create + @review = Review.create(review_params) + + if @review.save + flash[:success] = "Review successfully added." + redirect_to product_path(@review.product_id) + # TODO: Render status codes + else + render :new, status: :bad_request end end - describe "review_params" do + describe "create" do + it "can create a review" do + assert_difference('Review.count') do + post new_review_path, params: { review:{ product: 'rx_bar', rate: '5', content: "great"}} + end + assert_redirect_to + end end end From 3bb0609cace9e3a0cfb2ea9f75de0ece5343dfc7 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Thu, 18 Jun 2020 13:38:58 -0700 Subject: [PATCH 300/350] Fixed rainer typo in tests, smoothed after merging merchant tests. --- app/models/merchant.rb | 2 +- test/models/merchant_test.rb | 114 +++++++++++++++-------------------- test/models/order_test.rb | 4 +- 3 files changed, 52 insertions(+), 68 deletions(-) diff --git a/app/models/merchant.rb b/app/models/merchant.rb index d337c2a340..e1425863ba 100644 --- a/app/models/merchant.rb +++ b/app/models/merchant.rb @@ -6,7 +6,7 @@ class Merchant < ApplicationRecord # method to create new merchant using github login def self.build_from_github(auth_hash) - merchant = Merchant.news + merchant = Merchant.new merchant.uid = auth_hash[:uid] merchant.provider = "github" merchant.username = auth_hash[:info][:username] diff --git a/test/models/merchant_test.rb b/test/models/merchant_test.rb index 4d2e8eb4b6..54ba83f457 100644 --- a/test/models/merchant_test.rb +++ b/test/models/merchant_test.rb @@ -2,37 +2,6 @@ require "pry" describe Merchant do - describe "total_revenue" do - it "correctly calculates the total revenue for a merchant" do - merchant = merchants(:greta) - # 2.45 for rxbar in order3 + 5,000 for rainier in order4 + 5,000 for rainier in order5 - # formatting for money correct??? - expect(merchant.total_revenue).must_equal 10002.45 - end - - it "returns 0 if a merchant has not sold any products" do - merchant = merchants(:no_products_merchant) - - expect(merchant.total_revenue).must_equal 0 - end - end - - describe "all_orders" do - it "finds all the orders containing at least one item from a merchant" do - merchant = merchants(:greta) - merchant2 = merchants(:bob) - - # from fixtures, greta's products (snow_pass) are in 3 separate orders - # while bob's products are in 4 orders - expect(merchant.all_orders).must_be_kind_of Array - expect(merchant.all_orders.length).must_equal 3 - expect(merchant2.all_orders.length).must_equal 4 - end - - it "returns an empty array if there are no items from that merchant in any order" do - merchant = merchants(:no_products_merchant) - - expect(merchant.all_orders.count).must_equal 0 let(:merchant) { Merchant.new( username: "Hollerin Harriet", @@ -41,6 +10,7 @@ provider: "github" ) } + describe "validations" do it "is valid with all fields present and valid" do expect(merchant.valid?).must_equal true @@ -59,26 +29,28 @@ expect(invalid_merchant.valid?).must_equal false expect(invalid_merchant.errors.messages).must_include :email end + end - describe "relations" do - it "can have one or many products" do - merchant.must_respond_to :products - merchant.products.each do |product| - product.must_be_kind_of Product - end + describe "relations" do + it "can have one or many products" do + merchant.must_respond_to :products + merchant.products.each do |product| + product.must_be_kind_of Product end + end + # test products *** + it "can have one or more order items through products" do + merchant.must_respond_to :orderitems - it "can have one or more order items through products" do - merchant.must_respond_to :order_items - merchant.order_items.each do |order_item| - order_item.must_be_kind_of OrderItem - end + merchant.orderitems.each do |order_item| + order_item.must_be_kind_of OrderItem end - end end +# CUSTOM MODEL METHODS: + describe "build_from_github" do it "creates a new merchant" do auth_hash = { @@ -102,31 +74,37 @@ end end - describe "custom methods made" do - describe "total_revenue" do - it "calculates the total revenue" do - # need to validate how much they have in their total revenue - expect(merchant.total_revenue).must_equal 11.11 - end + describe "total_revenue" do + it "correctly calculates the total revenue for a merchant" do + merchant = merchants(:greta) + # 2.45 for rxbar in order3 + 5,000 for rainier in order4 + 5,000 for rainier in order5 + # formatting for money correct??? + expect(merchant.total_revenue).must_equal 10002.45 + end - it "returns 0 if the merchant has no revenue" do - expect(merchant.total_revenue).must_equal 0 - end + it "returns 0 if a merchant has not sold any products" do + merchant = merchants(:no_products_merchant) + + expect(merchant.total_revenue).must_equal 0 end + end - describe "revenue_by_status" do - it "calculates the total revenue by status passed in" do - # veriyf the must_equal to the two following - expect(merchant.total_revenue_by_status("paid")).must_equal 11.15 - expect(merchant.total_revenue_by_status("pending")).must_equal 831.06 - end + describe "all_orders" do + it "finds all the orders containing at least one item from a merchant" do + merchant = merchants(:greta) + merchant2 = merchants(:bob) - # it "will return 0 for a non-existing status" do - # # verify the n/a message - # expect(merchant(:canoeing_chris).total_revenue_by_status("n/a")).must_equal 0.0 - # end + # from fixtures, greta's products (snow_pass) are in 3 separate orders + # while bob's products are in 4 orders expect(merchant.all_orders).must_be_kind_of Array - expect(merchant.all_orders).must_be_empty + expect(merchant.all_orders.length).must_equal 3 + expect(merchant2.all_orders.length).must_equal 4 + end + + it "returns an empty array if there are no items from that merchant in any order" do + merchant = merchants(:no_products_merchant) + + expect(merchant.all_orders.count).must_equal 0 end end @@ -160,7 +138,13 @@ it "returns 0 if there is no revenue associated with merchant orders of a certain status" do merchant = merchants(:greta) # greta does not have any pending orders... (?) - expect(merchant.order_status("pending")).must_equal 0 + expect(merchant.revenue_by_status("pending")).must_equal 0 + end + + it "will return 0 for a non-existing status" do + merchant = merchants(:greta) + expect(merchant.total_revenue_by_status("n/a")).must_be_kind_of Array + expect(merchant.total_revenue_by_status("n/a")).must_equal 0 end end -end +end \ No newline at end of file diff --git a/test/models/order_test.rb b/test/models/order_test.rb index e528ee4094..d19ed1441d 100644 --- a/test/models/order_test.rb +++ b/test/models/order_test.rb @@ -34,7 +34,7 @@ end it "can update an Order" do - expect{ Orderitem.create(quantity: 1, order: pending_order, product: products(:rainer), shipped: false) }.must_change "pending_order.orderitems.count", 1 + expect{ Orderitem.create(quantity: 1, order: pending_order, product: products(:rainier), shipped: false) }.must_change "pending_order.orderitems.count", 1 expect{ pending_order.update( @@ -107,7 +107,7 @@ #low hanging fruit :P describe "All attributes must be present when updating" do before do - expect{ Orderitem.create(quantity: 1, order: pending_order, product: products(:rainer), shipped: false) }.must_change "pending_order.orderitems.count", 1 + expect{ Orderitem.create(quantity: 1, order: pending_order, product: products(:rainier), shipped: false) }.must_change "pending_order.orderitems.count", 1 @updated_order = pending_order.update( status: "paid" From fc645eadb3352d97ab9ca1d2ee710a6a7b14dd67 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 13:54:38 -0700 Subject: [PATCH 301/350] important pseudocode reminder --- app/models/merchant.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/merchant.rb b/app/models/merchant.rb index d337c2a340..088127d03d 100644 --- a/app/models/merchant.rb +++ b/app/models/merchant.rb @@ -15,6 +15,7 @@ def self.build_from_github(auth_hash) end def total_revenue + # TODO: remove cancelled order from consideration revenue = 0 orders = self.all_orders From dc7af1031612af3bbd81d7ed5320af7905b2a2ea Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 13:54:59 -0700 Subject: [PATCH 302/350] test cleaning --- test/models/order_test.rb | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/test/models/order_test.rb b/test/models/order_test.rb index e528ee4094..bf393d22ef 100644 --- a/test/models/order_test.rb +++ b/test/models/order_test.rb @@ -4,7 +4,7 @@ let(:paid_order) { orders(:order2) } let(:pending_order) { orders(:pending_order) } - describe "validation" do + describe "validations" do it "will not allow Orders to have no status" do paid_order.status = nil @@ -14,7 +14,7 @@ end end - it "cannot have a status other than pending, paid, cancel or complete" do + it "cannot have a status other than pending, paid, cancelled or complete" do paid_order.status = "pending" expect(paid_order.valid?).must_equal true @@ -24,7 +24,7 @@ paid_order.status = "complete" expect(paid_order.valid?).must_equal true - paid_order.status = "cancel" + paid_order.status = "cancelled" expect(paid_order.valid?).must_equal true paid_order.status = "gretchen" @@ -33,8 +33,8 @@ expect(paid_order.errors.messages[:status]).must_include "gretchen is not a valid status" end - it "can update an Order" do - expect{ Orderitem.create(quantity: 1, order: pending_order, product: products(:rainer), shipped: false) }.must_change "pending_order.orderitems.count", 1 + it "can update an Order with valid order data" do + expect{ Orderitem.create(quantity: 1, order: pending_order, product: products(:rainier), shipped: false) }.must_change "pending_order.orderitems.count", 1 expect{ pending_order.update( @@ -60,6 +60,7 @@ expect(pending_order.orderitems.length).must_equal 1 end + # DO WE NEED THIS ONE? OR TEST INVALID DATA? it "cannot update an Order" do expect(pending_order.orderitems.count).must_equal 0 @@ -76,6 +77,7 @@ ) ).must_equal false + # Does this pending order need to be referenced from fixtures differently? updated_order = Order.find_by(id: pending_order.id) expect(updated_order.email).must_be_nil @@ -88,7 +90,7 @@ expect(updated_order.status).must_equal "pending" end - it "will outputs errors if updating Orders without orderitems" do + it "will output errors if updating Orders without orderitems" do updated_order = pending_order.update( email: "lady@gmail.com", address: "2020 my house street", @@ -232,6 +234,18 @@ end describe "custom methods" do + + # def mark_as_complete! + # if self.status == "paid" && self.orderitems.find_by(shipped: false).nil? + # self.status = "complete" + # self.save! + # return true + # else + # return false + # end + # end + + # describe "reduce_stock" do # it "will reduce the number of product stock by orderitem quantity" do # expect(products(:rx_bar).stock).must_equal 3 From 3716c9377552e59cebf0614f7fe2a046f36f365b Mon Sep 17 00:00:00 2001 From: denisseai Date: Thu, 18 Jun 2020 14:08:43 -0700 Subject: [PATCH 303/350] Added test for review controller create method --- app/controllers/reviews_controller.rb | 2 +- app/models/review.rb | 11 +++++---- test/controllers/reviews_controller_test.rb | 25 ++++++++++++--------- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/app/controllers/reviews_controller.rb b/app/controllers/reviews_controller.rb index b64d16ac18..6906879ef2 100644 --- a/app/controllers/reviews_controller.rb +++ b/app/controllers/reviews_controller.rb @@ -18,7 +18,7 @@ def create private - def review_params + def review_params1 return params.require(:review).permit(:content, :rating, :product_id) end end diff --git a/app/models/review.rb b/app/models/review.rb index d4d6613711..e83472238c 100644 --- a/app/models/review.rb +++ b/app/models/review.rb @@ -1,11 +1,10 @@ class Review < ApplicationRecord belongs_to :product - - # validates :rating, presence: true, numericality: { - # only_integer: true, - # greater_than_or_equal_to: 1, - # less_than_or_equal_to: 5 - # } + validates :rating, presence: true, numericality: { + only_integer: true, + greater_than_or_equal_to: 1, + less_than_or_equal_to: 5 + } # validates NOT merchant id end diff --git a/test/controllers/reviews_controller_test.rb b/test/controllers/reviews_controller_test.rb index 97453de246..b30e93edcc 100644 --- a/test/controllers/reviews_controller_test.rb +++ b/test/controllers/reviews_controller_test.rb @@ -5,34 +5,37 @@ describe Review do describe "new" do - it "" do + it "successfully retrieve new review page for valid product id" do get new_review_path(product_id: Product.first.id) must_respond_with :success end end + describe "create" do + let(:product) { products(:rx_bar) } it "can create a valid review and redirects to product page" do valid_hash = { review: { rating: 5, - product: products(:rx_bar) + product_id: product.id }, - } - expect { - post reviews_path(product_id: products(:rx_bar).id), params: valid_hash - }.must_change "Review.count", 1 - + } + + assert_difference("Review.count") do + post reviews_path(product.id), params: valid_hash + end + new_review = Review.last expect(new_review.rating).must_equal 5 - expect(new_review.text_review).must_be_nil expect(new_review.product_id).must_equal products(:rx_bar).id + expect - must_redirect_to product_path(id: products(:rx_bar).id) + must_redirect_to product_path(products(:rx_bar).id) end end - describe "review_params" do - end + # describe "review_params" do + # end end end From d281176d27ed1d834d0d4b777012daea927b24f7 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 14:26:04 -0700 Subject: [PATCH 304/350] FIXED SIMPLECOV --- test/models/review_test.rb | 2 +- test/test_helper.rb | 45 ++++++++++++++++++++++++++++++++++---- 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/test/models/review_test.rb b/test/models/review_test.rb index b538950c2e..2c56dbaae7 100644 --- a/test/models/review_test.rb +++ b/test/models/review_test.rb @@ -1,2 +1,2 @@ require "test_helper" -end + diff --git a/test/test_helper.rb b/test/test_helper.rb index a6772d1af1..b07a382ef4 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,13 +1,10 @@ +require 'simplecov' require "pry" ENV['RAILS_ENV'] ||= 'test' require_relative '../config/environment' require 'rails/test_help' require "minitest/rails" require "minitest/reporters" # for Colorized output -require 'simplecov' -SimpleCov.start do - add_filter 'test/' -end # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, @@ -16,6 +13,10 @@ ) class ActiveSupport::TestCase + +SimpleCov.start do + add_filter 'test/' +end # Run tests in parallel with specified workers # parallelize(workers: :number_of_processors) # causes out of order output. @@ -61,4 +62,40 @@ def make_order puts "HERE IS ORDER ID: #{@order.id}" return @order end + + def setup + OmniAuth.config.test_mode = true + end + + def mock_auth_hash(merchant) + return { + provider: merchant.provider, + uid: merchant.uid, + info: { + nickname: merchant.username, + email: merchant.email, + }, + } + end + + + + + # Helper method that performs a log-in with either + # a passed-in user or the first test user + def perform_login(merchant = nil) + merchant ||= Merchant.first + OmniAuth.config.mock_auth[:github] = OmniAuth::AuthHash.new(mock_auth_hash(merchant)) + + # Act Try to call the callback route + get auth_callback_path(:github) + + merchant = User.find_by(uid: merchant.uid, username: merchant.username) + expect(merchant).wont_be_nil + + # Verify the user ID was saved - if that didn't work, this test is invalid + expect(session[:merchant_id]).must_equal merchant.id + + return merchant + end end From ccc35765b463da74bcbd040a38a931827af03425 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 14:27:42 -0700 Subject: [PATCH 305/350] condensed orderitems#mark_shipped --- app/controllers/orderitems_controller.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/controllers/orderitems_controller.rb b/app/controllers/orderitems_controller.rb index feee47c099..b47a8e0cc4 100644 --- a/app/controllers/orderitems_controller.rb +++ b/app/controllers/orderitems_controller.rb @@ -85,17 +85,14 @@ def destroy def mark_shipped if @orderitem.order.status == "paid" && @orderitem.shipped == false @orderitem.mark_item_shipped! - flash[:status] = :success - flash[:result_text] = "#{ @orderitem.product.product_name } has shipped!" + flash[:success] = "#{ @orderitem.product.product_name } has shipped!" # @orderitem.order.mark_as_complete! redirect_back fallback_location: root_path elsif @orderitem.order.status == "paid" && @orderitem.shipped == true - flash[:status] = :failure - flash[:result_text] = "#{ @orderitem.product.product_name } has already shipped." + flash[:failure] = "#{ @orderitem.product.product_name } has already shipped." redirect_back fallback_location: root_path else - flash[:status] = :failure - flash[:result_text] = "Cannot perform this action for a #{@orderitem.order.status} order" + flash[:failure] = "Cannot perform this action for a #{@orderitem.order.status} order" redirect_to root_path end end From 208729a941347e0af51efb06abc8ee62881deb14 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 14:28:21 -0700 Subject: [PATCH 306/350] added mark shipped button --- app/views/orders/index.html.erb | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/app/views/orders/index.html.erb b/app/views/orders/index.html.erb index 50f41034ea..4216ee681f 100644 --- a/app/views/orders/index.html.erb +++ b/app/views/orders/index.html.erb @@ -43,8 +43,9 @@
    product namesubtotal quantitysubtotalStatus Ship product
    <%= link_to orderitem.product.product_name, product_path(orderitem.product.id), class: "text-dark, cart__text" %>
    		 -
    $<%= number_with_precision(orderitem.subtotal, :precision => 2, :delimiter => ',') %>
    -
    <%= orderitem.quantity %>
    		- <%= link_to "TODO FUNCTIONING MARK SHIPPED", root_path, class: "catalog__add-to-cart-button" %> +
    $<%= number_with_precision(orderitem.subtotal, :precision => 2, :delimiter => ',') %>
    +     		+ <% if orderitem.shipped %> +
    + shipped +
    + <% else %> +
    + not shipped +
    + <% end %> +     		+ <%= link_to "Ship Item", mark_shipped_path(orderitem), method: :patch, data: {confirm: "Are you sure you want to mark #{orderitem.product.product_name} as shipped?"}, class: "cart__remove-button" %>

    $<%= number_with_precision(orderitem.subtotal, :precision => 2, :delimiter => ',') %>

    From 72a17d6543d094b2fffe48bb24b8e6bfd93dd089 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 17:21:31 -0700 Subject: [PATCH 318/350] classes for order styling --- app/assets/stylesheets/application.scss | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index ce6cb8e826..419742cf40 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -137,6 +137,29 @@ body { font-family: 'Rubik', sans-serif; } +.order__info { + color: #fff; +} + +.order__product-link { + +} + +.order__shipped { + color: rgb(21, 143, 21); +} + +.order__not-shipped { + color:#c21b1b; +} + + +.order__highlight { + background-color: #16161696; + padding: 1px; +} + + .catalog__header, .catalog__secondary-header, .catalog__detail-header { text-transform: uppercase; font-weight: 300; From 4e184fbb272088a946873b83adeb68f93f66f2bf Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 17:21:41 -0700 Subject: [PATCH 319/350] changed redirect for mark_shipped --- app/controllers/orderitems_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/orderitems_controller.rb b/app/controllers/orderitems_controller.rb index b47a8e0cc4..a007d7d5af 100644 --- a/app/controllers/orderitems_controller.rb +++ b/app/controllers/orderitems_controller.rb @@ -93,7 +93,7 @@ def mark_shipped redirect_back fallback_location: root_path else flash[:failure] = "Cannot perform this action for a #{@orderitem.order.status} order" - redirect_to root_path + redirect_back fallback_location: root_path end end From 11fbe469fb9572edbb377b763aa656aaf03dae40 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 17:22:01 -0700 Subject: [PATCH 320/350] added instance variables to display revenues and collections dependent on status --- app/controllers/orders_controller.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index 649c175d97..4cd318fc73 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -11,7 +11,14 @@ class OrdersController < ApplicationController def index @merchant = Merchant.find_by(id: session[:merchant_id]) @order_collection = @merchant.all_orders + @paid_collection = @merchant.order_status("paid") + @complete_collection = @merchant.order_status("complete") + @cancelled_collection = @merchant.order_status("cancelled") + @total_revenue = @merchant.total_revenue + @paid_revenue = @merchant.revenue_by_status("paid") + @complete_revenue = @merchant.revenue_by_status("complete") + @cancelled_revenue = @merchant.revenue_by_status("cancelled") end def show @@ -66,7 +73,7 @@ def cancel flash[:failure] = "Cannot cancel an order that has already been shipped" redirect_back fallback_location: root_path else - flash[:failure] = "Cannot perform this action" + flash[:failure] = "Cannot cancel this order, one or more of your items has already shipped" redirect_to root_path end end From ae8c84a10b5d686920e9642d780864e561f4f9da Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 17:22:26 -0700 Subject: [PATCH 321/350] added access to order fulfillment on merchant dashboard --- app/views/merchants/show.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/merchants/show.html.erb b/app/views/merchants/show.html.erb index eb59170468..09fe1152a4 100644 --- a/app/views/merchants/show.html.erb +++ b/app/views/merchants/show.html.erb @@ -26,7 +26,8 @@

    On Outdoorsy since: <%= @merchant.created_at.strftime("%B %d, %Y") %>


    <% if @merchant.id == session[:merchant_id] %> <%= button_to "Add New Product", new_product_path, method: :get, class: "product__new-button" %>
    - <%= button_to "Add New Category", new_category_path, method: :get, class: "product__new-button" %> + <%= button_to "Add New Category", new_category_path, method: :get, class: "product__new-button" %>
    + <%= button_to "Order Fulfillment", orders_path, method: :get, class: "product__new-button" %> <% end %> From 405d782f25aae6f0be841c32ffa77bd4ff3fc921 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 17:22:37 -0700 Subject: [PATCH 322/350] view partial for order fulfillment page --- app/views/orders/_order-collection.html.erb | 73 +++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 app/views/orders/_order-collection.html.erb diff --git a/app/views/orders/_order-collection.html.erb b/app/views/orders/_order-collection.html.erb new file mode 100644 index 0000000000..a87fc83045 --- /dev/null +++ b/app/views/orders/_order-collection.html.erb @@ -0,0 +1,73 @@ + + +
    + + + <%# TODO: add column names %> + + + + + + + <% collection.each do |order| %> + + + + + + + + + <% end %> + + +
    +

    Order ID: <%= order.id %>

    + <%= link_to "order details", order_path(order), class: "catalog__add-to-cart-button" %>

    +

    Created: <%= order.created_at.strftime("%m/%d/%Y at %I:%M%p") %>
    Status: <%= order.status %>

    +
    + + <%# Orderitems Table Header %> + + + + + + + + + + + <%# Orderitems Table Content %> + <% order.orderitems.each do |orderitem| %> + + + + + + + + <% end %> +
    product namequantitysubtotalStatusShip product
    +
    <%= link_to orderitem.product.product_name, product_path(orderitem.product.id), class: "text-dark, cart__text" %>
    +     		+
    + <%= orderitem.quantity %> +
    +     		+
    $<%= number_with_precision(orderitem.subtotal, :precision => 2, :delimiter => ',') %>
    +     		+ <% if orderitem.shipped %> +
    + shipped +
    + <% else %> +
    + not shipped +
    + <% end %> +     		+ <%= link_to "Ship Item", mark_shipped_path(orderitem), method: :patch, data: {confirm: "Are you sure you want to mark #{orderitem.product.product_name} as shipped?"}, class: "cart__remove-button" %> +
    +
    \ No newline at end of file From 087124999299f78f8d68bc52e625fc3c2c906960 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 17:22:55 -0700 Subject: [PATCH 323/350] DRY up order fulfillment page --- app/views/orders/index.html.erb | 132 ++++++++++++-------------------- 1 file changed, 48 insertions(+), 84 deletions(-) diff --git a/app/views/orders/index.html.erb b/app/views/orders/index.html.erb index 4216ee681f..a316fab22e 100644 --- a/app/views/orders/index.html.erb +++ b/app/views/orders/index.html.erb @@ -1,92 +1,56 @@
    -

    ORDER FULFILLMENT PAGE

    -

    TOTAL REVENUE: $<%= number_with_precision(456789, :precision => 2, :delimiter => ',') %>

    +

    ORDER FULFILLMENT PAGE

    +

    TOTAL REVENUE: $<%= number_with_precision(@total_revenue, :precision => 2, :delimiter => ',') %>

    -

    All orders

    - - - - <%# TODO: add column names %> - - - - -<%# On the order fulfillment page: - - Total Revenue - √ - Total Revenue by status - Total number of orders by status - Filter orders displayed by status - Link to each individual order - √ - A list of orders including at least one of my products: - DateTime the order was placed - √ - Each order item sold by me with a quantity and - √ - line-item subtotal - √ - A link to the item description page - √ - Link to transition the order item to marked as shipped - √ - The current status of the order ("pending", "paid", "complete", "cancelled") - √ %> - - - <% @order_collection.each do |order| %> - +

    + + + +

    + +
    + <%# @complete %> + <% if @complete_collection.empty? %> +

    No orders

    + <% else %> +

    Complete Orders

    +

    Revenue: $<%= number_with_precision(@complete_revenue, :precision => 2, :delimiter => ',') %>

    + <%= render partial: "order-collection", locals: { collection: @complete_collection } %> + <% end %> +
    +
    + <%# @cancelled %> + <% if @cancelled_collection.empty? %> +

    No orders

    + <% else %> +

    Cancelled Orders

    +

    Revenue: $<%= number_with_precision(@cancelled_revenue, :precision => 2, :delimiter => ',') %>

    + <%= render partial: "order-collection", locals: { collection: @cancelled_collection } %> + <% end %> +
    - - - - - - <% end %> - -
    -

    Order ID: <%= order.id %>

    -

    Created: <%= order.created_at.strftime("%m/%d/%Y at %I:%M%p") %>
    Status: <%= order.status %>

    -
    - - <%# Orderitems Table Header %> - - - - - - - - - +

    All orders

    +

    Revenue: $<%= number_with_precision(@total_revenue, :precision => 2, :delimiter => ',') %>

    +<%= render partial: "order-collection", locals: { collection: @order_collection } %> - <%# Orderitems Table Content %> - <% order.orderitems.each do |orderitem| %> - - - - - - - - <% end %> -
    product namequantitysubtotalStatusShip product
    -
    <%= link_to orderitem.product.product_name, product_path(orderitem.product.id), class: "text-dark, cart__text" %>
    -     		-
    - <%= orderitem.quantity %> -
    -     		-
    $<%= number_with_precision(orderitem.subtotal, :precision => 2, :delimiter => ',') %>
    -     		- <% if orderitem.shipped %> -
    - shipped -
    - <% else %> -
    - not shipped -
    - <% end %> -     		- <%= link_to "Ship Item", mark_shipped_path(orderitem), method: :patch, data: {confirm: "Are you sure you want to mark #{orderitem.product.product_name} as shipped?"}, class: "cart__remove-button" %> -
    -
    +
    -
    \ No newline at end of file +
    From db5a70f7565191ebd647d0e53a148bb1ffb02e3b Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 17:23:06 -0700 Subject: [PATCH 324/350] styled order detail page --- app/views/orders/show.html.erb | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/app/views/orders/show.html.erb b/app/views/orders/show.html.erb index 0955f70c55..c96f91032b 100644 --- a/app/views/orders/show.html.erb +++ b/app/views/orders/show.html.erb @@ -1,13 +1,16 @@
    -
      -
    • Name: <%= @order.cc_name %>
      • -
    • Shipping Address: <%= @order.address %>
      • -
    • Email: <%= @order.email %>
      • -
    +

    Order detail page

    +
    -
      -
    • Order Number: <%= @order.id %>
      • -
    • Purchased On: <%= @order.created_at.to_date %>
      • -
    • Order Status: <%= @order.status %>
      • +
      +
        +
      • Name: <%= @order.cc_name %>
        • +
      • Shipping Address: <%= @order.address %>
        • +
      • Email: <%= @order.email %>
        • +
      • Order Number: <%= @order.id %>
        • +
      • Purchased On: <%= @order.created_at.to_date %>
        • +
      • Order Status: <%= @order.status %>
      +
      +
    \ No newline at end of file From f99f07c40a054e95624e4da3e9856c7456287482 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 17:27:47 -0700 Subject: [PATCH 325/350] cleaned up controller code --- app/controllers/merchants_controller.rb | 20 ------------------ app/controllers/pages_controller.rb | 3 +-- app/controllers/products_controller.rb | 27 ++----------------------- app/controllers/reviews_controller.rb | 1 - 4 files changed, 3 insertions(+), 48 deletions(-) diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rb index e8827267bc..fd4976c2bc 100644 --- a/app/controllers/merchants_controller.rb +++ b/app/controllers/merchants_controller.rb @@ -1,6 +1,4 @@ class MerchantsController < ApplicationController - # before_action :require_login, except: [:index, :destroy, :create] - def index @merchants = Merchant.all @url = "http://thecatapi.com/api/images/get?format=src&type=gif×tamp=" @@ -53,22 +51,4 @@ def current return end end - - #to do!!! - # def show - # @merchant = Merchant.find_by(id: params[:id]) - # if @merchant.nil? - # flash[:error] = "Invaid merchant credentials." - # redirect_to root_path - # return - # end - - # if @merchant.id != (session[:merchant_id]) - # flash[:error] = "You must log in to view the merchant dashboard." - # redirect_to root_path - # return - # end - # end - - end diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 39848c624f..4942a62c3e 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -1,4 +1,3 @@ class PagesController < ApplicationController - def index - end + def index ; end end diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 6ba25f8d16..9d7c3bbd84 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -1,5 +1,5 @@ class ProductsController < ApplicationController - before_action :find_product, only: [:show, :update, :edit, :destroy, :retired] + before_action :find_product, only: [:show, :update, :edit, :retired] before_action :require_login, only: [:new, :edit] def index @@ -84,27 +84,4 @@ def find_product def product_params return params.require(:product).permit(:product_name, :price, :description, :photo_url, :stock, :merchant_id, category_ids: []) end -end - - - -# describe "edit" do -# before do -# @passenger = Passenger.create(name: 'Bojack', phone_num: '27') -# end - -# it "responds with success when getting the edit page for an existing, valid passenger" do -# valid_passenger_id = @passenger.id - -# get "/passengers/#{valid_passenger_id}/edit" - -# must_respond_with :success -# end - -# it "responds with redirect when getting the edit page for a non-existing passenger" do -# get "/passengers/#{@invalid_passenger_id}/edit" - -# must_respond_with :redirect -# must_redirect_to passengers_path -# end -# end \ No newline at end of file +end \ No newline at end of file diff --git a/app/controllers/reviews_controller.rb b/app/controllers/reviews_controller.rb index 7433f7dedb..e92258089c 100644 --- a/app/controllers/reviews_controller.rb +++ b/app/controllers/reviews_controller.rb @@ -16,7 +16,6 @@ def create if @review.save flash[:success] = "Review successfully added." redirect_to product_path(@review.product_id) - # TODO: Render status codes else render :new, status: :bad_request end From f772f6f0a6721de124782f5f01b7a348439cbb6d Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Thu, 18 Jun 2020 17:34:54 -0700 Subject: [PATCH 326/350] Working on orderitems_controller_tests. --- app/controllers/orderitems_controller.rb | 5 ++- .../controllers/orderitems_controller_test.rb | 42 +++++++++++++++---- 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/app/controllers/orderitems_controller.rb b/app/controllers/orderitems_controller.rb index b47a8e0cc4..3c2b08d014 100644 --- a/app/controllers/orderitems_controller.rb +++ b/app/controllers/orderitems_controller.rb @@ -47,7 +47,7 @@ def create return @orderitem end - def edit ; end + # def edit ; end def update # TODO: MAKE SURE ORDERITEM MODEL TESTS NOT_RETIRED ********* @@ -93,7 +93,8 @@ def mark_shipped redirect_back fallback_location: root_path else flash[:failure] = "Cannot perform this action for a #{@orderitem.order.status} order" - redirect_to root_path + # IS THIS OKAY???? + redirect_back fallback_location: root_path end end diff --git a/test/controllers/orderitems_controller_test.rb b/test/controllers/orderitems_controller_test.rb index e638f724a8..1e8ff654a5 100644 --- a/test/controllers/orderitems_controller_test.rb +++ b/test/controllers/orderitems_controller_test.rb @@ -10,7 +10,6 @@ } describe "create" do - # Reasonable to check set_current_order here and one other place it "creates an order automatically" do post product_orderitems_path(products(:snow_pass).id), params: update_hash @@ -148,14 +147,41 @@ end describe "mark_shipped" do - it "can correctly change shipped status for existing orderitem" do + it "responds with 404 when orderitem does not exist" do + # WHAT IS GOING ON HERE?? + orderitem = orderitems(:rxbar) + orderitem.destroy! + puts "ORDERITEM::::: #{orderitem}" + + delete orderitem_path(orderitem) + # puts "orderitem::::: #{orderitem.id}" + patch mark_shipped_path(orderitem) + must_respond_with :not_found + end + + # WHY CURRENTLY FAILING ????? :( + it "can change shipped status for an existing, non-shipped orderitem in a paid order" do + # it updates, flashes success, redirects back + orderitem = orderitems(:nature_valley) + expect(orderitem.shipped).must_equal false + + patch mark_shipped_path(orderitem.id) + + expect(orderitem.shipped).must_equal true + + # assert flash stuff + # other more specific redirect?? + must_respond_with :redirect end - # it "responds with 404 when orderitem does not exist" do - # orderitem = orderitems(:rxbar) - # orderitem.destroy! - # # change to right path::: delete orderitem_path(orderitem) - # must_respond_with :not_found - # end + it "does not update shipped status when the orderitem on a paid order has already been shipped, and redirects" do + # flash[:failure] = "#{ @orderitem.product.product_name } has already shipped." + # redirect_back fallback_location: root_path + end + + it "does not update shipped status when the order status is not paid" do + # flash[:failure] = "Cannot perform this action for a #{@orderitem.order.status} order" + # redirect_back fallback_location: root_path + end end end From 4725037e443584f522c9c1101b4975a97c84dab1 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 17:36:39 -0700 Subject: [PATCH 327/350] fixed bug that prevented retiring a merchant's own product --- app/controllers/products_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 9d7c3bbd84..aa28c88dee 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -59,7 +59,7 @@ def edit end def retired - if @product.merchant_id != @current_user + if @product.merchant != @current_user flash[:error] = "You cannot retire a product that you do not sell" redirect_back(fallback_location: root_path) return From 5d4d2a3ba0115a3ac1040e27072a8b7939b9c4d7 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 17:38:06 -0700 Subject: [PATCH 328/350] finalized routes --- config/routes.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index cbaee949f2..46989828ef 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -10,18 +10,18 @@ resources :orderitems, only: [:update, :destroy] patch 'orderitems/:id/mark_shipped', to: 'orderitems#mark_shipped', as: 'mark_shipped' - resources :orders, only: [:index, :new, :show, :edit, :update, :cancel] - # # below for checkout success confirmation page + resources :orders, only: [:index, :show, :edit, :update] + # below for checkout success confirmation page get '/orders/:id/cart/success', to: 'orders#success', as: 'success' get '/orders/:id/cart', to: 'orders#cart', as: 'cart' patch '/orders/:id/cancel', to: 'orders#cancel', as: 'cancel' - resources :merchants - + resources :merchants, only: [:index, :show, :create] + # login post "/auth/github", as: "github_login" get "/auth/github/callback", to: "merchants#create", as: "auth_callback" post "/logout", to: "merchants#logout", as: "logout" - # get '/orders/:id/merchant_order', to: 'orders#merchant_order', as: 'merchant_order' + resources :reviews, only: [:new, :create] resources :categories, only: [:new, :create] end From d7e3b3655bb0250552b9e69f7d36227d8565d8f7 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 17:38:25 -0700 Subject: [PATCH 329/350] removed unused merchants#current --- app/controllers/merchants_controller.rb | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rb index fd4976c2bc..fc7e2f0faf 100644 --- a/app/controllers/merchants_controller.rb +++ b/app/controllers/merchants_controller.rb @@ -39,16 +39,4 @@ def logout redirect_to root_path return end - - def current - if session[:merchant_id] == nil - flash[:error] = "No merchant logged in." - redirect_to root_path - return - else - @merchant = Merchant.find_by(id: session[:merchant_id]) - redirect_to merchant_path(session[:merchant_id]) - return - end - end end From f503d1ab5e305bba82500c01c3d5d10e6307b6a5 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 17:38:36 -0700 Subject: [PATCH 330/350] removed unused orderitems#edit --- app/controllers/orderitems_controller.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/controllers/orderitems_controller.rb b/app/controllers/orderitems_controller.rb index a007d7d5af..75eede0cdf 100644 --- a/app/controllers/orderitems_controller.rb +++ b/app/controllers/orderitems_controller.rb @@ -46,8 +46,6 @@ def create # might not need this? return @orderitem end - - def edit ; end def update # TODO: MAKE SURE ORDERITEM MODEL TESTS NOT_RETIRED ********* From 622f1443d420a7a45c9dd369c98da221d5c1a748 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 17:41:33 -0700 Subject: [PATCH 331/350] cleaned up code --- app/models/order.rb | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/app/models/order.rb b/app/models/order.rb index f31df08e8f..797871f425 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -17,6 +17,7 @@ class Order < ApplicationRecord validates :zip, presence: true, numericality: { only_integer: true }, on: :update def cancel_order + # TODO: Testing - Diana # return_stock self.return_stock @@ -60,7 +61,6 @@ def mark_as_complete! end def change_to_paid! - # change order status to paid self.status = "paid" if !self.save @@ -70,11 +70,6 @@ def change_to_paid! end end - # def clear_cart - # session[:order_id] = nil - # set_current_order - # end - def checkout result = self.change_to_paid! @@ -84,8 +79,6 @@ def checkout self.reduce_stock - # clear cart - # self.clear_cart return true end end From badb7a4fd62c799176f147f5b92738d8cd84f754 Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Thu, 18 Jun 2020 19:24:39 -0700 Subject: [PATCH 332/350] Major headway getting simplecov happy. --- app/controllers/merchants_controller.rb | 2 +- app/controllers/orders_controller.rb | 14 +---- config/routes.rb | 6 +-- test/controllers/merchants_controller_test.rb | 16 +----- .../controllers/orderitems_controller_test.rb | 53 +++++++++++++------ test/controllers/orders_controller_test.rb | 34 +++++++++++- test/controllers/products_controller_test.rb | 12 ++--- test/fixtures/merchants.yml | 6 +++ test/models/merchant_test.rb | 37 ++++++++++--- test/test_helper.rb | 49 +---------------- 10 files changed, 119 insertions(+), 110 deletions(-) diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rb index 6af15fdd5d..ee5d7723d3 100644 --- a/app/controllers/merchants_controller.rb +++ b/app/controllers/merchants_controller.rb @@ -21,7 +21,7 @@ def show def create auth_hash = request.env["omniauth.auth"] merchant = Merchant.find_by(uid: auth_hash[:uid], provider: "github") - + if merchant flash[:result_text] = "Returning merchant: #{merchant.username}" else diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index 649c175d97..7755966188 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -2,9 +2,7 @@ class OrdersController < ApplicationController # todo -product model made then collab for update order quantity before_action :require_login, only: [:index] before_action :find_order_from_session, only: [:edit, :update, :cart] - # delete merch order from 6 if not used eventually ***** - before_action :find_order_from_params, only: [:show, :merchant_order, :success, :cancel] - + before_action :find_order_from_params, only: [:show, :success, :cancel] # Renders details page for order already paid for (or cancelled?) # if we want other redirect behavior, edit later****** @@ -71,16 +69,6 @@ def cancel end end - # deleted view file and route - # def merchant_order - # unless @order.is_order_of(session[:merchant_id]) && @order.status != 'pending' - # flash[:status] = :failure - # flash[:result_text] = "You do not have access to this page" - # redirect_back fallback_location: root_path - # return - # end - # end - private def order_params diff --git a/config/routes.rb b/config/routes.rb index cbaee949f2..feb41c60cf 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -11,17 +11,15 @@ patch 'orderitems/:id/mark_shipped', to: 'orderitems#mark_shipped', as: 'mark_shipped' resources :orders, only: [:index, :new, :show, :edit, :update, :cancel] - # # below for checkout success confirmation page get '/orders/:id/cart/success', to: 'orders#success', as: 'success' get '/orders/:id/cart', to: 'orders#cart', as: 'cart' patch '/orders/:id/cancel', to: 'orders#cancel', as: 'cancel' resources :merchants - post "/auth/github", as: "github_login" - get "/auth/github/callback", to: "merchants#create", as: "auth_callback" + get "/auth/:github/callback", to: "merchants#create", as: "auth_callback" post "/logout", to: "merchants#logout", as: "logout" - # get '/orders/:id/merchant_order', to: 'orders#merchant_order', as: 'merchant_order' + resources :reviews, only: [:new, :create] resources :categories, only: [:new, :create] end diff --git a/test/controllers/merchants_controller_test.rb b/test/controllers/merchants_controller_test.rb index db7dab0a9c..1ec74b0cc5 100644 --- a/test/controllers/merchants_controller_test.rb +++ b/test/controllers/merchants_controller_test.rb @@ -20,7 +20,7 @@ it "returns head :not_found when merchant_id isn't found" do # NOT SURE WHY THIS IS NOT WORKING??? - get merchant_path(nil) + get merchant_path(-1) must_respond_with :not_found end @@ -54,19 +54,5 @@ must_redirect_to root_path end end - - describe "current" do - it "responds with success when a merchant is currently logged in, and redirects" do - # CHECK SESSION ID - get merchants_path - must_respond_with :success - # FLASH ERROR - must_redirect_to merchant_path(session[:merchant_id]) - end - - it "flashes an error and redirects to root_path when no merchant is logged in" do - # TODO: THIS ONE. - end - end end diff --git a/test/controllers/orderitems_controller_test.rb b/test/controllers/orderitems_controller_test.rb index 1e8ff654a5..19f55eaad2 100644 --- a/test/controllers/orderitems_controller_test.rb +++ b/test/controllers/orderitems_controller_test.rb @@ -4,9 +4,10 @@ let(:existing_orderitem) { orderitems(:rxbar) } let(:update_hash) { - { + { orderitem: { quantity: 1 } + } } describe "create" do @@ -80,7 +81,9 @@ it "redirects to cart path without updating when given bad data" do bogus_update_hash = { - quantity: -1 + orderitem: { + quantity: -1 + } } expect { @@ -148,40 +151,58 @@ describe "mark_shipped" do it "responds with 404 when orderitem does not exist" do - # WHAT IS GOING ON HERE?? orderitem = orderitems(:rxbar) orderitem.destroy! - puts "ORDERITEM::::: #{orderitem}" - delete orderitem_path(orderitem) - # puts "orderitem::::: #{orderitem.id}" + # delete orderitem_path(orderitem) + patch mark_shipped_path(orderitem) must_respond_with :not_found end - # WHY CURRENTLY FAILING ????? :( it "can change shipped status for an existing, non-shipped orderitem in a paid order" do - # it updates, flashes success, redirects back orderitem = orderitems(:nature_valley) + + expect(orderitem.order.status).must_equal "paid" expect(orderitem.shipped).must_equal false - patch mark_shipped_path(orderitem.id) + patch mark_shipped_path(id: orderitem.id) + # NEED TO RELOAD MANUALLY + orderitem.reload + expect(orderitem.shipped).must_equal true - - # assert flash stuff - # other more specific redirect?? + assert_equal "#{ orderitem.product.product_name } has shipped!", flash[:success] must_respond_with :redirect end it "does not update shipped status when the orderitem on a paid order has already been shipped, and redirects" do - # flash[:failure] = "#{ @orderitem.product.product_name } has already shipped." - # redirect_back fallback_location: root_path + orderitem = orderitems(:discover) + expect(orderitem.shipped).must_equal true + expect(orderitem.order.status).must_equal "paid" + + patch mark_shipped_path(id: orderitem.id) + + orderitem.reload + + expect(orderitem.shipped).must_equal true + + assert_equal "#{ orderitem.product.product_name } has already shipped.", flash[:failure] + must_respond_with :redirect end it "does not update shipped status when the order status is not paid" do - # flash[:failure] = "Cannot perform this action for a #{@orderitem.order.status} order" - # redirect_back fallback_location: root_path + orderitem = orderitems(:snow) + + expect(orderitem.order.status).must_equal "pending" + expect(orderitem.shipped).must_equal false + + patch mark_shipped_path(id: orderitem.id) + + orderitem.reload + + assert_equal "Cannot perform this action for a #{orderitem.order.status} order", flash[:failure] + must_respond_with :redirect end end end diff --git a/test/controllers/orders_controller_test.rb b/test/controllers/orders_controller_test.rb index 3a095829b9..8ca088a15f 100644 --- a/test/controllers/orders_controller_test.rb +++ b/test/controllers/orders_controller_test.rb @@ -27,6 +27,17 @@ # end end + describe "index" do + # CHECK REDIRECT BEHAVIOR HERE?? + it "responds with success" do + # order = orders(:order1) + get orders_path + must_respond_with :redirect + + # how to test the merchant, order_collection, and total_revenue???? + end + end + describe "show" do it "responds with success" do order = orders(:order1) @@ -38,6 +49,9 @@ get order_path(orders(:order2).id) must_respond_with :success end + + it "MARKS AS COMPLETE???? how to test this" do + end end describe "edit" do @@ -116,12 +130,28 @@ end describe "cart" do - # Add item to cart: -# - product is retired, quantity too high, or something like that (error) it "responds with success" do order = orders(:order1) get cart_path(order.id) must_respond_with :success + # expect order id must be current from session + # HOW TO TEST???? + end + end + + describe "success" do + it "responds with success" do + order = orders(:order3) + get cart_path(order.id) + must_respond_with :success + # expect order 3 won't be the same as current session order + # HOW TO TEST???? + end + end + + # LOTS TO DO HERE::::: + describe "cancel" do + it "does stuff" do end end end \ No newline at end of file diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb index eb5c14498b..c8372288ca 100644 --- a/test/controllers/products_controller_test.rb +++ b/test/controllers/products_controller_test.rb @@ -125,13 +125,13 @@ end # TODO: testing out login functionality - # it "redirects if the user editing a product's merchant is not the merchant" do - # perform_login - # @current_user = 1 - # get edit_product_path(@valid_product_id) + it "redirects if the user editing a product's merchant is not the merchant" do + perform_login + @current_user = 1 + get edit_product_path(@valid_product_id) - # assert_equal 'User was successfully created.', flash[:error] - # end + assert_equal 'User was successfully created.', flash[:error] + end it "responds with success when getting the edit page for an existing, valid product" do get edit_product_path(@valid_product_id) diff --git a/test/fixtures/merchants.yml b/test/fixtures/merchants.yml index ac46b1c81c..9bea59d37b 100644 --- a/test/fixtures/merchants.yml +++ b/test/fixtures/merchants.yml @@ -2,12 +2,18 @@ diana: email: wowtestingissofun@nightowl.edu username: dnguye2 uid: 2 + provider: "github" bob: username: "Bob Hicok" email: bob@university.com + uid: 5 + provider: "github" greta: username: "Greta the Unstoppable" email: "stike4climate@earth.org" + provider: "github" no_products_merchant: username: "Lazy Lou" email: samIam@email.com + uid: 7 + provider: "github" diff --git a/test/models/merchant_test.rb b/test/models/merchant_test.rb index dcbfc0f36a..89dc9039c6 100644 --- a/test/models/merchant_test.rb +++ b/test/models/merchant_test.rb @@ -32,19 +32,44 @@ end describe "relations" do + before do + @merchant = merchants(:bob) + @orderitem = orderitems(:nature_valley) + @product = products(:nature_valley) + end + it "can have one or many products" do - merchant.must_respond_to :products - merchant.products.each do |product| - product.must_be_kind_of Product + @merchant.must_respond_to :products + + @merchant.products.each do |product| + product.must_be_kind_of Product + end + + expect(@merchant.products.count).must_equal 5 + end + + it "can set the merchant id through product" do + # @new_product + # @merchant.products << @product + + # expect + # @product.merchant_id = @merchant.id + end + +# NOT NEEDED IN THIS MODEL: + it "can set the product_id through merchant" do + # @product.merchant = Merch end end # ASK ABOUT TESTING PRODUCTS??? - it "can have one or more order items through products" do + it "can have one or more orderitems through products" do + @merchant + merchant.must_respond_to :orderitem - merchant.orderitems.each do |order_item| - order_item.must_be_kind_of OrderItem + merchant.orderitems.each do |item| + item.must_be_kind_of Orderitem end end end diff --git a/test/test_helper.rb b/test/test_helper.rb index b07a382ef4..7df1087bdd 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,5 +1,4 @@ require 'simplecov' -require "pry" ENV['RAILS_ENV'] ||= 'test' require_relative '../config/environment' require 'rails/test_help' @@ -23,46 +22,6 @@ class ActiveSupport::TestCase # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. fixtures :all - # helper method to set session for a valid order - def make_order - # new_order = Order.create!( - # status: "pending", - # total: 5, - # email: "greenleaf@gmail.com", - # address: "1516 Mesa Verde", - # cc_name: "Mastercard", - # cc_num: 8788082, - # cvv: 572, - # cc_exp: "06/20", - # zip: 74804 - # ) - - # orderitem = Orderitem.create!( - # quantity: 1, - # order: new_order, - # product: products(:rainier), - # shipped: false - # ) - - # new_order.orderitems << orderitem - - # if new_order.save! - # session[:order_id] = new_order.id - # puts "SESSION ID: #{session[:order_id]}" - # puts "COUNT: #{new_order.orderitems.count}" - # else - # puts "ORDER FAILED TO SAVE" - # end - - # return new_order - - orderitem = Orderitem.create!(quantity: 1, order: orders(:order2), product: products(:rainier), shipped: false) - @order = Order.find_by(id: orderitem.order_id) - # expect id = 2 - puts "HERE IS ORDER ID: #{@order.id}" - return @order - end - def setup OmniAuth.config.test_mode = true end @@ -72,15 +31,12 @@ def mock_auth_hash(merchant) provider: merchant.provider, uid: merchant.uid, info: { - nickname: merchant.username, + username: merchant.username, email: merchant.email, }, } end - - - # Helper method that performs a log-in with either # a passed-in user or the first test user def perform_login(merchant = nil) @@ -90,12 +46,11 @@ def perform_login(merchant = nil) # Act Try to call the callback route get auth_callback_path(:github) - merchant = User.find_by(uid: merchant.uid, username: merchant.username) + merchant = Merchant.find_by(uid: merchant.uid, username: merchant.username) expect(merchant).wont_be_nil # Verify the user ID was saved - if that didn't work, this test is invalid expect(session[:merchant_id]).must_equal merchant.id - return merchant end end From 48e3032c7b6142663dbec34f864f49a8fdaae0dc Mon Sep 17 00:00:00 2001 From: RebeccaRoach Date: Thu, 18 Jun 2020 19:39:41 -0700 Subject: [PATCH 333/350] Fixed stray end --- test/models/merchant_test.rb | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/test/models/merchant_test.rb b/test/models/merchant_test.rb index 89dc9039c6..b369182e67 100644 --- a/test/models/merchant_test.rb +++ b/test/models/merchant_test.rb @@ -1,5 +1,4 @@ require "test_helper" -require "pry" describe Merchant do let(:merchant) { @@ -44,22 +43,22 @@ @merchant.products.each do |product| product.must_be_kind_of Product end - + expect(@merchant.products.count).must_equal 5 end - it "can set the merchant id through product" do - # @new_product - # @merchant.products << @product - # expect - # @product.merchant_id = @merchant.id - end + it "can set the merchant id through product" do + # @new_product + # @merchant.products << @product + + # expect + # @product.merchant_id = @merchant.id + end # NOT NEEDED IN THIS MODEL: - it "can set the product_id through merchant" do + it "can set the product_id through merchant" do # @product.merchant = Merch - end end # ASK ABOUT TESTING PRODUCTS??? From b98573d77adbaf251729d6d3da2a2ac1709e2359 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 19:47:54 -0700 Subject: [PATCH 334/350] removed redundant flash --- app/controllers/orderitems_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/orderitems_controller.rb b/app/controllers/orderitems_controller.rb index d70a44a314..e0351f0a77 100644 --- a/app/controllers/orderitems_controller.rb +++ b/app/controllers/orderitems_controller.rb @@ -11,7 +11,6 @@ def create if result == false flash[:result_text] = "Can't add another #{@orderitem.product.product_name} to cart; not enough stock" - flash[:messages] = @orderitem.errors.messages redirect_back(fallback_location: root_path) && return else @orderitem.quantity += params[:quantity].to_i From 81b43fd9bd54f3bbce68472cce1cefaf9dc77877 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 20:11:35 -0700 Subject: [PATCH 335/350] changed login and logout messages --- app/controllers/merchants_controller.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rb index 205d4784de..7a2b7983a8 100644 --- a/app/controllers/merchants_controller.rb +++ b/app/controllers/merchants_controller.rb @@ -19,13 +19,13 @@ def create merchant = Merchant.find_by(uid: auth_hash[:uid], provider: "github") if merchant - flash[:result_text] = "Returning merchant: #{merchant.username}" + flash[:result_text] = "Did you get lost in the woods? We missed you, #{merchant.username}" else merchant = Merchant.build_from_github(auth_hash) if merchant.save - flash[:result_text] = "You are logged in as new merchant: #{merchant.username}." + flash[:result_text] = "Welcome to the great Outdoorsy, #{merchant.username}." else - flash[:result_text] = "Failure: Could not create new merchant account" + flash[:result_text] = "Failure: Take a hike!" flash[:messages] = merchant.errors.messages return redirect_to root_path end @@ -37,7 +37,7 @@ def create def logout session[:merchant_id] = nil - flash[:result_text] = "Successfully logged out" + flash[:result_text] = "Get Outdoorsy, catch ya later alligator" redirect_to root_path return end From 850b53af716889063dbf7a5d6b68ed56cfcf7ac9 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 20:11:46 -0700 Subject: [PATCH 336/350] updated footer attributions --- app/views/layouts/_footer.html.erb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index bbf7e8cc0d..f70da25371 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -25,13 +25,14 @@ ATTRIBUTIONS

    Favicon: Mountain icon by Icons8

    +

    ♥ CheezItMan, Travis, Dan, Matt, Ryan, Dee, Ace, Lee, Sharon, Angela, Katie Voldemort, Stephanie, Kaida, Samson, Willow, Mushu, Manna, Max, Louie, June and the best for last... Gretchen

    follow us
    - - + +
    From fb9973da6dfd7d1ff4860045b1bb204789adcf42 Mon Sep 17 00:00:00 2001 From: dnguye2 Date: Thu, 18 Jun 2020 20:17:49 -0700 Subject: [PATCH 337/350] changed order fulfillment from red to blue --- app/assets/stylesheets/application.scss | 20 ++++++++++++++++++++ app/views/orders/index.html.erb | 20 ++++++++++---------- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 419742cf40..ae19a605b1 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -271,6 +271,26 @@ body { color: #fff; } + +.order__button { + background-color: #fff; + color: #007bff; + padding: 5px; + border: solid; + border-width: thin; + border-color: #007bff; + text-transform: uppercase; + font-weight: 300; + white-space: normal; + min-width: 25%; +} + +.order__button:hover { + color: #fff; + background-color: #007bff; +} + + /* Footer */ .footer { padding: 20px 0px 10px 0px; diff --git a/app/views/orders/index.html.erb b/app/views/orders/index.html.erb index a316fab22e..3d4f00f9a8 100644 --- a/app/views/orders/index.html.erb +++ b/app/views/orders/index.html.erb @@ -1,25 +1,25 @@
    -

    ORDER FULFILLMENT PAGE

    +

    ORDER FULFILLMENT PAGE

    TOTAL REVENUE: $<%= number_with_precision(@total_revenue, :precision => 2, :delimiter => ',') %>

    - - -