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

The page you were looking for doesn't exist.

+

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

+
+

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

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

The change you wanted was rejected.

+

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

+
+

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

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

We're sorry, but something went wrong.

+
+

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

+
+ + diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 0000000000..37b576a4a0 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb new file mode 100644 index 0000000000..d19212abd5 --- /dev/null +++ b/test/application_system_test_case.rb @@ -0,0 +1,5 @@ +require "test_helper" + +class ApplicationSystemTestCase < ActionDispatch::SystemTestCase + driven_by :selenium, using: :chrome, screen_size: [1400, 1400] +end diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/helpers/.keep b/test/helpers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/system/.keep b/test/system/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 0000000000..10594a3248 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,26 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" +require "minitest/reporters" # for Colorized output + +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 0000000000..e69de29bb2 From d5dcf3ff8059830498f2d89e805e8754b123e04c Mon Sep 17 00:00:00 2001 From: Victoria Sawchuk Date: Tue, 17 Oct 2017 10:35:22 -0700 Subject: [PATCH 002/300] Add foundation stylesheets --- Gemfile | 3 +- Gemfile.lock | 21 +- app/assets/javascripts/application.js | 3 + app/assets/stylesheets/_settings.scss | 863 ++++++++++++++++++ app/assets/stylesheets/application.css | 2 + .../stylesheets/foundation_and_overrides.scss | 53 ++ app/views/layouts/application.html.erb | 15 +- 7 files changed, 948 insertions(+), 12 deletions(-) create mode 100644 app/assets/stylesheets/_settings.scss create mode 100644 app/assets/stylesheets/foundation_and_overrides.scss diff --git a/Gemfile b/Gemfile index 88aee9dc96..ae421047c3 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,8 @@ git_source(:github) do |repo_name| "https://github.com/#{repo_name}.git" end - +# Foundation CSS Framework +gem 'foundation-rails', '6.4.1.2' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.1.4' # Use postgresql as the database for Active Record diff --git a/Gemfile.lock b/Gemfile.lock index b3f609aa59..67420367a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,6 +42,10 @@ GEM public_suffix (>= 2.0.2, < 4.0) ansi (1.5.0) arel (8.0.0) + babel-source (5.8.35) + babel-transpiler (0.7.0) + babel-source (>= 4.0, < 6) + execjs (~> 2.0) better_errors (2.4.0) coderay (>= 1.0.0) erubi (>= 1.0.0) @@ -67,6 +71,10 @@ GEM erubi (1.7.0) execjs (2.7.0) ffi (1.9.18) + foundation-rails (6.4.1.2) + railties (>= 3.1.0) + sass (>= 3.3.0, < 3.5) + sprockets-es6 (>= 0.9.0) globalid (0.4.0) activesupport (>= 4.2.0) i18n (0.9.0) @@ -146,11 +154,7 @@ GEM ruby-progressbar (1.9.0) ruby_dep (1.5.0) rubyzip (1.2.1) - sass (3.5.2) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) + sass (3.4.25) sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) @@ -168,6 +172,10 @@ GEM sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) + sprockets-es6 (0.9.2) + babel-source (>= 5.8.11) + babel-transpiler + sprockets (>= 3.0.0) sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) @@ -201,6 +209,7 @@ DEPENDENCIES binding_of_caller byebug capybara (~> 2.13) + foundation-rails (= 6.4.1.2) jbuilder (~> 2.5) jquery-turbolinks listen (>= 3.0.5, < 3.2) @@ -220,4 +229,4 @@ DEPENDENCIES web-console (>= 3.3.0) BUNDLED WITH - 1.15.4 + 1.16.0.pre.3 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 46b20359fa..4f2cc0f55a 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -11,5 +11,8 @@ // about supported directives. // //= require rails-ujs +//= require foundation //= require turbolinks //= require_tree . + +$(function(){ $(document).foundation(); }); diff --git a/app/assets/stylesheets/_settings.scss b/app/assets/stylesheets/_settings.scss new file mode 100644 index 0000000000..b67ff00cdc --- /dev/null +++ b/app/assets/stylesheets/_settings.scss @@ -0,0 +1,863 @@ +// Foundation for Sites Settings +// ----------------------------- +// +// Table of Contents: +// +// 1. Global +// 2. Breakpoints +// 3. The Grid +// 4. Base Typography +// 5. Typography Helpers +// 6. Abide +// 7. Accordion +// 8. Accordion Menu +// 9. Badge +// 10. Breadcrumbs +// 11. Button +// 12. Button Group +// 13. Callout +// 14. Card +// 15. Close Button +// 16. Drilldown +// 17. Dropdown +// 18. Dropdown Menu +// 19. Flexbox Utilities +// 20. Forms +// 21. Label +// 22. Media Object +// 23. Menu +// 24. Meter +// 25. Off-canvas +// 26. Orbit +// 27. Pagination +// 28. Progress Bar +// 29. Prototype Arrow +// 30. Prototype Border-Box +// 31. Prototype Border-None +// 32. Prototype Bordered +// 33. Prototype Display +// 34. Prototype Font-Styling +// 35. Prototype List-Style-Type +// 36. Prototype Overflow +// 37. Prototype Position +// 38. Prototype Rounded +// 39. Prototype Separator +// 40. Prototype Shadow +// 41. Prototype Sizing +// 42. Prototype Spacing +// 43. Prototype Text-Decoration +// 44. Prototype Text-Transformation +// 45. Prototype Text-Utilities +// 46. Responsive Embed +// 47. Reveal +// 48. Slider +// 49. Switch +// 50. Table +// 51. Tabs +// 52. Thumbnail +// 53. Title Bar +// 54. Tooltip +// 55. Top Bar +// 56. Xy Grid + +@import 'util/util'; + +// 1. Global +// --------- + +$global-font-size: 100%; +$global-width: rem-calc(1200); +$global-lineheight: 1.5; +$foundation-palette: ( + primary: #1779ba, + secondary: #767676, + success: #3adb76, + warning: #ffae00, + alert: #cc4b37, +); +$light-gray: #e6e6e6; +$medium-gray: #cacaca; +$dark-gray: #8a8a8a; +$black: #0a0a0a; +$white: #fefefe; +$body-background: $white; +$body-font-color: $black; +$body-font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif; +$body-antialiased: true; +$global-margin: 1rem; +$global-padding: 1rem; +$global-position: 1rem; +$global-weight-normal: normal; +$global-weight-bold: bold; +$global-radius: 0; +$global-menu-padding: 0.7rem 1rem; +$global-menu-nested-margin: 1rem; +$global-text-direction: ltr; +$global-flexbox: true; +$global-prototype-breakpoints: false; +$global-color-pick-contrast-tolerance: 0; +$print-transparent-backgrounds: true; + +@include add-foundation-colors; + +// 2. Breakpoints +// -------------- + +$breakpoints: ( + small: 0, + medium: 640px, + large: 1024px, + xlarge: 1200px, + xxlarge: 1440px, +); +$print-breakpoint: large; +$breakpoint-classes: (small medium large); + +// 3. The Grid +// ----------- + +$grid-row-width: $global-width; +$grid-column-count: 12; +$grid-column-gutter: ( + small: 20px, + medium: 30px, +); +$grid-column-align-edge: true; +$grid-column-alias: 'columns'; +$block-grid-max: 8; + +// 4. Base Typography +// ------------------ + +$header-font-family: $body-font-family; +$header-font-weight: $global-weight-normal; +$header-font-style: normal; +$font-family-monospace: Consolas, 'Liberation Mono', Courier, monospace; +$header-color: inherit; +$header-lineheight: 1.4; +$header-margin-bottom: 0.5rem; +$header-styles: ( + small: ( + 'h1': ('font-size': 24), + 'h2': ('font-size': 20), + 'h3': ('font-size': 19), + 'h4': ('font-size': 18), + 'h5': ('font-size': 17), + 'h6': ('font-size': 16), + ), + medium: ( + 'h1': ('font-size': 48), + 'h2': ('font-size': 40), + 'h3': ('font-size': 31), + 'h4': ('font-size': 25), + 'h5': ('font-size': 20), + 'h6': ('font-size': 16), + ), +); +$header-text-rendering: optimizeLegibility; +$small-font-size: 80%; +$header-small-font-color: $medium-gray; +$paragraph-lineheight: 1.6; +$paragraph-margin-bottom: 1rem; +$paragraph-text-rendering: optimizeLegibility; +$code-color: $black; +$code-font-family: $font-family-monospace; +$code-font-weight: $global-weight-normal; +$code-background: $light-gray; +$code-border: 1px solid $medium-gray; +$code-padding: rem-calc(2 5 1); +$anchor-color: $primary-color; +$anchor-color-hover: scale-color($anchor-color, $lightness: -14%); +$anchor-text-decoration: none; +$anchor-text-decoration-hover: none; +$hr-width: $global-width; +$hr-border: 1px solid $medium-gray; +$hr-margin: rem-calc(20) auto; +$list-lineheight: $paragraph-lineheight; +$list-margin-bottom: $paragraph-margin-bottom; +$list-style-type: disc; +$list-style-position: outside; +$list-side-margin: 1.25rem; +$list-nested-side-margin: 1.25rem; +$defnlist-margin-bottom: 1rem; +$defnlist-term-weight: $global-weight-bold; +$defnlist-term-margin-bottom: 0.3rem; +$blockquote-color: $dark-gray; +$blockquote-padding: rem-calc(9 20 0 19); +$blockquote-border: 1px solid $medium-gray; +$cite-font-size: rem-calc(13); +$cite-color: $dark-gray; +$cite-pseudo-content: '\2014 \0020'; +$keystroke-font: $font-family-monospace; +$keystroke-color: $black; +$keystroke-background: $light-gray; +$keystroke-padding: rem-calc(2 4 0); +$keystroke-radius: $global-radius; +$abbr-underline: 1px dotted $black; + +// 5. Typography Helpers +// --------------------- + +$lead-font-size: $global-font-size * 1.25; +$lead-lineheight: 1.6; +$subheader-lineheight: 1.4; +$subheader-color: $dark-gray; +$subheader-font-weight: $global-weight-normal; +$subheader-margin-top: 0.2rem; +$subheader-margin-bottom: 0.5rem; +$stat-font-size: 2.5rem; + +// 6. Abide +// -------- + +$abide-inputs: true; +$abide-labels: true; +$input-background-invalid: get-color(alert); +$form-label-color-invalid: get-color(alert); +$input-error-color: get-color(alert); +$input-error-font-size: rem-calc(12); +$input-error-font-weight: $global-weight-bold; + +// 7. Accordion +// ------------ + +$accordion-background: $white; +$accordion-plusminus: true; +$accordion-title-font-size: rem-calc(12); +$accordion-item-color: $primary-color; +$accordion-item-background-hover: $light-gray; +$accordion-item-padding: 1.25rem 1rem; +$accordion-content-background: $white; +$accordion-content-border: 1px solid $light-gray; +$accordion-content-color: $body-font-color; +$accordion-content-padding: 1rem; + +// 8. Accordion Menu +// ----------------- + +$accordionmenu-padding: $global-menu-padding; +$accordionmenu-nested-margin: $global-menu-nested-margin; +$accordionmenu-submenu-padding: $accordionmenu-padding; +$accordionmenu-arrows: true; +$accordionmenu-arrow-color: $primary-color; +$accordionmenu-item-background: null; +$accordionmenu-border: null; +$accordionmenu-submenu-toggle-background: null; +$accordion-submenu-toggle-border: $accordionmenu-border; +$accordionmenu-submenu-toggle-width: 40px; +$accordionmenu-submenu-toggle-height: $accordionmenu-submenu-toggle-width; +$accordionmenu-arrow-size: 6px; + +// 9. Badge +// -------- + +$badge-background: $primary-color; +$badge-color: $white; +$badge-color-alt: $black; +$badge-palette: $foundation-palette; +$badge-padding: 0.3em; +$badge-minwidth: 2.1em; +$badge-font-size: 0.6rem; + +// 10. Breadcrumbs +// --------------- + +$breadcrumbs-margin: 0 0 $global-margin 0; +$breadcrumbs-item-font-size: rem-calc(11); +$breadcrumbs-item-color: $primary-color; +$breadcrumbs-item-color-current: $black; +$breadcrumbs-item-color-disabled: $medium-gray; +$breadcrumbs-item-margin: 0.75rem; +$breadcrumbs-item-uppercase: true; +$breadcrumbs-item-separator: true; +$breadcrumbs-item-separator-item: '/'; +$breadcrumbs-item-separator-item-rtl: '\\'; +$breadcrumbs-item-separator-color: $medium-gray; + +// 11. Button +// ---------- + +$button-font-family: inherit; +$button-padding: 0.85em 1em; +$button-margin: 0 0 $global-margin 0; +$button-fill: solid; +$button-background: $primary-color; +$button-background-hover: scale-color($button-background, $lightness: -15%); +$button-color: $white; +$button-color-alt: $black; +$button-radius: $global-radius; +$button-hollow-border-width: 1px; +$button-sizes: ( + tiny: 0.6rem, + small: 0.75rem, + default: 0.9rem, + large: 1.25rem, +); +$button-palette: $foundation-palette; +$button-opacity-disabled: 0.25; +$button-background-hover-lightness: -20%; +$button-hollow-hover-lightness: -50%; +$button-transition: background-color 0.25s ease-out, color 0.25s ease-out; + +// 12. Button Group +// ---------------- + +$buttongroup-margin: 1rem; +$buttongroup-spacing: 1px; +$buttongroup-child-selector: '.button'; +$buttongroup-expand-max: 6; +$buttongroup-radius-on-each: true; + +// 13. Callout +// ----------- + +$callout-background: $white; +$callout-background-fade: 85%; +$callout-border: 1px solid rgba($black, 0.25); +$callout-margin: 0 0 1rem 0; +$callout-padding: 1rem; +$callout-font-color: $body-font-color; +$callout-font-color-alt: $body-background; +$callout-radius: $global-radius; +$callout-link-tint: 30%; + +// 14. Card +// -------- + +$card-background: $white; +$card-font-color: $body-font-color; +$card-divider-background: $light-gray; +$card-border: 1px solid $light-gray; +$card-shadow: none; +$card-border-radius: $global-radius; +$card-padding: $global-padding; +$card-margin-bottom: $global-margin; + +// 15. Close Button +// ---------------- + +$closebutton-position: right top; +$closebutton-offset-horizontal: ( + small: 0.66rem, + medium: 1rem, +); +$closebutton-offset-vertical: ( + small: 0.33em, + medium: 0.5rem, +); +$closebutton-size: ( + small: 1.5em, + medium: 2em, +); +$closebutton-lineheight: 1; +$closebutton-color: $dark-gray; +$closebutton-color-hover: $black; + +// 16. Drilldown +// ------------- + +$drilldown-transition: transform 0.15s linear; +$drilldown-arrows: true; +$drilldown-padding: $global-menu-padding; +$drilldown-nested-margin: 0; +$drilldown-background: $white; +$drilldown-submenu-padding: $drilldown-padding; +$drilldown-submenu-background: $white; +$drilldown-arrow-color: $primary-color; +$drilldown-arrow-size: 6px; + +// 17. Dropdown +// ------------ + +$dropdown-padding: 1rem; +$dropdown-background: $body-background; +$dropdown-border: 1px solid $medium-gray; +$dropdown-font-size: 1rem; +$dropdown-width: 300px; +$dropdown-radius: $global-radius; +$dropdown-sizes: ( + tiny: 100px, + small: 200px, + large: 400px, +); + +// 18. Dropdown Menu +// ----------------- + +$dropdownmenu-arrows: true; +$dropdownmenu-arrow-color: $anchor-color; +$dropdownmenu-arrow-size: 6px; +$dropdownmenu-arrow-padding: 1.5rem; +$dropdownmenu-min-width: 200px; +$dropdownmenu-background: $white; +$dropdownmenu-submenu-background: $dropdownmenu-background; +$dropdownmenu-padding: $global-menu-padding; +$dropdownmenu-nested-margin: 0; +$dropdownmenu-submenu-padding: $dropdownmenu-padding; +$dropdownmenu-border: 1px solid $medium-gray; +$dropdown-menu-item-color-active: get-color(primary); +$dropdown-menu-item-background-active: transparent; + +// 19. Flexbox Utilities +// --------------------- + +$flex-source-ordering-count: 6; +$flexbox-responsive-breakpoints: true; + +// 20. Forms +// --------- + +$fieldset-border: 1px solid $medium-gray; +$fieldset-padding: rem-calc(20); +$fieldset-margin: rem-calc(18 0); +$legend-padding: rem-calc(0 3); +$form-spacing: rem-calc(16); +$helptext-color: $black; +$helptext-font-size: rem-calc(13); +$helptext-font-style: italic; +$input-prefix-color: $black; +$input-prefix-background: $light-gray; +$input-prefix-border: 1px solid $medium-gray; +$input-prefix-padding: 1rem; +$form-label-color: $black; +$form-label-font-size: rem-calc(14); +$form-label-font-weight: $global-weight-normal; +$form-label-line-height: 1.8; +$select-background: $white; +$select-triangle-color: $dark-gray; +$select-radius: $global-radius; +$input-color: $black; +$input-placeholder-color: $medium-gray; +$input-font-family: inherit; +$input-font-size: rem-calc(16); +$input-font-weight: $global-weight-normal; +$input-line-height: $global-lineheight; +$input-background: $white; +$input-background-focus: $white; +$input-background-disabled: $light-gray; +$input-border: 1px solid $medium-gray; +$input-border-focus: 1px solid $dark-gray; +$input-padding: $form-spacing / 2; +$input-shadow: inset 0 1px 2px rgba($black, 0.1); +$input-shadow-focus: 0 0 5px $medium-gray; +$input-cursor-disabled: not-allowed; +$input-transition: box-shadow 0.5s, border-color 0.25s ease-in-out; +$input-number-spinners: true; +$input-radius: $global-radius; +$form-button-radius: $global-radius; + +// 21. Label +// --------- + +$label-background: $primary-color; +$label-color: $white; +$label-color-alt: $black; +$label-palette: $foundation-palette; +$label-font-size: 0.8rem; +$label-padding: 0.33333rem 0.5rem; +$label-radius: $global-radius; + +// 22. Media Object +// ---------------- + +$mediaobject-margin-bottom: $global-margin; +$mediaobject-section-padding: $global-padding; +$mediaobject-image-width-stacked: 100%; + +// 23. Menu +// -------- + +$menu-margin: 0; +$menu-nested-margin: $global-menu-nested-margin; +$menu-items-padding: $global-menu-padding; +$menu-simple-margin: 1rem; +$menu-item-color-active: $white; +$menu-item-background-active: get-color(primary); +$menu-icon-spacing: 0.25rem; +$menu-item-background-hover: $light-gray; +$menu-state-back-compat: true; +$menu-centered-back-compat: true; + +// 24. Meter +// --------- + +$meter-height: 1rem; +$meter-radius: $global-radius; +$meter-background: $medium-gray; +$meter-fill-good: $success-color; +$meter-fill-medium: $warning-color; +$meter-fill-bad: $alert-color; + +// 25. Off-canvas +// -------------- + +$offcanvas-size: 250px; +$offcanvas-vertical-size: 250px; +$offcanvas-background: $light-gray; +$offcanvas-shadow: 0 0 10px rgba($black, 0.7); +$offcanvas-inner-shadow-size: 20px; +$offcanvas-inner-shadow-color: rgba($black, 0.25); +$offcanvas-overlay-zindex: 11; +$offcanvas-push-zindex: 12; +$offcanvas-overlap-zindex: 13; +$offcanvas-reveal-zindex: 12; +$offcanvas-transition-length: 0.5s; +$offcanvas-transition-timing: ease; +$offcanvas-fixed-reveal: true; +$offcanvas-exit-background: rgba($white, 0.25); +$maincontent-class: 'off-canvas-content'; + +// 26. Orbit +// --------- + +$orbit-bullet-background: $medium-gray; +$orbit-bullet-background-active: $dark-gray; +$orbit-bullet-diameter: 1.2rem; +$orbit-bullet-margin: 0.1rem; +$orbit-bullet-margin-top: 0.8rem; +$orbit-bullet-margin-bottom: 0.8rem; +$orbit-caption-background: rgba($black, 0.5); +$orbit-caption-padding: 1rem; +$orbit-control-background-hover: rgba($black, 0.5); +$orbit-control-padding: 1rem; +$orbit-control-zindex: 10; + +// 27. Pagination +// -------------- + +$pagination-font-size: rem-calc(14); +$pagination-margin-bottom: $global-margin; +$pagination-item-color: $black; +$pagination-item-padding: rem-calc(3 10); +$pagination-item-spacing: rem-calc(1); +$pagination-radius: $global-radius; +$pagination-item-background-hover: $light-gray; +$pagination-item-background-current: $primary-color; +$pagination-item-color-current: $white; +$pagination-item-color-disabled: $medium-gray; +$pagination-ellipsis-color: $black; +$pagination-mobile-items: false; +$pagination-mobile-current-item: false; +$pagination-arrows: true; + +// 28. Progress Bar +// ---------------- + +$progress-height: 1rem; +$progress-background: $medium-gray; +$progress-margin-bottom: $global-margin; +$progress-meter-background: $primary-color; +$progress-radius: $global-radius; + +// 29. Prototype Arrow +// ------------------- + +$prototype-arrow-directions: ( + down, + up, + right, + left +); +$prototype-arrow-size: 0.4375rem; +$prototype-arrow-color: $black; + +// 30. Prototype Border-Box +// ------------------------ + +$prototype-border-box-breakpoints: $global-prototype-breakpoints; + +// 31. Prototype Border-None +// ------------------------- + +$prototype-border-none-breakpoints: $global-prototype-breakpoints; + +// 32. Prototype Bordered +// ---------------------- + +$prototype-bordered-breakpoints: $global-prototype-breakpoints; +$prototype-border-width: rem-calc(1); +$prototype-border-type: solid; +$prototype-border-color: $medium-gray; + +// 33. Prototype Display +// --------------------- + +$prototype-display-breakpoints: $global-prototype-breakpoints; +$prototype-display: ( + inline, + inline-block, + block, + table, + table-cell +); + +// 34. Prototype Font-Styling +// -------------------------- + +$prototype-font-breakpoints: $global-prototype-breakpoints; +$prototype-wide-letter-spacing: rem-calc(4); +$prototype-font-normal: $global-weight-normal; +$prototype-font-bold: $global-weight-bold; + +// 35. Prototype List-Style-Type +// ----------------------------- + +$prototype-list-breakpoints: $global-prototype-breakpoints; +$prototype-style-type-unordered: ( + disc, + circle, + square +); +$prototype-style-type-ordered: ( + decimal, + lower-alpha, + lower-latin, + lower-roman, + upper-alpha, + upper-latin, + upper-roman +); + +// 36. Prototype Overflow +// ---------------------- + +$prototype-overflow-breakpoints: $global-prototype-breakpoints; +$prototype-overflow: ( + visible, + hidden, + scroll +); + +// 37. Prototype Position +// ---------------------- + +$prototype-position-breakpoints: $global-prototype-breakpoints; +$prototype-position: ( + static, + relative, + absolute, + fixed +); +$prototype-position-z-index: 975; + +// 38. Prototype Rounded +// --------------------- + +$prototype-rounded-breakpoints: $global-prototype-breakpoints; +$prototype-border-radius: rem-calc(3); + +// 39. Prototype Separator +// ----------------------- + +$prototype-separator-breakpoints: $global-prototype-breakpoints; +$prototype-separator-align: center; +$prototype-separator-height: rem-calc(2); +$prototype-separator-width: 3rem; +$prototype-separator-background: $primary-color; +$prototype-separator-margin-top: $global-margin; + +// 40. Prototype Shadow +// -------------------- + +$prototype-shadow-breakpoints: $global-prototype-breakpoints; +$prototype-box-shadow: 0 2px 5px 0 rgba(0,0,0,.16), + 0 2px 10px 0 rgba(0,0,0,.12); + +// 41. Prototype Sizing +// -------------------- + +$prototype-sizing-breakpoints: $global-prototype-breakpoints; +$prototype-sizing: ( + width, + height +); +$prototype-sizes: ( + 25: 25%, + 50: 50%, + 75: 75%, + 100: 100% +); + +// 42. Prototype Spacing +// --------------------- + +$prototype-spacing-breakpoints: $global-prototype-breakpoints; +$prototype-spacers-count: 3; + +// 43. Prototype Text-Decoration +// ----------------------------- + +$prototype-decoration-breakpoints: $global-prototype-breakpoints; +$prototype-text-decoration: ( + overline, + underline, + line-through, +); + +// 44. Prototype Text-Transformation +// --------------------------------- + +$prototype-transformation-breakpoints: $global-prototype-breakpoints; +$prototype-text-transformation: ( + lowercase, + uppercase, + capitalize +); + +// 45. Prototype Text-Utilities +// ---------------------------- + +$prototype-utilities-breakpoints: $global-prototype-breakpoints; +$prototype-text-overflow: ellipsis; + +// 46. Responsive Embed +// -------------------- + +$responsive-embed-margin-bottom: rem-calc(16); +$responsive-embed-ratios: ( + default: 4 by 3, + widescreen: 16 by 9, +); + +// 47. Reveal +// ---------- + +$reveal-background: $white; +$reveal-width: 600px; +$reveal-max-width: $global-width; +$reveal-padding: $global-padding; +$reveal-border: 1px solid $medium-gray; +$reveal-radius: $global-radius; +$reveal-zindex: 1005; +$reveal-overlay-background: rgba($black, 0.45); + +// 48. Slider +// ---------- + +$slider-width-vertical: 0.5rem; +$slider-transition: all 0.2s ease-in-out; +$slider-height: 0.5rem; +$slider-background: $light-gray; +$slider-fill-background: $medium-gray; +$slider-handle-height: 1.4rem; +$slider-handle-width: 1.4rem; +$slider-handle-background: $primary-color; +$slider-opacity-disabled: 0.25; +$slider-radius: $global-radius; + +// 49. Switch +// ---------- + +$switch-background: $medium-gray; +$switch-background-active: $primary-color; +$switch-height: 2rem; +$switch-height-tiny: 1.5rem; +$switch-height-small: 1.75rem; +$switch-height-large: 2.5rem; +$switch-radius: $global-radius; +$switch-margin: $global-margin; +$switch-paddle-background: $white; +$switch-paddle-offset: 0.25rem; +$switch-paddle-radius: $global-radius; +$switch-paddle-transition: all 0.25s ease-out; + +// 50. Table +// --------- + +$table-background: $white; +$table-color-scale: 5%; +$table-border: 1px solid smart-scale($table-background, $table-color-scale); +$table-padding: rem-calc(8 10 10); +$table-hover-scale: 2%; +$table-row-hover: darken($table-background, $table-hover-scale); +$table-row-stripe-hover: darken($table-background, $table-color-scale + $table-hover-scale); +$table-is-striped: true; +$table-striped-background: smart-scale($table-background, $table-color-scale); +$table-stripe: even; +$table-head-background: smart-scale($table-background, $table-color-scale / 2); +$table-head-row-hover: darken($table-head-background, $table-hover-scale); +$table-foot-background: smart-scale($table-background, $table-color-scale); +$table-foot-row-hover: darken($table-foot-background, $table-hover-scale); +$table-head-font-color: $body-font-color; +$table-foot-font-color: $body-font-color; +$show-header-for-stacked: false; +$table-stack-breakpoint: medium; + +// 51. Tabs +// -------- + +$tab-margin: 0; +$tab-background: $white; +$tab-color: $primary-color; +$tab-background-active: $light-gray; +$tab-active-color: $primary-color; +$tab-item-font-size: rem-calc(12); +$tab-item-background-hover: $white; +$tab-item-padding: 1.25rem 1.5rem; +$tab-expand-max: 6; +$tab-content-background: $white; +$tab-content-border: $light-gray; +$tab-content-color: $body-font-color; +$tab-content-padding: 1rem; + +// 52. Thumbnail +// ------------- + +$thumbnail-border: solid 4px $white; +$thumbnail-margin-bottom: $global-margin; +$thumbnail-shadow: 0 0 0 1px rgba($black, 0.2); +$thumbnail-shadow-hover: 0 0 6px 1px rgba($primary-color, 0.5); +$thumbnail-transition: box-shadow 200ms ease-out; +$thumbnail-radius: $global-radius; + +// 53. Title Bar +// ------------- + +$titlebar-background: $black; +$titlebar-color: $white; +$titlebar-padding: 0.5rem; +$titlebar-text-font-weight: bold; +$titlebar-icon-color: $white; +$titlebar-icon-color-hover: $medium-gray; +$titlebar-icon-spacing: 0.25rem; + +// 54. Tooltip +// ----------- + +$has-tip-cursor: help; +$has-tip-font-weight: $global-weight-bold; +$has-tip-border-bottom: dotted 1px $dark-gray; +$tooltip-background-color: $black; +$tooltip-color: $white; +$tooltip-padding: 0.75rem; +$tooltip-max-width: 10rem; +$tooltip-font-size: $small-font-size; +$tooltip-pip-width: 0.75rem; +$tooltip-pip-height: $tooltip-pip-width * 0.866; +$tooltip-radius: $global-radius; + +// 55. Top Bar +// ----------- + +$topbar-padding: 0.5rem; +$topbar-background: $light-gray; +$topbar-submenu-background: $topbar-background; +$topbar-title-spacing: 0.5rem 1rem 0.5rem 0; +$topbar-input-width: 200px; +$topbar-unstack-breakpoint: medium; + +// 56. Xy Grid +// ----------- + +$xy-grid: true; +$grid-container: $global-width; +$grid-columns: 12; +$grid-margin-gutters: ( + small: 20px, + medium: 30px +); +$grid-padding-gutters: $grid-margin-gutters; +$grid-container-padding: $grid-padding-gutters; +$grid-container-max: $global-width; +$block-grid-max: 8; + diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index d05ea0f511..a152282fce 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -12,4 +12,6 @@ * *= require_tree . *= require_self + *= require foundation_and_overrides + */ diff --git a/app/assets/stylesheets/foundation_and_overrides.scss b/app/assets/stylesheets/foundation_and_overrides.scss new file mode 100644 index 0000000000..584bc3205b --- /dev/null +++ b/app/assets/stylesheets/foundation_and_overrides.scss @@ -0,0 +1,53 @@ +@charset 'utf-8'; + +@import 'settings'; +@import 'foundation'; + +// If you'd like to include motion-ui the foundation-rails gem comes prepackaged with it, uncomment the 3 @imports, if you are not using the gem you need to install the motion-ui sass package. +// +@import 'motion-ui/motion-ui'; + +// We include everything by default. To slim your CSS, remove components you don't use. + +@include foundation-global-styles; +@include foundation-grid; +@include foundation-typography; +@include foundation-button; +@include foundation-forms; +@include foundation-visibility-classes; +@include foundation-float-classes; +@include foundation-accordion; +@include foundation-accordion-menu; +@include foundation-badge; +@include foundation-breadcrumbs; +@include foundation-button-group; +@include foundation-callout; +@include foundation-card; +@include foundation-close-button; +@include foundation-drilldown-menu; +@include foundation-dropdown; +@include foundation-dropdown-menu; +@include foundation-responsive-embed; +@include foundation-label; +@include foundation-media-object; +@include foundation-menu; +@include foundation-menu-icon; +@include foundation-off-canvas; +@include foundation-orbit; +@include foundation-pagination; +@include foundation-progress-bar; +@include foundation-slider; +@include foundation-sticky; +@include foundation-reveal; +@include foundation-switch; +@include foundation-table; +@include foundation-tabs; +@include foundation-thumbnail; +@include foundation-title-bar; +@include foundation-tooltip; +@include foundation-top-bar; + +// If you'd like to include motion-ui the foundation-rails gem comes prepackaged with it, uncomment the 3 @imports, if you are not using the gem you need to install the motion-ui sass package. + +@include motion-ui-transitions; +@include motion-ui-animations; diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 008c56f923..cd60004891 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,14 +1,19 @@ - + - Betsy - <%= csrf_meta_tags %> + + + + <%= content_for?(:title) ? yield(:title) : "Untitled" %> - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag "application", 'data-turbolinks-track' => true %> + <%= csrf_meta_tags %> + <%= yield %> + From 7bf1831ee768e1328253f246295148b14b26600d Mon Sep 17 00:00:00 2001 From: Kayla Ecker Date: Tue, 17 Oct 2017 12:55:52 -0700 Subject: [PATCH 003/300] created products model/controller --- app/assets/javascripts/products.js | 2 ++ app/assets/stylesheets/products.scss | 3 +++ app/controllers/products_controller.rb | 22 +++++++++++++++++ app/helpers/products_helper.rb | 2 ++ app/models/product.rb | 2 ++ app/views/products/edit.html.erb | 0 app/views/products/index.html.erb | 0 app/views/products/new.html.erb | 0 app/views/products/show.html.erb | 0 config/routes.rb | 4 +++- db/migrate/20171017194630_create_products.rb | 10 ++++++++ db/schema.rb | 25 ++++++++++++++++++++ test/controllers/products_controller_test.rb | 7 ++++++ test/fixtures/products.yml | 9 +++++++ test/models/product_test.rb | 9 +++++++ 15 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/products.js create mode 100644 app/assets/stylesheets/products.scss create mode 100644 app/controllers/products_controller.rb create mode 100644 app/helpers/products_helper.rb create mode 100644 app/models/product.rb 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/20171017194630_create_products.rb create mode 100644 db/schema.rb create mode 100644 test/controllers/products_controller_test.rb create mode 100644 test/fixtures/products.yml create mode 100644 test/models/product_test.rb diff --git a/app/assets/javascripts/products.js b/app/assets/javascripts/products.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/products.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/products.scss b/app/assets/stylesheets/products.scss new file mode 100644 index 0000000000..89e2e8db07 --- /dev/null +++ b/app/assets/stylesheets/products.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the products controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb new file mode 100644 index 0000000000..1f75763d43 --- /dev/null +++ b/app/controllers/products_controller.rb @@ -0,0 +1,22 @@ +class ProductsController < ApplicationController + + def index + end + + def show + end + + def edit + end + + def update + end + + def new + end + + def create + 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/edit.html.erb b/app/views/products/edit.html.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/products/new.html.erb b/app/views/products/new.html.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/routes.rb b/config/routes.rb index 787824f888..08d52295ed 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,5 @@ Rails.application.routes.draw do - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + + resources :products, :except => [:delete] + end diff --git a/db/migrate/20171017194630_create_products.rb b/db/migrate/20171017194630_create_products.rb new file mode 100644 index 0000000000..164da21e54 --- /dev/null +++ b/db/migrate/20171017194630_create_products.rb @@ -0,0 +1,10 @@ +class CreateProducts < ActiveRecord::Migration[5.1] + def change + create_table :products do |t| + t.string :name + t.integer :price + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000000..f4077e1ef1 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,25 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 20171017194630) 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 "price" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb new file mode 100644 index 0000000000..392a20e292 --- /dev/null +++ b/test/controllers/products_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe ProductsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml new file mode 100644 index 0000000000..8eaabe5059 --- /dev/null +++ b/test/fixtures/products.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + price: 1 + +two: + name: MyString + price: 1 diff --git a/test/models/product_test.rb b/test/models/product_test.rb new file mode 100644 index 0000000000..a618b0a156 --- /dev/null +++ b/test/models/product_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Product do + let(:product) { Product.new } + + it "must be valid" do + value(product).must_be :valid? + end +end From f99587e6d84076aad0ab37e7da37ad9e5d2d1c45 Mon Sep 17 00:00:00 2001 From: Victoria Sawchuk Date: Tue, 17 Oct 2017 13:08:51 -0700 Subject: [PATCH 004/300] * Defined products#index action * Add seed data for products * Begin view creation of root path (products#index) --- app/controllers/products_controller.rb | 1 + app/views/products/index.html.erb | 6 ++++ config/routes.rb | 2 +- db/product_seeds.csv | 11 ++++++++ db/seeds.rb | 39 +++++++++++++++++++++----- 5 files changed, 51 insertions(+), 8 deletions(-) create mode 100644 db/product_seeds.csv diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 1f75763d43..f29d47d34f 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -1,6 +1,7 @@ class ProductsController < ApplicationController def index + @products = Product.all end def show diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index e69de29bb2..c3588aaa67 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -0,0 +1,6 @@ +

Treebay Products

+
    + <% @products.each do |product| %> +
  • <%= product.name %>
    • + <% end %> +
diff --git a/config/routes.rb b/config/routes.rb index 08d52295ed..fc13de5ceb 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,5 @@ Rails.application.routes.draw do - + root to: 'products#index' resources :products, :except => [:delete] end diff --git a/db/product_seeds.csv b/db/product_seeds.csv new file mode 100644 index 0000000000..34f816cc8c --- /dev/null +++ b/db/product_seeds.csv @@ -0,0 +1,11 @@ +id,name,price +1,product1,0.97 +2,product2,3.49 +3,product3,3.28 +4,product4,6.65 +5,product5,8.29 +6,product6,9.39 +7,product7,1.89 +8,product8,8.09 +9,product9,5.5 +10,product10,3.32 \ No newline at end of file diff --git a/db/seeds.rb b/db/seeds.rb index 1beea2accd..f31044c100 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,7 +1,32 @@ -# This file should contain all the record creation needed to seed the database with its default values. -# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). -# -# Examples: -# -# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) -# Character.create(name: 'Luke', movie: movies.first) +require 'csv' + +PRODUCT_FILE = Rails.root.join('db', 'product_seeds.csv') +puts "Loading raw product data from #{PRODUCT_FILE}" + +product_failures = [] +CSV.foreach(PRODUCT_FILE, :headers => true) do |row| + product = Product.new + product.id = row['id'] + product.name = row['name'] + product.price = row['price'] + puts "Created product: #{product.inspect}" + successful = product.save + if !successful + product_failures << driver + end +end + +puts "Added #{Product.count} product records" +puts "#{product_failures.length} products failed to save" + + +# Since we set the primary key (the ID) manually on each of the +# tables, we've got to tell postgres to reload the latest ID +# values. Otherwise when we create a new record it will try +# to start at ID 1, which will be a conflict. +puts "Manually resetting PK sequence on each table" +ActiveRecord::Base.connection.tables.each do |t| + ActiveRecord::Base.connection.reset_pk_sequence!(t) +end + +puts "done" From 021c1e2e4711d0e1a27ec5d57e1a0a8872372196 Mon Sep 17 00:00:00 2001 From: Victoria Sawchuk Date: Tue, 17 Oct 2017 13:12:10 -0700 Subject: [PATCH 005/300] Add test for products#index --- test/controllers/products_controller_test.rb | 7 ++++--- test/fixtures/products.yml | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb index 392a20e292..14fb66a072 100644 --- a/test/controllers/products_controller_test.rb +++ b/test/controllers/products_controller_test.rb @@ -1,7 +1,8 @@ require "test_helper" describe ProductsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + it "must get the index view" do + get products_path + must_respond_with :success + end end diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml index 8eaabe5059..c498c6a7ec 100644 --- a/test/fixtures/products.yml +++ b/test/fixtures/products.yml @@ -1,9 +1,9 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - name: MyString + name: productone price: 1 two: - name: MyString - price: 1 + name: producttwo + price: 2 From 146e6ff3dbabece8c27ca4e26e040e2e15a2a802 Mon Sep 17 00:00:00 2001 From: Victoria Sawchuk Date: Tue, 17 Oct 2017 13:17:05 -0700 Subject: [PATCH 006/300] Set up automated testing with guard --- Gemfile | 5 +++++ Gemfile.lock | 32 ++++++++++++++++++++++++++++++++ Guardfile | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+) create mode 100644 Guardfile diff --git a/Gemfile b/Gemfile index ae421047c3..fb0c7f406d 100644 --- a/Gemfile +++ b/Gemfile @@ -49,6 +49,11 @@ group :development do # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' gem 'spring-watcher-listen', '~> 2.0.0' + gem 'guard-minitest', '~> 2.3.2' # https://github.com/guard/guard-minitest + # Colorize minitest output and show failing tests instantly. + gem 'minitest-colorize', git: 'https://github.com/ysbaddaden/minitest-colorize' + gem 'terminal-notifier-guard', '~> 1.6.4' # https://github.com/Springest/terminal-notifier-guard + gem 'terminal-notifier', '~> 1.6.2' # https://github.com/alloy/terminal-notifier end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem diff --git a/Gemfile.lock b/Gemfile.lock index 67420367a1..0efbcfd500 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,10 @@ +GIT + remote: https://github.com/ysbaddaden/minitest-colorize + revision: 81f2dd6aee81c83debc31572608fa89d6d9e1a19 + specs: + minitest-colorize (0.0.6.pre) + minitest (>= 5.2) + GEM remote: https://rubygems.org/ specs: @@ -71,12 +78,25 @@ GEM erubi (1.7.0) execjs (2.7.0) ffi (1.9.18) + formatador (0.2.5) foundation-rails (6.4.1.2) railties (>= 3.1.0) sass (>= 3.3.0, < 3.5) sprockets-es6 (>= 0.9.0) globalid (0.4.0) activesupport (>= 4.2.0) + guard (2.14.1) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (~> 1.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-minitest (2.3.2) + guard (~> 2.0) + minitest (>= 3.0) i18n (0.9.0) concurrent-ruby (~> 1.0) jbuilder (2.7.0) @@ -92,6 +112,7 @@ GEM loofah (2.1.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) + lumberjack (1.0.12) mail (2.6.6) mime-types (>= 1.16, < 4) method_source (0.9.0) @@ -110,9 +131,13 @@ GEM minitest (>= 5.0) ruby-progressbar multi_json (1.12.2) + nenv (0.3.0) nio4r (2.1.0) nokogiri (1.8.1) mini_portile2 (~> 2.3.0) + notiffany (0.1.1) + nenv (~> 0.1) + shellany (~> 0.0) pg (0.21.0) pry (0.11.1) coderay (~> 1.1.0) @@ -164,6 +189,7 @@ GEM selenium-webdriver (3.6.0) childprocess (~> 0.5) rubyzip (~> 1.0) + shellany (0.0.1) spring (2.0.2) activesupport (>= 4.2) spring-watcher-listen (2.0.1) @@ -180,6 +206,8 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) + terminal-notifier (1.6.3) + terminal-notifier-guard (1.6.4) thor (0.20.0) thread_safe (0.3.6) tilt (2.0.8) @@ -210,9 +238,11 @@ DEPENDENCIES byebug capybara (~> 2.13) foundation-rails (= 6.4.1.2) + guard-minitest (~> 2.3.2) jbuilder (~> 2.5) jquery-turbolinks listen (>= 3.0.5, < 3.2) + minitest-colorize! minitest-rails minitest-reporters pg (~> 0.18) @@ -223,6 +253,8 @@ DEPENDENCIES selenium-webdriver spring spring-watcher-listen (~> 2.0.0) + terminal-notifier (~> 1.6.2) + terminal-notifier-guard (~> 1.6.4) turbolinks (~> 5) tzinfo-data uglifier (>= 1.3.0) diff --git a/Guardfile b/Guardfile new file mode 100644 index 0000000000..a500da00d2 --- /dev/null +++ b/Guardfile @@ -0,0 +1,47 @@ +# A sample Guardfile +# More info at https://github.com/guard/guard#readme + +## Uncomment and set this to only include directories you want to watch +# directories %w(app lib config test spec features) \ +# .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")} + +## Note: if you are using the `directories` clause above and you are not +## watching the project directory ('.'), then you will want to move +## the Guardfile to a watched dir and symlink it back, e.g. +# +# $ mkdir config +# $ mv Guardfile config/ +# $ ln -s config/Guardfile . +# +# and, you'll have to watch "config/Guardfile" instead of "Guardfile" +require 'active_support/inflector' + +guard :minitest do + # with Minitest::Unit + watch(%r{^test/(.*)\/?test_(.*)\.rb$}) + watch(%r{^lib/(.*/)?([^/]+)\.rb$}) { |m| "test/#{m[1]}test_#{m[2]}.rb" } + watch(%r{^test/test_helper\.rb$}) { 'test' } + + # with Minitest::Spec + # watch(%r{^spec/(.*)_spec\.rb$}) + # watch(%r{^lib/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" } + # watch(%r{^spec/spec_helper\.rb$}) { 'spec' } + + # Rails 4 + 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' } + watch(%r{^app/views/(.+)/.+}) { |m| "test/controllers/#{m[1]}_controller_test.rb" } + watch(%r{^test/fixtures/(.+)\.yml}) { |m| "test/models/#{m[1].singularize}_test.rb" } + watch(%r{^test/fixtures/(.+)\.yml}) { |m| "test/controllers/#{m[1]}_controller_test.rb" } + + + # Rails < 4 + # watch(%r{^app/controllers/(.*)\.rb$}) { |m| "test/functional/#{m[1]}_test.rb" } + # watch(%r{^app/helpers/(.*)\.rb$}) { |m| "test/helpers/#{m[1]}_test.rb" } + # watch(%r{^app/models/(.*)\.rb$}) { |m| "test/unit/#{m[1]}_test.rb" } +end From dd1e36a76f8840c114babee0660575044a289094 Mon Sep 17 00:00:00 2001 From: Kayla Ecker Date: Tue, 17 Oct 2017 13:20:20 -0700 Subject: [PATCH 007/300] testing for products --- app/models/product.rb | 2 ++ test/controllers/products_controller_test.rb | 38 +++++++++++++++++--- test/fixtures/products.yml | 12 +++---- test/models/product_test.rb | 32 +++++++++++++++-- 4 files changed, 72 insertions(+), 12 deletions(-) diff --git a/app/models/product.rb b/app/models/product.rb index 35a85acab3..0082a72ddd 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -1,2 +1,4 @@ class Product < ApplicationRecord + validates :name, presence: true + validates :name, uniqueness: true end diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb index 392a20e292..b4a9c4dc29 100644 --- a/test/controllers/products_controller_test.rb +++ b/test/controllers/products_controller_test.rb @@ -1,7 +1,37 @@ require "test_helper" describe ProductsController do - # it "must be a real test" do - # flunk "Need real tests" - # end -end + + it "Successfully loads the index page" do + + end + + it "Successfully loads the show page" do + + end + + it "Successfully loads a new product form page" do + + end + + it "Successfully loads an edit product form page" do + + end + + it "Successfully creates a new work that saves to the database" do + + end + + it "Successfully saves the attributes of a new work" do + + end + + it "Successfully updates attribute for an existing work" do + + end + #may do attributes individually and for redirecting + + + + +end #desribe products controller diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml index 8eaabe5059..e24fd71749 100644 --- a/test/fixtures/products.yml +++ b/test/fixtures/products.yml @@ -1,9 +1,9 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - name: MyString - price: 1 +tree1: + name: Tree1 + price: 10 -two: - name: MyString - price: 1 +tree2: + name: Tree2 + price: 20 diff --git a/test/models/product_test.rb b/test/models/product_test.rb index a618b0a156..d6bcbd59fc 100644 --- a/test/models/product_test.rb +++ b/test/models/product_test.rb @@ -2,8 +2,36 @@ describe Product do let(:product) { Product.new } + let(:tree1) {products(:tree1)} + let(:tree2) {products(:tree2)} - it "must be valid" do - value(product).must_be :valid? + + it "must have a name" do + tree1.valid?.must_equal true + tree1.name = nil + tree1.valid?.must_equal false end + + it "must have a unique name" do + tree1.name = "Tree2" + tree1.valid?.must_equal false + + end + + it "must have a price" do + + end + + it "price must be a number" do + + end + + it "price must be greater than 0" do + + end + + it "must belong to a user" do + + end + end From 5863ed864bb831e699b4646369506b9ef67f0b4c Mon Sep 17 00:00:00 2001 From: Victoria Sawchuk Date: Tue, 17 Oct 2017 13:28:05 -0700 Subject: [PATCH 008/300] Updating guard file --- Guardfile | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 Guardfile diff --git a/Guardfile b/Guardfile new file mode 100644 index 0000000000..a500da00d2 --- /dev/null +++ b/Guardfile @@ -0,0 +1,47 @@ +# A sample Guardfile +# More info at https://github.com/guard/guard#readme + +## Uncomment and set this to only include directories you want to watch +# directories %w(app lib config test spec features) \ +# .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")} + +## Note: if you are using the `directories` clause above and you are not +## watching the project directory ('.'), then you will want to move +## the Guardfile to a watched dir and symlink it back, e.g. +# +# $ mkdir config +# $ mv Guardfile config/ +# $ ln -s config/Guardfile . +# +# and, you'll have to watch "config/Guardfile" instead of "Guardfile" +require 'active_support/inflector' + +guard :minitest do + # with Minitest::Unit + watch(%r{^test/(.*)\/?test_(.*)\.rb$}) + watch(%r{^lib/(.*/)?([^/]+)\.rb$}) { |m| "test/#{m[1]}test_#{m[2]}.rb" } + watch(%r{^test/test_helper\.rb$}) { 'test' } + + # with Minitest::Spec + # watch(%r{^spec/(.*)_spec\.rb$}) + # watch(%r{^lib/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" } + # watch(%r{^spec/spec_helper\.rb$}) { 'spec' } + + # Rails 4 + 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' } + watch(%r{^app/views/(.+)/.+}) { |m| "test/controllers/#{m[1]}_controller_test.rb" } + watch(%r{^test/fixtures/(.+)\.yml}) { |m| "test/models/#{m[1].singularize}_test.rb" } + watch(%r{^test/fixtures/(.+)\.yml}) { |m| "test/controllers/#{m[1]}_controller_test.rb" } + + + # Rails < 4 + # watch(%r{^app/controllers/(.*)\.rb$}) { |m| "test/functional/#{m[1]}_test.rb" } + # watch(%r{^app/helpers/(.*)\.rb$}) { |m| "test/helpers/#{m[1]}_test.rb" } + # watch(%r{^app/models/(.*)\.rb$}) { |m| "test/unit/#{m[1]}_test.rb" } +end From 37c18ca18d86cf9f8fba4acbf1220dffff9244cb Mon Sep 17 00:00:00 2001 From: Kayla Ecker Date: Tue, 17 Oct 2017 13:37:38 -0700 Subject: [PATCH 009/300] further work on tests and created product category migration --- app/models/product.rb | 2 ++ db/migrate/20171017203621_product_category.rb | 5 +++++ db/schema.rb | 3 ++- test/models/product_test.rb | 5 +++++ 4 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20171017203621_product_category.rb diff --git a/app/models/product.rb b/app/models/product.rb index 0082a72ddd..75cd18f886 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -1,4 +1,6 @@ class Product < ApplicationRecord validates :name, presence: true validates :name, uniqueness: true + + end diff --git a/db/migrate/20171017203621_product_category.rb b/db/migrate/20171017203621_product_category.rb new file mode 100644 index 0000000000..8114933622 --- /dev/null +++ b/db/migrate/20171017203621_product_category.rb @@ -0,0 +1,5 @@ +class ProductCategory < ActiveRecord::Migration[5.1] + def change + add_column :products, :category, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index f4077e1ef1..fb4b54ad0b 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: 20171017194630) do +ActiveRecord::Schema.define(version: 20171017203621) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -20,6 +20,7 @@ t.integer "price" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.string "category" end end diff --git a/test/models/product_test.rb b/test/models/product_test.rb index d6bcbd59fc..f9584673aa 100644 --- a/test/models/product_test.rb +++ b/test/models/product_test.rb @@ -10,6 +10,8 @@ tree1.valid?.must_equal true tree1.name = nil tree1.valid?.must_equal false + tree1.save + tree1.errors.keys.must_include :name end it "must have a unique name" do @@ -19,6 +21,9 @@ end it "must have a price" do + tree1.valid?.must_equal true + tree1.price = nil + tree1.valid?.must_equal false end From 7cc15bc3a847203fb8d86ebfce410326c739c8e9 Mon Sep 17 00:00:00 2001 From: Kayla Ecker Date: Tue, 17 Oct 2017 13:40:20 -0700 Subject: [PATCH 010/300] added migration for product quantity --- db/migrate/20171017203923_product_quantity.rb | 5 +++++ db/schema.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20171017203923_product_quantity.rb diff --git a/db/migrate/20171017203923_product_quantity.rb b/db/migrate/20171017203923_product_quantity.rb new file mode 100644 index 0000000000..d201b2c5c9 --- /dev/null +++ b/db/migrate/20171017203923_product_quantity.rb @@ -0,0 +1,5 @@ +class ProductQuantity < ActiveRecord::Migration[5.1] + def change + add_column :products, :quantity, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index fb4b54ad0b..89c878a62d 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: 20171017203621) do +ActiveRecord::Schema.define(version: 20171017203923) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -21,6 +21,7 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.string "category" + t.string "quantity" end end From 6508d083ba3f7d1aa76119a757b4cf7bbc951eeb Mon Sep 17 00:00:00 2001 From: Kayla Ecker Date: Tue, 17 Oct 2017 13:44:49 -0700 Subject: [PATCH 011/300] checkout requires an add --- db/migrate/20171017203621_product_category.rb | 5 +++++ db/migrate/20171017203923_product_quantity.rb | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 db/migrate/20171017203621_product_category.rb create mode 100644 db/migrate/20171017203923_product_quantity.rb diff --git a/db/migrate/20171017203621_product_category.rb b/db/migrate/20171017203621_product_category.rb new file mode 100644 index 0000000000..8114933622 --- /dev/null +++ b/db/migrate/20171017203621_product_category.rb @@ -0,0 +1,5 @@ +class ProductCategory < ActiveRecord::Migration[5.1] + def change + add_column :products, :category, :string + end +end diff --git a/db/migrate/20171017203923_product_quantity.rb b/db/migrate/20171017203923_product_quantity.rb new file mode 100644 index 0000000000..d201b2c5c9 --- /dev/null +++ b/db/migrate/20171017203923_product_quantity.rb @@ -0,0 +1,5 @@ +class ProductQuantity < ActiveRecord::Migration[5.1] + def change + add_column :products, :quantity, :string + end +end From 3a6d6cfaf754ffba528df7208756a8ae4983a10c Mon Sep 17 00:00:00 2001 From: Kayla Ecker Date: Tue, 17 Oct 2017 13:57:15 -0700 Subject: [PATCH 012/300] completed model testing for products --- app/models/product.rb | 6 ++++-- test/models/product_test.rb | 13 ++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/models/product.rb b/app/models/product.rb index 75cd18f886..4dc5b7abdd 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -1,6 +1,8 @@ class Product < ApplicationRecord validates :name, presence: true validates :name, uniqueness: true - - + validates :price, presence: true + validates :price, numericality: { greater_than: 0 } + validates :price, numericality: { only_float: true } + #may need to include integers as well end diff --git a/test/models/product_test.rb b/test/models/product_test.rb index f9584673aa..68ce534788 100644 --- a/test/models/product_test.rb +++ b/test/models/product_test.rb @@ -28,10 +28,21 @@ end it "price must be a number" do - + tree1.valid?.must_equal true + tree1.price = nil + tree1.valid?.must_equal false + tree1.price = "haha" + tree1.valid?.must_equal false end it "price must be greater than 0" do + tree1.valid?.must_equal true + tree1.price = 1 + tree1.valid?.must_equal true + tree1.price = 0 + tree1.valid?.must_equal false + tree1.price = -1 + tree1.valid?.must_equal false end From 17a4b01a35b17704cce632a73e6797ab09839efd Mon Sep 17 00:00:00 2001 From: Kayla Ecker Date: Tue, 17 Oct 2017 14:07:02 -0700 Subject: [PATCH 013/300] added migration for merchants and products --- app/assets/javascripts/merchants.js | 2 ++ app/assets/stylesheets/merchants.scss | 3 ++ app/controllers/merchants_controller.rb | 19 +++++++++++ app/helpers/merchants_helper.rb | 2 ++ app/models/merchant.rb | 2 ++ app/views/merchants/create.html.erb | 2 ++ app/views/merchants/edit.html.erb | 2 ++ app/views/merchants/index.html.erb | 2 ++ app/views/merchants/new.html.erb | 2 ++ app/views/merchants/show.html.erb | 2 ++ app/views/merchants/update.html.erb | 2 ++ config/routes.rb | 3 ++ db/migrate/20171017205747_create_merchants.rb | 10 ++++++ .../20171017210543_merchant_has_products.rb | 5 +++ db/schema.rb | 12 ++++++- test/controllers/merchants_controller_test.rb | 34 +++++++++++++++++++ test/fixtures/merchants.yml | 9 +++++ test/models/merchant_test.rb | 9 +++++ test/models/product_test.rb | 2 +- 19 files changed, 122 insertions(+), 2 deletions(-) create mode 100644 app/assets/javascripts/merchants.js create mode 100644 app/assets/stylesheets/merchants.scss create mode 100644 app/controllers/merchants_controller.rb create mode 100644 app/helpers/merchants_helper.rb create mode 100644 app/models/merchant.rb create mode 100644 app/views/merchants/create.html.erb create mode 100644 app/views/merchants/edit.html.erb create mode 100644 app/views/merchants/index.html.erb create mode 100644 app/views/merchants/new.html.erb create mode 100644 app/views/merchants/show.html.erb create mode 100644 app/views/merchants/update.html.erb create mode 100644 db/migrate/20171017205747_create_merchants.rb create mode 100644 db/migrate/20171017210543_merchant_has_products.rb create mode 100644 test/controllers/merchants_controller_test.rb create mode 100644 test/fixtures/merchants.yml create mode 100644 test/models/merchant_test.rb diff --git a/app/assets/javascripts/merchants.js b/app/assets/javascripts/merchants.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/merchants.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/merchants.scss b/app/assets/stylesheets/merchants.scss new file mode 100644 index 0000000000..2327c00afe --- /dev/null +++ b/app/assets/stylesheets/merchants.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the merchants controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rb new file mode 100644 index 0000000000..e731b44b3f --- /dev/null +++ b/app/controllers/merchants_controller.rb @@ -0,0 +1,19 @@ +class MerchantsController < ApplicationController + def new + end + + def create + end + + def index + end + + def edit + end + + def update + end + + def show + end +end diff --git a/app/helpers/merchants_helper.rb b/app/helpers/merchants_helper.rb new file mode 100644 index 0000000000..5337747b0f --- /dev/null +++ b/app/helpers/merchants_helper.rb @@ -0,0 +1,2 @@ +module MerchantsHelper +end diff --git a/app/models/merchant.rb b/app/models/merchant.rb new file mode 100644 index 0000000000..0440407160 --- /dev/null +++ b/app/models/merchant.rb @@ -0,0 +1,2 @@ +class Merchant < ApplicationRecord +end diff --git a/app/views/merchants/create.html.erb b/app/views/merchants/create.html.erb new file mode 100644 index 0000000000..1762feece0 --- /dev/null +++ b/app/views/merchants/create.html.erb @@ -0,0 +1,2 @@ +

Merchants#create

+

Find me in app/views/merchants/create.html.erb

diff --git a/app/views/merchants/edit.html.erb b/app/views/merchants/edit.html.erb new file mode 100644 index 0000000000..825f2251dc --- /dev/null +++ b/app/views/merchants/edit.html.erb @@ -0,0 +1,2 @@ +

Merchants#edit

+

Find me in app/views/merchants/edit.html.erb

diff --git a/app/views/merchants/index.html.erb b/app/views/merchants/index.html.erb new file mode 100644 index 0000000000..0ad7977813 --- /dev/null +++ b/app/views/merchants/index.html.erb @@ -0,0 +1,2 @@ +

Merchants#index

+

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

diff --git a/app/views/merchants/new.html.erb b/app/views/merchants/new.html.erb new file mode 100644 index 0000000000..aaac3f85d7 --- /dev/null +++ b/app/views/merchants/new.html.erb @@ -0,0 +1,2 @@ +

Merchants#new

+

Find me in app/views/merchants/new.html.erb

diff --git a/app/views/merchants/show.html.erb b/app/views/merchants/show.html.erb new file mode 100644 index 0000000000..cbb0f02bfe --- /dev/null +++ b/app/views/merchants/show.html.erb @@ -0,0 +1,2 @@ +

Merchants#show

+

Find me in app/views/merchants/show.html.erb

diff --git a/app/views/merchants/update.html.erb b/app/views/merchants/update.html.erb new file mode 100644 index 0000000000..48e3f8aed5 --- /dev/null +++ b/app/views/merchants/update.html.erb @@ -0,0 +1,2 @@ +

Merchants#update

+

Find me in app/views/merchants/update.html.erb

diff --git a/config/routes.rb b/config/routes.rb index fc13de5ceb..55fbb50f72 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,8 @@ Rails.application.routes.draw do + root to: 'products#index' + resources :products, :except => [:delete] + resources :merchants, :except => [:delete] end diff --git a/db/migrate/20171017205747_create_merchants.rb b/db/migrate/20171017205747_create_merchants.rb new file mode 100644 index 0000000000..64a57c904c --- /dev/null +++ b/db/migrate/20171017205747_create_merchants.rb @@ -0,0 +1,10 @@ +class CreateMerchants < ActiveRecord::Migration[5.1] + def change + create_table :merchants do |t| + t.string :username + t.string :email + + t.timestamps + end + end +end diff --git a/db/migrate/20171017210543_merchant_has_products.rb b/db/migrate/20171017210543_merchant_has_products.rb new file mode 100644 index 0000000000..954ff90065 --- /dev/null +++ b/db/migrate/20171017210543_merchant_has_products.rb @@ -0,0 +1,5 @@ +class MerchantHasProducts < ActiveRecord::Migration[5.1] + def change + add_reference :products, :merchant, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 89c878a62d..739529991a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,11 +10,18 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20171017203923) do +ActiveRecord::Schema.define(version: 20171017210543) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "merchants", force: :cascade do |t| + t.string "username" + t.string "email" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "products", force: :cascade do |t| t.string "name" t.integer "price" @@ -22,6 +29,9 @@ t.datetime "updated_at", null: false t.string "category" t.string "quantity" + t.bigint "merchant_id" + t.index ["merchant_id"], name: "index_products_on_merchant_id" end + add_foreign_key "products", "merchants" end diff --git a/test/controllers/merchants_controller_test.rb b/test/controllers/merchants_controller_test.rb new file mode 100644 index 0000000000..87ba4a8e09 --- /dev/null +++ b/test/controllers/merchants_controller_test.rb @@ -0,0 +1,34 @@ +require "test_helper" + +describe MerchantsController do + it "should get new" do + get merchants_new_url + value(response).must_be :success? + end + + it "should get create" do + get merchants_create_url + value(response).must_be :success? + end + + it "should get index" do + get merchants_index_url + value(response).must_be :success? + end + + it "should get edit" do + get merchants_edit_url + value(response).must_be :success? + end + + it "should get update" do + get merchants_update_url + value(response).must_be :success? + end + + it "should get show" do + get merchants_show_url + value(response).must_be :success? + end + +end diff --git a/test/fixtures/merchants.yml b/test/fixtures/merchants.yml new file mode 100644 index 0000000000..b6a1b87767 --- /dev/null +++ b/test/fixtures/merchants.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +sappy1: + username: sappy1 + email: sappy1@gmail.com + +sappy2: + username: sappy2 + email: sappy2@gmail.com diff --git a/test/models/merchant_test.rb b/test/models/merchant_test.rb new file mode 100644 index 0000000000..1cc99d985f --- /dev/null +++ b/test/models/merchant_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Merchant do + let(:merchant) { Merchant.new } + + it "must be valid" do + value(merchant).must_be :valid? + end +end diff --git a/test/models/product_test.rb b/test/models/product_test.rb index 68ce534788..52ce88be0e 100644 --- a/test/models/product_test.rb +++ b/test/models/product_test.rb @@ -47,7 +47,7 @@ end it "must belong to a user" do - + end end From aadaf7d13a176432ef39abace004ec42ee58cc9e Mon Sep 17 00:00:00 2001 From: "Retropiaf (Christiane Sawadogo)" Date: Tue, 17 Oct 2017 14:07:18 -0700 Subject: [PATCH 014/300] *modified product_seed.csv, *Added merchant, order, orderitem, review seed files --- db/merchant_seeds.csv | 27 +++++++++++++++++++++++++++ db/order_seeds.csv | 11 +++++++++++ db/orderitem_seeds.csv | 11 +++++++++++ db/product_seeds.csv | 22 +++++++++++----------- db/review_seeds.csv | 11 +++++++++++ 5 files changed, 71 insertions(+), 11 deletions(-) create mode 100644 db/merchant_seeds.csv create mode 100644 db/order_seeds.csv create mode 100644 db/orderitem_seeds.csv create mode 100644 db/review_seeds.csv diff --git a/db/merchant_seeds.csv b/db/merchant_seeds.csv new file mode 100644 index 0000000000..86c41cbdb8 --- /dev/null +++ b/db/merchant_seeds.csv @@ -0,0 +1,27 @@ +id,username,email +1,a,a@gmail.com +2,b,b@gmail.com +3,c,c@gmail.com +4,d,d@gmail.com +5,e,e@gmail.com +6,f,f@gmail.com +7,g,g@gmail.com +8,h,h@gmail.com +9,i,i@gmail.com +10,j,j@gmail.com +11,k,k@gmail.com +12,l,l@gmail.com +13,m,m@gmail.com +14,n,n@gmail.com +15,o,o@gmail.com +16,p,p@gmail.com +17,q,q@gmail.com +18,r,r@gmail.com +19,s,s@gmail.com +20,t,t@gmail.com +21,u,u@gmail.com +22,v,v@gmail.com +23,w,w@gmail.com +24,x,x@gmail.com +25,y,y@gmail.com +26,z,z@gmail.com \ No newline at end of file diff --git a/db/order_seeds.csv b/db/order_seeds.csv new file mode 100644 index 0000000000..9aa218670c --- /dev/null +++ b/db/order_seeds.csv @@ -0,0 +1,11 @@ +id,customer_email,address1,address2,city,state,zip_code,cc_name,cc_number,cc_expiration,cc_security,billing_zip +1,christiane@gmail.com,123 A Street,,New York,NY,93507,Christiane S,4111283003558320,01/01,791,96535 +2,shaunna@gmail.com,456 B Street,#4,Lahaina,HI,92509,Shaunna W,4111381187187510,01/02,539,92509 +3,kayla@gmail.com,1 3rd Ave,,Seattle,WA,93032,Kayla E,4111515970319250,01/03,322,96433 +4,victoria@gmail.com,12 8th Ave,#21,New York,NY,99690,Victoria S,4111892427248440,01/04,291,99690 +5,chris@gmail.com,21 Fake Pl,,New York,NY,90097,Chris M,4111698564821290,01/05,981,99642 +6,dee@gmail.com,13 Real St,Apt E,Lahaina,HI,99858,Dee D,4111258502273620,01/06,259,99858 +7,cynthia@gmail.com,321 C Ave,,Seattle,WA,92249,Cynthia T,4111261136939650,01/07,385,98631 +8,sarah@gmail.com,1923 4th Ave,,New York,NY,90161,Sarah E,4111702954334590,01/08,941,90161 +9,alexandra@gmail.com,1230 3rd Ave,Apt 3,New York,NY,96558,Alexandra H,4111941145824450,01/09,382,96558 +10,dan@gmail.com,1083 2nd Ave,,Lahaina,HI,98953,Dan R,4111597016882430,01/10,488,93479 \ No newline at end of file diff --git a/db/orderitem_seeds.csv b/db/orderitem_seeds.csv new file mode 100644 index 0000000000..69675f5f63 --- /dev/null +++ b/db/orderitem_seeds.csv @@ -0,0 +1,11 @@ +id,order_id,product_id,quantity +1,5,3,1 +2,10,2,5 +3,3,1,2 +4,9,4,3 +5,4,2,4 +6,1,4,2 +7,1,5,5 +8,1,1,5 +9,2,5,3 +10,2,4,5 diff --git a/db/product_seeds.csv b/db/product_seeds.csv index 34f816cc8c..97b99d85b0 100644 --- a/db/product_seeds.csv +++ b/db/product_seeds.csv @@ -1,11 +1,11 @@ -id,name,price -1,product1,0.97 -2,product2,3.49 -3,product3,3.28 -4,product4,6.65 -5,product5,8.29 -6,product6,9.39 -7,product7,1.89 -8,product8,8.09 -9,product9,5.5 -10,product10,3.32 \ No newline at end of file +id,name,price,category,merchant_id,quantity +1,product1,0.97,indoor,1,89 +2,product2,3.49,outdoor,1,84 +3,product3,3.28,indoor,2,86 +4,product4,6.65,outdoor,7,76 +5,product5,8.29,indoor,4,97 +6,product6,9.39,outdoor,5,71 +7,product7,1.89,indoor,9,56 +8,product8,8.09,outdoor,8,92 +9,product9,5.5,indoor,3,73 +10,product10,3.32,outdoor,3,88 diff --git a/db/review_seeds.csv b/db/review_seeds.csv new file mode 100644 index 0000000000..2cce8368ea --- /dev/null +++ b/db/review_seeds.csv @@ -0,0 +1,11 @@ +id,product_id,review_text +1,1,product1 is awesome +2,1,product1 is awful +3,1,product1 is okay +4,2,product2 is alright +5,3,product3 is so-so +6,4,product4 is the best +7,5,product5 is the worst +8,6,product6 is meh +9,7,product7 is great +10,8,product8 is unsatisfying \ No newline at end of file From 0b8528cc69d0f9b681556f3139ebf2f1cdf8ebb7 Mon Sep 17 00:00:00 2001 From: Kayla Ecker Date: Tue, 17 Oct 2017 14:18:22 -0700 Subject: [PATCH 015/300] completed testing for product and created a merchant (and connected them) --- app/models/merchant.rb | 1 + app/models/product.rb | 3 +++ test/fixtures/products.yml | 2 ++ test/models/product_test.rb | 10 ++++++++-- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/models/merchant.rb b/app/models/merchant.rb index 0440407160..07aacc445d 100644 --- a/app/models/merchant.rb +++ b/app/models/merchant.rb @@ -1,2 +1,3 @@ class Merchant < ApplicationRecord + has_many :products end diff --git a/app/models/product.rb b/app/models/product.rb index 4dc5b7abdd..0177c9a220 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -1,8 +1,11 @@ class Product < ApplicationRecord + belongs_to :merchant + validates :name, presence: true validates :name, uniqueness: true validates :price, presence: true validates :price, numericality: { greater_than: 0 } validates :price, numericality: { only_float: true } #may need to include integers as well + validates :merchant_id, presence: true end diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml index e24fd71749..9317105294 100644 --- a/test/fixtures/products.yml +++ b/test/fixtures/products.yml @@ -3,7 +3,9 @@ tree1: name: Tree1 price: 10 + merchant: sappy1 tree2: name: Tree2 price: 20 + merchant: sappy2 diff --git a/test/models/product_test.rb b/test/models/product_test.rb index 52ce88be0e..2e9ee765bf 100644 --- a/test/models/product_test.rb +++ b/test/models/product_test.rb @@ -43,11 +43,17 @@ tree1.valid?.must_equal false tree1.price = -1 tree1.valid?.must_equal false + end + it "must belong to a merchant" do + tree1.valid?.must_equal true + tree1.merchant = nil + tree1.valid?.must_equal false end - it "must belong to a user" do - + it "merchant must be a kind of merchant object" do + tree1.merchant.must_be_kind_of Merchant end + end From 15e5795ba495fde51d08fa662ae894eaf2a68f5a Mon Sep 17 00:00:00 2001 From: "Retropiaf (Christiane Sawadogo)" Date: Tue, 17 Oct 2017 14:23:43 -0700 Subject: [PATCH 016/300] *Created a Show view, *Filled in product#show method (no unexisting product case), *Started testing the show method --- app/controllers/products_controller.rb | 6 ++++++ app/views/products/index.html.erb | 2 +- app/views/products/show.html.erb | 1 + test/controllers/products_controller_test.rb | 10 ++++++++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index f29d47d34f..c2a001721e 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -1,4 +1,5 @@ class ProductsController < ApplicationController +before_action :find_product, only: [:show, :edit, :update, :destroy] def index @products = Product.all @@ -19,5 +20,10 @@ def new def create end + private + + def find_product + @product = Product.find_by_id(params[:id]) + end end diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index c3588aaa67..b64b4ecfe3 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -1,6 +1,6 @@

Treebay Products

    <% @products.each do |product| %> -
  • <%= product.name %>
    • +
  • <%= link_to(product.name, product_path(product.id)) %>
    • <% end %>
diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index e69de29bb2..67df92f0dd 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -0,0 +1 @@ +

Product: <%=@product.name %>

diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb index 14fb66a072..f60e964448 100644 --- a/test/controllers/products_controller_test.rb +++ b/test/controllers/products_controller_test.rb @@ -1,8 +1,18 @@ require "test_helper" +let(:one) {products(:one)} + describe ProductsController do it "must get the index view" do get products_path must_respond_with :success end + it "must get the show view" do + get product_path(one.id) + must_respond_with :success + + get product_path(-1) + must_respond_with :redirect + must_redirect_to products_path + end end From 3bca5ef4402eba3a3a02ea517f71dcdee140976f Mon Sep 17 00:00:00 2001 From: Kayla Ecker Date: Tue, 17 Oct 2017 15:42:47 -0700 Subject: [PATCH 017/300] completed testing for model of merchant --- app/models/merchant.rb | 5 ++ test/controllers/merchants_controller_test.rb | 58 +++++++++---------- test/models/merchant_test.rb | 40 ++++++++++++- test/models/product_test.rb | 1 + 4 files changed, 72 insertions(+), 32 deletions(-) diff --git a/app/models/merchant.rb b/app/models/merchant.rb index 07aacc445d..2848cfa571 100644 --- a/app/models/merchant.rb +++ b/app/models/merchant.rb @@ -1,3 +1,8 @@ class Merchant < ApplicationRecord has_many :products + + validates :username, presence: true + validates :username, uniqueness: true + validates :email, presence: true + validates :email, uniqueness: true end diff --git a/test/controllers/merchants_controller_test.rb b/test/controllers/merchants_controller_test.rb index 87ba4a8e09..2a50436448 100644 --- a/test/controllers/merchants_controller_test.rb +++ b/test/controllers/merchants_controller_test.rb @@ -1,34 +1,34 @@ require "test_helper" describe MerchantsController do - it "should get new" do - get merchants_new_url - value(response).must_be :success? - end - - it "should get create" do - get merchants_create_url - value(response).must_be :success? - end - - it "should get index" do - get merchants_index_url - value(response).must_be :success? - end - - it "should get edit" do - get merchants_edit_url - value(response).must_be :success? - end - - it "should get update" do - get merchants_update_url - value(response).must_be :success? - end - - it "should get show" do - get merchants_show_url - value(response).must_be :success? - end + # it "should get new" do + # get merchants_new_url + # value(response).must_be :success? + # end + # + # it "should get create" do + # get merchants_create_url + # value(response).must_be :success? + # end + # + # it "should get index" do + # get merchants_index_url + # value(response).must_be :success? + # end + # + # it "should get edit" do + # get merchants_edit_url + # value(response).must_be :success? + # end + # + # it "should get update" do + # get merchants_update_url + # value(response).must_be :success? + # end + # + # it "should get show" do + # get merchants_show_url + # value(response).must_be :success? + # end end diff --git a/test/models/merchant_test.rb b/test/models/merchant_test.rb index 1cc99d985f..f607d00f64 100644 --- a/test/models/merchant_test.rb +++ b/test/models/merchant_test.rb @@ -1,9 +1,43 @@ require "test_helper" + #needs to write in two tests for scopes on the model describe Merchant do let(:merchant) { Merchant.new } + let(:sappy1) { merchants(:sappy1) } - it "must be valid" do - value(merchant).must_be :valid? + it "must have a username" do + sappy1.valid?.must_equal true + sappy1.username = nil + sappy1.valid?.must_equal false + sappy1.save + sappy1.errors.keys.must_include :username end -end + + it "must have a unique username" do + sappy1.username = "sappy2" + sappy1.valid?.must_equal false + end + + it "must have an email address" do + sappy1.valid?.must_equal true + sappy1.email = nil + sappy1.valid?.must_equal false + sappy1.save + sappy1.errors.keys.must_include :email + end + + it "must have a unique email" do + sappy1.email = "sappy2@gmail.com" + sappy1.valid?.must_equal false + end + + it "must return the products of the merchant" do + sappy1.products.must_be_kind_of Enumerable + sappy1.products.each do |product| + product.must_be_kind_of Product + end + end + + + +end #describe merchant diff --git a/test/models/product_test.rb b/test/models/product_test.rb index 2e9ee765bf..aa490e17c9 100644 --- a/test/models/product_test.rb +++ b/test/models/product_test.rb @@ -1,4 +1,5 @@ require "test_helper" + #needs to write in two tests for scopes on the model describe Product do let(:product) { Product.new } From 078bd0b550b600845deb891bcc7a4b6c8f5b022f Mon Sep 17 00:00:00 2001 From: Victoria Sawchuk Date: Tue, 17 Oct 2017 15:53:53 -0700 Subject: [PATCH 018/300] * Update product seed * Add merchant seed --- db/seeds.rb | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/db/seeds.rb b/db/seeds.rb index f31044c100..955e0c2538 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -9,10 +9,13 @@ product.id = row['id'] product.name = row['name'] product.price = row['price'] + product.category = row['category'] + product.merchant_id = row['merchant_id'] + product.quantity = row['quantity'] puts "Created product: #{product.inspect}" successful = product.save if !successful - product_failures << driver + product_failures << product end end @@ -20,6 +23,27 @@ puts "#{product_failures.length} products failed to save" + +MERCHANT_FILE = Rails.root.join('db', 'merchant_seeds.csv') +puts "Loading raw merchant data from #{MERCHANT_FILE}" + +merchant_failures = [] +CSV.foreach(MERCHANT_FILE, :headers => true) do |row| + merchant = Merchant.new + merchant.id = row['id'] + merchant.username = row['username'] + merchant.email = row['email'] + puts "Created merchant: #{merchant.inspect}" + successful = merchant.save + if !successful + merchant_failures << merchant + end +end + +puts "Added #{Merchant.count} merchant records" +puts "#{merchant_failures.length} merchants failed to save" + + # Since we set the primary key (the ID) manually on each of the # tables, we've got to tell postgres to reload the latest ID # values. Otherwise when we create a new record it will try From c43ca8d9dcc7288f0db39b78805fba854605339d Mon Sep 17 00:00:00 2001 From: Victoria Sawchuk Date: Tue, 17 Oct 2017 16:07:29 -0700 Subject: [PATCH 019/300] Passing controller test for products#show action --- app/controllers/products_controller.rb | 3 ++ app/views/products/show.html.erb | 2 +- db/seeds.rb | 43 ++++++++++---------- test/controllers/products_controller_test.rb | 5 +-- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index c2a001721e..b3dfa14d79 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -6,6 +6,9 @@ def index end def show + unless @product + redirect_to root_path + end end def edit diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 67df92f0dd..658f167ec5 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -1 +1 @@ -

Product: <%=@product.name %>

+

<%=@product.name %>

diff --git a/db/seeds.rb b/db/seeds.rb index 955e0c2538..b2aba90e16 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,5 +1,27 @@ require 'csv' +MERCHANT_FILE = Rails.root.join('db', 'merchant_seeds.csv') +puts "Loading raw merchant data from #{MERCHANT_FILE}" + +merchant_failures = [] +CSV.foreach(MERCHANT_FILE, :headers => true) do |row| + merchant = Merchant.new + merchant.id = row['id'] + merchant.username = row['username'] + merchant.email = row['email'] + puts "Created merchant: #{merchant.inspect}" + successful = merchant.save + if !successful + merchant_failures << merchant + end +end + +puts "Added #{Merchant.count} merchant records" +puts "#{merchant_failures.length} merchants failed to save" + + + + PRODUCT_FILE = Rails.root.join('db', 'product_seeds.csv') puts "Loading raw product data from #{PRODUCT_FILE}" @@ -23,27 +45,6 @@ puts "#{product_failures.length} products failed to save" - -MERCHANT_FILE = Rails.root.join('db', 'merchant_seeds.csv') -puts "Loading raw merchant data from #{MERCHANT_FILE}" - -merchant_failures = [] -CSV.foreach(MERCHANT_FILE, :headers => true) do |row| - merchant = Merchant.new - merchant.id = row['id'] - merchant.username = row['username'] - merchant.email = row['email'] - puts "Created merchant: #{merchant.inspect}" - successful = merchant.save - if !successful - merchant_failures << merchant - end -end - -puts "Added #{Merchant.count} merchant records" -puts "#{merchant_failures.length} merchants failed to save" - - # Since we set the primary key (the ID) manually on each of the # tables, we've got to tell postgres to reload the latest ID # values. Otherwise when we create a new record it will try diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb index 237edcd84c..fb0da19532 100644 --- a/test/controllers/products_controller_test.rb +++ b/test/controllers/products_controller_test.rb @@ -1,8 +1,7 @@ require "test_helper" -let(:one) {products(:one)} - describe ProductsController do + let(:one) {products(:tree1)} it "must get the index view" do get products_path @@ -15,6 +14,6 @@ get product_path(-1) must_respond_with :redirect - must_redirect_to products_path + must_redirect_to root_path end end From 0093e7879177f054607ac05746acbdf7a0979775 Mon Sep 17 00:00:00 2001 From: Kayla Ecker Date: Tue, 17 Oct 2017 16:29:56 -0700 Subject: [PATCH 020/300] created orderitem, wrote tests for order, made a through table for orders and products --- app/assets/javascripts/orders.js | 2 ++ app/assets/stylesheets/orders.scss | 3 ++ app/controllers/orders_controller.rb | 19 +++++++++++ app/helpers/orders_helper.rb | 2 ++ app/models/order.rb | 5 +++ app/models/orderitem.rb | 4 +++ app/models/product.rb | 2 ++ app/views/orders/create.html.erb | 2 ++ app/views/orders/edit.html.erb | 2 ++ app/views/orders/index.html.erb | 2 ++ app/views/orders/new.html.erb | 2 ++ app/views/orders/show.html.erb | 2 ++ app/views/orders/update.html.erb | 2 ++ config/routes.rb | 1 + db/migrate/20171017224721_create_orders.rb | 19 +++++++++++ db/migrate/20171017225720_orderitem.rb | 10 ++++++ db/migrate/20171017230352_foreignkey.rb | 5 +++ db/migrate/20171017230402_foreignkey2.rb | 5 +++ .../20171017230819_create_orderitems.rb | 5 +++ db/schema.rb | 30 +++++++++++++++- test/controllers/orders_controller_test.rb | 34 +++++++++++++++++++ test/fixtures/orderitems.yml | 13 +++++++ test/fixtures/orders.yml | 27 +++++++++++++++ test/models/order_test.rb | 17 ++++++++++ test/models/orderitem_test.rb | 19 +++++++++++ 25 files changed, 233 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/orders.js create mode 100644 app/assets/stylesheets/orders.scss create mode 100644 app/controllers/orders_controller.rb create mode 100644 app/helpers/orders_helper.rb create mode 100644 app/models/order.rb create mode 100644 app/models/orderitem.rb create mode 100644 app/views/orders/create.html.erb create mode 100644 app/views/orders/edit.html.erb create mode 100644 app/views/orders/index.html.erb create mode 100644 app/views/orders/new.html.erb create mode 100644 app/views/orders/show.html.erb create mode 100644 app/views/orders/update.html.erb create mode 100644 db/migrate/20171017224721_create_orders.rb create mode 100644 db/migrate/20171017225720_orderitem.rb create mode 100644 db/migrate/20171017230352_foreignkey.rb create mode 100644 db/migrate/20171017230402_foreignkey2.rb create mode 100644 db/migrate/20171017230819_create_orderitems.rb create mode 100644 test/controllers/orders_controller_test.rb create mode 100644 test/fixtures/orderitems.yml create mode 100644 test/fixtures/orders.yml create mode 100644 test/models/order_test.rb create mode 100644 test/models/orderitem_test.rb diff --git a/app/assets/javascripts/orders.js b/app/assets/javascripts/orders.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/orders.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/orders.scss b/app/assets/stylesheets/orders.scss new file mode 100644 index 0000000000..3b0428a94e --- /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: http://sass-lang.com/ diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb new file mode 100644 index 0000000000..c684e94789 --- /dev/null +++ b/app/controllers/orders_controller.rb @@ -0,0 +1,19 @@ +class OrdersController < ApplicationController + def index + end + + def create + end + + def new + end + + def edit + end + + def update + end + + def show + end +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/app/models/order.rb b/app/models/order.rb new file mode 100644 index 0000000000..1914e42b8f --- /dev/null +++ b/app/models/order.rb @@ -0,0 +1,5 @@ +class Order < ApplicationRecord + has_many :orderitems + has_many :products, :through => :orderitems + +end diff --git a/app/models/orderitem.rb b/app/models/orderitem.rb new file mode 100644 index 0000000000..ab4246db25 --- /dev/null +++ b/app/models/orderitem.rb @@ -0,0 +1,4 @@ +class Orderitem < ApplicationRecord + belongs_to :product + belongs_to :order +end diff --git a/app/models/product.rb b/app/models/product.rb index 0177c9a220..abdbad2ef2 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -1,5 +1,7 @@ class Product < ApplicationRecord belongs_to :merchant + has_many :orderitems + has_many :orders, :through => :orderitems validates :name, presence: true validates :name, uniqueness: true diff --git a/app/views/orders/create.html.erb b/app/views/orders/create.html.erb new file mode 100644 index 0000000000..295bd84094 --- /dev/null +++ b/app/views/orders/create.html.erb @@ -0,0 +1,2 @@ +

Orders#create

+

Find me in app/views/orders/create.html.erb

diff --git a/app/views/orders/edit.html.erb b/app/views/orders/edit.html.erb new file mode 100644 index 0000000000..7de9049bee --- /dev/null +++ b/app/views/orders/edit.html.erb @@ -0,0 +1,2 @@ +

Orders#edit

+

Find me in app/views/orders/edit.html.erb

diff --git a/app/views/orders/index.html.erb b/app/views/orders/index.html.erb new file mode 100644 index 0000000000..d63a69fb54 --- /dev/null +++ b/app/views/orders/index.html.erb @@ -0,0 +1,2 @@ +

Orders#index

+

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

diff --git a/app/views/orders/new.html.erb b/app/views/orders/new.html.erb new file mode 100644 index 0000000000..1bc27609ce --- /dev/null +++ b/app/views/orders/new.html.erb @@ -0,0 +1,2 @@ +

Orders#new

+

Find me in app/views/orders/new.html.erb

diff --git a/app/views/orders/show.html.erb b/app/views/orders/show.html.erb new file mode 100644 index 0000000000..22eb495f6f --- /dev/null +++ b/app/views/orders/show.html.erb @@ -0,0 +1,2 @@ +

Orders#show

+

Find me in app/views/orders/show.html.erb

diff --git a/app/views/orders/update.html.erb b/app/views/orders/update.html.erb new file mode 100644 index 0000000000..21caac1f70 --- /dev/null +++ b/app/views/orders/update.html.erb @@ -0,0 +1,2 @@ +

Orders#update

+

Find me in app/views/orders/update.html.erb

diff --git a/config/routes.rb b/config/routes.rb index 55fbb50f72..d6815dd305 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,5 +4,6 @@ resources :products, :except => [:delete] resources :merchants, :except => [:delete] + resources :orders, :except => [:delete] end diff --git a/db/migrate/20171017224721_create_orders.rb b/db/migrate/20171017224721_create_orders.rb new file mode 100644 index 0000000000..a20744ec30 --- /dev/null +++ b/db/migrate/20171017224721_create_orders.rb @@ -0,0 +1,19 @@ +class CreateOrders < ActiveRecord::Migration[5.1] + def change + create_table :orders do |t| + t.string :customer_email + t.string :address1 + t.string :address2 + t.string :city + t.string :state + t.integer :zipcode + t.string :cc_name + t.integer :cc_number + t.string :cc_expiration + t.integer :cc_security + t.integer :billingzip + + t.timestamps + end + end +end diff --git a/db/migrate/20171017225720_orderitem.rb b/db/migrate/20171017225720_orderitem.rb new file mode 100644 index 0000000000..3ec5415039 --- /dev/null +++ b/db/migrate/20171017225720_orderitem.rb @@ -0,0 +1,10 @@ +class Orderitem < ActiveRecord::Migration[5.1] + def change + create_table :orderitems do |t| + t.belongs_to :order, index: true + t.belongs_to :product, index: true + t.integer :quantity + t.timestamps + end + end +end diff --git a/db/migrate/20171017230352_foreignkey.rb b/db/migrate/20171017230352_foreignkey.rb new file mode 100644 index 0000000000..3bb20329c7 --- /dev/null +++ b/db/migrate/20171017230352_foreignkey.rb @@ -0,0 +1,5 @@ +class Foreignkey < ActiveRecord::Migration[5.1] + def change + add_foreign_key :orderitems, :orders + end +end diff --git a/db/migrate/20171017230402_foreignkey2.rb b/db/migrate/20171017230402_foreignkey2.rb new file mode 100644 index 0000000000..e64b250dca --- /dev/null +++ b/db/migrate/20171017230402_foreignkey2.rb @@ -0,0 +1,5 @@ +class Foreignkey2 < ActiveRecord::Migration[5.1] + def change + add_foreign_key :orderitems, :products + end +end diff --git a/db/migrate/20171017230819_create_orderitems.rb b/db/migrate/20171017230819_create_orderitems.rb new file mode 100644 index 0000000000..6e5bf7aac8 --- /dev/null +++ b/db/migrate/20171017230819_create_orderitems.rb @@ -0,0 +1,5 @@ +class CreateOrderitems < ActiveRecord::Migration[5.1] + def change + + end +end diff --git a/db/schema.rb b/db/schema.rb index 739529991a..412b7ee204 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: 20171017210543) do +ActiveRecord::Schema.define(version: 20171017230819) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -22,6 +22,32 @@ t.datetime "updated_at", null: false end + create_table "orderitems", force: :cascade do |t| + t.bigint "order_id" + t.bigint "product_id" + t.integer "quantity" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["order_id"], name: "index_orderitems_on_order_id" + t.index ["product_id"], name: "index_orderitems_on_product_id" + end + + create_table "orders", force: :cascade do |t| + t.string "customer_email" + t.string "address1" + t.string "address2" + t.string "city" + t.string "state" + t.integer "zipcode" + t.string "cc_name" + t.integer "cc_number" + t.string "cc_expiration" + t.integer "cc_security" + t.integer "billingzip" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "products", force: :cascade do |t| t.string "name" t.integer "price" @@ -33,5 +59,7 @@ t.index ["merchant_id"], name: "index_products_on_merchant_id" end + add_foreign_key "orderitems", "orders" + add_foreign_key "orderitems", "products" add_foreign_key "products", "merchants" end diff --git a/test/controllers/orders_controller_test.rb b/test/controllers/orders_controller_test.rb new file mode 100644 index 0000000000..b255d89659 --- /dev/null +++ b/test/controllers/orders_controller_test.rb @@ -0,0 +1,34 @@ +require "test_helper" + +describe OrdersController do + it "should get index" do + get orders_index_url + value(response).must_be :success? + end + + it "should get create" do + get orders_create_url + value(response).must_be :success? + end + + it "should get new" do + get orders_new_url + value(response).must_be :success? + end + + it "should get edit" do + get orders_edit_url + value(response).must_be :success? + end + + it "should get update" do + get orders_update_url + value(response).must_be :success? + end + + it "should get show" do + get orders_show_url + value(response).must_be :success? + end + +end diff --git a/test/fixtures/orderitems.yml b/test/fixtures/orderitems.yml new file mode 100644 index 0000000000..5c80e4c825 --- /dev/null +++ b/test/fixtures/orderitems.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: + quantity: 1 + order: one + product: tree1 + +# column: value +# diff --git a/test/fixtures/orders.yml b/test/fixtures/orders.yml new file mode 100644 index 0000000000..f270ff8e1a --- /dev/null +++ b/test/fixtures/orders.yml @@ -0,0 +1,27 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + customer_email: MyString + address1: MyString + address2: MyString + city: MyString + state: MyString + zipcode: 1 + cc_name: MyString + cc_number: 1 + cc_expiration: MyString + cc_security: 1 + billingzip: 1 + +two: + customer_email: MyString + address1: MyString + address2: MyString + city: MyString + state: MyString + zipcode: 1 + cc_name: MyString + cc_number: 1 + cc_expiration: MyString + cc_security: 1 + billingzip: 1 diff --git a/test/models/order_test.rb b/test/models/order_test.rb new file mode 100644 index 0000000000..310c8eddf3 --- /dev/null +++ b/test/models/order_test.rb @@ -0,0 +1,17 @@ +require "test_helper" + +describe Order do + let(:one) { orders(:one) } + + it "must have one or more order items" do + one.orderitems.each do |o| + o.must_be_kind_of Orderitem + end + end + + it "can access products in the order" do + one.products.each do |o| + o.must_be_kind_of Product + end + end +end diff --git a/test/models/orderitem_test.rb b/test/models/orderitem_test.rb new file mode 100644 index 0000000000..4eda379d53 --- /dev/null +++ b/test/models/orderitem_test.rb @@ -0,0 +1,19 @@ +require "test_helper" + +describe Orderitem do + let(:one) { orderitems(:one) } + + it "has an order" do + one.order.must_be_kind_of Order + end + + it "has a product" do + one.product.must_be_kind_of Product + end + + + + + + +end From 39fedc0793921a55a521f0ef85b25b4be102d6d5 Mon Sep 17 00:00:00 2001 From: Kayla Ecker Date: Tue, 17 Oct 2017 16:44:20 -0700 Subject: [PATCH 021/300] completed model testing for orderitem --- app/models/orderitem.rb | 5 +++++ test/models/orderitem_test.rb | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/app/models/orderitem.rb b/app/models/orderitem.rb index ab4246db25..149942666a 100644 --- a/app/models/orderitem.rb +++ b/app/models/orderitem.rb @@ -1,4 +1,9 @@ class Orderitem < ApplicationRecord belongs_to :product belongs_to :order + + validates :quantity, presence: true + validates :quantity, numericality: { greater_than: 0 } + validates :quantity, numericality: { only_integer: true } + end diff --git a/test/models/orderitem_test.rb b/test/models/orderitem_test.rb index 4eda379d53..f0bd1de520 100644 --- a/test/models/orderitem_test.rb +++ b/test/models/orderitem_test.rb @@ -8,11 +8,44 @@ end it "has a product" do - one.product.must_be_kind_of Product + one.product.must_be_kind_of Product end + it "quantity must be present" do + one.valid?.must_equal true + one.quantity = nil + one.valid?.must_equal false + end + + it "quantity must be an integer" do + one.valid?.must_equal true + one.quantity = 4.5 + one.valid?.must_equal false + one.quantity = "treehouse" + one.valid?.must_equal false + end + it "must be quantity greater than 0" do + one.valid?.must_equal true + one.quantity = 1 + one.valid?.must_equal true + one.quantity = 0 + one.valid?.must_equal false + one.quantity = -1 + one.valid?.must_equal false + end + it "must have a product" do + one.valid?.must_equal true + one.product = nil + one.valid?.must_equal false + end + + it "must have an order" do + one.valid?.must_equal true + one.order = nil + one.valid?.must_equal false + end From 7974846d70a46883c939119d5c821ffec6c90379 Mon Sep 17 00:00:00 2001 From: Victoria Sawchuk Date: Tue, 17 Oct 2017 16:45:01 -0700 Subject: [PATCH 022/300] * Allow users to filter products by category on the homepage * Change product price from integer to float * Add get_products method to product model for index action --- app/controllers/products_controller.rb | 2 +- app/models/product.rb | 8 ++++++++ app/views/products/index.html.erb | 5 +++++ app/views/products/show.html.erb | 3 ++- .../20171017231027_update_products_price_to_integer.rb | 5 +++++ db/schema.rb | 4 ++-- 6 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20171017231027_update_products_price_to_integer.rb diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index b3dfa14d79..1b20d7e344 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -2,7 +2,7 @@ class ProductsController < ApplicationController before_action :find_product, only: [:show, :edit, :update, :destroy] def index - @products = Product.all + @products = Product.get_products(a_category: params[:category]) end def show diff --git a/app/models/product.rb b/app/models/product.rb index 0177c9a220..5929991ffa 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -8,4 +8,12 @@ class Product < ApplicationRecord validates :price, numericality: { only_float: true } #may need to include integers as well validates :merchant_id, presence: true + + def self.get_products(a_category: "all") + if ["all", nil].include?(a_category) + return Product.all + else + return Product.where(category: a_category) + end + end end diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index b64b4ecfe3..d94a199fcc 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -1,4 +1,9 @@

Treebay Products

+<%= form_tag(root_path, method: :get) do %> + <%= label_tag(:category, "Category") %> + <%= select_tag "category", options_for_select(["all", "indoor", "outdoor"], ["all"] ) %> + <%= submit_tag("Submit", class: "button") %> +<% end %>