From 538909918ead48a7fd473264b44f8689e3329718 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Mon, 16 Nov 2020 16:18:05 -0800 Subject: [PATCH 001/248] created rails app --- .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 | 18 + 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 | 19 + 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 | 13 + 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 | 7638 +++++++++++++++++ 93 files changed, 9448 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..48cdee19cb --- /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.4' +# 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..5c056fcc4c --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,298 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (6.0.3.4) + actionpack (= 6.0.3.4) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.0.3.4) + actionpack (= 6.0.3.4) + activejob (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) + mail (>= 2.7.1) + actionmailer (6.0.3.4) + actionpack (= 6.0.3.4) + actionview (= 6.0.3.4) + activejob (= 6.0.3.4) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.0.3.4) + actionview (= 6.0.3.4) + activesupport (= 6.0.3.4) + 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.4) + actionpack (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) + nokogiri (>= 1.8.5) + actionview (6.0.3.4) + activesupport (= 6.0.3.4) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.3.4) + activesupport (= 6.0.3.4) + globalid (>= 0.3.6) + activemodel (6.0.3.4) + activesupport (= 6.0.3.4) + activerecord (6.0.3.4) + activemodel (= 6.0.3.4) + activesupport (= 6.0.3.4) + activestorage (6.0.3.4) + actionpack (= 6.0.3.4) + activejob (= 6.0.3.4) + activerecord (= 6.0.3.4) + marcel (~> 0.3.1) + activesupport (6.0.3.4) + 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 (10.0.2.0) + execjs + better_errors (2.9.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.5.1) + msgpack (~> 1.0) + bootstrap (4.5.3) + 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.33.0) + 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.7) + crass (1.0.6) + debase (0.2.4.1) + debase-ruby_core_source (>= 0.10.2) + debase-ruby_core_source (0.10.11) + debug_inspector (0.0.3) + erubi (1.10.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.5) + concurrent-ruby (~> 1.0) + jbuilder (2.10.1) + 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.3.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + loofah (2.7.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.2.8) + 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.2) + 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.4) + nokogiri (1.10.10) + 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.6) + puma (4.3.6) + nio4r (~> 2.0) + rack (2.2.3) + rack-proxy (0.6.5) + rack + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (6.0.3.4) + actioncable (= 6.0.3.4) + actionmailbox (= 6.0.3.4) + actionmailer (= 6.0.3.4) + actionpack (= 6.0.3.4) + actiontext (= 6.0.3.4) + actionview (= 6.0.3.4) + activejob (= 6.0.3.4) + activemodel (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) + bundler (>= 1.3.0) + railties (= 6.0.3.4) + 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.4) + actionpack (= 6.0.3.4) + activesupport (= 6.0.3.4) + 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.8.2) + 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.1) + 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.2) + 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.8) + thread_safe (~> 0.1) + web-console (4.1.0) + 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.3.0) + activesupport (>= 4.2) + rack-proxy (>= 0.6.1) + railties (>= 4.2) + websocket-driver (0.7.3) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + xpath (3.2.0) + nokogiri (~> 1.8) + zeitwerk (2.4.1) + +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.4) + 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..17320fb11e --- /dev/null +++ b/app/assets/stylesheets/application.scss @@ -0,0 +1,18 @@ +/* + * 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..529f85b082 --- /dev/null +++ b/app/javascript/packs/application.js @@ -0,0 +1,19 @@ +// 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..262750d985 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +D5eMg4two/AR+hCd2AzXdL1yq1nLrLIfVvTWgpJHPZZ5f3VWjXO9qmSAcL09LUJgxfzj9xHW97qEDp3xV/qRO3SAalYztiUXLzaW+E7CqhHpfmFBKA7A5aw4DGoo63fsSiOV9LsxK9aCGolouvY/DCDenG27/fV8o52FGo6LvtAnJzV7AsRMEDhTJTQOZFqRYqhGQvl9sbqufAVtDrqy4WKCi/FmWp9QPx45vejdVDdOSXzwV23My7B7g2J18T/lmwY8Z8x7zPiKP6PATHcRBJLQHPg4xV+QiMmz0M7WparYu6GG5gvP0aURwJbtxEiO7eZ/O4AHBMQJhph9kGVNfxxdwLrcWjsBO1RfO6voPu/jDhYWkH8jtauzuQSA9LqyNftKWeFDWllVpc/+9NQXvaqmQ8FYAkhE4W26--K+E0aqN5alvp2IXV--aIbnfZ5SJmcLbx3HXRaQAg== \ 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..1a4f73eecb --- /dev/null +++ b/config/webpack/environment.js @@ -0,0 +1,13 @@ +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..1d56e43d97 --- /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.3.0", + "bootstrap": "^4.5.3", + "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..d8487b4546 --- /dev/null +++ b/yarn.lock @@ -0,0 +1,7638 @@ +# 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.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a" + integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg== + dependencies: + "@babel/highlight" "^7.10.4" + +"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.12.5": + version "7.12.5" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.5.tgz#f56db0c4bb1bbbf221b4e81345aab4141e7cb0e9" + integrity sha512-DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg== + +"@babel/core@^7.7.2": + version "7.12.3" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz#1b436884e1e3bff6fb1328dc02b208759de92ad8" + integrity sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g== + dependencies: + "@babel/code-frame" "^7.10.4" + "@babel/generator" "^7.12.1" + "@babel/helper-module-transforms" "^7.12.1" + "@babel/helpers" "^7.12.1" + "@babel/parser" "^7.12.3" + "@babel/template" "^7.10.4" + "@babel/traverse" "^7.12.1" + "@babel/types" "^7.12.1" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.1" + json5 "^2.1.2" + lodash "^4.17.19" + resolve "^1.3.2" + semver "^5.4.1" + source-map "^0.5.0" + +"@babel/generator@^7.12.1", "@babel/generator@^7.12.5": + version "7.12.5" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de" + integrity sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A== + dependencies: + "@babel/types" "^7.12.5" + jsesc "^2.5.1" + source-map "^0.5.0" + +"@babel/helper-annotate-as-pure@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz#5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3" + integrity sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA== + dependencies: + "@babel/types" "^7.10.4" + +"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz#bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3" + integrity sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg== + dependencies: + "@babel/helper-explode-assignable-expression" "^7.10.4" + "@babel/types" "^7.10.4" + +"@babel/helper-compilation-targets@^7.12.1": + version "7.12.5" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz#cb470c76198db6a24e9dbc8987275631e5d29831" + integrity sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw== + dependencies: + "@babel/compat-data" "^7.12.5" + "@babel/helper-validator-option" "^7.12.1" + browserslist "^4.14.5" + semver "^5.5.0" + +"@babel/helper-create-class-features-plugin@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz#3c45998f431edd4a9214c5f1d3ad1448a6137f6e" + integrity sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w== + dependencies: + "@babel/helper-function-name" "^7.10.4" + "@babel/helper-member-expression-to-functions" "^7.12.1" + "@babel/helper-optimise-call-expression" "^7.10.4" + "@babel/helper-replace-supers" "^7.12.1" + "@babel/helper-split-export-declaration" "^7.10.4" + +"@babel/helper-create-regexp-features-plugin@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz#18b1302d4677f9dc4740fe8c9ed96680e29d37e8" + integrity sha512-rsZ4LGvFTZnzdNZR5HZdmJVuXK8834R5QkF3WvcnBhrlVtF0HSIUC6zbreL9MgjTywhKokn8RIYRiq99+DLAxA== + dependencies: + "@babel/helper-annotate-as-pure" "^7.10.4" + "@babel/helper-regex" "^7.10.4" + regexpu-core "^4.7.1" + +"@babel/helper-define-map@^7.10.4": + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz#b53c10db78a640800152692b13393147acb9bb30" + integrity sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ== + dependencies: + "@babel/helper-function-name" "^7.10.4" + "@babel/types" "^7.10.5" + lodash "^4.17.19" + +"@babel/helper-explode-assignable-expression@^7.10.4": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz#8006a466695c4ad86a2a5f2fb15b5f2c31ad5633" + integrity sha512-dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA== + dependencies: + "@babel/types" "^7.12.1" + +"@babel/helper-function-name@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a" + integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ== + dependencies: + "@babel/helper-get-function-arity" "^7.10.4" + "@babel/template" "^7.10.4" + "@babel/types" "^7.10.4" + +"@babel/helper-get-function-arity@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2" + integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A== + dependencies: + "@babel/types" "^7.10.4" + +"@babel/helper-hoist-variables@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz#d49b001d1d5a68ca5e6604dda01a6297f7c9381e" + integrity sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA== + dependencies: + "@babel/types" "^7.10.4" + +"@babel/helper-member-expression-to-functions@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz#fba0f2fcff3fba00e6ecb664bb5e6e26e2d6165c" + integrity sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ== + dependencies: + "@babel/types" "^7.12.1" + +"@babel/helper-module-imports@^7.12.1": + version "7.12.5" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb" + integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA== + dependencies: + "@babel/types" "^7.12.5" + +"@babel/helper-module-transforms@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz#7954fec71f5b32c48e4b303b437c34453fd7247c" + integrity sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w== + dependencies: + "@babel/helper-module-imports" "^7.12.1" + "@babel/helper-replace-supers" "^7.12.1" + "@babel/helper-simple-access" "^7.12.1" + "@babel/helper-split-export-declaration" "^7.11.0" + "@babel/helper-validator-identifier" "^7.10.4" + "@babel/template" "^7.10.4" + "@babel/traverse" "^7.12.1" + "@babel/types" "^7.12.1" + lodash "^4.17.19" + +"@babel/helper-optimise-call-expression@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673" + integrity sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg== + dependencies: + "@babel/types" "^7.10.4" + +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" + integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== + +"@babel/helper-regex@^7.10.4": + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz#32dfbb79899073c415557053a19bd055aae50ae0" + integrity sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg== + dependencies: + lodash "^4.17.19" + +"@babel/helper-remap-async-to-generator@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz#8c4dbbf916314f6047dc05e6a2217074238347fd" + integrity sha512-9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A== + dependencies: + "@babel/helper-annotate-as-pure" "^7.10.4" + "@babel/helper-wrap-function" "^7.10.4" + "@babel/types" "^7.12.1" + +"@babel/helper-replace-supers@^7.12.1": + version "7.12.5" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz#f009a17543bbbbce16b06206ae73b63d3fca68d9" + integrity sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.12.1" + "@babel/helper-optimise-call-expression" "^7.10.4" + "@babel/traverse" "^7.12.5" + "@babel/types" "^7.12.5" + +"@babel/helper-simple-access@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz#32427e5aa61547d38eb1e6eaf5fd1426fdad9136" + integrity sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA== + dependencies: + "@babel/types" "^7.12.1" + +"@babel/helper-skip-transparent-expression-wrappers@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf" + integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA== + dependencies: + "@babel/types" "^7.12.1" + +"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f" + integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg== + dependencies: + "@babel/types" "^7.11.0" + +"@babel/helper-validator-identifier@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2" + integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw== + +"@babel/helper-validator-option@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz#175567380c3e77d60ff98a54bb015fe78f2178d9" + integrity sha512-YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A== + +"@babel/helper-wrap-function@^7.10.4": + version "7.12.3" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz#3332339fc4d1fbbf1c27d7958c27d34708e990d9" + integrity sha512-Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow== + dependencies: + "@babel/helper-function-name" "^7.10.4" + "@babel/template" "^7.10.4" + "@babel/traverse" "^7.10.4" + "@babel/types" "^7.10.4" + +"@babel/helpers@^7.12.1": + version "7.12.5" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e" + integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA== + dependencies: + "@babel/template" "^7.10.4" + "@babel/traverse" "^7.12.5" + "@babel/types" "^7.12.5" + +"@babel/highlight@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143" + integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA== + dependencies: + "@babel/helper-validator-identifier" "^7.10.4" + chalk "^2.0.0" + js-tokens "^4.0.0" + +"@babel/parser@^7.10.4", "@babel/parser@^7.12.3", "@babel/parser@^7.12.5": + version "7.12.5" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.5.tgz#b4af32ddd473c0bfa643bd7ff0728b8e71b81ea0" + integrity sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ== + +"@babel/plugin-proposal-async-generator-functions@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz#dc6c1170e27d8aca99ff65f4925bd06b1c90550e" + integrity sha512-d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-remap-async-to-generator" "^7.12.1" + "@babel/plugin-syntax-async-generators" "^7.8.0" + +"@babel/plugin-proposal-class-properties@^7.12.1", "@babel/plugin-proposal-class-properties@^7.7.0": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz#a082ff541f2a29a4821065b8add9346c0c16e5de" + integrity sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.12.1" + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-proposal-dynamic-import@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz#43eb5c2a3487ecd98c5c8ea8b5fdb69a2749b2dc" + integrity sha512-a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-dynamic-import" "^7.8.0" + +"@babel/plugin-proposal-export-namespace-from@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz#8b9b8f376b2d88f5dd774e4d24a5cc2e3679b6d4" + integrity sha512-6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-export-namespace-from" "^7.8.3" + +"@babel/plugin-proposal-json-strings@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz#d45423b517714eedd5621a9dfdc03fa9f4eb241c" + integrity sha512-GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-json-strings" "^7.8.0" + +"@babel/plugin-proposal-logical-assignment-operators@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz#f2c490d36e1b3c9659241034a5d2cd50263a2751" + integrity sha512-k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" + +"@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz#3ed4fff31c015e7f3f1467f190dbe545cd7b046c" + integrity sha512-nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" + +"@babel/plugin-proposal-numeric-separator@^7.12.1": + version "7.12.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.5.tgz#b1ce757156d40ed79d59d467cb2b154a5c4149ba" + integrity sha512-UiAnkKuOrCyjZ3sYNHlRlfuZJbBHknMQ9VMwVeX97Ofwx7RpD6gS2HfqTCh8KNUQgcOm8IKt103oR4KIjh7Q8g== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-numeric-separator" "^7.10.4" + +"@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.6.2": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz#def9bd03cea0f9b72283dac0ec22d289c7691069" + integrity sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-object-rest-spread" "^7.8.0" + "@babel/plugin-transform-parameters" "^7.12.1" + +"@babel/plugin-proposal-optional-catch-binding@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz#ccc2421af64d3aae50b558a71cede929a5ab2942" + integrity sha512-hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" + +"@babel/plugin-proposal-optional-chaining@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz#cce122203fc8a32794296fc377c6dedaf4363797" + integrity sha512-c2uRpY6WzaVDzynVY9liyykS+kVU+WRZPMPYpkelXH8KBt1oXoI89kPbZKKG/jDT5UK92FTW2fZkZaJhdiBabw== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" + "@babel/plugin-syntax-optional-chaining" "^7.8.0" + +"@babel/plugin-proposal-private-methods@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz#86814f6e7a21374c980c10d38b4493e703f4a389" + integrity sha512-mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.12.1" + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-proposal-unicode-property-regex@^7.12.1", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz#2a183958d417765b9eae334f47758e5d6a82e072" + integrity sha512-MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.12.1" + "@babel/helper-plugin-utils" "^7.10.4" + +"@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.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz#bcb297c5366e79bebadef509549cd93b04f19978" + integrity sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@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-export-namespace-from@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" + integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q== + dependencies: + "@babel/helper-plugin-utils" "^7.8.3" + +"@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-logical-assignment-operators@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" + integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@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.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" + integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@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.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz#dd6c0b357ac1bb142d98537450a319625d13d2a0" + integrity sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-transform-arrow-functions@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz#8083ffc86ac8e777fbe24b5967c4b2521f3cb2b3" + integrity sha512-5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-transform-async-to-generator@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz#3849a49cc2a22e9743cbd6b52926d30337229af1" + integrity sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A== + dependencies: + "@babel/helper-module-imports" "^7.12.1" + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-remap-async-to-generator" "^7.12.1" + +"@babel/plugin-transform-block-scoped-functions@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz#f2a1a365bde2b7112e0a6ded9067fdd7c07905d9" + integrity sha512-5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-transform-block-scoping@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz#f0ee727874b42a208a48a586b84c3d222c2bbef1" + integrity sha512-zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-transform-classes@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz#65e650fcaddd3d88ddce67c0f834a3d436a32db6" + integrity sha512-/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog== + dependencies: + "@babel/helper-annotate-as-pure" "^7.10.4" + "@babel/helper-define-map" "^7.10.4" + "@babel/helper-function-name" "^7.10.4" + "@babel/helper-optimise-call-expression" "^7.10.4" + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-replace-supers" "^7.12.1" + "@babel/helper-split-export-declaration" "^7.10.4" + globals "^11.1.0" + +"@babel/plugin-transform-computed-properties@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz#d68cf6c9b7f838a8a4144badbe97541ea0904852" + integrity sha512-vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-transform-destructuring@^7.12.1", "@babel/plugin-transform-destructuring@^7.6.0": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz#b9a570fe0d0a8d460116413cb4f97e8e08b2f847" + integrity sha512-fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-transform-dotall-regex@^7.12.1", "@babel/plugin-transform-dotall-regex@^7.4.4": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz#a1d16c14862817b6409c0a678d6f9373ca9cd975" + integrity sha512-B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.12.1" + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-transform-duplicate-keys@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz#745661baba295ac06e686822797a69fbaa2ca228" + integrity sha512-iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-transform-exponentiation-operator@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz#b0f2ed356ba1be1428ecaf128ff8a24f02830ae0" + integrity sha512-7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug== + dependencies: + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4" + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-transform-for-of@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz#07640f28867ed16f9511c99c888291f560921cfa" + integrity sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-transform-function-name@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz#2ec76258c70fe08c6d7da154003a480620eba667" + integrity sha512-JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw== + dependencies: + "@babel/helper-function-name" "^7.10.4" + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-transform-literals@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz#d73b803a26b37017ddf9d3bb8f4dc58bfb806f57" + integrity sha512-+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-transform-member-expression-literals@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz#496038602daf1514a64d43d8e17cbb2755e0c3ad" + integrity sha512-1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-transform-modules-amd@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz#3154300b026185666eebb0c0ed7f8415fefcf6f9" + integrity sha512-tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ== + dependencies: + "@babel/helper-module-transforms" "^7.12.1" + "@babel/helper-plugin-utils" "^7.10.4" + babel-plugin-dynamic-import-node "^2.3.3" + +"@babel/plugin-transform-modules-commonjs@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz#fa403124542636c786cf9b460a0ffbb48a86e648" + integrity sha512-dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag== + dependencies: + "@babel/helper-module-transforms" "^7.12.1" + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-simple-access" "^7.12.1" + babel-plugin-dynamic-import-node "^2.3.3" + +"@babel/plugin-transform-modules-systemjs@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz#663fea620d593c93f214a464cd399bf6dc683086" + integrity sha512-Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q== + dependencies: + "@babel/helper-hoist-variables" "^7.10.4" + "@babel/helper-module-transforms" "^7.12.1" + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-validator-identifier" "^7.10.4" + babel-plugin-dynamic-import-node "^2.3.3" + +"@babel/plugin-transform-modules-umd@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz#eb5a218d6b1c68f3d6217b8fa2cc82fec6547902" + integrity sha512-aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q== + dependencies: + "@babel/helper-module-transforms" "^7.12.1" + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-transform-named-capturing-groups-regex@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz#b407f5c96be0d9f5f88467497fa82b30ac3e8753" + integrity sha512-tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.12.1" + +"@babel/plugin-transform-new-target@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz#80073f02ee1bb2d365c3416490e085c95759dec0" + integrity sha512-+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-transform-object-super@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz#4ea08696b8d2e65841d0c7706482b048bed1066e" + integrity sha512-AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-replace-supers" "^7.12.1" + +"@babel/plugin-transform-parameters@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz#d2e963b038771650c922eff593799c96d853255d" + integrity sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-transform-property-literals@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz#41bc81200d730abb4456ab8b3fbd5537b59adecd" + integrity sha512-6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-transform-regenerator@^7.12.1", "@babel/plugin-transform-regenerator@^7.7.0": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz#5f0a28d842f6462281f06a964e88ba8d7ab49753" + integrity sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng== + dependencies: + regenerator-transform "^0.14.2" + +"@babel/plugin-transform-reserved-words@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz#6fdfc8cc7edcc42b36a7c12188c6787c873adcd8" + integrity sha512-pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-transform-runtime@^7.6.2": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.1.tgz#04b792057eb460389ff6a4198e377614ea1e7ba5" + integrity sha512-Ac/H6G9FEIkS2tXsZjL4RAdS3L3WHxci0usAnz7laPWUmFiGtj7tIASChqKZMHTSQTQY6xDbOq+V1/vIq3QrWg== + dependencies: + "@babel/helper-module-imports" "^7.12.1" + "@babel/helper-plugin-utils" "^7.10.4" + resolve "^1.8.1" + semver "^5.5.1" + +"@babel/plugin-transform-shorthand-properties@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz#0bf9cac5550fce0cfdf043420f661d645fdc75e3" + integrity sha512-GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-transform-spread@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz#527f9f311be4ec7fdc2b79bb89f7bf884b3e1e1e" + integrity sha512-vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" + +"@babel/plugin-transform-sticky-regex@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz#5c24cf50de396d30e99afc8d1c700e8bce0f5caf" + integrity sha512-CiUgKQ3AGVk7kveIaPEET1jNDhZZEl1RPMWdTBE1799bdz++SwqDHStmxfCtDfBhQgCl38YRiSnrMuUMZIWSUQ== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-regex" "^7.10.4" + +"@babel/plugin-transform-template-literals@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz#b43ece6ed9a79c0c71119f576d299ef09d942843" + integrity sha512-b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-transform-typeof-symbol@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz#9ca6be343d42512fbc2e68236a82ae64bc7af78a" + integrity sha512-EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-transform-unicode-escapes@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz#5232b9f81ccb07070b7c3c36c67a1b78f1845709" + integrity sha512-I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-transform-unicode-regex@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz#cc9661f61390db5c65e3febaccefd5c6ac3faecb" + integrity sha512-SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.12.1" + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/preset-env@^7.7.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.1.tgz#9c7e5ca82a19efc865384bb4989148d2ee5d7ac2" + integrity sha512-H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg== + dependencies: + "@babel/compat-data" "^7.12.1" + "@babel/helper-compilation-targets" "^7.12.1" + "@babel/helper-module-imports" "^7.12.1" + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-validator-option" "^7.12.1" + "@babel/plugin-proposal-async-generator-functions" "^7.12.1" + "@babel/plugin-proposal-class-properties" "^7.12.1" + "@babel/plugin-proposal-dynamic-import" "^7.12.1" + "@babel/plugin-proposal-export-namespace-from" "^7.12.1" + "@babel/plugin-proposal-json-strings" "^7.12.1" + "@babel/plugin-proposal-logical-assignment-operators" "^7.12.1" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1" + "@babel/plugin-proposal-numeric-separator" "^7.12.1" + "@babel/plugin-proposal-object-rest-spread" "^7.12.1" + "@babel/plugin-proposal-optional-catch-binding" "^7.12.1" + "@babel/plugin-proposal-optional-chaining" "^7.12.1" + "@babel/plugin-proposal-private-methods" "^7.12.1" + "@babel/plugin-proposal-unicode-property-regex" "^7.12.1" + "@babel/plugin-syntax-async-generators" "^7.8.0" + "@babel/plugin-syntax-class-properties" "^7.12.1" + "@babel/plugin-syntax-dynamic-import" "^7.8.0" + "@babel/plugin-syntax-export-namespace-from" "^7.8.3" + "@babel/plugin-syntax-json-strings" "^7.8.0" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" + "@babel/plugin-syntax-numeric-separator" "^7.10.4" + "@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.12.1" + "@babel/plugin-transform-arrow-functions" "^7.12.1" + "@babel/plugin-transform-async-to-generator" "^7.12.1" + "@babel/plugin-transform-block-scoped-functions" "^7.12.1" + "@babel/plugin-transform-block-scoping" "^7.12.1" + "@babel/plugin-transform-classes" "^7.12.1" + "@babel/plugin-transform-computed-properties" "^7.12.1" + "@babel/plugin-transform-destructuring" "^7.12.1" + "@babel/plugin-transform-dotall-regex" "^7.12.1" + "@babel/plugin-transform-duplicate-keys" "^7.12.1" + "@babel/plugin-transform-exponentiation-operator" "^7.12.1" + "@babel/plugin-transform-for-of" "^7.12.1" + "@babel/plugin-transform-function-name" "^7.12.1" + "@babel/plugin-transform-literals" "^7.12.1" + "@babel/plugin-transform-member-expression-literals" "^7.12.1" + "@babel/plugin-transform-modules-amd" "^7.12.1" + "@babel/plugin-transform-modules-commonjs" "^7.12.1" + "@babel/plugin-transform-modules-systemjs" "^7.12.1" + "@babel/plugin-transform-modules-umd" "^7.12.1" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.1" + "@babel/plugin-transform-new-target" "^7.12.1" + "@babel/plugin-transform-object-super" "^7.12.1" + "@babel/plugin-transform-parameters" "^7.12.1" + "@babel/plugin-transform-property-literals" "^7.12.1" + "@babel/plugin-transform-regenerator" "^7.12.1" + "@babel/plugin-transform-reserved-words" "^7.12.1" + "@babel/plugin-transform-shorthand-properties" "^7.12.1" + "@babel/plugin-transform-spread" "^7.12.1" + "@babel/plugin-transform-sticky-regex" "^7.12.1" + "@babel/plugin-transform-template-literals" "^7.12.1" + "@babel/plugin-transform-typeof-symbol" "^7.12.1" + "@babel/plugin-transform-unicode-escapes" "^7.12.1" + "@babel/plugin-transform-unicode-regex" "^7.12.1" + "@babel/preset-modules" "^0.1.3" + "@babel/types" "^7.12.1" + core-js-compat "^3.6.2" + semver "^5.5.0" + +"@babel/preset-modules@^0.1.3": + version "0.1.4" + resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e" + integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg== + 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.12.5" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e" + integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg== + dependencies: + regenerator-runtime "^0.13.4" + +"@babel/template@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278" + integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA== + dependencies: + "@babel/code-frame" "^7.10.4" + "@babel/parser" "^7.10.4" + "@babel/types" "^7.10.4" + +"@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5": + version "7.12.5" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.5.tgz#78a0c68c8e8a35e4cacfd31db8bb303d5606f095" + integrity sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA== + dependencies: + "@babel/code-frame" "^7.10.4" + "@babel/generator" "^7.12.5" + "@babel/helper-function-name" "^7.10.4" + "@babel/helper-split-export-declaration" "^7.11.0" + "@babel/parser" "^7.12.5" + "@babel/types" "^7.12.5" + debug "^4.1.0" + globals "^11.1.0" + lodash "^4.17.19" + +"@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.4.4": + version "7.12.6" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.6.tgz#ae0e55ef1cce1fbc881cd26f8234eb3e657edc96" + integrity sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA== + dependencies: + "@babel/helper-validator-identifier" "^7.10.4" + lodash "^4.17.19" + 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== + +"@npmcli/move-file@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.0.1.tgz#de103070dac0f48ce49cf6693c23af59c0f70464" + integrity sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw== + dependencies: + mkdirp "^1.0.4" + +"@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.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@rails/webpacker/-/webpacker-4.3.0.tgz#3793b3aed08ed0b661f1bed9de0739abacb6a834" + integrity sha512-DmKGjKugLeeytT1TO9fUBBjdA3YwQ19zoWK5JDL8V1rM0bf6WRf1n9DZTiVmuf0WO1gp5ej5pJ9b3NjZwfAz4Q== + 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 "^4.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.3" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183" + integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w== + dependencies: + "@types/minimatch" "*" + "@types/node" "*" + +"@types/json-schema@^7.0.5": + version "7.0.6" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" + integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw== + +"@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.14.7" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.7.tgz#8ea1e8f8eae2430cf440564b98c6dfce1ec5945d" + integrity sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg== + +"@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.2" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" + integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== + +aggregate-error@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== + 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, ajv-keywords@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== + +ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + 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@^5.2.0: + version "5.4.1" + resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07" + integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA== + dependencies: + bn.js "^4.0.0" + inherits "^2.0.1" + minimalistic-assert "^1.0.0" + safer-buffer "^2.1.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.6" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f" + integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg== + dependencies: + browserslist "^4.12.0" + caniuse-lite "^1.0.30001109" + colorette "^1.2.1" + normalize-range "^0.1.2" + num2fraction "^1.2.2" + postcss "^7.0.32" + 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.11.0" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" + integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== + +babel-loader@^8.0.6: + version "8.2.1" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.1.tgz#e53313254677e86f27536f5071d807e01d24ec00" + integrity sha512-dMF8sb2KQ8kJl21GUjkW1HWmcsL39GOV5vnzjqrCzEPNY0S0UfMLnumidiwIajDSBmKhYf5iRW+HXaM4cvCKBw== + dependencies: + find-cache-dir "^2.1.0" + loader-utils "^1.4.0" + make-dir "^2.1.0" + 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.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + +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.1.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz#30fa40c9e7fe07dbc895678cd287024dea241dd9" + integrity sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ== + +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.0.0, bn.js@^5.1.1: + version "5.1.3" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b" + integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ== + +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.3: + version "4.5.3" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.3.tgz#c6a72b355aaf323920be800246a6e4ef30997fe6" + integrity sha512-o9ppKQioXGqhw8Z7mah6KdTYpNQY//tipnkxppWhPbiSWdD+1raYsnhwEZjkTHYbGee4cVQ0Rx65EhOY/HNLcQ== + +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.1.0" + resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d" + integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog== + dependencies: + bn.js "^5.0.0" + randombytes "^2.0.1" + +browserify-sign@^4.0.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3" + integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg== + dependencies: + bn.js "^5.1.1" + browserify-rsa "^4.0.1" + create-hash "^1.2.0" + create-hmac "^1.1.7" + elliptic "^6.5.3" + 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.14.5, browserslist@^4.14.6, browserslist@^4.6.4: + version "4.14.7" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz#c071c1b3622c1c2e790799a37bb09473a4351cb6" + integrity sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ== + dependencies: + caniuse-lite "^1.0.30001157" + colorette "^1.2.1" + electron-to-chromium "^1.3.591" + escalade "^3.1.1" + node-releases "^1.1.66" + +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" + +cacache@^15.0.5: + version "15.0.5" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz#69162833da29170d6732334643c60e005f5f17d0" + integrity sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A== + dependencies: + "@npmcli/move-file" "^1.0.1" + chownr "^2.0.0" + fs-minipass "^2.0.0" + glob "^7.1.4" + infer-owner "^1.0.4" + lru-cache "^6.0.0" + minipass "^3.1.1" + minipass-collect "^1.0.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.2" + mkdirp "^1.0.3" + p-map "^4.0.0" + promise-inflight "^1.0.1" + rimraf "^3.0.2" + ssri "^8.0.0" + tar "^6.0.2" + 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" + +call-bind@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz#24127054bb3f9bdcb4b1fb82418186072f77b8ce" + integrity sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w== + dependencies: + function-bind "^1.1.1" + get-intrinsic "^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.30001109, caniuse-lite@^1.0.30001157: + version "1.0.30001158" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001158.tgz#fce86d321369603c2bc855ee0e901a7f49f8310b" + integrity sha512-s5loVYY+yKpuVA3HyW8BarzrtJvwHReuzugQXlv1iR3LKSReoFXRm86mT6hT7PEF5RxW+XQZg+6nYjlywYzQ+g== + +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@^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" + +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" + +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.1: + version "3.4.3" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz#c1df38231448e45ca4ac588e6c79573ba6a57d5b" + integrity sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ== + 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.5.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== + +chownr@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" + integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== + +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.4: + version "1.5.4" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.4.tgz#dd51cd25cfee953d138fe4002372cc3d0e504cb6" + integrity sha512-57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw== + dependencies: + color-name "^1.0.0" + simple-swizzle "^0.2.2" + +color@^3.0.0: + version "3.1.3" + resolved "https://registry.yarnpkg.com/color/-/color-3.1.3.tgz#ca67fb4e7b97d611dcde39eceed422067d91596e" + integrity sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ== + dependencies: + color-convert "^1.9.1" + color-string "^1.5.4" + +colorette@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b" + integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw== + +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@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-4.0.1.tgz#33eda97f1170dd38c5556771de10f34245aa0274" + integrity sha512-0mg6PgwTsUe5LEcUrOu3ob32vraDx2VdbMGAT1PARcOV+UJWDYZFdkSo6RbHoGQ061mmmkC7XpRKOlvwm/gzJQ== + dependencies: + cacache "^15.0.5" + find-cache-dir "^3.3.1" + schema-utils "^2.7.0" + serialize-javascript "^4.0.0" + webpack-sources "^1.4.3" + +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.7.0" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.7.0.tgz#8479c5d3d672d83f1f5ab94cf353e57113e065ed" + integrity sha512-V8yBI3+ZLDVomoWICO6kq/CD28Y4r1M7CWeO4AGpMdMfseu8bkSubBmUPySMGKRTS+su4XQ07zUkAsiu9FCWTg== + dependencies: + browserslist "^4.14.6" + semver "7.0.0" + +core-js@^3.4.0: + version "3.7.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.7.0.tgz#b0a761a02488577afbf97179e4681bf49568520f" + integrity sha512-NwS7fI5M5B85EwpWuIwJN4i/fbisQUwLwiSNUWeXlkAZ0sbBjLEvLvFLf1uzAUV66PcEPt4xCGCmOZSxVf3xzA== + +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.4" + resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e" + integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A== + dependencies: + bn.js "^4.1.0" + elliptic "^6.5.3" + +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@^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" + +cross-spawn@^6.0.0, cross-spawn@^6.0.5: + 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" + +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.6.0" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.6.0.tgz#2e4b2c7e6e2d27f8c8f28f61bffcd2e6c91ef645" + integrity sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ== + 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.32" + 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.1.0" + schema-utils "^2.7.0" + 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: + version "1.0.1" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.1.tgz#7726678dfe2a57993a018d9dce519bf1760e3b6d" + integrity sha512-WroX+2MvsYcRGP8QA0p+rxzOniT/zpAoQ/DTKDSJzh5T3IQKUkFHeIIfgIapm2uaP178GWY3Mime1qbk8GO/tA== + dependencies: + mdn-data "2.0.12" + source-map "^0.6.1" + +css-what@^3.2.1: + version "3.4.2" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" + integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ== + +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.1.1" + resolved "https://registry.yarnpkg.com/csso/-/csso-4.1.1.tgz#e0cb02d6eb3af1df719222048e4359efd662af13" + integrity sha512-Rvq+e1e0TFB8E8X+8MQjHSY6vtol45s5gxtLI/018UsAn2IBMmwNEZRM/h+HVnAJRHjasLIKKUO3uvoMM28LvA== + dependencies: + css-tree "^1.0.0" + +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.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.2.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1" + integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg== + dependencies: + ms "2.1.2" + +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.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.2" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.2.tgz#f3b6e549201e46f588b59463dd77187131fe6971" + integrity sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA== + +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.3.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" + integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== + 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.591: + version "1.3.596" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.596.tgz#c7ed98512c7ff36ddcbfed9e54e6355335c35257" + integrity sha512-nLO2Wd2yU42eSoNJVQKNf89CcEGqeFZd++QsnN2XIgje1s/19AgctfjLIbPORlvcCO8sYjLwX4iUgDdusOY8Sg== + +elliptic@^6.5.3: + version "6.5.3" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6" + integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw== + 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@^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.1, enhanced-resolve@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126" + integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ== + dependencies: + graceful-fs "^4.1.2" + memory-fs "^0.5.0" + tapable "^1.0.0" + +entities@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5" + integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w== + +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: + version "1.17.7" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c" + integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g== + dependencies: + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + is-callable "^1.2.2" + is-regex "^1.1.1" + object-inspect "^1.8.0" + object-keys "^1.1.1" + object.assign "^4.1.1" + string.prototype.trimend "^1.0.1" + string.prototype.trimstart "^1.0.1" + +es-abstract@^1.18.0-next.1: + version "1.18.0-next.1" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68" + integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA== + dependencies: + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + is-callable "^1.2.2" + is-negative-zero "^2.0.0" + is-regex "^1.1.1" + object-inspect "^1.8.0" + object-keys "^1.1.1" + object.assign "^4.1.1" + string.prototype.trimend "^1.0.1" + string.prototype.trimstart "^1.0.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" + +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + +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.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== + dependencies: + estraverse "^5.2.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== + +estraverse@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" + integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== + +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.7" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" + integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== + +events@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379" + integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg== + +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.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@^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.13.0" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db" + integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA== + +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.2" + resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" + integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== + +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-intrinsic@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz#94a9768fcbdd0595a1c9273aacf4c89d075631be" + integrity sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg== + dependencies: + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + +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@^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-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-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.5" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" + integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w== + dependencies: + ajv "^6.12.3" + 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.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.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + +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.2" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz#fc129c160c5d68235507f4331a6baad186bdbc3e" + integrity sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw== + 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: + 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.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" + integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== + +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.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9" + integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA== + +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-core-module@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz#a4cc031d9b1aca63eecbd18a650e13cb4eeab946" + integrity sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA== + dependencies: + has "^1.0.3" + +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-negative-zero@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461" + integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE= + +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.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9" + integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg== + 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.6.4" + resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4" + integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ== + +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-parse-even-better-errors@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== + +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" + +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.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@^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.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.5, lodash@~4.17.10: + version "4.17.20" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" + integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== + +loglevel@^1.6.8: + version "1.7.0" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0" + integrity sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ== + +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" + +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + +make-dir@^2.0.0, make-dir@^2.1.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-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.12: + version "2.0.12" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.12.tgz#bbb658d08b38f574bbb88f7b83703defdcc46844" + integrity sha512-ULbAlgzVb8IqZ0Hsxm6hHSlQl3Jckst2YEQS7fODu9ilNWy2LvcoSY7TRFIktABP2mdppBioc66va90T+NUs8Q== + +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== + +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= + +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: + 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-db@>= 1.43.0 < 2": + version "1.45.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea" + integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w== + +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== + +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.4" + resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" + integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== + 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" + +minizlib@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" + integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== + dependencies: + minipass "^3.0.0" + 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.5, 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" + +mkdirp@^1.0.3, mkdirp@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== + +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.2, 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.2" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" + integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== + +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.2" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== + +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.10.0: + version "0.10.0" + resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" + integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== + +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.66: + version "1.1.66" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.66.tgz#609bd0dc069381015cd982300bae51ab4f1b1814" + integrity sha512-JHEQ1iWPGK+38VLB2H9ef2otU4l8s3yAMt9Xf934r6+ojCYDMHPMqvCc9TnzfeFSP1QEOeU6YZEd3+De0LTCgg== + +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.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0" + integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA== + +object-is@^1.0.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.3.tgz#2e3b9e65560137455ee3bd62aec4d90a2ea1cc81" + integrity sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.18.0-next.1" + +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, object.assign@^4.1.1: + version "4.1.2" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" + integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + has-symbols "^1.0.1" + object-keys "^1.1.1" + +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.4" + resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.4.tgz#85883c6528aaa02e30bbad9908c92926bb52dc90" + integrity sha512-wqd6FdI2a5/FdoiCNNkEvLeA//lHHfG24Ln2Xm2qqdIk4aOlsR18jwpyOihqQ8849W3qu2DX8fOYxpvTMj+93A== + 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-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-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-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@^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-map@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== + 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@^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.6" + resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4" + integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw== + dependencies: + asn1.js "^5.2.0" + browserify-aes "^1.0.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.1.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz#f96088cdf24a8faa9aea9a009f2d9d942c999646" + integrity sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ== + dependencies: + "@babel/code-frame" "^7.0.0" + error-ex "^1.3.1" + json-parse-even-better-errors "^2.3.0" + 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" + +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.28" + resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778" + integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA== + dependencies: + async "^2.6.2" + debug "^3.1.1" + mkdirp "^0.5.5" + +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.5" + resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.5.tgz#f8a6e99f12e619c2ebc23cf6c486fdc15860933e" + integrity sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg== + 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.1" + resolved "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-4.0.1.tgz#42d4c0ab30894f60f98b17561eb5c0321f502641" + integrity sha512-I3ADQSTNtLTTd8uxZhtSOrTCQ9G4qUVKPjHiDk0bV75QSxXjVWiJVJ2VLdspGUi9fbW9BcjKJoRvxAH1pckqmA== + 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.2" + resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.2.tgz#c5ea504f2c4aef33c7359a34de3573772ad7502a" + integrity sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw== + 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.3" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz#bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0" + integrity sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw== + dependencies: + icss-utils "^4.1.1" + postcss "^7.0.32" + postcss-selector-parser "^6.0.2" + postcss-value-parser "^4.1.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.4" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3" + integrity sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw== + dependencies: + cssesc "^3.0.0" + indexes-of "^1.0.1" + uniq "^1.0.1" + util-deprecate "^1.0.2" + +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.2, 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.17, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6: + version "7.0.35" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24" + integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg== + 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= + +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.2.0" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" + integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== + +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.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" + integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ== + 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.2" + resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" + integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== + +regenerator-runtime@^0.13.3, regenerator-runtime@^0.13.4: + version "0.13.7" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" + integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== + +regenerator-transform@^0.14.2: + version "0.14.5" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4" + integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw== + dependencies: + "@babel/runtime" "^7.8.4" + +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.1: + version "4.7.1" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6" + integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ== + 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.19.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c" + integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg== + dependencies: + is-core-module "^2.1.0" + 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" + +rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + 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.5, schema-utils@^2.6.6, schema-utils@^2.7.0: + version "2.7.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" + integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== + dependencies: + "@types/json-schema" "^7.0.5" + ajv "^6.12.4" + ajv-keywords "^3.5.2" + +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.8" + resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz#0d17208b7d12c33f8eac85c41835f27fc3d81a30" + integrity sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w== + dependencies: + node-forge "^0.10.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@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa" + integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw== + 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.6" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz#c80757383c28abf7296744998cbc106ae8b854ce" + integrity sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw== + +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" + +ssri@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.0.tgz#79ca74e21f8ceaeddfcb4b90143c458b8d988808" + integrity sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA== + dependencies: + 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.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz#6ddd9a8796bc714b489a3ae22246a208f37bfa46" + integrity sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.18.0-next.1" + +string.prototype.trimstart@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz#22d45da81015309cd0cdd79787e8919fc5c613e7" + integrity sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.18.0-next.1" + +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.3.0" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.3.0.tgz#828b4a3b3b7e7aa5847ce7bae9e874512114249e" + integrity sha512-V7TCORko8rs9rIqkSrlMfkqA63DfoGBBJmK1kKGCcSi+BWb4cqz0SRsnp4l6rU5iwOEd0/2ePv68SV22VXon4Q== + dependencies: + loader-utils "^2.0.0" + schema-utils "^2.7.0" + +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@^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@^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@^7.0.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + 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" + +tar@^6.0.2: + version "6.0.5" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz#bde815086e10b39f1dcd298e89d596e1535e200f" + integrity sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^3.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + +terser-webpack-plugin@^1.4.3: + version "1.4.5" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b" + integrity sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw== + dependencies: + cacache "^12.0.2" + find-cache-dir "^2.1.0" + is-wsl "^1.1.0" + schema-utils "^1.0.0" + serialize-javascript "^4.0.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.8" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz#894764a19b0743f2f704e7c2a848c5283a696724" + integrity sha512-/fKw3R+hWyHfYx7Bv6oPqmk4HGQcrWLtV3X6ggvPuwPNHSnzvVV51z6OaaCOus4YLjutYGOz3pEpbhe6Up2s1w== + 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 "^4.0.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.8.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17" + integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw== + 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.12" + resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee" + integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ== + 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.14.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" + integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== + +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.4.0" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602" + integrity sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g== + 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.2, 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.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132" + integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q== + +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.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957" + integrity sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww== + dependencies: + chokidar "^2.1.8" + +watchpack@^1.7.4: + version "1.7.5" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453" + integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ== + dependencies: + graceful-fs "^4.1.2" + neo-async "^2.5.0" + optionalDependencies: + chokidar "^3.4.1" + watchpack-chokidar2 "^2.0.1" + +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.12" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.12.tgz#94e9ada081453cd0aa609c99e500012fd3ad2d4a" + integrity sha512-NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag== + dependencies: + chalk "^2.4.2" + cross-spawn "^6.0.5" + enhanced-resolve "^4.1.1" + findup-sync "^3.0.0" + global-modules "^2.0.0" + import-local "^2.0.0" + interpret "^1.4.0" + loader-utils "^1.4.0" + supports-color "^6.1.0" + v8-compile-cache "^2.1.1" + yargs "^13.3.2" + +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.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.44.2" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.44.2.tgz#6bfe2b0af055c8b2d1e90ed2cd9363f841266b72" + integrity sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q== + 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.3.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.7.4" + 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.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.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 7fb328b8e00376926b49cf1e246dccba142a24ec Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Mon, 16 Nov 2020 18:47:50 -0800 Subject: [PATCH 002/248] experimenting with scaffolding Product. Product routes, controller, model and templatized view pages created by rails --- app/controllers/products_controller.rb | 76 ++++++++++++++++++++ app/helpers/products_helper.rb | 2 + app/models/product.rb | 2 + app/views/products/_form.html.erb | 17 +++++ app/views/products/edit.html.erb | 6 ++ app/views/products/index.html.erb | 25 +++++++ app/views/products/new.html.erb | 5 ++ app/views/products/show.html.erb | 4 ++ config/routes.rb | 2 +- db/migrate/20201117023314_create_products.rb | 13 ++++ db/schema.rb | 18 +++++ test/controllers/products_controller_test.rb | 46 ++++++++++++ test/models/product_test.rb | 7 ++ test/system/products_test.rb | 39 ++++++++++ 14 files changed, 261 insertions(+), 1 deletion(-) create mode 100644 app/controllers/products_controller.rb create mode 100644 app/helpers/products_helper.rb create mode 100644 app/models/product.rb create mode 100644 app/views/products/_form.html.erb create mode 100644 app/views/products/edit.html.erb create mode 100644 app/views/products/index.html.erb create mode 100644 app/views/products/new.html.erb create mode 100644 app/views/products/show.html.erb create mode 100644 db/migrate/20201117023314_create_products.rb create mode 100644 db/schema.rb create mode 100644 test/controllers/products_controller_test.rb create mode 100644 test/models/product_test.rb create mode 100644 test/system/products_test.rb diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb new file mode 100644 index 0000000000..bcc0d86c94 --- /dev/null +++ b/app/controllers/products_controller.rb @@ -0,0 +1,76 @@ +class ProductsController < ApplicationController + before_action :set_product, only: [:show, :edit, :update, :destroy] + + def index + @products = Product.all + end + + def show + if @product.nil? + head :not_found + return + end + end + + def new + @product = Product.new + end + + def edit + if @product.nil? + redirect_to products_path + return + end + end + + def create + @product = Product.new(product_params) + + if @product.save + flash[:success] = 'Product was successfully created!' + redirect_to product_path(@product) + return + else + flash.now[:failure] = 'Product was not successfully created.' + render :new, status :bad_request + return + end + end + + def update + if @product.nil? + head :not_found + return + elsif @product.update(product_params) + flash[:success] = 'Product was successfully updated!' + redirect_to product_path(@product) + return + else + flash.now[:failure] = "Product was not successfully updated." + render :edit, status :bad_request + return + end + end + + def destroy + if @product.nil? + head :not_found + return + else + @product.destroy + flash[:success] = "Product was successfully deleted." + redirect_to products_path + return + end + end + + private + + def set_product + @product = Product.find(params[:id]) + end + + def product_params + return params.require(:product).permit(:name, :cost, :inventory, :description, :image, :merchant_id, :review_id) + end +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/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/app/views/products/_form.html.erb b/app/views/products/_form.html.erb new file mode 100644 index 0000000000..0f4ce4ef88 --- /dev/null +++ b/app/views/products/_form.html.erb @@ -0,0 +1,17 @@ +<%= form_with(model: product, local: true) do |form| %> + <% if product.errors.any? %> +
+

<%= pluralize(product.errors.count, "error") %> prohibited this product from being saved:

+ +
    + <% product.errors.full_messages.each do |message| %> +
  • <%= message %>
    • + <% end %> +
+
+ <% end %> + +
+ <%= form.submit %> +
+<% end %> diff --git a/app/views/products/edit.html.erb b/app/views/products/edit.html.erb new file mode 100644 index 0000000000..fc16e133a0 --- /dev/null +++ b/app/views/products/edit.html.erb @@ -0,0 +1,6 @@ +

Editing Product

+ +<%= render 'form', product: @product %> + +<%= link_to 'Show', @product %> | +<%= link_to 'Back', products_path %> diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb new file mode 100644 index 0000000000..db5f937870 --- /dev/null +++ b/app/views/products/index.html.erb @@ -0,0 +1,25 @@ +

<%= notice %>

+ +

Products

+ + + + + + + + + + <% @products.each do |product| %> + + + + + + <% end %> + +
<%= link_to 'Show', product %><%= link_to 'Edit', edit_product_path(product) %><%= link_to 'Destroy', product, method: :delete, data: { confirm: 'Are you sure?' } %>
+ +
+ +<%= link_to 'New Product', new_product_path %> diff --git a/app/views/products/new.html.erb b/app/views/products/new.html.erb new file mode 100644 index 0000000000..a06963dc59 --- /dev/null +++ b/app/views/products/new.html.erb @@ -0,0 +1,5 @@ +

New Product

+ +<%= render 'form', product: @product %> + +<%= link_to 'Back', products_path %> diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb new file mode 100644 index 0000000000..332e362386 --- /dev/null +++ b/app/views/products/show.html.erb @@ -0,0 +1,4 @@ +

<%= notice %>

+ +<%= link_to 'Edit', edit_product_path(@product) %> | +<%= link_to 'Back', products_path %> 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 diff --git a/db/migrate/20201117023314_create_products.rb b/db/migrate/20201117023314_create_products.rb new file mode 100644 index 0000000000..33599c48db --- /dev/null +++ b/db/migrate/20201117023314_create_products.rb @@ -0,0 +1,13 @@ +class CreateProducts < ActiveRecord::Migration[6.0] + def change + create_table :products do |t| + t.string :name + t.integer :inventory + t.integer :cost + t.text :description + t.string :image + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000000..b10373ba60 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,18 @@ +# 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: 0) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + +end diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb new file mode 100644 index 0000000000..70f9e0ec69 --- /dev/null +++ b/test/controllers/products_controller_test.rb @@ -0,0 +1,46 @@ +require "test_helper" + +describe ProductsController do + let(:product) { products(:one) } + + it "should get index" do + get products_url + must_respond_with :success + end + + it "should get new" do + get new_product_url + must_respond_with :success + end + + it "should create product" do + assert_difference("Product.count") do + post products_url, params: { product: { } } + end + + must_redirect_to product_url(Product.last) + end + + it "should show product" do + get product_url(@product) + must_respond_with :success + end + + it "should get edit" do + get edit_product_url(@product) + must_respond_with :success + end + + it "should update product" do + patch product_url(@product), params: { product: { } } + must_redirect_to product_url(product) + end + + it "should destroy product" do + assert_difference("Product.count", -1) do + delete product_url(@product) + end + + must_redirect_to products_url + 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 diff --git a/test/system/products_test.rb b/test/system/products_test.rb new file mode 100644 index 0000000000..64819a4c58 --- /dev/null +++ b/test/system/products_test.rb @@ -0,0 +1,39 @@ +require "application_system_test_case" + +describe "Products", :system do + let(:product) { products(:one) } + + it "visiting the index" do + visit products_url + assert_selector "h1", text: "Products" + end + + it "creating a Product" do + visit products_url + click_on "New Product" + + click_on "Create Product" + + assert_text "Product was successfully created" + click_on "Back" + end + + it "updating a Product" do + visit products_url + click_on "Edit", match: :first + + click_on "Update Product" + + assert_text "Product was successfully updated" + click_on "Back" + end + + it "destroying a Product" do + visit products_url + page.accept_confirm do + click_on "Destroy", match: :first + end + + assert_text "Product was successfully destroyed" + end +end From e0a37ec80cf95577336bc22675f0977a60154bc5 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Mon, 16 Nov 2020 18:49:58 -0800 Subject: [PATCH 003/248] fixed typos in products controller --- app/controllers/products_controller.rb | 4 ++-- db/schema.rb | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index bcc0d86c94..1a67efd320 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -32,7 +32,7 @@ def create return else flash.now[:failure] = 'Product was not successfully created.' - render :new, status :bad_request + render :new, status: :bad_request return end end @@ -47,7 +47,7 @@ def update return else flash.now[:failure] = "Product was not successfully updated." - render :edit, status :bad_request + render :edit, status: :bad_request return end end diff --git a/db/schema.rb b/db/schema.rb index b10373ba60..80b17e5b8f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,9 +10,19 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 0) do +ActiveRecord::Schema.define(version: 2020_11_17_023314) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "products", force: :cascade do |t| + t.string "name" + t.integer "inventory" + t.integer "cost" + t.text "description" + t.string "image" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + end From a9af1d8d017e6f28bd36d824ec83c14ae8b57159 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Tue, 17 Nov 2020 09:13:37 -0800 Subject: [PATCH 004/248] test_helper setup for OmniAuth testing. no other auth set up yet. --- Gemfile | 8 ++++++++ Gemfile.lock | 31 +++++++++++++++++++++++++++++++ test/fixtures/users.yml | 12 ++++++++++++ test/test_helper.rb | 23 +++++++++++++++++++++++ 4 files changed, 74 insertions(+) create mode 100644 test/fixtures/users.yml diff --git a/Gemfile b/Gemfile index 48cdee19cb..a47d84aee7 100644 --- a/Gemfile +++ b/Gemfile @@ -24,6 +24,14 @@ gem 'jbuilder', '~> 2.7' # Use Active Storage variant # gem 'image_processing', '~> 1.2' +# +# omniauth and .env files +gem 'omniauth' +gem 'omniauth-github' + +group :development, :test do + gem 'dotenv-rails' +end # 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 5c056fcc4c..c36c89dd8e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,8 +92,15 @@ GEM debase-ruby_core_source (>= 0.10.2) debase-ruby_core_source (0.10.11) debug_inspector (0.0.3) + dotenv (2.7.6) + dotenv-rails (2.7.6) + dotenv (= 2.7.6) + railties (>= 3.2) erubi (1.10.0) execjs (2.7.0) + faraday (1.1.0) + multipart-post (>= 1.2, < 3) + ruby2_keywords ffi (1.13.1) formatador (0.2.5) globalid (0.4.2) @@ -111,6 +118,7 @@ GEM guard-minitest (2.4.6) guard-compat (~> 1.2) minitest (>= 3.0) + hashie (4.1.0) i18n (1.8.5) concurrent-ruby (~> 1.0) jbuilder (2.10.1) @@ -122,6 +130,7 @@ GEM jquery-turbolinks (2.1.0) railties (>= 3.1.0) turbolinks + jwt (2.2.2) listen (3.3.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -147,6 +156,9 @@ GEM minitest (>= 5.0) ruby-progressbar msgpack (1.3.3) + multi_json (1.15.0) + multi_xml (0.6.0) + multipart-post (2.1.1) nenv (0.3.0) nio4r (2.5.4) nokogiri (1.10.10) @@ -154,6 +166,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.7.0) + oauth2 (~> 1.4) + omniauth (~> 1.9) pg (1.2.3) popper_js (1.16.0) pry (0.13.1) @@ -203,6 +230,7 @@ GEM ruby-debug-ide (0.7.2) rake (>= 0.8.1) ruby-progressbar (1.10.1) + ruby2_keywords (0.0.2) rubyzip (2.3.0) sass-rails (6.0.0) sassc-rails (~> 2.1, >= 2.1.1) @@ -268,6 +296,7 @@ DEPENDENCIES byebug capybara (>= 2.15) debase (>= 0.2.4.1) + dotenv-rails guard guard-minitest jbuilder (~> 2.7) @@ -276,6 +305,8 @@ DEPENDENCIES listen (~> 3.2) minitest-rails minitest-reporters + omniauth + omniauth-github pg (>= 0.18, < 2.0) pry-rails puma (~> 4.1) diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 0000000000..a65e9c820b --- /dev/null +++ b/test/fixtures/users.yml @@ -0,0 +1,12 @@ +ada: + provider: github + uid: 12345 + email: ada@adadev.org + username: ada + avatar: https://placekitten.com/50/50 +sophie: + provider: github + uid: 33333 + email: sophieemessing@gmail.com + username: sophie + avatar: https://placekitten.com/50/50 diff --git a/test/test_helper.rb b/test/test_helper.rb index b19af0d5bd..6d69d3a9d6 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -18,4 +18,27 @@ class ActiveSupport::TestCase fixtures :all # Add more helper methods to be used by all tests here... + + def setup + OmniAuth.config.test_mode = true + end + + def mock_auth_hash(user) + return { + provider: user.provider, + uid: user.uid, + info: { + email: user.email, + nickname: user.name, + }, + } + end + + def perform_login(user = nil) + user ||= User.first + OmniAuth.config.mock_auth[:github] = OmniAuth::AuthHash.new(mock_auth_hash(user)) + get auth_callback_path(:github) + expect(session[:user_id]).must_equal user.id + end + end From ef6a71168325e6c7b1a12a8240ccbf1b38bec1f5 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Tue, 17 Nov 2020 09:29:18 -0800 Subject: [PATCH 005/248] test_helper setup for OmniAuth testing. no other auth set up yet. --- test/test_helper.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/test_helper.rb b/test/test_helper.rb index 6d69d3a9d6..199928a0be 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -29,7 +29,8 @@ def mock_auth_hash(user) uid: user.uid, info: { email: user.email, - nickname: user.name, + nickname: user.username, + image: user.avatar }, } end @@ -37,7 +38,11 @@ def mock_auth_hash(user) def perform_login(user = nil) user ||= User.first OmniAuth.config.mock_auth[:github] = OmniAuth::AuthHash.new(mock_auth_hash(user)) + get auth_callback_path(:github) + user = User.find_by(uid: user.uid, username: user.username) + + expect(user).wont_be_nil expect(session[:user_id]).must_equal user.id end From 80ab5a62c31c49f5217f3cf5b337bdfe90f4aea9 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Tue, 17 Nov 2020 11:08:29 -0800 Subject: [PATCH 006/248] product scaffolding complete --- .gitignore | 2 ++ app/controllers/products_controller.rb | 2 +- app/views/products/_form.html.erb | 2 +- app/views/products/edit.html.erb | 3 +-- app/views/products/new.html.erb | 2 -- app/views/products/show.html.erb | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index f22dd34725..8f784de9fc 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,5 @@ /yarn-error.log yarn-debug.log* .yarn-integrity + +.env diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 1a67efd320..e61159991b 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -71,6 +71,6 @@ def set_product end def product_params - return params.require(:product).permit(:name, :cost, :inventory, :description, :image, :merchant_id, :review_id) + return params.require(:product).permit(:name, :cost, :inventory, :description, :image) end end diff --git a/app/views/products/_form.html.erb b/app/views/products/_form.html.erb index 0f4ce4ef88..cd5351b49c 100644 --- a/app/views/products/_form.html.erb +++ b/app/views/products/_form.html.erb @@ -1,4 +1,4 @@ -<%= form_with(model: product, local: true) do |form| %> +<%= form_with model: @product do |f| %> <% if product.errors.any? %>

<%= pluralize(product.errors.count, "error") %> prohibited this product from being saved:

diff --git a/app/views/products/edit.html.erb b/app/views/products/edit.html.erb index fc16e133a0..8109b87d22 100644 --- a/app/views/products/edit.html.erb +++ b/app/views/products/edit.html.erb @@ -1,6 +1,5 @@ -

Editing Product

+

Edit Product

<%= render 'form', product: @product %> - <%= link_to 'Show', @product %> | <%= link_to 'Back', products_path %> diff --git a/app/views/products/new.html.erb b/app/views/products/new.html.erb index a06963dc59..e2bef40a64 100644 --- a/app/views/products/new.html.erb +++ b/app/views/products/new.html.erb @@ -1,5 +1,3 @@

New Product

-<%= render 'form', product: @product %> - <%= link_to 'Back', products_path %> diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 332e362386..fbeed42e45 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -1,4 +1,4 @@ -

<%= notice %>

+

<%= @product.name %>

<%= link_to 'Edit', edit_product_path(@product) %> | <%= link_to 'Back', products_path %> From 2fd6f25d0ec5482ca3dc78ea9d3b157e1f9a2c5d Mon Sep 17 00:00:00 2001 From: Lina Do Date: Tue, 17 Nov 2020 11:13:58 -0800 Subject: [PATCH 007/248] stash away schema --- db/schema.rb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 db/schema.rb diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000000..b10373ba60 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,18 @@ +# 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: 0) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + +end From 73af02836bdd7a06c3cb89dfdf28d4b651ca43aa Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Tue, 17 Nov 2020 11:38:57 -0800 Subject: [PATCH 008/248] created initializer --- app/assets/stylesheets/users.scss | 3 +++ app/controllers/users_controller.rb | 2 ++ app/helpers/users_helper.rb | 2 ++ config/initializers/omniauth.rb | 4 ++++ test/controllers/users_controller_test.rb | 7 +++++++ 5 files changed, 18 insertions(+) create mode 100644 app/assets/stylesheets/users.scss create mode 100644 app/controllers/users_controller.rb create mode 100644 app/helpers/users_helper.rb create mode 100644 config/initializers/omniauth.rb create mode 100644 test/controllers/users_controller_test.rb diff --git a/app/assets/stylesheets/users.scss b/app/assets/stylesheets/users.scss new file mode 100644 index 0000000000..efc25261dd --- /dev/null +++ b/app/assets/stylesheets/users.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Users 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/users_controller.rb b/app/controllers/users_controller.rb new file mode 100644 index 0000000000..3e74dea87f --- /dev/null +++ b/app/controllers/users_controller.rb @@ -0,0 +1,2 @@ +class UsersController < ApplicationController +end diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb new file mode 100644 index 0000000000..2310a240d7 --- /dev/null +++ b/app/helpers/users_helper.rb @@ -0,0 +1,2 @@ +module UsersHelper +end diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb new file mode 100644 index 0000000000..300bf0312c --- /dev/null +++ b/config/initializers/omniauth.rb @@ -0,0 +1,4 @@ + +Rails.application.config.middleware.use OmniAuth::Builder do + provider :github, ENV["GITHUB_CLIENT_ID"], ENV["GITHUB_CLIENT_SECRET"], scope: "user:email" +end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb new file mode 100644 index 0000000000..b58feb8fcc --- /dev/null +++ b/test/controllers/users_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe UsersController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From e8682ecc45acaa12fff3f0562934eb178fe0536b Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Tue, 17 Nov 2020 11:53:55 -0800 Subject: [PATCH 009/248] generate user model and controller --- app/controllers/users_controller.rb | 25 +++++++++++++++++++++++ app/models/user.rb | 2 ++ config/routes.rb | 7 +++++++ db/migrate/20201117195308_create_users.rb | 14 +++++++++++++ db/schema.rb | 13 +++++++++++- test/models/user_test.rb | 7 +++++++ 6 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 app/models/user.rb create mode 100644 db/migrate/20201117195308_create_users.rb create mode 100644 test/models/user_test.rb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 3e74dea87f..6bc2f34f6d 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,2 +1,27 @@ class UsersController < ApplicationController + + def create + auth_hash = request.env["omniauth.auth"] + user = User.find_by(uid: auth_hash[:uid], provider: "github") + if user + flash[:success] = "Logged in as returning user #{user.username}" + else + user = User.build_from_github(auth_hash) + if user.save + flash[:success] = "Logged in as new user #{user.username}" + else + flash[:error] = "Could not create new user account: #{user.errors.messages}" + return redirect_to root_path + end + end + session[:user_id] = user.id + return redirect_to root_path + end + + def destroy + session[:user_id] = nil + flash[:success] = "Successfully logged out!" + redirect_to root_path + end + end diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 0000000000..379658a509 --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,2 @@ +class User < ApplicationRecord +end diff --git a/config/routes.rb b/config/routes.rb index dd40ad4c1b..0b30c21855 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,10 @@ Rails.application.routes.draw do resources :products + + # user routes + get "/auth/github", as: "github_login" + get "/auth/:provider/callback", to: "users#create" + delete "/logout", to: "users#destroy", as: "logout" + + end diff --git a/db/migrate/20201117195308_create_users.rb b/db/migrate/20201117195308_create_users.rb new file mode 100644 index 0000000000..c7ed14ad2b --- /dev/null +++ b/db/migrate/20201117195308_create_users.rb @@ -0,0 +1,14 @@ +class CreateUsers < ActiveRecord::Migration[6.0] + def change + create_table :users do |t| + t.string :username + t.string :name + t.string :email + t.integer :uid + t.string :provider + t.string :image + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 80b17e5b8f..6365a508a0 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_11_17_023314) do +ActiveRecord::Schema.define(version: 2020_11_17_195308) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,4 +25,15 @@ t.datetime "updated_at", precision: 6, null: false end + create_table "users", force: :cascade do |t| + t.string "username" + t.string "name" + t.string "email" + t.integer "uid" + t.string "provider" + t.string "image" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + end diff --git a/test/models/user_test.rb b/test/models/user_test.rb new file mode 100644 index 0000000000..0ea72906d4 --- /dev/null +++ b/test/models/user_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe User do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 732c1ef38bd46cfcb7e0ca6eb80b0086dad75067 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Tue, 17 Nov 2020 11:57:11 -0800 Subject: [PATCH 010/248] user build_from_github method added --- app/models/user.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/models/user.rb b/app/models/user.rb index 379658a509..03165f7def 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,2 +1,14 @@ class User < ApplicationRecord + + def self.build_from_github(auth_hash) + user = User.new + user.uid = auth_hash[:uid] + user.provider = "github" + user.username = auth_hash["info"]["nickname"] + user.name = auth_hash["info"]["name"] + user.email = auth_hash["info"]["email"] + user.image = auth_hash["info"]["image"] + return user + end + end From f820176834703cdd96882307cfa2c8502fb55a29 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Tue, 17 Nov 2020 12:22:38 -0800 Subject: [PATCH 011/248] OmniAuth is set up! --- app/controllers/users_controller.rb | 2 ++ app/views/layouts/application.html.erb | 17 +++++++++++++++++ config/routes.rb | 1 + 3 files changed, 20 insertions(+) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 6bc2f34f6d..448847e3be 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,5 +1,7 @@ class UsersController < ApplicationController + + def create auth_hash = request.env["omniauth.auth"] user = User.find_by(uid: auth_hash[:uid], provider: "github") diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 74961e61a4..8b458b8a61 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,6 +9,23 @@ <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> +
+ <% if session[:user_id] %> + <%= button_to "Log out", logout_path, method: :delete %> + <% else %> + <%= button_to "Login with Github", github_login_path, method: :get %> + <% end %> + +
+ <% flash.each do |name, message| %> +

+ <%= message %> +

+ <% end %> +
+ +
+ <%= yield %> diff --git a/config/routes.rb b/config/routes.rb index 0b30c21855..25257c1d41 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,7 @@ Rails.application.routes.draw do resources :products + root to: "products#index" # user routes get "/auth/github", as: "github_login" get "/auth/:provider/callback", to: "users#create" From ae9e3ce21f69f8e12f187ba27362635138b1a8c1 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Tue, 17 Nov 2020 12:49:16 -0800 Subject: [PATCH 012/248] stash away schema --- db/schema.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index 4322ef5aab..80b17e5b8f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,6 @@ # # It's strongly recommended that you check this file into your version control system. - ActiveRecord::Schema.define(version: 2020_11_17_023314) do # These are extensions that must be enabled in order to support this database From 46e107fee5c84689ae7d4fdbc5130a0c00eabc1b Mon Sep 17 00:00:00 2001 From: r-spiel Date: Tue, 17 Nov 2020 15:26:19 -0800 Subject: [PATCH 013/248] initialized models --- .gitignore | 1 + app/models/cart.rb | 2 ++ app/models/cartitem.rb | 2 ++ app/models/category.rb | 2 ++ app/models/order.rb | 2 ++ db/migrate/20201117231751_create_orders.rb | 16 +++++++++ db/migrate/20201117231939_create_carts.rb | 8 +++++ db/migrate/20201117232219_create_cartitems.rb | 10 ++++++ .../20201117232400_create_categories.rb | 9 +++++ db/schema.rb | 33 ++++++++++++++++++- test/models/cart_test.rb | 7 ++++ test/models/cartitem_test.rb | 7 ++++ test/models/category_test.rb | 7 ++++ test/models/order_test.rb | 7 ++++ 14 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 app/models/cart.rb create mode 100644 app/models/cartitem.rb create mode 100644 app/models/category.rb create mode 100644 app/models/order.rb create mode 100644 db/migrate/20201117231751_create_orders.rb create mode 100644 db/migrate/20201117231939_create_carts.rb create mode 100644 db/migrate/20201117232219_create_cartitems.rb create mode 100644 db/migrate/20201117232400_create_categories.rb create mode 100644 test/models/cart_test.rb create mode 100644 test/models/cartitem_test.rb create mode 100644 test/models/category_test.rb create mode 100644 test/models/order_test.rb diff --git a/.gitignore b/.gitignore index 8f784de9fc..44792f0d6d 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ yarn-debug.log* .yarn-integrity .env +.idea/ \ No newline at end of file diff --git a/app/models/cart.rb b/app/models/cart.rb new file mode 100644 index 0000000000..f3c54414a4 --- /dev/null +++ b/app/models/cart.rb @@ -0,0 +1,2 @@ +class Cart < ApplicationRecord +end diff --git a/app/models/cartitem.rb b/app/models/cartitem.rb new file mode 100644 index 0000000000..544a12c415 --- /dev/null +++ b/app/models/cartitem.rb @@ -0,0 +1,2 @@ +class Cartitem < ApplicationRecord +end diff --git a/app/models/category.rb b/app/models/category.rb new file mode 100644 index 0000000000..54cb6aee3f --- /dev/null +++ b/app/models/category.rb @@ -0,0 +1,2 @@ +class Category < ApplicationRecord +end diff --git a/app/models/order.rb b/app/models/order.rb new file mode 100644 index 0000000000..10281b3450 --- /dev/null +++ b/app/models/order.rb @@ -0,0 +1,2 @@ +class Order < ApplicationRecord +end diff --git a/db/migrate/20201117231751_create_orders.rb b/db/migrate/20201117231751_create_orders.rb new file mode 100644 index 0000000000..57beb33fe7 --- /dev/null +++ b/db/migrate/20201117231751_create_orders.rb @@ -0,0 +1,16 @@ +class CreateOrders < ActiveRecord::Migration[6.0] + def change + create_table :orders do |t| + t.string :status + t.string :email + t.string :mailing_address + t.string :name + t.string :cc_number + t.string :cc_expiration + t.string :cc_cvv + t.string :zip + + t.timestamps + end + end +end diff --git a/db/migrate/20201117231939_create_carts.rb b/db/migrate/20201117231939_create_carts.rb new file mode 100644 index 0000000000..0e856f6263 --- /dev/null +++ b/db/migrate/20201117231939_create_carts.rb @@ -0,0 +1,8 @@ +class CreateCarts < ActiveRecord::Migration[6.0] + def change + create_table :carts do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20201117232219_create_cartitems.rb b/db/migrate/20201117232219_create_cartitems.rb new file mode 100644 index 0000000000..b8b18d4ca3 --- /dev/null +++ b/db/migrate/20201117232219_create_cartitems.rb @@ -0,0 +1,10 @@ +class CreateCartitems < ActiveRecord::Migration[6.0] + def change + create_table :cartitems do |t| + t.integer :qty + t.integer :cost + + t.timestamps + end + end +end diff --git a/db/migrate/20201117232400_create_categories.rb b/db/migrate/20201117232400_create_categories.rb new file mode 100644 index 0000000000..18db5f94e1 --- /dev/null +++ b/db/migrate/20201117232400_create_categories.rb @@ -0,0 +1,9 @@ +class CreateCategories < ActiveRecord::Migration[6.0] + def change + create_table :categories do |t| + t.string :name + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 6365a508a0..1a07fe19e0 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,11 +10,42 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_11_17_195308) do +ActiveRecord::Schema.define(version: 2020_11_17_232400) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "cartitems", force: :cascade do |t| + t.integer "qty" + t.integer "cost" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + + create_table "carts", force: :cascade do |t| + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + + create_table "categories", force: :cascade do |t| + t.string "name" + 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.string "status" + t.string "email" + t.string "mailing_address" + t.string "name" + t.string "cc_number" + t.string "cc_expiration" + t.string "cc_cvv" + t.string "zip" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + create_table "products", force: :cascade do |t| t.string "name" t.integer "inventory" diff --git a/test/models/cart_test.rb b/test/models/cart_test.rb new file mode 100644 index 0000000000..6da04aea1b --- /dev/null +++ b/test/models/cart_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Cart do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/models/cartitem_test.rb b/test/models/cartitem_test.rb new file mode 100644 index 0000000000..ad7e867d01 --- /dev/null +++ b/test/models/cartitem_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Cartitem do + # it "does a thing" do + # value(1+1).must_equal 2 + # 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 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 From aa06c0badeff0dff768ca08b4b578834cdd4fb44 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Tue, 17 Nov 2020 15:33:35 -0800 Subject: [PATCH 014/248] Adding necessary controllers --- app/assets/stylesheets/cartitems.scss | 3 +++ app/assets/stylesheets/carts.scss | 3 +++ app/assets/stylesheets/orders.scss | 3 +++ app/controllers/cartitems_controller.rb | 2 ++ app/controllers/carts_controller.rb | 2 ++ app/controllers/orders_controller.rb | 2 ++ app/helpers/cartitems_helper.rb | 2 ++ app/helpers/carts_helper.rb | 2 ++ app/helpers/orders_helper.rb | 2 ++ test/controllers/cartitems_controller_test.rb | 7 +++++++ test/controllers/carts_controller_test.rb | 7 +++++++ test/controllers/orders_controller_test.rb | 7 +++++++ 12 files changed, 42 insertions(+) create mode 100644 app/assets/stylesheets/cartitems.scss create mode 100644 app/assets/stylesheets/carts.scss create mode 100644 app/assets/stylesheets/orders.scss create mode 100644 app/controllers/cartitems_controller.rb create mode 100644 app/controllers/carts_controller.rb create mode 100644 app/controllers/orders_controller.rb create mode 100644 app/helpers/cartitems_helper.rb create mode 100644 app/helpers/carts_helper.rb create mode 100644 app/helpers/orders_helper.rb create mode 100644 test/controllers/cartitems_controller_test.rb create mode 100644 test/controllers/carts_controller_test.rb create mode 100644 test/controllers/orders_controller_test.rb diff --git a/app/assets/stylesheets/cartitems.scss b/app/assets/stylesheets/cartitems.scss new file mode 100644 index 0000000000..ba2881b2f9 --- /dev/null +++ b/app/assets/stylesheets/cartitems.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Cartitems 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/carts.scss b/app/assets/stylesheets/carts.scss new file mode 100644 index 0000000000..878063a96f --- /dev/null +++ b/app/assets/stylesheets/carts.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Carts 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/ diff --git a/app/controllers/cartitems_controller.rb b/app/controllers/cartitems_controller.rb new file mode 100644 index 0000000000..27eae4cf06 --- /dev/null +++ b/app/controllers/cartitems_controller.rb @@ -0,0 +1,2 @@ +class CartitemsController < ApplicationController +end diff --git a/app/controllers/carts_controller.rb b/app/controllers/carts_controller.rb new file mode 100644 index 0000000000..db5babd3e0 --- /dev/null +++ b/app/controllers/carts_controller.rb @@ -0,0 +1,2 @@ +class CartsController < ApplicationController +end diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb new file mode 100644 index 0000000000..8a0e3659ae --- /dev/null +++ b/app/controllers/orders_controller.rb @@ -0,0 +1,2 @@ +class OrdersController < ApplicationController +end diff --git a/app/helpers/cartitems_helper.rb b/app/helpers/cartitems_helper.rb new file mode 100644 index 0000000000..ae03e13635 --- /dev/null +++ b/app/helpers/cartitems_helper.rb @@ -0,0 +1,2 @@ +module CartitemsHelper +end diff --git a/app/helpers/carts_helper.rb b/app/helpers/carts_helper.rb new file mode 100644 index 0000000000..d99c380cb5 --- /dev/null +++ b/app/helpers/carts_helper.rb @@ -0,0 +1,2 @@ +module CartsHelper +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 diff --git a/test/controllers/cartitems_controller_test.rb b/test/controllers/cartitems_controller_test.rb new file mode 100644 index 0000000000..0f2e4bf10c --- /dev/null +++ b/test/controllers/cartitems_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CartitemsController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end diff --git a/test/controllers/carts_controller_test.rb b/test/controllers/carts_controller_test.rb new file mode 100644 index 0000000000..6e8596e293 --- /dev/null +++ b/test/controllers/carts_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CartsController 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 824704ba0e1a566c7ff59d2c9423c034891a953e Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Tue, 17 Nov 2020 15:58:19 -0800 Subject: [PATCH 015/248] establish relationship between order and cart --- app/models/cart.rb | 1 + app/models/order.rb | 1 + db/migrate/20201117234523_relate_orders_to_carts.rb | 5 +++++ db/schema.rb | 4 +++- 4 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20201117234523_relate_orders_to_carts.rb diff --git a/app/models/cart.rb b/app/models/cart.rb index f3c54414a4..90e68405d6 100644 --- a/app/models/cart.rb +++ b/app/models/cart.rb @@ -1,2 +1,3 @@ class Cart < ApplicationRecord + has_one :order end diff --git a/app/models/order.rb b/app/models/order.rb index 10281b3450..bac2e0eeb1 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -1,2 +1,3 @@ class Order < ApplicationRecord + belongs_to :cart end diff --git a/db/migrate/20201117234523_relate_orders_to_carts.rb b/db/migrate/20201117234523_relate_orders_to_carts.rb new file mode 100644 index 0000000000..f1f6966390 --- /dev/null +++ b/db/migrate/20201117234523_relate_orders_to_carts.rb @@ -0,0 +1,5 @@ +class RelateOrdersToCarts < ActiveRecord::Migration[6.0] + def change + add_reference :orders, :cart, index: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 1a07fe19e0..0fa5aba51e 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_11_17_232400) do +ActiveRecord::Schema.define(version: 2020_11_17_234523) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -44,6 +44,8 @@ t.string "zip" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.bigint "cart_id" + t.index ["cart_id"], name: "index_orders_on_cart_id" end create_table "products", force: :cascade do |t| From 876e76b46ff0435f0439f1a84c09639f5ef28ece Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Tue, 17 Nov 2020 16:04:42 -0800 Subject: [PATCH 016/248] establish relationship between cart and cart items --- app/models/cart.rb | 1 + app/models/cartitem.rb | 1 + db/migrate/20201117235923_relate_cart_to_cartitems.rb | 5 +++++ db/schema.rb | 4 +++- 4 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20201117235923_relate_cart_to_cartitems.rb diff --git a/app/models/cart.rb b/app/models/cart.rb index 90e68405d6..aa22ebfab5 100644 --- a/app/models/cart.rb +++ b/app/models/cart.rb @@ -1,3 +1,4 @@ class Cart < ApplicationRecord has_one :order + has_many :cartitems end diff --git a/app/models/cartitem.rb b/app/models/cartitem.rb index 544a12c415..860031feb6 100644 --- a/app/models/cartitem.rb +++ b/app/models/cartitem.rb @@ -1,2 +1,3 @@ class Cartitem < ApplicationRecord + belongs_to :cart end diff --git a/db/migrate/20201117235923_relate_cart_to_cartitems.rb b/db/migrate/20201117235923_relate_cart_to_cartitems.rb new file mode 100644 index 0000000000..31c833bcf6 --- /dev/null +++ b/db/migrate/20201117235923_relate_cart_to_cartitems.rb @@ -0,0 +1,5 @@ +class RelateCartToCartitems < ActiveRecord::Migration[6.0] + def change + add_reference :cartitems, :cart, index: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 0fa5aba51e..853ecbba6e 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_11_17_234523) do +ActiveRecord::Schema.define(version: 2020_11_17_235923) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -20,6 +20,8 @@ t.integer "cost" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.bigint "cart_id" + t.index ["cart_id"], name: "index_cartitems_on_cart_id" end create_table "carts", force: :cascade do |t| From beb1b90ba68cf26077109d554d054b850d7a8c1a Mon Sep 17 00:00:00 2001 From: r-spiel Date: Tue, 17 Nov 2020 17:00:40 -0800 Subject: [PATCH 017/248] add migration to connect product and cartitem --- app/models/cartitem.rb | 1 + app/models/product.rb | 1 + db/migrate/20201118005146_relate_product_to_cart_items.rb | 5 +++++ db/schema.rb | 4 +++- 4 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20201118005146_relate_product_to_cart_items.rb diff --git a/app/models/cartitem.rb b/app/models/cartitem.rb index 860031feb6..8b770bd61e 100644 --- a/app/models/cartitem.rb +++ b/app/models/cartitem.rb @@ -1,3 +1,4 @@ class Cartitem < ApplicationRecord belongs_to :cart + belongs_to :product end diff --git a/app/models/product.rb b/app/models/product.rb index 35a85acab3..bbe99ecd8c 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -1,2 +1,3 @@ class Product < ApplicationRecord + has_many :cartitems end diff --git a/db/migrate/20201118005146_relate_product_to_cart_items.rb b/db/migrate/20201118005146_relate_product_to_cart_items.rb new file mode 100644 index 0000000000..9fd12b50db --- /dev/null +++ b/db/migrate/20201118005146_relate_product_to_cart_items.rb @@ -0,0 +1,5 @@ +class RelateProductToCartItems < ActiveRecord::Migration[6.0] + def change + add_reference :cartitems, :product, index: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 853ecbba6e..f0972ad788 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_11_17_235923) do +ActiveRecord::Schema.define(version: 2020_11_18_005146) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -21,7 +21,9 @@ t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false t.bigint "cart_id" + t.bigint "product_id" t.index ["cart_id"], name: "index_cartitems_on_cart_id" + t.index ["product_id"], name: "index_cartitems_on_product_id" end create_table "carts", force: :cascade do |t| From 8487b1d41e73ac95caf08636d5a17919f4f47e70 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Tue, 17 Nov 2020 18:00:45 -0800 Subject: [PATCH 018/248] added method to application controller to ensure that every guest or user that visits the site has a cart --- app/controllers/application_controller.rb | 14 ++++++++++++++ app/controllers/carts_controller.rb | 1 + 2 files changed, 15 insertions(+) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 09705d12ab..33b434e573 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,16 @@ class ApplicationController < ActionController::Base + + def current_cart + if session[:cart_id] + # check if there is an existing session for the cart + cart = Cart.find_by(id: session[:cart_id]) + @current_cart = cart + else + # create a new cart if there is no cart session + # store the session cart_id + @current_cart = Cart.create + session[:cart_id] = @current_cart.id + end + end + end diff --git a/app/controllers/carts_controller.rb b/app/controllers/carts_controller.rb index db5babd3e0..9277fd2058 100644 --- a/app/controllers/carts_controller.rb +++ b/app/controllers/carts_controller.rb @@ -1,2 +1,3 @@ class CartsController < ApplicationController + end From dd0fb05a88cc11b0f989a6b1a324d4e969a318b5 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Tue, 17 Nov 2020 18:02:32 -0800 Subject: [PATCH 019/248] added the before action to call the current_cart method before every action in the application --- app/controllers/application_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 33b434e573..7d2e6477ee 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,5 +1,7 @@ class ApplicationController < ActionController::Base + before_action :current_cart + def current_cart if session[:cart_id] # check if there is an existing session for the cart From bbe70d3050200255b54524bf57c8b11823956628 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Tue, 17 Nov 2020 18:05:29 -0800 Subject: [PATCH 020/248] added cart show action to routes --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 25257c1d41..4f18bca739 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,5 +7,5 @@ get "/auth/:provider/callback", to: "users#create" delete "/logout", to: "users#destroy", as: "logout" - + get 'carts/:id', to: "carts#show", as: "cart" end From 58c4e3c858bb73cdd37627a745460fc2c1128e0f Mon Sep 17 00:00:00 2001 From: Lina Do Date: Tue, 17 Nov 2020 18:20:04 -0800 Subject: [PATCH 021/248] very very basic show view page and added cart button to navbar --- app/views/carts/show.html.erb | 17 +++++++++++++++++ app/views/layouts/application.html.erb | 1 + 2 files changed, 18 insertions(+) create mode 100644 app/views/carts/show.html.erb diff --git a/app/views/carts/show.html.erb b/app/views/carts/show.html.erb new file mode 100644 index 0000000000..1d4557393c --- /dev/null +++ b/app/views/carts/show.html.erb @@ -0,0 +1,17 @@ +
+

Shopping Cart

+ + + + + + + + + + + + +
ItemPriceQuantityTotalRemove
+ +
\ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 8b458b8a61..e1ddbd3c6f 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,6 +10,7 @@
+ <%= button_to "Cart", cart_path(session[:cart_id]), method: :get %> <% if session[:user_id] %> <%= button_to "Log out", logout_path, method: :delete %> <% else %> From f71d97b23c0d96b78a0778eda0c3819543361f7f Mon Sep 17 00:00:00 2001 From: Lina Do Date: Tue, 17 Nov 2020 18:23:04 -0800 Subject: [PATCH 022/248] added show action to carts controller --- app/controllers/carts_controller.rb | 3 +++ app/views/carts/show.html.erb | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/controllers/carts_controller.rb b/app/controllers/carts_controller.rb index 9277fd2058..dfe3f277dd 100644 --- a/app/controllers/carts_controller.rb +++ b/app/controllers/carts_controller.rb @@ -1,3 +1,6 @@ class CartsController < ApplicationController + def show + @cart = @current_cart + end end diff --git a/app/views/carts/show.html.erb b/app/views/carts/show.html.erb index 1d4557393c..bc6f1c74fe 100644 --- a/app/views/carts/show.html.erb +++ b/app/views/carts/show.html.erb @@ -2,13 +2,13 @@

Shopping Cart

- - - - - - - + + + + + + + From 236ca55e7b6307cb032291e6c2abcb739318070f Mon Sep 17 00:00:00 2001 From: Lina Do Date: Tue, 17 Nov 2020 20:21:33 -0800 Subject: [PATCH 023/248] added tests for current cart method --- app/controllers/carts_controller.rb | 1 + test/controllers/carts_controller_test.rb | 50 +++++++++++++++++++++++ test/fixtures/users.yml | 4 +- 3 files changed, 53 insertions(+), 2 deletions(-) diff --git a/app/controllers/carts_controller.rb b/app/controllers/carts_controller.rb index dfe3f277dd..91430f283e 100644 --- a/app/controllers/carts_controller.rb +++ b/app/controllers/carts_controller.rb @@ -3,4 +3,5 @@ class CartsController < ApplicationController def show @cart = @current_cart end + end diff --git a/test/controllers/carts_controller_test.rb b/test/controllers/carts_controller_test.rb index 6e8596e293..c9ee49a0a0 100644 --- a/test/controllers/carts_controller_test.rb +++ b/test/controllers/carts_controller_test.rb @@ -4,4 +4,54 @@ # it "does a thing" do # value(1+1).must_equal 2 # end + + # describe "show" do + # + # it "will get show for current cart" do + # + # get root_path + # + # current_cart = Cart.create() + # session[:cart_id] = cart.id + # + # + # + # end + # + # end + describe 'current cart' do + it "creates a new cart when visiting the site for the first time" do + + expect{ + get root_path + }.must_differ "Cart.count", 1 + + cart_id = session[:cart_id] + current_cart = Cart.find_by(id: cart_id) + + expect(current_cart).wont_be_nil + expect(session[:cart_id]).must_equal current_cart.id + + end + + it "should have the same cart throughout the site " do + + get root_path + cart_id = session[:cart_id] + cart = Cart.find_by(id: cart_id) + + # wait on other controllers to get another path and finish out writing test + + # expect{ + # get user_path(users(:ada).id) + # }.wont_change "Cart.count" + # current_cart_id = session[:cart_id] + # current_cart = Cart.find_by(id: current_cart_id) + # + # expect(current_cart).wont_be_nil + # expect(current_cart.id).must_equal cart.id + + end + end + end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index a65e9c820b..2188456586 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -3,10 +3,10 @@ ada: uid: 12345 email: ada@adadev.org username: ada - avatar: https://placekitten.com/50/50 + image: https://placekitten.com/50/50 sophie: provider: github uid: 33333 email: sophieemessing@gmail.com username: sophie - avatar: https://placekitten.com/50/50 + image: https://placekitten.com/50/50 From bd227347bd5a86f25ef1751d33c7c006bf615868 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Tue, 17 Nov 2020 20:26:31 -0800 Subject: [PATCH 024/248] added categories and created join table with products --- app/assets/stylesheets/categories.scss | 3 + app/controllers/categories_controller.rb | 5 ++ app/helpers/categories_helper.rb | 2 + app/models/category.rb | 1 + app/models/product.rb | 1 + app/views/categories/index.html.erb | 2 + app/views/products/_form.html.erb | 61 +++++++++++++++---- app/views/products/edit.html.erb | 4 +- app/views/products/new.html.erb | 1 + app/views/products/show.html.erb | 10 ++- config/routes.rb | 1 + ...8041431_create_categories_products_join.rb | 8 +++ db/schema.rb | 9 ++- .../controllers/categories_controller_test.rb | 9 +++ 14 files changed, 100 insertions(+), 17 deletions(-) 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 app/views/categories/index.html.erb create mode 100644 db/migrate/20201118041431_create_categories_products_join.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..1764578448 --- /dev/null +++ b/app/controllers/categories_controller.rb @@ -0,0 +1,5 @@ +class CategoriesController < ApplicationController + def index + @categories = Category.all + 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/app/models/category.rb b/app/models/category.rb index 54cb6aee3f..f3218758f1 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -1,2 +1,3 @@ class Category < ApplicationRecord + has_and_belongs_to_many :products end diff --git a/app/models/product.rb b/app/models/product.rb index bbe99ecd8c..ee772e583d 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -1,3 +1,4 @@ class Product < ApplicationRecord has_many :cartitems + has_and_belongs_to_many :categories end diff --git a/app/views/categories/index.html.erb b/app/views/categories/index.html.erb new file mode 100644 index 0000000000..a5d0d54736 --- /dev/null +++ b/app/views/categories/index.html.erb @@ -0,0 +1,2 @@ +

Categories#index

+

Find me in app/views/categories/index.html.erb

diff --git a/app/views/products/_form.html.erb b/app/views/products/_form.html.erb index cd5351b49c..892cbf99e4 100644 --- a/app/views/products/_form.html.erb +++ b/app/views/products/_form.html.erb @@ -1,17 +1,52 @@ -<%= form_with model: @product do |f| %> - <% if product.errors.any? %> -
-

<%= pluralize(product.errors.count, "error") %> prohibited this product from being saved:

- -
    - <% product.errors.full_messages.each do |message| %> -
  • <%= message %>
    • - <% end %> -
-
+
+ <% if @product && @product.errors.any? %> +
    + <% @product.errors.each do |column, message| %> +
  • <%= column %> <%= message %>
    • + <% end %> +
<% end %> +
-
- <%= form.submit %> +<%= form_with model: @product do |f| %> + +
+ <%= f.label :product_name %> +
+ <%= f.text_field :name %> +
+
+
+ <%= f.label :cost %> +
+ <%= f.text_field :cost %> +
+
+
+ <%= f.label :inventory %> +
+ <%= f.number_field :inventory %> +
+
+
+ <%= f.label :category %> +
+ <%#= f.select :category, options_for_select(@categories.each { |category| category.name) } %> + <%= f.select :category, options_for_select(%w[athleisure gear equipment snacks]) %> +
+
+
+ <%= f.label :description %> +
+ <%= f.text_area :description %> +
+
+ <%= f.label :image_embed_link %> +
+ <%= f.text_area :image %> +
+
+
+ <%= f.submit action_name %>
<% end %> diff --git a/app/views/products/edit.html.erb b/app/views/products/edit.html.erb index 8109b87d22..d4974663c1 100644 --- a/app/views/products/edit.html.erb +++ b/app/views/products/edit.html.erb @@ -1,5 +1,5 @@

Edit Product

-<%= render 'form', product: @product %> -<%= link_to 'Show', @product %> | +<%= render partial: 'form', locals: {action_name: "Update"} %> +<%= link_to 'Show', @product %> <%= link_to 'Back', products_path %> diff --git a/app/views/products/new.html.erb b/app/views/products/new.html.erb index e2bef40a64..e7d5d1ba9e 100644 --- a/app/views/products/new.html.erb +++ b/app/views/products/new.html.erb @@ -1,3 +1,4 @@

New Product

+<%= render partial: 'form', locals: {action_name: "Add Product"} %> <%= link_to 'Back', products_path %> diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index fbeed42e45..6ee93c0fac 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -1,4 +1,12 @@ -

<%= @product.name %>

+

<%= @product.name %>

+
+ <%= image_tag(@product.image) %> +
+ +<%= @product.inventory %> +<%= @product.description %> + <%= @product.categories.each do |category| %> + <%= category %> <%= link_to 'Edit', edit_product_path(@product) %> | <%= link_to 'Back', products_path %> diff --git a/config/routes.rb b/config/routes.rb index 25257c1d41..688a6ca3bc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,5 @@ Rails.application.routes.draw do + get 'categories/index' resources :products root to: "products#index" diff --git a/db/migrate/20201118041431_create_categories_products_join.rb b/db/migrate/20201118041431_create_categories_products_join.rb new file mode 100644 index 0000000000..82dfdf6bad --- /dev/null +++ b/db/migrate/20201118041431_create_categories_products_join.rb @@ -0,0 +1,8 @@ +class CreateCategoriesProductsJoin < 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 f0972ad788..c4e16390d1 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_11_18_005146) do +ActiveRecord::Schema.define(version: 2020_11_18_041431) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -37,6 +37,13 @@ t.datetime "updated_at", precision: 6, null: false 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 "orders", force: :cascade do |t| t.string "status" t.string "email" diff --git a/test/controllers/categories_controller_test.rb b/test/controllers/categories_controller_test.rb new file mode 100644 index 0000000000..30f9179ab3 --- /dev/null +++ b/test/controllers/categories_controller_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe CategoriesController do + it "must get index" do + get categories_index_url + must_respond_with :success + end + +end From 85266f2d0f5d6bae91e26ec8779e122a46833011 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Tue, 17 Nov 2020 20:30:06 -0800 Subject: [PATCH 025/248] added test for show action --- test/controllers/carts_controller_test.rb | 32 +++++++++++++---------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/test/controllers/carts_controller_test.rb b/test/controllers/carts_controller_test.rb index c9ee49a0a0..82eeb3d38a 100644 --- a/test/controllers/carts_controller_test.rb +++ b/test/controllers/carts_controller_test.rb @@ -5,20 +5,6 @@ # value(1+1).must_equal 2 # end - # describe "show" do - # - # it "will get show for current cart" do - # - # get root_path - # - # current_cart = Cart.create() - # session[:cart_id] = cart.id - # - # - # - # end - # - # end describe 'current cart' do it "creates a new cart when visiting the site for the first time" do @@ -54,4 +40,22 @@ end end + describe "show" do + + it "will get show for current cart" do + # Arrange + get root_path + cart_id = session[:cart_id] + current_cart = Cart.find_by(id: cart_id) + + # Act + get cart_path(cart_id) + + # Assert + must_respond_with :success + + end + + end + end From 2e7b3dee567d6354db6577e620eb9fc8b1f17e57 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Tue, 17 Nov 2020 21:59:21 -0800 Subject: [PATCH 026/248] can add, edit and delete products with categories if logged in. --- app/controllers/products_controller.rb | 2 +- app/views/categories/index.html.erb | 6 ++++-- app/views/layouts/application.html.erb | 12 +++++++----- app/views/products/_form.html.erb | 25 +++++++++++++------------ app/views/products/index.html.erb | 14 +++++++++----- app/views/products/show.html.erb | 23 +++++++++++++++++------ config/routes.rb | 1 + 7 files changed, 52 insertions(+), 31 deletions(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index e61159991b..7313d03e65 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -71,6 +71,6 @@ def set_product end def product_params - return params.require(:product).permit(:name, :cost, :inventory, :description, :image) + return params.require(:product).permit(:name, :cost, :inventory, :description, :image, category_ids: []) end end diff --git a/app/views/categories/index.html.erb b/app/views/categories/index.html.erb index a5d0d54736..1fc1ff0533 100644 --- a/app/views/categories/index.html.erb +++ b/app/views/categories/index.html.erb @@ -1,2 +1,4 @@ -

Categories#index

-

Find me in app/views/categories/index.html.erb

+

Categories

+<% @categories.each do |category| %> + <%= link_to category.name, products_path %> +<% end %> \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 8b458b8a61..1676114e86 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,11 +10,13 @@
- <% if session[:user_id] %> - <%= button_to "Log out", logout_path, method: :delete %> - <% else %> - <%= button_to "Login with Github", github_login_path, method: :get %> - <% end %> +
<% flash.each do |name, message| %> diff --git a/app/views/products/_form.html.erb b/app/views/products/_form.html.erb index 892cbf99e4..b62506bf56 100644 --- a/app/views/products/_form.html.erb +++ b/app/views/products/_form.html.erb @@ -1,15 +1,17 @@ -
- <% if @product && @product.errors.any? %> -
    - <% @product.errors.each do |column, message| %> -
  • <%= column %> <%= message %>
    • - <% end %> -
- <% end %> -
+ <%= form_with model: @product do |f| %> +
+ <% if @product.errors.any? %> +
    + <% @product.errors.each do |column, message| %> +
  • <%= column %> <%= message %>
    • + <% end %> +
+ <% end %> +
+
<%= f.label :product_name %>
@@ -29,10 +31,9 @@

- <%= f.label :category %> + <%= f.label :categories %>
- <%#= f.select :category, options_for_select(@categories.each { |category| category.name) } %> - <%= f.select :category, options_for_select(%w[athleisure gear equipment snacks]) %> + <%= collection_check_boxes(:product, :category_ids, Category.all, :id, :name) %>

diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index db5f937870..156577b644 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -5,16 +5,18 @@
ItemPriceQuantityTotalRemove
ItemPriceQuantityTotalRemove
- + <% @products.each do |product| %> - - - + + <% if session[:user] %> + + + <% end %> <% end %> @@ -22,4 +24,6 @@
-<%= link_to 'New Product', new_product_path %> +<% if session[:user_id] %> + <%= link_to 'New Product', new_product_path %> +<% end %> diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 6ee93c0fac..977addd9b7 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -2,11 +2,22 @@
<%= image_tag(@product.image) %> -
+
+ +<%= @product.inventory %> in stock
+<%= @product.description %>
+ + +Categories: +
    + <% @product.categories.each do |category| %> +
  • <%= category.name %>
    • + <% end %> +
+ + +<% if session[:user_id] %> + <%= link_to 'Edit', edit_product_path(@product) %> +<% end %> -<%= @product.inventory %> -<%= @product.description %> - <%= @product.categories.each do |category| %> - <%= category %> -<%= link_to 'Edit', edit_product_path(@product) %> | <%= link_to 'Back', products_path %> diff --git a/config/routes.rb b/config/routes.rb index 688a6ca3bc..c814f68569 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,7 @@ Rails.application.routes.draw do get 'categories/index' resources :products + resources :categories, only:[:index] root to: "products#index" # user routes From 4fccebe5964a829ed5932d40489db196781e44ee Mon Sep 17 00:00:00 2001 From: r-spiel Date: Tue, 17 Nov 2020 22:09:57 -0800 Subject: [PATCH 027/248] testing Oauth --- app/controllers/users_controller.rb | 9 +++- config/routes.rb | 6 +-- test/controllers/users_controller_test.rb | 65 +++++++++++++++++++++-- test/fixtures/users.yml | 6 ++- test/test_helper.rb | 5 +- 5 files changed, 80 insertions(+), 11 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 448847e3be..70b5f0ec10 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -20,10 +20,17 @@ def create return redirect_to root_path end - def destroy + def logout session[:user_id] = nil flash[:success] = "Successfully logged out!" redirect_to root_path + return end + # def destroy + # session[:user_id] = nil + # flash[:success] = "Successfully logged out!" + # redirect_to root_path + # end + end diff --git a/config/routes.rb b/config/routes.rb index 25257c1d41..7b2d04c933 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,8 +4,8 @@ root to: "products#index" # user routes get "/auth/github", as: "github_login" - get "/auth/:provider/callback", to: "users#create" - delete "/logout", to: "users#destroy", as: "logout" - + get "/auth/:provider/callback", to: "users#create", as: "omniauth_callback" + #delete "/logout", to: "users#destroy", as: "logout" + post "/logout", to: "users#logout", as: "logout" end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index b58feb8fcc..f957875f2c 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -1,7 +1,66 @@ require "test_helper" describe UsersController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe 'login' do + it 'can log in an existing user' do + user = perform_login(users(:ada)) + + must_respond_with :redirect + end + + it 'can log in an new user' do + new_user = User.new(uid: '1111', username: 'new_user', provider: 'github', image: 'some string', email: 'test@test.com') + + expect { + logged_in_user = perform_login(new_user) + }.must_change 'User.count', 1 + + must_respond_with :redirect + end + + it 'redirects to root path if given invalid user data' do + # Arrange - invalid user (uid is nil) + start_count = User.count + + user = User.new(uid: nil, username: 'new_user', provider: 'github', image: 'some string', email: 'test@test.com') + + OmniAuth.config.mock_auth[:github] = OmniAuth::AuthHash.new(mock_auth_hash(user)) + # send login request for that user + get omniauth_callback_path(:github) + + must_redirect_to root_path + + # find the new user in the DB + user = User.find_by(uid: user.uid, provider: user.provider) + + # Make sure the user is nil + expect(user).must_equal nil + + # Since we can read the session, check that the user ID was set as expected + session[:user_id].must_equal nil + + # Should *not* have created a new user + User.count.must_equal start_count + + end + end + + describe 'logout' do + it 'can logout an existing user' do + perform_login() + + # before logging out + expect {session[:user_id]}.wont_be_nil + + post logout_path, params: {} # log out + + expect {session[:user_id]}.must_be_nil + end + end + + #NOTES: testing negative cases + # Someone making a get request to the callback route without coming from the Auth provider (no auth_hash). + # A request with an invalid auth provider `get auth_callback_path(:bogus) + # A request with an invalid auth_hash, like missing a uid. + end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index a65e9c820b..a89d056746 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -3,10 +3,12 @@ ada: uid: 12345 email: ada@adadev.org username: ada - avatar: https://placekitten.com/50/50 + name: Ada Lovelace + image: https://placekitten.com/50/50 sophie: provider: github uid: 33333 email: sophieemessing@gmail.com username: sophie - avatar: https://placekitten.com/50/50 + name: Sophie Messing + image: https://placekitten.com/50/50 diff --git a/test/test_helper.rb b/test/test_helper.rb index 199928a0be..c683c55d11 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -30,7 +30,8 @@ def mock_auth_hash(user) info: { email: user.email, nickname: user.username, - image: user.avatar + name: user.name, + image: user.image }, } end @@ -39,7 +40,7 @@ def perform_login(user = nil) user ||= User.first OmniAuth.config.mock_auth[:github] = OmniAuth::AuthHash.new(mock_auth_hash(user)) - get auth_callback_path(:github) + get omniauth_callback_path(:github) user = User.find_by(uid: user.uid, username: user.username) expect(user).wont_be_nil From 70535d91c0a15fd93a237f68e7268c8e206aa382 Mon Sep 17 00:00:00 2001 From: r-spiel Date: Tue, 17 Nov 2020 22:16:31 -0800 Subject: [PATCH 028/248] rearrange comment --- test/controllers/users_controller_test.rb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index f957875f2c..74a65ff368 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -28,7 +28,7 @@ # send login request for that user get omniauth_callback_path(:github) - must_redirect_to root_path + #must_redirect_to root_path # find the new user in the DB user = User.find_by(uid: user.uid, provider: user.provider) @@ -41,8 +41,12 @@ # Should *not* have created a new user User.count.must_equal start_count - end + + #NOTES: testing negative cases + # Someone making a get request to the callback route without coming from the Auth provider (no auth_hash). + # A request with an invalid auth provider `get auth_callback_path(:bogus) + # A request with an invalid auth_hash, like missing a uid. end describe 'logout' do @@ -58,9 +62,6 @@ end end - #NOTES: testing negative cases - # Someone making a get request to the callback route without coming from the Auth provider (no auth_hash). - # A request with an invalid auth provider `get auth_callback_path(:bogus) - # A request with an invalid auth_hash, like missing a uid. + end From a6da76482216415dd900b2b7165bd1b2fe10bc7b Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Tue, 17 Nov 2020 22:33:44 -0800 Subject: [PATCH 029/248] initial instation, relation, and presence order model tests --- app/models/order.rb | 8 ++++++++ test/fixtures/orders.yml | 10 +++++++++ test/fixtures/users.yml | 4 ++-- test/models/order_test.rb | 43 ++++++++++++++++++++++++++++++++++++--- 4 files changed, 60 insertions(+), 5 deletions(-) create mode 100644 test/fixtures/orders.yml diff --git a/app/models/order.rb b/app/models/order.rb index bac2e0eeb1..603e6c5d3c 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -1,3 +1,11 @@ class Order < ApplicationRecord belongs_to :cart + + validates :email, presence: true + validates :mailing_address, presence: true + validates :name, presence: true + validates :cc_number, presence: true + validates :cc_expiration, presence: true + validates :cc_cvv, presence: true + validates :zip, presence: true end diff --git a/test/fixtures/orders.yml b/test/fixtures/orders.yml new file mode 100644 index 0000000000..37aa44e3e2 --- /dev/null +++ b/test/fixtures/orders.yml @@ -0,0 +1,10 @@ +order_one: + status: pending + email: ada@adadev.org + mailing_address: "315 5th Ave S Suite 200, Seattle, WA 98104" + name: ada + cc_number: "1234 5678 9123 4567" + cc_expiration: "12/2021" + cc_cvv: 111 + zip: 98104 + cart: cart_one \ No newline at end of file diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index a65e9c820b..2188456586 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -3,10 +3,10 @@ ada: uid: 12345 email: ada@adadev.org username: ada - avatar: https://placekitten.com/50/50 + image: https://placekitten.com/50/50 sophie: provider: github uid: 33333 email: sophieemessing@gmail.com username: sophie - avatar: https://placekitten.com/50/50 + image: https://placekitten.com/50/50 diff --git a/test/models/order_test.rb b/test/models/order_test.rb index 59ceb9a253..ab164cc2c2 100644 --- a/test/models/order_test.rb +++ b/test/models/order_test.rb @@ -1,7 +1,44 @@ require "test_helper" describe Order do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + + before do + @cart = Cart.create! + @order = orders(:order_one) + @order.update(cart: @cart) + end + + describe "instantiation" do + + it "can be instantiated" do + expect(@order.valid?).must_equal true + end + + it "has the required fields" do + [:status, :email, :mailing_address, :name, :cc_number, :cc_expiration, :cc_cvv, :zip].each do |field| + expect(@order).must_respond_to field + end + end + end + + describe "validations" do + + it "requires billing information about customer" do + [:email, :name, :mailing_address, :name, :cc_number, :cc_expiration, :cc_cvv, :zip].each do |field| + @order.update("#{field}": nil) + expect(@order.valid?).must_equal false + end + end + end + + + describe "relations" do + + it "belongs to a cart" do + expect(@cart.order).must_equal @order + end + + end + + end From 2986a9fb4a996d94b54b76f15904be1307c0712a Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Tue, 17 Nov 2020 22:34:36 -0800 Subject: [PATCH 030/248] added cost to show page --- app/models/product.rb | 4 ++++ app/views/products/show.html.erb | 21 +++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/app/models/product.rb b/app/models/product.rb index ee772e583d..95dd8ddd9b 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -1,4 +1,8 @@ class Product < ApplicationRecord has_many :cartitems has_and_belongs_to_many :categories + + validates :name, :description, :image, presence: true + validates :inventory, :cost, presence: true, numericality: true + validates :category_ids, presence: true end diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 977addd9b7..9701d93659 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -4,17 +4,18 @@ <%= image_tag(@product.image) %>
-<%= @product.inventory %> in stock
-<%= @product.description %>
- - -Categories: -
    - <% @product.categories.each do |category| %> -
  • <%= category.name %>
    • - <% end %> -
+
+ <%= @product.inventory %> in stock
+ <%= @product.description %>
+ $<%= @product.cost %>
+ Categories: +
    + <% @product.categories.each do |category| %> +
  • <%= category.name %>
    • + <% end %> +
+
<% if session[:user_id] %> <%= link_to 'Edit', edit_product_path(@product) %> From e877c36f32233a48b9c0f595091fff820001e9c8 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Tue, 17 Nov 2020 22:42:28 -0800 Subject: [PATCH 031/248] dry up --- app/models/order.rb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/app/models/order.rb b/app/models/order.rb index 603e6c5d3c..73900c6789 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -1,11 +1,6 @@ class Order < ApplicationRecord belongs_to :cart - validates :email, presence: true - validates :mailing_address, presence: true - validates :name, presence: true - validates :cc_number, presence: true - validates :cc_expiration, presence: true - validates :cc_cvv, presence: true - validates :zip, presence: true + validates :email, :mailing_address, :name, :cc_number, :cc_expiration, :cc_cvv, :zip, presence: true + end From 95c757a2a11c3a1e54f4fd8a5eb5c41221dda4a9 Mon Sep 17 00:00:00 2001 From: r-spiel Date: Wed, 18 Nov 2020 10:36:56 -0800 Subject: [PATCH 032/248] revert back to destory instead of post custom method for logout --- app/controllers/users_controller.rb | 9 +-------- config/routes.rb | 3 +-- test/controllers/users_controller_test.rb | 2 +- test/test_helper.rb | 2 +- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 70b5f0ec10..448847e3be 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -20,17 +20,10 @@ def create return redirect_to root_path end - def logout + def destroy session[:user_id] = nil flash[:success] = "Successfully logged out!" redirect_to root_path - return end - # def destroy - # session[:user_id] = nil - # flash[:success] = "Successfully logged out!" - # redirect_to root_path - # end - end diff --git a/config/routes.rb b/config/routes.rb index 7b2d04c933..ecef6ca674 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,7 +5,6 @@ # user routes get "/auth/github", as: "github_login" get "/auth/:provider/callback", to: "users#create", as: "omniauth_callback" - #delete "/logout", to: "users#destroy", as: "logout" - post "/logout", to: "users#logout", as: "logout" + delete "/logout", to: "users#destroy", as: "logout" end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 74a65ff368..d26861fba7 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -56,7 +56,7 @@ # before logging out expect {session[:user_id]}.wont_be_nil - post logout_path, params: {} # log out + delete logout_path, params: {} # log out expect {session[:user_id]}.must_be_nil end diff --git a/test/test_helper.rb b/test/test_helper.rb index c683c55d11..43f69c5c2a 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -32,7 +32,7 @@ def mock_auth_hash(user) nickname: user.username, name: user.name, image: user.image - }, + } } end From f9b013422a0fb114a129b51a5b85c579f3948fcf Mon Sep 17 00:00:00 2001 From: r-spiel Date: Wed, 18 Nov 2020 10:40:59 -0800 Subject: [PATCH 033/248] skip broken tests --- test/controllers/users_controller_test.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index d26861fba7..f0a27199db 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -19,6 +19,7 @@ end it 'redirects to root path if given invalid user data' do + skip # Arrange - invalid user (uid is nil) start_count = User.count @@ -51,6 +52,8 @@ describe 'logout' do it 'can logout an existing user' do + skip + perform_login() # before logging out From 29f12ccfb05a1dab4951b64aa44797850c473d09 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Wed, 18 Nov 2020 16:11:25 -0800 Subject: [PATCH 034/248] added cart_item create to route and added create method in the controller, nested cart_item create route to products --- app/controllers/cartitems_controller.rb | 31 +++++++++++++++++++++++++ app/models/cart.rb | 1 + config/routes.rb | 6 ++++- 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/app/controllers/cartitems_controller.rb b/app/controllers/cartitems_controller.rb index 27eae4cf06..d0194e06d7 100644 --- a/app/controllers/cartitems_controller.rb +++ b/app/controllers/cartitems_controller.rb @@ -1,2 +1,33 @@ class CartitemsController < ApplicationController + + def create + # product nested route + product_id = params[:product_id] + product = Product.find_by(id: product_id) + current_cart = @current_cart + + # check if product is already in the cart + if current_cart.products.include?(product) + + # find the cart item + @cart_item = current_cart.cartitems.find_by(product_id: product_id) + # check if there is enough inventory + if @cart_item.qty < product.inventory + @cart_item.qty += 1 + else + # not enough inventory + redirect_back fallback_location: root_path + flash[:error] = "Sorry, not enough inventory" + return + end + else + # create a new cart item if it doesn't exist + @cart_item = Cartitem.new(cart_id: current_cart.id, product_id: product_id, qty: 1, cost: product.cost ) + end + + # save the cart item and redirect back to the product show page + @cart_item.save + redirect_back fallback_location: root_path + end + end diff --git a/app/models/cart.rb b/app/models/cart.rb index aa22ebfab5..619185a910 100644 --- a/app/models/cart.rb +++ b/app/models/cart.rb @@ -1,4 +1,5 @@ class Cart < ApplicationRecord has_one :order has_many :cartitems + has_many :products, through: :cartitems end diff --git a/config/routes.rb b/config/routes.rb index 5933ba3ee0..851ee87c81 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,8 @@ Rails.application.routes.draw do get 'categories/index' - resources :products + resources :products do + resources :cartitems, only:[:create] + end resources :categories, only:[:index] root to: "products#index" @@ -10,4 +12,6 @@ delete "/logout", to: "users#destroy", as: "logout" get 'carts/:id', to: "carts#show", as: "cart" + + resources :cartitems, only:[:create, :destroy] end From 5dd032382ef6ed67a88e207e3f3c7dce8d668a84 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Wed, 18 Nov 2020 16:23:58 -0800 Subject: [PATCH 035/248] added button to added item to cart on product show page, cart_items show up in shopping cart woohoooo --- app/views/carts/show.html.erb | 20 ++++++++++++++++++++ app/views/products/show.html.erb | 1 + 2 files changed, 21 insertions(+) diff --git a/app/views/carts/show.html.erb b/app/views/carts/show.html.erb index bc6f1c74fe..2f8899129d 100644 --- a/app/views/carts/show.html.erb +++ b/app/views/carts/show.html.erb @@ -11,6 +11,26 @@ + <% if @cart.cartitems.any? %> + <% @cart.cartitems.each do|item| %> + + + + + + + + <% end %> + <% end %>
<%= link_to 'Show', product %><%= link_to 'Edit', edit_product_path(product) %><%= link_to 'Destroy', product, method: :delete, data: { confirm: 'Are you sure?' } %><%= link_to product.name, product %><%= link_to 'Edit', edit_product_path(product) %><%= link_to 'Destroy', product, method: :delete, data: { confirm: 'Are you sure?' } %>
+ <%= item.product.name%> + + <%= item.cost %> + + <%= item.qty %> + + + <%= item.cost * item.qty %> +
diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 9701d93659..68400e46ce 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -21,4 +21,5 @@ <%= link_to 'Edit', edit_product_path(@product) %> <% end %> +<%= button_to "Add to Cart", product_cartitems_path(@product.id) %> <%= link_to 'Back', products_path %> From b52a8bbb6675b4f3882f6df489a05f8a0ff8b40b Mon Sep 17 00:00:00 2001 From: Lina Do Date: Wed, 18 Nov 2020 16:27:10 -0800 Subject: [PATCH 036/248] added links to the cart items to direct to product show page --- app/views/carts/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/carts/show.html.erb b/app/views/carts/show.html.erb index 2f8899129d..ae3133d299 100644 --- a/app/views/carts/show.html.erb +++ b/app/views/carts/show.html.erb @@ -15,7 +15,7 @@ <% @cart.cartitems.each do|item| %> - <%= item.product.name%> + <%= link_to item.product.name, product_path(item.product.id)%> <%= item.cost %> From 2294a027420ecff4a2d9bf96c3ec82932b016a62 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Wed, 18 Nov 2020 16:35:02 -0800 Subject: [PATCH 037/248] started working on category show page --- app/views/categories/show.html.erb | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/views/categories/show.html.erb diff --git a/app/views/categories/show.html.erb b/app/views/categories/show.html.erb new file mode 100644 index 0000000000..e69de29bb2 From 987a0ff4055d1da4b7708a0b46097cc527b1f8b7 Mon Sep 17 00:00:00 2001 From: r-spiel Date: Wed, 18 Nov 2020 17:35:33 -0800 Subject: [PATCH 038/248] update tests and add validtion to user model --- app/controllers/users_controller.rb | 1 + app/models/user.rb | 2 ++ test/controllers/users_controller_test.rb | 28 ++++++++++++++--------- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 448847e3be..60d2bcf88f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -24,6 +24,7 @@ def destroy session[:user_id] = nil flash[:success] = "Successfully logged out!" redirect_to root_path + return end end diff --git a/app/models/user.rb b/app/models/user.rb index 03165f7def..f48d22b993 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,4 +1,6 @@ class User < ApplicationRecord + validates :uid, uniqueness: { scope: :provider}, presence: true + validates :username, presence: true def self.build_from_github(auth_hash) user = User.new diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index f0a27199db..d52f176f77 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -1,6 +1,17 @@ require "test_helper" describe UsersController do + describe 'user instance' do + it 'cannot create a user with missing uid' do + # this should be a model/validtions text + user = User.new(uid: nil, username: 'new_user') + + expect(user.valid?).must_equal false + + end + + end + describe 'login' do it 'can log in an existing user' do user = perform_login(users(:ada)) @@ -19,7 +30,6 @@ end it 'redirects to root path if given invalid user data' do - skip # Arrange - invalid user (uid is nil) start_count = User.count @@ -29,30 +39,25 @@ # send login request for that user get omniauth_callback_path(:github) - #must_redirect_to root_path + must_redirect_to root_path # find the new user in the DB user = User.find_by(uid: user.uid, provider: user.provider) # Make sure the user is nil - expect(user).must_equal nil + expect(user).must_be_nil # Since we can read the session, check that the user ID was set as expected - session[:user_id].must_equal nil + expect(session[:user_id]).must_be_nil # Should *not* have created a new user - User.count.must_equal start_count + expect(User.count).must_equal start_count end - #NOTES: testing negative cases - # Someone making a get request to the callback route without coming from the Auth provider (no auth_hash). - # A request with an invalid auth provider `get auth_callback_path(:bogus) - # A request with an invalid auth_hash, like missing a uid. end describe 'logout' do it 'can logout an existing user' do - skip perform_login() @@ -61,7 +66,8 @@ delete logout_path, params: {} # log out - expect {session[:user_id]}.must_be_nil + expect(session[:user_id]).must_be_nil + end end From dab534f04e954bcad8bcbadd1c729fa441882518 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Wed, 18 Nov 2020 17:35:38 -0800 Subject: [PATCH 039/248] nested routes to browse products by category --- app/controllers/categories_controller.rb | 5 --- app/controllers/products_controller.rb | 13 +++++++- app/models/product.rb | 1 + app/views/categories/show.html.erb | 0 app/views/layouts/application.html.erb | 5 +++ app/views/products/index.html.erb | 22 +++++++++++-- app/views/products/show.html.erb | 2 +- config/routes.rb | 5 ++- test/system/categories_test.rb | 41 ++++++++++++++++++++++++ 9 files changed, 84 insertions(+), 10 deletions(-) delete mode 100644 app/controllers/categories_controller.rb delete mode 100644 app/views/categories/show.html.erb create mode 100644 test/system/categories_test.rb diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb deleted file mode 100644 index 1764578448..0000000000 --- a/app/controllers/categories_controller.rb +++ /dev/null @@ -1,5 +0,0 @@ -class CategoriesController < ApplicationController - def index - @categories = Category.all - end -end diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 7313d03e65..60340c6d7a 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -2,7 +2,18 @@ class ProductsController < ApplicationController before_action :set_product, only: [:show, :edit, :update, :destroy] def index - @products = Product.all + @categories = Category.all + + if params[:category_id] + @category = Category.find(params[:category_id]) + @products = @category.products + elsif params[:user_id] + @merchant = User.find(params[:user_id]) + @products = @merchant.products + else + @products = Product.all + end + end def show diff --git a/app/models/product.rb b/app/models/product.rb index 95dd8ddd9b..35cb2a0b8a 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -5,4 +5,5 @@ class Product < ApplicationRecord validates :name, :description, :image, presence: true validates :inventory, :cost, presence: true, numericality: true validates :category_ids, presence: true + end diff --git a/app/views/categories/show.html.erb b/app/views/categories/show.html.erb deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 6e6d076519..883b67a4c2 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,6 +10,11 @@
+ +

+ <%= link_to "SWEATSY", root_path %> +

+ - <% if @product.user_id == @current_user.id %> + <% if @current_user && @product.user_id == @current_user.id %> <%= link_to 'Edit', edit_product_path(@product) %> <%= link_to 'Delete', product_path(@product), method: :delete, data: { confirm: "Are you sure?"} %> <% end %> From d80d27756c0119110880ad0642fa037d94e86bf8 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Thu, 19 Nov 2020 23:08:13 -0800 Subject: [PATCH 086/248] Revert "empty cart when place order" This reverts commit 026190a736720e52ad6c9b873aef3b7a2b499e63. --- app/controllers/carts_controller.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/controllers/carts_controller.rb b/app/controllers/carts_controller.rb index 035b12166a..ccaf2a13f4 100644 --- a/app/controllers/carts_controller.rb +++ b/app/controllers/carts_controller.rb @@ -16,8 +16,6 @@ def purchase @cart.status = "paid" @cart.save flash[:success] = "your stuff was ordered" - session[:cart_id] = nil - current_cart redirect_to root_path return else From 4336262897991e5515af14a8da62513f823a1db7 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Thu, 19 Nov 2020 23:11:37 -0800 Subject: [PATCH 087/248] empty cart when place order --- app/controllers/carts_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/carts_controller.rb b/app/controllers/carts_controller.rb index ccaf2a13f4..035b12166a 100644 --- a/app/controllers/carts_controller.rb +++ b/app/controllers/carts_controller.rb @@ -16,6 +16,8 @@ def purchase @cart.status = "paid" @cart.save flash[:success] = "your stuff was ordered" + session[:cart_id] = nil + current_cart redirect_to root_path return else From e0ea44898bb947e75e67813cadf8936960cc754c Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Thu, 19 Nov 2020 23:11:58 -0800 Subject: [PATCH 088/248] Revert "dry up cartitems controller tests" This reverts commit ce117b3bcf6348e1a04d25771530bc6d1eb750ab. --- test/controllers/cartitems_controller_test.rb | 136 ++++++++++++------ 1 file changed, 94 insertions(+), 42 deletions(-) diff --git a/test/controllers/cartitems_controller_test.rb b/test/controllers/cartitems_controller_test.rb index cbc637456d..11eb29285d 100644 --- a/test/controllers/cartitems_controller_test.rb +++ b/test/controllers/cartitems_controller_test.rb @@ -1,57 +1,62 @@ require "test_helper" describe CartitemsController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end - before do - @product = products(:product0) - @one_inventory_product = products(:product1) - @user = users(:ada) - @cartitem = cartitems(:cartitem0) - end - - let(:cartitem_hash){ - { - product: { - name: "Yellow Socks", - inventory: 10, - cost: 10.00, - description: "best socks in the wooooorld", - image: "image", - category_ids: Category.create(name: "Sweatpants").id, - user: @user - } - } - } - + # need to dry up code using fixture data describe "create" do - it "can create a cart item for a logged in user" do + it "can create a cart item" do perform_login - expect{ - post product_cartitems_path(@product.id), params: cartitem_hash - }.must_differ "Cartitem.count", 1 + user = User.first + category = Category.create(name: "Sweatpants") + product = Product.create( + name: "Yellow Socks", + inventory: 10, + cost: 10.00, + description: "best socks in the wooooorld", + image: "image", + category_ids: category.id, + user: user + ) - must_respond_with :redirect - end + cart = Cart.find_by(id: session[:cart_id]) - it "can create a cart item for a guest " do expect{ - post product_cartitems_path(@product.id), params: cartitem_hash - }.must_differ "Cartitem.count", 1 + post product_cartitems_path(product.id) + }.must_differ "cart.cartitems.count", 1 must_respond_with :redirect end - it "wont add to cart if not enough inventory" do + it "cart item quantity will not increase if there is not enough inventory" do perform_login + user = User.first + category = Category.create(name: "Sweatpants") + product = Product.create( + name: "Yellow Socks", + inventory: 1, + cost: 10.00, + description: "best socks in the wooooorld", + image: "image", + category_ids: category.id, + user: user + ) + cart = Cart.find_by(id: session[:cart_id]) - expect(cart.cartitems.length).must_equal 0 - expect { - post product_cartitems_path(@one_inventory_product.id)}.must_differ "Cartitem.count", 1 - expect { - post product_cartitems_path(@one_inventory_product.id)}.wont_change "Cartitem.count" + # added the product to the cart + post product_cartitems_path(product.id) + + cart_item = cart.cartitems.find_by(product: product) + + # adding the same product again + expect{ + post product_cartitems_path(product.id) + }.wont_change "cart_item.qty" expect(flash[:error]).wont_be_nil must_respond_with :redirect @@ -61,22 +66,69 @@ describe "reduce_qty" do it "can reduce the quantity of the cart item by 1" do + + skip perform_login - expect{ - post reduce_path(@cartitem.id).must_differ "@cartitem.qty", -1 - } + + user = User.first + category = Category.create(name: "Sweatpants") + product = Product.create( + name: "Yellow Socks", + inventory: 10, + cost: 10.00, + description: "best socks in the wooooorld", + image: "image", + category_ids: category.id, + user: user + ) + + cart_item = Cartitem.create( + cart: Cart.find_by(id: session[:cart_id]), + product: product, + qty: 3, + cost: product.cost + ) + + p Cartitem.all + + post reduce_path(cart_item.id) + p cart_item.qty + end end describe "destroy" do it "can destroy a cart item" do + # creates a user perform_login + user = User.first + category = Category.create(name: "Sweatpants") + product = Product.new( + name: "Yellow Socks", + inventory: 10, + cost: 10.00, + description: "best socks in the wooooorld", + image: "image", + category_ids: category.id, + user: user + ) + + cart = Cart.find_by(id: session[:cart_id]) + + cart_item = Cartitem.create( + cart: cart, + product: product, + qty: 3, + cost: product.cost + ) + + expect{ - delete cartitem_path(@cartitem.id) - }.must_change "Cartitem.count", -1 - + delete cartitem_path(cart_item.id) + }.must_change "cart.cartitems.count", -1 + must_respond_with :redirect must_redirect_to cart_path end From 69ed9d2d79fa7e456ad00c9609a21b2db78b34b4 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Thu, 19 Nov 2020 23:19:21 -0800 Subject: [PATCH 089/248] but if i was gonna write this test tonight, this is what it would do --- test/controllers/carts_controller_test.rb | 24 ++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/test/controllers/carts_controller_test.rb b/test/controllers/carts_controller_test.rb index 1eea882aac..4983dcc5c4 100644 --- a/test/controllers/carts_controller_test.rb +++ b/test/controllers/carts_controller_test.rb @@ -1,9 +1,6 @@ require "test_helper" describe CartsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end describe 'current cart' do it "creates a new cart when visiting the site for the first time" do @@ -22,7 +19,6 @@ it "should have the same cart throughout the site " do - get root_path cart_id = session[:cart_id] cart = Cart.find_by(id: cart_id) @@ -46,7 +42,6 @@ # Arrange get root_path cart_id = session[:cart_id] - current_cart = Cart.find_by(id: cart_id) # Act get cart_path(cart_id) @@ -58,4 +53,23 @@ end + describe "purchase" do + + it "can purchase a cart for a logged in user" do + skip + # updates cart status + # check flash message + # make sure cart empties + # make sure redirects correctly + end + + it "can purchase a cart for a guest user" do + skip + # updates cart status + # check flash message + # make sure cart empties + # make sure redirects correctly + end + end + end From e6adfe3a3010006c0058ad899c73950c68b87edc Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Thu, 19 Nov 2020 23:24:02 -0800 Subject: [PATCH 090/248] simplecov for test coverage --- .gitignore | 3 ++- Gemfile | 1 + Gemfile.lock | 6 ++++++ test/test_helper.rb | 4 ++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 44792f0d6d..72f6f52f12 100644 --- a/.gitignore +++ b/.gitignore @@ -36,4 +36,5 @@ yarn-debug.log* .yarn-integrity .env -.idea/ \ No newline at end of file +.idea/ +coverage \ No newline at end of file diff --git a/Gemfile b/Gemfile index a47d84aee7..a4874b3e6a 100644 --- a/Gemfile +++ b/Gemfile @@ -56,6 +56,7 @@ group :test do gem 'selenium-webdriver' # Easy installation and use of web drivers to run system tests with browsers gem 'webdrivers' + gem 'simplecov' end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem diff --git a/Gemfile.lock b/Gemfile.lock index c36c89dd8e..87d4c42154 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,6 +92,7 @@ GEM debase-ruby_core_source (>= 0.10.2) debase-ruby_core_source (0.10.11) debug_inspector (0.0.3) + docile (1.3.2) dotenv (2.7.6) dotenv-rails (2.7.6) dotenv (= 2.7.6) @@ -246,6 +247,10 @@ GEM childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) shellany (0.0.1) + simplecov (0.19.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov-html (0.12.3) spring (2.1.1) spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) @@ -314,6 +319,7 @@ DEPENDENCIES ruby-debug-ide (>= 0.7.0) sass-rails (>= 6) selenium-webdriver + simplecov spring spring-watcher-listen (~> 2.0.0) turbolinks (~> 5) diff --git a/test/test_helper.rb b/test/test_helper.rb index 43f69c5c2a..1c73434032 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,6 +1,7 @@ ENV['RAILS_ENV'] ||= 'test' require_relative '../config/environment' require 'rails/test_help' +require 'simplecov' require "minitest/rails" require "minitest/reporters" # for Colorized output # For colorful output! @@ -9,6 +10,9 @@ ENV, Minitest.backtrace_filter ) +SimpleCov.start do + add_filter 'test/' # Tests should not be checked for coverage. +end class ActiveSupport::TestCase # Run tests in parallel with specified workers From a061a5c6b87c34d7c52f2fb6f11f75d8a5fe2526 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Fri, 20 Nov 2020 08:10:08 -0800 Subject: [PATCH 091/248] moved add item to cart to products controller --- app/controllers/products_controller.rb | 28 +++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 65518b7d42..f1a9c1055e 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -1,5 +1,5 @@ class ProductsController < ApplicationController - before_action :set_product, only: [:show, :edit, :update, :destroy] + before_action :set_product, only: [:show, :edit, :update, :destroy, :add_to_cart] before_action :require_login, only: [:new, :create, :edit, :update, :destroy] def index @@ -64,6 +64,32 @@ def destroy end end + def add_to_cart + # check if product is already in the cart + if @current_cart.products.include?(@product) + # find the cart item + @cart_item = current_cart.cartitems.find_by(product_id: @product.id) + # check if there is enough inventory + if @cart_item.qty < @product.inventory + @cart_item.qty += 1 + else + # not enough inventory + flash[:error] = "Sorry, not enough inventory" + return + end + else + # create a new cart item if it doesn't exist + @cart_item = Cartitem.new(cart: @current_cart, product: @product, qty: 1, cost: @product.cost ) + end + + # save the cart item and redirect back to the product show page + if @cart_item.save + flash[:success] = "Successfully added to cart" + end + + redirect_back fallback_location: product_path(@product) + end + private def set_product From c976e75a53b64f0932547ae9c5aa6ae35ddf8df4 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Fri, 20 Nov 2020 08:15:41 -0800 Subject: [PATCH 092/248] moved adding item to cart from cartitem controller to product in route --- config/routes.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index e959e50808..6c89aa0347 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,9 +3,9 @@ get 'categories/create' get 'categories/index' - resources :products do - resources :cartitems, only:[:create] - end + resources :products + # moved adding item to cart from cartitem controller to product + post "/products/:id/add_to_cart," to: "products#add_to_cart", as "add_to_cart" resources :categories, only:[:index] do From cc97b77a95956343eb7f2e2a0301dce9e5303c73 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Fri, 20 Nov 2020 08:16:31 -0800 Subject: [PATCH 093/248] added comments --- config/routes.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 6c89aa0347..c0c9eeefaf 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -32,7 +32,8 @@ get 'carts/:id/purchase', to: "carts#purchase_form", as: "purchase_form" patch 'carts/:id', to: "carts#purchase" - resources :cartitems, only:[:create, :destroy] + # removed create + resources :cartitems, only:[:destroy] post 'cartitems/:id/add', to: "cartitems#add_qty", as: "add" post 'cartitems/:id/reduce', to: "cartitems#reduce_qty", as: "reduce" From 26e31d956b4c469995fe8a4b5546f515bc520667 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Fri, 20 Nov 2020 08:19:29 -0800 Subject: [PATCH 094/248] changed cart item from an instance variable to a local variable --- app/controllers/products_controller.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index f1a9c1055e..b7dd8fa87c 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -68,10 +68,10 @@ def add_to_cart # check if product is already in the cart if @current_cart.products.include?(@product) # find the cart item - @cart_item = current_cart.cartitems.find_by(product_id: @product.id) + cart_item = current_cart.cartitems.find_by(product_id: @product.id) # check if there is enough inventory - if @cart_item.qty < @product.inventory - @cart_item.qty += 1 + if cart_item.qty < @product.inventory + cart_item.qty += 1 else # not enough inventory flash[:error] = "Sorry, not enough inventory" @@ -79,11 +79,11 @@ def add_to_cart end else # create a new cart item if it doesn't exist - @cart_item = Cartitem.new(cart: @current_cart, product: @product, qty: 1, cost: @product.cost ) + cart_item = Cartitem.new(cart: @current_cart, product: @product, qty: 1, cost: @product.cost ) end # save the cart item and redirect back to the product show page - if @cart_item.save + if cart_item.save flash[:success] = "Successfully added to cart" end From f06f5b4fed1e4390bc3f6734a05c3dff72766938 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Fri, 20 Nov 2020 08:20:30 -0800 Subject: [PATCH 095/248] commented out create action in cartitems controller --- app/controllers/cartitems_controller.rb | 58 ++++++++++++------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/app/controllers/cartitems_controller.rb b/app/controllers/cartitems_controller.rb index d80a588428..67d3885870 100644 --- a/app/controllers/cartitems_controller.rb +++ b/app/controllers/cartitems_controller.rb @@ -2,35 +2,35 @@ class CartitemsController < ApplicationController before_action :find_cartitem, except: [:create] - def create - # product nested route - product_id = params[:product_id] - product = Product.find_by(id: product_id) - current_cart = @current_cart - - # check if product is already in the cart - if current_cart.products.include?(product) - - # find the cart item - @cart_item = current_cart.cartitems.find_by(product_id: product_id) - # check if there is enough inventory - if @cart_item.qty < product.inventory - @cart_item.qty += 1 - else - # not enough inventory - redirect_back fallback_location: root_path - flash[:error] = "Sorry, not enough inventory" - return - end - else - # create a new cart item if it doesn't exist - @cart_item = Cartitem.new(cart_id: current_cart.id, product_id: product_id, qty: 1, cost: product.cost ) - end - - # save the cart item and redirect back to the product show page - @cart_item.save - redirect_back fallback_location: root_path - end + # def create + # # product nested route + # product_id = params[:product_id] + # product = Product.find_by(id: product_id) + # current_cart = @current_cart + # + # # check if product is already in the cart + # if current_cart.products.include?(product) + # + # # find the cart item + # @cart_item = current_cart.cartitems.find_by(product_id: product_id) + # # check if there is enough inventory + # if @cart_item.qty < product.inventory + # @cart_item.qty += 1 + # else + # # not enough inventory + # redirect_back fallback_location: root_path + # flash[:error] = "Sorry, not enough inventory" + # return + # end + # else + # # create a new cart item if it doesn't exist + # @cart_item = Cartitem.new(cart_id: current_cart.id, product_id: product_id, qty: 1, cost: product.cost ) + # end + # + # # save the cart item and redirect back to the product show page + # @cart_item.save + # redirect_back fallback_location: root_path + # end def add_qty # find the product From 346e65d74ce9c8c8aab6adcacb4f08362404f157 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Fri, 20 Nov 2020 08:25:15 -0800 Subject: [PATCH 096/248] fix syntax errror in add to cart route --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index c0c9eeefaf..a1cc278922 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,7 +5,7 @@ resources :products # moved adding item to cart from cartitem controller to product - post "/products/:id/add_to_cart," to: "products#add_to_cart", as "add_to_cart" + post "/products/:id/add_to_cart,", to: "products#add_to_cart", as: "add_to_cart" resources :categories, only:[:index] do From 6d816e161eb19c8d3cfa9df195719a1c588887a4 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Fri, 20 Nov 2020 09:02:11 -0800 Subject: [PATCH 097/248] added more tests to compare before and after quantities for the add and reduce methods --- test/controllers/cartitems_controller_test.rb | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/test/controllers/cartitems_controller_test.rb b/test/controllers/cartitems_controller_test.rb index f8acb48f17..800e943c77 100644 --- a/test/controllers/cartitems_controller_test.rb +++ b/test/controllers/cartitems_controller_test.rb @@ -55,9 +55,10 @@ ) post add_path(cart_item.id) - cart_item.reload + updated_cart_item = Cartitem.find_by(id: cart_item.id) - expect(cart_item.qty).must_equal 4 + expect(updated_cart_item.qty).must_equal 4 + expect(updated_cart_item.qty > cart_item.qty).must_equal true must_redirect_to cart_path end @@ -73,9 +74,12 @@ post add_path(cart_item.id) expect(flash[:error]).must_equal "Sorry, not enough inventory" - cart_item.reload - expect(cart_item.qty).must_equal 1 + updated_cart_item = Cartitem.find_by(id: cart_item.id) + + expect(updated_cart_item.qty).must_equal 1 + expect(updated_cart_item.qty).must_equal cart_item.qty + must_respond_with :redirect must_redirect_to cart_path end end @@ -95,9 +99,11 @@ ) post reduce_path(cart_item.id) - cart_item.reload + updated_cart_item = Cartitem.find_by(id: cart_item.id) - expect(cart_item.qty).must_equal 2 + expect(updated_cart_item.qty).must_equal 2 + expect(updated_cart_item.qty < cart_item.qty).must_equal true + must_respond_with :redirect must_redirect_to cart_path end end From 581d868857ffce35d7fc97d30e76d260e68f9645 Mon Sep 17 00:00:00 2001 From: r-spiel Date: Fri, 20 Nov 2020 09:26:30 -0800 Subject: [PATCH 098/248] not working attempt at category yml --- test/fixtures/categories.yml | 8 ++++++++ test/fixtures/categories_products.yml | 15 +++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 test/fixtures/categories.yml create mode 100644 test/fixtures/categories_products.yml diff --git a/test/fixtures/categories.yml b/test/fixtures/categories.yml new file mode 100644 index 0000000000..ec5c00d3fb --- /dev/null +++ b/test/fixtures/categories.yml @@ -0,0 +1,8 @@ +category_gear + name: gear +category_weights + name: weights +category_clothing + name: clothing +category_shoes + name: shoes \ No newline at end of file diff --git a/test/fixtures/categories_products.yml b/test/fixtures/categories_products.yml new file mode 100644 index 0000000000..d036b6bea5 --- /dev/null +++ b/test/fixtures/categories_products.yml @@ -0,0 +1,15 @@ +join0: + category: category_gear + product: product0 +join1: + category: category_clothing + product: product0 +join2: + category: category_shoes + product: product0 +join3: + category: category_gear + product: product1 +join4: + category: weights + product: product2 \ No newline at end of file From 212d63ed244f33f3c88d61db3f6a2fd0ca846b57 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Fri, 20 Nov 2020 09:45:00 -0800 Subject: [PATCH 099/248] testing add to cart method that it can add a new cart item --- test/controllers/carts_controller_test.rb | 44 +++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/test/controllers/carts_controller_test.rb b/test/controllers/carts_controller_test.rb index 1eea882aac..0ec3c36d7d 100644 --- a/test/controllers/carts_controller_test.rb +++ b/test/controllers/carts_controller_test.rb @@ -58,4 +58,48 @@ end + describe "add to cart" do + it "can add a new cart item" do + # start a new cart + get root_path + cart = Cart.find_by(id: session[:cart_id]) + + expect{ + post add_to_cart_path(products(:product0).id) + }.must_differ "cart.cartitems.count", 1 + + cart_item = Cartitem.find_by(product_id: products(:product0).id) + + expect(cart_item.cart).must_equal cart + expect(cart_item.product).must_equal products(:product0) + expect(cart_item.qty).must_equal 1 + expect(cart_item.cost).must_equal products(:product0).cost + expect(flash[:success]).must_equal "Successfully added to cart" + must_respond_with :redirect + must_redirect_to product_path(products(:product0)) + end + + it "will not add to the cart if there is not enough inventory" do + # start a new cart + skip + get root_path + cart = Cart.find_by(id: session[:cart_id]) + + # add the product to the cart, product only has one in inventory + post product_cartitems_path(products(:product1).id) + + cart_item = cart.cartitems.find_by(product: products(:product1)) + + # add the same product again + expect{ + post product_cartitems_path(products(:product1).id) + }.wont_change "cart_item.qty" + + expect(flash[:error]).wont_be_nil + must_respond_with :redirect + + end + + end + end From d6eb6780d2552fd04c39188e73d9c2a0e9d3b728 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Fri, 20 Nov 2020 09:54:03 -0800 Subject: [PATCH 100/248] incorrectly placed add to cart test to cart when it should be in products tests --- app/controllers/products_controller.rb | 1 - test/controllers/carts_controller_test.rb | 44 -------------------- test/controllers/products_controller_test.rb | 44 ++++++++++++++++++++ 3 files changed, 44 insertions(+), 45 deletions(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index b7dd8fa87c..369ae5d105 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -75,7 +75,6 @@ def add_to_cart else # not enough inventory flash[:error] = "Sorry, not enough inventory" - return end else # create a new cart item if it doesn't exist diff --git a/test/controllers/carts_controller_test.rb b/test/controllers/carts_controller_test.rb index 0ec3c36d7d..1eea882aac 100644 --- a/test/controllers/carts_controller_test.rb +++ b/test/controllers/carts_controller_test.rb @@ -58,48 +58,4 @@ end - describe "add to cart" do - it "can add a new cart item" do - # start a new cart - get root_path - cart = Cart.find_by(id: session[:cart_id]) - - expect{ - post add_to_cart_path(products(:product0).id) - }.must_differ "cart.cartitems.count", 1 - - cart_item = Cartitem.find_by(product_id: products(:product0).id) - - expect(cart_item.cart).must_equal cart - expect(cart_item.product).must_equal products(:product0) - expect(cart_item.qty).must_equal 1 - expect(cart_item.cost).must_equal products(:product0).cost - expect(flash[:success]).must_equal "Successfully added to cart" - must_respond_with :redirect - must_redirect_to product_path(products(:product0)) - end - - it "will not add to the cart if there is not enough inventory" do - # start a new cart - skip - get root_path - cart = Cart.find_by(id: session[:cart_id]) - - # add the product to the cart, product only has one in inventory - post product_cartitems_path(products(:product1).id) - - cart_item = cart.cartitems.find_by(product: products(:product1)) - - # add the same product again - expect{ - post product_cartitems_path(products(:product1).id) - }.wont_change "cart_item.qty" - - expect(flash[:error]).wont_be_nil - must_respond_with :redirect - - end - - end - end diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb index 96552e982f..90dcfb1981 100644 --- a/test/controllers/products_controller_test.rb +++ b/test/controllers/products_controller_test.rb @@ -142,5 +142,49 @@ end + describe "add to cart" do + it "can add a new cart item" do + # start a new cart + get root_path + cart = Cart.find_by(id: session[:cart_id]) + + expect{ + post add_to_cart_path(products(:product0).id) + }.must_differ "cart.cartitems.count", 1 + + cart_item = Cartitem.find_by(product_id: products(:product0).id) + + expect(cart_item.cart).must_equal cart + expect(cart_item.product).must_equal products(:product0) + expect(cart_item.qty).must_equal 1 + expect(cart_item.cost).must_equal products(:product0).cost + expect(flash[:success]).must_equal "Successfully added to cart" + must_respond_with :redirect + must_redirect_to product_path(products(:product0)) + end + + it "will not add to the cart if there is not enough inventory" do + # start a new cart + get root_path + cart = Cart.find_by(id: session[:cart_id]) + + # add the product to the cart, product only has one in inventory + post add_to_cart_path(products(:product1).id) + + cart_item = cart.cartitems.find_by(product: products(:product1)) + + # add the same product again + post add_to_cart_path(products(:product1).id) + + updated_cart_item = cart.cartitems.find_by(product: products(:product1)) + + expect(cart_item.qty).must_equal updated_cart_item.qty + expect(flash[:error]).must_equal "Sorry, not enough inventory" + must_respond_with :redirect + must_redirect_to product_path(products(:product1)) + + end + + end end From fa10d4e11cc3b3a1e6d05ea6241872f4d343eec6 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Fri, 20 Nov 2020 09:55:50 -0800 Subject: [PATCH 101/248] products show view, changed the add to cart path --- 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 f8e477a7ad..1a0349cc0e 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -22,5 +22,5 @@ <%= link_to 'Delete', product_path(@product), method: :delete, data: { confirm: "Are you sure?"} %> <% end %> -<%= button_to "Add to Cart", product_cartitems_path(@product.id) %> +<%= button_to "Add to Cart", add_to_cart_path(@product.id) %> <%= link_to 'Back', products_path %> From 4fd976d6fe0b42fd9dfb4623149ba62ab84f6de0 Mon Sep 17 00:00:00 2001 From: r-spiel Date: Fri, 20 Nov 2020 09:58:42 -0800 Subject: [PATCH 102/248] try with category_id --- test/fixtures/categories_products.yml | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/test/fixtures/categories_products.yml b/test/fixtures/categories_products.yml index d036b6bea5..0ca351771c 100644 --- a/test/fixtures/categories_products.yml +++ b/test/fixtures/categories_products.yml @@ -1,15 +1,6 @@ join0: - category: category_gear - product: product0 + category_id: 1 + product_id: 1 join1: - category: category_clothing - product: product0 -join2: - category: category_shoes - product: product0 -join3: - category: category_gear - product: product1 -join4: - category: weights - product: product2 \ No newline at end of file + category_id: 2 + product_id: 1 From 2d7364b91ea44fdfbd1fb2323ce353d3ba359615 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Fri, 20 Nov 2020 12:01:17 -0800 Subject: [PATCH 103/248] removed relate order migration --- .../20201117234523_relate_orders_to_carts.rb | 5 ----- db/schema.rb | 15 --------------- 2 files changed, 20 deletions(-) delete mode 100644 db/migrate/20201117234523_relate_orders_to_carts.rb diff --git a/db/migrate/20201117234523_relate_orders_to_carts.rb b/db/migrate/20201117234523_relate_orders_to_carts.rb deleted file mode 100644 index f1f6966390..0000000000 --- a/db/migrate/20201117234523_relate_orders_to_carts.rb +++ /dev/null @@ -1,5 +0,0 @@ -class RelateOrdersToCarts < ActiveRecord::Migration[6.0] - def change - add_reference :orders, :cart, index: true - end -end diff --git a/db/schema.rb b/db/schema.rb index d5a472a3cd..80b7868d1b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -52,21 +52,6 @@ t.index ["product_id"], name: "index_categories_products_on_product_id" end - create_table "orders", force: :cascade do |t| - t.string "status" - t.string "email" - t.string "mailing_address" - t.string "name" - t.string "cc_number" - t.string "cc_expiration" - t.string "cc_cvv" - t.string "zip" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false - t.bigint "cart_id" - t.index ["cart_id"], name: "index_orders_on_cart_id" - end - create_table "products", force: :cascade do |t| t.string "name" t.integer "inventory" From 3eeeff09ba1f17b33e7374df3c27f6626641694e Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Fri, 20 Nov 2020 12:03:44 -0800 Subject: [PATCH 104/248] add coverage to gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 44792f0d6d..72f6f52f12 100644 --- a/.gitignore +++ b/.gitignore @@ -36,4 +36,5 @@ yarn-debug.log* .yarn-integrity .env -.idea/ \ No newline at end of file +.idea/ +coverage \ No newline at end of file From 85fa1980e72febc8410119910666524d01305620 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Fri, 20 Nov 2020 12:10:37 -0800 Subject: [PATCH 105/248] accept schema changes --- db/schema.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/db/schema.rb b/db/schema.rb index 80b7868d1b..d5a472a3cd 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -52,6 +52,21 @@ t.index ["product_id"], name: "index_categories_products_on_product_id" end + create_table "orders", force: :cascade do |t| + t.string "status" + t.string "email" + t.string "mailing_address" + t.string "name" + t.string "cc_number" + t.string "cc_expiration" + t.string "cc_cvv" + t.string "zip" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.bigint "cart_id" + t.index ["cart_id"], name: "index_orders_on_cart_id" + end + create_table "products", force: :cascade do |t| t.string "name" t.integer "inventory" From d60459d31ea9fedf108364646cd77202bb877382 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Fri, 20 Nov 2020 12:30:45 -0800 Subject: [PATCH 106/248] removed create action from cart items --- app/controllers/cartitems_controller.rb | 30 ------------------------- 1 file changed, 30 deletions(-) diff --git a/app/controllers/cartitems_controller.rb b/app/controllers/cartitems_controller.rb index 67d3885870..b48cb7729e 100644 --- a/app/controllers/cartitems_controller.rb +++ b/app/controllers/cartitems_controller.rb @@ -2,36 +2,6 @@ class CartitemsController < ApplicationController before_action :find_cartitem, except: [:create] - # def create - # # product nested route - # product_id = params[:product_id] - # product = Product.find_by(id: product_id) - # current_cart = @current_cart - # - # # check if product is already in the cart - # if current_cart.products.include?(product) - # - # # find the cart item - # @cart_item = current_cart.cartitems.find_by(product_id: product_id) - # # check if there is enough inventory - # if @cart_item.qty < product.inventory - # @cart_item.qty += 1 - # else - # # not enough inventory - # redirect_back fallback_location: root_path - # flash[:error] = "Sorry, not enough inventory" - # return - # end - # else - # # create a new cart item if it doesn't exist - # @cart_item = Cartitem.new(cart_id: current_cart.id, product_id: product_id, qty: 1, cost: product.cost ) - # end - # - # # save the cart item and redirect back to the product show page - # @cart_item.save - # redirect_back fallback_location: root_path - # end - def add_qty # find the product product_inventory = @cart_item.product.inventory From 696b458f6623237e49d7d14b3d9574e9a25f1c7b Mon Sep 17 00:00:00 2001 From: Lina Do Date: Fri, 20 Nov 2020 14:47:33 -0800 Subject: [PATCH 107/248] removed create action tests for cartitem controller --- test/controllers/cartitems_controller_test.rb | 35 ------------------- 1 file changed, 35 deletions(-) diff --git a/test/controllers/cartitems_controller_test.rb b/test/controllers/cartitems_controller_test.rb index 800e943c77..5a8ff3a1af 100644 --- a/test/controllers/cartitems_controller_test.rb +++ b/test/controllers/cartitems_controller_test.rb @@ -5,41 +5,6 @@ # value(1+1).must_equal 2 # end - describe "create" do - it "can create a cart item" do - # start a new cart - get root_path - cart = Cart.find_by(id: session[:cart_id]) - - expect{ - post product_cartitems_path(products(:product0).id) - }.must_differ "cart.cartitems.count", 1 - - must_respond_with :redirect - end - - it "will not add to the cart if there is not enough inventory" do - # start a new cart - get root_path - cart = Cart.find_by(id: session[:cart_id]) - - # add the product to the cart, product only has one in inventory - post product_cartitems_path(products(:product1).id) - - cart_item = cart.cartitems.find_by(product: products(:product1)) - - # add the same product again - expect{ - post product_cartitems_path(products(:product1).id) - }.wont_change "cart_item.qty" - - expect(flash[:error]).wont_be_nil - must_respond_with :redirect - - end - - end - describe "add_qty" do it "can increase the quantity of the cart item by 1" do From 0f7553300c9d4994da0aa48a7066b5de3bb022a5 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Fri, 20 Nov 2020 15:02:45 -0800 Subject: [PATCH 108/248] incorrect path was causing error, switched to add_to_cart path, and added more expects to reduce qty test --- test/controllers/cartitems_controller_test.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/controllers/cartitems_controller_test.rb b/test/controllers/cartitems_controller_test.rb index 5a8ff3a1af..6d020325e7 100644 --- a/test/controllers/cartitems_controller_test.rb +++ b/test/controllers/cartitems_controller_test.rb @@ -34,7 +34,7 @@ cart = Cart.find_by(id: session[:cart_id]) # add the product to the cart, product only has one in inventory - post product_cartitems_path(products(:product1).id) + post add_to_cart_path(products(:product1).id) cart_item = cart.cartitems.find_by(product: products(:product1)) post add_path(cart_item.id) @@ -66,6 +66,9 @@ post reduce_path(cart_item.id) updated_cart_item = Cartitem.find_by(id: cart_item.id) + expect(updated_cart_item.cart).must_equal cart_item.cart + expect(updated_cart_item.id).must_equal cart_item.id + expect(updated_cart_item.product).must_equal cart_item.product expect(updated_cart_item.qty).must_equal 2 expect(updated_cart_item.qty < cart_item.qty).must_equal true must_respond_with :redirect From 707efd2af069d387f5468a4bb466079ba85379af Mon Sep 17 00:00:00 2001 From: Lina Do Date: Fri, 20 Nov 2020 15:04:58 -0800 Subject: [PATCH 109/248] changed another incorrect path in the destroy action test --- test/controllers/cartitems_controller_test.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/controllers/cartitems_controller_test.rb b/test/controllers/cartitems_controller_test.rb index 6d020325e7..07855fbcaf 100644 --- a/test/controllers/cartitems_controller_test.rb +++ b/test/controllers/cartitems_controller_test.rb @@ -42,6 +42,9 @@ updated_cart_item = Cartitem.find_by(id: cart_item.id) + expect(updated_cart_item.cart).must_equal cart_item.cart + expect(updated_cart_item.id).must_equal cart_item.id + expect(updated_cart_item.product).must_equal cart_item.product expect(updated_cart_item.qty).must_equal 1 expect(updated_cart_item.qty).must_equal cart_item.qty must_respond_with :redirect @@ -82,7 +85,7 @@ perform_login cart = Cart.find_by(id: session[:cart_id]) # add a new cart item to cart - post product_cartitems_path(products(:product0).id) + post add_to_cart_path(products(:product0).id) # find the cart item from the cart cart_item = cart.cartitems.find_by(product: products(:product0)) From 3f2b1113c1f7b217ffe24bd1a450ccb03a700c79 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Fri, 20 Nov 2020 15:30:42 -0800 Subject: [PATCH 110/248] fixed an error on add to cart test, its passing now quit --- test/controllers/products_controller_test.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb index 90dcfb1981..6abc2e3852 100644 --- a/test/controllers/products_controller_test.rb +++ b/test/controllers/products_controller_test.rb @@ -152,7 +152,8 @@ post add_to_cart_path(products(:product0).id) }.must_differ "cart.cartitems.count", 1 - cart_item = Cartitem.find_by(product_id: products(:product0).id) + # cart_item = Cartitem.find_by(product_id: products(:product0).id) + cart_item = cart.cartitems.find_by(product_id: products(:product0).id) expect(cart_item.cart).must_equal cart expect(cart_item.product).must_equal products(:product0) From 801d5d0a8fd5d512a5df671a3f5ba4d6d889718c Mon Sep 17 00:00:00 2001 From: r-spiel Date: Fri, 20 Nov 2020 15:35:18 -0800 Subject: [PATCH 111/248] category fixtures --- test/fixtures/categories.yml | 8 ++++---- test/fixtures/categories_products.yml | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/test/fixtures/categories.yml b/test/fixtures/categories.yml index ec5c00d3fb..5b41768daf 100644 --- a/test/fixtures/categories.yml +++ b/test/fixtures/categories.yml @@ -1,8 +1,8 @@ -category_gear +category_gear: name: gear -category_weights +category_weights: name: weights -category_clothing +category_clothing: name: clothing -category_shoes +category_shoes: name: shoes \ No newline at end of file diff --git a/test/fixtures/categories_products.yml b/test/fixtures/categories_products.yml index 0ca351771c..41682f4287 100644 --- a/test/fixtures/categories_products.yml +++ b/test/fixtures/categories_products.yml @@ -4,3 +4,21 @@ join0: join1: category_id: 2 product_id: 1 +join2: + category_id: 3 + product_id: 1 +join3: + category_id: 1 + product_id: 2 +join4: + category_id: 1 + product_id: 3 +join5: + category_id: 1 + product_id: 4 +join6: + category_id: 1 + product_id: 5 +join7: + category_id: 1 + product_id: 6 \ No newline at end of file From dffab1de85dbe9b59193562e1b4956106eb14338 Mon Sep 17 00:00:00 2001 From: r-spiel Date: Fri, 20 Nov 2020 15:39:50 -0800 Subject: [PATCH 112/248] comment out line 89 products_controller_test and skip in categories_controller_tests --- test/controllers/categories_controller_test.rb | 6 ++++-- test/controllers/products_controller_test.rb | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test/controllers/categories_controller_test.rb b/test/controllers/categories_controller_test.rb index 678499d1f5..5fb8e736fa 100644 --- a/test/controllers/categories_controller_test.rb +++ b/test/controllers/categories_controller_test.rb @@ -2,12 +2,14 @@ describe CategoriesController do it "must get new" do - get categories_new_url + skip + get categories_new_path must_respond_with :success end it "must get create" do - get categories_create_url + skip + get categories_create_path must_respond_with :success end diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb index 6abc2e3852..a88fba43f4 100644 --- a/test/controllers/products_controller_test.rb +++ b/test/controllers/products_controller_test.rb @@ -86,7 +86,7 @@ must_respond_with :success expect(product.name).must_equal "leggings" - expect(product.category_ids).must_include @cat1.id + #expect(product.category_ids).must_include @cat1.id end it "will not show product with invalid ID" do From 08483ddc136bdb927e52b9dd7d508486ce95c8ba Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Fri, 20 Nov 2020 16:27:08 -0800 Subject: [PATCH 113/248] cart purchase fails when info isnt filled out (and tests) --- app/models/cart.rb | 3 +++ test/fixtures/carts.yml | 4 ++-- test/models/cart_test.rb | 15 +++++++++++++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/app/models/cart.rb b/app/models/cart.rb index 1fa42aee46..b1cb8adab2 100644 --- a/app/models/cart.rb +++ b/app/models/cart.rb @@ -1,4 +1,7 @@ class Cart < ApplicationRecord has_many :cartitems has_many :products, through: :cartitems + + validates_presence_of :email, :mailing_address, :name, :cc_number, :cc_expiration, :cc_cvv, :zip, :if => lambda {self.status != "pending"} + end diff --git a/test/fixtures/carts.yml b/test/fixtures/carts.yml index dfc6ce8655..0e44767fd3 100644 --- a/test/fixtures/carts.yml +++ b/test/fixtures/carts.yml @@ -1,9 +1,9 @@ cart0: - status: available + status: pending email: ada@adadev.org mailing_address: 315 5th Ave S Suite 200, Seattle, WA 98104 name: ada cc_number: "1234 5678 9123 4567" cc_expiration: "12/2021" cc_cvv: 111 - zip: 98104 \ No newline at end of file + zip: 98104 diff --git a/test/models/cart_test.rb b/test/models/cart_test.rb index 57ac424095..72ee8c7374 100644 --- a/test/models/cart_test.rb +++ b/test/models/cart_test.rb @@ -21,8 +21,19 @@ end describe "validations" do - it "requires billing information about customer when status is paid" do - skip + it "requires billing information and mailing information about customer when status is not pending" do + @cart.email = nil + @cart.mailing_address = nil + @cart.name = nil + @cart.cc_number = nil + @cart.cc_expiration = nil + @cart.cc_cvv = nil + @cart.zip = nil + + ["paid", "complete", "cancelled"].each do |status| + @cart.status = status + expect(@cart.valid?).must_equal false + end end end From c848f86e3d9c1dfd031b01ef1547469f831962d7 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Fri, 20 Nov 2020 17:19:03 -0800 Subject: [PATCH 114/248] display poorly formatted error messages when order purchase validations not met --- app/controllers/carts_controller.rb | 13 ++++++++++--- app/views/carts/purchase_form.html.erb | 10 +++++----- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/app/controllers/carts_controller.rb b/app/controllers/carts_controller.rb index 035b12166a..a0a0478c56 100644 --- a/app/controllers/carts_controller.rb +++ b/app/controllers/carts_controller.rb @@ -11,20 +11,27 @@ def purchase_form def purchase @cart = @current_cart + # have to change order type first in order for validation to hold.. + # updates local variable but not database + @cart.assign_attributes(status: "paid") + # raise if @cart.update(cart_params) - @cart.status = "paid" @cart.save - flash[:success] = "your stuff was ordered" + flash[:success] = "Your order has been placed!" session[:cart_id] = nil current_cart redirect_to root_path return else - flash.now[:error] = "your stuff wasnt ordered" + flash.now[:error] = "There was an error in placing your order" + flash.now[:error_message] = @cart.errors.messages render :purchase_form, status: :bad_request return end + end + + def view_confirmation end diff --git a/app/views/carts/purchase_form.html.erb b/app/views/carts/purchase_form.html.erb index a7f94ff711..9963c5564d 100644 --- a/app/views/carts/purchase_form.html.erb +++ b/app/views/carts/purchase_form.html.erb @@ -10,7 +10,7 @@
<%= f.label :email_address %> - <%= f.text_field :email_address %> + <%= f.text_field :email %>
@@ -20,22 +20,22 @@
<%= f.label :zipcode %> - <%= f.text_field :zipcode %> + <%= f.text_field :zip %>
<%= f.label :credit_card_number %> - <%= f.text_field :credit_card_number %> + <%= f.text_field :cc_number %>
<%= f.label :credit_card_expiration %> - <%= f.text_field :credit_card_expiration %> + <%= f.text_field :cc_expiration %>
<%= f.label :cvv %> - <%= f.text_field :cvv %> + <%= f.text_field :cc_cvv %>
From 8d2087aabb36a71cd2608a246d0857a272564624 Mon Sep 17 00:00:00 2001 From: r-spiel Date: Fri, 20 Nov 2020 23:53:04 -0800 Subject: [PATCH 115/248] refactor the new category form add @category to the application controller --- app/controllers/application_controller.rb | 6 +++++- app/views/layouts/application.html.erb | 5 +---- app/views/products/_new_category.html.erb | 4 ++++ app/views/products/edit.html.erb | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 app/views/products/_new_category.html.erb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index aceb81be27..9845d4a5a9 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,6 +1,6 @@ class ApplicationController < ActionController::Base - before_action :current_cart, :current_user, :categories, :merchants + before_action :current_cart, :current_user, :categories, :merchants, :category def categories @categories = Category.all @@ -10,6 +10,10 @@ def merchants @merchants = User.merchants end + def category + @category = Category.new + end + def current_user # return user matching id from session variable if session[:user_id] diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 6ead70d359..0af4aee515 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -55,10 +55,7 @@
<% if session[:user_id] %> - <%= form_with model: Category.new do |f| %> - <%= f.text_field :name, placeholder: "New Category" %> - <%= f.submit :submit %> - <% end %> + <%= render partial: 'new_category', locals: {action_name: "New"} %> <% end %>
diff --git a/app/views/products/_new_category.html.erb b/app/views/products/_new_category.html.erb new file mode 100644 index 0000000000..cc8aa51036 --- /dev/null +++ b/app/views/products/_new_category.html.erb @@ -0,0 +1,4 @@ +<%= form_with model: @category do |f| %> + <%= f.text_field :name, placeholder: "New Category" %> + <%= f.submit :submit %> +<% end %> \ No newline at end of file diff --git a/app/views/products/edit.html.erb b/app/views/products/edit.html.erb index be4e2eee10..0003251c25 100644 --- a/app/views/products/edit.html.erb +++ b/app/views/products/edit.html.erb @@ -10,6 +10,6 @@

Edit Product

-<%= render partial: 'form', locals: {action_name: "Update"} %> +<%= render partial: 'form', locals: {action_name: "New"} %> <%= link_to 'Show', @product %> <%= link_to 'Back', products_path %> \ No newline at end of file From 8577e3c8543fe5c74c03eb06da1b175485dabf62 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Sat, 21 Nov 2020 08:40:46 -0800 Subject: [PATCH 116/248] added new method to update inventory after a successful purchase --- app/controllers/carts_controller.rb | 3 +++ app/models/cart.rb | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/app/controllers/carts_controller.rb b/app/controllers/carts_controller.rb index 035b12166a..bff6f1bfd0 100644 --- a/app/controllers/carts_controller.rb +++ b/app/controllers/carts_controller.rb @@ -16,6 +16,9 @@ def purchase @cart.status = "paid" @cart.save flash[:success] = "your stuff was ordered" + + @cart.update_inventory + session[:cart_id] = nil current_cart redirect_to root_path diff --git a/app/models/cart.rb b/app/models/cart.rb index 1fa42aee46..7f2901c2be 100644 --- a/app/models/cart.rb +++ b/app/models/cart.rb @@ -1,4 +1,12 @@ class Cart < ApplicationRecord has_many :cartitems has_many :products, through: :cartitems + + def update_inventory + self.cartitems.each do |item| + product = item.product + product.inventory -= item.qty + product.save + end + end end From 226a27914050ca0d5a3e436bd406159fe97bbc26 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Sat, 21 Nov 2020 09:33:55 -0800 Subject: [PATCH 117/248] working on tests to inventory update and fixed flash success message for add to cart method --- app/controllers/products_controller.rb | 7 +++---- test/fixtures/cartitems.yml | 2 +- test/models/cart_test.rb | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 7aae282dca..b995e188d4 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -71,6 +71,7 @@ def add_to_cart # check if there is enough inventory if cart_item.qty < @product.inventory cart_item.qty += 1 + flash[:success] = "Successfully added to cart" else # not enough inventory flash[:error] = "Sorry, not enough inventory" @@ -78,13 +79,11 @@ def add_to_cart else # create a new cart item if it doesn't exist cart_item = Cartitem.new(cart: @current_cart, product: @product, qty: 1, cost: @product.cost ) - end - - # save the cart item and redirect back to the product show page - if cart_item.save flash[:success] = "Successfully added to cart" end + # save the cart item and redirect back to the product show page + cart_item.save redirect_back fallback_location: product_path(@product) end diff --git a/test/fixtures/cartitems.yml b/test/fixtures/cartitems.yml index 05c03a90d0..7f393dfcd5 100644 --- a/test/fixtures/cartitems.yml +++ b/test/fixtures/cartitems.yml @@ -7,4 +7,4 @@ cartitem1: qty: 4 cost: 101 cart: cart0 - product: product1 \ No newline at end of file + product: product2 \ No newline at end of file diff --git a/test/models/cart_test.rb b/test/models/cart_test.rb index 57ac424095..716f04c0a9 100644 --- a/test/models/cart_test.rb +++ b/test/models/cart_test.rb @@ -36,4 +36,24 @@ expect(@cart.products.length).must_equal 2 end end + + describe "update inventory" do + + it "updates the inventory after an order purchase" do + + product1 = @cartitem0.product + product2 = @cartitem1.product + expect(product1.inventory).must_equal 10 + expect(product2.inventory).must_equal 5 + + + @cart.update_inventory + + p @cart.cartitems.first.product + + + + end + + end end From 5193bae2284192bd098c063389fa27bb8f990eee Mon Sep 17 00:00:00 2001 From: Lina Do Date: Sat, 21 Nov 2020 09:53:28 -0800 Subject: [PATCH 118/248] save test progress --- test/models/cart_test.rb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/test/models/cart_test.rb b/test/models/cart_test.rb index 716f04c0a9..e3305883ed 100644 --- a/test/models/cart_test.rb +++ b/test/models/cart_test.rb @@ -49,7 +49,17 @@ @cart.update_inventory - p @cart.cartitems.first.product + p updated_product1 = @cart.cartitems.first.product + p updated_product2 = @cart.cartitems.last.product + + expect(updated_product1.id).must_equal product1.id + expect(updated_product1.inventory).must_equal 6 + expect(updated_product2.id).must_equal product2.id + expect(updated_product2.inventory).must_equal 1 + + Product.all.each do |x| + p x + end From e6618e5f07037fd817179c4f983884f1e26351bd Mon Sep 17 00:00:00 2001 From: Lina Do Date: Sat, 21 Nov 2020 10:04:03 -0800 Subject: [PATCH 119/248] was experimenting with the code but reverted back --- test/models/cart_test.rb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/test/models/cart_test.rb b/test/models/cart_test.rb index e3305883ed..7649e12e19 100644 --- a/test/models/cart_test.rb +++ b/test/models/cart_test.rb @@ -49,19 +49,15 @@ @cart.update_inventory - p updated_product1 = @cart.cartitems.first.product - p updated_product2 = @cart.cartitems.last.product + + updated_product1 = @cart.cartitems.first.product + updated_product2 = @cart.cartitems.last.product expect(updated_product1.id).must_equal product1.id expect(updated_product1.inventory).must_equal 6 expect(updated_product2.id).must_equal product2.id expect(updated_product2.inventory).must_equal 1 - Product.all.each do |x| - p x - end - - end From 75be81f1765936e11eeaf2de1ccefc3a1c76d156 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Sat, 21 Nov 2020 12:16:31 -0800 Subject: [PATCH 120/248] added a method to calculate the total for the cartitem, and the cart view page- added $ sign and round to 2 decimal places --- app/models/cartitem.rb | 4 ++++ app/views/carts/show.html.erb | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/models/cartitem.rb b/app/models/cartitem.rb index 8b770bd61e..32313f7055 100644 --- a/app/models/cartitem.rb +++ b/app/models/cartitem.rb @@ -1,4 +1,8 @@ class Cartitem < ApplicationRecord belongs_to :cart belongs_to :product + + def cartitem_total + return (self.qty * self.cost).round(2) + end end diff --git a/app/views/carts/show.html.erb b/app/views/carts/show.html.erb index 82c0f1bb18..51ea5cc4e4 100644 --- a/app/views/carts/show.html.erb +++ b/app/views/carts/show.html.erb @@ -23,7 +23,7 @@ <%= link_to item.product.name, product_path(item.product.id)%> - <%= item.cost %> +
$<%= '%.2f' %item.cost %>
<%= button_to "+", add_path(item.id) %> @@ -31,8 +31,7 @@ <%= button_to "-", reduce_path(item.id) %> - - <%= item.cost * item.qty %> +
$<%= '%.2f' %item.cartitem_total %>
<%= link_to "Remove", cartitem_path(item), method: :delete %> From 30a140b538cf2d5d5ba01ce1beb14ff1a29c0bca Mon Sep 17 00:00:00 2001 From: Lina Do Date: Sat, 21 Nov 2020 12:52:29 -0800 Subject: [PATCH 121/248] added a new migration to change product cost datatype tp float --- .../20201121205018_change_cost_datatype_for_products.rb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 db/migrate/20201121205018_change_cost_datatype_for_products.rb diff --git a/db/migrate/20201121205018_change_cost_datatype_for_products.rb b/db/migrate/20201121205018_change_cost_datatype_for_products.rb new file mode 100644 index 0000000000..e1eb8bf982 --- /dev/null +++ b/db/migrate/20201121205018_change_cost_datatype_for_products.rb @@ -0,0 +1,5 @@ +class ChangeCostDatatypeForProducts < ActiveRecord::Migration[6.0] + def change + change_column :products, :cost, :float + end +end From be6a5caa8bd4aa31d37beac91e26731821f0b2e5 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Sat, 21 Nov 2020 12:52:55 -0800 Subject: [PATCH 122/248] it would wouldnt it --- app/controllers/carts_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/carts_controller.rb b/app/controllers/carts_controller.rb index a0a0478c56..50aa95a641 100644 --- a/app/controllers/carts_controller.rb +++ b/app/controllers/carts_controller.rb @@ -18,6 +18,7 @@ def purchase # raise if @cart.update(cart_params) @cart.save + # it'd be nice to have a button link to their confirmation page too flash[:success] = "Your order has been placed!" session[:cart_id] = nil current_cart From 9dabf6122097bcb60fb9d10143757ba7d7a8ad7d Mon Sep 17 00:00:00 2001 From: Lina Do Date: Sat, 21 Nov 2020 12:54:49 -0800 Subject: [PATCH 123/248] added a new migration to change cartitem cost datatype tp float --- .../20201121205342_change_cost_datatype_for_cartitems.rb | 5 +++++ db/schema.rb | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20201121205342_change_cost_datatype_for_cartitems.rb diff --git a/db/migrate/20201121205342_change_cost_datatype_for_cartitems.rb b/db/migrate/20201121205342_change_cost_datatype_for_cartitems.rb new file mode 100644 index 0000000000..69357e9dad --- /dev/null +++ b/db/migrate/20201121205342_change_cost_datatype_for_cartitems.rb @@ -0,0 +1,5 @@ +class ChangeCostDatatypeForCartitems < ActiveRecord::Migration[6.0] + def change + change_column :cartitems, :cost, :float + end +end diff --git a/db/schema.rb b/db/schema.rb index 80b7868d1b..899067db2d 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_11_19_193849) do +ActiveRecord::Schema.define(version: 2020_11_21_205018) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -55,7 +55,7 @@ create_table "products", force: :cascade do |t| t.string "name" t.integer "inventory" - t.integer "cost" + t.float "cost" t.text "description" t.string "image" t.datetime "created_at", precision: 6, null: false From a500bb27df9cd9a9f7aafcf99160bb1f63225339 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Sat, 21 Nov 2020 13:28:08 -0800 Subject: [PATCH 124/248] a poorly formatted confirmation page yay --- app/controllers/carts_controller.rb | 4 ++-- app/views/carts/view_confirmation.html.erb | 1 + config/routes.rb | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 app/views/carts/view_confirmation.html.erb diff --git a/app/controllers/carts_controller.rb b/app/controllers/carts_controller.rb index 50aa95a641..ba5d1bca60 100644 --- a/app/controllers/carts_controller.rb +++ b/app/controllers/carts_controller.rb @@ -22,7 +22,7 @@ def purchase flash[:success] = "Your order has been placed!" session[:cart_id] = nil current_cart - redirect_to root_path + redirect_to view_confirmation_path(@cart.id) return else flash.now[:error] = "There was an error in placing your order" @@ -33,7 +33,7 @@ def purchase end def view_confirmation - + @old_cart = Cart.find(params[:id]) end private diff --git a/app/views/carts/view_confirmation.html.erb b/app/views/carts/view_confirmation.html.erb new file mode 100644 index 0000000000..a12e93617f --- /dev/null +++ b/app/views/carts/view_confirmation.html.erb @@ -0,0 +1 @@ +<%= @old_cart.name %> \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index a7db9a387b..1b1d56042d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -32,6 +32,7 @@ get 'carts/:id/purchase', to: "carts#purchase_form", as: "purchase_form" patch 'carts/:id', to: "carts#purchase" + get 'carts/:id/confirmation', to: "carts#view_confirmation", as: "view_confirmation" resources :cartitems, only:[:destroy] From ec388a12f816386cf30aafffd24a2e17f609342c Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Sat, 21 Nov 2020 13:49:25 -0800 Subject: [PATCH 125/248] committing so i can switch branches --- app/controllers/carts_controller.rb | 3 +-- app/views/carts/view_confirmation.html.erb | 7 ++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/carts_controller.rb b/app/controllers/carts_controller.rb index ba5d1bca60..4fdf93610c 100644 --- a/app/controllers/carts_controller.rb +++ b/app/controllers/carts_controller.rb @@ -18,7 +18,6 @@ def purchase # raise if @cart.update(cart_params) @cart.save - # it'd be nice to have a button link to their confirmation page too flash[:success] = "Your order has been placed!" session[:cart_id] = nil current_cart @@ -33,7 +32,7 @@ def purchase end def view_confirmation - @old_cart = Cart.find(params[:id]) + @ordered_cart = Cart.find(params[:id]) end private diff --git a/app/views/carts/view_confirmation.html.erb b/app/views/carts/view_confirmation.html.erb index a12e93617f..d15365fd09 100644 --- a/app/views/carts/view_confirmation.html.erb +++ b/app/views/carts/view_confirmation.html.erb @@ -1 +1,6 @@ -<%= @old_cart.name %> \ No newline at end of file +

This is Your Order

+ +<% @ordered_cart.cartitems.each do |cartitem| %> + <%= cartitem.product.name %> + <%= cartitem.qty %> +<% end %> \ No newline at end of file From 9881db1eebf7cab28f901a2899e13b438d42a056 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Sat, 21 Nov 2020 13:54:35 -0800 Subject: [PATCH 126/248] pulling linas schema change --- db/schema.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 899067db2d..5cb3356847 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,14 +10,14 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_11_21_205018) do +ActiveRecord::Schema.define(version: 2020_11_21_205342) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" create_table "cartitems", force: :cascade do |t| t.integer "qty" - t.integer "cost" + t.float "cost" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false t.bigint "cart_id" From e6741dff5c08c0ac86ce9d1e38c777f8826c2199 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Sat, 21 Nov 2020 13:57:16 -0800 Subject: [PATCH 127/248] update schema --- db/schema.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 899067db2d..5cb3356847 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,14 +10,14 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_11_21_205018) do +ActiveRecord::Schema.define(version: 2020_11_21_205342) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" create_table "cartitems", force: :cascade do |t| t.integer "qty" - t.integer "cost" + t.float "cost" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false t.bigint "cart_id" From 2d809bf6aeb17ab431dfea17cc4ad21da62f023a Mon Sep 17 00:00:00 2001 From: Lina Do Date: Sat, 21 Nov 2020 14:21:39 -0800 Subject: [PATCH 128/248] added total price method to cart model and added the total price to the cart show page --- app/models/cart.rb | 11 +++++++++++ app/models/cartitem.rb | 2 +- app/views/carts/show.html.erb | 3 ++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/models/cart.rb b/app/models/cart.rb index 7f2901c2be..b8b4f3c4b2 100644 --- a/app/models/cart.rb +++ b/app/models/cart.rb @@ -9,4 +9,15 @@ def update_inventory product.save end end + + def total_price + total_price = 0 + + self.cartitems.each do |item| + total_price += item.cartitem_subtotal + end + + return total_price + end + end diff --git a/app/models/cartitem.rb b/app/models/cartitem.rb index 32313f7055..bcf6ba2d73 100644 --- a/app/models/cartitem.rb +++ b/app/models/cartitem.rb @@ -2,7 +2,7 @@ class Cartitem < ApplicationRecord belongs_to :cart belongs_to :product - def cartitem_total + def cartitem_subtotal return (self.qty * self.cost).round(2) end end diff --git a/app/views/carts/show.html.erb b/app/views/carts/show.html.erb index 51ea5cc4e4..ad3e50911c 100644 --- a/app/views/carts/show.html.erb +++ b/app/views/carts/show.html.erb @@ -31,7 +31,7 @@ <%= button_to "-", reduce_path(item.id) %> -
$<%= '%.2f' %item.cartitem_total %>
+
$<%= '%.2f' %item.cartitem_subtotal %>
<%= link_to "Remove", cartitem_path(item), method: :delete %> @@ -41,5 +41,6 @@ <% end %> +

Total Cost: $<%= '%.2f' %@cart.total_price %>

<%= link_to 'Back', products_path %> \ No newline at end of file From 9e8e11b6f8ba1c4b282781b5d9fdcadeb1d7aab6 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Sat, 21 Nov 2020 14:25:33 -0800 Subject: [PATCH 129/248] added product owner model method --- app/assets/images/favicon-16x16.png | Bin 0 -> 596 bytes app/controllers/application_controller.rb | 1 - app/controllers/carts_controller.rb | 2 +- app/controllers/products_controller.rb | 11 +++++++++- app/controllers/users_controller.rb | 20 +++++++++---------- app/models/product.rb | 9 +++++++++ app/views/layouts/application.html.erb | 4 +++- app/views/products/index.html.erb | 2 +- test/controllers/products_controller_test.rb | 3 +-- test/controllers/users_controller_test.rb | 20 +++++++++++++++++++ 10 files changed, 55 insertions(+), 17 deletions(-) create mode 100644 app/assets/images/favicon-16x16.png diff --git a/app/assets/images/favicon-16x16.png b/app/assets/images/favicon-16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..c4a8042da899e33f0c1b8cd616be020c7826eb1e GIT binary patch literal 596 zcmV-a0;~OrP)X7ZI4f%-&f%O{IN{&Aa#8Vkjnt}w9$RBtF?g^z{G@T3x`+EKx)@W1_5YW z4oE(10bF`oIH1J!0wR5#R@>-XjAV*CJTB!mLxG}G9DQ!>T(|iMK%^5yfHhvsl?F7( zj9p`NI_i73X^Lg7>!fxE5cd|KdB$@~aR5^Q)lVTBCP5mj_EmEvuQpX$WJ0Fm<;dz-k4^l zbX?QqnDY;m$g9nsv%-4-{r`+8m@|irK_}FzEx}aSpKZ4WW7(x2B)Z!GR7I(7PepmL z-Bl3cwX#(r9rb@~);bydBG}cI&Wf>Kal2gG^u>*SjliVUwUT&wwzulk9KamGb8P@0 z%&>7Zk|_o}y4J|T(JA0|Ds0q)=Y?#sSEu$CK%fB;l&NrfDr(Hf^FRHNYN0h`yfH(@ z$vVKf;`v2Cls*P(eM0%HM4wEDcYm#$L>SL6F95RtFNAl^urJX7bo#RKtkn - Betsy + swEtsy <%= csrf_meta_tags %> <%= csp_meta_tag %> + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index 5129d3046d..b36ab0d6f1 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -18,7 +18,7 @@ <% @products.each do |product| %> <%= link_to product.name, product %> - <% if @current_user && product.user_id == @current_user.id %> + <% if product.owner(@current_user) %> <%= link_to 'Edit', edit_product_path(product) %> <%= link_to 'Delete', product_path(product), method: :delete, data: { confirm: 'Are you sure?' } %> <% end %> diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb index 90dcfb1981..39176c6387 100644 --- a/test/controllers/products_controller_test.rb +++ b/test/controllers/products_controller_test.rb @@ -10,8 +10,6 @@ @user = users(:ada) end - - let(:product) { Product.create( name: "leggings", user: @user, @@ -187,4 +185,5 @@ end + end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 7a8946c99e..62e05c5efc 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -60,6 +60,26 @@ end end + describe "Authentication" do + it "logged in users can add a new product" do + end + + it "logged in users can add a new category" do + + end + + end + + describe "Authorization" do + it "authorized users can edit their own products" do + + end + + it "authorized users can delete their own products" do + + end + + end end From ec23ff4f8514337754639662a8d756a4fc1fbc43 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Sat, 21 Nov 2020 14:26:45 -0800 Subject: [PATCH 130/248] added product owner model method to show 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 6feba20443..01c4f541b6 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -17,7 +17,7 @@ - <% if @current_user && @product.user_id == @current_user.id %> + <% if product.owner(@current_user) %> <%= link_to 'Edit', edit_product_path(@product) %> <%= link_to 'Delete', product_path(@product), method: :delete, data: { confirm: "Are you sure?"} %> <% end %> From 44309e3ac575164689afdf580e3d08c89b1c31e3 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Sat, 21 Nov 2020 14:27:58 -0800 Subject: [PATCH 131/248] added product owner model method to show 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 01c4f541b6..400dc8d8f9 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -17,7 +17,7 @@ - <% if product.owner(@current_user) %> + <% if @product.owner(@current_user) %> <%= link_to 'Edit', edit_product_path(@product) %> <%= link_to 'Delete', product_path(@product), method: :delete, data: { confirm: "Are you sure?"} %> <% end %> From 58778af8892472eb653f2ebaacdcb654b3faf37c Mon Sep 17 00:00:00 2001 From: Lina Do Date: Sat, 21 Nov 2020 14:35:45 -0800 Subject: [PATCH 132/248] round total price to 2 decimal places --- app/models/cart.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/cart.rb b/app/models/cart.rb index b8b4f3c4b2..7ef41f4c6a 100644 --- a/app/models/cart.rb +++ b/app/models/cart.rb @@ -17,7 +17,7 @@ def total_price total_price += item.cartitem_subtotal end - return total_price + return total_price.round(2) end end From 73298cf2b72f23a4503a343649fc872a7d1328d3 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Sat, 21 Nov 2020 14:48:13 -0800 Subject: [PATCH 133/248] added a test for cartitem subtotal method --- test/models/cartitem_test.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/test/models/cartitem_test.rb b/test/models/cartitem_test.rb index f49c34f598..c7697f080f 100644 --- a/test/models/cartitem_test.rb +++ b/test/models/cartitem_test.rb @@ -30,4 +30,16 @@ expect(@cartitem.product).must_equal @product end end + + describe "cartitem subtotal" do + + it "can calculate the subtotal for the cartitem" do + + item1 = cartitems(:cartitem0) + item2 = cartitems(:cartitem1) + + expect(item1.cartitem_subtotal).must_equal 400.00 + expect(item2.cartitem_subtotal).must_equal 404.00 + end + end end From 13cdffc2e38de748aea32f04c33aa4faeb48fff0 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Sat, 21 Nov 2020 15:12:58 -0800 Subject: [PATCH 134/248] added a test for total price and added new carts and cart items fixture data --- test/fixtures/cartitems.yml | 17 ++++++++++++++++- test/fixtures/carts.yml | 20 +++++++++++++++++++- test/models/cart_test.rb | 12 ++++++++++++ 3 files changed, 47 insertions(+), 2 deletions(-) diff --git a/test/fixtures/cartitems.yml b/test/fixtures/cartitems.yml index 7f393dfcd5..fd4ca1b9cd 100644 --- a/test/fixtures/cartitems.yml +++ b/test/fixtures/cartitems.yml @@ -7,4 +7,19 @@ cartitem1: qty: 4 cost: 101 cart: cart0 - product: product2 \ No newline at end of file + product: product2 +cartitem2: + qty: 2 + cost: 1500 + cart: cart1 + product: product3 +cartitem3: + qty: 2 + cost: 700 + cart: cart1 + product: product4 +cartitem4: + qty: 3 + cost: 500 + cart: cart2 + product: product5 \ No newline at end of file diff --git a/test/fixtures/carts.yml b/test/fixtures/carts.yml index dfc6ce8655..719e2268a7 100644 --- a/test/fixtures/carts.yml +++ b/test/fixtures/carts.yml @@ -6,4 +6,22 @@ cart0: cc_number: "1234 5678 9123 4567" cc_expiration: "12/2021" cc_cvv: 111 - zip: 98104 \ No newline at end of file + zip: 98104 +cart1: + status: available + email: locomoco@adadev.org + mailing_address: 1834 S 211th St, Seattle, WA 98122 + name: Sally Carter + cc_number: "1234 2734 4332 7876" + cc_expiration: "12/2025" + cc_cvv: 098 + zip: 98122 +cart2: + status: available + email: b.loaf222@gmail.com + mailing_address: 2019 SW 10th St, Seattle, WA 98107 + name: Bobby Loaf + cc_number: "1234 4723 4332 7346" + cc_expiration: "10/2022" + cc_cvv: 305 + zip: 98107 \ No newline at end of file diff --git a/test/models/cart_test.rb b/test/models/cart_test.rb index 7649e12e19..f1a72042f6 100644 --- a/test/models/cart_test.rb +++ b/test/models/cart_test.rb @@ -62,4 +62,16 @@ end end + + describe "total price" do + it "can calculate the total price of the cartitems" do + cart1 = carts(:cart0) + cart2 = carts(:cart1) + cart3 = carts(:cart2) + expect(cart1.total_price).must_equal 804.00 + expect(cart2.total_price).must_equal 4400.00 + expect(cart3.total_price).must_equal 1500.00 + end + + end end From f201700e13d8fc8775fecd84ba77dd90f74896c3 Mon Sep 17 00:00:00 2001 From: r-spiel Date: Sat, 21 Nov 2020 15:13:37 -0800 Subject: [PATCH 135/248] update new category form partial, only in layouts folder' --- app/controllers/application_controller.rb | 2 +- app/views/{products => layouts}/_new_category.html.erb | 2 +- app/views/layouts/application.html.erb | 2 +- db/schema.rb | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) rename app/views/{products => layouts}/_new_category.html.erb (67%) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 9845d4a5a9..cc2cc16ed6 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -11,7 +11,7 @@ def merchants end def category - @category = Category.new + @category_new = Category.new end def current_user diff --git a/app/views/products/_new_category.html.erb b/app/views/layouts/_new_category.html.erb similarity index 67% rename from app/views/products/_new_category.html.erb rename to app/views/layouts/_new_category.html.erb index cc8aa51036..2555ff1d99 100644 --- a/app/views/products/_new_category.html.erb +++ b/app/views/layouts/_new_category.html.erb @@ -1,4 +1,4 @@ -<%= form_with model: @category do |f| %> +<%= form_with model: @category_new do |f| %> <%= f.text_field :name, placeholder: "New Category" %> <%= f.submit :submit %> <% end %> \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 0af4aee515..1eeaca0912 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -55,7 +55,7 @@
<% if session[:user_id] %> - <%= render partial: 'new_category', locals: {action_name: "New"} %> + <%= render partial: '/layouts/new_category', locals: {action_name: "New"} %> <% end %>
diff --git a/db/schema.rb b/db/schema.rb index 899067db2d..5cb3356847 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,14 +10,14 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_11_21_205018) do +ActiveRecord::Schema.define(version: 2020_11_21_205342) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" create_table "cartitems", force: :cascade do |t| t.integer "qty" - t.integer "cost" + t.float "cost" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false t.bigint "cart_id" From 2b6e9158d56c997fa2f324946078fb119bb0179b Mon Sep 17 00:00:00 2001 From: Lina Do Date: Sat, 21 Nov 2020 15:21:37 -0800 Subject: [PATCH 136/248] added another test for total price, return 0 for no cart items listed --- test/models/cart_test.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/models/cart_test.rb b/test/models/cart_test.rb index f1a72042f6..0f4553cad7 100644 --- a/test/models/cart_test.rb +++ b/test/models/cart_test.rb @@ -73,5 +73,15 @@ expect(cart3.total_price).must_equal 1500.00 end + it "should return 0 if there are no cart items" do + + cart1 = carts(:cart0) + + cart1.cartitems.destroy_all + expect(cart1.cartitems).must_be_empty + expect(cart1.total_price).must_equal 0 + + end + end end From f3ba5ac0484a64324365938db9ccb1fa5e57d748 Mon Sep 17 00:00:00 2001 From: r-spiel Date: Sat, 21 Nov 2020 15:40:16 -0800 Subject: [PATCH 137/248] update user dashboard page --- app/views/users/current.html.erb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/views/users/current.html.erb b/app/views/users/current.html.erb index 85bca5d1cc..2fca746d1d 100644 --- a/app/views/users/current.html.erb +++ b/app/views/users/current.html.erb @@ -21,8 +21,14 @@

Consider adding some products to sell!

<% end %> -

COMING SOON:

-

LINK TO: Create a new category

-

COMING SOON! Link to: Order Fulfillment:

+

Order Fulfillment:

+ +
Pending orders: *orders that are in a customer's cart*
+ +
Confirmed orders: *customer has paid, waiting for shipment*
+

*orders that have not shipped are not included in the Merchant sales report

+ +
Complete orders: *order has shipped*
+

Detailed list of products sold, Order status ("pending", "paid", "complete", "cancelled"), fulfillment (can transition an order to be shipped). Link to - indiv order to see name/mailing/last for of cc etc.

\ No newline at end of file From 8de967e46a4d7b7d3471ec30734cd0fad879ca0b Mon Sep 17 00:00:00 2001 From: r-spiel Date: Sat, 21 Nov 2020 15:56:39 -0800 Subject: [PATCH 138/248] revert back action_name in product edit page partial render --- app/views/products/edit.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/products/edit.html.erb b/app/views/products/edit.html.erb index 0003251c25..be4e2eee10 100644 --- a/app/views/products/edit.html.erb +++ b/app/views/products/edit.html.erb @@ -10,6 +10,6 @@

Edit Product

-<%= render partial: 'form', locals: {action_name: "New"} %> +<%= render partial: 'form', locals: {action_name: "Update"} %> <%= link_to 'Show', @product %> <%= link_to 'Back', products_path %> \ No newline at end of file From 785c8bfce3a7e886b5e36d56342abf1158c29ffd Mon Sep 17 00:00:00 2001 From: r-spiel Date: Sat, 21 Nov 2020 16:07:15 -0800 Subject: [PATCH 139/248] update application html --- app/views/layouts/application.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 1eeaca0912..b462b571ce 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -55,7 +55,7 @@
<% if session[:user_id] %> - <%= render partial: '/layouts/new_category', locals: {action_name: "New"} %> + <%= render partial: '/layouts/new_category' %> <% end %>
From 4ada28fd063e2f50fcdd236df86c47f1d9319391 Mon Sep 17 00:00:00 2001 From: r-spiel Date: Sat, 21 Nov 2020 16:39:28 -0800 Subject: [PATCH 140/248] Add indirect relationship: user has many cart_items thru product --- app/controllers/users_controller.rb | 2 +- app/models/user.rb | 1 + app/views/users/current.html.erb | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 56be997dae..1d0c6a510b 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -26,8 +26,8 @@ def destroy end def current - @current_user = User.find_by(id: session[:user_id]) @current_user_products = @current_user.products + @current_user_cart_items = @current_user.cartitems unless @current_user flash[:error] = "You must be logged in to see this page" diff --git a/app/models/user.rb b/app/models/user.rb index b5739e2e79..c35b449001 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,5 +1,6 @@ class User < ApplicationRecord has_many :products + has_many :cartitems, through: :products validates :uid, uniqueness: { scope: :provider}, presence: true validates :username, presence: true, uniqueness: true diff --git a/app/views/users/current.html.erb b/app/views/users/current.html.erb index 2fca746d1d..43d43c086f 100644 --- a/app/views/users/current.html.erb +++ b/app/views/users/current.html.erb @@ -23,7 +23,11 @@

Order Fulfillment:

- +<% @current_user_cart_items.each do |cart_item| %> +
    +
  • <%= cart_item.product.name %>
    • +
+<% end %>
Pending orders: *orders that are in a customer's cart*
Confirmed orders: *customer has paid, waiting for shipment*
From fae592dc3441086392503e88669523a2f057ca19 Mon Sep 17 00:00:00 2001 From: r-spiel Date: Sat, 21 Nov 2020 16:50:00 -0800 Subject: [PATCH 141/248] migration to add column fulfillment_status to cartitems table --- .../20201122004311_add_fulfillment_status_to_cartitems.rb | 5 +++++ db/schema.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20201122004311_add_fulfillment_status_to_cartitems.rb diff --git a/db/migrate/20201122004311_add_fulfillment_status_to_cartitems.rb b/db/migrate/20201122004311_add_fulfillment_status_to_cartitems.rb new file mode 100644 index 0000000000..eaf1b803a7 --- /dev/null +++ b/db/migrate/20201122004311_add_fulfillment_status_to_cartitems.rb @@ -0,0 +1,5 @@ +class AddFulfillmentStatusToCartitems < ActiveRecord::Migration[6.0] + def change + add_column :cartitems, :fulfillment_status, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 5cb3356847..2268435fdc 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_11_21_205342) do +ActiveRecord::Schema.define(version: 2020_11_22_004311) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -22,6 +22,7 @@ t.datetime "updated_at", precision: 6, null: false t.bigint "cart_id" t.bigint "product_id" + t.string "fulfillment_status" t.index ["cart_id"], name: "index_cartitems_on_cart_id" t.index ["product_id"], name: "index_cartitems_on_product_id" end From daa308267991fe51576eca2cdac7ef4d2defd7e2 Mon Sep 17 00:00:00 2001 From: r-spiel Date: Sat, 21 Nov 2020 20:52:54 -0800 Subject: [PATCH 142/248] fulfillment method to get merchant orders by cart status --- app/controllers/application_controller.rb | 18 ++++++++++++++++++ app/controllers/users_controller.rb | 12 ++++++++++++ app/models/cart.rb | 2 ++ app/models/user.rb | 2 ++ app/views/users/current.html.erb | 1 + app/views/users/fulfillment.html.erb | 20 ++++++++++++++++++++ config/routes.rb | 1 + 7 files changed, 56 insertions(+) create mode 100644 app/views/users/fulfillment.html.erb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index cc2cc16ed6..d5d14bca96 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -43,4 +43,22 @@ def current_cart end end + def merchant_orders(user, status) + #from a user's cartitems, return the carts associated that have a certain cart status + return nil if user.cartitems.nil? + + merchant_cartitems = user.cartitems + + selected_carts = [] + current_cart_id = nil + + merchant_cartitems.each do |item| + if item.cart.status == status && item.cart.id != current_cart_id + selected_carts << item.cart + current_cart_id = item.cart.id + end + end + return selected_carts + end + end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 1d0c6a510b..a530819db5 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -35,4 +35,16 @@ def current return end end + + def fulfillment + + @pending_orders = merchant_orders(@current_user, status = "pending") + + unless @current_user + flash[:error] = "You must be logged in to see this page" + redirect_to root_path + return + end + end + end diff --git a/app/models/cart.rb b/app/models/cart.rb index 7ef41f4c6a..3a942c53d2 100644 --- a/app/models/cart.rb +++ b/app/models/cart.rb @@ -20,4 +20,6 @@ def total_price return total_price.round(2) end + + end diff --git a/app/models/user.rb b/app/models/user.rb index c35b449001..a709624db1 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -28,4 +28,6 @@ def self.merchants return @merchants end + + end diff --git a/app/views/users/current.html.erb b/app/views/users/current.html.erb index 43d43c086f..9c1f347756 100644 --- a/app/views/users/current.html.erb +++ b/app/views/users/current.html.erb @@ -22,6 +22,7 @@ <% end %> +<%= link_to 'Fulfillment Page', current_user_fulfillment_path %>

Order Fulfillment:

<% @current_user_cart_items.each do |cart_item| %>
    diff --git a/app/views/users/fulfillment.html.erb b/app/views/users/fulfillment.html.erb new file mode 100644 index 0000000000..e7f7be1070 --- /dev/null +++ b/app/views/users/fulfillment.html.erb @@ -0,0 +1,20 @@ +

    Fulfillment Page for <%= @current_user.username %>

    + +

    Order Fulfillment:

    + +
    PENDING ORDERS: *orders in a customer's cart*
    +<% if @pending_orders %> + + <% @pending_orders.each do |cart| %> + + Cart ID: <%= cart.id %> ~ Cart Status: <%= cart.status %> + Items in this cart: + <% cart.cartitems.each do |item| %> + <%= item.product.name %><%= item.cost %> + <% end %> +

    ~~~~~~~~~~~~~~

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

    No pending orders yet!

    +<% end %> diff --git a/config/routes.rb b/config/routes.rb index a7db9a387b..aa612152a8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -24,6 +24,7 @@ # User routes delete "/logout", to: "users#destroy", as: "logout" get "/users/current", to: "users#current", as: "current_user" + get "/users/current/fulfillment", to: "users#fulfillment", as: "current_user_fulfillment" # Nested Route (not tested) - to link to separate page for current user products #get "/user/:user_id/products", to: "products#index", as: "current_user_products" From d4ba4b3c74fcec93c415b8087dd13b015be76151 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Sat, 21 Nov 2020 21:03:32 -0800 Subject: [PATCH 143/248] committing so i can switch branches --- app/views/carts/view_confirmation.html.erb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/views/carts/view_confirmation.html.erb b/app/views/carts/view_confirmation.html.erb index d15365fd09..dfe39ebab8 100644 --- a/app/views/carts/view_confirmation.html.erb +++ b/app/views/carts/view_confirmation.html.erb @@ -1,6 +1,12 @@

    This is Your Order

    -<% @ordered_cart.cartitems.each do |cartitem| %> +
      +
    • <% @ordered_cart.cartitems.each do |cartitem| %> + <%# link_to, cartitem.product.name, product_path() %> <%= cartitem.product.name %> <%= cartitem.qty %> -<% end %> \ No newline at end of file + <%# TODO: cartitem subtotal %> + +<% end %> +
      • +
    \ No newline at end of file From b6d269d320c8dae479ee64bcdbd4e546ba5a167d Mon Sep 17 00:00:00 2001 From: r-spiel Date: Sat, 21 Nov 2020 21:21:30 -0800 Subject: [PATCH 144/248] updates to views --- app/controllers/users_controller.rb | 3 ++- app/views/users/current.html.erb | 20 +++------------ app/views/users/fulfillment.html.erb | 38 ++++++++++++++++++++++++++-- 3 files changed, 42 insertions(+), 19 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index a530819db5..8d09113ef7 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -27,7 +27,6 @@ def destroy def current @current_user_products = @current_user.products - @current_user_cart_items = @current_user.cartitems unless @current_user flash[:error] = "You must be logged in to see this page" @@ -39,6 +38,8 @@ def current def fulfillment @pending_orders = merchant_orders(@current_user, status = "pending") + @paid_orders = merchant_orders(@current_user, status = "paid") + @complete_orders = merchant_orders(@current_user, status = "complete") unless @current_user flash[:error] = "You must be logged in to see this page" diff --git a/app/views/users/current.html.erb b/app/views/users/current.html.erb index 9c1f347756..067ea3d978 100644 --- a/app/views/users/current.html.erb +++ b/app/views/users/current.html.erb @@ -5,6 +5,10 @@

    <%= "EMAIL: #{@current_user.email}" %>

    MERCHANT DASHBOARD

    + +

    Sales Details & Fulfillment:

    +<%= link_to 'Fulfillment Page', current_user_fulfillment_path %> +

    Shop Items:

    <%= link_to 'Add New Product', new_product_path %> @@ -21,19 +25,3 @@

    Consider adding some products to sell!

    <% end %>
    - -<%= link_to 'Fulfillment Page', current_user_fulfillment_path %> -

    Order Fulfillment:

    -<% @current_user_cart_items.each do |cart_item| %> -
      -
    • <%= cart_item.product.name %>
      • -
    -<% end %> -
    Pending orders: *orders that are in a customer's cart*
    - -
    Confirmed orders: *customer has paid, waiting for shipment*
    -

    *orders that have not shipped are not included in the Merchant sales report

    - -
    Complete orders: *order has shipped*
    - -

    Detailed list of products sold, Order status ("pending", "paid", "complete", "cancelled"), fulfillment (can transition an order to be shipped). Link to - indiv order to see name/mailing/last for of cc etc.

    \ No newline at end of file diff --git a/app/views/users/fulfillment.html.erb b/app/views/users/fulfillment.html.erb index e7f7be1070..89fffc82ca 100644 --- a/app/views/users/fulfillment.html.erb +++ b/app/views/users/fulfillment.html.erb @@ -3,14 +3,14 @@

    Order Fulfillment:

    PENDING ORDERS: *orders in a customer's cart*
    -<% if @pending_orders %> +<% if @pending_orders.any? %> <% @pending_orders.each do |cart| %> Cart ID: <%= cart.id %> ~ Cart Status: <%= cart.status %> Items in this cart: <% cart.cartitems.each do |item| %> - <%= item.product.name %><%= item.cost %> + <%= item.product.name %><%= item.cost %>, <% end %>

    ~~~~~~~~~~~~~~

    @@ -18,3 +18,37 @@ <% else %>

    No pending orders yet!

    <% end %> + +
    PAID ORDERS: *order is confirmed and paid, waiting for merchant to ship*
    +<% if @paid_orders.any? %> + + <% @paid_orders.each do |cart| %> + + Cart ID: <%= cart.id %> ~ Cart Status: <%= cart.status %> + Items in this cart: + <% cart.cartitems.each do |item| %> + <%= item.product.name %><%= item.cost %> + <% end %> +

    ~~~~~~~~~~~~~~

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

    No paid orders yet!

    +<% end %> + +
    COMPLETE ORDERS: *customer's entire order has been shipped*
    +<% if @complete_orders.any? %> + + <% @complete_orders.each do |cart| %> + + Cart ID: <%= cart.id %> ~ Cart Status: <%= cart.status %> + Items in this cart: + <% cart.cartitems.each do |item| %> + <%= item.product.name %><%= item.cost %> + <% end %> +

    ~~~~~~~~~~~~~~

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

    No completed orders yet!

    +<% end %> \ No newline at end of file From 1da3c16e5cc3ff73cbc181716bbbbb0bdd343872 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Sat, 21 Nov 2020 22:30:04 -0800 Subject: [PATCH 145/248] tests are weird --- app/views/carts/view_confirmation.html.erb | 18 +++++--- config/routes.rb | 1 - test/controllers/carts_controller_test.rb | 49 +++++++++++++++++++--- test/fixtures/carts.yml | 7 ---- 4 files changed, 55 insertions(+), 20 deletions(-) diff --git a/app/views/carts/view_confirmation.html.erb b/app/views/carts/view_confirmation.html.erb index dfe39ebab8..ba6862bbf6 100644 --- a/app/views/carts/view_confirmation.html.erb +++ b/app/views/carts/view_confirmation.html.erb @@ -1,12 +1,18 @@ -

    This is Your Order

    +

    Order Confirmation

    + +

    Order placed: <%# %>

    • <% @ordered_cart.cartitems.each do |cartitem| %> - <%# link_to, cartitem.product.name, product_path() %> - <%= cartitem.product.name %> + <%= link_to cartitem.product.name, product_path(cartitem.product.id) %>, + quantity purchased: <%= cartitem.qty %> - <%# TODO: cartitem subtotal %> - + + <%# cartitem.cartitem_subtotal%> <% end %>
      • -
    \ No newline at end of file +
+ + +

Order total price: <%#@ordered_cart.total_price %>

+

Order current status: <%= @ordered_cart.status %>

\ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 1b1d56042d..dc51ffe6b7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -31,7 +31,6 @@ get 'carts/:id', to: "carts#show", as: "cart" get 'carts/:id/purchase', to: "carts#purchase_form", as: "purchase_form" patch 'carts/:id', to: "carts#purchase" - get 'carts/:id/confirmation', to: "carts#view_confirmation", as: "view_confirmation" resources :cartitems, only:[:destroy] diff --git a/test/controllers/carts_controller_test.rb b/test/controllers/carts_controller_test.rb index 4983dcc5c4..fb60032341 100644 --- a/test/controllers/carts_controller_test.rb +++ b/test/controllers/carts_controller_test.rb @@ -2,6 +2,23 @@ describe CartsController do + before do + @cart = carts(:cart0) + end + + let(:paid_cart_hash){ + { + cart: { + email: "ada@adadev.org", + mailing_address: "315 5th Ave S Suite 200, Seattle, WA 98104", + name: "ada", + cc_number: "1234 5678 9123 4567", + cc_expiration: "12/2021", + cc_cvv: "111", + zip: "98104"}, + } + } + describe 'current cart' do it "creates a new cart when visiting the site for the first time" do @@ -55,20 +72,40 @@ describe "purchase" do - it "can purchase a cart for a logged in user" do + it "can purchase a cart for a guest" do skip + # why doesnt this work + # puts session[:cart_id] + patch cart_path(@cart.id), params: paid_cart_hash + puts session[:cart_id] + # why is this still pending? + puts @cart.status + # skip # updates cart status # check flash message # make sure cart empties # make sure redirects correctly end - it "can purchase a cart for a guest user" do + it "can purchase a cart for a logged in user" do + perform_login + + # the fixture doesnt work here? why? + cart = session[:cart_id] + + patch cart_path(cart), params: paid_cart_hash + + new_cart = Cart.find(cart) + + expect(flash[:success]).must_equal "Your order has been placed!" + expect(new_cart.status).must_equal "paid" + must_redirect_to view_confirmation_path(new_cart.id) + expect(Cart.find(session[:cart_id]).cartitems.length).must_equal 0 + + end + + it "redirects when there's an issue with placing the order" do skip - # updates cart status - # check flash message - # make sure cart empties - # make sure redirects correctly end end diff --git a/test/fixtures/carts.yml b/test/fixtures/carts.yml index 0e44767fd3..62e987af17 100644 --- a/test/fixtures/carts.yml +++ b/test/fixtures/carts.yml @@ -1,9 +1,2 @@ cart0: status: pending - email: ada@adadev.org - mailing_address: 315 5th Ave S Suite 200, Seattle, WA 98104 - name: ada - cc_number: "1234 5678 9123 4567" - cc_expiration: "12/2021" - cc_cvv: 111 - zip: 98104 From ce82d1808588aeb95e9eb750327b546edfc885de Mon Sep 17 00:00:00 2001 From: Lina Do Date: Sat, 21 Nov 2020 23:19:04 -0800 Subject: [PATCH 146/248] when a product's price changes, made sure to change cartitems in pending cart to reflect that change --- app/controllers/products_controller.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index b995e188d4..f5d5921524 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -47,6 +47,14 @@ def update if @product.update(product_params) flash[:success] = 'Product was successfully updated!' redirect_to product_path(@product) + # update cartitems that are in carts with the status pending + cartitems = Cartitem.where(product: @product) + cartitems.each do |item| + if item.cart.status == "pending" + item.cost = @product.cost + item.save + end + end return else flash.now[:failure] = "Product was not successfully updated." From 456fb8356ba6971962e227925d2181dc46613523 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Sat, 21 Nov 2020 23:25:42 -0800 Subject: [PATCH 147/248] turned it into a model method in products, update cartitems method --- app/controllers/products_controller.rb | 11 +++-------- app/models/product.rb | 11 +++++++++++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index f5d5921524..1c7b33a3fb 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -45,16 +45,11 @@ def create def update if @product.update(product_params) + # update prices for cartitems in carts with the status pending + @product.update_cartitems flash[:success] = 'Product was successfully updated!' redirect_to product_path(@product) - # update cartitems that are in carts with the status pending - cartitems = Cartitem.where(product: @product) - cartitems.each do |item| - if item.cart.status == "pending" - item.cost = @product.cost - item.save - end - end + return else flash.now[:failure] = "Product was not successfully updated." diff --git a/app/models/product.rb b/app/models/product.rb index 818a749487..9fb486fae8 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -6,4 +6,15 @@ class Product < ApplicationRecord validates :name, :description, :image, presence: true validates :inventory, :cost, presence: true, numericality: true validates :category_ids, presence: true + + def update_cartitems + # update prices for cartitems in carts with the status pending + cartitems = Cartitem.where(product: self) + cartitems.each do |item| + if item.cart.status == "pending" + item.cost = self.cost + item.save + end + end + end end From afa1fcf0dadf36801c47fcb61aed2ab7205bfdbf Mon Sep 17 00:00:00 2001 From: Lina Do Date: Sun, 22 Nov 2020 00:09:13 -0800 Subject: [PATCH 148/248] added tests for update cartitems method --- app/controllers/products_controller.rb | 1 - test/fixtures/cartitems.yml | 7 +++- test/fixtures/carts.yml | 6 ++-- test/models/product_test.rb | 47 ++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 4 deletions(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 1c7b33a3fb..5f409b8c87 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -49,7 +49,6 @@ def update @product.update_cartitems flash[:success] = 'Product was successfully updated!' redirect_to product_path(@product) - return else flash.now[:failure] = "Product was not successfully updated." diff --git a/test/fixtures/cartitems.yml b/test/fixtures/cartitems.yml index fd4ca1b9cd..be4ac40a62 100644 --- a/test/fixtures/cartitems.yml +++ b/test/fixtures/cartitems.yml @@ -22,4 +22,9 @@ cartitem4: qty: 3 cost: 500 cart: cart2 - product: product5 \ No newline at end of file + product: product5 +cartitem5: + qty: 3 + cost: 1500 + cart: cart3 + product: product3 diff --git a/test/fixtures/carts.yml b/test/fixtures/carts.yml index 719e2268a7..49c0d24dea 100644 --- a/test/fixtures/carts.yml +++ b/test/fixtures/carts.yml @@ -17,11 +17,13 @@ cart1: cc_cvv: 098 zip: 98122 cart2: - status: available + status: paid email: b.loaf222@gmail.com mailing_address: 2019 SW 10th St, Seattle, WA 98107 name: Bobby Loaf cc_number: "1234 4723 4332 7346" cc_expiration: "10/2022" cc_cvv: 305 - zip: 98107 \ No newline at end of file + zip: 98107 +cart3: + status: pending diff --git a/test/models/product_test.rb b/test/models/product_test.rb index 6977718e14..c4c4e5ff83 100644 --- a/test/models/product_test.rb +++ b/test/models/product_test.rb @@ -4,4 +4,51 @@ # it "does a thing" do # value(1+1).must_equal 2 # end + + describe "update cartitems" do + it "can update a cartitems cost to match the product and the cart status must be pending" do + # choose a product and change cost + product = products(:product3) + product.cost = 4234.00 + product.save + + + # cartitem of the product above + cartitem = cartitems(:cartitem5) + + # assert + product.update_cartitems + + updated_cartitem = Cartitem.find_by(id: cartitem.id) + + expect(updated_cartitem.id).must_equal cartitem.id + expect(updated_cartitem.cart).must_equal cartitem.cart + expect(updated_cartitem.product).must_equal product + expect(updated_cartitem.cart.status).must_equal "pending" + expect(updated_cartitem.cost).must_equal 4234.00 + end + + it "should not update the cartitem if the cart status is not pending" do + + # choose a product and change cost + product = products(:product5) + product.cost = 385.00 + product.save + + + # cartitem of the product above + cartitem = cartitems(:cartitem4) + + # assert + product.update_cartitems + + found_cartitem = Cartitem.find_by(id: cartitem.id) + + expect(found_cartitem.id).must_equal cartitem.id + expect(found_cartitem.cart).must_equal cartitem.cart + expect(found_cartitem.product).must_equal product + expect(found_cartitem.cart.status).must_equal "paid" + expect(found_cartitem.cost).wont_equal product.cost + end + end end From 83280e82e12ddd53b72f0786381000b77efd5da0 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Sun, 22 Nov 2020 01:01:13 -0800 Subject: [PATCH 149/248] changed the cart button to a cart image --- app/assets/images/shopping-cart.png | Bin 0 -> 7699 bytes app/views/layouts/application.html.erb | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 app/assets/images/shopping-cart.png diff --git a/app/assets/images/shopping-cart.png b/app/assets/images/shopping-cart.png new file mode 100644 index 0000000000000000000000000000000000000000..74cdd4042b08caf3efbeb001f8dc84099ce58446 GIT binary patch literal 7699 zcmcI}_g527)cz(AdH^LN0wD-eqSBQv3BC7^A|gdpK#?L{S`rZuLk}buL0?VCWMxJ<9oh8y#K(vXU~~AyED&yZkf4rcVjHf^r3A0Yybd24Gnax002bq zf&dmKdUM;S$OQo4V}?4K{{@Y$<3qgv8xCv#d$ZBh;8x*-!Y#*Czd4h%8oXIyl9>Xj z#*D+D;p~OA3yN#t(|innZgb1rWxhdaQ8_)rqUL}jDVsT~#XJ6@;JCRW5F;OcRlwT} zuF5ILXqHTWxQD*9PNJ$VPWT2^^0ErlTv~SsLn*j!7_C)&ZrtBjBTSQz)E1N9{v-E) zd}S@krAjKD<4TFMN#m{jDcIu@Yl$;Ii=9)XJ{2g=7L1T=FNC7y&Jh;) z2%X;|#YsP)#x*WXYCrBgiRYbmk_~^^@(shEtSoc1A0(#X55xl60)#tT#vI0>vUi7g zyT)&Z2@I8wm=uV0IL+;glkP;s5d1Ts`nLe$XMO@_d%h)q9KpJA?uPtjIk%f4cVrVS z+I`QZ4sSnu5R>Nz36A*sG`A!5#YvmG>tU=c@)o3QUbJ6iAI1<$|Z4dI8uie*koieOmTzZ5p0uY^mqh zX3q?_IyqII&%D!(crP^943)qM$o}EP#u$ZhblTcRu07lfaKWgAs3j6d17`I zj#cTD+|UD?{PfG=hB1NoB=m_WciHfuwvrpR3uJY9GvF@(v?;R{_4;GI_<6}?_TlWE!RX1Z-e|Bq;`^vWzYeN1G*DUU+-CgCcUW&p_b?HeYCe zxGf><`8ZGSy=-*%G3%(D+b!p$cpVF7fQUL3$?~TDm!27eMc0EX{apab(AMt?A7-Rj zJ4=BZK&b#W_fwpuJ(4+zd#XTE%;4_AM{dcSKd0wu0Oc3x^D4CYp)4Km*ZgBZe&5{O z?zhM*vVcjbP$nPH?8g}Ty5*Z%|H#Ypk?8hwO9k1LA$TT$C}CnR(gkgEOlv;oO(hpj zXk|5Sx{X;a@Rc+@U;v2BDZGILSVuJo$~C5{9kisCb@TQgq#zhLo&|1;W!V~qzrP;s z8RD%)b1=j)1#p0g<_8!(wl9ZQkiDZA;!8kiPmcot9F>8Jd^G(IEdDUgK4XAm;<5b4 zS_ZsnfV*vso7k&iEQI?5R>DAdJfnDL6LalGX7{L^!4R0EtrqtD3LV0-_H+G&la?_~ zBtMW_Brum72}w&9g{0j)!-A#t0|RqLY;XDzd1ye~j8ds2yzndduVbqnv#dfX_@F?3 z?Gy`^kZ{Df#DX@&O?jdRct9z<7#$6AB+XVZXg~GPNR7WN%dIHGS#yvPkhEt`7!5En z#0BrwO}^B;XPWi97%HfozW+8J=iFix8wG~3GY!h|m*m|n(o*G8D~b0O0^)obv)q9> zkpZ7PbRA2P5=$+#G<7A}V<}{DIjVGd=4Wv+LpIs!3Pmb5ib{uJm*hVb)Q!l@Uds3a zV?ip~sd6n}0K<~vMN=LN&PTpDzuK>JZXR{k%E*vg>v1|LV}}%>6#&mR>&5(O=|&r|Rzp zGxWLpW-R^~*3)K zU;fXuJsORYeJ1OG{q`SoL=XG;u}mkNfsevpY{*YfK~slB};sdNWlIJ&o>$cIs} z*bS}Ah`j3DazR(y@c#S!Z zZOz>=6C*fFA{?rsaL}Qx%G%G_`k2=?Ivc|oENIa2SXgdZr-s3@TQnsrB{-u?9kbgP z9ZDF;;j+_5%F^AWqD5 zzl0eHPg$Pf8?lvo^>!=1B(~)mld5uy0R)|$kA9p6lY|qmycn4O{%bHu`{p@9#whz5 zphre)AP=7(h#ndc_|z|b)%crke32<&hm5)uA&%by1y{Ft-vk}er& zlQ^`XEBI2wIr4?ZBc;RVkvS0|Kk-|8NHwN_8z_EqN`ust#{CmwcgZHPBJCfOOC!0%7(lfA*hjos5V&yvBBHf%p(;JRtA z`)`1219#%Ks&X~24w4wE=YN`=j7u1Q{RF?8Dc^6}!PoZLc8zfR8F<)pOSFWrn!L5lG4U$ZoWH_1;nn?bPKALseMBLW^Fb5W zTG>+`EUYNL0+u4^isU9GiC}G9tmjfyS1{ZC<|IHq9*szhXLLh06T8(h| zDYQ%vn6ULz*m`*Z&VC4L#%}?Az#We@m;c)YHf2KgN*vG(uHqQimF~-V;{$+^4Ubl1 z+zZ|MV)7Zc;6Uc5u$z7dnC-P4+5nvBYkL*obZWf>nlNP$L?&pm?cSlHbj}#8rx`Ic zJ~YV#gncW~z9}IP{y1&6U43e1F^FTs;+47ho*BU+oE*^zg@MjPwAgk-sFjZIUax=M zqU+cGmaAJB;$wi*=%&#_>S5zPRYFFW!o{5M77UewxNPupAbY(IFk{JhY~w?hqGOB= zR1nxS!ijovmplZupNAv|P^YtnG7Z!h=4lL#y^M@k21b|+a2>RkZ*RbpSForh1Dv3h z@HR#k*Gj_%Fvi2&VxE;UqSJ1n_sn4dH@aBl{Am)H}WuE4AK@9!*0roW*>K=rwg8$<)W6YfOKk1Vb$$fxIK}Vv8 zL6S&|4fdJqU}4Ci7_I#fBYT?>`1ck|PbL2b_0|F!omCmvaZGt=I;gW{wV!tVoySs; z?KhzRHEuHujwW-t;lnG@D#8#E8gl~p{J$nV8EpE(9RF!>Qh?iP=4Ld_hhwdxQwO+7 z<7#tYyLXH2UIMuN%JHj6$&>!Kiw`LsG|j0zVjvu8fo2oT9Ys~23|A|3UpuC2uD1>( zZ~F|)$&^C1q#kjr77WqcETYzPp|nIAg8?odwzs&vL7=HJujTEkS4Jq3hME>fn4DzIX{TaRpnDRqXU;|aJc7^KzC0PaQ5Qh92rzl*bnGeTLQGB;)xcHKnbizgX z=&z@xDqu?g3@1mO99#*Xr)6Oiv98yJ601lMIgiPKRS0CN~5ywM7 z4XlHrTQDU&DEJ_v_uZeb zqaYuxm;w8Yqf)-T)#)+IZ3*-5k_^4NH)Q2Z_TvwIm^N0THf8x1KU&+D>9Q257`jAr z`YA~4Pmeahef8izY`uoM5YjH@x6SGS3x|)5=%VUZ!ZHH%MQ4` zdG}ju_uVU#+PvDwCB{$270x2{X7#N8P-~_W`tK%LA0G+DA?DQ}9R@f@0Zq1=(&Q`S z)i);4nD8&EDkB;yeS|P0ts4b$Z1S(S9Y9ulxlKb?s;Xm27a@^0V7|{TG#IG|_Ww+JeE5+;$DL){_7t3(2m87nOqhi8pJ5Drbi#|~3L1M>JbNyCT zO{&nODh)Ii*qO$&KD0{TweQ3o$I};20S-U(f;nL5xb&zgBY3TmYV|92_hK!*hpE0oIoo ztxFV%6dZqmLL36f)CD}%Hix4oh2Lz|LN_pfOiRqRruGW1Kk8i!Svp z5J2Rb#ZH8VtPIF7t}<@r}83w6*%sW}+lLOui0Mt)Ptrsn1Sa(fK)K$>4$kj0Pyx@X#nR z&ocWDqqb{F^%BCvQJJ>PvP<*SV^%s0rHyhR75vy-Rc*(eR44BaoNkc%JaF&$sr+RI zrYxP8nfJ%(zT7CX8@;G~@+SMGV*${{OW_+Iflm}uvP(pvC`)uYWc;?{Rx`aQaSNI{)7ZhttnAr6~%GY z57fqmj`?%qnbhNab*K7Kbf!i_b+ZXbkmP!-60y~@GTcG|Np_~9s#{-SM(=4!ZFWxW zy$FeORBj^}@e@WoEvfxxlL9f$b7lFb+qkfm+n8BBz@r~z@TAAL5K;T9?(iDP zy=LofA{U_H1Dv_9Er9Xyq#&)jMTDm;n930VVF-98@OxU3{y}J&XVflCC5_<8cDj2< zSp)!%NkB#z6)K+G2t`K)zH_YaENqx9RQ8nJg21KzD{0w1m0J@{6@rR`rvkiXL9$Xx z5bm?-qwsK#LNcnF3BA7KD*IvBY0j837#ePx)u9Fw#pTb1ex38`SZ^NeLj4(CyIaIV z>2;b5kBGVP^>q2lbIUPp%&UU$0;cOTP>i!`u+58HiDi+an$DmyB9;q^yHG%t&Seq6uMcF4U@3#3LI z!9#ZI`^Suv^H>5NyTQ!;Zb+JNotI%C>h0v;;gBO44o9e3V`+7Dd1G_^YG~Ls^d4Rr zqPZcx`Jn$7YCFeZp^WXB=w`WSM_02r$<$1fyDl)Z=nKfW- z6fWr~s=)pPZ`$26(SCQWXL_@l5CA-!WF}R2Rec?J_KwBf#Q4kk7vbF}K$@ZB6{Ib* zg?+?|a>E@-=3Jpd`F#Q9u)M#7kWBImx%Z3Y=6C8{*)NEd0%hm+{WE5|up3-%)VK+; zjv5Mkf!N$fq=6^+B3`RG>dTU}U6?@Ugmp9K*K6o1s4gnYEK?_)OZ$hkp*@{7=yB_$q zM%gnxIXvM=sGFqf`(WolbvJq|B0CHmIbR}BXMYuQ@_X@5`SfASm%nz*i_=vv|5Q%v zZA)T)6Q&6>Z5}oUTME(zJNgpBe9Nr~`>cK;?F=P>6LX;YLSiADiG&+#OWs-Gw;RmK zsh{oGU;Uc+URR2c2T__f-TCd68&#lK!lnNxup@JUyg>M|*tysP)t7!(S?N9zhNH)= zHp+&DW&B(dT$Kp})!FjT3O?0@hJ}4z5B6X@ql^J!Q=$rs|jec{Vsg6~$3 z-L#(X?U0OeV)2f(y^@PURjlj$I-WsBzhX>&pI)PwSogj6S?yY@=EdCFv7$zAPzRCwu*l7VV7t zxzI!zRy#{OR72#Cq?7yl_DQ>cm>;ViYG&lub(w7W6S+7^fu5%Kf-d_z)mTEs> zuu!jd$XCQ>UA)!V`c67{C>oy-u+gBl#Q#_cu6!unw6%c@ULVO^t|cLgNdjbi&b#TL zbl#oJlEsA^?etKn37<|K11>(M0x(vnsRzh|Wmp=9vN@=%+Z1EBR~WA8Pj)2dh?4h9 z*$LH+N(%Em`ctcgznKF{7V9HFJdzePR3(ppvZCREf7-}lpDSVwf-HZ?%txkKyp%o^ zc~1zxWd9*p;beE~9?|$x4wQicbX%`0Jz{s$ zzFF*AlIIS{GX}U2rTl(`sSTPa9diW5Do&19ykEqF1Tt=`7N)hl!4WcB4hMD=ku&HH*%#~-x4o$PJ z@-)2ljTy7geW4oR%9t5z)sWyze=i4~s72`DC&M}`Hkx(l$DEwf#$lCsAHS0QWn;QE zYKJGN*hj(V`dBow&ra>tw20&HfAHwjoh@JZeths|`ye7_hOq&~<`=Lp6izx(_V?c} zXb3(mDsAl9SXr(eB3W|Sb|&lF_P#ci4si&xw(s@zXTDu=Do$D6eE}aS3++;#FF5Bh zeeu%f>yiJ@EQGmt--b>J(L~*2Rr$K`eN$f^jP$=&L%z;tk5T(&fA(DX_w>LUeo7tQ zHm#AOh6ntGIa38%(^25)=G>D|qmyG?&y%LYx-X@L`!ju9OvR;zN~1#qu7UphWB9|R z+nb9Ts*Tm8-Ytitj*!B&=u9g9;eDt>Ve6f%>L=@->7~AY{0^_Jb{wi^J%`Nf5T5Df zGSpaS+W#PDp22Qt;7NN9lROfEZAJlm9k*@l*PfiiA2!Wz^=`d-OVzcCY`=ZEEtkBnv=P4GMv~h1zw9^~Je>wnnymk#A(%SdJE&OO zjP%Lgr;YRu-mommG%wCXZ3Z%0)SSH$HUM9M&TdHsyj)zg=2+ws*JBhGaJbmm5W;}J z7KWqCL))0&(JMR_2o_Y{HkS}1XMt%_W i|M=(T|ANQn%+WxG?93T%F-l|qo*U|#=~QSrJ^g=9y^a|G literal 0 HcmV?d00001 diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index b462b571ce..fd9e2c061a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -30,7 +30,7 @@
- <%= button_to "Cart", cart_path(session[:cart_id]), method: :get %> + <%= link_to image_tag( "shopping-cart.png", alt: "shopping cart", width: "60rem" ), cart_path(session[:cart_id]), method: :get %>
From 05d8e4b51e7fcef1f935854c7926428b5e08d88c Mon Sep 17 00:00:00 2001 From: Lina Do Date: Sun, 22 Nov 2020 01:55:09 -0800 Subject: [PATCH 150/248] css styling cart show page, changing image size, aligning text and buttons --- app/assets/stylesheets/application.scss | 32 ++++++++++++++++++++++++- app/views/carts/show.html.erb | 16 ++++++------- 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index dd8acab038..20df211d7c 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -66,4 +66,34 @@ footer { container { padding: 10px; -} \ No newline at end of file +} + +.quantity-container { + display: flex; + justify-content: center; +} + +.quantity-container div { + width: 2rem; + text-align: center; + align-self: center; +} + +.cart-image img { + padding: 5px; + width: 8vw; +} + +.row-height { + height: 10rem; + text-align: center; +} + +.cart-table-columns { + text-align: center; +} + +.cart-table { + width: 90%; + margin-left: 3rem; +} diff --git a/app/views/carts/show.html.erb b/app/views/carts/show.html.erb index ad3e50911c..5b81c0f814 100644 --- a/app/views/carts/show.html.erb +++ b/app/views/carts/show.html.erb @@ -3,9 +3,9 @@ <%= button_to "Check out", purchase_form_path, method: :get %>

Shopping Cart

- +
- + @@ -17,18 +17,18 @@ <% if @cart.cartitems.any? %> <% @cart.cartitems.each do|item| %> - - + + - <% end %> From 9d7f8257b7d6fe50e5c37e6f59005735c8f22c6f Mon Sep 17 00:00:00 2001 From: Lina Do Date: Sun, 22 Nov 2020 11:33:37 -0800 Subject: [PATCH 153/248] changed the order of the cartitems in the cart to decending order by creation date, won't jump around when changing quantity --- app/controllers/carts_controller.rb | 1 + app/views/carts/show.html.erb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/carts_controller.rb b/app/controllers/carts_controller.rb index bff6f1bfd0..5ba2cc2853 100644 --- a/app/controllers/carts_controller.rb +++ b/app/controllers/carts_controller.rb @@ -2,6 +2,7 @@ class CartsController < ApplicationController def show @cart = @current_cart + @cartitems = @cart.cartitems.order(created_at: :desc) end def purchase_form diff --git a/app/views/carts/show.html.erb b/app/views/carts/show.html.erb index a4f7b182b1..14de7fcb95 100644 --- a/app/views/carts/show.html.erb +++ b/app/views/carts/show.html.erb @@ -13,8 +13,8 @@ - <% if @cart.cartitems.any? %> - <% @cart.cartitems.each do|item| %> + <% if @cartitems.any? %> + <% @cartitems.each do|item| %>
Item Price
<%= image_tag(item.product.image) %>
<%= image_tag(item.product.image) %> <%= link_to item.product.name, product_path(item.product.id)%>
$<%= '%.2f' %item.cost %>
 - <%= button_to "+", add_path(item.id) %> - <%= item.qty %> - <%= button_to "-", reduce_path(item.id) %> + +
<%= button_to "-", reduce_path(item.id) %>
+
<%= item.qty %>
+
<%= button_to "+", add_path(item.id) %>
$<%= '%.2f' %item.cartitem_subtotal %>
From 9240a1fda66f1ec797e79b047cafbf3a2f1057ef Mon Sep 17 00:00:00 2001 From: Lina Do Date: Sun, 22 Nov 2020 02:37:02 -0800 Subject: [PATCH 151/248] css styling the cart summary --- app/assets/stylesheets/application.scss | 32 +++++++++++++++++++++++-- app/views/carts/show.html.erb | 16 +++++++++---- 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 20df211d7c..14f528d26c 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -94,6 +94,34 @@ container { } .cart-table { - width: 90%; - margin-left: 3rem; + width: 80%; + margin-left: 7rem; + +} + +.checkout { + + margin-left: auto; + margin-right: 12rem; + width: 25rem; + height: 10rem; + background: lightpink; +} + +.summary-container { + padding-left: 3rem; + padding-right: 3rem; + padding-top: 2rem; +} + +.summary-container div { + padding-bottom: .5rem; +} + +span { + margin-left: 8rem; +} + +.checkout-button { + text-align: center; } diff --git a/app/views/carts/show.html.erb b/app/views/carts/show.html.erb index 5b81c0f814..435293b564 100644 --- a/app/views/carts/show.html.erb +++ b/app/views/carts/show.html.erb @@ -1,8 +1,6 @@ -
- <%= button_to "Check out", purchase_form_path, method: :get %> -
-

Shopping Cart

+ +

SHOPPING CART

@@ -41,6 +39,14 @@ <% end %>
-

Total Cost: $<%= '%.2f' %@cart.total_price %>

+ +
+
+

SUMMARY

+
Total Cost: $<%= '%.2f' %@cart.total_price %>
+
<%= button_to "Check out", purchase_form_path, method: :get %>
+
+
<%= link_to 'Back', products_path %> + \ No newline at end of file From e62911b0e0b661ecc76fc6733eee5368e1ba77f6 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Sun, 22 Nov 2020 02:39:25 -0800 Subject: [PATCH 152/248] changed remove button to X --- app/views/carts/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/carts/show.html.erb b/app/views/carts/show.html.erb index 435293b564..a4f7b182b1 100644 --- a/app/views/carts/show.html.erb +++ b/app/views/carts/show.html.erb @@ -32,7 +32,7 @@
$<%= '%.2f' %item.cartitem_subtotal %>
 - <%= link_to "Remove", cartitem_path(item), method: :delete %> + <%= link_to "X", cartitem_path(item), method: :delete %>
<%= image_tag(item.product.image) %> From d1a6c52fb0c31c6b360be274a34843ed95bfb432 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Sun, 22 Nov 2020 16:50:24 -0800 Subject: [PATCH 154/248] products_controller auth tests passing! --- app/controllers/products_controller.rb | 4 +- test/controllers/products_controller_test.rb | 366 +++++++++++++------ test/controllers/users_controller_test.rb | 22 -- test/fixtures/products.yml | 4 +- 4 files changed, 255 insertions(+), 141 deletions(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 956c613254..a21b80e22c 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -1,6 +1,6 @@ class ProductsController < ApplicationController before_action :set_product, only: [:show, :edit, :update, :destroy, :add_to_cart] - before_action :require_login, only: [:new, :create] + before_action :require_login, only: [:new, :create, :edit] before_action :authorized?, only:[:edit, :update, :destroy] def index @@ -20,7 +20,7 @@ def index def authorized? unless @product.owner(@current_user) flash[:error] = "You are not authorized to do this." - redirect_to products_path + redirect_to root_path return end end diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb index 0e78d86704..0725392c19 100644 --- a/test/controllers/products_controller_test.rb +++ b/test/controllers/products_controller_test.rb @@ -2,145 +2,284 @@ describe ProductsController do - before do - @cat1 = Category.create(name: "clothing") - @cat2 = Category.create(name: "equipment") - @cat3 = Category.create(name: "food") + describe "Authentication - Logged in Users" do - @user = users(:ada) - end + before do + @user = perform_login(users(:ada)) + end - let(:product) { Product.create( - name: "leggings", - user: @user, - cost: 44, - inventory: 20, - description: "they're like thick tights", - image: "https://placekitten.com/300/200", - category_ids: [@cat1.id, @cat2.id]) - } - - it "should get index" do - get products_path - must_respond_with :success - end + it "logged in users can access the new product page" do + get new_product_path + must_respond_with :success + end + + it "logged in users can create a new product with all required attributes accurately, and redirect" do + + product_hash = { + product: { + name: "dumbbells", + user: @user, + cost: 15, + inventory: 100, + description: "5 lbs, set of 2", + image: "https://placekitten.com/300/200", + category_ids: [categories(:category_weights).id] + } + } + + expect{ + post products_path, params: product_hash + }.must_change "Product.count", 1 + + new_product = Product.find_by(name: product_hash[:product][:name]) + + expect(new_product.name).must_equal "dumbbells" + expect(new_product.user).must_equal users(:ada) + expect(new_product.cost).must_equal 15 + expect(new_product.inventory).must_equal 100 + expect(new_product.description).must_equal "5 lbs, set of 2" + expect(new_product.image).must_equal "https://placekitten.com/300/200" + expect(new_product.category_ids).must_equal [categories(:category_weights).id] + + must_respond_with :found + must_redirect_to product_path(new_product.id) + end + + it "logged in users can't create new product if required fields are missing" do + bad_product_hash = { + product: { + name: "bench" + } + } + + expect{ + post products_path, params: bad_product_hash + }.wont_change "Product.count" + + bad_product = Product.find_by(name: bad_product_hash[:product][:name]) + expect(bad_product).must_be_nil + must_respond_with :bad_request + end - it "should get new" do - skip - get new_product_path - must_respond_with :success end - it "should create a new product with all required attributes accurately, and redirect" do - skip - product_hash = { - product: { - name: "weights", - user: @user, - cost: 15, - inventory: 100, - description: "5 lbs, set of 2", - image: "https://placekitten.com/300/200", - category_ids: [@cat2.id] + describe "Authentication - Guest Users" do + + before do + delete logout_path, params: {} # log out + end + + it "guest users (not logged in) can view the product index page" do + get products_path + must_respond_with :success + end + + it "guest users can browse products by category" do + get category_products_path(categories(:category_weights).id) + must_respond_with :success + end + + it "guest users can browse products by merchant" do + get user_products_path(users(:ada).id) + must_respond_with :success + end + + it "guest users can access show product page" do + get product_path(products(:product0).id) + + must_respond_with :success + + expect(products(:product0).name).must_equal "product0" + expect(products(:product0).inventory).must_equal 10 + end + + it "will not show product with invalid ID" do + get product_path(-1) + must_respond_with :not_found + end + + it "guest users can add products to cart" do + post add_to_cart_path(products(:product1).id) + + must_respond_with :found + must_redirect_to product_path(products(:product1).id) + end + + it "guest users can't add product to cart if not enough inventory" do + + post add_to_cart_path(products(:product3).id) # inventory: 2 + post add_to_cart_path(products(:product3).id) + post add_to_cart_path(products(:product3).id) + + must_respond_with :redirect + must_redirect_to product_path(products(:product3).id) + end + + it "guest users (not logged in) can't access the new product page" do + get new_product_path + + must_respond_with :redirect + must_redirect_to root_path + end + + it "guest users (not logged in) can't access the edit product page" do + get new_product_path + + must_respond_with :redirect + must_redirect_to root_path + end + + it "guest users (not logged in) can't delete products" do + delete product_path(products(:product0).id) + + must_respond_with :redirect + must_redirect_to root_path + end + + it "guest users (not logged in) can't update products" do + delete logout_path, params: {} # log out + + patch product_path(products(:product1).id), params: { product: { name: "jeggings" } } + + must_respond_with :redirect + must_redirect_to root_path + end + + it "guest users (not logged in) can't create a new product" do + + product_hash = { + product: { + name: "dumbbells", + cost: 15, + inventory: 100, + description: "5 lbs, set of 2", + image: "https://placekitten.com/300/200", + category_ids: [categories(:category_weights).id] + } } - } - expect{ - post products_path, params: product_hash - }.must_change "Product.count", 1 + expect{ + post products_path, params: product_hash + }.wont_change "Product.count" - new_product = Product.find_by(name: product_hash[:product][:name]) + must_respond_with :redirect + must_redirect_to root_path - expect(new_product.name).must_equal "weights" - expect(new_product.user).must_equal @user - expect(new_product.cost).must_equal 15 - expect(new_product.inventory).must_equal 100 - expect(new_product.description).must_equal "5 lbs, set of 2" - expect(new_product.image).must_equal "https://placekitten.com/300/200" - expect(new_product.category_ids).must_equal [@cat2.id] + end - must_redirect_to product_path(new_product.id) end - it "will not create product if required fields are missing" do - skip - bad_product_hash = { - product: { - name: "bench" - } - } - - expect{ - post products_path, params: bad_product_hash - }.wont_change "Product.count" - - bad_product = Product.find_by(name: bad_product_hash[:product][:name]) - expect(bad_product).must_be_nil - must_respond_with :not_found - end + describe "Authorization" do - it "should show product" do - get product_path(product.id) - must_respond_with :success + before do + user = perform_login(users(:ada)) + end - expect(product.name).must_equal "leggings" - #expect(product.category_ids).must_include @cat1.id - end + it "Authorized merchants can access edit page for their own products" do + get edit_product_path(products(:product1).id) - it "will not show product with invalid ID" do - get product_path(-1) - must_respond_with :not_found - end + must_respond_with :success + end - it "should get edit" do - skip - get edit_product_path(product.id) - must_respond_with :success - end + it "Should not render edit page for invalid product ID" do + get edit_product_path(-1) + must_respond_with :not_found + end - it "should not render edit page for invalid product ID" do - get edit_product_path(-1) - must_respond_with :not_found - end + it "Authorized merchants can update their own products" do + update_hash = { + product: { + name: "hoodie", + cost: 15, + inventory: 1, + description: "comfy!", + image: "https://placekitten.com/300/200", + category_ids: [categories(:category_clothing).id] + } + } - # it "should update product" do - # skip - # patch product_path(product), params: { product: { name: "jeggings" } } - # must_redirect_to product_path(product) - # end + patch product_path(products(:product1).id), params: update_hash - it "will not update product with invalid params" do - skip - patch product_path(product), params: { product: { name: "" } } - must_respond_with :not_found - end + updated_product = Product.find_by(name: "hoodie") + expect(updated_product.name).must_equal "hoodie" + expect(updated_product.inventory).must_equal 1 + expect(updated_product).must_equal products(:product1) + + must_respond_with :found + must_redirect_to product_path(products(:product1).id) + end + + it "will not update product with invalid params" do + patch product_path(products(:product1).id), params: { product: { name: "" } } - it "should destroy product" do - skip - product_to_delete = Product.create( - name: "socks", - user: @user, - cost: 19, - inventory: 20, - description: "made of wool", - image: "https://placekitten.com/300/200", - category_ids: [@cat1.id, @cat2.id]) + must_respond_with :bad_request + end + + it "Authorized merchants can delete their own products" do + + expect{ + delete product_path(products(:product1).id) + }.must_change "Product.count", -1 - id = product_to_delete.id + deleted_product = Product.find_by(name: "product1") - expect{ - delete product_path(id) - }.must_change "Product.count", -1 + expect(deleted_product).must_be_nil + must_respond_with :redirect + must_redirect_to products_path + + end + + it "merchants can't access edit page for products they don't own" do + + get edit_product_path(products(:product3).id) # valentine's product + + must_respond_with :redirect + must_redirect_to root_path + + end - deleted_product = Product.find_by(name: "socks") + it "merchants can't delete products they don't own" do + val_product_count = users(:valentine).products.count - expect(deleted_product).must_be_nil - must_respond_with :redirect - must_redirect_to products_path + # ada tries to delete valentine's product + + expect{ + delete product_path(products(:product3).id) + }.wont_change val_product_count + + must_respond_with :redirect + must_redirect_to root_path + end end - describe "add to cart" do + + + # it "should destroy product" do + # product_to_delete = Product.create( + # name: "socks", + # user: users(:ada), + # cost: 19, + # inventory: 20, + # description: "made of wool", + # image: "https://placekitten.com/300/200", + # category_ids: [categories(:category_clothing)] + # + # id = product_to_delete.id + # + # expect{ + # delete product_path(id) + # }.must_change "Product.count", -1 + # + # deleted_product = Product.find_by(name: "socks") + # + # expect(deleted_product).must_be_nil + # must_respond_with :redirect + # must_redirect_to products_path + # + # end + + describe "Adding products to cart" do it "can add a new cart item" do # start a new cart get root_path @@ -183,8 +322,5 @@ must_redirect_to product_path(products(:product1)) end - end - - end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 62e05c5efc..093a31480f 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -60,26 +60,4 @@ end end - describe "Authentication" do - it "logged in users can add a new product" do - - end - - it "logged in users can add a new category" do - - end - - end - - describe "Authorization" do - it "authorized users can edit their own products" do - - end - - it "authorized users can delete their own products" do - - end - - end - end diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml index ec209ef1b2..f5d6e7b874 100644 --- a/test/fixtures/products.yml +++ b/test/fixtures/products.yml @@ -4,14 +4,14 @@ product0: inventory: 10 cost: 2000 description: really cool thing - image: image tag + image: https://placekitten.com/300/200 product1: user: ada name: product1 inventory: 1 cost: 1000 description: really cool thing - image: image tag + image: https://placekitten.com/300/200 product2: user: ada name: product2 From 156df04a97c03985409e61e8f251b671557441ab Mon Sep 17 00:00:00 2001 From: r-spiel Date: Sun, 22 Nov 2020 17:24:24 -0800 Subject: [PATCH 155/248] add table partial for orders, try to get route/update method for cartitem status, not working yet --- app/controllers/application_controller.rb | 16 ------- app/controllers/cartitems_controller.rb | 14 ++++++ app/controllers/carts_controller.rb | 2 + app/controllers/users_controller.rb | 7 +-- app/models/cart.rb | 7 ++- app/models/user.rb | 18 ++++++++ app/views/users/_order_table.html.erb | 52 +++++++++++++++++++++++ app/views/users/fulfillment.html.erb | 51 ++-------------------- config/routes.rb | 1 + 9 files changed, 100 insertions(+), 68 deletions(-) create mode 100644 app/views/users/_order_table.html.erb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d5d14bca96..5a43d44b85 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -43,22 +43,6 @@ def current_cart end end - def merchant_orders(user, status) - #from a user's cartitems, return the carts associated that have a certain cart status - return nil if user.cartitems.nil? - merchant_cartitems = user.cartitems - - selected_carts = [] - current_cart_id = nil - - merchant_cartitems.each do |item| - if item.cart.status == status && item.cart.id != current_cart_id - selected_carts << item.cart - current_cart_id = item.cart.id - end - end - return selected_carts - end end diff --git a/app/controllers/cartitems_controller.rb b/app/controllers/cartitems_controller.rb index 40ae0e4971..b87d026316 100644 --- a/app/controllers/cartitems_controller.rb +++ b/app/controllers/cartitems_controller.rb @@ -31,8 +31,22 @@ def destroy end + def update_status + if @cart_item.update(fulfillment_status: params[:fulfillment_status]) + redirect_back fallback_location: '/' + return + else + flash[:error] = "Sorry, status not changed. Please try again." + redirect_back fallback_location: '/' + end + end + private + def cartitem_params + return params.require(:cartitem).permit(:fulfillment_status) + end + def find_cartitem cart_item_id = params[:id] @cart_item = Cartitem.find_by(id: cart_item_id) diff --git a/app/controllers/carts_controller.rb b/app/controllers/carts_controller.rb index 5ba2cc2853..c47dba044a 100644 --- a/app/controllers/carts_controller.rb +++ b/app/controllers/carts_controller.rb @@ -15,6 +15,8 @@ def purchase if @cart.update(cart_params) @cart.status = "paid" + @cart.update_item_fulfillment + @cart.save flash[:success] = "your stuff was ordered" diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 8d09113ef7..ffde7d9199 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -37,9 +37,10 @@ def current def fulfillment - @pending_orders = merchant_orders(@current_user, status = "pending") - @paid_orders = merchant_orders(@current_user, status = "paid") - @complete_orders = merchant_orders(@current_user, status = "complete") + # merchant_orders returns a hash where the key is the cart id, the value is the cart + @pending_orders = @current_user.merchant_orders(status = "pending") + @paid_orders = @current_user.merchant_orders(status = "paid") + @complete_orders = @current_user.merchant_orders(status = "complete") unless @current_user flash[:error] = "You must be logged in to see this page" diff --git a/app/models/cart.rb b/app/models/cart.rb index 3a942c53d2..908fe83e7a 100644 --- a/app/models/cart.rb +++ b/app/models/cart.rb @@ -20,6 +20,11 @@ def total_price return total_price.round(2) end - + def update_item_fulfillment + self.cartitems.each do |item| + item.fulfillment_status = "order placed" + item.save + end + end end diff --git a/app/models/user.rb b/app/models/user.rb index a709624db1..2d133fcefe 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -28,6 +28,24 @@ def self.merchants return @merchants end + def merchant_orders(status) + #from a user's cartitems, return the carts associated that have a certain cart status + return nil if self.cartitems.nil? + merchant_cartitems = self.cartitems + + # selected_carts = [] + # current_cart_id = nil + + # make selected carts a hash, where the cart id is the key and the cart is the value in order to make it easier to check if that cart is already in the list + selected_carts = {} + + merchant_cartitems.each do |item| + if item.cart.status == status && !selected_carts[item.cart.id] + selected_carts[item.cart.id] = item.cart + end + end + return selected_carts + end end diff --git a/app/views/users/_order_table.html.erb b/app/views/users/_order_table.html.erb new file mode 100644 index 0000000000..243666791b --- /dev/null +++ b/app/views/users/_order_table.html.erb @@ -0,0 +1,52 @@ +
+

<%= status %> Orders

+

*<%= description %>*

+ + <% if orders.any? %> + + <% orders.each_value do |cart| %> + + + + + + + + + + + + + + + <% cart.cartitems.each do |item| %> + + + + + + + + + <% end %> +
Order ID: <%= cart.id %>Status: <%= cart.status %>
Product NamePriceQuantityTotalFulfillment Status
<%= item.product.name %><%= item.product.cost %><%= item.qty %><%= item.product.cost * item.qty %> + <% if item.fulfillment_status && item.product.user.id == @current_user.id %> + <%= item.fulfillment_status %> + <%#=# button_to "Update to Shipped", update_status_path(item.id) %> + <%= form_with model: item do |f| %> + <%= f.label :fulfillment_status %> + <%= f.select :fulfillment_status, ["Order Placed", "Order Shipped"], include_blank: false %> + <%= f.submit "Update", class: "submit_button", method: :patch %> + <% end %> + <% elsif item.fulfillment_status %> + <%= item.fulfillment_status %> + <% else %> + N/A + <% end %> +
+ <% end %> + + <% else %> +

No <%= status %> Orders yet!

+ <% end %> +
diff --git a/app/views/users/fulfillment.html.erb b/app/views/users/fulfillment.html.erb index 89fffc82ca..8c3c5e288d 100644 --- a/app/views/users/fulfillment.html.erb +++ b/app/views/users/fulfillment.html.erb @@ -2,53 +2,8 @@

Order Fulfillment:

-
PENDING ORDERS: *orders in a customer's cart*
-<% if @pending_orders.any? %> +<%= render partial: 'order_table', locals: { status: "Pending", description: "orders in a customer's cart", orders: @pending_orders } %> - <% @pending_orders.each do |cart| %> +<%= render partial: 'order_table', locals: { status: "Paid", description: "order confirmed, waiting for all items in the order to ship", orders: @paid_orders } %> - Cart ID: <%= cart.id %> ~ Cart Status: <%= cart.status %> - Items in this cart: - <% cart.cartitems.each do |item| %> - <%= item.product.name %><%= item.cost %>, - <% end %> -

~~~~~~~~~~~~~~

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

No pending orders yet!

-<% end %> - -
PAID ORDERS: *order is confirmed and paid, waiting for merchant to ship*
-<% if @paid_orders.any? %> - - <% @paid_orders.each do |cart| %> - - Cart ID: <%= cart.id %> ~ Cart Status: <%= cart.status %> - Items in this cart: - <% cart.cartitems.each do |item| %> - <%= item.product.name %><%= item.cost %> - <% end %> -

~~~~~~~~~~~~~~

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

No paid orders yet!

-<% end %> - -
COMPLETE ORDERS: *customer's entire order has been shipped*
-<% if @complete_orders.any? %> - - <% @complete_orders.each do |cart| %> - - Cart ID: <%= cart.id %> ~ Cart Status: <%= cart.status %> - Items in this cart: - <% cart.cartitems.each do |item| %> - <%= item.product.name %><%= item.cost %> - <% end %> -

~~~~~~~~~~~~~~

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

No completed orders yet!

-<% end %> \ No newline at end of file +<%= render partial: 'order_table', locals: { status: "Complete", description: "orders where all items have shipped", orders: @complete_orders } %> \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index aa612152a8..97b42dbe2c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -38,4 +38,5 @@ post 'cartitems/:id/add', to: "cartitems#add_qty", as: "add" post 'cartitems/:id/reduce', to: "cartitems#reduce_qty", as: "reduce" + patch 'cartitems/:id', to: 'cartitems#update_status', as: 'update_status' end From fa84ade3220311f299428fc18bfa150cf929605c Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Sun, 22 Nov 2020 17:30:31 -0800 Subject: [PATCH 156/248] product model tests passing! --- app/models/product.rb | 2 +- test/models/product_test.rb | 126 +++++++++++++++++++++++++++++++++++- 2 files changed, 124 insertions(+), 4 deletions(-) diff --git a/app/models/product.rb b/app/models/product.rb index e12c517c8c..2757bdd65d 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -4,7 +4,7 @@ class Product < ApplicationRecord belongs_to :user validates :name, :description, :image, presence: true - validates :inventory, :cost, presence: true, numericality: true + validates :inventory, :cost, presence: true, numericality: { greater_than: 0 } validates :category_ids, presence: true def owner(current_user) diff --git a/test/models/product_test.rb b/test/models/product_test.rb index 6977718e14..cf07ab8906 100644 --- a/test/models/product_test.rb +++ b/test/models/product_test.rb @@ -1,7 +1,127 @@ require "test_helper" describe Product do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + + before do # connect categories + product = products(:product1) + weights = categories(:category_weights) + shoes = categories(:category_shoes) + product.category_ids = [weights.id, shoes.id] + end + + describe "custom model methods" do + + it "will authenticate a user as the owner of a product and return true" do + user = users(:ada) + product = products(:product1) + result = product.owner(user) + expect(result).must_equal true + end + + it "will not authenticate a guest user not logged in" do + user = nil + product = products(:product1) + result = product.owner(user) + expect(result).must_equal false + end + + it "will return false if the user is not the owner of a product" do + user = users(:valentine) + product = products(:product1) + result = product.owner(user) + expect(result).must_equal false + end + end + + describe "validations" do + it "Product with valid fields passes" do + product = products(:product1) + expect(product.valid?).must_equal true + end + + it "must have a name" do + product = products(:product1) + product.name = nil + expect(product.valid?).must_equal false + expect(product.errors.messages).must_include :name + end + + it "needs a description" do + product = products(:product1) + product.description = nil + expect(product.valid?).must_equal false + end + + it "must have inventory" do + product = products(:product1) + product.inventory = nil + expect(product.valid?).must_equal false + end + + it "inventory must be numeric" do + product = products(:product1) + product.inventory = "FT66231H" + expect(product.valid?).must_equal false + end + + it "Inventory must be be positive" do + product = products(:product1) + product.inventory = -1 + expect(product.valid?).must_equal false + end + + it "price needs to be numeric" do + product = products(:product1) + product.cost = "YYYY" + expect(product.valid?).must_equal false + end + + it "price needs to be positive" do + product = products(:product1) + product.cost = -1 + expect(product.valid?).must_equal false + end + + it "Needs a photo url" do + product = products(:product1) + product.image = "https://placekitten.com/300/200" + expect(product.valid?).must_equal true + end + + it "Must have at least 1 category" do + product = products(:product1) + product.category_ids = [] + expect(product.valid?).must_equal false + end + + end + + describe "relationships" do + it "belongs to a user" do + product = products(:product1) + expect(product.user).must_be_instance_of User + end + + it "Can have multiple categories" do + product = products(:product1) + weights = categories(:category_weights) + shoes = categories(:category_shoes) + + product.category_ids = [weights.id, shoes.id] + expect(product.valid?).must_equal true + end + + it "can have many CartItems (can be added to many carts)" do + product = products(:product1) + cart1 = carts(:cart1) + cart2 = carts(:cart2) + + cart_item_1 = Cartitem.new(cart: cart1, product: product, qty: 1, cost: product.cost ) + cart_item_2 = Cartitem.new(cart: cart2, product: product, qty: 1, cost: product.cost ) + + expect(product.valid?).must_equal true + expect(cart_item_1.valid?).must_equal true + expect(cart_item_2.valid?).must_equal true + end + end end From 70b608e9d3aaaf9afd1c20f37f3bbabe1e2d44d4 Mon Sep 17 00:00:00 2001 From: r-spiel Date: Sun, 22 Nov 2020 17:34:54 -0800 Subject: [PATCH 157/248] update params in update_status method for cartitems --- app/controllers/cartitems_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/cartitems_controller.rb b/app/controllers/cartitems_controller.rb index b87d026316..e2c68ca2a8 100644 --- a/app/controllers/cartitems_controller.rb +++ b/app/controllers/cartitems_controller.rb @@ -32,7 +32,7 @@ def destroy end def update_status - if @cart_item.update(fulfillment_status: params[:fulfillment_status]) + if @cart_item.update(cartitem_params) redirect_back fallback_location: '/' return else From 060946722dc2d808cf2ff0ae5d58b60bb111a22f Mon Sep 17 00:00:00 2001 From: r-spiel Date: Sun, 22 Nov 2020 19:55:50 -0800 Subject: [PATCH 158/248] minor changes white space, comments etc. --- app/controllers/application_controller.rb | 2 -- app/controllers/users_controller.rb | 1 - app/models/user.rb | 7 ++----- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 5a43d44b85..cc2cc16ed6 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -43,6 +43,4 @@ def current_cart end end - - end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index ffde7d9199..1927908609 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -36,7 +36,6 @@ def current end def fulfillment - # merchant_orders returns a hash where the key is the cart id, the value is the cart @pending_orders = @current_user.merchant_orders(status = "pending") @paid_orders = @current_user.merchant_orders(status = "paid") diff --git a/app/models/user.rb b/app/models/user.rb index 2d133fcefe..ff75d0b798 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -30,14 +30,11 @@ def self.merchants def merchant_orders(status) #from a user's cartitems, return the carts associated that have a certain cart status - return nil if self.cartitems.nil? + return nil if self.nil? || self.cartitems.nil? merchant_cartitems = self.cartitems - # selected_carts = [] - # current_cart_id = nil - - # make selected carts a hash, where the cart id is the key and the cart is the value in order to make it easier to check if that cart is already in the list + # selected carts is a hash, where the cart id is the key and the cart is the value in order to make it easier to check if that cart is already in the list when iterating thru cartitems selected_carts = {} merchant_cartitems.each do |item| From 32551f29e178de5bd23752631b6195d118413af1 Mon Sep 17 00:00:00 2001 From: r-spiel Date: Sun, 22 Nov 2020 20:46:54 -0800 Subject: [PATCH 159/248] some tests for the user model, comments lining out some future tests for user controller --- test/controllers/users_controller_test.rb | 13 ++++- test/models/user_test.rb | 59 ++++++++++++++++++++++- 2 files changed, 69 insertions(+), 3 deletions(-) diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 7a8946c99e..b8d35485e6 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -57,9 +57,20 @@ expect(session[:user_id]).must_be_nil + # How do I expect a flash message? it should be: + # "Successfully logged out!" end end - + describe 'fulfillment' do + # can get fulfillment page + # + # can get fulfillment page with no orders/carts + # + # cannot get fulfillment page when not logged in + # => flash error should be "You must be logged in to see this page" + # + # cannot get fulfillment page for user that is not you + end end diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 569bfa23b8..a26ab8ed23 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -52,12 +52,67 @@ end describe 'relations' do + before do + @user = users(:ada) + end + it 'can have many products' do #use fixtures yml data - user = users(:ada) - expect(user.products.count).must_equal 3 + expect(@user.products.count).must_equal 3 + end + + it 'has many cartitems through products' do + expect(@user.cartitems.count).must_equal 2 + #instead of equal 2, could do array = cartitems.where(:product_id ) is 1, 2, or 3 .length + + @user.cartitems.each do |item| + expect(item).must_be_kind_of Cartitem + end + + #add a cart item + #????? + end + end + + describe 'methods' do + before do + @user = users(:ada) + end + + it 'can find all merchants (users w/ > 0 products)' do + # merchants are users with > 0 products + merchants = User.merchants + + merchants.each do |merchant| + # Not sure why this doesn't work: + # expect(merchant.products).must_be :>, 2 + expect(merchant).must_be_kind_of User + end + + expect(merchants).must_be_kind_of Array end + it 'can return a hash with all of a current users related carts' do + pending_orders = @user.merchant_orders( status = "pending") + + # OK need to add some orders for this user! + p pending_orders.length + p pending_orders + + expect(pending_orders).must_be_kind_of Hash + + # Once there are orders + # Expect pending_orders.first (I cant do that with a hash, right? Or have to use pending_orders[1] ? ) .must_be_kind_of Cart + # select that cart, that Cart must include cart items where the product is one of this user's products + + end + + it 'will return an empty hash if user has no currents carts' do + pending_orders = @user.merchant_orders( status = "pending") + + expect(pending_orders).must_be_kind_of Hash + expect(pending_orders).must_be_empty + end end end From 3684b8370a1f199a7a45e6945e20508d99b70976 Mon Sep 17 00:00:00 2001 From: r-spiel Date: Sun, 22 Nov 2020 21:13:52 -0800 Subject: [PATCH 160/248] fix no ending div in cart show page --- app/views/carts/show.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/carts/show.html.erb b/app/views/carts/show.html.erb index 14de7fcb95..c8919c905f 100644 --- a/app/views/carts/show.html.erb +++ b/app/views/carts/show.html.erb @@ -21,7 +21,7 @@ <%= link_to item.product.name, product_path(item.product.id)%> 		-
$<%= '%.2f' %item.cost %>
+
$<%= '%.2f' %item.cost %>
<%= button_to "-", reduce_path(item.id) %>
@@ -29,7 +29,7 @@
<%= button_to "+", add_path(item.id) %>
 -
$<%= '%.2f' %item.cartitem_subtotal %>
+
$<%= '%.2f' %item.cartitem_subtotal %>
 <%= link_to "X", cartitem_path(item), method: :delete %> From 7f6a592b519032fdf88ffa9446bb5bdb5fb21a8c Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Sun, 22 Nov 2020 21:47:09 -0800 Subject: [PATCH 161/248] Playing with image rendering --- app/models/product.rb | 3 ++- app/views/products/show.html.erb | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/models/product.rb b/app/models/product.rb index 2757bdd65d..f45082ee9e 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -3,7 +3,8 @@ class Product < ApplicationRecord has_and_belongs_to_many :categories belongs_to :user - validates :name, :description, :image, presence: true + validates :name, presence: true, uniqueness: true + validates :description, presence: true validates :inventory, :cost, presence: true, numericality: { greater_than: 0 } validates :category_ids, presence: true diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 400dc8d8f9..149dabe2f6 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -1,7 +1,11 @@

<%= @product.name %>

- <%= image_tag(@product.image) %> + <% if @product.image %> + <%= image_tag(@product.image) %> + <% else %> + <%= image_tag("https://placebear.com/360/360") %> + <% end %>
From fd33dcf580915eec1cfa8ba20fa3d3cab265dcc3 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Sun, 22 Nov 2020 21:51:59 -0800 Subject: [PATCH 162/248] migrated and dropped order table --- db/schema.rb | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 39e79d9d11..5cb3356847 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -52,21 +52,6 @@ t.index ["product_id"], name: "index_categories_products_on_product_id" end - create_table "orders", force: :cascade do |t| - t.string "status" - t.string "email" - t.string "mailing_address" - t.string "name" - t.string "cc_number" - t.string "cc_expiration" - t.string "cc_cvv" - t.string "zip" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false - t.bigint "cart_id" - t.index ["cart_id"], name: "index_orders_on_cart_id" - end - create_table "products", force: :cascade do |t| t.string "name" t.integer "inventory" From 39b184f5d7dbe60e39f2d622e2a76340a552139d Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 08:58:51 -0800 Subject: [PATCH 163/248] css bootstrap - show number of cart items next to cart image --- app/assets/stylesheets/application.scss | 2 +- app/views/carts/show.html.erb | 2 +- app/views/layouts/application.html.erb | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 14f528d26c..66d768b768 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -118,7 +118,7 @@ container { padding-bottom: .5rem; } -span { +span.total { margin-left: 8rem; } diff --git a/app/views/carts/show.html.erb b/app/views/carts/show.html.erb index 14de7fcb95..b042f5f4fc 100644 --- a/app/views/carts/show.html.erb +++ b/app/views/carts/show.html.erb @@ -43,7 +43,7 @@

SUMMARY

-
Total Cost: $<%= '%.2f' %@cart.total_price %>
+
Total Cost: $<%= '%.2f' %@cart.total_price %>
<%= button_to "Check out", purchase_form_path, method: :get %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index fd9e2c061a..6990979f2b 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -30,7 +30,10 @@
+
<%= link_to image_tag( "shopping-cart.png", alt: "shopping cart", width: "60rem" ), cart_path(session[:cart_id]), method: :get %> + <%=@current_cart.cartitems.count %> +
From ff1920bb524ffafe14a06d79f464f6a5c83686bc Mon Sep 17 00:00:00 2001 From: r-spiel Date: Mon, 23 Nov 2020 11:17:54 -0800 Subject: [PATCH 164/248] delete new method from category controller --- app/controllers/categories_controller.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb index b62ffd0e15..6beea9c240 100644 --- a/app/controllers/categories_controller.rb +++ b/app/controllers/categories_controller.rb @@ -1,10 +1,6 @@ class CategoriesController < ApplicationController before_action :require_login - def new - @category = Category.new - end - def create @category = Category.new(category_params) if @category.save From 9e6c12b78a3ad34d103c926fa4ecc81f9725aff9 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Mon, 23 Nov 2020 11:39:21 -0800 Subject: [PATCH 165/248] omg lina helped my tests pass --- app/controllers/carts_controller.rb | 3 --- test/controllers/carts_controller_test.rb | 12 +++++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/controllers/carts_controller.rb b/app/controllers/carts_controller.rb index 4c24e16040..9c260feb86 100644 --- a/app/controllers/carts_controller.rb +++ b/app/controllers/carts_controller.rb @@ -12,8 +12,6 @@ def purchase_form def purchase @cart = @current_cart - # have to change order type first in order for validation to hold.. - # updates local variable but not database @cart.assign_attributes(status: "paid") # raise @@ -22,7 +20,6 @@ def purchase flash[:success] = "Your order has been placed!" @cart.update_item_fulfillment @cart.save - flash[:success] = "your stuff was ordered" @cart.update_inventory session[:cart_id] = nil current_cart diff --git a/test/controllers/carts_controller_test.rb b/test/controllers/carts_controller_test.rb index fb60032341..5f4105483c 100644 --- a/test/controllers/carts_controller_test.rb +++ b/test/controllers/carts_controller_test.rb @@ -73,13 +73,16 @@ describe "purchase" do it "can purchase a cart for a guest" do - skip + get root_path # why doesnt this work - # puts session[:cart_id] - patch cart_path(@cart.id), params: paid_cart_hash puts session[:cart_id] + cart = session[:cart_id] + patch cart_path(cart), params: paid_cart_hash + + new_cart = Cart.find(cart) + # puts session[:cart_id] # why is this still pending? - puts @cart.status + puts new_cart.status # skip # updates cart status # check flash message @@ -90,7 +93,6 @@ it "can purchase a cart for a logged in user" do perform_login - # the fixture doesnt work here? why? cart = session[:cart_id] patch cart_path(cart), params: paid_cart_hash From 2fcb4bcc21d27b16f228ff96ea203fd327e86d40 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 11:42:08 -0800 Subject: [PATCH 166/248] created review model --- app/models/review.rb | 2 ++ db/migrate/20201123194136_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/20201123194136_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/20201123194136_create_reviews.rb b/db/migrate/20201123194136_create_reviews.rb new file mode 100644 index 0000000000..13a7d45257 --- /dev/null +++ b/db/migrate/20201123194136_create_reviews.rb @@ -0,0 +1,10 @@ +class CreateReviews < ActiveRecord::Migration[6.0] + def change + create_table :reviews do |t| + t.integer :rating + t.string :description + + 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 4845ad2ddd69a2c863d508e10c89ada495ba8714 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 11:43:01 -0800 Subject: [PATCH 167/248] created reviews controller --- app/assets/stylesheets/reviews.scss | 3 +++ app/controllers/reviews_controller.rb | 2 ++ app/helpers/reviews_helper.rb | 2 ++ test/controllers/reviews_controller_test.rb | 7 +++++++ 4 files changed, 14 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..da98aabdd8 --- /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..b3d77cc1c3 --- /dev/null +++ b/app/controllers/reviews_controller.rb @@ -0,0 +1,2 @@ +class ReviewsController < ApplicationController +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/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 d9a10449a03faa57e4683d043fc4d4a0c37b3889 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 11:44:22 -0800 Subject: [PATCH 168/248] added relationships between product and review --- app/models/product.rb | 1 + app/models/review.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/app/models/product.rb b/app/models/product.rb index 8ff8332022..b4af5da93e 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -2,6 +2,7 @@ class Product < ApplicationRecord has_many :cartitems has_and_belongs_to_many :categories belongs_to :user + has_many :reviews validates :name, presence: true, uniqueness: true validates :description, presence: true diff --git a/app/models/review.rb b/app/models/review.rb index b2ca4935ed..949d4ccddb 100644 --- a/app/models/review.rb +++ b/app/models/review.rb @@ -1,2 +1,3 @@ class Review < ApplicationRecord + belongs_to :product end From a7e4089949c42326e3105baf4187d6aec0c556aa Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 11:49:16 -0800 Subject: [PATCH 169/248] relate reviews to products migration --- db/migrate/20201123194722_relate_reviews_to_products.rb | 5 +++++ db/schema.rb | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20201123194722_relate_reviews_to_products.rb diff --git a/db/migrate/20201123194722_relate_reviews_to_products.rb b/db/migrate/20201123194722_relate_reviews_to_products.rb new file mode 100644 index 0000000000..457870b180 --- /dev/null +++ b/db/migrate/20201123194722_relate_reviews_to_products.rb @@ -0,0 +1,5 @@ +class RelateReviewsToProducts < ActiveRecord::Migration[6.0] + def change + add_reference :reviews, :product, index:true + end +end diff --git a/db/schema.rb b/db/schema.rb index 2268435fdc..01a25cfac8 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_11_22_004311) do +ActiveRecord::Schema.define(version: 2020_11_23_194136) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -65,6 +65,13 @@ t.index ["user_id"], name: "index_products_on_user_id" end + create_table "reviews", force: :cascade do |t| + t.integer "rating" + t.string "description" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + create_table "users", force: :cascade do |t| t.string "username" t.string "name" From 074eccad423325a88be3abc5365bad787685bcd5 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 12:12:22 -0800 Subject: [PATCH 170/248] added create action method for review, product nested route --- app/controllers/reviews_controller.rb | 17 +++++++++++++++++ app/views/products/show.html.erb | 2 ++ config/routes.rb | 5 ++++- db/schema.rb | 4 +++- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/app/controllers/reviews_controller.rb b/app/controllers/reviews_controller.rb index b3d77cc1c3..e454db8ee6 100644 --- a/app/controllers/reviews_controller.rb +++ b/app/controllers/reviews_controller.rb @@ -1,2 +1,19 @@ class ReviewsController < ApplicationController + + def create + + product = Product.find_by(id: params[:product_id]) + @review = Review.new(product: product, rating: params[:review][:rating], description: params[:review][:description] ) + @review.product = product + if @review.save + flash[:success] = 'Thank you for your review' + redirect_to product_path(product.id) + return + else + flash.now[:failure] = 'Review was not successfully created.' + render product_path(product.id) + return + end + end + end diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 149dabe2f6..1c626331b5 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -26,6 +26,8 @@ <%= link_to 'Delete', product_path(@product), method: :delete, data: { confirm: "Are you sure?"} %> <% end %> + <%#= form_with url: %> + <%= button_to "Add to Cart", add_to_cart_path(@product.id) %> <%= link_to 'Back', products_path %> diff --git a/config/routes.rb b/config/routes.rb index fe5cd19346..1f620d51e3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,7 +3,9 @@ get 'categories/create' get 'categories/index' - resources :products + resources :products do + resources :reviews, only:[:create] + end # moved adding item to cart from cartitem controller to product post "/products/:id/add_to_cart,", to: "products#add_to_cart", as: "add_to_cart" @@ -39,4 +41,5 @@ post 'cartitems/:id/add', to: "cartitems#add_qty", as: "add" post 'cartitems/:id/reduce', to: "cartitems#reduce_qty", as: "reduce" patch 'cartitems/:id', to: 'cartitems#update_status', as: 'update_status' + end diff --git a/db/schema.rb b/db/schema.rb index 01a25cfac8..63a96e2d27 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_11_23_194136) do +ActiveRecord::Schema.define(version: 2020_11_23_194722) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -70,6 +70,8 @@ t.string "description" 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 create_table "users", force: :cascade do |t| From 71f3043c4b4efbf898eea4fd44e47f2aac8794a6 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 12:40:31 -0800 Subject: [PATCH 171/248] worked on the create method in reviews and added review section to product show page --- app/controllers/reviews_controller.rb | 2 +- app/views/products/show.html.erb | 36 ++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/app/controllers/reviews_controller.rb b/app/controllers/reviews_controller.rb index e454db8ee6..9a75e13c49 100644 --- a/app/controllers/reviews_controller.rb +++ b/app/controllers/reviews_controller.rb @@ -3,7 +3,7 @@ class ReviewsController < ApplicationController def create product = Product.find_by(id: params[:product_id]) - @review = Review.new(product: product, rating: params[:review][:rating], description: params[:review][:description] ) + @review = Review.new(product: product, rating: params[:rating], description: params[:description] ) @review.product = product if @review.save flash[:success] = 'Thank you for your review' diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 1c626331b5..4c3af49836 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -26,7 +26,41 @@ <%= link_to 'Delete', product_path(@product), method: :delete, data: { confirm: "Are you sure?"} %> <% end %> - <%#= form_with url: %> +
+
Please rate product
+ <%= form_with url: product_reviews_path(@product.id) do |f| %> +

Rating:

+ <%= f.radio_button :rating, 1 %> + <%= f.label "1"%> + + <%= f.radio_button :rating, 2 %> + <%= f.label "2"%> + + <%= f.radio_button :rating, 3 %> + <%= f.label "3"%> + + <%= f.radio_button :rating, 4 %> + <%= f.label "4"%> + + <%= f.radio_button :rating, 5 %> + <%= f.label "5"%> +
+ <%= f.label :description %> + <%= f.text_area :description %> + + <%= f.submit "Submit" %> + + <% end %> +
+ + <% if @product.reviews.any? %> + <% @product.reviews.each do |review| %> +

Review

+

Rating: <%= review.rating %>

+

Description: <%= review.description %>

+ <% end %> + <% end %> + <%= button_to "Add to Cart", add_to_cart_path(@product.id) %> From 07f2b7425d386d4662d0b3da3b298a3e1b4fc4f0 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 13:26:19 -0800 Subject: [PATCH 172/248] add strong params for review, and added model to form --- app/controllers/products_controller.rb | 2 +- app/controllers/reviews_controller.rb | 9 +++++++-- app/views/products/show.html.erb | 15 +++++++-------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 2ba2f4c2f6..6aabfeecaf 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -26,7 +26,7 @@ def authorized? end def show - + @review = Review.new end def new diff --git a/app/controllers/reviews_controller.rb b/app/controllers/reviews_controller.rb index 9a75e13c49..92f769a057 100644 --- a/app/controllers/reviews_controller.rb +++ b/app/controllers/reviews_controller.rb @@ -1,9 +1,9 @@ class ReviewsController < ApplicationController def create - product = Product.find_by(id: params[:product_id]) - @review = Review.new(product: product, rating: params[:rating], description: params[:description] ) + # @review = Review.new(product: product, rating: params[:rating], description: params[:description] ) + @review = Review.new(review_params) @review.product = product if @review.save flash[:success] = 'Thank you for your review' @@ -16,4 +16,9 @@ def create end end + private + + def review_params + return params.require(:review).permit(:rating, :description) + end end diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 4c3af49836..3b21e7ec20 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -27,9 +27,9 @@ <% end %>
-
Please rate product
- <%= form_with url: product_reviews_path(@product.id) do |f| %> -

Rating:

+
Send a review
+ <%= form_with model: @review, url: product_reviews_path(@product.id) do |f| %> + <%= f.label :rating %>: <%= f.radio_button :rating, 1 %> <%= f.label "1"%> @@ -45,17 +45,16 @@ <%= f.radio_button :rating, 5 %> <%= f.label "5"%>
- <%= f.label :description %> + <%= f.label :description, "Review Content" %> <%= f.text_area :description %> - +
<%= f.submit "Submit" %> - <% end %>
<% if @product.reviews.any? %> - <% @product.reviews.each do |review| %> -

Review

+ <% @product.reviews.each_with_index do |review, i| %> +
Review <%= i+1 %>

Rating: <%= review.rating %>

Description: <%= review.description %>

<% end %> From e3538d780019abe54244bfb46761f8c62aece1de Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Mon, 23 Nov 2020 14:03:57 -0800 Subject: [PATCH 173/248] navbar is pretty functional --- Gemfile | 2 + app/assets/stylesheets/application.scss | 210 ++++++++++++------------ app/views/layouts/application.html.erb | 147 ++++++++++------- app/views/products/index.html.erb | 12 ++ app/views/products/new.html.erb | 2 +- 5 files changed, 211 insertions(+), 162 deletions(-) diff --git a/Gemfile b/Gemfile index a4874b3e6a..19bcf37d55 100644 --- a/Gemfile +++ b/Gemfile @@ -85,3 +85,5 @@ group :test do gem 'minitest-rails' gem 'minitest-reporters' end + +gem "bootstrap" \ No newline at end of file diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 66d768b768..b008da67d4 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -20,108 +20,108 @@ @import url('https://fonts.googleapis.com/css2?family=Chango&family=Lemon&display=swap'); -header h1 a { - color: white; - font-family: Chango; - -webkit-text-stroke: 2px dodgerblue; - letter-spacing: .2em; -} - -header h1 a:hover { - text-decoration: none; - color: darkblue; -} - -main { - display: grid; - grid-template-columns: 280px auto; - grid-template-rows: auto auto 70px; - grid-template-areas: - "header header" - "menu yield" - "footer footer" - ; -} - -header { - padding: 10px; - grid-area: header; -} - -menu { - padding: 10px; - grid-area: menu; - margin: 0; - background: lightblue; -} - -body { - grid-area: yield; -} - -footer { - grid-area: footer; - background: black; -} - -container { - padding: 10px; -} - -.quantity-container { - display: flex; - justify-content: center; -} - -.quantity-container div { - width: 2rem; - text-align: center; - align-self: center; -} - -.cart-image img { - padding: 5px; - width: 8vw; -} - -.row-height { - height: 10rem; - text-align: center; -} - -.cart-table-columns { - text-align: center; -} - -.cart-table { - width: 80%; - margin-left: 7rem; - -} - -.checkout { - - margin-left: auto; - margin-right: 12rem; - width: 25rem; - height: 10rem; - background: lightpink; -} - -.summary-container { - padding-left: 3rem; - padding-right: 3rem; - padding-top: 2rem; -} - -.summary-container div { - padding-bottom: .5rem; -} - -span.total { - margin-left: 8rem; -} - -.checkout-button { - text-align: center; -} +//header h1 a { +// color: white; +// font-family: Chango; +// -webkit-text-stroke: 2px dodgerblue; +// letter-spacing: .2em; +//} +// +//header h1 a:hover { +// text-decoration: none; +// color: darkblue; +//} +// +//main { +// display: grid; +// grid-template-columns: 280px auto; +// grid-template-rows: auto auto 70px; +// grid-template-areas: +// "header header" +// "menu yield" +// "footer footer" +// ; +//} +// +//header { +// padding: 10px; +// grid-area: header; +//} +// +//menu { +// padding: 10px; +// grid-area: menu; +// margin: 0; +// background: lightblue; +//} +// +//body { +// grid-area: yield; +//} +// +//footer { +// grid-area: footer; +// background: black; +//} +// +//container { +// padding: 10px; +//} +// +//.quantity-container { +// display: flex; +// justify-content: center; +//} +// +//.quantity-container div { +// width: 2rem; +// text-align: center; +// align-self: center; +//} +// +//.cart-image img { +// padding: 5px; +// width: 8vw; +//} +// +//.row-height { +// height: 10rem; +// text-align: center; +//} +// +//.cart-table-columns { +// text-align: center; +//} +// +//.cart-table { +// width: 80%; +// margin-left: 7rem; +// +//} +// +//.checkout { +// +// margin-left: auto; +// margin-right: 12rem; +// width: 25rem; +// height: 10rem; +// background: lightpink; +//} +// +//.summary-container { +// padding-left: 3rem; +// padding-right: 3rem; +// padding-top: 2rem; +//} +// +//.summary-container div { +// padding-bottom: .5rem; +//} +// +//span.total { +// margin-left: 8rem; +//} +// +//.checkout-button { +// text-align: center; +//} diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 17a4ea5c69..86241e0576 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,73 +1,108 @@ - - swEtsy - <%= csrf_meta_tags %> - <%= csp_meta_tag %> - - - - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> - - -
-
-

- <%= link_to "swEtsy💦", root_path %> -

- - - <% if session[:user_id] %> - <%= link_to "Logged in as #{@current_user.name}", current_user_path %> - <% end %> - + + swEtsy + <%= csrf_meta_tags %> + <%= csp_meta_tag %> - + -
-
- <%= link_to image_tag( "shopping-cart.png", alt: "shopping cart", width: "60rem" ), cart_path(session[:cart_id]), method: :get %> - <%=@current_cart.cartitems.count %> -
-
+ <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> + -
+
- - <%= link_to "All Products", products_path %>
+ + + + +
- +
<% flash.each do |name, message| %>

@@ -77,7 +112,7 @@

<%= yield %> - +
diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index b36ab0d6f1..043e0008b2 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -7,6 +7,18 @@

All Products

<% end %> + + +
+
+ Card header image +
Product Name
+

Product Price

+ + +
+
+ diff --git a/app/views/products/new.html.erb b/app/views/products/new.html.erb index ddc71cd1c5..0a11ca1523 100644 --- a/app/views/products/new.html.erb +++ b/app/views/products/new.html.erb @@ -1,4 +1,4 @@ -
+
<% if @product.errors.any? %>
    <% @product.errors.each do |column, message| %> From a21c5d882d1d3559422a0c0b89dd709df0ea2d37 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Mon, 23 Nov 2020 14:28:19 -0800 Subject: [PATCH 174/248] cart purchase tests passing --- test/controllers/carts_controller_test.rb | 86 +++++++++++++++-------- 1 file changed, 57 insertions(+), 29 deletions(-) diff --git a/test/controllers/carts_controller_test.rb b/test/controllers/carts_controller_test.rb index 5f4105483c..bef0257f12 100644 --- a/test/controllers/carts_controller_test.rb +++ b/test/controllers/carts_controller_test.rb @@ -72,43 +72,71 @@ describe "purchase" do - it "can purchase a cart for a guest" do - get root_path - # why doesnt this work - puts session[:cart_id] - cart = session[:cart_id] - patch cart_path(cart), params: paid_cart_hash - - new_cart = Cart.find(cart) - # puts session[:cart_id] - # why is this still pending? - puts new_cart.status - # skip - # updates cart status - # check flash message - # make sure cart empties - # make sure redirects correctly - end + describe "logged in customer" do + it "can purchase a cart for a logged in user" do + perform_login - it "can purchase a cart for a logged in user" do - perform_login + cart = session[:cart_id] - cart = session[:cart_id] + patch cart_path(cart), params: paid_cart_hash - patch cart_path(cart), params: paid_cart_hash + new_cart = Cart.find(cart) - new_cart = Cart.find(cart) + expect(flash[:success]).must_equal "Your order has been placed!" + expect(new_cart.status).must_equal "paid" + must_redirect_to view_confirmation_path(new_cart.id) + expect(Cart.find(session[:cart_id]).cartitems.length).must_equal 0 + + end + + it "redirects when there's an issue with placing the order" do + perform_login + paid_cart_hash[:cart][:email] = nil + + cart = session[:cart_id] + + patch cart_path(cart), params: paid_cart_hash + + new_cart = Cart.find(cart) + + expect(flash[:error]).must_equal "There was an error in placing your order" + expect(new_cart.status).must_equal "pending" + must_respond_with :bad_request + end - expect(flash[:success]).must_equal "Your order has been placed!" - expect(new_cart.status).must_equal "paid" - must_redirect_to view_confirmation_path(new_cart.id) - expect(Cart.find(session[:cart_id]).cartitems.length).must_equal 0 end - it "redirects when there's an issue with placing the order" do - skip + describe "guest customer" do + it "can purchase a cart for a guest" do + get root_path + + cart = session[:cart_id] + patch cart_path(cart), params: paid_cart_hash + + new_cart = Cart.find(cart) + + expect(flash[:success]).must_equal "Your order has been placed!" + expect(new_cart.status).must_equal "paid" + must_redirect_to view_confirmation_path(new_cart.id) + expect(Cart.find(session[:cart_id]).cartitems.length).must_equal 0 + end + + it "redirects when there's an issue with placing the order" do + get root_path + + paid_cart_hash[:cart][:email] = nil + + cart = session[:cart_id] + + patch cart_path(cart), params: paid_cart_hash + + new_cart = Cart.find(cart) + + expect(flash[:error]).must_equal "There was an error in placing your order" + expect(new_cart.status).must_equal "pending" + must_respond_with :bad_request + end end end - end From b7a9b49f5c1c587466e39fee190d66dc68ff5d9c Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Mon, 23 Nov 2020 14:34:29 -0800 Subject: [PATCH 175/248] require 16 character cc number --- app/models/cart.rb | 3 ++- test/controllers/carts_controller_test.rb | 2 +- test/models/cart_test.rb | 8 ++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/models/cart.rb b/app/models/cart.rb index 40e9c7cd5c..fae65415a8 100644 --- a/app/models/cart.rb +++ b/app/models/cart.rb @@ -3,7 +3,8 @@ class Cart < ApplicationRecord has_many :products, through: :cartitems validates_presence_of :email, :mailing_address, :name, :cc_number, :cc_expiration, :cc_cvv, :zip, :if => lambda {self.status != "pending"} - + validates_length_of :cc_number, minimum: 16, maximum: 16, :if => lambda {self.status != "pending"} + def update_inventory self.cartitems.each do |item| product = item.product diff --git a/test/controllers/carts_controller_test.rb b/test/controllers/carts_controller_test.rb index bef0257f12..34ec5937da 100644 --- a/test/controllers/carts_controller_test.rb +++ b/test/controllers/carts_controller_test.rb @@ -124,7 +124,7 @@ it "redirects when there's an issue with placing the order" do get root_path - + paid_cart_hash[:cart][:email] = nil cart = session[:cart_id] diff --git a/test/models/cart_test.rb b/test/models/cart_test.rb index ac8938080c..74a75aed19 100644 --- a/test/models/cart_test.rb +++ b/test/models/cart_test.rb @@ -35,6 +35,14 @@ expect(@cart.valid?).must_equal false end end + + it "requires a 16 character credit card number when status is not pending" do + @cart.cc_number = "12" + ["paid", "complete", "cancelled"].each do |status| + @cart.status = status + expect(@cart.valid?).must_equal false + end + end end describe "relations" do From 96e100c85aa33c981fcce2e899e2b9e572dd007d Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Mon, 23 Nov 2020 14:41:06 -0800 Subject: [PATCH 176/248] product cards and buttons --- app/assets/stylesheets/application.scss | 32 +++++++++----- app/views/layouts/application.html.erb | 24 +++++------ app/views/products/index.html.erb | 56 ++++++++++--------------- 3 files changed, 54 insertions(+), 58 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index b008da67d4..231a7c6dc4 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -19,18 +19,28 @@ @import url('https://fonts.googleapis.com/css2?family=Chango&family=Lemon&display=swap'); +header h1 a { + color: white; + font-family: Chango; + font-size: 2em; + -webkit-text-stroke: 2px dodgerblue; + letter-spacing: .2em; +} + +header h1 a:hover { + text-decoration: none; + color: darkblue; +} + +a:hover { + text-decoration: none; +} + +button.btn a { + color: white; +} + -//header h1 a { -// color: white; -// font-family: Chango; -// -webkit-text-stroke: 2px dodgerblue; -// letter-spacing: .2em; -//} -// -//header h1 a:hover { -// text-decoration: none; -// color: darkblue; -//} // //main { // display: grid; diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 86241e0576..ae59d9c918 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -102,17 +102,17 @@ - -
    - <% flash.each do |name, message| %> -

    - <%= message %> -

    - <% end %> -
    - - <%= yield %> -     + +
    + <% flash.each do |name, message| %> +

    + <%= message %> +

    + <% end %> +
    + + <%= yield %> +     - + diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index 043e0008b2..8184c9abf9 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -1,4 +1,5 @@ - + + <% if params[:category_id] %>

    <%= @category.name.capitalize %>

    <% elsif params[:user_id] %> @@ -7,43 +8,28 @@

    All Products

    <% end %> +
    + <% @products.each do |product| %> +
    +
    +
    + Product image +
    <%= link_to product.name, product_path(product.id) %>
    +

    <%= product.cost %>

    - -
    -
    - Card header image -
    Product Name
    -

    Product Price

    - - -
    -
    - -
- - - - - - - - <% @products.each do |product| %> - - <% if product.owner(@current_user) %> - - + + <% end %> - - <% end %> - -
<%= link_to product.name, product %><%= link_to 'Edit', edit_product_path(product) %><%= link_to 'Delete', product_path(product), method: :delete, data: { confirm: 'Are you sure?' } %>
- -
-
- <% if session[:user_id] %> - <%= button_to 'Add New Product', new_product_path, method: :get %> +
+ + <% end %> - + +
+ <% if session[:user_id] %> + + <% end %> +
From e67a5eb25cdbd87b6e85b2ad0a71bee0d71173ce Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 14:48:33 -0800 Subject: [PATCH 177/248] added a new migration tro add name column to review --- app/controllers/reviews_controller.rb | 2 +- db/migrate/20201123224708_add_name_to_review.rb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20201123224708_add_name_to_review.rb diff --git a/app/controllers/reviews_controller.rb b/app/controllers/reviews_controller.rb index 92f769a057..5c2b714991 100644 --- a/app/controllers/reviews_controller.rb +++ b/app/controllers/reviews_controller.rb @@ -2,8 +2,8 @@ class ReviewsController < ApplicationController def create product = Product.find_by(id: params[:product_id]) - # @review = Review.new(product: product, rating: params[:rating], description: params[:description] ) @review = Review.new(review_params) + @review.product = product if @review.save flash[:success] = 'Thank you for your review' diff --git a/db/migrate/20201123224708_add_name_to_review.rb b/db/migrate/20201123224708_add_name_to_review.rb new file mode 100644 index 0000000000..ec0ffb437b --- /dev/null +++ b/db/migrate/20201123224708_add_name_to_review.rb @@ -0,0 +1,5 @@ +class AddNameToReview < ActiveRecord::Migration[6.0] + def change + add_column :reviews, :name, :string + end +end From 6fdd0e0dc522b2a43ddad268f116542e11d747c4 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 14:58:59 -0800 Subject: [PATCH 178/248] added name to strong params, changed the product view to show the section for name on the review form --- app/controllers/reviews_controller.rb | 2 +- app/views/products/show.html.erb | 15 ++++++++++----- db/schema.rb | 3 ++- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/controllers/reviews_controller.rb b/app/controllers/reviews_controller.rb index 5c2b714991..3dd260ab0f 100644 --- a/app/controllers/reviews_controller.rb +++ b/app/controllers/reviews_controller.rb @@ -19,6 +19,6 @@ def create private def review_params - return params.require(:review).permit(:rating, :description) + return params.require(:review).permit(:name, :rating, :description) end end diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 3b21e7ec20..ded68110c4 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -27,8 +27,12 @@ <% end %>
-
Send a review
+
Add a review
<%= form_with model: @review, url: product_reviews_path(@product.id) do |f| %> + <%= f.label :name %> + <%= f.text_field :name %> +
+ <%= f.label :rating %>: <%= f.radio_button :rating, 1 %> <%= f.label "1"%> @@ -45,17 +49,18 @@ <%= f.radio_button :rating, 5 %> <%= f.label "5"%>
- <%= f.label :description, "Review Content" %> + <%= f.label :description, "Review" %> <%= f.text_area :description %>
- <%= f.submit "Submit" %> + <%= f.submit "Submit Review" %> <% end %>
<% if @product.reviews.any? %> - <% @product.reviews.each_with_index do |review, i| %> -
Review <%= i+1 %>
+

Reviews

+ <% @product.reviews.each do |review| %>

Rating: <%= review.rating %>

+

Reviewed on <%= review.created_at%> by <%= review.name %>

Description: <%= review.description %>

<% end %> <% end %> diff --git a/db/schema.rb b/db/schema.rb index 63a96e2d27..f2bd85b045 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_11_23_194722) do +ActiveRecord::Schema.define(version: 2020_11_23_224708) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -71,6 +71,7 @@ t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false t.bigint "product_id" + t.string "name" t.index ["product_id"], name: "index_reviews_on_product_id" end From d93a3939e7425428b0bb1000386d79d75cd20707 Mon Sep 17 00:00:00 2001 From: r-spiel Date: Mon, 23 Nov 2020 15:03:00 -0800 Subject: [PATCH 179/248] category tests, delete redundancies in route --- app/controllers/categories_controller.rb | 4 +- app/models/user.rb | 1 + config/routes.rb | 5 +- .../controllers/categories_controller_test.rb | 32 ++++++++---- test/models/category_test.rb | 5 +- test/models/user_test.rb | 50 +++++++++++++------ 6 files changed, 66 insertions(+), 31 deletions(-) diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb index 6beea9c240..36e80c42f6 100644 --- a/app/controllers/categories_controller.rb +++ b/app/controllers/categories_controller.rb @@ -3,7 +3,9 @@ class CategoriesController < ApplicationController def create @category = Category.new(category_params) - if @category.save + + p category_params + if @category.save! flash[:success] = 'Category was successfully created!' redirect_to products_path return diff --git a/app/models/user.rb b/app/models/user.rb index ff75d0b798..ec80e3b20e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -30,6 +30,7 @@ def self.merchants def merchant_orders(status) #from a user's cartitems, return the carts associated that have a certain cart status + # this guard clause below doesn't do anything? based on the tests return nil if self.nil? || self.cartitems.nil? merchant_cartitems = self.cartitems diff --git a/config/routes.rb b/config/routes.rb index fe5cd19346..c43c27fd63 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,4 @@ Rails.application.routes.draw do - get 'categories/new' - get 'categories/create' - get 'categories/index' resources :products # moved adding item to cart from cartitem controller to product @@ -12,7 +9,7 @@ resources :products, only:[:index] end - resources :categories, only:[:index, :new, :create] + resources :categories, only:[:create] root to: "products#index" diff --git a/test/controllers/categories_controller_test.rb b/test/controllers/categories_controller_test.rb index 5fb8e736fa..0df0c14f29 100644 --- a/test/controllers/categories_controller_test.rb +++ b/test/controllers/categories_controller_test.rb @@ -1,16 +1,30 @@ require "test_helper" describe CategoriesController do - it "must get new" do - skip - get categories_new_path - must_respond_with :success - end + describe 'create' do + it 'can create a new category' do + perform_login() + + new_category = { category: {name: "equipment"} } + + expect { + post categories_path, params: new_category + }.must_differ 'Category.count', 1 + + # expect the flash message + end + + it 'will not create a category if not logged in' do + # not logged in + + new_category = { category: {name: "equipment"} } + + expect { + post categories_path, params: new_category + }.wont_change 'Category.count' - it "must get create" do - skip - get categories_create_path - must_respond_with :success + # expect the flash message + end end end diff --git a/test/models/category_test.rb b/test/models/category_test.rb index 841a2edc6d..636bae147a 100644 --- a/test/models/category_test.rb +++ b/test/models/category_test.rb @@ -1,7 +1,6 @@ require "test_helper" describe Category do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + + end diff --git a/test/models/user_test.rb b/test/models/user_test.rb index a26ab8ed23..521cef5aae 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -77,42 +77,64 @@ describe 'methods' do before do - @user = users(:ada) + @user_ada = users(:ada) end it 'can find all merchants (users w/ > 0 products)' do # merchants are users with > 0 products merchants = User.merchants + expect(merchants).must_be_kind_of Array merchants.each do |merchant| - # Not sure why this doesn't work: - # expect(merchant.products).must_be :>, 2 + expect(merchant.products.length > 0 ).must_equal true expect(merchant).must_be_kind_of User end - - expect(merchants).must_be_kind_of Array end it 'can return a hash with all of a current users related carts' do - pending_orders = @user.merchant_orders( status = "pending") + # key of the hash is the cart id, value is the Cart object + pending_orders = @user_ada.merchant_orders( status = "pending") + user_product_ids = [] - # OK need to add some orders for this user! - p pending_orders.length - p pending_orders + # this user (:ada) has 3 products + @user_ada.products.each do |product| + user_product_ids << product.id + end expect(pending_orders).must_be_kind_of Hash - # Once there are orders - # Expect pending_orders.first (I cant do that with a hash, right? Or have to use pending_orders[1] ? ) .must_be_kind_of Cart - # select that cart, that Cart must include cart items where the product is one of this user's products + pending_orders.each do |cart_id, cart| + expect(cart).must_be_kind_of Cart + expect(cart.id == cart_id).must_equal true + + # Set up for: expecting that of the cartitems in the selected cart, must include at least one of the user's products + is_user_product = [] # an array of boolean values + cart.cartitems.each do |item| + user_product_ids.include? (item.product_id) ? (is_user_product << true) : (is_user_product << false) + end + expect(is_user_product.include? (true)).must_equal true + end end - it 'will return an empty hash if user has no currents carts' do + it 'will return an empty hash if user has no products in current carts' do + skip + # not working, 'undefined method 'merchant_orders' for nil class + Cart.all.each do |cart| + cart.destroy + end + + Cartitem.all.each do |item| + item.destroy + end + pending_orders = @user.merchant_orders( status = "pending") + p @user + expect(@user).must_be_kind_of User + expect(pending_orders).must_be_kind_of Hash - expect(pending_orders).must_be_empty + #expect(pending_orders).must_be_empty end end end From 11f1e985007dd845d784d5228ef1d46468b7c696 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 15:27:40 -0800 Subject: [PATCH 180/248] added error messages to review to application --- app/controllers/reviews_controller.rb | 5 +++-- app/models/review.rb | 3 +++ app/views/layouts/application.html.erb | 17 ++++++++++++++--- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/app/controllers/reviews_controller.rb b/app/controllers/reviews_controller.rb index 3dd260ab0f..0492987546 100644 --- a/app/controllers/reviews_controller.rb +++ b/app/controllers/reviews_controller.rb @@ -10,8 +10,9 @@ def create redirect_to product_path(product.id) return else - flash.now[:failure] = 'Review was not successfully created.' - render product_path(product.id) + flash[:failure] = 'Review was not successfully created.' + flash[:messages] = @review.errors.messages + redirect_to product_path(product.id) return end end diff --git a/app/models/review.rb b/app/models/review.rb index 949d4ccddb..1a9162ab9e 100644 --- a/app/models/review.rb +++ b/app/models/review.rb @@ -1,3 +1,6 @@ class Review < ApplicationRecord belongs_to :product + + validates :name, presence: true + validates :rating, presence: true end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 17a4ea5c69..edec41f9ae 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -70,10 +70,21 @@
<% flash.each do |name, message| %> -

- <%= message %> -

+ <% if name == "messages" %> +
    + <% message.each do |name, problem| %> + <% problem.each do |problem| %> +
  • <%= name %>: <%= problem %>
    • + <% end %> + <% end %> +
+ <% else %> +

+ <%= message %> +

+ <% end %> <% end %> +
<%= yield %> From e840fab65c0a143317000b326cdb144ccea7f40a Mon Sep 17 00:00:00 2001 From: r-spiel Date: Mon, 23 Nov 2020 15:27:41 -0800 Subject: [PATCH 181/248] test updates' --- .../controllers/categories_controller_test.rb | 5 ++- test/models/category_test.rb | 37 +++++++++++++++++++ test/models/user_test.rb | 3 +- 3 files changed, 42 insertions(+), 3 deletions(-) diff --git a/test/controllers/categories_controller_test.rb b/test/controllers/categories_controller_test.rb index 0df0c14f29..70a1e70131 100644 --- a/test/controllers/categories_controller_test.rb +++ b/test/controllers/categories_controller_test.rb @@ -11,7 +11,7 @@ post categories_path, params: new_category }.must_differ 'Category.count', 1 - # expect the flash message + expect(flash[:success]).must_equal "Category was successfully created!" end it 'will not create a category if not logged in' do @@ -23,7 +23,8 @@ post categories_path, params: new_category }.wont_change 'Category.count' - # expect the flash message + # flash failure didn't pick up from test + #expect(flash[:failure]).must_equal "Category was not successfully created." end end diff --git a/test/models/category_test.rb b/test/models/category_test.rb index 636bae147a..3c51367ce1 100644 --- a/test/models/category_test.rb +++ b/test/models/category_test.rb @@ -1,6 +1,43 @@ require "test_helper" describe Category do + describe 'validations' do + it 'is valid with unique name' do + category = Category.new(name: 'Joggers') + expect(category.valid?).must_equal true + + gear = Category.find_by(name: 'gear') + expect(gear.valid?).must_equal true + end + + it 'is invalid without a name' do + category = Category.new(name: nil) + + expect(category.valid?).must_equal false + end + + it 'is invalid if name is not unique' do + category = Category.new(name: 'gear') + + expect(category.valid?).must_equal false + end + + end + + describe 'relations' do + it'has many products' do + gear = Category.find_by(name: 'gear') + + # p gear.products + # expect(gear.products.length > 1).must_equal true + + end + + it 'a product can be added to a category' do + + end + end + end diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 521cef5aae..651b5b4121 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -129,11 +129,12 @@ end pending_orders = @user.merchant_orders( status = "pending") + p pending_orders - p @user expect(@user).must_be_kind_of User expect(pending_orders).must_be_kind_of Hash + #expect(pending_orders).must_be_empty end end From 2a6beabe9e8acb9d6bacab8285023857044504d1 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 15:40:10 -0800 Subject: [PATCH 182/248] added a custom message to rating validator --- app/models/review.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/review.rb b/app/models/review.rb index 1a9162ab9e..1647b973ef 100644 --- a/app/models/review.rb +++ b/app/models/review.rb @@ -2,5 +2,6 @@ class Review < ApplicationRecord belongs_to :product validates :name, presence: true - validates :rating, presence: true + validates_presence_of :rating, message: "must give a rating" + end From 5a0c857d819b0aa87b39c98619049ca47bffda8d Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 15:48:19 -0800 Subject: [PATCH 183/248] added a relations test for review --- test/fixtures/reviews.yml | 5 +++++ test/models/review_test.rb | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 test/fixtures/reviews.yml diff --git a/test/fixtures/reviews.yml b/test/fixtures/reviews.yml new file mode 100644 index 0000000000..5752146947 --- /dev/null +++ b/test/fixtures/reviews.yml @@ -0,0 +1,5 @@ +review1: + product: product0 + name: Rodger Carlton + rating: 5 + description: Best product everrrr \ No newline at end of file diff --git a/test/models/review_test.rb b/test/models/review_test.rb index 626fa522d8..739a8400ea 100644 --- a/test/models/review_test.rb +++ b/test/models/review_test.rb @@ -1,7 +1,12 @@ require "test_helper" describe Review do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "relations" do + it 'has a product' do + r = reviews(:review1) + expect(r).must_respond_to :product + expect(r.product).must_be_kind_of Product + end + + end end From c5e346b2aba1af38416e9e83eb70181c5e4fa37f Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Mon, 23 Nov 2020 15:50:28 -0800 Subject: [PATCH 184/248] format prices in product show page and order confirmation --- app/controllers/carts_controller.rb | 1 + app/views/carts/view_confirmation.html.erb | 9 +- app/views/layouts/application.html.erb | 103 ++++++++++++--------- app/views/products/show.html.erb | 2 +- 4 files changed, 62 insertions(+), 53 deletions(-) diff --git a/app/controllers/carts_controller.rb b/app/controllers/carts_controller.rb index 9c260feb86..15919213e8 100644 --- a/app/controllers/carts_controller.rb +++ b/app/controllers/carts_controller.rb @@ -28,6 +28,7 @@ def purchase else flash.now[:error] = "There was an error in placing your order" flash.now[:error_message] = @cart.errors.messages + # raise render :purchase_form, status: :bad_request return end diff --git a/app/views/carts/view_confirmation.html.erb b/app/views/carts/view_confirmation.html.erb index ba6862bbf6..e6d49f0b2c 100644 --- a/app/views/carts/view_confirmation.html.erb +++ b/app/views/carts/view_confirmation.html.erb @@ -1,18 +1,15 @@

Order Confirmation

-

Order placed: <%# %>

  • <% @ordered_cart.cartitems.each do |cartitem| %> <%= link_to cartitem.product.name, product_path(cartitem.product.id) %>, quantity purchased: - <%= cartitem.qty %> - - <%# cartitem.cartitem_subtotal%> + <%= cartitem.qty %>, + subtotal: $<%= '%.2f' %cartitem.cartitem_subtotal%>
- -

Order total price: <%#@ordered_cart.total_price %>

+

Order total price: $<%= '%.2f'%@ordered_cart.total_price %>

Order current status: <%= @ordered_cart.status %>

\ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 17a4ea5c69..a3065abb16 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -11,39 +11,39 @@ <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> -
-
-

- <%= link_to "swEtsy💦", root_path %> -

+
+
+

+ <%= link_to "swEtsy💦", root_path %> +

- - <% if session[:user_id] %> - <%= link_to "Logged in as #{@current_user.name}", current_user_path %> - <% end %> - + + <% if session[:user_id] %> + <%= link_to "Logged in as #{@current_user.name}", current_user_path %> + <% end %> + - + -
-
- <%= link_to image_tag( "shopping-cart.png", alt: "shopping cart", width: "60rem" ), cart_path(session[:cart_id]), method: :get %> - <%=@current_cart.cartitems.count %> -
-
+
+
+ <%= link_to image_tag( "shopping-cart.png", alt: "shopping cart", width: "60rem" ), cart_path(session[:cart_id]), method: :get %> + <%=@current_cart.cartitems.count %> +
+
-
+
- - <%= link_to "All Products", products_path %>
+ + <%= link_to "All Products", products_path %>
- Browse by Merchant + Browse by Merchant
    <% @merchants.each do |merchant| %>
  • <%= link_to merchant.name.capitalize, user_products_path(merchant.id) %>
    • @@ -51,33 +51,44 @@
- Browse by Category + Browse by Category
    <% @categories.each do |category| %>
  • <%= link_to category.name.capitalize, category_products_path(category.id) %>
    • <% end %>
-
- <% if session[:user_id] %> - <%= render partial: '/layouts/new_category' %> - <% end %> -
+
+ <% if session[:user_id] %> + <%= render partial: '/layouts/new_category' %> + <% end %> +
- + - + -
- <% flash.each do |name, message| %> -

- <%= message %> -

- <% end %> -
+
+ <% if flash[:success] %> +
+ <%= flash[:success] %> +
+ <% elsif flash[:error] %> +
+ <%= flash[:error] %> + <% if flash[:error_message] %> +
    + <% flash[:error_message].each do |attribute, message| %> +
  • <%= attribute %>: <%= message[0] %>
    • + <% end %> +
+ <% end %> +
+ <% end %> +
- <%= yield %> + <%= yield %> - -
- + + + \ No newline at end of file diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 149dabe2f6..6216d3d62a 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -11,7 +11,7 @@
<%= @product.inventory %> in stock
<%= @product.description %>
- $<%= @product.cost %>
+ $<%= '%.2f' %@product.cost %>
Categories:
    From ca9e2fae413870aa5b022b012606c8418e8fc154 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 15:53:26 -0800 Subject: [PATCH 185/248] added relation test for product has a list of reviews --- test/fixtures/reviews.yml | 7 ++++++- test/models/product_test.rb | 8 ++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/test/fixtures/reviews.yml b/test/fixtures/reviews.yml index 5752146947..b5731c19bd 100644 --- a/test/fixtures/reviews.yml +++ b/test/fixtures/reviews.yml @@ -2,4 +2,9 @@ review1: product: product0 name: Rodger Carlton rating: 5 - description: Best product everrrr \ No newline at end of file + description: Best product everrrr +review2: + product: product0 + name: Aria Yu + rating: 3 + description: Like woooooow. \ No newline at end of file diff --git a/test/models/product_test.rb b/test/models/product_test.rb index 47af3f946a..34e64d3507 100644 --- a/test/models/product_test.rb +++ b/test/models/product_test.rb @@ -149,6 +149,14 @@ expect(product.user).must_be_instance_of User end + it "has a list of reviews" do + product = products(:product0) + expect(product).must_respond_to :reviews + product.reviews.each do |review| + expect(review).must_be_kind_of Review + end + end + it "Can have multiple categories" do product = products(:product1) weights = categories(:category_weights) From 6436b54a6da112f00fc0d3e9621473065a829ba7 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 16:03:05 -0800 Subject: [PATCH 186/248] added validation tests for review --- test/models/review_test.rb | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/test/models/review_test.rb b/test/models/review_test.rb index 739a8400ea..3b6e2b129e 100644 --- a/test/models/review_test.rb +++ b/test/models/review_test.rb @@ -1,12 +1,42 @@ require "test_helper" describe Review do + describe "relations" do it 'has a product' do r = reviews(:review1) expect(r).must_respond_to :product expect(r.product).must_be_kind_of Product end + end + + describe "validations" do + + it "is valid when all fields are present" do + p = products(:product0) + review = Review.new(product: p, name: "Bobster", rating: 1) + + result = review.valid? + expect(result).must_equal true + + end + + it "requires a name" do + p = products(:product0) + review = Review.new(product: p, rating: 1) + result = review.valid? + + expect(result).must_equal false + expect(review.errors.messages).must_include :name + end + + it "requires a rating" do + p = products(:product0) + review = Review.new(product: p, name: "Terry Bob") + result = review.valid? + expect(result).must_equal false + expect(review.errors.messages).must_include :rating + end end end From ef7afa6282f7902e2cc8970aa1d5064770a69958 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Mon, 23 Nov 2020 16:03:49 -0800 Subject: [PATCH 187/248] purchase date column migration --- app/controllers/carts_controller.rb | 2 +- app/views/carts/view_confirmation.html.erb | 4 +++- db/migrate/20201123235409_add_purchase_datetime_to_carts.rb | 5 +++++ db/schema.rb | 3 ++- 4 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20201123235409_add_purchase_datetime_to_carts.rb diff --git a/app/controllers/carts_controller.rb b/app/controllers/carts_controller.rb index 15919213e8..c847dd3b41 100644 --- a/app/controllers/carts_controller.rb +++ b/app/controllers/carts_controller.rb @@ -12,7 +12,7 @@ def purchase_form def purchase @cart = @current_cart - @cart.assign_attributes(status: "paid") + @cart.assign_attributes(status: "paid", purchase_datetime: Time.now) # raise if @cart.update(cart_params) diff --git a/app/views/carts/view_confirmation.html.erb b/app/views/carts/view_confirmation.html.erb index e6d49f0b2c..83c3c4f940 100644 --- a/app/views/carts/view_confirmation.html.erb +++ b/app/views/carts/view_confirmation.html.erb @@ -1,5 +1,7 @@

    Order Confirmation

    -

    Order placed: <%# %>

    +

    Order Date: <%= @ordered_cart.purchase_datetime.strftime("%b %d, %Y") %>

    +

    Order Time: <%= @ordered_cart.purchase_datetime.strftime("%I:%M%p") %>

    +
    • <% @ordered_cart.cartitems.each do |cartitem| %> diff --git a/db/migrate/20201123235409_add_purchase_datetime_to_carts.rb b/db/migrate/20201123235409_add_purchase_datetime_to_carts.rb new file mode 100644 index 0000000000..8b3c63fed8 --- /dev/null +++ b/db/migrate/20201123235409_add_purchase_datetime_to_carts.rb @@ -0,0 +1,5 @@ +class AddPurchaseDatetimeToCarts < ActiveRecord::Migration[6.0] + def change + add_column :carts, :purchase_datetime, :datetime + end +end diff --git a/db/schema.rb b/db/schema.rb index 2268435fdc..73154d6290 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_11_22_004311) do +ActiveRecord::Schema.define(version: 2020_11_23_235409) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -38,6 +38,7 @@ t.string "cc_expiration" t.string "cc_cvv" t.string "zip" + t.datetime "purchase_datetime" end create_table "categories", force: :cascade do |t| From bdac9f2a753ee4a731163ac24e12247cf900aacd Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 16:20:11 -0800 Subject: [PATCH 188/248] added tests for create action mehod for review --- test/controllers/reviews_controller_test.rb | 44 +++++++++++++++++++-- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/test/controllers/reviews_controller_test.rb b/test/controllers/reviews_controller_test.rb index 444c98848f..30e89b3484 100644 --- a/test/controllers/reviews_controller_test.rb +++ b/test/controllers/reviews_controller_test.rb @@ -1,7 +1,45 @@ require "test_helper" describe ReviewsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + + describe "create" do + it "creates a review with valid information" do + + product = products(:product0) + new_review = { + review: { + name: "Kristal Calimari", + rating: 5, + description: "Best product ever" + + } + } + + expect { + post product_reviews_path(product.id), params: new_review + }.must_change "Review.count", 1 + + must_respond_with :redirect + must_redirect_to product_path(product) + + end + + it "will not create a new review for missing required information" do + product = products(:product0) + new_review = { + review: { + description: "Best product ever" + } + } + + expect { + post product_reviews_path(product.id), params: new_review + }.wont_change "Review.count" + + must_respond_with :redirect + must_redirect_to product_path(product) + + end + + end end From f89b56d5a0f519fe9efd11ea196caf72d1357783 Mon Sep 17 00:00:00 2001 From: r-spiel Date: Mon, 23 Nov 2020 16:22:40 -0800 Subject: [PATCH 189/248] tests for user conteroller --- app/controllers/users_controller.rb | 13 +------ test/controllers/users_controller_test.rb | 43 ++++++++++++++++------- test/models/category_test.rb | 23 +++++++----- 3 files changed, 46 insertions(+), 33 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 534423fa23..360386ee58 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,4 +1,5 @@ class UsersController < ApplicationController + before_action :require_login, only: [:current, :fulfillment, :destroy] def create auth_hash = request.env["omniauth.auth"] @@ -27,12 +28,6 @@ def destroy def current @current_user_products = @current_user.products - - unless @current_user - flash[:error] = "You must be logged in to see this page" - redirect_to root_path - return - end end def fulfillment @@ -40,11 +35,5 @@ def fulfillment @pending_orders = @current_user.merchant_orders(status = "pending") @paid_orders = @current_user.merchant_orders(status = "paid") @complete_orders = @current_user.merchant_orders(status = "complete") - - unless @current_user - flash[:error] = "You must be logged in to see this page" - redirect_to root_path - return - end end end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index b8d35485e6..0461126d97 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -42,7 +42,6 @@ # Should *not* have created a new user expect(User.count).must_equal start_count end - end describe 'logout' do @@ -56,21 +55,41 @@ delete logout_path, params: {} # log out expect(session[:user_id]).must_be_nil + expect(flash[:success]).must_equal "Successfully logged out!" + end + end - # How do I expect a flash message? it should be: - # "Successfully logged out!" + describe 'current user page' do + it 'can get the current user page when logged in' do + perform_login() + get current_user_path + must_respond_with :success + end + + it 'cannot get current user page if not logged in' do + # not logged in + get current_user_path + + must_respond_with :redirect + must_redirect_to root_path + expect(flash[:error]).must_equal "You must be logged in to do that" end end describe 'fulfillment' do - # can get fulfillment page - # - # can get fulfillment page with no orders/carts - # - # cannot get fulfillment page when not logged in - # => flash error should be "You must be logged in to see this page" - # - # cannot get fulfillment page for user that is not you - end + it 'can get the fulfillment page when logged in' do + perform_login() + + get current_user_fulfillment_path + must_respond_with :success + end + + it 'cannot get fulfillment page if not logged in' do + # not logged in + get current_user_fulfillment_path + must_respond_with :redirect + must_redirect_to root_path + end + end end diff --git a/test/models/category_test.rb b/test/models/category_test.rb index 3c51367ce1..88a559319d 100644 --- a/test/models/category_test.rb +++ b/test/models/category_test.rb @@ -21,23 +21,28 @@ expect(category.valid?).must_equal false end - end describe 'relations' do - it'has many products' do - gear = Category.find_by(name: 'gear') + before do + @ada = users(:ada) + @gear = categories(:category_gear) + end + + it 'can have many products' do + @ada.products.each do |product| + product.categories << @gear + end - # p gear.products - # expect(gear.products.length > 1).must_equal true + expect(@gear.products.length > 1).must_equal true end - it 'a product can be added to a category' do + it 'can add a product to a category' do + product = @ada.products[0] + @gear.products << product + expect(@gear.products.length == 1).must_equal true end end - - - end From 649daa45b0b14a44283d6de0d3e889b11c5ff8f2 Mon Sep 17 00:00:00 2001 From: r-spiel Date: Mon, 23 Nov 2020 16:25:14 -0800 Subject: [PATCH 190/248] delete white space --- test/controllers/users_controller_test.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 0461126d97..2450c61248 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -46,7 +46,6 @@ describe 'logout' do it 'can logout an existing user' do - perform_login() # before logging out From e5b847ab474cbec98ddf0284629fa07a3bbc4d14 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Mon, 23 Nov 2020 16:29:22 -0800 Subject: [PATCH 191/248] cart tests pass with new purchase_datetime column --- app/controllers/carts_controller.rb | 2 -- app/models/cart.rb | 2 +- test/controllers/carts_controller_test.rb | 4 ++-- test/fixtures/carts.yml | 2 ++ test/models/cart_test.rb | 10 +--------- 5 files changed, 6 insertions(+), 14 deletions(-) diff --git a/app/controllers/carts_controller.rb b/app/controllers/carts_controller.rb index c847dd3b41..ebe71407e3 100644 --- a/app/controllers/carts_controller.rb +++ b/app/controllers/carts_controller.rb @@ -14,7 +14,6 @@ def purchase @cart = @current_cart @cart.assign_attributes(status: "paid", purchase_datetime: Time.now) - # raise if @cart.update(cart_params) @cart.save flash[:success] = "Your order has been placed!" @@ -28,7 +27,6 @@ def purchase else flash.now[:error] = "There was an error in placing your order" flash.now[:error_message] = @cart.errors.messages - # raise render :purchase_form, status: :bad_request return end diff --git a/app/models/cart.rb b/app/models/cart.rb index fae65415a8..2d38e62a0b 100644 --- a/app/models/cart.rb +++ b/app/models/cart.rb @@ -2,7 +2,7 @@ class Cart < ApplicationRecord has_many :cartitems has_many :products, through: :cartitems - validates_presence_of :email, :mailing_address, :name, :cc_number, :cc_expiration, :cc_cvv, :zip, :if => lambda {self.status != "pending"} + validates_presence_of :email, :mailing_address, :name, :cc_number, :cc_expiration, :cc_cvv, :zip, :purchase_datetime, :if => lambda {self.status != "pending"} validates_length_of :cc_number, minimum: 16, maximum: 16, :if => lambda {self.status != "pending"} def update_inventory diff --git a/test/controllers/carts_controller_test.rb b/test/controllers/carts_controller_test.rb index 34ec5937da..456f7ac1d1 100644 --- a/test/controllers/carts_controller_test.rb +++ b/test/controllers/carts_controller_test.rb @@ -12,7 +12,7 @@ email: "ada@adadev.org", mailing_address: "315 5th Ave S Suite 200, Seattle, WA 98104", name: "ada", - cc_number: "1234 5678 9123 4567", + cc_number: "1234567891234567", cc_expiration: "12/2021", cc_cvv: "111", zip: "98104"}, @@ -110,8 +110,8 @@ describe "guest customer" do it "can purchase a cart for a guest" do get root_path - cart = session[:cart_id] + patch cart_path(cart), params: paid_cart_hash new_cart = Cart.find(cart) diff --git a/test/fixtures/carts.yml b/test/fixtures/carts.yml index f1a84efb3b..ae657ec13f 100644 --- a/test/fixtures/carts.yml +++ b/test/fixtures/carts.yml @@ -9,6 +9,7 @@ cart1: cc_expiration: "12/2025" cc_cvv: 098 zip: 98122 + purchase_datetime: Time.now cart2: status: paid email: b.loaf222@gmail.com @@ -18,6 +19,7 @@ cart2: cc_expiration: "10/2022" cc_cvv: 305 zip: 98107 + purchase_datetime: Time.now cart3: status: pending diff --git a/test/models/cart_test.rb b/test/models/cart_test.rb index 74a75aed19..982693bcb6 100644 --- a/test/models/cart_test.rb +++ b/test/models/cart_test.rb @@ -14,7 +14,7 @@ end it "has the required fields" do - [:status, :email, :mailing_address, :name, :cc_number, :cc_expiration, :cc_cvv, :zip].each do |field| + [:status, :email, :mailing_address, :name, :cc_number, :cc_expiration, :cc_cvv, :zip, :purchase_datetime].each do |field| expect(@cart).must_respond_to field end end @@ -22,14 +22,6 @@ describe "validations" do it "requires billing information and mailing information about customer when status is not pending" do - @cart.email = nil - @cart.mailing_address = nil - @cart.name = nil - @cart.cc_number = nil - @cart.cc_expiration = nil - @cart.cc_cvv = nil - @cart.zip = nil - ["paid", "complete", "cancelled"].each do |status| @cart.status = status expect(@cart.valid?).must_equal false From c282f54d1e15bd05b729c568416ba7d736849369 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Mon, 23 Nov 2020 16:33:04 -0800 Subject: [PATCH 192/248] get rid of unnecessary space differences --- app/views/layouts/application.html.erb | 134 ++++++++++++------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index a3065abb16..39a14675db 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -11,84 +11,84 @@ <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> -
      -
      -

      - <%= link_to "swEtsy💦", root_path %> -

      +
      +
      +

      + <%= link_to "swEtsy💦", root_path %> +

      - - <% if session[:user_id] %> - <%= link_to "Logged in as #{@current_user.name}", current_user_path %> - <% end %> - + + <% if session[:user_id] %> + <%= link_to "Logged in as #{@current_user.name}", current_user_path %> + <% end %> + - + -
      -
      - <%= link_to image_tag( "shopping-cart.png", alt: "shopping cart", width: "60rem" ), cart_path(session[:cart_id]), method: :get %> - <%=@current_cart.cartitems.count %> -
      -
      +
      +
      + <%= link_to image_tag( "shopping-cart.png", alt: "shopping cart", width: "60rem" ), cart_path(session[:cart_id]), method: :get %> + <%=@current_cart.cartitems.count %> +
      +
      -
      +
      - - <%= link_to "All Products", products_path %>
      + + <%= link_to "All Products", products_path %>
      - Browse by Merchant -
        - <% @merchants.each do |merchant| %> -
      • <%= link_to merchant.name.capitalize, user_products_path(merchant.id) %>
        • - <% end %> -
      + Browse by Merchant +
        + <% @merchants.each do |merchant| %> +
      • <%= link_to merchant.name.capitalize, user_products_path(merchant.id) %>
        • + <% end %> +
      - Browse by Category -
        - <% @categories.each do |category| %> -
      • <%= link_to category.name.capitalize, category_products_path(category.id) %>
        • - <% end %> -
      + Browse by Category +
        + <% @categories.each do |category| %> +
      • <%= link_to category.name.capitalize, category_products_path(category.id) %>
        • + <% end %> +
      -
      - <% if session[:user_id] %> - <%= render partial: '/layouts/new_category' %> - <% end %> -
      +
      + <% if session[:user_id] %> + <%= render partial: '/layouts/new_category' %> + <% end %> +
      -       +       - - -
      - <% if flash[:success] %> -
      - <%= flash[:success] %> -
      - <% elsif flash[:error] %> -
      - <%= flash[:error] %> - <% if flash[:error_message] %> -
        - <% flash[:error_message].each do |attribute, message| %> -
      • <%= attribute %>: <%= message[0] %>
        • - <% end %> -
      + + +
      + <% if flash[:success] %> +
      + <%= flash[:success] %> +
      + <% elsif flash[:error] %> +
      + <%= flash[:error] %> + <% if flash[:error_message] %> +
        + <% flash[:error_message].each do |attribute, message| %> +
      • <%= attribute %>: <%= message[0] %>
        • <% end %> -
      - <% end %> -
      +
    + <% end %> + + <% end %> +
- <%= yield %> - - - + <%= yield %> + + + \ No newline at end of file From 223784cbe2e401a87ed2c7a7e3e4b02c3e80a18c Mon Sep 17 00:00:00 2001 From: r-spiel Date: Mon, 23 Nov 2020 16:34:43 -0800 Subject: [PATCH 193/248] small changes --- app/controllers/categories_controller.rb | 3 +-- test/models/user_test.rb | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb index 36e80c42f6..2f581b704d 100644 --- a/app/controllers/categories_controller.rb +++ b/app/controllers/categories_controller.rb @@ -4,8 +4,7 @@ class CategoriesController < ApplicationController def create @category = Category.new(category_params) - p category_params - if @category.save! + if @category.save flash[:success] = 'Category was successfully created!' redirect_to products_path return diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 651b5b4121..b97055ef9e 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -69,9 +69,6 @@ @user.cartitems.each do |item| expect(item).must_be_kind_of Cartitem end - - #add a cart item - #????? end end From 886d8eecfea656f82ecc8a20ca474268bf600301 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Mon, 23 Nov 2020 16:36:56 -0800 Subject: [PATCH 194/248] idk spaces --- app/views/layouts/application.html.erb | 38 +++++++++++++------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 39a14675db..71e5db08a1 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -67,28 +67,28 @@ - -
- <% if flash[:success] %> -
- <%= flash[:success] %> -
- <% elsif flash[:error] %> -
- <%= flash[:error] %> - <% if flash[:error_message] %> -
    - <% flash[:error_message].each do |attribute, message| %> -
  • <%= attribute %>: <%= message[0] %>
    • + +
    + <% if flash[:success] %> +
    + <%= flash[:success] %> +
    + <% elsif flash[:error] %> +
    + <%= flash[:error] %> + <% if flash[:error_message] %> +
      + <% flash[:error_message].each do |attribute, message| %> +
    • <%= attribute %>: <%= message[0] %>
      • + <% end %> +
    <% end %> -
- <% end %> -
- <% end %> -
+ + <% end %> + <%= yield %> - + \ No newline at end of file From 16829a151cae55c7adab6e447f2ef2135cb7c43c Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Mon, 23 Nov 2020 16:57:56 -0800 Subject: [PATCH 195/248] using bootstrap for purchase form --- app/views/carts/purchase_form.html.erb | 41 +++++++++++++------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/app/views/carts/purchase_form.html.erb b/app/views/carts/purchase_form.html.erb index 9963c5564d..33eb5cf895 100644 --- a/app/views/carts/purchase_form.html.erb +++ b/app/views/carts/purchase_form.html.erb @@ -1,46 +1,47 @@ -
-

Purchase Form

+

Purchase Form

<%= form_with model: @cart do |f| %> -
+
<%= f.label :name %> - <%= f.text_field :name %> + <%= f.text_field :name, class: "form-control" %>
-
+
<%= f.label :email_address %> - <%= f.text_field :email %> + <%= f.text_field :email, class: "form-control" %>
-
+
<%= f.label :mailing_address %> - <%= f.text_field :mailing_address %> + <%= f.text_field :mailing_address, class: "form-control" %>
-
+
<%= f.label :zipcode %> - <%= f.text_field :zip %> + <%= f.text_field :zip, class: "form-control" %>
-
+
<%= f.label :credit_card_number %> - <%= f.text_field :cc_number %> + <%= f.text_field :cc_number, class: "form-control" %> + We'll never share your credit card info with anyone else.
-
+
<%= f.label :credit_card_expiration %> - <%= f.text_field :cc_expiration %> + <%= f.text_field :cc_expiration, class: "form-control" %> + We'll never share your credit card info with anyone else.
-
+
<%= f.label :cvv %> - <%= f.text_field :cc_cvv %> + <%= f.text_field :cc_cvv, class: "form-control" %> + We'll never share your credit card info with anyone else.
-
- <%= f.submit "Purchase order"%> +
+ <%= f.submit "Purchase order", class: "btn btn-primary" %>
<% end %> -
-
\ No newline at end of file + \ No newline at end of file From 85e7a96aba44f6cd08e0dac63552f32c1e5ff588 Mon Sep 17 00:00:00 2001 From: r-spiel Date: Mon, 23 Nov 2020 17:00:25 -0800 Subject: [PATCH 196/248] delete duplicate info in cart controller purchase method --- app/controllers/carts_controller.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/controllers/carts_controller.rb b/app/controllers/carts_controller.rb index 4c24e16040..e5c8d52db4 100644 --- a/app/controllers/carts_controller.rb +++ b/app/controllers/carts_controller.rb @@ -18,11 +18,9 @@ def purchase # raise if @cart.update(cart_params) - @cart.save - flash[:success] = "Your order has been placed!" @cart.update_item_fulfillment @cart.save - flash[:success] = "your stuff was ordered" + flash[:success] = "Your order has been placed!" @cart.update_inventory session[:cart_id] = nil current_cart From c96c963554f85619cbb0df64a633500e696f5210 Mon Sep 17 00:00:00 2001 From: r-spiel Date: Mon, 23 Nov 2020 17:01:17 -0800 Subject: [PATCH 197/248] revert back --- app/controllers/carts_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/carts_controller.rb b/app/controllers/carts_controller.rb index e5c8d52db4..4c24e16040 100644 --- a/app/controllers/carts_controller.rb +++ b/app/controllers/carts_controller.rb @@ -18,9 +18,11 @@ def purchase # raise if @cart.update(cart_params) - @cart.update_item_fulfillment @cart.save flash[:success] = "Your order has been placed!" + @cart.update_item_fulfillment + @cart.save + flash[:success] = "your stuff was ordered" @cart.update_inventory session[:cart_id] = nil current_cart From f6325d866781365791be0dca20d2133e59f11c8d Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 17:41:46 -0800 Subject: [PATCH 198/248] formatting the reviews, adding star images as rating --- app/assets/images/star.png | Bin 0 -> 18293 bytes app/views/products/show.html.erb | 56 +++++++++++++++++-------------- 2 files changed, 31 insertions(+), 25 deletions(-) create mode 100644 app/assets/images/star.png diff --git a/app/assets/images/star.png b/app/assets/images/star.png new file mode 100644 index 0000000000000000000000000000000000000000..d109375bc0f4795a10b4dc857b2d9f0985e07961 GIT binary patch literal 18293 zcmZ6zcRbZ^{6G9Y2gly4Y$qd|%F0ZHh*C!O$jFwAY{?FhQQ28V_A0`$5@nQi?1Mra zn`1lobw1zU_x|0FyMO2!uj@6Ruh%u+V(;o{Qd6)|KoCT&t)*@NL2&RZY?%xJehmEj zYXN=`d#hk zSGbh>;0}Y^EXQ?7U9x>}%4>}wf$R0-2zsH2B31LAwj!bWd+O@y@PPCt+ViwF$NP^z z#>B)BS6`}1JQjr3#xj`c>61AEqK^OTHE^l~z5c85Q=_5%55rnx8%@FFuZoc;7^|Z| z;ccUME#&(;b{?c5BWbComs(*MTj2~u|1nPRifIOz`9NF6TKaq#pVl_Iw#Eb~Q=KTx zBk+B5bBt#Qq=8RUqo9Fe{>B+zu$wX&{)-Jtw*9!2*5m+Fr%=DxqE-C~&Sv;=V^nof zcvK8YK1>y+<)x^;j|d$bKfBAk#+pq07@=Ayr(AMuyiyh>V0cbNuN~$9smIOVNO_y% z@%6k`op1RX5sv{?S$IFg@h9mA2SyPwe5zL=YTf6Fo6kt?Js7P2b zdFayZyoVjRLP!{(%{RA!JZjI~&wXZ0kt>1>cOo=p<({g|x61_7d?9KJj zKo*Pyd5{%7Jv}UaLC!kYJCXWyZEV7dV+y}yI(OUvCTOM2B=#_$)IGMk0~O!d%^~@$ z6uv2jL>f2`7~@rre`S#3-)WjlI({0_BICw&&kJtqxb5GVSs+Gc~TGa@t@vIJxD+w2k0w@FY*BT!UG5AgK`D9 z|0aC9Xi5nhQ<%pWyzI|6ntk-4+2C=&{v>f?G$0}r6tx(p==@*?LEz@YJwVqg@o>r4ghYh)^I8AVswBn?t0%q$v~HZy zCy8wP&3b_~p7nq=lE^u@0VTC}`f3N~WmPQJAxKRvK*BmCvWNMQ-Q!RY^7uNhM7dQ) zocJ0L$p6{xh2fO>>9JM$mY9ltDGmC0=Z{uwObnBHsWJZDe-?}0ZNV=l(Ox|q*M%pl zSh~P~Uze_5QLOlE6)YVD-&!r3t%Wl9J*PqY6E~SeqV-q2Hvg&m6)zADtDcwzR?@S0 z*^`D7seB*-^Z(1d`7kWLEM$)`qwi=nwC&6_ufhmU*MqxQv3|1_0&clv4CJ-E;H7ak?cFN~4Js`Ib-TlR4As^7 zh8-5TeV#<3#t(__$*%i6m-o&pJEU8=SfPP5;HLiV9;OwW9l401^*oq? znWgBlH*_b414cgv#VqbU8?We{JDEe9hE-U!xDy4v`JT*@TsZ`y`T78&!AmS?t$Zl& zM!+!MI(H^7yuQ0r23-xJN+_~d&QkgStNk^=r^y&E?FcifY>@d9lDprd2CTnzYq2`u ze7mPsieN*o(CL%duwRBMtH>Sx018#UXRpJRD*2>AJk}vy0k?%g0*$-sJZUhd9p0qJ(B;l#W1%4h7>qrxr) zYX@ebuIhZe?_hM=1LUe6;~mCU)Cp|%YpZR@#Bw)dt98RW9@q=9TJSo667qP2?^7|L z?c=2LQGqzuV71OD%h9jYSf*m2G4_72{9>j*)wx}dL*Q1l1PeTobIq_n5nauYEKI<; zD_<+ljVoRV+^NZi!usJs=knLwRt*yXGBV^{gpyYk=#$#<;iNlKhY|JF+Keu>(VW$G z0!YI`LT4sK`zg%N!qAEK< zq~UwQyq%_F{HeFow44<=gce1W8m5!^4~d3pF%w`mAZlLfaL!9pnKZOYM%LYRuDuh& zUWn6T2B26NVA;7y;d}JNX-qWtzqxVDLtnobOEZRr+nDkpr3nPC<2vlN+7=UoXwR+P zJjQ+ovRE5qP2#kyfkr^}M(Q#TlfC2KgTvTgCWW4Xb6}=M+M&7zjQjCEfnCV5W zG*?6@edW1`a4pn0ybYI;~&)+c`$5xh*piM`-2$D}}tTp*;&4d9N;{SmnJA8!f9`I+kx8%Ej> zkCFRL6&9ngT!x=JtC%J%?J+l-7)iS9&12vTR`%K@<1)^%Z#lr{!plkgndB6KE&6T( zg8SoKNe9DLPht`HxIWV`9r5i_hs(Zt>V;fDu?C^EFwG{G^FNF$=zHX<8cgk3@`e)fGi_PX2dEYiOa#V&! za(Vm;`d1knV0R<}XmfShdi;6YVI%^d5NoF(1Aa4>9$3Cr_%apDoKaG}Ki*N2!&b#l z^7q-xcecw~>Z_{cVOlc@o?`yLG=}QSfYBLyd|!$;eJ^8M_U1E?F$EmU9zZ=`SaReU z8)i+(QN`-?Ki`p9H2E8POGsV;GRNrvnSH!dUD_!nMle>!Uamc>9h5DlUdqNu`}f4E zkA^ph-+g8|-|!=9DCAR2ddP^)iq#SW9J#*REwEqCBARLXx7wz>fKHr{U-maF=z(d- z+;D-^o&6NH?u>WbFHuY4x(%(0#92>XLp!inI&VOF6u)_r;lMyz>xo`sat<#Mp@ena ze_p6`&Kk_tx(I^m(V{zvp0Ajq8{5;(3SyKYQ@bYjLnLNi29wG|%^-9EDAP4-_v&BA zto-&lV~!~)#YL)0=Q@e7@3$_)=q9Sz!;C5-2Nkbc>)amLHEHM=D2h2H<%f{$zRz9S zuMUJM2S45CR^yne-peBKRL($Z6celdDXSngZDLVg`xGWdk2-nN&^7QeW+ac$kyUv? zUxhQ^U~Dv03$VJkH{4SCOEm0z=v_F^j(up?;w*l`k<>LdD0aEpEi&7T{-Hj3*!K+1 zP1CIxjMgXXKKoYGU>=URZOwn#Tf{*9Hl*I_DOMHfGLJv53=>PH-ckH!X1#2p4hR|y z$5xQ&%aiz`Zy4i8nSe?4x2MK>jyU3(5*Q$QZ|0$I^;^%DNnB$``gTnk+Xw2k{t3b8 zqy{7sU3(B?G&>h93XMxzP_|$ixRc^E% z^F6uhhj`Pmz5!4oxBPE{>xdgL-G&OW70~1t7G?Y?U@u@>5w~9DEn#3v=xF_G>e)qh zK~mKi{}?QUyL39czZ|ro5eNJ+b)v|B`lM~E1L#mNXE{#^$4)0yba@>SQ|Kf!G*N`% z3Pk;oSX)(byGIBU)K7@LbNG@0XQ6biBiK1Ao3XW;S5>lej4gERXxg5|-Mp z@5ONnJKrk-Lgy(C-eJWy@*1$cgT1QpYCWC{4fS8Tcry47_C4Jxm`?!%`QsigJ71&Z zDFSIq==JXQ=i@f)m6H+#9{Vxtb)Wo`5t5UHnAGPEP@%3eyy*+mw70(hKmL=!+fdEN zE0k5^mJON_1^-kJ0NC})^aC-o{;O5Gk1ZAfi^hMa&F33CLuIjzNCSTY6NeCbtlrb! z^B(+_TiV00?-Dh^WP5ua30e&RZ2K_giil9L(;rEF@}*fvt8BMwN~f9 z%iiUnJv0le0QhMfa1Bk>S8bdv-_NUu?uRL#m(%wO0H%|JDM8NP?pe=eJKZgLG9bJ> zbk74T%V(ekXd*M8F9uJ$HH06`4)2BL7>>dB{t?|Txo*6x%%xqZl@9ohTUGEEU1&OX zrapgW{E*Uff7EhxuOmbU8Cd|dTB?nr5hr1ne$FhCXLFMudd8|zY$ z0%McjDFqd(1c1Q*CSNPqzHr);IEt~lmR1kh^#m9Wv!1xcGDQK?In5IL`U;^xONp90 z9mJSXSJbdzW&>MF|0SJ`sXx&N zlbFC}2bL}|z88A&!5I9S$A)3T7+i~&AQ0vtvfMvhwdBc7XE_!_91Xi{r zto_D2nvNwh2$dET_~LQ0)^*VFOqMLE-O3pMm(hvE+7H_(m|_Nu^mTZ&Z6p)aaA3rd z3>C0u!_>9I3`2VsOvBXI(h1HJ>bO5C4iMj9PLCa%?=Pg&j48S5Lk)USODeZXf5TmP zmHr!+SU!+UQj8Tapd1UTMc`}V?M|qtgKCYXBewi^3$@-6*5BvgGPeAYK5=Hn5B+7) zXrL+7psaMxA;nP-Ba{CCxpqF#g6emF++~ZEu?J`N`8=S~8P^{28uJp!(Uy2)f%>aFja!09Jvt!R!(p69P z@xfQ~Y}gWh1EmUViH613qu8v4CAr_ki%Ditd`0N$m)jd?-G;g}1u@a8w0V~r=t?gR zv1Qf_rVc9CiYW3!HN5v8T~*KY$nn*YapJGKU;_I}`V&?R3nf<8u6&r{cpG|jzct+A zi(ijr_#}cIt57)c;rRG$bN*B9wL_it_hjc=q;e0-Ks)sdYm&hsp@S+Tk*u@ zUKxJKz>7kX$%)i8;m)FL2Mgx!?DUtR{0Jb01ylRiXH|dGA2;&7u}8n}`iBz5+{b8R z#;&pRPvjBjDF(oM><$(i+l?kEECt3-}y(8c;i(}(|t^=;xo5ur7sPA_T#txp!sq>Owr!^_fU z%A3G-QSM?tRgN#SmzK**KLa> zu7V$#8CFqBxFL*$`+G8hJI_PTe!FY)e(GYmB#v^RW+6-_p1oadQB+KvcYMn_5Z%~m z$v#QmENhkJ^X=l^`N>di2_kfxQDX}?CHbU~pU6PkySg5c3vF8Ki+rV0eC1FOr$?@O zp|h&nH_&c)FVjwBJ@dT}ODrg!yJtUc(QhFeYY&YI9BeRJyi&Dzp`SaTIWWCDSu*OZa+6Vnjv#iQkda#qrQS`6fOAS3};G3mEEwhZ<97FT_ z@dzdI2`|kHQXLJL83*>2nW^G61;40U2{M*?L@iAB+^&)WMfY$|xkU=y2R=Tl=#PP! zy|^6v@Ol3Q(QbFapWiH-_D-0l9!NjagM8a7rcZ3kuv5184=k$64j)*`o5_%JSQ~E= zAyo0_zyr%O*WZuj!LChze>lV=u@jlVPwE1&+NUA&@7_OOGfh=M{vdTLdg%u<m0kh8qt zK=wbf`-$Gvd&us_k5d%h%cf5xLtFcqf{ulB-#`b`uXRuUg!Xr&y!Z!P+7VTN+Rax+ z@xv~}wLI~a#lAgCM~?=%fZ#E57hy6QF2)_2A8b?&DmU=z{hbY3{Kjr&Qwg(Fm$A1a z?^qr6HOsFVvmO)mKYw<(aw#y&>u=wqsfPwq4NKNiGA>n2Q&Sj2tYN?YSV_$!Vr|pf zY|1^cC80uTh$^!+;|0L6su^Ej=C&E%q4$yHbsqPA%to-SXzke-WC=YRWzIEgqC#J;XYRV*-ichSpK`Tc`8V{OY; z6`oc({&gw1VX0nYd%uxc`5cXtHmQPU{X1oDzEiw-etz(1QZNiaM~}PMDfOYxi}e>H z%Kb)Z?Xs;l5@r9;^w)iA61>=Cqn7$*Pd|M{_|pr;QS*}lpWXTEYi6_h;P4OQo2#T; zp&aMOEMo*lZ+w7#jBd-7wlWbH;oOHAruu>&;_h$J>`iek8A zswtwZa%`+O|1#`D^o(EQ@}l1~Jr3PzH0Jlu)_9Ma4Xuo0e-E@=7y?2Zl&#H|LUv+j zZkv3)aK0}QnCdlo&Hrzjdgfb~+mH+fMKu4$4jU45upzS|>wemeYhW)32XmX8GvzaaAr&klSO3D3-t zf1@|nNbifT}iNMA8o_oS4cl^oShI)!Q-w;U>Ct$S>j^sC#aWxGC{w8?8jkqgXYrln7mZ$T15Ta3aXNS+?zH$ya)=$!GoV zwW0VJtrQt)mn#42ezqXo+j8kc?A5@D-_qlJ!>vtP*I;N5l|bz~J&CwMvBtVI+)UGG zh@>Z*>l^2D66-?W5^5b+TnGkI|5GO8V`g*ee?d_W zvkV&!+sGFVI&ljmZ9xQp!}`#B#EgQI;&rg#5ojg6MN=+@)2}X)CbRDmIMXilz4yq@ z8Pgt$7%JF-EMzgAccnL*M82NZq=1_TdSlT0uc8@Ij=Smlvt)^JPbr*MEx5xnusvQv zm>eAEeyqG)BlWbh<+;%bOlFM8N)LhpV6WAJf9Kt3cydpha1}A5o}7>!fgmaOWsv!X zucThjAE$kDVU;nO>K+5(N`f`5J@oslyivWbZ#anw^ba>bVoTcn-kVV0B>%+@x(!)^yG#h*H%aiZ!{QtmsrP0Sg?*NsP!4-L00Tb7kz9@0{OgmSzOJFlfjK zAh=F*9T+22M%)m23qly4<)zc;z>V<5#9>_^P3nE7_LhT=@5wjHg4sR{3qNoA2|b{K zarrq9AYO8ihaSZ{z=2kS-hcmwLPg*gN5HPi$z-t4qlbmb)p+m;`yPsDsECq^M9Cq^?`@Gp4h3WoH6#c%?-8o_i<8I9po)T7Vm+xXcwR)GJL?%P~m(BkK1xt8-b+O3>MDaF(l$+RxwAR|H!^Ksb zt+#av9 zIM$&A)W_De7vR{Ih36^%U4|`e?SG`&oN3N8EZOQ-GsAdv$iSY|I*F$)pQf31w7Yh& zWBQAv>zn`RB=x=7kKjgmgtFJImW5e^p#qR~CS4u>P&1KbFf)s2*iD*n#QsDLxHRG; zxkn5TRel-8jlWR0ibp&b=cNKCviz_+;lVc_;3`AgKRv|3dHachKN@KyyLsSeHamRA zNy?9nRnhz}9tgsqKo8V)YtNWI%TUhQXQa1YhDD7!SA(m%g3HgPT`*mY^SG%9qu^i1 zZJ1K|EM*-OpY?+JA%+M9F2My;IMdqksrRw{AutQ#7Zz$JHyK{9&XHD78%|)_8?00d zZUwx~i-{=&M|u0sgi=&i+-Xz=I%lf;hJV#nzgLEWWA4KFIEITS#KP$>i4y!?`zBL+ z9J433dMhcExXhQ+Q-;o$d>+B~<KqOAg{vj8xA3X?|F6Ml{m|1A;x zruE>lvBmGTRZX}bozs%dxCHIGh)7W5bO5* z9bh!sIR_r0tP-Z9W{56|=Z7_M zf?*XP9#cR(GPwTK@!5)Y{RxfK(FGQH(s2h9&on(IC~#FU&ieT2%B+%8eSDSdl7kwH z1LQnO^oF~%W@Bdl?BG9u@L|=E@g?RuUAD6`cX;IGi_3m>+io? z%H-aP{NJ|#isNO*L(a=YoYih2S1-9-g{(mOEEx>!k<7%&%=o#j81rE9PBME8K5en>+%omo7WK%U-JkfUV;%}Grp9j>yMsX zIlS4*0EMlG`>7c=3@UF8h7uBj(Cf=J=(a&+0FR{X1y3${kVC3g)&?K?aC6+>67B<8 z3=sDoNrmFiB8(Ks*)yN;CxHL$mlrG)%;-T}*N zNTPo*(I`-Hg%Geyi(VtS`>>M+a6;@V+E=6~2th>QtTzpPyXZaVf(Z(VNeS{_#wFJg#7{-4Wa<7$(}bR|KLust5^f_gM(ddd{j~q3 zpfxifI)|K`Q-YAN0RUcwDup3Ib$h!WwGzFmlMO<=^hWfh;eE#24_aC4R-?l^BgWp; zyyu4?Kez(XjoE*DTVVUjQnj2zkfP=jLjfL~M=ZX~Gn}IhQgTYTc()6nw56+NF(*Ja zwB1k*KNVXc5Qi^bxcW%8E&M+?m-RFsV!QhO1382WM(6xI14FwQhw6l|&6NZVi+=3- zV|7L`prYb58Vb{+Ftv+f0zL&0{dQggTTTFl%+$|@R}X->Qd)0|wqmb*-s%7h5NEN~ zeS0Ys0Ef2dhAxur43u~+@+8`9SrZ`eacLJO7tbNyD(5shPBcetYKKVUg+Yf3RU}o8 zF?~7D5JnX*cyFcx3@+r2!`fm?R3d*!(3 z2pULv5c|dM+yCT&Imjl1&cWm@@H@dU2UIJsaNs}wH!9pT^2BWE>soO!g*g1H5VOH<%p%VEM7DYbaZy49en;8 z9phd5w~tqpRJUgoK<)kepH%c8ytT0DDNvs;hk{HgwY8fky`=s&y38?bFgzdduzSaU znNw~@%W34YdIG3OWezJ%V1n6?JaCjNCFs#mp){b|z@kN4%n)7Lop;2QEr=dY#}g8e zU2-o!H!QR6BJ*F#2bsN{hLr-(cRsdVes2E*i(9=q z2y%g#CynQwDmL%iHisPot^AGpuNg)=e>_DC&0SpHlpg zl?>bARk}y;P;ju&7M3oS2JA2bu7-XWflV1W%5N{VAj(2aGkp4%bsxTEIES)?e(|Z> zXJ4OKKsC4#M!Vi-YVU}w>ZHNN`0(Ts6@;}R%BrDM$Q5maia>|JZh-60ax)R&;h^PvBX?EM3me8BaEDlb33cs0+g z5fFnP!)l+8nW}xk@k2K2&{z7>nloI4U@ie3ju)Z=rg4T~;48w_ zOUG;Tfpe6m`<;X;(?EnD>TPC3Gn4J8{cOW?PBum>;qC(NM-5}8#?6UTPHl!tx#1n+ zys38#;I9&!tBI{k=+cyqFJE(aZFVPkmGg(L^dAz@-hBcL56%`7%OCK4pTXKI8?ex(ounYb^Sj4RRx~(DG}nu2W+q4{O+L5 z%3YuuhFkpUr+X!y+ub+H&bh5046zkirb30Ayx5j8B9J$xy{n!Sfymi5j^$-Fw>HMZ z&MwM{IVBhXhpMp=t>VYM2y0xy#PYB@xL$TIT=#X|D&hpv~KL8Rx0J$Z(BiVKW&x4eppdCYR)rqBuCaev%q!(8sv z6Yyvtd+$+m{P|Y2XD2n_Qrh#z5LMNaMWP2&;KdorWSs9y!^f0bcp zRG$@{5*S`YMPLJHOb{Fl?`uNw>;n2x1&Po5Whn0z#4v%E3#EpV&Z#Zaf_b@+F{1q5 z^IzHX*b^GucU`&&(#}gsVCNJNpBID1v^^;*XJ#YR`Xw+~!oc5Ds<=DQ5>a&Y2Ul?T zvU|sjap<#G44VdD<$JPpiRi_|h|tqZPNR;{I4KxDOr;u%>K&$sbKKXj ztzg;^@%PwHz18wnLK8{diP$1PxRzvFpZcS1DM1jX-e78fPU49PZ;+FFHHzv*XX^0_ zrb2&)>0Fml)_&XnJrn`B#PpD<{q$%kAJn48HZG|-6sBblvfW{ShVP?KYK>o%dPZ}) zj;qel&}d+N#i{{TeTisGEM2Bjj8Y|$haNb9H# z=l?@?u)Ww3jkEqnwK68=R8JY+j$*&zlGY^zyPU2cE~aK!92t&0GJH1B=CcNXADSd7 zzh_Wj26fk5l9YI0@0e|mA6bWzgPJa5PY#xBq;65D<+r?1hFy>P;I#8-WmvNoLOx^A z*xLC4uASRUvxuHj7-c>JSJQDH86_3eHNveZg^}dspL+*guN|_cFoZ2kvc36hrj22J z5u>G6(Il)TU0Y>>Bq=1$LpMQJgM>{Q#qa8<^WA$b@XT0>D4y5g?rkWpl3lXD-m}(W zo(+lYod^xBTo|rG^OAte5RL}eQWMkZH(7Y2x;lf@lS1!bUrc_!dVU{%m+OZ)g^*pfI&;2zl&9ldtCCbxTHH;s@aKh!-wQ*T}CUWPD4#g*FstTJ2}d>q-Uvr%T8&YuwgZ#5>WN1- zjIpCMDB24o6uN18X#v^gJw*?0C1O4UGOpl-&k$P+Il4XQCpNry2jW<;? z7AVxU=QGpwKXf1}lwdq5eqOG@N3U*Xm3hYTrqBW-xq(ZsmVik2sF=c!j{3{*^`z8y zZjh^1udf)apooYX)zl57{j0q1m0Um`fm=VcX*1JrMhMxx@T(--Hs((R!8bV39YuMw z@XH3GT)_d9qUl;Nz;(rXc$7Ga!oPo3$!gmx!_?LP<1e3aPlT>Ly?o8}gCKYV4IU-x z({iqwN8T6xk6CktF9c>|-V=;>O(S`{AWW}Xy+)s0)vMl5Xyl9cibISRi~pWmi3xI| zggEbWR?g{+eFi~`qFXCd8_i@|#bE7X2b6<2iP>5{ce2{f%2cL}lm^8ua#gA9_{A@y zT!8yOzZ%)C|4*Zjm(VrqupEd^=zZU7hzKEPJkNBWZwlD-^)N2Ghm*DGA~J=aE7;r& z&iV>y`HAUf^J^{~z0kEJ<%;D93N1j`2e^(Vq!HI&kfhMfM7US&9;R^mX8`tHM8L(b zbQdHwcG<==#Q=3(TsQcj&3M9?ys(2^F6gXRuK^XnHV4r6)LfK9{~j?whwkeAZI95Y zFL6Yj^|$`(mzybDo0NWf73_-?kDJC|OfLbciGiY_jex~QEg}CspAs~3qKG)p-}E!n zDq8A)N8Wc$#u~uyiV7~EwS6d63po^zfr-9p-2idLvK$>WS@#RBn*2WAZf%WgugWu= z&|JbAlE}tP5Zj(B*iwQ@f)2>@`$y5x4N`)mJbJ5{>lY`LatF9iQHu_*7{nyRnxwqR zWXG2Yv=%?i-gbhc20q+-<^Q%u@2*`pTbbudHrU4Q27rtQ7D^nppy2d`>O3leFZ2Ol z807X01MygWs|G~4*V89LBRV<(>bH9fHWj+rdbt1>^G}UE+RoHKK<=OlHeE*V66nyB zjDArHi~_9v3D=w(e+`jP&Xs%D})<`lRU`UYNP z3N2S~8##+N-!fpk6Dm<7$_o#HA&W-x!n+~O4SxQsOy}|KLhLF_7bxKY#CHqL7tqJ& zQay6U`4_|B1Y+v|tm+L3PMPE11(m$HGy!h8FJz7FZhZaERSB(1Di0u_sr-*R`M!Pg z8n^o|A>_I_dRh3PqXR~c!2&KAlaOrEg&`TmtdBj&;TdJ0{0en41~>sc4P1bt~DAGBue9Do!_(D|h#6O6JS&s)M+84xqo zcK_e8^hGn!_R>?<(DNWO*e7WS`IlK^>tD&x?Ag9D+s!AsSD_={8khFsfEZ2ntwfRm zDXrfn#5{9RUzm;u{PHv?EzaUoEjY|X4+s1R7;+K+^O=bfgm zQ(`x=mltTK{!(HR2ArUggduGg(6-MD$l^6pZUV|K3K?po+#J9`4T!m_+l5%Pk3nY7 z7|#5fq#zC)zmQDPHsZc$%AOFQ-T=UJ`pW;ml}kMG7)L!#K`%s{gdVzNF2bh`2=_kQ z9gqod(o~m0U6pb2-sS*xtA0ik)1;d$+I(}9A(N{vcpC%k<5tZ7J0zf)Y4YJ~?;@j%7(u-{k+0tp+}e#B z-F-(7epq!(d5F-{RhrB*W%4Plt{&C0M0c%6(7J{vxx-R*>?K3-!G|-O;F(S7*&P1- zz~<+LmC+yP%^?zhLCG;64IVw*-}X`MtP)Fc2K8g>Db(X#+z6%X{JkA={1hB^tjq)s zgJ-&J!_AFpZuXo}`%LSY)g*grOte4^Q_N~C8wKr1pDvm!dl%0HI zU$0FiW6IS0Iivu4q7E3V18}8ByUe6#4_VeCHd5Ex%FdT_eBT9+wH!=3iqKyc zNP08RRKUl%+H|x4qHusC^V=v}*l8J619(;dE*@;6i>7ikxg&XRwxaC~+Nw|Ek#7`O zulqi&L|S_n#$6+N#jV-Q;<~Z71fDkaVeljOhuT7qBUDV-j}IDU!X1d>I<7j%^$2UH z15c0xz7{LEN*?yLOt-e}5Q%M(rQ)R6{QBCrtaWQZVXV02ph0G}LABK|hgfb~eOWlm zHjNMD+7LOnp?{zAqaUf-^8~Mnfj!HGYh;!ILhD9u(>f9l*=bd#CqJq4%qiMN%Ww^n z15ceF;q;pndU~~RQkZBNycJpbCDVPrQt-I3bb~8+WKuDpE|`=be)NZ4;ps#&BZ#zu z2%UW8fXjli!bE>HxhK-Ug7f3@#^M=azs6bTx%rd1#?3-?9xJfI{ZA=>KpaOCg%^vH zOf}L@(UDhPksNqSq=J{mkW9VWRoxBwNucswH}!z5KB
Z<>gG>kgL_m?+gocH!m)97@tlb=own(Z zKsgoU*;FFqX}#j0MJDaH*?b-__4F^cmeH+)4P%pcbles_j`xU_J8?Z37`LjlAgLX= z6y?OJN&^rr+5)&57w2c@g`%a6V87YN3ai;60So>93@fx8_ZCAHY|rqxM=8|uXHOLn zezPCJhAJDekQNDFwxZN=oTiT!DUvq?XCY+OT={|Qli%~TX=m_ zJl@9=zbOFT*VNhVU?O~9rjk91)}-=^dzc~$3{sV#lh5f33dxU^@0t(xS4ph!0SkBh zDW~4pOJH7KKRwC)g!fA_wUUvt!Z&eVS{Hu9$tBe#9b&-}k)_TEmIl zO1}OZ22wL&_*|XwywN+fkKix-5SLXoekcm{^U|j*n-@kTbT*g-jYsD!EOWih4cu z`kbyM4Ya3RvMzUg5G`yNh`|L&c-V$PgvJf zMCc`2oqBdg?ysYT>9zDY%&7j&&3&P8yP56;cw9gkCFAQ`9TYB83BNvd3qNUg4k* z6@AcNuV6!`#b6HDwFB?D=&2-g0nhhKUqpxjk`zFx0)rGFEl}SrWkPRmPwf1{clKMXNKWvz|FD+%btS|EY3)TfZXr zBz#`AlTT%DwQN51ex9Mo$>#A)G`&VukbIpdcV7~Mi)EO+k?nXPSC`RGgil_uvGwv&jyaE)mvB?{Z|^$gRCmcoY43voY-ksc98jQT zlNm95mDC5-I5WTGqy+CeKHQ6yUF3I7cfY)KZy|SM~vTD2aX(9S8 z#vT@(0foUY6eSk~dI1!>=}G*-RusuvzW)xNW7J0nFU@x{dUUjf-wbPE#Q)jCeQW*E z_WE>azH@zAY5PUC4nHhJ(KgOfE5`;Hwf~#{X+tU~tBsJWYWnJHP&^3#t66-wSwdoI)8-@9xbMUbW6g2HDF_(iwT#R~$u zVG%UX&kmwv8G)N$!<>No8;RJECpG8KgL^jZ=H%(Ydjol;6&{72+r+Dbmx|@OCAFi# zVa;_|&u;CPCiCnEi06K@)qy=kq#d8VfM?J&R1e6Yd;pE6iq6*EZnTtE*Jm%^M9qX6 z?+W$24Mp4AM55{12*622i#erxbtDTkRt$WjK=bBYYeRtI4a%?|VS4DXCi{I#>;>~E z&e!VGAQ=JD2G{WNW&5#n~GK1D%%T>g0p#r#}lJ(l5lpi7kee{96&~D)Lq#VVngDRd(qyB9(P>UChR45A|47)Uz&@ z5)*+@P$f2-eqmZ2;(dB`r;On{tN06-ifTLWb`qcv<}IEfCOM&B`U8!xtL$(*$vuOy)tn0^!<@9hqVmoy(Y--Y9a{1KD10Hz3_O5c7l6iD>r|3yH z?r0fYpfyB3rij2(np7z;QJ?b$z2y8srqB>8fAr{tdd4sJthi7466T^AgFfcba4MKT zoU_>(Jw+MTSL|RNa%eMEk44)tdVF(1Nm}Q2seDnywI^=7Xosv+_e^@M&PT7eWk}OI z%}%=*|5W_i^B#Pn@aR5mhT7TjjR?fwccq_*7aVgVm4h)cm#p<{_0x$OYG<}l?x;(^ zKjf93bFM9Fdm6XPdt)0%OTb(2JacVT4l~z(%dJ_JnxDtCE(7y?1Y3eDZZLBI$QFK) zL^NSS_Zi$e9$=c$6w84OXOCbCOJ`NylF}b(v#)fAxHNB=4p@*V+3F^FmeUC}bfb}| zfU}lkVJ{BGN;Bi>Ho1m2?bk6$N)6{dmr-*Zm{Z|wKQBLJUw4KxC62&PXDlLZKk802 z>rZCODz9^wbsJvaL`GhL0{1@7X1lJAEFki4hXrpcE!-& zaBIS&_IoT4;H8)1t+Fb#0J8p2D)GjLnD7#YyN&~V;1iMui1Tig^r-x(fyOvS?)B2H z-}w>FOw1Wc*JIhU+ygq0-P?g2*NvH&MKBNGD_Qbg8CE%cs5XwNWWAkr8mzg%@yVCd zCnxJHV)QX~@zRMse-8|=_aGy;;WXK6<89)%@;(y(98|t^zV31V;-N9@!06xf?SPH$ z?Xh=*a~`2CZGYeM!M$9ozis>TH6=y3zRQ7s=PF_K2*3`dkrQC?$RY4-CFympWDwH| z8AryUpiVt!boP`cz$9)wI^+lVJ};~Pg`#bORAep#XR25u{Tt#*BNsp2Ag^Jgwg6iazw^ z#%0Pe-*~o23_+w!gue@LlE7y>ueL@+L~5EFh8;w7Rd>IOp!Kcj5c;O=0}^>U*nisx zQ-asQ%b6Y>+dZ9JfoPdh@^{qcWP4qfVj?xXjn-|+l+|;(NCDj{Wv|oiG0h!MGt{Le zxo)}SD~A`NAJ+@!d|%qLu{ZVJd9<*YsAFFmO5^F}qnDP7>MpEm+4AannA^MR7B1KD zX7TWBFU~bN;gBj?FRk7WdH^4Pd9lmxTj7;0iCdY8T5@fIkrpI9FRPVP>(x=a*-)H{{*qMsRMy%n6_T!NO;&=>L2ySae+-n0v`TD5JK_+f;pL zErjFx@V}B0Rx06er=uqeneMmkF-hT?L$*fRmPFXbj6;v};>=HjMQ_P~BDs1tJwtu; zVn;IIj=oQQg+>}ZRvcVS?bCMRn778;)OMG));$DgUoMA{$#Ixu9G2)zly`;%(&Nl@ ze>S$c1#eV_)+@gmyHCVb-6J%n?GHetpjjtB2kb}f7KOtdX0H2h-Jn$K;cs&}7eU=X zg~W!|e2-d>J`=Fg-np5iFmQ~Cpf%0ay-vRsqoh}@SNMHwK{8v${`P(e%w^*N?$7Hk zF|*<;qj-ep)3n4Et;?ErZKLWZnm^LVWM6}tE>R38*Wl+y=o06Qwd<+;>iu;x0v|8I zaIl%%hf*QAV3AfJZlF|9J?H-ZtSB^et!z{e4tDuTnr2C#`tGsz=Fef!$)%&cBCtQ@ zjWJ1zSJJ{mWnP_9hHG>jOX1A)>hK)T3ioH61>j!T(Qk7PmObPD49>_seQ%dYKKDfg zwm9P#tNBvP9+OLST6eqWA)lBEKX3remsPFi2?Wz1U!Hu36Pw$osSPh4}KyXf0wO*DE_ShX>15aeoG{b6o#L%Kh1I z;WqR}CHF8+1c0dV`^T!u&DE{1obb&H6l*8S|7W2H+y))Yx2Kv>!qOZ+UXrlb1J_kH*_%W~D^3aYY$1Q}sH)Nbr}R zes41fWhNI^m036YvfOmmA-F^GqN8X9=;)0!LQw#z0yl%}?;BlTb*ZGM3SpQh!g#`S#Vjw5_~MOO*FQZqsW5L>PpN ze;VLrNXC2ejx95+FKcqxNEJJP48#(zxT@5AJz9(Jq@t^OaU^JMeB@)7V{UdI3V(5{ zd6k2We&WTPO|ayzkWkzNi?{PPo}}Z7PXqb%y{+4FPv3#V2R+$9nQanQ0`8EUn`hqy zPZ;(bKj{mwk&1st+1}+a(|z*EG02A|RttBhBY)W3hk1K5Bm>Zw_cTjOjEp(_LcLZH z`z>H`1)n z3Z@wAFCOM3zrd^CUViX<)4%?#g_!EYWFu=b9~DoL1@mf1HJ;%P2+x9m@O^x}Ac4@&>Y5XjS-iK9LmgKtZu>JkI#XJ3Np%3=i;~xz@ z1>I8MvyuYgP-FVubZ(nqmGwhLyXw1z50v?5{+|F30r37#HyikI)xV{PWZ93gSdeBc z`n2lbQY1r$l3r)~47j5DUr|JIquvR zlJ6z)1baBz@15OsD!=QeQ|!3h8eo6RVz2 z>I;da?R~1(k=6oFCihiDqy(PCVoSB+*89nQ6_Ip(NOd~Vv%ua7eh(2TkG-)NQ;pa) zExE5DlCCL)?L4mmLlXT4B2rdE2*0b~)I`65NQzz{Os9DVI40q?i->^5o_7cn%d`eS xO5-H_I?EK`TZy+?MC7Z!h5xMP$%(gG`2XqQoqun5iZ}oO002ovPDHLkV1oZXW~KlD literal 0 HcmV?d00001 diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index ded68110c4..086cdb6860 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -27,41 +27,47 @@ <% end %>
+
Add a review
- <%= form_with model: @review, url: product_reviews_path(@product.id) do |f| %> - <%= f.label :name %> - <%= f.text_field :name %> -
+ <%= form_with model: @review, url: product_reviews_path(@product.id) do |f| %> + <%= f.label :name %> + <%= f.text_field :name %> +
- <%= f.label :rating %>: - <%= f.radio_button :rating, 1 %> - <%= f.label "1"%> + <%= f.label :rating %>: + <%= f.radio_button :rating, 1 %> + <%= f.label "1"%> - <%= f.radio_button :rating, 2 %> - <%= f.label "2"%> + <%= f.radio_button :rating, 2 %> + <%= f.label "2"%> - <%= f.radio_button :rating, 3 %> - <%= f.label "3"%> + <%= f.radio_button :rating, 3 %> + <%= f.label "3"%> - <%= f.radio_button :rating, 4 %> - <%= f.label "4"%> + <%= f.radio_button :rating, 4 %> + <%= f.label "4"%> - <%= f.radio_button :rating, 5 %> - <%= f.label "5"%> -
- <%= f.label :description, "Review" %> - <%= f.text_area :description %> -
- <%= f.submit "Submit Review" %> - <% end %> + <%= f.radio_button :rating, 5 %> + <%= f.label "5"%> +
+ <%= f.label :description, "Review" %> + <%= f.text_area :description %> +
+ <%= f.submit "Submit Review" %> + <% end %> +
<% if @product.reviews.any? %> -

Reviews

+

Customer Reviews

<% @product.reviews.each do |review| %> -

Rating: <%= review.rating %>

-

Reviewed on <%= review.created_at%> by <%= review.name %>

-

Description: <%= review.description %>

+

+ <% review.rating.times do %> + <%= image_tag "star.png", alt: "star", width: "30rem" %> + <% end %> +

+

Reviewed on <%= review.created_at.strftime('%d %B %Y')%> by <%= review.name %>

+

<%= review.description %>

<% end %> <% end %> From 580d686e58aef1104a431059ac326ca609891b69 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Mon, 23 Nov 2020 17:50:15 -0800 Subject: [PATCH 199/248] a poorly formatted container for confirmation page --- app/assets/stylesheets/application.scss | 12 ++++++ app/views/carts/view_confirmation.html.erb | 44 +++++++++++++++++----- 2 files changed, 47 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 66d768b768..3228dd3e58 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -125,3 +125,15 @@ span.total { .checkout-button { text-align: center; } + +.order-break { + border: 1px solid lightgray; +// width: 50%; + margin-top: 2em; + margin-bottom: 2em; +} + +.cart-image img { + padding: 5px; + width: 8vw; +} \ No newline at end of file diff --git a/app/views/carts/view_confirmation.html.erb b/app/views/carts/view_confirmation.html.erb index 83c3c4f940..5713b67eee 100644 --- a/app/views/carts/view_confirmation.html.erb +++ b/app/views/carts/view_confirmation.html.erb @@ -2,16 +2,42 @@

Order Date: <%= @ordered_cart.purchase_datetime.strftime("%b %d, %Y") %>

Order Time: <%= @ordered_cart.purchase_datetime.strftime("%I:%M%p") %>

+ + + + + + + +<%# end %> + + + -
    -
  • <% @ordered_cart.cartitems.each do |cartitem| %> - <%= link_to cartitem.product.name, product_path(cartitem.product.id) %>, - quantity purchased: - <%= cartitem.qty %>, - subtotal: $<%= '%.2f' %cartitem.cartitem_subtotal%> -
    • -
+
+
+ <% @ordered_cart.cartitems.each do |cartitem| %> +
+ +
+ <%= image_tag(cartitem.product.image, :class => "order-image")%> +
+ +
+

<%= link_to cartitem.product.name.capitalize, product_path(cartitem.product.id) %>

+ Quantity purchased: <%= cartitem.qty %> +
+ +
+ subtotal: $<%= '%.2f' %cartitem.cartitem_subtotal%> +
+ +
+ <% end %> +
+ + +

Order total price: $<%= '%.2f'%@ordered_cart.total_price %>

Order current status: <%= @ordered_cart.status %>

\ No newline at end of file From 4361184cd02a58c3eb710815249ba1cd964fc49b Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Mon, 23 Nov 2020 17:56:04 -0800 Subject: [PATCH 200/248] category banner images --- app/assets/stylesheets/application.scss | 10 +++++ app/controllers/categories_controller.rb | 2 +- app/models/category.rb | 1 + app/views/layouts/_new_category.html.erb | 1 + app/views/layouts/application.html.erb | 20 --------- app/views/products/index.html.erb | 55 +++++++++++++++++------ db/migrate/20201124010335_category_url.rb | 5 +++ db/schema.rb | 3 +- 8 files changed, 61 insertions(+), 36 deletions(-) create mode 100644 db/migrate/20201124010335_category_url.rb diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 231a7c6dc4..1ec9adb6dc 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -40,6 +40,16 @@ button.btn a { color: white; } +.banner { + object-fit: cover; + width: 100%; + max-height: 360px; +} + +.title { + text-align: center; +} + // //main { diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb index b62ffd0e15..87b2426d92 100644 --- a/app/controllers/categories_controller.rb +++ b/app/controllers/categories_controller.rb @@ -21,7 +21,7 @@ def create private def category_params - return params.require(:category).permit(:name) + return params.require(:category).permit(:name, :banner_img) end end diff --git a/app/models/category.rb b/app/models/category.rb index 181b56c31b..fc29af3456 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -1,4 +1,5 @@ class Category < ApplicationRecord has_and_belongs_to_many :products validates :name, presence: true, uniqueness: true + attribute :banner_img, :string, default: "http://lorempixel.com/1440/360/sports" end diff --git a/app/views/layouts/_new_category.html.erb b/app/views/layouts/_new_category.html.erb index 2555ff1d99..88e140852b 100644 --- a/app/views/layouts/_new_category.html.erb +++ b/app/views/layouts/_new_category.html.erb @@ -1,4 +1,5 @@ <%= form_with model: @category_new do |f| %> <%= f.text_field :name, placeholder: "New Category" %> + <%= f.text_field :banner_img, placeholder: "Banner Image URL (optional)" %> <%= f.submit :submit %> <% end %> \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index ae59d9c918..27dfbb00ac 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -45,23 +45,6 @@ <% @categories.each do |category| %>

<%= link_to category.name.capitalize, category_products_path(category.id) %>

<% end %> - - <% if session[:user_id] %> - - - - - - - - - <%= render partial: '/layouts/new_category' %> - - - - - <% end %> - @@ -94,9 +77,6 @@ - - - diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index 8184c9abf9..f09d575ee2 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -1,19 +1,51 @@ - - <% if params[:category_id] %> -

<%= @category.name.capitalize %>

- <% elsif params[:user_id] %> -

Products by <%= @merchant.name.capitalize %>

+
+ <% if @category.banner_img || @user.banner%> <% else %> -

All Products

- <% end %> +
+ +
+ +
+ + <% if params[:category_id] %> + +

<%= @category.name.capitalize %>

+ <% elsif params[:user_id] %> + +

Products by <%= @merchant.name.capitalize %>

+ <% else %> +

All Products

+ <% end %> + + <% if session[:user_id] %> + + + + + + <% end %> + +
+
<% @products.each do |product| %>
-
+
+ Product image
- Product image
<%= link_to product.name, product_path(product.id) %>

<%= product.cost %>

@@ -28,8 +60,3 @@ <% end %>
-
- <% if session[:user_id] %> - - <% end %> -
diff --git a/db/migrate/20201124010335_category_url.rb b/db/migrate/20201124010335_category_url.rb new file mode 100644 index 0000000000..1aeee3f1e6 --- /dev/null +++ b/db/migrate/20201124010335_category_url.rb @@ -0,0 +1,5 @@ +class CategoryUrl < ActiveRecord::Migration[6.0] + def change + add_column :categories, :banner_img, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 2268435fdc..9b74a553b3 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_11_22_004311) do +ActiveRecord::Schema.define(version: 2020_11_24_010335) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -44,6 +44,7 @@ t.string "name" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.string "banner_img" end create_table "categories_products", force: :cascade do |t| From 163f07b4fa9a3a68497e221309552f41009de614 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Mon, 23 Nov 2020 18:00:45 -0800 Subject: [PATCH 201/248] a table works omg --- app/views/carts/view_confirmation.html.erb | 53 +++++++++++++++------- 1 file changed, 36 insertions(+), 17 deletions(-) diff --git a/app/views/carts/view_confirmation.html.erb b/app/views/carts/view_confirmation.html.erb index 5713b67eee..0bfa4a2a68 100644 --- a/app/views/carts/view_confirmation.html.erb +++ b/app/views/carts/view_confirmation.html.erb @@ -14,30 +14,49 @@ + + + <%# @ordered_cart.cartitems.each do |cartitem| %> + + + + <%#= image_tag(cartitem.product.image, :class => "order-image")%> + + + + + + + + + + + + + <%# end %> + + +
-
+ + <% @ordered_cart.cartitems.each do |cartitem| %> -
- -
- <%= image_tag(cartitem.product.image, :class => "order-image")%> -
+
+ + + + + <% end %> -
-

<%= link_to cartitem.product.name.capitalize, product_path(cartitem.product.id) %>

- Quantity purchased: <%= cartitem.qty %> -
+ -
- subtotal: $<%= '%.2f' %cartitem.cartitem_subtotal%> -
+
<%= image_tag(cartitem.product.image, :class => "order-image")%>

<%= link_to cartitem.product.name.capitalize, product_path(cartitem.product.id) %> +

Quantity purchased: <%= cartitem.qty %>

+ 		subtotal: $<%= '%.2f' %cartitem.cartitem_subtotal%>
-
- <% end %> -
+
-

Order total price: $<%= '%.2f'%@ordered_cart.total_price %>

Order current status: <%= @ordered_cart.status %>

\ No newline at end of file From 930da7371c7e810b467d4ed4d865a63c632b7b97 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Mon, 23 Nov 2020 18:19:45 -0800 Subject: [PATCH 202/248] basic product nav styling complete --- app/assets/stylesheets/application.scss | 5 +++++ app/views/products/index.html.erb | 17 +++++------------ test/models/category_test.rb | 13 ++++++++++--- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 1ec9adb6dc..1a8e5de4f9 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -50,6 +50,11 @@ button.btn a { text-align: center; } +img.card-img-top { + object-fit: cover; + width: 100%; + height: 240px; +} // //main { diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index f09d575ee2..f58c8a6028 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -1,21 +1,15 @@ -
- <% if @category.banner_img || @user.banner%> - <% else %> -
- -
-
<% if params[:category_id] %> - +

<%= @category.name.capitalize %>

<% elsif params[:user_id] %> - +

Products by <%= @merchant.name.capitalize %>

<% else %> -

All Products

+

+

All Products

<% end %> <% if session[:user_id] %> @@ -38,13 +32,12 @@ <% end %>
-
<% @products.each do |product| %>
- Product image + Product image
<%= link_to product.name, product_path(product.id) %>

<%= product.cost %>

diff --git a/test/models/category_test.rb b/test/models/category_test.rb index 841a2edc6d..925c50e6ea 100644 --- a/test/models/category_test.rb +++ b/test/models/category_test.rb @@ -1,7 +1,14 @@ require "test_helper" describe Category do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + it "can have a banner image" do + gear = categories(:category_gear) + gear.banner_img = "http://lorempixel.com/1440/360/food" + expect(gear.valid?).must_equal true + end + + it "can be instantiated without a banner image" do + gear = Category.create(name: "pets", banner_img: nil) + expect(gear.valid?).must_equal true + end end From 127d2ee310d5c597257834a2655be5aafbc0f592 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 18:22:25 -0800 Subject: [PATCH 203/248] bootstrap styling the customer review section --- app/views/products/show.html.erb | 92 ++++++++++++++++++++------------ 1 file changed, 58 insertions(+), 34 deletions(-) diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 086cdb6860..8b4ff0e592 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -27,49 +27,73 @@ <% end %>
-
-
Add a review
- <%= form_with model: @review, url: product_reviews_path(@product.id) do |f| %> - <%= f.label :name %> - <%= f.text_field :name %> -
+
+

Add a review

+ <%= form_with model: @review, url: product_reviews_path(@product.id) do |f|%> - <%= f.label :rating %>: - <%= f.radio_button :rating, 1 %> - <%= f.label "1"%> +
+ <%= f.label :rating, "Your Rating" %>: +
- <%= f.radio_button :rating, 2 %> - <%= f.label "2"%> +
+ <%= f.radio_button :rating, 1, class: "form-check-input" %> + <%= f.label "1", class: "form-check-label"%> +
- <%= f.radio_button :rating, 3 %> - <%= f.label "3"%> +
+ <%= f.radio_button :rating, 2, class: "form-check-input" %> + <%= f.label "2", class: "form-check-label"%> +
- <%= f.radio_button :rating, 4 %> - <%= f.label "4"%> +
+ <%= f.radio_button :rating, 3, class: "form-check-input" %> + <%= f.label "3", class: "form-check-label"%> +
- <%= f.radio_button :rating, 5 %> - <%= f.label "5"%> -
+
+ <%= f.radio_button :rating, 4, class: "form-check-input" %> + <%= f.label "4", class: "form-check-label"%> +
+ +
+ <%= f.radio_button :rating, 5, class: "form-check-input" %> + <%= f.label "5", class: "form-check-label"%> +
+ +
+ <%= f.label :name %> + <%= f.text_field :name, class: "form-control" %> +
+ +
<%= f.label :description, "Review" %> - <%= f.text_area :description %> -
- <%= f.submit "Submit Review" %> + <%= f.text_area :description, class: "form-control" %> +
+ + <%= f.submit "Submit Review", class: "btn btn-info" %> <% end %>
- - <% if @product.reviews.any? %> -

Customer Reviews

- <% @product.reviews.each do |review| %> -

- <% review.rating.times do %> - <%= image_tag "star.png", alt: "star", width: "30rem" %> - <% end %> -

-

Reviewed on <%= review.created_at.strftime('%d %B %Y')%> by <%= review.name %>

-

<%= review.description %>

- <% end %> - <% end %> +
+
+ <% if @product.reviews.any? %> +

Customer Reviews

+
+ <% @product.reviews.each do |review| %> +
+
+ <% review.rating.times do %> + <%= image_tag "star.png", alt: "star", width: "30rem" %> + <% end %> +
+
Reviewed on <%= review.created_at.strftime('%d %B %Y')%> by <%= review.name %>
+
<%= review.description %>
+
+ <% end %> +
+ <% end %> +
+
From f4b4dec69b5ce5b278ad1747b7feb690b7ed63ad Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 18:38:03 -0800 Subject: [PATCH 204/248] save current work --- app/views/products/show.html.erb | 104 +++++++++++++++++-------------- 1 file changed, 56 insertions(+), 48 deletions(-) diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 8b4ff0e592..68af8539b2 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -26,65 +26,75 @@ <%= link_to 'Delete', product_path(@product), method: :delete, data: { confirm: "Are you sure?"} %> <% end %> -
-
-

Add a review

- <%= form_with model: @review, url: product_reviews_path(@product.id) do |f|%> - -
- <%= f.label :rating, "Your Rating" %>: -
- -
- <%= f.radio_button :rating, 1, class: "form-check-input" %> - <%= f.label "1", class: "form-check-label"%> -
+ <%= button_to "Add to Cart", add_to_cart_path(@product.id) %> + <%= link_to 'Back', products_path %> -
- <%= f.radio_button :rating, 2, class: "form-check-input" %> - <%= f.label "2", class: "form-check-label"%> -
- -
- <%= f.radio_button :rating, 3, class: "form-check-input" %> - <%= f.label "3", class: "form-check-label"%> -
- -
- <%= f.radio_button :rating, 4, class: "form-check-input" %> - <%= f.label "4", class: "form-check-label"%> -
- -
- <%= f.radio_button :rating, 5, class: "form-check-input" %> - <%= f.label "5", class: "form-check-label"%> -
- -
- <%= f.label :name %> - <%= f.text_field :name, class: "form-control" %> -
+
-
- <%= f.label :description, "Review" %> - <%= f.text_area :description, class: "form-control" %> +
+

ADD A REVIEW

+
+
+ <%= form_with model: @review, url: product_reviews_path(@product.id) do |f|%> + +
+ <%= f.label :rating, "Your Rating" %>: +
+ +
+ <%= f.radio_button :rating, 1, class: "form-check-input" %> + <%= f.label "1", class: "form-check-label"%> +
+ +
+ <%= f.radio_button :rating, 2, class: "form-check-input" %> + <%= f.label "2", class: "form-check-label"%> +
+ +
+ <%= f.radio_button :rating, 3, class: "form-check-input" %> + <%= f.label "3", class: "form-check-label"%> +
+ +
+ <%= f.radio_button :rating, 4, class: "form-check-input" %> + <%= f.label "4", class: "form-check-label"%> +
+ +
+ <%= f.radio_button :rating, 5, class: "form-check-input" %> + <%= f.label "5", class: "form-check-label"%> +
+ +
+ <%= f.label :name %> + <%= f.text_field :name, class: "form-control" %> +
+ +
+ <%= f.label :description, "Review" %> + <%= f.text_area :description, class: "form-control" %> +
+ + <%= f.submit "Submit Review", class: "btn btn-info" %> + <% end %>
+
- <%= f.submit "Submit Review", class: "btn btn-info" %> - <% end %>
+
<% if @product.reviews.any? %> -

Customer Reviews

+

CUSTOMER REVIEWS

<% @product.reviews.each do |review| %>
- <% review.rating.times do %> - <%= image_tag "star.png", alt: "star", width: "30rem" %> - <% end %> + <% review.rating.times do %> + <%= image_tag "star.png", alt: "star", width: "30rem" %> + <% end %>
Reviewed on <%= review.created_at.strftime('%d %B %Y')%> by <%= review.name %>
<%= review.description %>
@@ -97,6 +107,4 @@ -<%= button_to "Add to Cart", add_to_cart_path(@product.id) %> -<%= link_to 'Back', products_path %> From ec78f94759c9888f55b7f3361a61208372e30dd2 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Mon, 23 Nov 2020 18:40:55 -0800 Subject: [PATCH 205/248] format images --- app/assets/stylesheets/application.scss | 5 +- app/views/carts/view_confirmation.html.erb | 61 ++++++++-------------- 2 files changed, 25 insertions(+), 41 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 3228dd3e58..5f2fdf014f 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -133,7 +133,6 @@ span.total { margin-bottom: 2em; } -.cart-image img { - padding: 5px; - width: 8vw; +.order-image { +height: 100px } \ No newline at end of file diff --git a/app/views/carts/view_confirmation.html.erb b/app/views/carts/view_confirmation.html.erb index 0bfa4a2a68..63f78b7ede 100644 --- a/app/views/carts/view_confirmation.html.erb +++ b/app/views/carts/view_confirmation.html.erb @@ -1,41 +1,9 @@

Order Confirmation

Order Date: <%= @ordered_cart.purchase_datetime.strftime("%b %d, %Y") %>

Order Time: <%= @ordered_cart.purchase_datetime.strftime("%I:%M%p") %>

+

Order total price: $<%= '%.2f'%@ordered_cart.total_price %>

+

Order current status: <%= @ordered_cart.status.capitalize %>

- - - - - - - -<%# end %> - - - - - - - <%# @ordered_cart.cartitems.each do |cartitem| %> - - - - <%#= image_tag(cartitem.product.image, :class => "order-image")%> - - - - - - - - - - - - - <%# end %> - -
@@ -44,9 +12,9 @@ - + <% end %> @@ -56,7 +24,24 @@
+
+

Shipping Address

+

<%= @ordered_cart.name %>

+

<%= @ordered_cart.mailing_address %>

+

<%= @ordered_cart.email %>

+
+ +
+

Payment Information

+
<%= image_tag(cartitem.product.image, :class => "order-image")%>

<%= link_to cartitem.product.name.capitalize, product_path(cartitem.product.id) %> -

Quantity purchased: <%= cartitem.qty %>

+

Quantity: <%= cartitem.qty %> @ $<%= '%.2f' %cartitem.cost %> each

subtotal: $<%= '%.2f' %cartitem.cartitem_subtotal%>Subtotal: $<%= '%.2f' %cartitem.cartitem_subtotal%>
+ + + + + + +
Card Number************ <%= @ordered_cart.cc_number[-4..-1] %>
+
+ -

Order total price: $<%= '%.2f'%@ordered_cart.total_price %>

-

Order current status: <%= @ordered_cart.status %>

\ No newline at end of file From 2778ff5b1af0d7585038b061769a8a2b0d4060d0 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Mon, 23 Nov 2020 18:52:02 -0800 Subject: [PATCH 206/248] schema diff --- db/schema.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index 41dfe040b3..f1929a4b15 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_11_23_235409) do +ActiveRecord::Schema.define(version: 2020_11_24_010335) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" From 0ff03e9c4f0b23d36ba00b39e8c4cae92ef23556 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Mon, 23 Nov 2020 18:53:30 -0800 Subject: [PATCH 207/248] residual merge conflict mess --- app/assets/stylesheets/application.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index efd6e1e328..2437084146 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -50,7 +50,6 @@ button.btn a { text-align: center; } -<<<<<<< HEAD .cart-table { width: 80%; margin-left: 7rem; From c394208b788d410eea2b9c97418f86d019e143ff Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Mon, 23 Nov 2020 18:59:03 -0800 Subject: [PATCH 208/248] should have deleted --- app/assets/stylesheets/application.scss | 33 ------------------------- 1 file changed, 33 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 2437084146..8912dbd534 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -50,39 +50,6 @@ button.btn a { text-align: center; } -.cart-table { - width: 80%; - margin-left: 7rem; - -} - -.checkout { - - margin-left: auto; - margin-right: 12rem; - width: 25rem; - height: 10rem; - background: lightpink; -} - -.summary-container { - padding-left: 3rem; - padding-right: 3rem; - padding-top: 2rem; -} - -.summary-container div { - padding-bottom: .5rem; -} - -span.total { - margin-left: 8rem; -} - -.checkout-button { - text-align: center; -} - .order-break { border: 1px solid lightgray; // width: 50%; From f93c21b32efde5b3bc16b552d58b29ed8802600c Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 19:14:54 -0800 Subject: [PATCH 209/248] styling spacing and font color of reviews section --- app/assets/stylesheets/application.scss | 19 ++++++++ app/views/products/show.html.erb | 59 +++++++++++++------------ 2 files changed, 49 insertions(+), 29 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 1a8e5de4f9..ae48e9d2a0 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -56,6 +56,25 @@ img.card-img-top { height: 240px; } +.radio-buttons { + margin-bottom: 1rem; +} + +.rating-label { + margin-bottom: .75rem; +} +.review-group div { + margin-left: 0; + margin-right: 0; +} + +.review-info { + margin-bottom: 0.5rem; +} + +div.reviewed-by { + color: gray; +} // //main { // display: grid; diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 68af8539b2..16a5389fff 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -33,37 +33,38 @@

ADD A REVIEW

-
+
<%= form_with model: @review, url: product_reviews_path(@product.id) do |f|%> -
+
<%= f.label :rating, "Your Rating" %>:
- -
- <%= f.radio_button :rating, 1, class: "form-check-input" %> - <%= f.label "1", class: "form-check-label"%> -
- -
- <%= f.radio_button :rating, 2, class: "form-check-input" %> - <%= f.label "2", class: "form-check-label"%> -
- -
- <%= f.radio_button :rating, 3, class: "form-check-input" %> - <%= f.label "3", class: "form-check-label"%> -
- -
- <%= f.radio_button :rating, 4, class: "form-check-input" %> - <%= f.label "4", class: "form-check-label"%> -
- -
- <%= f.radio_button :rating, 5, class: "form-check-input" %> - <%= f.label "5", class: "form-check-label"%> +
+
+ <%= f.radio_button :rating, 1, class: "form-check-input" %> + <%= f.label "1", class: "form-check-label"%> +
+ +
+ <%= f.radio_button :rating, 2, class: "form-check-input" %> + <%= f.label "2", class: "form-check-label"%> +
+ +
+ <%= f.radio_button :rating, 3, class: "form-check-input" %> + <%= f.label "3", class: "form-check-label"%> +
+ +
+ <%= f.radio_button :rating, 4, class: "form-check-input" %> + <%= f.label "4", class: "form-check-label"%> +
+ +
+ <%= f.radio_button :rating, 5, class: "form-check-input" %> + <%= f.label "5", class: "form-check-label"%> +
@@ -91,13 +92,13 @@
<% @product.reviews.each do |review| %>
-
+
<% review.rating.times do %> <%= image_tag "star.png", alt: "star", width: "30rem" %> <% end %>
-
Reviewed on <%= review.created_at.strftime('%d %B %Y')%> by <%= review.name %>
-
<%= review.description %>
+
Reviewed on <%= review.created_at.strftime('%d %B %Y')%> by <%= review.name %>
+
<%= review.description %>
<% end %>
From c1ab8c7be75d86dafc0fd0de6f3b8dfcd8ee9163 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 19:28:51 -0800 Subject: [PATCH 210/248] added rating validator, only rating between 1-5, wrote tests --- app/models/review.rb | 1 + db/schema.rb | 6 ++---- test/models/review_test.rb | 20 ++++++++++++++++++++ 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/app/models/review.rb b/app/models/review.rb index 1647b973ef..e5dc10fce8 100644 --- a/app/models/review.rb +++ b/app/models/review.rb @@ -3,5 +3,6 @@ class Review < ApplicationRecord validates :name, presence: true validates_presence_of :rating, message: "must give a rating" + validates :rating, :inclusion => 1..5 end diff --git a/db/schema.rb b/db/schema.rb index 4465a4a6e6..5c5fa2b785 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,11 +10,9 @@ # # It's strongly recommended that you check this file into your version control system. -<<<<<<< HEAD -ActiveRecord::Schema.define(version: 2020_11_23_224708) do -======= + ActiveRecord::Schema.define(version: 2020_11_24_010335) do ->>>>>>> master + # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" diff --git a/test/models/review_test.rb b/test/models/review_test.rb index 3b6e2b129e..0607359411 100644 --- a/test/models/review_test.rb +++ b/test/models/review_test.rb @@ -38,5 +38,25 @@ expect(result).must_equal false expect(review.errors.messages).must_include :rating end + + it "requires a rating between 1-5" do + p = products(:product0) + 5.times do |i| + review = Review.new(product: p, name: "Terry Bob", rating: i+1 ) + result = review.valid? + expect(result).must_equal true + end + end + + it "invalid ratings for bogas ratings" do + p = products(:product0) + bogas_ratings = ["hello", 20, -10] + bogas_ratings.each do |rating| + review = Review.new(product: p, name: "Terry Bob", rating: rating ) + result = review.valid? + expect(result).must_equal false + expect(review.errors.messages).must_include :rating + end + end end end From d3a22505015e1c787749bafa870ad6c398d69637 Mon Sep 17 00:00:00 2001 From: r-spiel Date: Mon, 23 Nov 2020 19:31:52 -0800 Subject: [PATCH 211/248] update fulfillment methods to only pull user's cartitems from cart --- app/controllers/cartitems_controller.rb | 9 ++++----- app/controllers/users_controller.rb | 6 +++++- app/models/cart.rb | 10 ++++++++++ app/models/user.rb | 25 ++++++++++++++++++++++--- app/views/users/_order_table.html.erb | 23 +++++++++++++---------- app/views/users/fulfillment.html.erb | 1 + config/routes.rb | 2 +- 7 files changed, 56 insertions(+), 20 deletions(-) diff --git a/app/controllers/cartitems_controller.rb b/app/controllers/cartitems_controller.rb index e2c68ca2a8..343daa4ab5 100644 --- a/app/controllers/cartitems_controller.rb +++ b/app/controllers/cartitems_controller.rb @@ -32,7 +32,10 @@ def destroy end def update_status - if @cart_item.update(cartitem_params) + @cart_item.assign_attributes(fulfillment_status: "order shipped") + if @cart_item.save + cart = @cart_item.cart + cart.complete_cart redirect_back fallback_location: '/' return else @@ -43,10 +46,6 @@ def update_status private - def cartitem_params - return params.require(:cartitem).permit(:fulfillment_status) - end - def find_cartitem cart_item_id = params[:id] @cart_item = Cartitem.find_by(id: cart_item_id) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 534423fa23..e13fe23394 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -36,11 +36,15 @@ def current end def fulfillment - # merchant_orders returns a hash where the key is the cart id, the value is the cart + # merchant_orders returns a hash where the key is the cart, the value an array of cart items belonging to the user @pending_orders = @current_user.merchant_orders(status = "pending") @paid_orders = @current_user.merchant_orders(status = "paid") @complete_orders = @current_user.merchant_orders(status = "complete") + # @pending_revenue = @current_user.revenue("pending") + # @paid_revenue = @current_user.revenue("paid") + # @complete_revenue = @current_user.revenue("complete") + unless @current_user flash[:error] = "You must be logged in to see this page" redirect_to root_path diff --git a/app/models/cart.rb b/app/models/cart.rb index 40e9c7cd5c..536d920470 100644 --- a/app/models/cart.rb +++ b/app/models/cart.rb @@ -28,4 +28,14 @@ def update_item_fulfillment item.save end end + + def complete_cart + complete_cart = self.cartitems.all? { |item| item.fulfillment_status == "order shipped" } + + if complete_cart + self.status = "complete" + self.save + end + end + end diff --git a/app/models/user.rb b/app/models/user.rb index ff75d0b798..00a0d89286 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -35,14 +35,33 @@ def merchant_orders(status) merchant_cartitems = self.cartitems # selected carts is a hash, where the cart id is the key and the cart is the value in order to make it easier to check if that cart is already in the list when iterating thru cartitems - selected_carts = {} + # Want to make the key the cart, and the value an array of the user's cart items + selected_carts = Hash.new { |h, k| h[k] = []} # set empty array as default value merchant_cartitems.each do |item| - if item.cart.status == status && !selected_carts[item.cart.id] - selected_carts[item.cart.id] = item.cart + if item.cart.status == status + selected_carts[item.cart] << item end end + + # merchant_cartitems.each do |item| + # if item.cart.status == status && !selected_carts[item.cart.id] + # selected_carts[item.cart.id] = item.cart + # end + # end return selected_carts end + # def revenue(status) + # revenue = 0 + # + # self.merchant_orders(status).each_value do |cart| + # cart.cartitems.each do |item| + # item.product.user == self + # revenue += (item.cost * item.qty) + # end + # end + # + # return revenue + # end end diff --git a/app/views/users/_order_table.html.erb b/app/views/users/_order_table.html.erb index 243666791b..e90e28e43e 100644 --- a/app/views/users/_order_table.html.erb +++ b/app/views/users/_order_table.html.erb @@ -4,10 +4,17 @@ <% if orders.any? %> - <% orders.each_value do |cart| %> + <% orders.each do |cart, user_items| %> - + + @@ -19,22 +26,18 @@ - <% cart.cartitems.each do |item| %> + <% user_items.each do |item| %> - +
Order ID: <%= cart.id %><%= link_to "Order #: #{cart.id}", view_confirmation_path(cart.id), method: :get %>Order Placed On: + <% if cart.status == "pending" %> + N/A + <% else %> + Insert DateTime + <% end %> + Status: <%= cart.status %>
Fulfillment Status
<%= item.product.name %><% product = Product.find_by(id: item.product_id) %> + <%= link_to product.name, product_path(product), method: :get %> <%= item.product.cost %> <%= item.qty %> <%= item.product.cost * item.qty %> <% if item.fulfillment_status && item.product.user.id == @current_user.id %> <%= item.fulfillment_status %> - <%#=# button_to "Update to Shipped", update_status_path(item.id) %> - <%= form_with model: item do |f| %> - <%= f.label :fulfillment_status %> - <%= f.select :fulfillment_status, ["Order Placed", "Order Shipped"], include_blank: false %> - <%= f.submit "Update", class: "submit_button", method: :patch %> - <% end %> + <%= button_to "Update to Shipped", update_status_path(item.id), method: :post %> <% elsif item.fulfillment_status %> <%= item.fulfillment_status %> <% else %> diff --git a/app/views/users/fulfillment.html.erb b/app/views/users/fulfillment.html.erb index 8c3c5e288d..b1c67ee5e6 100644 --- a/app/views/users/fulfillment.html.erb +++ b/app/views/users/fulfillment.html.erb @@ -2,6 +2,7 @@

Order Fulfillment:

+ <%= render partial: 'order_table', locals: { status: "Pending", description: "orders in a customer's cart", orders: @pending_orders } %> <%= render partial: 'order_table', locals: { status: "Paid", description: "order confirmed, waiting for all items in the order to ship", orders: @paid_orders } %> diff --git a/config/routes.rb b/config/routes.rb index fe5cd19346..ba45a9813d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -38,5 +38,5 @@ post 'cartitems/:id/add', to: "cartitems#add_qty", as: "add" post 'cartitems/:id/reduce', to: "cartitems#reduce_qty", as: "reduce" - patch 'cartitems/:id', to: 'cartitems#update_status', as: 'update_status' + post 'cartitems/:id', to: 'cartitems#update_status', as: 'update_status' end From 7851958b61448b13d5ea7e00d64c3f4e5c9b70f2 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 19:34:29 -0800 Subject: [PATCH 212/248] create a method for average rating of product --- app/models/product.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/models/product.rb b/app/models/product.rb index b4af5da93e..b1979e1f39 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -29,5 +29,9 @@ def owner(current_user) end end - + def avg_rating + sum = self.reviews.sum { |review| review.rating }.round(2) + num_reviews = self.reviews.count + return sum/num_reviews + end end From 39de4c28dc2ed0e704180475990b409ce73d76e3 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 19:35:15 -0800 Subject: [PATCH 213/248] rounded average rating to 1 decimal place --- app/models/product.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/product.rb b/app/models/product.rb index b1979e1f39..ca4967e1a6 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -32,6 +32,6 @@ def owner(current_user) def avg_rating sum = self.reviews.sum { |review| review.rating }.round(2) num_reviews = self.reviews.count - return sum/num_reviews + return (sum/num_reviews).round(1) end end From a9e42d46ceb9c5d9a049806e0be399b649f7a169 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 19:43:10 -0800 Subject: [PATCH 214/248] fixed avg_rating method to handle no reviews and fixed rounding --- app/models/product.rb | 10 +++++++--- app/views/products/show.html.erb | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/models/product.rb b/app/models/product.rb index ca4967e1a6..c900bb57c6 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -30,8 +30,12 @@ def owner(current_user) end def avg_rating - sum = self.reviews.sum { |review| review.rating }.round(2) - num_reviews = self.reviews.count - return (sum/num_reviews).round(1) + if self.reviews == nil + return nil + else + sum = self.reviews.sum { |review| review.rating }.to_f + num_reviews = self.reviews.count + return (sum/num_reviews).round(1) + end end end diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 16a5389fff..a76e2b2dba 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -12,7 +12,7 @@ <%= @product.inventory %> in stock
<%= @product.description %>
$<%= @product.cost %>
- + Rating: <%= @product.avg_rating %>
Categories:
    <% @product.categories.each do |category| %> From e129092f8485de66d3be58b9b8ea68b8d5a6488d Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 19:49:44 -0800 Subject: [PATCH 215/248] added tests for avg rating method --- app/models/product.rb | 2 +- test/models/product_test.rb | 81 ++++++++++++++++++++++--------------- 2 files changed, 49 insertions(+), 34 deletions(-) diff --git a/app/models/product.rb b/app/models/product.rb index c900bb57c6..c122fc863f 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -30,7 +30,7 @@ def owner(current_user) end def avg_rating - if self.reviews == nil + if self.reviews.empty? return nil else sum = self.reviews.sum { |review| review.rating }.to_f diff --git a/test/models/product_test.rb b/test/models/product_test.rb index 34e64d3507..a93326b012 100644 --- a/test/models/product_test.rb +++ b/test/models/product_test.rb @@ -11,52 +11,67 @@ describe "custom model methods" do - describe "update cartitems" do - it "can update a cartitems cost to match the product and the cart status must be pending" do - # choose a product and change cost - product = products(:product3) - product.cost = 4234.00 - product.save + describe "update cartitems" do + it "can update a cartitems cost to match the product and the cart status must be pending" do + # choose a product and change cost + product = products(:product3) + product.cost = 4234.00 + product.save - # cartitem of the product above - cartitem = cartitems(:cartitem5) + # cartitem of the product above + cartitem = cartitems(:cartitem5) - # assert - product.update_cartitems + # assert + product.update_cartitems - updated_cartitem = Cartitem.find_by(id: cartitem.id) + updated_cartitem = Cartitem.find_by(id: cartitem.id) - expect(updated_cartitem.id).must_equal cartitem.id - expect(updated_cartitem.cart).must_equal cartitem.cart - expect(updated_cartitem.product).must_equal product - expect(updated_cartitem.cart.status).must_equal "pending" - expect(updated_cartitem.cost).must_equal 4234.00 - end + expect(updated_cartitem.id).must_equal cartitem.id + expect(updated_cartitem.cart).must_equal cartitem.cart + expect(updated_cartitem.product).must_equal product + expect(updated_cartitem.cart.status).must_equal "pending" + expect(updated_cartitem.cost).must_equal 4234.00 + end - it "should not update the cartitem if the cart status is not pending" do + it "should not update the cartitem if the cart status is not pending" do - # choose a product and change cost - product = products(:product5) - product.cost = 385.00 - product.save + # choose a product and change cost + product = products(:product5) + product.cost = 385.00 + product.save - # cartitem of the product above - cartitem = cartitems(:cartitem4) + # cartitem of the product above + cartitem = cartitems(:cartitem4) - # assert - product.update_cartitems + # assert + product.update_cartitems - found_cartitem = Cartitem.find_by(id: cartitem.id) + found_cartitem = Cartitem.find_by(id: cartitem.id) + + expect(found_cartitem.id).must_equal cartitem.id + expect(found_cartitem.cart).must_equal cartitem.cart + expect(found_cartitem.product).must_equal product + expect(found_cartitem.cart.status).must_equal "paid" + expect(found_cartitem.cost).wont_equal product.cost + end + end + + describe "avg rating" do + it "can calculate the average rating" do + product = products(:product0) + + expect(product.avg_rating).must_equal 4.0 + end + + it "returns nil if there is no rating for the product" do + product = products(:product1) + + expect(product.avg_rating).must_be_nil + end - expect(found_cartitem.id).must_equal cartitem.id - expect(found_cartitem.cart).must_equal cartitem.cart - expect(found_cartitem.product).must_equal product - expect(found_cartitem.cart.status).must_equal "paid" - expect(found_cartitem.cost).wont_equal product.cost end - end it "will authenticate a user as the owner of a product and return true" do user = users(:ada) From e62628a7fe0a459ebe4f1e334628641cd2cebef3 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 19:54:26 -0800 Subject: [PATCH 216/248] added rating to the products view page --- app/views/products/show.html.erb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index a76e2b2dba..7173d09c8b 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -12,7 +12,11 @@ <%= @product.inventory %> in stock
    <%= @product.description %>
    $<%= @product.cost %>
    - Rating: <%= @product.avg_rating %>
    + <% if @product.avg_rating == nil %> + Rating: Not Available
    + <% else %> + Rating: <%= @product.avg_rating %>
    + <% end %> Categories:
      <% @product.categories.each do |category| %> From 058a5f5c28da33b277c7b88d4f0a37997f6409ea Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 19:57:01 -0800 Subject: [PATCH 217/248] made the costs on the product list and show page to two decimal places, added dollar sign --- app/views/products/index.html.erb | 2 +- app/views/products/show.html.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index f58c8a6028..dc02cf4076 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -40,7 +40,7 @@ Product image
      <%= link_to product.name, product_path(product.id) %>
      -

      <%= product.cost %>

      +

      $<%= '%.2f' %product.cost %>

      <% if product.owner(@current_user) %> diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 7173d09c8b..69b922cdb5 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -11,12 +11,12 @@
      <%= @product.inventory %> in stock
      <%= @product.description %>
      - $<%= @product.cost %>
      + $<%= '%.2f' %@product.cost %>
      <% if @product.avg_rating == nil %> Rating: Not Available
      <% else %> Rating: <%= @product.avg_rating %>
      - <% end %> + <% end %> Categories:
        <% @product.categories.each do |category| %> From be5d94f6e4467c6472b143a61c1c71194dcab64a Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 20:03:00 -0800 Subject: [PATCH 218/248] added in the show page of a product that the product owner cannot leave a review --- app/views/products/show.html.erb | 85 +++++++++++++++++--------------- 1 file changed, 44 insertions(+), 41 deletions(-) diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 69b922cdb5..826acaf702 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -33,62 +33,65 @@ <%= button_to "Add to Cart", add_to_cart_path(@product.id) %> <%= link_to 'Back', products_path %> -
        + + <% unless @product.owner(@current_user) %> +
        +
        +

        ADD A REVIEW

        +
        +
        + <%= form_with model: @review, url: product_reviews_path(@product.id) do |f|%> + +
        + <%= f.label :rating, "Your Rating" %>: +
        +
        +
        + <%= f.radio_button :rating, 1, class: "form-check-input" %> + <%= f.label "1", class: "form-check-label"%> +
        -
        -

        ADD A REVIEW

        -
        -
        - <%= form_with model: @review, url: product_reviews_path(@product.id) do |f|%> +
        + <%= f.radio_button :rating, 2, class: "form-check-input" %> + <%= f.label "2", class: "form-check-label"%> +
        -
        - <%= f.label :rating, "Your Rating" %>: -
        -
        -
        - <%= f.radio_button :rating, 1, class: "form-check-input" %> - <%= f.label "1", class: "form-check-label"%> -
        +
        + <%= f.radio_button :rating, 3, class: "form-check-input" %> + <%= f.label "3", class: "form-check-label"%> +
        -
        - <%= f.radio_button :rating, 2, class: "form-check-input" %> - <%= f.label "2", class: "form-check-label"%> -
        +
        + <%= f.radio_button :rating, 4, class: "form-check-input" %> + <%= f.label "4", class: "form-check-label"%> +
        -
        - <%= f.radio_button :rating, 3, class: "form-check-input" %> - <%= f.label "3", class: "form-check-label"%> +
        + <%= f.radio_button :rating, 5, class: "form-check-input" %> + <%= f.label "5", class: "form-check-label"%> +
        -
        - <%= f.radio_button :rating, 4, class: "form-check-input" %> - <%= f.label "4", class: "form-check-label"%> +
        + <%= f.label :name %> + <%= f.text_field :name, class: "form-control" %>
        -
        - <%= f.radio_button :rating, 5, class: "form-check-input" %> - <%= f.label "5", class: "form-check-label"%> +
        + <%= f.label :description, "Review" %> + <%= f.text_area :description, class: "form-control" %>
        -
        -
        - <%= f.label :name %> - <%= f.text_field :name, class: "form-control" %> + <%= f.submit "Submit Review", class: "btn btn-info" %> + <% end %>
        - -
        - <%= f.label :description, "Review" %> - <%= f.text_area :description, class: "form-control" %> -
        - - <%= f.submit "Submit Review", class: "btn btn-info" %> - <% end %>
        +
        -
        +
        + <% end %> -
        <% if @product.reviews.any? %> From d3d4bd490f082b7599587853fc345b0ecba1f3d8 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 20:22:36 -0800 Subject: [PATCH 219/248] added back some of the cart formatting --- app/assets/stylesheets/application.scss | 46 ++++++++++++------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index ae48e9d2a0..ceb1f9cb47 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -112,30 +112,30 @@ div.reviewed-by { // padding: 10px; //} // -//.quantity-container { -// display: flex; -// justify-content: center; -//} -// -//.quantity-container div { -// width: 2rem; -// text-align: center; -// align-self: center; -//} -// -//.cart-image img { -// padding: 5px; -// width: 8vw; -//} -// -//.row-height { -// height: 10rem; -// text-align: center; -//} +.quantity-container { + display: flex; + justify-content: center; +} + +.quantity-container div { + width: 2rem; + text-align: center; + align-self: center; +} + +.cart-image img { + padding: 5px; + width: 8vw; +} + +.row-height { + height: 10rem; + text-align: center; +} // -//.cart-table-columns { -// text-align: center; -//} +.cart-table-columns { + text-align: center; +} // //.cart-table { // width: 80%; From e827dec2d9e81193aa8862ad79d7920e890a8718 Mon Sep 17 00:00:00 2001 From: r-spiel Date: Mon, 23 Nov 2020 20:44:57 -0800 Subject: [PATCH 220/248] some changes --- app/controllers/users_controller.rb | 12 +++++++--- app/models/user.rb | 34 +++++++++++---------------- app/views/users/_order_table.html.erb | 5 ++-- app/views/users/current.html.erb | 1 + app/views/users/fulfillment.html.erb | 11 +++++---- 5 files changed, 34 insertions(+), 29 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index e13fe23394..0c0746206b 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -28,6 +28,9 @@ def destroy def current @current_user_products = @current_user.products + cartitems_orderplaced = @current_user.cartitems.where(fulfillment_status: "order placed" ) + @not_shipped = cartitems_orderplaced.count + unless @current_user flash[:error] = "You must be logged in to see this page" redirect_to root_path @@ -36,14 +39,17 @@ def current end def fulfillment + cartitems_orderplaced = @current_user.cartitems.where(fulfillment_status: "order placed" ) + @not_shipped = cartitems_orderplaced.count + # merchant_orders returns a hash where the key is the cart, the value an array of cart items belonging to the user @pending_orders = @current_user.merchant_orders(status = "pending") @paid_orders = @current_user.merchant_orders(status = "paid") @complete_orders = @current_user.merchant_orders(status = "complete") - # @pending_revenue = @current_user.revenue("pending") - # @paid_revenue = @current_user.revenue("paid") - # @complete_revenue = @current_user.revenue("complete") + @pending_revenue = @current_user.revenue("pending") + @paid_revenue = @current_user.revenue("paid") + @complete_revenue = @current_user.revenue("complete") unless @current_user flash[:error] = "You must be logged in to see this page" diff --git a/app/models/user.rb b/app/models/user.rb index 00a0d89286..c9665e59a4 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -30,12 +30,11 @@ def self.merchants def merchant_orders(status) #from a user's cartitems, return the carts associated that have a certain cart status - return nil if self.nil? || self.cartitems.nil? + return nil if self.nil? || self.cartitems.nil? # I don't think this does anything merchant_cartitems = self.cartitems - # selected carts is a hash, where the cart id is the key and the cart is the value in order to make it easier to check if that cart is already in the list when iterating thru cartitems - # Want to make the key the cart, and the value an array of the user's cart items + # selected carts is a hash, where the key is a cart, and the value is an array of the user's items for that cart selected_carts = Hash.new { |h, k| h[k] = []} # set empty array as default value merchant_cartitems.each do |item| @@ -44,24 +43,19 @@ def merchant_orders(status) end end - # merchant_cartitems.each do |item| - # if item.cart.status == status && !selected_carts[item.cart.id] - # selected_carts[item.cart.id] = item.cart - # end - # end return selected_carts end - # def revenue(status) - # revenue = 0 - # - # self.merchant_orders(status).each_value do |cart| - # cart.cartitems.each do |item| - # item.product.user == self - # revenue += (item.cost * item.qty) - # end - # end - # - # return revenue - # end + def revenue(status) + revenue = 0 + + # is it redundant to call .merchant_orders here? Should I rather pass it in as a parameter? + self.merchant_orders(status).each_value do |cartitems| # cartitems is an array of cartitems + cartitems.each do |item| + revenue += (item.cost * item.qty) + end + end + + return revenue + end end diff --git a/app/views/users/_order_table.html.erb b/app/views/users/_order_table.html.erb index e90e28e43e..f7ca4fd8ff 100644 --- a/app/views/users/_order_table.html.erb +++ b/app/views/users/_order_table.html.erb @@ -1,6 +1,7 @@ -
        +

        <%= status %> Orders

        *<%= description %>*

        + Revenue: $<%= revenue %> <% if orders.any? %> @@ -35,7 +36,7 @@
<%= item.qty %> <%= item.product.cost * item.qty %> - <% if item.fulfillment_status && item.product.user.id == @current_user.id %> + <% if item.fulfillment_status != "order shipped" %> <%= item.fulfillment_status %> <%= button_to "Update to Shipped", update_status_path(item.id), method: :post %> <% elsif item.fulfillment_status %> diff --git a/app/views/users/current.html.erb b/app/views/users/current.html.erb index 067ea3d978..8a988dc158 100644 --- a/app/views/users/current.html.erb +++ b/app/views/users/current.html.erb @@ -7,6 +7,7 @@

MERCHANT DASHBOARD

Sales Details & Fulfillment:

+

You have <%= @not_shipped %> orders waiting to be shipped. See Fulfillment Page for details.

<%= link_to 'Fulfillment Page', current_user_fulfillment_path %>
diff --git a/app/views/users/fulfillment.html.erb b/app/views/users/fulfillment.html.erb index b1c67ee5e6..6b8856ce98 100644 --- a/app/views/users/fulfillment.html.erb +++ b/app/views/users/fulfillment.html.erb @@ -1,10 +1,13 @@

Fulfillment Page for <%= @current_user.username %>

+

Total Revenue

+

Total revenue for paid & complete orders: $<%= @paid_revenue + @complete_revenue %>

+

Order Fulfillment:

+

You have <%= @not_shipped %> orders waiting to be shipped.

- -<%= render partial: 'order_table', locals: { status: "Pending", description: "orders in a customer's cart", orders: @pending_orders } %> +<%= render partial: 'order_table', locals: { status: "Paid", description: "order confirmed, waiting for all items in the order to ship", orders: @paid_orders, revenue: @paid_revenue } %> -<%= render partial: 'order_table', locals: { status: "Paid", description: "order confirmed, waiting for all items in the order to ship", orders: @paid_orders } %> +<%= render partial: 'order_table', locals: { status: "Pending", description: "orders in a customer's cart", orders: @pending_orders, revenue: @pending_revenue } %> -<%= render partial: 'order_table', locals: { status: "Complete", description: "orders where all items have shipped", orders: @complete_orders } %> \ No newline at end of file +<%= render partial: 'order_table', locals: { status: "Complete", description: "orders where all items have shipped", orders: @complete_orders, revenue: @complete_revenue } %> \ No newline at end of file From 0a88b177fcabb06ed734bb78503e2e97e687f773 Mon Sep 17 00:00:00 2001 From: r-spiel Date: Mon, 23 Nov 2020 21:10:07 -0800 Subject: [PATCH 221/248] add block items containers --- app/views/users/_order_table.html.erb | 14 +++++--- app/views/users/current.html.erb | 50 ++++++++++++++++----------- app/views/users/fulfillment.html.erb | 22 +++++++----- 3 files changed, 52 insertions(+), 34 deletions(-) diff --git a/app/views/users/_order_table.html.erb b/app/views/users/_order_table.html.erb index f7ca4fd8ff..208aeedae8 100644 --- a/app/views/users/_order_table.html.erb +++ b/app/views/users/_order_table.html.erb @@ -1,7 +1,11 @@
-

<%= status %> Orders

-

*<%= description %>*

- Revenue: $<%= revenue %> + +

<%= status %> Orders

+

*<%= description %>*

+

Total Revenue: $<%= revenue %>

+ + + <% if orders.any? %> @@ -36,7 +40,7 @@
<%= item.qty %> <%= item.product.cost * item.qty %> - <% if item.fulfillment_status != "order shipped" %> + <% if item.fulfillment_status && item.fulfillment_status != "order shipped" %> <%= item.fulfillment_status %> <%= button_to "Update to Shipped", update_status_path(item.id), method: :post %> <% elsif item.fulfillment_status %> @@ -51,6 +55,6 @@ <% end %> <% else %> -

No <%= status %> Orders yet!

+

No <%= status %> orders currently.

<% end %> diff --git a/app/views/users/current.html.erb b/app/views/users/current.html.erb index 8a988dc158..e0030ba03e 100644 --- a/app/views/users/current.html.erb +++ b/app/views/users/current.html.erb @@ -1,28 +1,36 @@ -

Welcome back <%= @current_user.name %>!

+
+

Welcome back <%= @current_user.name %>!

-

Account Details:

-

<%= "NAME: #{@current_user.name} ~ USERNAME: #{@current_user.username}" %>

-

<%= "EMAIL: #{@current_user.email}" %>

+

Account Details:

+

<%= "NAME: #{@current_user.name} ~ USERNAME: #{@current_user.username}" %>

+

<%= "EMAIL: #{@current_user.email}" %>

-

MERCHANT DASHBOARD

+

MERCHANT DASHBOARD

-

Sales Details & Fulfillment:

-

You have <%= @not_shipped %> orders waiting to be shipped. See Fulfillment Page for details.

-<%= link_to 'Fulfillment Page', current_user_fulfillment_path %> + +

Sales Details & Fulfillment:

+

You have <%= @not_shipped %> orders waiting to be shipped. See Fulfillment Page for details.

+

<%= link_to 'Fulfillment Page', current_user_fulfillment_path %>

+ -
-

Shop Items:

- <%= link_to 'Add New Product', new_product_path %> - <% if @current_user_products %> -
    - <% @current_user_products.each do |product| %> -
  • Name: <%= link_to product.name, product_path(product), method: :get %> Sell Price: <%= product.cost %> Inventory: <%= product.inventory %> *coming soon retire product (hides it from browsing)
    • - <% end %> -
- <% else %> +
+

Shop Items:

+ <%= link_to 'Add New Product', new_product_path %> + + <% if @current_user_products %> +
    + <% @current_user_products.each do |product| %> +
  • Name: <%= link_to product.name, product_path(product), method: :get %> Sell Price: <%= product.cost %> Inventory: <%= product.inventory %> *coming soon retire product (hides it from browsing)
    • + <% end %> +
+ <% else %> + +

Your shop does not have any products!

+

Consider adding some products to sell!

+ <% end %> +
+ -

Your shop does not have any products!

-

Consider adding some products to sell!

- <% end %>
+ diff --git a/app/views/users/fulfillment.html.erb b/app/views/users/fulfillment.html.erb index 6b8856ce98..646a04d5fc 100644 --- a/app/views/users/fulfillment.html.erb +++ b/app/views/users/fulfillment.html.erb @@ -1,13 +1,19 @@ -

Fulfillment Page for <%= @current_user.username %>

+
+

Fulfillment Page for <%= @current_user.username %>

+ <%= link_to "< back to user page", current_user_path %> -

Total Revenue

-

Total revenue for paid & complete orders: $<%= @paid_revenue + @complete_revenue %>

+ +

Total Revenue

+

Total revenue for paid & complete orders: $<%= @paid_revenue + @complete_revenue %>

+ -

Order Fulfillment:

-

You have <%= @not_shipped %> orders waiting to be shipped.

-<%= render partial: 'order_table', locals: { status: "Paid", description: "order confirmed, waiting for all items in the order to ship", orders: @paid_orders, revenue: @paid_revenue } %> +

Order Fulfillment:

+

You have <%= @not_shipped %> orders waiting to be shipped.

-<%= render partial: 'order_table', locals: { status: "Pending", description: "orders in a customer's cart", orders: @pending_orders, revenue: @pending_revenue } %> + <%= render partial: 'order_table', locals: { status: "Paid", description: "order confirmed, waiting for all items in the order to ship", orders: @paid_orders, revenue: @paid_revenue } %> -<%= render partial: 'order_table', locals: { status: "Complete", description: "orders where all items have shipped", orders: @complete_orders, revenue: @complete_revenue } %> \ No newline at end of file + <%= render partial: 'order_table', locals: { status: "Pending", description: "orders in a customer's cart", orders: @pending_orders, revenue: @pending_revenue } %> + + <%= render partial: 'order_table', locals: { status: "Complete", description: "orders where all items have shipped", orders: @complete_orders, revenue: @complete_revenue } %> +
From d2a31d9af163d9960e31f044b81d2c44a144cfd4 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 21:39:03 -0800 Subject: [PATCH 222/248] added more tests for current cart --- test/controllers/carts_controller_test.rb | 45 +++++++++++++++++++++-- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/test/controllers/carts_controller_test.rb b/test/controllers/carts_controller_test.rb index fb60032341..000f765299 100644 --- a/test/controllers/carts_controller_test.rb +++ b/test/controllers/carts_controller_test.rb @@ -29,25 +29,64 @@ cart_id = session[:cart_id] current_cart = Cart.find_by(id: cart_id) - expect(current_cart).wont_be_nil + expect(cart_id).wont_be_nil expect(session[:cart_id]).must_equal current_cart.id end - it "should have the same cart throughout the site " do + it "should have the same cart throughout the site as a guest " do get root_path cart_id = session[:cart_id] cart = Cart.find_by(id: cart_id) + expect{ + get product_path(products(:product0)) + }.wont_change "Cart.count" + + expect{ + get product_path(products(:product1)) + }.wont_change "Cart.count" + + expect{ + get cart_path(session[:cart_id]) + }.wont_change "Cart.count" + + current_cart_id = session[:cart_id] + current_cart = Cart.find_by(id: current_cart_id) + + expect(current_cart_id).wont_be_nil + expect(current_cart.id).must_equal cart.id + + end + + it "should have the same cart throughout the site when logged in " do + + get root_path + cart_id = session[:cart_id] + cart = Cart.find_by(id: cart_id) + + # login with a user expect{ perform_login }.wont_change "Cart.count" + expect{ + get product_path(products(:product0)) + }.wont_change "Cart.count" + + expect{ + get product_path(products(:product1)) + }.wont_change "Cart.count" + + expect{ + get cart_path(session[:cart_id]) + }.wont_change "Cart.count" + current_cart_id = session[:cart_id] current_cart = Cart.find_by(id: current_cart_id) - expect(current_cart).wont_be_nil + expect(current_cart_id).wont_be_nil expect(current_cart.id).must_equal cart.id end From ccd1c191f2ecc72a25376127692f8c9818ff36ce Mon Sep 17 00:00:00 2001 From: r-spiel Date: Mon, 23 Nov 2020 21:58:06 -0800 Subject: [PATCH 223/248] minor update --- app/controllers/users_controller.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 0c0746206b..454d8a4ef1 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -51,10 +51,5 @@ def fulfillment @paid_revenue = @current_user.revenue("paid") @complete_revenue = @current_user.revenue("complete") - unless @current_user - flash[:error] = "You must be logged in to see this page" - redirect_to root_path - return - end end end From 56aae40145cc471417ecaf067e3bae58d8034e84 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 22:20:11 -0800 Subject: [PATCH 224/248] using bootstrap to format form --- app/assets/stylesheets/application.scss | 5 ++ app/views/products/_form.html.erb | 73 +++++++++++-------------- app/views/products/edit.html.erb | 9 ++- 3 files changed, 43 insertions(+), 44 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 1a8e5de4f9..63e7b121dd 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -150,3 +150,8 @@ img.card-img-top { //.checkout-button { // text-align: center; //} + +.product-group div { + margin-left: 0; + margin-right: 0; +} \ No newline at end of file diff --git a/app/views/products/_form.html.erb b/app/views/products/_form.html.erb index 43a0379822..a5c4df2c2b 100644 --- a/app/views/products/_form.html.erb +++ b/app/views/products/_form.html.erb @@ -1,43 +1,34 @@ - -<%= form_with model: @product do |f| %> - -
- <%= f.label :product_name %> -
- <%= f.text_field :name %> -
-
-
- <%= f.label :cost %> -
- <%= f.text_field :cost %> -
-
-
- <%= f.label :inventory %> -
- <%= f.number_field :inventory %> -
-
-
- <%= f.label :categories %> -
- <%= collection_check_boxes(:product, :category_ids, Category.all, :id, :name) %>
-
-
-
- <%= f.label :description %> -
- <%= f.text_area :description %> -
-
- <%= f.label :image_embed_link %> -
- <%= f.text_area :image %> -
-
-
- <%= f.submit action_name %> +
+
+ <%= form_with model: @product do |f| %> +
+ <%= f.label :name, "Product Name" %> + <%= f.text_field :name, class: "form-control" %> +
+
+ <%= f.label :cost %> + <%= f.text_field :cost, class: "form-control" %> +
+
+ <%= f.label :inventory %> + <%= f.number_field :inventory, class: "form-control" %> +
+
+ <%= f.label :categories %> +
+
+ <%= collection_check_boxes(:product, :category_ids, Category.all, :id, :name) %> +
+
+ <%= f.label :description %> + <%= f.text_area :description, class: "form-control" %> +
+
+ <%= f.label :image_embed_link %> + <%= f.text_area :image, class: "form-control" %> +
+ <%= f.submit action_name, class: "btn btn-info" %> + <% end %>
-<% end %> +
\ No newline at end of file diff --git a/app/views/products/edit.html.erb b/app/views/products/edit.html.erb index be4e2eee10..9f1e979e79 100644 --- a/app/views/products/edit.html.erb +++ b/app/views/products/edit.html.erb @@ -7,9 +7,12 @@ <% end %>
+
+
+

Edit Product

-

Edit Product

- -<%= render partial: 'form', locals: {action_name: "Update"} %> + <%= render partial: 'form', locals: {action_name: "Update"} %> +
+
<%= link_to 'Show', @product %> <%= link_to 'Back', products_path %> \ No newline at end of file From efa9bc2dd36b286cc16960bb4b52d9836c8c0d14 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 22:23:12 -0800 Subject: [PATCH 225/248] changed the margin for the category label --- app/assets/stylesheets/application.scss | 4 ++++ app/views/products/_form.html.erb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 63e7b121dd..96401231e0 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -154,4 +154,8 @@ img.card-img-top { .product-group div { margin-left: 0; margin-right: 0; +} + +.category-label { + margin-bottom: .5rem; } \ No newline at end of file diff --git a/app/views/products/_form.html.erb b/app/views/products/_form.html.erb index a5c4df2c2b..0b82cb2fdb 100644 --- a/app/views/products/_form.html.erb +++ b/app/views/products/_form.html.erb @@ -14,7 +14,7 @@ <%= f.label :inventory %> <%= f.number_field :inventory, class: "form-control" %> -
+
<%= f.label :categories %>
From 5ddd82c6a5609677d89dfbe42796f50d883d1e26 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 22:34:35 -0800 Subject: [PATCH 226/248] more css formating --- app/assets/stylesheets/application.scss | 13 +++++++------ app/views/products/_form.html.erb | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 8b00b6e5c2..034a2027a1 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -63,7 +63,7 @@ img.card-img-top { .rating-label { margin-bottom: .75rem; } -.review-group div { +.review-group div, .product-group div { margin-left: 0; margin-right: 0; } @@ -170,11 +170,12 @@ div.reviewed-by { // text-align: center; //} -.product-group div { - margin-left: 0; - margin-right: 0; -} - .category-label { margin-bottom: .5rem; +} + +.category-buttons input { + margin-left: 1rem; + margin-right: .5rem; + margin-bottom: 2rem; } \ No newline at end of file diff --git a/app/views/products/_form.html.erb b/app/views/products/_form.html.erb index 0b82cb2fdb..0dd5139333 100644 --- a/app/views/products/_form.html.erb +++ b/app/views/products/_form.html.erb @@ -17,7 +17,7 @@
<%= f.label :categories %>
-
+
<%= collection_check_boxes(:product, :category_ids, Category.all, :id, :name) %>
From 79aa9c841fd12848a249bbf637c9c7beebafabc0 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 22:38:20 -0800 Subject: [PATCH 227/248] formated new form to be similar to edit form --- app/views/products/edit.html.erb | 4 ++-- app/views/products/new.html.erb | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/views/products/edit.html.erb b/app/views/products/edit.html.erb index 9f1e979e79..482202f637 100644 --- a/app/views/products/edit.html.erb +++ b/app/views/products/edit.html.erb @@ -12,7 +12,7 @@

Edit Product

<%= render partial: 'form', locals: {action_name: "Update"} %> + <%= link_to 'Show', @product %> + <%= link_to 'Back', products_path %>
-<%= link_to 'Show', @product %> -<%= link_to 'Back', products_path %> \ No newline at end of file diff --git a/app/views/products/new.html.erb b/app/views/products/new.html.erb index 0a11ca1523..b27cfb21f6 100644 --- a/app/views/products/new.html.erb +++ b/app/views/products/new.html.erb @@ -8,7 +8,13 @@ <% end %> -

New Product

+
+
+

New Product

+ + <%= render partial: 'form', locals: {action_name: "Add Product"} %> + <%= link_to 'Show', @product %> + <%= link_to 'Back', products_path %> +
+
-<%= render partial: 'form', locals: {action_name: "Add Product"} %> -<%= link_to 'Back', products_path %> From 8d594bbae6f1cb112a4dce4029b59f7c48efe610 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Mon, 23 Nov 2020 22:46:47 -0800 Subject: [PATCH 228/248] save changes --- app/views/products/new.html.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/products/new.html.erb b/app/views/products/new.html.erb index b27cfb21f6..d74b7f18e0 100644 --- a/app/views/products/new.html.erb +++ b/app/views/products/new.html.erb @@ -11,7 +11,6 @@

New Product

- <%= render partial: 'form', locals: {action_name: "Add Product"} %> <%= link_to 'Show', @product %> <%= link_to 'Back', products_path %> From e1608aaadfb33dc349a2c2fd01a05655318e8a68 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Tue, 24 Nov 2020 09:00:47 -0800 Subject: [PATCH 229/248] changes validation messages --- app/models/review.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/review.rb b/app/models/review.rb index e5dc10fce8..e0d5bf7360 100644 --- a/app/models/review.rb +++ b/app/models/review.rb @@ -2,7 +2,7 @@ class Review < ApplicationRecord belongs_to :product validates :name, presence: true - validates_presence_of :rating, message: "must give a rating" - validates :rating, :inclusion => 1..5 + validates :rating, presence: true + validates :rating, inclusion: { in: 1..5, message: "rating needs to be between 1-5" } end From cbc80800b42290e0072286b8af45e8158e0e76e4 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Tue, 24 Nov 2020 09:05:06 -0800 Subject: [PATCH 230/248] added more tests for the create action in reviews, test flash messages --- app/controllers/reviews_controller.rb | 2 +- test/controllers/reviews_controller_test.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/reviews_controller.rb b/app/controllers/reviews_controller.rb index 0492987546..08f89d6a68 100644 --- a/app/controllers/reviews_controller.rb +++ b/app/controllers/reviews_controller.rb @@ -6,7 +6,7 @@ def create @review.product = product if @review.save - flash[:success] = 'Thank you for your review' + flash[:success] = 'Thank you for your review!' redirect_to product_path(product.id) return else diff --git a/test/controllers/reviews_controller_test.rb b/test/controllers/reviews_controller_test.rb index 30e89b3484..d0f9b6cf30 100644 --- a/test/controllers/reviews_controller_test.rb +++ b/test/controllers/reviews_controller_test.rb @@ -19,6 +19,7 @@ post product_reviews_path(product.id), params: new_review }.must_change "Review.count", 1 + expect(flash[:success]).must_equal "Thank you for your review!" must_respond_with :redirect must_redirect_to product_path(product) @@ -36,6 +37,7 @@ post product_reviews_path(product.id), params: new_review }.wont_change "Review.count" + expect(flash[:failure]).must_equal 'Review was not successfully created.' must_respond_with :redirect must_redirect_to product_path(product) From 5e065c9dfa1842813a71a9be9c09666f3be9d9bf Mon Sep 17 00:00:00 2001 From: r-spiel Date: Tue, 24 Nov 2020 09:12:29 -0800 Subject: [PATCH 231/248] add order details page (cart route/controller method), add some styling for current user page --- app/assets/stylesheets/users.scss | 8 ++++++++ app/controllers/carts_controller.rb | 4 ++++ app/controllers/users_controller.rb | 4 ++++ app/models/user.rb | 13 +++++++++++++ app/views/carts/order_details.html.erb | 18 ++++++++++++++++++ app/views/users/_order_table.html.erb | 4 ++-- app/views/users/current.html.erb | 12 ++++++++++-- app/views/users/fulfillment.html.erb | 6 +++--- config/routes.rb | 1 + 9 files changed, 63 insertions(+), 7 deletions(-) create mode 100644 app/views/carts/order_details.html.erb diff --git a/app/assets/stylesheets/users.scss b/app/assets/stylesheets/users.scss index efc25261dd..fe820bcf59 100644 --- a/app/assets/stylesheets/users.scss +++ b/app/assets/stylesheets/users.scss @@ -1,3 +1,11 @@ // Place all the styles related to the Users controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: https://sass-lang.com/ + +.user-info { + display: flex; +} + +.user-img { + height: 100px; +} \ No newline at end of file diff --git a/app/controllers/carts_controller.rb b/app/controllers/carts_controller.rb index 4c24e16040..3071ca4c6f 100644 --- a/app/controllers/carts_controller.rb +++ b/app/controllers/carts_controller.rb @@ -40,6 +40,10 @@ def view_confirmation @ordered_cart = Cart.find(params[:id]) end + def order_details + @ordered_cart = Cart.find(params[:id]) + end + private def cart_params diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 454d8a4ef1..eb864108ce 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -51,5 +51,9 @@ def fulfillment @paid_revenue = @current_user.revenue("paid") @complete_revenue = @current_user.revenue("complete") + @pending_items_count = @current_user.item_count("pending") + @paid_items_count = @current_user.item_count("paid") + @complete_items_count = @current_user.item_count("complete") + end end diff --git a/app/models/user.rb b/app/models/user.rb index c9665e59a4..ccf5bac3bc 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -58,4 +58,17 @@ def revenue(status) return revenue end + + def item_count(status) + count = 0 + + self.merchant_orders(status).each_value do |cartitems| # cartitems is an array of cartitems + cartitems.each do |item| + count += 1 + end + end + + return count + end + end diff --git a/app/views/carts/order_details.html.erb b/app/views/carts/order_details.html.erb new file mode 100644 index 0000000000..bad84fb9a2 --- /dev/null +++ b/app/views/carts/order_details.html.erb @@ -0,0 +1,18 @@ +
+

Shipping Address

+

<%= @ordered_cart.name %>

+

<%= @ordered_cart.mailing_address %>

+

<%= @ordered_cart.email %>

+
+ +
+

Payment Information

+ + + + + + + +
Card Number************ <%= @ordered_cart.cc_number[-4..-1] %>
+
diff --git a/app/views/users/_order_table.html.erb b/app/views/users/_order_table.html.erb index 208aeedae8..421fdf4991 100644 --- a/app/views/users/_order_table.html.erb +++ b/app/views/users/_order_table.html.erb @@ -2,7 +2,7 @@

<%= status %> Orders

*<%= description %>*

-

Total Revenue: $<%= revenue %>

+

Total Revenue: $<%= revenue %> # of Items: <%= item_count %>

 @@ -12,7 +12,7 @@ <% orders.each do |cart, user_items| %> - + - + From a2d36a18daf72f23c83ee9ab03206775e45fc420 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Tue, 24 Nov 2020 12:39:40 -0800 Subject: [PATCH 238/248] refactored product error messages --- app/controllers/products_controller.rb | 6 ++++-- app/views/products/edit.html.erb | 9 --------- app/views/products/new.html.erb | 26 ++++++++------------------ 3 files changed, 12 insertions(+), 29 deletions(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 6aabfeecaf..4f99e95690 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -46,7 +46,8 @@ def create redirect_to product_path(@product) return else - flash.now[:failure] = 'Product was not successfully created.' + flash.now[:error] = 'Product was not successfully created.' + flash.now[:error_message] = @product.errors.messages render :new, status: :bad_request return end @@ -60,7 +61,8 @@ def update redirect_to product_path(@product) return else - flash.now[:failure] = "Product was not successfully updated." + flash.now[:error] = "Product was not successfully updated." + flash.now[:error_message] = @product.errors.messages render :edit, status: :bad_request return end diff --git a/app/views/products/edit.html.erb b/app/views/products/edit.html.erb index 482202f637..8275578d4e 100644 --- a/app/views/products/edit.html.erb +++ b/app/views/products/edit.html.erb @@ -1,12 +1,3 @@ -
- <% if @product.errors.any? %> -
    - <% @product.errors.each do |column, message| %> -
  • <%= column %> <%= message %>
    • - <% end %> -
- <% end %> -

Edit Product

diff --git a/app/views/products/new.html.erb b/app/views/products/new.html.erb index d74b7f18e0..6d703d36b5 100644 --- a/app/views/products/new.html.erb +++ b/app/views/products/new.html.erb @@ -1,19 +1,9 @@ -
- <% if @product.errors.any? %> -
    - <% @product.errors.each do |column, message| %> -
  • <%= column %> <%= message %>
    • - <% end %> -
- <% end %> -
- -
-
-

New Product

- <%= render partial: 'form', locals: {action_name: "Add Product"} %> - <%= link_to 'Show', @product %> - <%= link_to 'Back', products_path %> -
-
+
+
+

New Product

+ <%= render partial: 'form', locals: {action_name: "Add Product"} %> + <%= link_to 'Show', @product %> + <%= link_to 'Back', products_path %> +
+
From a89342b1770990f1555d0dff7a3d4afb8caf12cc Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Tue, 24 Nov 2020 12:51:11 -0800 Subject: [PATCH 239/248] improved default image setting --- app/models/category.rb | 11 +++++++++-- app/models/product.rb | 8 ++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/models/category.rb b/app/models/category.rb index fc29af3456..89eee5837f 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -1,5 +1,12 @@ class Category < ApplicationRecord has_and_belongs_to_many :products validates :name, presence: true, uniqueness: true - attribute :banner_img, :string, default: "http://lorempixel.com/1440/360/sports" -end + before_create :set_default_image + + def set_default_image + unless banner_img.present? + self.banner_img = "http://lorempixel.com/1440/360/sports" + end + end + +end \ No newline at end of file diff --git a/app/models/product.rb b/app/models/product.rb index c122fc863f..0bd1c3690f 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -9,6 +9,14 @@ class Product < ApplicationRecord validates :inventory, :cost, presence: true, numericality: { greater_than: 0 } validates :category_ids, presence: true + before_create :set_default_image + + def set_default_image + unless image.present? + self.image = "https://cdn.dribbble.com/users/625354/screenshots/3429078/404.png" + end + end + def update_cartitems # update prices for cartitems in carts with the status pending From c4e12b1b2c96eeb3c0ddce6a41b4c73b09502f8b Mon Sep 17 00:00:00 2001 From: Lina Do Date: Tue, 24 Nov 2020 13:01:40 -0800 Subject: [PATCH 240/248] css style radio buttons, and form rows dont move when filled out --- app/assets/stylesheets/application.scss | 8 ++++++-- app/views/products/_form.html.erb | 17 +++++++++-------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 751d7d904c..0f4b6ffc84 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -185,8 +185,12 @@ div.reviewed-by { margin-bottom: .5rem; } -.category-buttons input { +.category-buttons { + display: flex; +} +.category-buttons input, .category-buttons label { margin-left: 1rem; - margin-right: .5rem; margin-bottom: 2rem; + margin-top: 1rem; + align-self: center; } \ No newline at end of file diff --git a/app/views/products/_form.html.erb b/app/views/products/_form.html.erb index 0dd5139333..19c1ca0f90 100644 --- a/app/views/products/_form.html.erb +++ b/app/views/products/_form.html.erb @@ -2,29 +2,30 @@
<%= form_with model: @product do |f| %> -
+
<%= f.label :name, "Product Name" %> <%= f.text_field :name, class: "form-control" %>
-
+
<%= f.label :cost %> <%= f.text_field :cost, class: "form-control" %>
-
+
<%= f.label :inventory %> <%= f.number_field :inventory, class: "form-control" %>
-
+
<%= f.label :categories %> -
-
+
<%= collection_check_boxes(:product, :category_ids, Category.all, :id, :name) %> +
-
+ +
<%= f.label :description %> <%= f.text_area :description, class: "form-control" %>
-
+
<%= f.label :image_embed_link %> <%= f.text_area :image, class: "form-control" %>
From 572d9ea43cb9bb28516b3166009fc6bd08b86f03 Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Tue, 24 Nov 2020 13:03:54 -0800 Subject: [PATCH 241/248] default image testing complete --- test/models/category_test.rb | 11 +++++++---- test/models/product_test.rb | 26 ++++++++++++++++++++------ 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/test/models/category_test.rb b/test/models/category_test.rb index c96a109577..857bee09ab 100644 --- a/test/models/category_test.rb +++ b/test/models/category_test.rb @@ -47,15 +47,18 @@ end describe 'bannerimage' do - it "can have a banner image" do + it "user can set banner image url" do gear = categories(:category_gear) gear.banner_img = "http://lorempixel.com/1440/360/food" expect(gear.valid?).must_equal true end - it "can be instantiated without a banner image" do - gear = Category.create(name: "pets", banner_img: nil) - expect(gear.valid?).must_equal true + it "can set a default banner image for nil image" do + category = Category.create!(name: "test category", banner_img: nil) + expect(category.banner_img).must_equal "http://lorempixel.com/1440/360/sports" end + end + end + diff --git a/test/models/product_test.rb b/test/models/product_test.rb index a93326b012..b39f093073 100644 --- a/test/models/product_test.rb +++ b/test/models/product_test.rb @@ -3,14 +3,28 @@ describe Product do before do # connect categories - product = products(:product1) - weights = categories(:category_weights) - shoes = categories(:category_shoes) - product.category_ids = [weights.id, shoes.id] + product = products(:product1) + weights = categories(:category_weights) + shoes = categories(:category_shoes) + product.category_ids = [weights.id, shoes.id] end describe "custom model methods" do + describe "default image" do + + it "can accept a url for image" do + kitten = Product.create!(name: "shoes", user: users(:ada), inventory: 1, category_ids: [categories(:category_shoes).id], cost: 1000, description: "really cool shoes", image: "https://placekitten.com/300/200") + expect(kitten.image).must_equal "https://placekitten.com/300/200" + end + + it "can set a default image for nil image" do + thing = Product.create!(name: "shoes", user: users(:ada), inventory: 1, category_ids: [categories(:category_shoes).id], cost: 1000, description: "really cool shoes", image: nil) + expect(thing.image).must_equal "https://cdn.dribbble.com/users/625354/screenshots/3429078/404.png" + end + + end + describe "update cartitems" do it "can update a cartitems cost to match the product and the cart status must be pending" do # choose a product and change cost @@ -72,7 +86,7 @@ end end - + it "will authenticate a user as the owner of a product and return true" do user = users(:ada) product = products(:product1) @@ -193,6 +207,6 @@ expect(cart_item_1.valid?).must_equal true expect(cart_item_2.valid?).must_equal true end - + end end From c09021ab8b844b22ac1a070d6d4f23a14ad0a7fe Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Tue, 24 Nov 2020 13:32:15 -0800 Subject: [PATCH 242/248] made flash bold. --- app/assets/stylesheets/application.scss | 5 +++++ app/views/layouts/_new_category.html.erb | 23 ++++++++++++++++++----- app/views/layouts/application.html.erb | 6 +++--- app/views/products/_form.html.erb | 2 +- 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 751d7d904c..dd73a1913e 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -86,6 +86,11 @@ img.card-img-top { div.reviewed-by { color: gray; } + +.flash span { + font-weight: bold; +} + // //main { // display: grid; diff --git a/app/views/layouts/_new_category.html.erb b/app/views/layouts/_new_category.html.erb index 88e140852b..65b8280704 100644 --- a/app/views/layouts/_new_category.html.erb +++ b/app/views/layouts/_new_category.html.erb @@ -1,5 +1,18 @@ -<%= form_with model: @category_new do |f| %> - <%= f.text_field :name, placeholder: "New Category" %> - <%= f.text_field :banner_img, placeholder: "Banner Image URL (optional)" %> - <%= f.submit :submit %> -<% end %> \ No newline at end of file +
+
New Category
+
+ <%= form_with model: @category_new do |f| %> +
+ <%= f.label :name, "Category Name" %> + <%= f.text_field :name, class: "form-control" %> +
+
+ <%= f.label :banner_image %> + <%= f.text_field :banner_img, placeholder: "URL(optional)", class: "form-control" %> +
+
+ <%= f.submit :submit %> +
+ <% end %> +
+
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 07ff4e4390..50f2e01f39 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -76,15 +76,15 @@
- + -
+
<% if flash[:success] %>
<%= flash[:success] %> @@ -96,7 +96,7 @@
    <% flash[:error_message].each do |attribute, messages| %> <% messages.each do |message| %> -
  • <%= attribute %>: <%= message%>
    • +
  • <%= attribute %>: <%= message%>
    • <% end %> <% end %>
diff --git a/app/views/products/_form.html.erb b/app/views/products/_form.html.erb index 0dd5139333..851ee7d62c 100644 --- a/app/views/products/_form.html.erb +++ b/app/views/products/_form.html.erb @@ -24,7 +24,7 @@ <%= f.label :description %> <%= f.text_area :description, class: "form-control" %>
-
+
<%= f.text_area :image, class: "form-control" %>
From d5df3f1bb7ef4ab0790337e72205f942c7d63dce Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Tue, 24 Nov 2020 14:58:12 -0800 Subject: [PATCH 243/248] product show page --- app/assets/stylesheets/application.scss | 10 ++ app/views/products/show.html.erb | 148 ++++++++++++++---------- 2 files changed, 95 insertions(+), 63 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index dd73a1913e..72196aa9f4 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -67,6 +67,12 @@ img.card-img-top { height: 240px; } +div.main-img.img-fluid img { + object-fit: cover; + object-position: center; + width: 100%; +} + .radio-buttons { margin-bottom: 1rem; } @@ -91,6 +97,10 @@ div.reviewed-by { font-weight: bold; } +div.product-info { + margin: 30px 15px 30px 15px; +} + // //main { // display: grid; diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 48049063ac..8618b0361d 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -1,47 +1,71 @@ -

<%= @product.name %>

+
+
+
+
+ + + +
+
+
+ +
-
- <%= @product.inventory %> in stock
- <%= @product.description %>
- $<%= '%.2f' %@product.cost %>
- - <% if @product.avg_rating == nil %> - Rating: Not Available
- <% else %> - Rating: <%= @product.avg_rating %>
- <% end %> - - Categories: -
    - <% @product.categories.each do |category| %> -
  • <%= link_to category.name.capitalize, category_products_path(category.id) %>
    • - <% end %> -
-
- - <% if @product.owner(@current_user) %> - <%= link_to 'Edit', edit_product_path(@product) %> - <%= link_to 'Delete', product_path(@product), method: :delete, data: { confirm: "Are you sure?"} %> - <% end %> - - <%= button_to "Add to Cart", add_to_cart_path(@product.id) %> - <%= link_to 'Back', products_path %> - - <% unless @product.owner(@current_user) %> -
-
-

ADD A REVIEW

-
-
+<% unless @product.owner(@current_user) %> +
+

Add a Review

+
+
<%= form_with model: @review, url: product_reviews_path(@product.id) do |f|%>
@@ -86,34 +110,32 @@ <%= f.submit "Submit Review", class: "btn btn-info" %> <% end %> -
-
-
- <% end %> +
+<% end %>
-
- <% if @product.reviews.any? %> -

CUSTOMER REVIEWS

-
- <% @product.reviews.each do |review| %> -
-
- <% review.rating.times do %> - <%= image_tag "star.png", alt: "star", width: "30rem" %> - <% end %> -
-
Reviewed on <%= review.created_at.strftime('%d %B %Y')%> by <%= review.name %>
-
<%= review.description %>
-
- <% end %> -
- <% end %> -
-
+
+ <% if @product.reviews.any? %> +

Customer Reviews

+
+ <% @product.reviews.each do |review| %> +
+
+ <% review.rating.times do %> + <%= image_tag "star.png", alt: "star", width: "30rem" %> + <% end %> +
+
Reviewed on <%= review.created_at.strftime('%d %B %Y')%> by <%= review.name %>
+
<%= review.description %>
+
+ <% end %> +
+ <% end %> +
+


From 6bcae6197d72f10a9fe197117bff651edffc222a Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Tue, 24 Nov 2020 15:09:46 -0800 Subject: [PATCH 244/248] match linas styling for purchase form --- app/assets/stylesheets/application.scss | 4 ++++ app/views/carts/purchase_form.html.erb | 32 ++++++++++++++----------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 751d7d904c..7afd202799 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -79,6 +79,10 @@ img.card-img-top { margin-right: 0; } +.review-group div, .order-group div { + margin-left: 0; + margin-right: 0; +} .review-info { margin-bottom: 0.5rem; } diff --git a/app/views/carts/purchase_form.html.erb b/app/views/carts/purchase_form.html.erb index 33eb5cf895..d32a6ff7ff 100644 --- a/app/views/carts/purchase_form.html.erb +++ b/app/views/carts/purchase_form.html.erb @@ -1,47 +1,51 @@ -

Purchase Form

-
+
+

Purchase Form

+
+
<%= form_with model: @cart do |f| %> -
+
<%= f.label :name %> <%= f.text_field :name, class: "form-control" %>
-
+
<%= f.label :email_address %> <%= f.text_field :email, class: "form-control" %>
-
+
<%= f.label :mailing_address %> <%= f.text_field :mailing_address, class: "form-control" %>
-
+
<%= f.label :zipcode %> <%= f.text_field :zip, class: "form-control" %>
-
+
<%= f.label :credit_card_number %> <%= f.text_field :cc_number, class: "form-control" %> - We'll never share your credit card info with anyone else. + We'll never share your credit card info with anyone else.
-
+
<%= f.label :credit_card_expiration %> <%= f.text_field :cc_expiration, class: "form-control" %> - We'll never share your credit card info with anyone else. + We'll never share your credit card info with anyone else.
-
+
<%= f.label :cvv %> <%= f.text_field :cc_cvv, class: "form-control" %> - We'll never share your credit card info with anyone else. + We'll never share your credit card info with anyone else.
- <%= f.submit "Purchase order", class: "btn btn-primary" %> + <%= f.submit "Purchase order", class: "btn btn-info" %>
<% end %> -
\ No newline at end of file +
+
+
\ No newline at end of file From 2d2583b6dfde1c6c0128fca7f1efd669e20437de Mon Sep 17 00:00:00 2001 From: Sophie Messing Date: Tue, 24 Nov 2020 15:24:49 -0800 Subject: [PATCH 245/248] tiny blue Xs in cart --- app/assets/stylesheets/application.scss | 1 + app/views/carts/show.html.erb | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 72196aa9f4..81c978fcdc 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -70,6 +70,7 @@ img.card-img-top { div.main-img.img-fluid img { object-fit: cover; object-position: center; + min-height: 500px; width: 100%; } diff --git a/app/views/carts/show.html.erb b/app/views/carts/show.html.erb index c2629b4985..c15ad2dcb4 100644 --- a/app/views/carts/show.html.erb +++ b/app/views/carts/show.html.erb @@ -32,7 +32,9 @@
$<%= '%.2f' %item.cartitem_subtotal %>
 <% end %> From 60ab6811f037c89987ea31e1faeb2fc4517e5747 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Tue, 24 Nov 2020 15:33:20 -0800 Subject: [PATCH 246/248] move back to cart button --- app/assets/stylesheets/application.scss | 4 ++++ app/views/carts/purchase_form.html.erb | 22 +++++++++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 7afd202799..a27d4b6125 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -83,6 +83,10 @@ img.card-img-top { margin-left: 0; margin-right: 0; } + +.back-cart{ + margin-left: 1.7rem +} .review-info { margin-bottom: 0.5rem; } diff --git a/app/views/carts/purchase_form.html.erb b/app/views/carts/purchase_form.html.erb index d32a6ff7ff..a6c001ee13 100644 --- a/app/views/carts/purchase_form.html.erb +++ b/app/views/carts/purchase_form.html.erb @@ -1,3 +1,5 @@ + +

Purchase Form

@@ -10,12 +12,12 @@
- <%= f.label :email_address %> + <%= f.label :email_address, "Email Address" %> <%= f.text_field :email, class: "form-control" %>
- <%= f.label :mailing_address %> + <%= f.label :mailing_address, "Mailing Address" %> <%= f.text_field :mailing_address, class: "form-control" %>
@@ -25,27 +27,33 @@
- <%= f.label :credit_card_number %> + <%= f.label :credit_card_number, "Credit Card Number" %> <%= f.text_field :cc_number, class: "form-control" %> We'll never share your credit card info with anyone else.
- <%= f.label :credit_card_expiration %> + <%= f.label :credit_card_expiration, "Credit Card Expiration" %> <%= f.text_field :cc_expiration, class: "form-control" %> We'll never share your credit card info with anyone else.
- <%= f.label :cvv %> + <%= f.label :cvv, "CVV"%> <%= f.text_field :cc_cvv, class: "form-control" %> We'll never share your credit card info with anyone else.
-
+
<%= f.submit "Purchase order", class: "btn btn-info" %>
<% end %>
- \ No newline at end of file +
+
+ <%= button_to "Back to Cart", cart_path(@cart.id), class: "btn btn-info back-cart", method: :get%> +
+ + + From c109f04bdd7f3c28b1f4ac3bccaaacd25b6ce275 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Tue, 24 Nov 2020 15:33:51 -0800 Subject: [PATCH 247/248] spacing --- app/assets/stylesheets/application.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index a27d4b6125..ea4bdee303 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -87,6 +87,7 @@ img.card-img-top { .back-cart{ margin-left: 1.7rem } + .review-info { margin-bottom: 0.5rem; } From da19d256b5dbe229283148650b5c87960f5d5291 Mon Sep 17 00:00:00 2001 From: Kareha Agesa Date: Tue, 24 Nov 2020 15:35:42 -0800 Subject: [PATCH 248/248] more spacing --- app/views/carts/purchase_form.html.erb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/views/carts/purchase_form.html.erb b/app/views/carts/purchase_form.html.erb index a6c001ee13..44f1c7f485 100644 --- a/app/views/carts/purchase_form.html.erb +++ b/app/views/carts/purchase_form.html.erb @@ -1,5 +1,3 @@ - -

Purchase Form

<%= link_to "Order #: #{cart.id}", view_confirmation_path(cart.id), method: :get %><%= link_to "Order #: #{cart.id}", order_details_path(cart.id), method: :get %> Order Placed On: <% if cart.status == "pending" %> N/A diff --git a/app/views/users/current.html.erb b/app/views/users/current.html.erb index e0030ba03e..4319497469 100644 --- a/app/views/users/current.html.erb +++ b/app/views/users/current.html.erb @@ -2,8 +2,16 @@

Welcome back <%= @current_user.name %>!

Account Details:

-

<%= "NAME: #{@current_user.name} ~ USERNAME: #{@current_user.username}" %>

-

<%= "EMAIL: #{@current_user.email}" %>

+ +

MERCHANT DASHBOARD

diff --git a/app/views/users/fulfillment.html.erb b/app/views/users/fulfillment.html.erb index 646a04d5fc..63bb7b0c88 100644 --- a/app/views/users/fulfillment.html.erb +++ b/app/views/users/fulfillment.html.erb @@ -11,9 +11,9 @@

Order Fulfillment:

You have <%= @not_shipped %> orders waiting to be shipped.

- <%= render partial: 'order_table', locals: { status: "Paid", description: "order confirmed, waiting for all items in the order to ship", orders: @paid_orders, revenue: @paid_revenue } %> + <%= render partial: 'order_table', locals: { status: "Paid", description: "order confirmed, waiting for all items in the order to ship", orders: @paid_orders, revenue: @paid_revenue, item_count: @paid_items_count } %> - <%= render partial: 'order_table', locals: { status: "Pending", description: "orders in a customer's cart", orders: @pending_orders, revenue: @pending_revenue } %> + <%= render partial: 'order_table', locals: { status: "Pending", description: "orders in a customer's cart", orders: @pending_orders, revenue: @pending_revenue, item_count: @pending_items_count } %> - <%= render partial: 'order_table', locals: { status: "Complete", description: "orders where all items have shipped", orders: @complete_orders, revenue: @complete_revenue } %> + <%= render partial: 'order_table', locals: { status: "Complete", description: "orders where all items have shipped", orders: @complete_orders, revenue: @complete_revenue, item_count: @complete_items_count } %> diff --git a/config/routes.rb b/config/routes.rb index ba45a9813d..a0cec2cd42 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -33,6 +33,7 @@ get 'carts/:id/purchase', to: "carts#purchase_form", as: "purchase_form" patch 'carts/:id', to: "carts#purchase" get 'carts/:id/confirmation', to: "carts#view_confirmation", as: "view_confirmation" + get 'carts/:id/details', to: 'carts#order_details', as: 'order_details' resources :cartitems, only:[:destroy] From f86029287db3769c8dc30be429ec76a5b291ca12 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Tue, 24 Nov 2020 10:43:21 -0800 Subject: [PATCH 232/248] fixed syntax error --- app/views/layouts/application.html.erb | 3 +-- db/schema.rb | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f7839b73bf..07ff4e4390 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -97,13 +97,12 @@ <% flash[:error_message].each do |attribute, messages| %> <% messages.each do |message| %>
  • <%= attribute %>: <%= message%>
    • - <% end> + <% end %> <% end %> <% end %> <% end %> - <% end %>
    diff --git a/db/schema.rb b/db/schema.rb index 9f1920edb6..1dcb5ec111 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,10 +10,8 @@ # # It's strongly recommended that you check this file into your version control system. - ActiveRecord::Schema.define(version: 2020_11_24_010335) do - # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" From 135eda7152e0f163fa5b7d3340f1e40bb9799588 Mon Sep 17 00:00:00 2001 From: r-spiel Date: Tue, 24 Nov 2020 11:20:35 -0800 Subject: [PATCH 233/248] delete duplicate code in cart controller, skip failing user test --- app/controllers/carts_controller.rb | 3 +-- test/models/user_test.rb | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/carts_controller.rb b/app/controllers/carts_controller.rb index 83d6255ff3..f7fb2d8150 100644 --- a/app/controllers/carts_controller.rb +++ b/app/controllers/carts_controller.rb @@ -15,11 +15,10 @@ def purchase @cart.assign_attributes(status: "paid", purchase_datetime: Time.now) if @cart.update(cart_params) - @cart.save flash[:success] = "Your order has been placed!" @cart.update_item_fulfillment - @cart.save @cart.update_inventory + @cart.save session[:cart_id] = nil current_cart redirect_to view_confirmation_path(@cart.id) diff --git a/test/models/user_test.rb b/test/models/user_test.rb index b97055ef9e..7f8e3a5771 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -89,8 +89,10 @@ end it 'can return a hash with all of a current users related carts' do - # key of the hash is the cart id, value is the Cart object - pending_orders = @user_ada.merchant_orders( status = "pending") + skip + + # key of the hash is the cart item, value is an array of the user's cartitems for that cart + pending_orders = @user_ada.merchant_orders( "pending") user_product_ids = [] # this user (:ada) has 3 products From 854cac404296fd2f3db72b0e2cc2374709565ea1 Mon Sep 17 00:00:00 2001 From: Lina Do Date: Tue, 24 Nov 2020 11:38:21 -0800 Subject: [PATCH 234/248] changed flash key names for review to be consistant --- app/controllers/reviews_controller.rb | 4 ++-- test/controllers/reviews_controller_test.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/reviews_controller.rb b/app/controllers/reviews_controller.rb index 08f89d6a68..96c415fffb 100644 --- a/app/controllers/reviews_controller.rb +++ b/app/controllers/reviews_controller.rb @@ -10,8 +10,8 @@ def create redirect_to product_path(product.id) return else - flash[:failure] = 'Review was not successfully created.' - flash[:messages] = @review.errors.messages + flash[:error] = 'Review was not successfully created.' + flash[:error_message] = @review.errors.messages redirect_to product_path(product.id) return end diff --git a/test/controllers/reviews_controller_test.rb b/test/controllers/reviews_controller_test.rb index d0f9b6cf30..1726a09d79 100644 --- a/test/controllers/reviews_controller_test.rb +++ b/test/controllers/reviews_controller_test.rb @@ -37,7 +37,7 @@ post product_reviews_path(product.id), params: new_review }.wont_change "Review.count" - expect(flash[:failure]).must_equal 'Review was not successfully created.' + expect(flash[:error]).must_equal 'Review was not successfully created.' must_respond_with :redirect must_redirect_to product_path(product) From 0396fbca73dce57089e7b8cf5e9ef8fa51ae9305 Mon Sep 17 00:00:00 2001 From: r-spiel Date: Tue, 24 Nov 2020 12:02:59 -0800 Subject: [PATCH 235/248] user model tests --- test/models/user_test.rb | 145 +++++++++++++++++++++++++++++++-------- 1 file changed, 115 insertions(+), 30 deletions(-) diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 7f8e3a5771..ed2d0d3fa2 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -88,53 +88,138 @@ end end - it 'can return a hash with all of a current users related carts' do - skip + describe 'merchant_orders by cart status' do + it 'can return a hash with all of a current users related carts' do + # key of the hash is the cart item, value is an array of the user's cartitems for that cart + pending_orders = @user_ada.merchant_orders( "pending") + user_product_ids = [] + + # this user (:ada) has 3 products + @user_ada.products.each do |product| + user_product_ids << product.id + end - # key of the hash is the cart item, value is an array of the user's cartitems for that cart - pending_orders = @user_ada.merchant_orders( "pending") - user_product_ids = [] + expect(pending_orders).must_be_kind_of Hash - # this user (:ada) has 3 products - @user_ada.products.each do |product| - user_product_ids << product.id - end + pending_orders.each do |cart, array| + expect(cart).must_be_kind_of Cart - expect(pending_orders).must_be_kind_of Hash + array.each do |item| + expect(user_product_ids.include? (item.product_id)).must_equal true + end - pending_orders.each do |cart_id, cart| - expect(cart).must_be_kind_of Cart - expect(cart.id == cart_id).must_equal true + end + end - # Set up for: expecting that of the cartitems in the selected cart, must include at least one of the user's products - is_user_product = [] # an array of boolean values - cart.cartitems.each do |item| - user_product_ids.include? (item.product_id) ? (is_user_product << true) : (is_user_product << false) + it 'will return an empty hash if user has no products in current carts' do + Cart.all.each do |cart| + cart.destroy end - expect(is_user_product.include? (true)).must_equal true + Cartitem.all.each do |item| + item.destroy + end + + pending_orders = @user_ada.merchant_orders( "pending") + paid_orders = @user_ada.merchant_orders( "paid") + complete_orders = @user_ada.merchant_orders( "complete") + + expect(pending_orders).must_be_kind_of Hash + + expect(pending_orders).must_be_empty + expect(paid_orders).must_be_empty + expect(complete_orders).must_be_empty end end - it 'will return an empty hash if user has no products in current carts' do - skip - # not working, 'undefined method 'merchant_orders' for nil class - Cart.all.each do |cart| - cart.destroy + describe 'revenue' do + it 'will return revenue by cart status for the current user' do + pending_revenue = @user_ada.revenue("pending") + paid_revenue = @user_ada.revenue("paid") + complete_revenue = @user_ada.revenue("complete") + + if pending_revenue == 0 + expect(pending_revenue).must_equal 0 + else + expect(pending_revenue).must_be_kind_of Float + end + + if paid_revenue == 0 + expect(paid_revenue).must_equal 0 + else + expect(paid_revenue).must_be_kind_of Float + end + + if complete_revenue == 0 + expect(complete_revenue).must_equal 0 + else + expect(complete_revenue).must_be_kind_of Float + end + + total_by_cartitems = 0 + @user_ada.cartitems.each do |item| + total_by_cartitems += (item.cost * item.qty) + end + + total_by_revenue = pending_revenue + paid_revenue + complete_revenue + + expect(total_by_cartitems == total_by_revenue).must_equal true end - Cartitem.all.each do |item| - item.destroy + it 'will return 0 if no carts/cartitems' do + Cart.all.each do |cart| + cart.destroy + end + + Cartitem.all.each do |item| + item.destroy + end + + pending_revenue = @user_ada.revenue("pending") + paid_revenue = @user_ada.revenue("paid") + complete_revenue = @user_ada.revenue("complete") + + expect(pending_revenue).must_equal 0 + expect(paid_revenue).must_equal 0 + expect(complete_revenue).must_equal 0 + end + end + + describe 'item count' do + it 'will return the number of user cartitems based on cart status' do + total_cartitems = @user_ada.cartitems.count - pending_orders = @user.merchant_orders( status = "pending") - p pending_orders + pending_items_count = @user_ada.item_count("pending") + paid_items_count = @user_ada.item_count("paid") + complete_items_count = @user_ada.item_count("complete") - expect(@user).must_be_kind_of User + expect(pending_items_count).must_be_kind_of Integer + expect(paid_items_count).must_be_kind_of Integer + expect(complete_items_count).must_be_kind_of Integer - expect(pending_orders).must_be_kind_of Hash + total_by_status = pending_items_count + paid_items_count + complete_items_count - #expect(pending_orders).must_be_empty + expect(total_by_status == total_cartitems).must_equal true + end + + it 'will return 0 if no cartitems' do + Cart.all.each do |cart| + cart.destroy + end + + Cartitem.all.each do |item| + item.destroy + end + + pending_items_count = @user_ada.item_count("pending") + paid_items_count = @user_ada.item_count("paid") + complete_items_count = @user_ada.item_count("complete") + + expect(pending_items_count).must_equal 0 + expect(paid_items_count).must_equal 0 + expect(complete_items_count).must_equal 0 + end end end end From a00c6225e6a5d62d9795c3de9846bb2a8a8f9466 Mon Sep 17 00:00:00 2001 From: r-spiel Date: Tue, 24 Nov 2020 12:08:56 -0800 Subject: [PATCH 236/248] user controller test added --- test/controllers/users_controller_test.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 2450c61248..e60aabf693 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -90,5 +90,20 @@ must_respond_with :redirect must_redirect_to root_path end + + it 'can get fulfillment page if user has not cart/cartitems' do + Cart.all.each do |cart| + cart.destroy + end + + Cartitem.all.each do |item| + item.destroy + end + + perform_login() + + get current_user_fulfillment_path + must_respond_with :success + end end end From c5ab8c28f0c0451902ef3422a8dfe5d4876bb8dc Mon Sep 17 00:00:00 2001 From: Lina Do Date: Tue, 24 Nov 2020 12:26:30 -0800 Subject: [PATCH 237/248] removed unneeded photos and made sure a photo shows up in the cart if there is an image available --- app/views/carts/show.html.erb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/carts/show.html.erb b/app/views/carts/show.html.erb index c2629b4985..b0fed6e9b2 100644 --- a/app/views/carts/show.html.erb +++ b/app/views/carts/show.html.erb @@ -16,7 +16,11 @@ <% if @cartitems.any? %> <% @cartitems.each do|item| %>
    <%= image_tag(item.product.image) %> + <% if item.product.image != nil %> + <%= image_tag(item.product.image) %> + <% end %> + <%= link_to item.product.name, product_path(item.product.id)%> - <%= link_to "X", cartitem_path(item), method: :delete %> + <%= link_to cartitem_path(item), method: :delete do %> + × + <% end %>