From b4fba4045e0dee5cbfa554814a4d8c68e2c16515 Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Tue, 10 Oct 2017 14:57:25 -0700 Subject: [PATCH 01/36] Initial Rails setup --- .gitignore | 19 ++ Gemfile | 66 ++++++ Gemfile.lock | 222 ++++++++++++++++++ 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, 1291 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..c1fe47650e --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,222 @@ +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.3.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.8.6) + 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.3 diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000000..e85f913914 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 0000000000..b16e53d6d5 --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css diff --git a/app/assets/images/.keep b/app/assets/images/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js new file mode 100644 index 0000000000..46b20359fa --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,15 @@ +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's +// vendor/assets/javascripts directory can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// compiled file. JavaScript code in this file should be added after the last require_* statement. +// +// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details +// about supported directives. +// +//= require rails-ujs +//= require turbolinks +//= require_tree . diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js new file mode 100644 index 0000000000..739aa5f022 --- /dev/null +++ b/app/assets/javascripts/cable.js @@ -0,0 +1,13 @@ +// Action Cable provides the framework to deal with WebSockets in Rails. +// You can generate new channels where WebSocket features live using the `rails generate channel` command. +// +//= require action_cable +//= require_self +//= require_tree ./channels + +(function() { + this.App || (this.App = {}); + + App.cable = ActionCable.createConsumer(); + +}).call(this); diff --git a/app/assets/javascripts/channels/.keep b/app/assets/javascripts/channels/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css new file mode 100644 index 0000000000..d05ea0f511 --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,15 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's + * vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS + * files in this directory. Styles in this file should be added after the last require_* statement. + * It is generally better to create a new file per style scope. + * + *= require_tree . + *= require_self + */ diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 0000000000..d672697283 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 0000000000..0ff5442f47 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 0000000000..1c07694e9d --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,3 @@ +class ApplicationController < ActionController::Base + protect_from_forgery with: :exception +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb new file mode 100644 index 0000000000..de6be7945c --- /dev/null +++ b/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 0000000000..a009ace51c --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 0000000000..286b2239d1 --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 0000000000..10a4cba84d --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 0000000000..6af511b830 --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,14 @@ + + + + MediaRanker + <%= 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..e73bab908f --- /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 MediaRanker + 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..3a27f13933 --- /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: MediaRanker_production diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 0000000000..0bd2511123 --- /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: MediaRanker_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: MediaRanker + + # 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: MediaRanker_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: MediaRanker_production + username: MediaRanker + password: <%= ENV['MEDIARANKER_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..d242dac65c --- /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 = "MediaRanker_#{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..a6913be87e --- /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: 863601d48c427168ebe3e60292882974850909d716fe4aeb8871a9c20b40ea55d3314b6fc36dc29c40ba5e594b7eca79c0c8e29003eac185f29df0fe51d2a5a1 + +test: + secret_key_base: 88c8696a87a5fb419a5afecc504fb2b795ac0c08a5f3a2e116c07801e1630c5ef9e50b12e45869bd18bffae03b6933a3b5dfc982f096ef4bdc4c4a31a2be0e1f + +# 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..625900f9d8 --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "name": "MediaRanker", + "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 b7cec92df26eb7491b0ca068c6bcda4660e137e5 Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Tue, 10 Oct 2017 18:02:07 -0700 Subject: [PATCH 02/36] Seeded database, set up Works model, controller, and views --- app/assets/javascripts/works.js | 2 + app/assets/stylesheets/application.css | 48 +++++++++ app/assets/stylesheets/works.scss | 3 + app/controllers/works_controller.rb | 30 ++++++ app/helpers/works_helper.rb | 2 + app/models/work.rb | 2 + app/views/works/_form.html.erb | 33 ++++++ app/views/works/create.html.erb | 2 + app/views/works/destroy.html.erb | 2 + app/views/works/edit.html.erb | 2 + app/views/works/index.html.erb | 116 ++++++++++++++++++++++ app/views/works/main.html.erb | 15 +++ app/views/works/new.html.erb | 3 + app/views/works/show.html.erb | 2 + app/views/works/update.html.erb | 2 + config/routes.rb | 17 ++++ db/migrate/20171010225926_create_works.rb | 13 +++ db/schema.rb | 28 ++++++ db/seeds.rb | 24 +++++ test/controllers/works_controller_test.rb | 39 ++++++++ test/fixtures/works.yml | 15 +++ test/models/work_test.rb | 9 ++ 22 files changed, 409 insertions(+) create mode 100644 app/assets/javascripts/works.js create mode 100644 app/assets/stylesheets/works.scss create mode 100644 app/controllers/works_controller.rb create mode 100644 app/helpers/works_helper.rb create mode 100644 app/models/work.rb create mode 100644 app/views/works/_form.html.erb create mode 100644 app/views/works/create.html.erb create mode 100644 app/views/works/destroy.html.erb create mode 100644 app/views/works/edit.html.erb create mode 100644 app/views/works/index.html.erb create mode 100644 app/views/works/main.html.erb create mode 100644 app/views/works/new.html.erb create mode 100644 app/views/works/show.html.erb create mode 100644 app/views/works/update.html.erb create mode 100644 db/migrate/20171010225926_create_works.rb create mode 100644 db/schema.rb create mode 100644 test/controllers/works_controller_test.rb create mode 100644 test/fixtures/works.yml create mode 100644 test/models/work_test.rb diff --git a/app/assets/javascripts/works.js b/app/assets/javascripts/works.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/works.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/application.css b/app/assets/stylesheets/application.css index d05ea0f511..7cc8103a49 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -13,3 +13,51 @@ *= require_tree . *= require_self */ + +input[type="submit"] { + display: inline-block; + vertical-align: middle; + margin: 0 0 1rem 0; + padding: 0.85em 1em; + -webkit-appearance: none; + border: 1px solid transparent; + border-radius: 0; + transition: background-color 0.25s ease-out, color 0.25s ease-out; + font-size: 0.9rem; + line-height: 1; + text-align: center; + cursor: pointer; + background-color: #26A69A; + color: #fefefe; + width: 112px; + } + + input, #work_category { + height: 2.4375rem; + margin: 0 0 1rem; + padding: 0.5rem; + appearance: none; + border: 1px solid #cacaca; + border-radius: 0; + background-color: #fefefe; + font-family: inherit; + font-size: 1rem; + line-height: normal; + color: #0a0a0a; + background-origin: content-box; + background-position: right -1rem center; + background-repeat: no-repeat; + background-size: 9px 6px; + padding-right: 1.5rem; + transition: box-shadow 0.5s, border-color 0.25s ease-in-out; + width: 100%; + } + + + body { + font-family: sans-serif; + } + + h3 { + color: #26A69A; + } diff --git a/app/assets/stylesheets/works.scss b/app/assets/stylesheets/works.scss new file mode 100644 index 0000000000..8c84be8c43 --- /dev/null +++ b/app/assets/stylesheets/works.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the works 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/works_controller.rb b/app/controllers/works_controller.rb new file mode 100644 index 0000000000..556027e36b --- /dev/null +++ b/app/controllers/works_controller.rb @@ -0,0 +1,30 @@ +class WorksController < ApplicationController + def index + @works = Work.all + end + + def create + end + + def new + @work = Work.new + end + + def edit + end + + def show + @work = Work.find_by(id: params[:id]) + # @votes = @work.votes.order(:created_at) + end + + def update + end + + def destroy + end + + def main + @works= Work.all + end +end diff --git a/app/helpers/works_helper.rb b/app/helpers/works_helper.rb new file mode 100644 index 0000000000..ccb78c2b73 --- /dev/null +++ b/app/helpers/works_helper.rb @@ -0,0 +1,2 @@ +module WorksHelper +end diff --git a/app/models/work.rb b/app/models/work.rb new file mode 100644 index 0000000000..95322dd45e --- /dev/null +++ b/app/models/work.rb @@ -0,0 +1,2 @@ +class Work < ApplicationRecord +end diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb new file mode 100644 index 0000000000..5fdf612ff3 --- /dev/null +++ b/app/views/works/_form.html.erb @@ -0,0 +1,33 @@ +<% if @work.errors.any? %> + +<% end %> + +<%= form_for @work do |f| %> + + <%= f.label "Category" %> + <%= f.select :category, [['album', 1], ['book', 2], ['movie', 3]] %> + + <%= f.label "Title" %> + <%= f.text_field :title , :required => true %> + + <%= f.label "Creator" %> + <%= f.text_field :creator %> + + <%= f.label "Publication year" %> + <%= f.text_field :publication_year %> + + <%= f.label "Description" %> + <%= f.text_field :description %> + + + + + + <%= f.submit button_text%> +<% end %> diff --git a/app/views/works/create.html.erb b/app/views/works/create.html.erb new file mode 100644 index 0000000000..5bc7fb6058 --- /dev/null +++ b/app/views/works/create.html.erb @@ -0,0 +1,2 @@ +

Works#create

+

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

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

Works#destroy

+

Find me in app/views/works/destroy.html.erb

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

Works#edit

+

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

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

List of works

+ + + +<% work_headers = ["Votes", "Title", "Created By", "Published", "Upvote"] %> + +<% if @works.count < 1 %> +

+ No media yet +

+<% end %> + +<% albums = @works.where(category: "album")%> +
+

Albums

+ + + <% work_headers.each do |header| %> + + <% end %> + + <% albums.each do |album| %> + + <% work_headers.each do |key| %> + + <% end %> + + <% end %> +
<%= header %>
+ <% if key == "Votes" %> + <%= "This will be # of votes" %> + <% elsif key == "Title" %> + <%= "#{album.title}" %> + <% elsif key == "Created By" %> + <%= "#{album.creator}"%> + <% elsif key == "Published" %> + <%= "#{album.publication_year}" %> + <% elsif key == "Upvote" %> + <%= "This will be a button" %> + <% end %> +
+
+ +<% books = @works.where(category: "book")%> + +
+

Books

+ + + <% work_headers.each do |header| %> + + <% end %> + + <% books.each do |book| %> + + <% work_headers.each do |key| %> + + <% end %> + + <% end %> +
<%= header %>
+ <% if key == "Votes" %> + <%= "This will be # of votes" %> + <% elsif key == "Title" %> + <%= "#{book.title}" %> + <% elsif key == "Created By" %> + <%= "#{book.creator}"%> + <% elsif key == "Published" %> + <%= "#{book.publication_year}" %> + <% elsif key == "Upvote" %> + <%= "This will be a button" %> + <% end %> +
+
+ +<% movies = @works.where(category: "movie")%> + +
+

Movies

+ + + <% work_headers.each do |header| %> + + <% end %> + + <% movies.each do |movie| %> + + <% work_headers.each do |key| %> + + <% end %> + + <% end %> +
<%= header %>
+ <% if key == "Votes" %> + <%= "This will be # of votes" %> + <% elsif key == "Title" %> + <%= "#{movie.title}" %> + <% elsif key == "Created By" %> + <%= "#{movie.creator}"%> + <% elsif key == "Published" %> + <%= "#{movie.publication_year}" %> + <% elsif key == "Upvote" %> + <%= "This will be a button" %> + <% end %> +
+ +
+ + + diff --git a/app/views/works/main.html.erb b/app/views/works/main.html.erb new file mode 100644 index 0000000000..356584f9fa --- /dev/null +++ b/app/views/works/main.html.erb @@ -0,0 +1,15 @@ +
+

Media Spotlight:

+
+ +
+

Top Movies

+
+ +
+

Top Books

+
+ +
+

Top Albums

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

Add a new work

+ +<%= render partial: 'form', locals: {button_text: 'Create Work'}%> diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb new file mode 100644 index 0000000000..c096804302 --- /dev/null +++ b/app/views/works/show.html.erb @@ -0,0 +1,2 @@ +

Works#show

+

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

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

Works#update

+

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

diff --git a/config/routes.rb b/config/routes.rb index 787824f888..c8961eb95a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,20 @@ Rails.application.routes.draw do + get 'works/', to: 'works#index', as: 'works' #works_path + + get 'works/:id/edit', to: 'works#edit', as: 'edit_work' #edit_work_path + + get 'works/new', to: 'works#new', as: 'new_work' #new_work_path + + get 'works/:id', to: 'works#show', as: 'work' #work_path + + patch 'works/:id', to: 'works#update', as: 'update_work' #update_work_path + + post 'works/', to: 'works#create', as: 'create_work' #create_work_path + + delete 'works/:id', to: 'works#destroy', as: 'delete_work' #delete_work_path + + root to: 'works#main', as: 'root' #root_path + + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/db/migrate/20171010225926_create_works.rb b/db/migrate/20171010225926_create_works.rb new file mode 100644 index 0000000000..06fccc4838 --- /dev/null +++ b/db/migrate/20171010225926_create_works.rb @@ -0,0 +1,13 @@ +class CreateWorks < ActiveRecord::Migration[5.1] + def change + create_table :works do |t| + t.string :category + t.string :title + t.string :creator + t.string :publication_year + t.string :description + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000000..fbee8c9383 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,28 @@ +# 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: 20171010225926) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "works", force: :cascade do |t| + t.string "category" + t.string "title" + t.string "creator" + t.string "publication_year" + t.string "description" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/db/seeds.rb b/db/seeds.rb index 1beea2accd..4e9d6dc651 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,3 +5,27 @@ # # movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) # Character.create(name: 'Luke', movie: movies.first) + +require 'csv' + +WORK_FILE = Rails.root.join('db','media_seeds.csv') +puts "Loading raw works data from #{WORK_FILE}" + +work_failures = [] +CSV.foreach(WORK_FILE, :headers => true) do |row| + work = Work.new + work.id = row['id'] + work.category = row['category'] + work.title = row['title'] + work.creator = row['creator'] + work.publication_year = row['publication_year'] + work.description = row['description'] + puts "Created work: #{work.inspect}" + successful = work.save + if !successful + work_failures << work + end +end + +puts "Added #{Work.count} work records" +puts "#{work_failures.length} works failed to save" diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb new file mode 100644 index 0000000000..cf2fd82095 --- /dev/null +++ b/test/controllers/works_controller_test.rb @@ -0,0 +1,39 @@ +require "test_helper" + +describe WorksController do + it "should get index" do + get works_index_url + value(response).must_be :success? + end + + it "should get create" do + get works_create_url + value(response).must_be :success? + end + + it "should get new" do + get works_new_url + value(response).must_be :success? + end + + it "should get edit" do + get works_edit_url + value(response).must_be :success? + end + + it "should get show" do + get works_show_url + value(response).must_be :success? + end + + it "should get update" do + get works_update_url + value(response).must_be :success? + end + + it "should get destroy" do + get works_destroy_url + value(response).must_be :success? + end + +end diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml new file mode 100644 index 0000000000..a9ccb09ba2 --- /dev/null +++ b/test/fixtures/works.yml @@ -0,0 +1,15 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + category: MyString + title: MyString + creator: MyString + publication_year: MyString + description: MyString + +two: + category: MyString + title: MyString + creator: MyString + publication_year: MyString + description: MyString diff --git a/test/models/work_test.rb b/test/models/work_test.rb new file mode 100644 index 0000000000..f6fba7104d --- /dev/null +++ b/test/models/work_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Work do + let(:work) { Work.new } + + it "must be valid" do + value(work).must_be :valid? + end +end From e519361e41315b86aef60e8dc6a519e9f42cf36b Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Wed, 11 Oct 2017 16:14:30 -0700 Subject: [PATCH 03/36] Added fixtures for testing, added validations for title presence and uniqueness to the Work model, tested validations for Work model --- app/assets/stylesheets/application.css | 9 +++- app/controllers/works_controller.rb | 15 ++++++ app/models/work.rb | 1 + app/views/layouts/application.html.erb | 5 ++ app/views/works/_form.html.erb | 2 +- test/controllers/works_controller_test.rb | 64 +++++++++++++++-------- test/fixtures/works.yml | 31 ++++++----- test/models/work_test.rb | 45 ++++++++++++++-- 8 files changed, 133 insertions(+), 39 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 7cc8103a49..d668d88fed 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -32,7 +32,7 @@ input[type="submit"] { width: 112px; } - input, #work_category { + input, #work_category, textarea { height: 2.4375rem; margin: 0 0 1rem; padding: 0.5rem; @@ -55,9 +55,14 @@ input[type="submit"] { body { - font-family: sans-serif; + font-family: "Gudea", sans-serif; } +/*@media print, screen and (min-width: 40em) h3 { + font-size: 1.9375rem; +}*/ h3 { color: #26A69A; + font-weight: bold; + font-size: 1.9375rem; } diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 556027e36b..616527957b 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -4,6 +4,13 @@ def index end def create + @new_work = Work.new work_params + + if @new_work.save + redirect_to work_path(@new_work.id) + else + render :new + end end def new @@ -27,4 +34,12 @@ def destroy def main @works= Work.all end + + private + + def work_params + return params.require(:work).permit(:category, :title, :creator, :publication_year, :description) + end + + end diff --git a/app/models/work.rb b/app/models/work.rb index 95322dd45e..adb64724ca 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,2 +1,3 @@ class Work < ApplicationRecord + validates :title, presence: true, uniqueness: {scope: :category, message: "There is already a Work of this category with this title " } end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 6af511b830..60a9563849 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,6 +9,11 @@ +
+ <% flash.each do |name, message| %> +
<%= message %>
+ <% end %> +
<%= yield %> diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb index 5fdf612ff3..c953f6d814 100644 --- a/app/views/works/_form.html.erb +++ b/app/views/works/_form.html.erb @@ -23,7 +23,7 @@ <%= f.text_field :publication_year %> <%= f.label "Description" %> - <%= f.text_field :description %> + <%= f.text_area :description %> diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index cf2fd82095..b8b329fceb 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -1,39 +1,61 @@ require "test_helper" describe WorksController do - it "should get index" do - get works_index_url - value(response).must_be :success? + it "should be able to visit the All Works (index) page" do + + get works_path + + must_respond_with :success + end - it "should get create" do - get works_create_url - value(response).must_be :success? + it " pulls up the main top ten page" do + get root_path + + must_respond_with :success end - it "should get new" do - get works_new_url - value(response).must_be :success? + it "should be able to visit a work's detail page" do + #Arrange + + #Act + get work_path(works(:book_one).id) + + #Assert + must_respond_with :success end - it "should get edit" do - get works_edit_url - value(response).must_be :success? + it "should be able to successfully create a new work" do + + proc { + post works_path, params: { work: {category: "album", title: "Por Vida", creator: "Kali Uchis", publication_year: "2015", description: "Kali's debut EP"} } + }.must_change 'Work.count', 1 + + + must_respond_with :redirect + must_redirect_to work_path(Work.find_by(title: "Por Vida").id) + end - it "should get show" do - get works_show_url - value(response).must_be :success? + it "should redirect to the new work's detail page if it is created successfully" do + + end - it "should get update" do - get works_update_url - value(response).must_be :success? + it "should stay on the add work page and display the error message banner if we are unsuccessful in creating or updating a work" do + + end + + it "should be able to update a work" do + end - it "should get destroy" do - get works_destroy_url - value(response).must_be :success? + it "should redirect to the show page if updated successfuly" do + + end + + it "renders to the same page if unsucessful create or update" do + end end diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index a9ccb09ba2..120576b184 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -1,15 +1,22 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - category: MyString - title: MyString - creator: MyString - publication_year: MyString - description: MyString +album_one: + category: album + title: 6 Feet Beneath the Moon + creator: King Krule + publication_year: "2013" + description: King Krule's first major studio release -two: - category: MyString - title: MyString - creator: MyString - publication_year: MyString - description: MyString +book_one: + category: book + title: Suddenly, a Knock on the Door + creator: Etgar Keret + publication_year: "2012" + description: Keret's latest book + +movie_one: + category: movie + title: Rosemary's Baby + creator: Roman Polanski + publication_year: "1968" + description: Horror classic diff --git a/test/models/work_test.rb b/test/models/work_test.rb index f6fba7104d..ace6f301dc 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -1,9 +1,48 @@ require "test_helper" describe Work do - let(:work) { Work.new } + describe 'validations' do + let(:work) { Work.new } - it "must be valid" do - value(work).must_be :valid? + # it "must be valid" do + # value(work).must_be :valid? + # end + + it "is invalid without a title" do + result = work.valid? + result.must_equal false + + work.errors.messages.must_include :title + end + + end + + describe 'creating a new Work' do + it "requires only a title to create a new Work" do + work = Work.new + + work.valid?.must_equal false + + work.title = "New Work" + + work.valid?.must_equal true + end + + it "raises an error if there is a Work that has the same category AND same title" do + existing_book = works(:book_one) + new_book_same_title = Work.new(category: existing_book.category, title: existing_book.title) + + new_book_same_title.valid?.must_equal false + + new_book_same_title.errors.must_include :title + end + + it "allows you to create a new Work that has the same title of a Work in a different category" do + book_with_title = works(:book_one) + album_with_same_title = Work.new(category: "album", title: book_with_title.title) + + album_with_same_title.valid?.must_equal true + end end + end From 4ec6e419d0b123d45235e21916fd5afb61c4449d Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Wed, 11 Oct 2017 16:16:55 -0700 Subject: [PATCH 04/36] moved tests for creating a new work to the Work Controller tests --- test/controllers/works_controller_test.rb | 30 ++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index b8b329fceb..456d443425 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -44,7 +44,7 @@ it "should stay on the add work page and display the error message banner if we are unsuccessful in creating or updating a work" do - end + end it "should be able to update a work" do @@ -58,4 +58,32 @@ end + describe 'creating a new Work' do + it "requires only a title to create a new Work" do + work = Work.new + + work.valid?.must_equal false + + work.title = "New Work" + + work.valid?.must_equal true + end + + it "raises an error if there is a Work that has the same category AND same title" do + existing_book = works(:book_one) + new_book_same_title = Work.new(category: existing_book.category, title: existing_book.title) + + new_book_same_title.valid?.must_equal false + + new_book_same_title.errors.must_include :title + end + + it "allows you to create a new Work that has the same title of a Work in a different category" do + book_with_title = works(:book_one) + album_with_same_title = Work.new(category: "album", title: book_with_title.title) + + album_with_same_title.valid?.must_equal true + end + end + end From c04944e6b508fdc0cbc9990f0553f2b5b686bbd3 Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Wed, 11 Oct 2017 16:41:31 -0700 Subject: [PATCH 05/36] updated select field to assign the appropriate category value for each new Work created/updated --- app/views/works/_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb index c953f6d814..13e58b5a2a 100644 --- a/app/views/works/_form.html.erb +++ b/app/views/works/_form.html.erb @@ -11,7 +11,7 @@ <%= form_for @work do |f| %> <%= f.label "Category" %> - <%= f.select :category, [['album', 1], ['book', 2], ['movie', 3]] %> + <%= f.select :category, [['album', 'album'], ['book', 'book'], ['movie', 'movie']] %> <%= f.label "Title" %> <%= f.text_field :title , :required => true %> From f6e14aa4a1b743851b11429aef1bc55fd7c0c727 Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Wed, 11 Oct 2017 17:22:54 -0700 Subject: [PATCH 06/36] Can create a new work and show a Success Flash when it saves, tested valid creations only --- app/assets/stylesheets/application.css | 5 ++ app/controllers/works_controller.rb | 1 + test/controllers/works_controller_test.rb | 59 ++++++++++++----------- test/models/work_test.rb | 20 ++------ 4 files changed, 43 insertions(+), 42 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index d668d88fed..71808eb368 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -66,3 +66,8 @@ input[type="submit"] { font-weight: bold; font-size: 1.9375rem; } + + .flash .success { + background-color: lightgreen; + display:block; + } diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 616527957b..15ee3be32b 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -7,6 +7,7 @@ def create @new_work = Work.new work_params if @new_work.save + flash[:success] = "Successfully created #{@new_work.category} #{@new_work.id}" redirect_to work_path(@new_work.id) else render :new diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index 456d443425..e7580bac64 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -25,22 +25,6 @@ must_respond_with :success end - it "should be able to successfully create a new work" do - - proc { - post works_path, params: { work: {category: "album", title: "Por Vida", creator: "Kali Uchis", publication_year: "2015", description: "Kali's debut EP"} } - }.must_change 'Work.count', 1 - - - must_respond_with :redirect - must_redirect_to work_path(Work.find_by(title: "Por Vida").id) - - end - - it "should redirect to the new work's detail page if it is created successfully" do - - - end it "should stay on the add work page and display the error message banner if we are unsuccessful in creating or updating a work" do @@ -54,11 +38,12 @@ end - it "renders to the same page if unsucessful create or update" do - - end - describe 'creating a new Work' do + it "should be able to visit the 'Add New Work' page " do + get new_work_path + must_respond_with :success + end + it "requires only a title to create a new Work" do work = Work.new @@ -70,19 +55,39 @@ end it "raises an error if there is a Work that has the same category AND same title" do - existing_book = works(:book_one) - new_book_same_title = Work.new(category: existing_book.category, title: existing_book.title) + # existing_book = works(:book_one) + # + # proc { post works_path, params: { work: {category: existing_book.category, title: existing_book.title} } }.must_raise ArugmentError.new + + end + + it "should be able to create a new work and redirect to the new work's detail page if successful" do - new_book_same_title.valid?.must_equal false + proc { + post works_path, params: { work: {category: "album", title: "Por Vida", creator: "Kali Uchis", publication_year: "2015", description: "Kali's debut EP"} } + }.must_change 'Work.count', 1 + + + must_respond_with :redirect + must_redirect_to work_path(Work.find_by(title: "Por Vida").id) - new_book_same_title.errors.must_include :title end it "allows you to create a new Work that has the same title of a Work in a different category" do - book_with_title = works(:book_one) - album_with_same_title = Work.new(category: "album", title: book_with_title.title) + existing_movie = works(:movie_one) + + proc { + post works_path, params: { work: {category: "album", title: existing_movie.title} } + }.must_change 'Work.count', 1 + + end + + it "should stay on the add work page and display the error message banner if we are unsuccessful in creating a work" do + + end + + it "should stay on the add work page if we are unsuccessful in creating a work" do - album_with_same_title.valid?.must_equal true end end diff --git a/test/models/work_test.rb b/test/models/work_test.rb index ace6f301dc..829e1eea3a 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -15,20 +15,7 @@ work.errors.messages.must_include :title end - end - - describe 'creating a new Work' do - it "requires only a title to create a new Work" do - work = Work.new - - work.valid?.must_equal false - - work.title = "New Work" - - work.valid?.must_equal true - end - - it "raises an error if there is a Work that has the same category AND same title" do + it "is invalid with a title shared by another work in the same category" do existing_book = works(:book_one) new_book_same_title = Work.new(category: existing_book.category, title: existing_book.title) @@ -37,12 +24,15 @@ new_book_same_title.errors.must_include :title end - it "allows you to create a new Work that has the same title of a Work in a different category" do + it "is valid if it shares the same title of a Work in a different category" do book_with_title = works(:book_one) album_with_same_title = Work.new(category: "album", title: book_with_title.title) album_with_same_title.valid?.must_equal true end + + #TODO: Test Relations to Votes + end end From 9a0fc95589ecc130d3cd730f228dad7eda32167c Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Thu, 12 Oct 2017 14:08:18 -0700 Subject: [PATCH 07/36] Added buttons related to Works pages --- app/views/layouts/application.html.erb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 60a9563849..607866487a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,6 +9,11 @@ +
<% flash.each do |name, message| %>
<%= message %>
From 3ffb8b7dce677f8da5e28d824e11d235079c267b Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Thu, 12 Oct 2017 14:55:05 -0700 Subject: [PATCH 08/36] Added links to Works show page --- app/assets/stylesheets/application.css | 4 ++++ app/controllers/works_controller.rb | 1 + app/views/layouts/application.html.erb | 10 +++++++--- app/views/works/edit.html.erb | 5 +++-- app/views/works/show.html.erb | 23 +++++++++++++++++++++-- 5 files changed, 36 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 71808eb368..443c9d7016 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -53,6 +53,10 @@ input[type="submit"] { width: 100%; } + .button { + display: inline-block; + } + body { font-family: "Gudea", sans-serif; diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 15ee3be32b..3cf3262a99 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -19,6 +19,7 @@ def new end def edit + @work = Work.find_by(id: params[:id]) end def show diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 607866487a..96c7a4d9e0 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,10 +9,14 @@ +

+ <%= link_to "Media Ranker", root_path %> + Ranking the Best of Everything +

<% flash.each do |name, message| %> diff --git a/app/views/works/edit.html.erb b/app/views/works/edit.html.erb index b717b97f84..d8e8aa283d 100644 --- a/app/views/works/edit.html.erb +++ b/app/views/works/edit.html.erb @@ -1,2 +1,3 @@ -

Works#edit

-

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

+

<%= "Edit this #{@work.category}" %>

+ +<%= render partial: 'form', locals: {button_text: 'Update Work'} %> diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index c096804302..e851166310 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -1,2 +1,21 @@ -

Works#show

-

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

+

<%= @work.title %>

+ +<% if @work.errors.any? %> +
    + <% @work.errors.each do |column, message| %> +
  • + <%= column.capitalize %> <%= message %> +
    • + <% end %> +
+<% end %> + +
+ <%= link_to "Back to media ranks", root_path, class: :button %> + <%= link_to "Edit", edit_work_path, class: :button %> + <%= link_to "Delete", delete_work_path, method: :delete, class: :button %> +
+ +
+ This will be the upvotes table on the side +
From 25f9eab9d443c6db2a3466ee6a060c2249b3523b Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Thu, 12 Oct 2017 15:22:03 -0700 Subject: [PATCH 09/36] wrote method to delete method, created a 'delete' link to be able to delete a work from their show page, tested that a work deletes successfully --- app/controllers/works_controller.rb | 3 +++ test/controllers/works_controller_test.rb | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 3cf3262a99..192ef7e8b5 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -31,6 +31,9 @@ def update end def destroy + @work= Work.find_by(id: params[:id]).destroy + + redirect_to root_path end def main diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index e7580bac64..b51f29cb8b 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -91,4 +91,16 @@ end end + describe "Deleting a Work" do + it "should successfully delete an existing work" do + + proc { + delete work_path( works(:movie_one).id ) + }.must_change 'Work.count', -1 + + must_respond_with :redirect + must_redirect_to root_path + end + end + end From 6f2e7aa2318fd64676c6e569d8ad4febff3efa2f Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Fri, 13 Oct 2017 00:17:16 -0700 Subject: [PATCH 10/36] Setup Users controller and User model --- app/assets/javascripts/users.js | 2 ++ app/assets/stylesheets/users.scss | 3 ++ app/controllers/users_controller.rb | 34 +++++++++++++++++++++++ app/controllers/works_controller.rb | 10 +++++++ app/helpers/users_helper.rb | 2 ++ app/models/user.rb | 2 ++ app/views/layouts/application.html.erb | 1 + app/views/users/create.html.erb | 2 ++ app/views/users/index.html.erb | 29 +++++++++++++++++++ app/views/users/new.html.erb | 2 ++ app/views/users/show.html.erb | 7 +++++ app/views/works/_form.html.erb | 4 --- app/views/works/main.html.erb | 33 ++++++++++++++-------- app/views/works/show.html.erb | 13 +++++++++ config/routes.rb | 13 +++++++++ db/migrate/20171013061450_create_users.rb | 9 ++++++ db/schema.rb | 8 +++++- test/controllers/users_controller_test.rb | 24 ++++++++++++++++ test/fixtures/users.yml | 13 +++++++++ test/models/user_test.rb | 9 ++++++ 20 files changed, 203 insertions(+), 17 deletions(-) create mode 100644 app/assets/javascripts/users.js create mode 100644 app/assets/stylesheets/users.scss create mode 100644 app/controllers/users_controller.rb create mode 100644 app/helpers/users_helper.rb create mode 100644 app/models/user.rb create mode 100644 app/views/users/create.html.erb create mode 100644 app/views/users/index.html.erb create mode 100644 app/views/users/new.html.erb create mode 100644 app/views/users/show.html.erb create mode 100644 db/migrate/20171013061450_create_users.rb create mode 100644 test/controllers/users_controller_test.rb create mode 100644 test/fixtures/users.yml create mode 100644 test/models/user_test.rb diff --git a/app/assets/javascripts/users.js b/app/assets/javascripts/users.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/users.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/users.scss b/app/assets/stylesheets/users.scss new file mode 100644 index 0000000000..31a2eacb84 --- /dev/null +++ b/app/assets/stylesheets/users.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Users controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb new file mode 100644 index 0000000000..33b15c239d --- /dev/null +++ b/app/controllers/users_controller.rb @@ -0,0 +1,34 @@ +class UsersController < ApplicationController + def index + @users = User.all + end + + def create + existing_user= User.find_by(username: params[:username]) + @user = User.new user_params + + if existing_user + flash[:success] = "Successfully logged in as existing user #{existing_user.username}" + redirect_to root_path + elsif @user.save + flash[:success] = "Successfully created new user #{@user.username} with ID #{@user.id}" + redirect_to root_path + else + render :new + end + end + + def new + @user = User.new + end + + def show + @user = User.find_by(id: params[:id]) + end + + private + + def user_params + return params.require(:user).permit(:username) + end +end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 192ef7e8b5..4285555ca8 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -20,6 +20,8 @@ def new def edit @work = Work.find_by(id: params[:id]) + + redirect_to root_path unless @work end def show @@ -28,6 +30,14 @@ def show end def update + @work = Work.find_by(id: params[:id]) + redirect_to root_path unless @work + + if @work.update_attributes work_params + redirect_to work_path(@work.id) + else + render :edit + end end def destroy diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb new file mode 100644 index 0000000000..2310a240d7 --- /dev/null +++ b/app/helpers/users_helper.rb @@ -0,0 +1,2 @@ +module UsersHelper +end diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 0000000000..379658a509 --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,2 @@ +class User < ApplicationRecord +end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 96c7a4d9e0..a01347edf5 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -17,6 +17,7 @@ <%= link_to "View Top Media", root_path, class: :button %> <%= link_to "View All Media", works_path, class: :button %> <%= link_to "Add a New Work", new_work_path, class: :button %> + <%= link_to "View all users", users_path, class: :button %>
<% flash.each do |name, message| %> diff --git a/app/views/users/create.html.erb b/app/views/users/create.html.erb new file mode 100644 index 0000000000..48ea02e600 --- /dev/null +++ b/app/views/users/create.html.erb @@ -0,0 +1,2 @@ +

Users#create

+

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

diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb new file mode 100644 index 0000000000..06540f37bb --- /dev/null +++ b/app/views/users/index.html.erb @@ -0,0 +1,29 @@ +
+

List of Users

+ + + + + + + + + + <% @users.each do |user| %> + + + + + + <% end %> + +
UsernameVotesJoined
+ <%= "#{user.username}" %> + + <%= "Future Votes" %> + + <%= "#{user.created_at.to_date}" %> +
+ + <%= link_to "Back to Media List", root_path, class: :button %> +
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb new file mode 100644 index 0000000000..c21a1adf19 --- /dev/null +++ b/app/views/users/new.html.erb @@ -0,0 +1,2 @@ +

Users#new

+

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

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

<%= "User Summary: #{@user.username}"%>

+

<%= "Joined site #{@user.created_at}"%>

+ +

Votes

+ + This will be user's votes +
diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb index 13e58b5a2a..0030269970 100644 --- a/app/views/works/_form.html.erb +++ b/app/views/works/_form.html.erb @@ -25,9 +25,5 @@ <%= f.label "Description" %> <%= f.text_area :description %> - - - - <%= f.submit button_text%> <% end %> diff --git a/app/views/works/main.html.erb b/app/views/works/main.html.erb index 356584f9fa..a66ee08086 100644 --- a/app/views/works/main.html.erb +++ b/app/views/works/main.html.erb @@ -1,15 +1,24 @@ -
-

Media Spotlight:

-
+
+
+
+

+ Media Spotlight: + <%= "eventual link_to to work's show page"%> by <%= "top work's creator"%> +

+
-
-

Top Movies

-
+
-
-

Top Books

-
+
+

Top Movies

+
-
-

Top Albums

-
+
+

Top Books

+
+ +
+

Top Albums

+
+ +
diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index e851166310..d50af74c3c 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -10,6 +10,19 @@ <% end %> +
+

+ <%= "Created by: #{@work.creator}"%> +

+

+ <%= "Published: #{@work.publication_year}"%> +

+

+ <%= " #{@work.description}"%> +

+ +
+
<%= link_to "Back to media ranks", root_path, class: :button %> <%= link_to "Edit", edit_work_path, class: :button %> diff --git a/config/routes.rb b/config/routes.rb index c8961eb95a..22a52dfd1e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,17 @@ Rails.application.routes.draw do + + ### USERS ### + get 'users/', to: 'users#index', as: 'users' #users_path + + get 'users/new', to: 'users#new', as: 'new_user' #new_user_path + + get 'users/:id', to: 'users#show', as: 'user' #user_path + + post 'users/', to: 'users#create', as: 'create_user' #create_user_path + + + ### WORKS ### + get 'works/', to: 'works#index', as: 'works' #works_path get 'works/:id/edit', to: 'works#edit', as: 'edit_work' #edit_work_path diff --git a/db/migrate/20171013061450_create_users.rb b/db/migrate/20171013061450_create_users.rb new file mode 100644 index 0000000000..7ed1ac365d --- /dev/null +++ b/db/migrate/20171013061450_create_users.rb @@ -0,0 +1,9 @@ +class CreateUsers < ActiveRecord::Migration[5.1] + def change + create_table :users do |t| + t.string :username + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index fbee8c9383..1cf634d60c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,11 +10,17 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20171010225926) do +ActiveRecord::Schema.define(version: 20171013061450) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "users", force: :cascade do |t| + t.string "username" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "works", force: :cascade do |t| t.string "category" t.string "title" diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb new file mode 100644 index 0000000000..5c27aad8d3 --- /dev/null +++ b/test/controllers/users_controller_test.rb @@ -0,0 +1,24 @@ +require "test_helper" + +describe UsersController do + it "should get index" do + get users_index_url + value(response).must_be :success? + end + + it "should get create" do + get users_create_url + value(response).must_be :success? + end + + it "should get new" do + get users_new_url + value(response).must_be :success? + end + + it "should get show" do + get users_show_url + value(response).must_be :success? + end + +end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 0000000000..46d76b6887 --- /dev/null +++ b/test/fixtures/users.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 +# +user_one: + username: plop +# column: value +# +user_two: + username: 100luftredballoons +# column: value diff --git a/test/models/user_test.rb b/test/models/user_test.rb new file mode 100644 index 0000000000..cc862ac2d9 --- /dev/null +++ b/test/models/user_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe User do + let(:user) { User.new } + + it "must be valid" do + value(user).must_be :valid? + end +end From 2c2f87d714d01793ee21229f660eded735c43210 Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Fri, 13 Oct 2017 07:58:02 -0700 Subject: [PATCH 11/36] Setup Vote controller, model, and yaml, set up relationships between votes, users, and works --- app/assets/javascripts/votes.js | 2 ++ app/assets/stylesheets/votes.scss | 3 +++ app/controllers/votes_controller.rb | 19 +++++++++++++++++++ app/helpers/votes_helper.rb | 2 ++ app/models/user.rb | 2 ++ app/models/vote.rb | 4 ++++ app/models/work.rb | 2 ++ app/views/votes/create.html.erb | 2 ++ config/routes.rb | 6 ++++++ db/migrate/20171013144113_create_votes.rb | 10 ++++++++++ test/controllers/votes_controller_test.rb | 9 +++++++++ test/fixtures/votes.yml | 17 +++++++++++++++++ test/models/vote_test.rb | 9 +++++++++ 13 files changed, 87 insertions(+) create mode 100644 app/assets/javascripts/votes.js create mode 100644 app/assets/stylesheets/votes.scss create mode 100644 app/controllers/votes_controller.rb create mode 100644 app/helpers/votes_helper.rb create mode 100644 app/models/vote.rb create mode 100644 app/views/votes/create.html.erb create mode 100644 db/migrate/20171013144113_create_votes.rb create mode 100644 test/controllers/votes_controller_test.rb create mode 100644 test/fixtures/votes.yml create mode 100644 test/models/vote_test.rb diff --git a/app/assets/javascripts/votes.js b/app/assets/javascripts/votes.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/votes.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/votes.scss b/app/assets/stylesheets/votes.scss new file mode 100644 index 0000000000..9a6720f80e --- /dev/null +++ b/app/assets/stylesheets/votes.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Votes 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/votes_controller.rb b/app/controllers/votes_controller.rb new file mode 100644 index 0000000000..9e2a63616c --- /dev/null +++ b/app/controllers/votes_controller.rb @@ -0,0 +1,19 @@ +class VotesController < ApplicationController + def create + @vote = Vote.new vote_params + + if @vote.save + flash[:success] = "Successfully upvoted!" + redirect_to work_path(id: params[:id]) + else + render :show + end + + end + + private + + def vote_params + return params.require(:vote).permit(:user_id, :work_id) + end +end diff --git a/app/helpers/votes_helper.rb b/app/helpers/votes_helper.rb new file mode 100644 index 0000000000..5a82eed07d --- /dev/null +++ b/app/helpers/votes_helper.rb @@ -0,0 +1,2 @@ +module VotesHelper +end diff --git a/app/models/user.rb b/app/models/user.rb index 379658a509..45a412a4eb 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,2 +1,4 @@ class User < ApplicationRecord + has_many :votes + end diff --git a/app/models/vote.rb b/app/models/vote.rb new file mode 100644 index 0000000000..b8b6f9f0aa --- /dev/null +++ b/app/models/vote.rb @@ -0,0 +1,4 @@ +class Vote < ApplicationRecord + belongs_to :user + belongs_to :work +end diff --git a/app/models/work.rb b/app/models/work.rb index adb64724ca..b9b1ddb816 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,3 +1,5 @@ class Work < ApplicationRecord + has_many :votes + validates :title, presence: true, uniqueness: {scope: :category, message: "There is already a Work of this category with this title " } end diff --git a/app/views/votes/create.html.erb b/app/views/votes/create.html.erb new file mode 100644 index 0000000000..36aaa30279 --- /dev/null +++ b/app/views/votes/create.html.erb @@ -0,0 +1,2 @@ +

Votes#create

+

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

diff --git a/config/routes.rb b/config/routes.rb index 22a52dfd1e..8066ba0938 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,11 @@ Rails.application.routes.draw do + ### VOTE ### + + post 'votes/', to: 'votes#create', as: 'create_vote' #create_vote_path + + get 'votes/create' + ### USERS ### get 'users/', to: 'users#index', as: 'users' #users_path diff --git a/db/migrate/20171013144113_create_votes.rb b/db/migrate/20171013144113_create_votes.rb new file mode 100644 index 0000000000..820291a2d3 --- /dev/null +++ b/db/migrate/20171013144113_create_votes.rb @@ -0,0 +1,10 @@ +class CreateVotes < ActiveRecord::Migration[5.1] + def change + create_table :votes do |t| + t.author_id + t.work_id + + t.timestamps + end + end +end diff --git a/test/controllers/votes_controller_test.rb b/test/controllers/votes_controller_test.rb new file mode 100644 index 0000000000..720b0fe9a6 --- /dev/null +++ b/test/controllers/votes_controller_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe VotesController do + it "should get create" do + get votes_create_url + value(response).must_be :success? + end + +end diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml new file mode 100644 index 0000000000..4db7675eb7 --- /dev/null +++ b/test/fixtures/votes.yml @@ -0,0 +1,17 @@ +# 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 +# +vote_one: + created_at: 2017-10-13 + user: users(:user_one) + work: works(:book_one) +# column: value +# +vote_two: + created_at: 2017-10-13 + user: users(:user_two) + work: works(:movie_one) +# column: value diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb new file mode 100644 index 0000000000..fc15947bd3 --- /dev/null +++ b/test/models/vote_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Vote do + let(:vote) { Vote.new } + + it "must be valid" do + value(vote).must_be :valid? + end +end From c175a7e6e513b026635aa8998a5e9cd47ed004c5 Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Fri, 13 Oct 2017 11:22:28 -0700 Subject: [PATCH 12/36] created migration for Votes table and set up relationships to user model and work model --- db/migrate/20171013144113_create_votes.rb | 4 ++-- db/schema.rb | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/db/migrate/20171013144113_create_votes.rb b/db/migrate/20171013144113_create_votes.rb index 820291a2d3..f20881ce7b 100644 --- a/db/migrate/20171013144113_create_votes.rb +++ b/db/migrate/20171013144113_create_votes.rb @@ -1,8 +1,8 @@ class CreateVotes < ActiveRecord::Migration[5.1] def change create_table :votes do |t| - t.author_id - t.work_id + t.belongs_to :user, index: true + t.belongs_to :work, index: true t.timestamps end diff --git a/db/schema.rb b/db/schema.rb index 1cf634d60c..04a449a330 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: 20171013061450) do +ActiveRecord::Schema.define(version: 20171013144113) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -21,6 +21,15 @@ t.datetime "updated_at", null: false end + create_table "votes", force: :cascade do |t| + t.bigint "user_id" + t.bigint "work_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["user_id"], name: "index_votes_on_user_id" + t.index ["work_id"], name: "index_votes_on_work_id" + end + create_table "works", force: :cascade do |t| t.string "category" t.string "title" From de3861b8c7676ecc9c32971ef0a3ca0bf8e40cab Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Fri, 13 Oct 2017 13:41:21 -0700 Subject: [PATCH 13/36] starting to modify view pages to account for showing votes --- app/assets/stylesheets/application.css | 17 +- app/assets/stylesheets/foundation.css | 4001 +++++++++++++++++++++ app/controllers/users_controller.rb | 30 +- app/controllers/votes_controller.rb | 19 +- app/controllers/works_controller.rb | 3 + app/views/layouts/application.html.erb | 1 + app/views/works/index.html.erb | 20 +- app/views/works/main.html.erb | 24 + app/views/works/show.html.erb | 2 +- test/controllers/votes_controller_test.rb | 8 +- 10 files changed, 4089 insertions(+), 36 deletions(-) create mode 100644 app/assets/stylesheets/foundation.css diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 443c9d7016..5c67b5a90e 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -14,7 +14,7 @@ *= require_self */ -input[type="submit"] { +/*input[type="submit"] { display: inline-block; vertical-align: middle; margin: 0 0 1rem 0; @@ -55,7 +55,7 @@ input[type="submit"] { .button { display: inline-block; - } + }*/ body { @@ -64,9 +64,11 @@ input[type="submit"] { /*@media print, screen and (min-width: 40em) h3 { font-size: 1.9375rem; }*/ + a, h3 { + color: #26A69A; + } h3 { - color: #26A69A; font-weight: bold; font-size: 1.9375rem; } @@ -75,3 +77,12 @@ input[type="submit"] { background-color: lightgreen; display:block; } + + .button { + background-color: #26A69A; + } + + + + +/* background-color: #26A69A;*/ diff --git a/app/assets/stylesheets/foundation.css b/app/assets/stylesheets/foundation.css new file mode 100644 index 0000000000..72a4ba0353 --- /dev/null +++ b/app/assets/stylesheets/foundation.css @@ -0,0 +1,4001 @@ +@charset "UTF-8"; +/** + * Foundation for Sites by ZURB + * Version 6.3.1 + * foundation.zurb.com + * Licensed under MIT Open Source + */ +/*! normalize-scss | MIT/GPLv2 License | bit.ly/normalize-scss */ +/* Document + ========================================================================== */ +/** + * 1. Change the default font family in all browsers (opinionated). + * 2. Correct the line height in all browsers. + * 3. Prevent adjustments of font size after orientation changes in + * IE on Windows Phone and in iOS. + */ +html { + font-family: sans-serif; + /* 1 */ + line-height: 1.15; + /* 2 */ + -ms-text-size-adjust: 100%; + /* 3 */ + -webkit-text-size-adjust: 100%; + /* 3 */ } + +/* Sections + ========================================================================== */ +/** + * Remove the margin in all browsers (opinionated). + */ +body { + margin: 0; } + +/** + * Add the correct display in IE 9-. + */ +article, +aside, +footer, +header, +nav, +section { + display: block; } + +/** + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. + */ +h1 { + font-size: 2em; + margin: 0.67em 0; } + +/* Grouping content + ========================================================================== */ +/** + * Add the correct display in IE 9-. + */ +figcaption, +figure { + display: block; } + +/** + * Add the correct margin in IE 8. + */ +figure { + margin: 1em 40px; } + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ +hr { + -webkit-box-sizing: content-box; + box-sizing: content-box; + /* 1 */ + height: 0; + /* 1 */ + overflow: visible; + /* 2 */ } + +/** + * Add the correct display in IE. + */ +main { + display: block; } + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ +pre { + font-family: monospace, monospace; + /* 1 */ + font-size: 1em; + /* 2 */ } + +/* Links + ========================================================================== */ +/** + * 1. Remove the gray background on active links in IE 10. + * 2. Remove gaps in links underline in iOS 8+ and Safari 8+. + */ +a { + background-color: transparent; + /* 1 */ + -webkit-text-decoration-skip: objects; + /* 2 */ } + +/** + * Remove the outline on focused links when they are also active or hovered + * in all browsers (opinionated). + */ +a:active, +a:hover { + outline-width: 0; } + +/* Text-level semantics + ========================================================================== */ +/** + * 1. Remove the bottom border in Firefox 39-. + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ +abbr[title] { + border-bottom: none; + /* 1 */ + text-decoration: underline; + /* 2 */ + text-decoration: underline dotted; + /* 2 */ } + +/** + * Prevent the duplicate application of `bolder` by the next rule in Safari 6. + */ +b, +strong { + font-weight: inherit; } + +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ +b, +strong { + font-weight: bolder; } + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ +code, +kbd, +samp { + font-family: monospace, monospace; + /* 1 */ + font-size: 1em; + /* 2 */ } + +/** + * Add the correct font style in Android 4.3-. + */ +dfn { + font-style: italic; } + +/** + * Add the correct background and color in IE 9-. + */ +mark { + background-color: #ff0; + color: #000; } + +/** + * Add the correct font size in all browsers. + */ +small { + font-size: 80%; } + +/** + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. + */ +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; } + +sub { + bottom: -0.25em; } + +sup { + top: -0.5em; } + +/* Embedded content + ========================================================================== */ +/** + * Add the correct display in IE 9-. + */ +audio, +video { + display: inline-block; } + +/** + * Add the correct display in iOS 4-7. + */ +audio:not([controls]) { + display: none; + height: 0; } + +/** + * Remove the border on images inside links in IE 10-. + */ +img { + border-style: none; } + +/** + * Hide the overflow in IE. + */ +svg:not(:root) { + overflow: hidden; } + +/* Forms + ========================================================================== */ +/** + * 1. Change the font styles in all browsers (opinionated). + * 2. Remove the margin in Firefox and Safari. + */ +button, +input, +optgroup, +select, +textarea { + font-family: sans-serif; + /* 1 */ + font-size: 100%; + /* 1 */ + line-height: 1.15; + /* 1 */ + margin: 0; + /* 2 */ } + +/** + * Show the overflow in IE. + */ +button { + overflow: visible; } + +/** + * Remove the inheritance of text transform in Edge, Firefox, and IE. + * 1. Remove the inheritance of text transform in Firefox. + */ +button, +select { + /* 1 */ + text-transform: none; } + +/** + * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video` + * controls in Android 4. + * 2. Correct the inability to style clickable types in iOS and Safari. + */ +button, +html [type="button"], +[type="reset"], +[type="submit"] { + -webkit-appearance: button; + /* 2 */ } + +button, +[type="button"], +[type="reset"], +[type="submit"] { + /** + * Remove the inner border and padding in Firefox. + */ + /** + * Restore the focus styles unset by the previous rule. + */ } + button::-moz-focus-inner, + [type="button"]::-moz-focus-inner, + [type="reset"]::-moz-focus-inner, + [type="submit"]::-moz-focus-inner { + border-style: none; + padding: 0; } + button:-moz-focusring, + [type="button"]:-moz-focusring, + [type="reset"]:-moz-focusring, + [type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; } + +/** + * Show the overflow in Edge. + */ +input { + overflow: visible; } + +/** + * 1. Add the correct box sizing in IE 10-. + * 2. Remove the padding in IE 10-. + */ +[type="checkbox"], +[type="radio"] { + -webkit-box-sizing: border-box; + box-sizing: border-box; + /* 1 */ + padding: 0; + /* 2 */ } + +/** + * Correct the cursor style of increment and decrement buttons in Chrome. + */ +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; } + +/** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ +[type="search"] { + -webkit-appearance: textfield; + /* 1 */ + outline-offset: -2px; + /* 2 */ + /** + * Remove the inner padding and cancel buttons in Chrome and Safari on macOS. + */ } + [type="search"]::-webkit-search-cancel-button, [type="search"]::-webkit-search-decoration { + -webkit-appearance: none; } + +/** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ +::-webkit-file-upload-button { + -webkit-appearance: button; + /* 1 */ + font: inherit; + /* 2 */ } + +/** + * Change the border, margin, and padding in all browsers (opinionated). + */ +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; } + +/** + * 1. Correct the text wrapping in Edge and IE. + * 2. Correct the color inheritance from `fieldset` elements in IE. + * 3. Remove the padding so developers are not caught out when they zero out + * `fieldset` elements in all browsers. + */ +legend { + -webkit-box-sizing: border-box; + box-sizing: border-box; + /* 1 */ + display: table; + /* 1 */ + max-width: 100%; + /* 1 */ + padding: 0; + /* 3 */ + color: inherit; + /* 2 */ + white-space: normal; + /* 1 */ } + +/** + * 1. Add the correct display in IE 9-. + * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ +progress { + display: inline-block; + /* 1 */ + vertical-align: baseline; + /* 2 */ } + +/** + * Remove the default vertical scrollbar in IE. + */ +textarea { + overflow: auto; } + +/* Interactive + ========================================================================== */ +/* + * Add the correct display in Edge, IE, and Firefox. + */ +details { + display: block; } + +/* + * Add the correct display in all browsers. + */ +summary { + display: list-item; } + +/* + * Add the correct display in IE 9-. + */ +menu { + display: block; } + +/* Scripting + ========================================================================== */ +/** + * Add the correct display in IE 9-. + */ +canvas { + display: inline-block; } + +/** + * Add the correct display in IE. + */ +template { + display: none; } + +/* Hidden + ========================================================================== */ +/** + * Add the correct display in IE 10-. + */ +[hidden] { + display: none; } + +.foundation-mq { + font-family: "small=0em&medium=40em&large=64em&xlarge=75em&xxlarge=90em"; } + +html { + -webkit-box-sizing: border-box; + box-sizing: border-box; + font-size: 100%; } + +*, +*::before, +*::after { + -webkit-box-sizing: inherit; + box-sizing: inherit; } + +body { + margin: 0; + padding: 0; + background: #fefefe; + font-family: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif; + font-weight: normal; + line-height: 1.5; + color: #0a0a0a; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } + +img { + display: inline-block; + vertical-align: middle; + max-width: 100%; + height: auto; + -ms-interpolation-mode: bicubic; } + +textarea { + height: auto; + min-height: 50px; + border-radius: 0; } + +select { + -webkit-box-sizing: border-box; + box-sizing: border-box; + width: 100%; + border-radius: 0; } + +.map_canvas img, +.map_canvas embed, +.map_canvas object, +.mqa-display img, +.mqa-display embed, +.mqa-display object { + max-width: none !important; } + +button { + padding: 0; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + border: 0; + border-radius: 0; + background: transparent; + line-height: 1; } + [data-whatinput='mouse'] button { + outline: 0; } + +pre { + overflow: auto; } + +.is-visible { + display: block !important; } + +.is-hidden { + display: none !important; } + +.row { + max-width: 75rem; + margin-right: auto; + margin-left: auto; } + .row::before, .row::after { + display: table; + content: ' '; } + .row::after { + clear: both; } + .row.collapse > .column, .row.collapse > .columns { + padding-right: 0; + padding-left: 0; } + .row .row { + margin-right: -0.625rem; + margin-left: -0.625rem; } + @media print, screen and (min-width: 40em) { + .row .row { + margin-right: -0.9375rem; + margin-left: -0.9375rem; } } + @media print, screen and (min-width: 64em) { + .row .row { + margin-right: -0.9375rem; + margin-left: -0.9375rem; } } + .row .row.collapse { + margin-right: 0; + margin-left: 0; } + .row.expanded { + max-width: none; } + .row.expanded .row { + margin-right: auto; + margin-left: auto; } + .row:not(.expanded) .row { + max-width: none; } + .row.gutter-small > .column, .row.gutter-small > .columns { + padding-right: 0.625rem; + padding-left: 0.625rem; } + .row.gutter-medium > .column, .row.gutter-medium > .columns { + padding-right: 0.9375rem; + padding-left: 0.9375rem; } + +.column, .columns { + width: 100%; + float: left; + padding-right: 0.625rem; + padding-left: 0.625rem; } + @media print, screen and (min-width: 40em) { + .column, .columns { + padding-right: 0.9375rem; + padding-left: 0.9375rem; } } + .column:last-child:not(:first-child), .columns:last-child:not(:first-child) { + float: right; } + .column.end:last-child:last-child, .end.columns:last-child:last-child { + float: left; } + +.column.row.row, .row.row.columns { + float: none; } + +.row .column.row.row, .row .row.row.columns { + margin-right: 0; + margin-left: 0; + padding-right: 0; + padding-left: 0; } + +.small-1 { + width: 8.33333%; } + +.small-push-1 { + position: relative; + left: 8.33333%; } + +.small-pull-1 { + position: relative; + left: -8.33333%; } + +.small-offset-0 { + margin-left: 0%; } + +.small-2 { + width: 16.66667%; } + +.small-push-2 { + position: relative; + left: 16.66667%; } + +.small-pull-2 { + position: relative; + left: -16.66667%; } + +.small-offset-1 { + margin-left: 8.33333%; } + +.small-3 { + width: 25%; } + +.small-push-3 { + position: relative; + left: 25%; } + +.small-pull-3 { + position: relative; + left: -25%; } + +.small-offset-2 { + margin-left: 16.66667%; } + +.small-4 { + width: 33.33333%; } + +.small-push-4 { + position: relative; + left: 33.33333%; } + +.small-pull-4 { + position: relative; + left: -33.33333%; } + +.small-offset-3 { + margin-left: 25%; } + +.small-5 { + width: 41.66667%; } + +.small-push-5 { + position: relative; + left: 41.66667%; } + +.small-pull-5 { + position: relative; + left: -41.66667%; } + +.small-offset-4 { + margin-left: 33.33333%; } + +.small-6 { + width: 50%; } + +.small-push-6 { + position: relative; + left: 50%; } + +.small-pull-6 { + position: relative; + left: -50%; } + +.small-offset-5 { + margin-left: 41.66667%; } + +.small-7 { + width: 58.33333%; } + +.small-push-7 { + position: relative; + left: 58.33333%; } + +.small-pull-7 { + position: relative; + left: -58.33333%; } + +.small-offset-6 { + margin-left: 50%; } + +.small-8 { + width: 66.66667%; } + +.small-push-8 { + position: relative; + left: 66.66667%; } + +.small-pull-8 { + position: relative; + left: -66.66667%; } + +.small-offset-7 { + margin-left: 58.33333%; } + +.small-9 { + width: 75%; } + +.small-push-9 { + position: relative; + left: 75%; } + +.small-pull-9 { + position: relative; + left: -75%; } + +.small-offset-8 { + margin-left: 66.66667%; } + +.small-10 { + width: 83.33333%; } + +.small-push-10 { + position: relative; + left: 83.33333%; } + +.small-pull-10 { + position: relative; + left: -83.33333%; } + +.small-offset-9 { + margin-left: 75%; } + +.small-11 { + width: 91.66667%; } + +.small-push-11 { + position: relative; + left: 91.66667%; } + +.small-pull-11 { + position: relative; + left: -91.66667%; } + +.small-offset-10 { + margin-left: 83.33333%; } + +.small-12 { + width: 100%; } + +.small-offset-11 { + margin-left: 91.66667%; } + +.small-up-1 > .column, .small-up-1 > .columns { + float: left; + width: 100%; } + .small-up-1 > .column:nth-of-type(1n), .small-up-1 > .columns:nth-of-type(1n) { + clear: none; } + .small-up-1 > .column:nth-of-type(1n+1), .small-up-1 > .columns:nth-of-type(1n+1) { + clear: both; } + .small-up-1 > .column:last-child, .small-up-1 > .columns:last-child { + float: left; } + +.small-up-2 > .column, .small-up-2 > .columns { + float: left; + width: 50%; } + .small-up-2 > .column:nth-of-type(1n), .small-up-2 > .columns:nth-of-type(1n) { + clear: none; } + .small-up-2 > .column:nth-of-type(2n+1), .small-up-2 > .columns:nth-of-type(2n+1) { + clear: both; } + .small-up-2 > .column:last-child, .small-up-2 > .columns:last-child { + float: left; } + +.small-up-3 > .column, .small-up-3 > .columns { + float: left; + width: 33.33333%; } + .small-up-3 > .column:nth-of-type(1n), .small-up-3 > .columns:nth-of-type(1n) { + clear: none; } + .small-up-3 > .column:nth-of-type(3n+1), .small-up-3 > .columns:nth-of-type(3n+1) { + clear: both; } + .small-up-3 > .column:last-child, .small-up-3 > .columns:last-child { + float: left; } + +.small-up-4 > .column, .small-up-4 > .columns { + float: left; + width: 25%; } + .small-up-4 > .column:nth-of-type(1n), .small-up-4 > .columns:nth-of-type(1n) { + clear: none; } + .small-up-4 > .column:nth-of-type(4n+1), .small-up-4 > .columns:nth-of-type(4n+1) { + clear: both; } + .small-up-4 > .column:last-child, .small-up-4 > .columns:last-child { + float: left; } + +.small-up-5 > .column, .small-up-5 > .columns { + float: left; + width: 20%; } + .small-up-5 > .column:nth-of-type(1n), .small-up-5 > .columns:nth-of-type(1n) { + clear: none; } + .small-up-5 > .column:nth-of-type(5n+1), .small-up-5 > .columns:nth-of-type(5n+1) { + clear: both; } + .small-up-5 > .column:last-child, .small-up-5 > .columns:last-child { + float: left; } + +.small-up-6 > .column, .small-up-6 > .columns { + float: left; + width: 16.66667%; } + .small-up-6 > .column:nth-of-type(1n), .small-up-6 > .columns:nth-of-type(1n) { + clear: none; } + .small-up-6 > .column:nth-of-type(6n+1), .small-up-6 > .columns:nth-of-type(6n+1) { + clear: both; } + .small-up-6 > .column:last-child, .small-up-6 > .columns:last-child { + float: left; } + +.small-up-7 > .column, .small-up-7 > .columns { + float: left; + width: 14.28571%; } + .small-up-7 > .column:nth-of-type(1n), .small-up-7 > .columns:nth-of-type(1n) { + clear: none; } + .small-up-7 > .column:nth-of-type(7n+1), .small-up-7 > .columns:nth-of-type(7n+1) { + clear: both; } + .small-up-7 > .column:last-child, .small-up-7 > .columns:last-child { + float: left; } + +.small-up-8 > .column, .small-up-8 > .columns { + float: left; + width: 12.5%; } + .small-up-8 > .column:nth-of-type(1n), .small-up-8 > .columns:nth-of-type(1n) { + clear: none; } + .small-up-8 > .column:nth-of-type(8n+1), .small-up-8 > .columns:nth-of-type(8n+1) { + clear: both; } + .small-up-8 > .column:last-child, .small-up-8 > .columns:last-child { + float: left; } + +.small-collapse > .column, .small-collapse > .columns { + padding-right: 0; + padding-left: 0; } + +.small-collapse .row { + margin-right: 0; + margin-left: 0; } + +.expanded.row .small-collapse.row { + margin-right: 0; + margin-left: 0; } + +.small-uncollapse > .column, .small-uncollapse > .columns { + padding-right: 0.625rem; + padding-left: 0.625rem; } + +.small-centered { + margin-right: auto; + margin-left: auto; } + .small-centered, .small-centered:last-child:not(:first-child) { + float: none; + clear: both; } + +.small-uncentered, +.small-push-0, +.small-pull-0 { + position: static; + float: left; + margin-right: 0; + margin-left: 0; } + +@media print, screen and (min-width: 40em) { + .medium-1 { + width: 8.33333%; } + .medium-push-1 { + position: relative; + left: 8.33333%; } + .medium-pull-1 { + position: relative; + left: -8.33333%; } + .medium-offset-0 { + margin-left: 0%; } + .medium-2 { + width: 16.66667%; } + .medium-push-2 { + position: relative; + left: 16.66667%; } + .medium-pull-2 { + position: relative; + left: -16.66667%; } + .medium-offset-1 { + margin-left: 8.33333%; } + .medium-3 { + width: 25%; } + .medium-push-3 { + position: relative; + left: 25%; } + .medium-pull-3 { + position: relative; + left: -25%; } + .medium-offset-2 { + margin-left: 16.66667%; } + .medium-4 { + width: 33.33333%; } + .medium-push-4 { + position: relative; + left: 33.33333%; } + .medium-pull-4 { + position: relative; + left: -33.33333%; } + .medium-offset-3 { + margin-left: 25%; } + .medium-5 { + width: 41.66667%; } + .medium-push-5 { + position: relative; + left: 41.66667%; } + .medium-pull-5 { + position: relative; + left: -41.66667%; } + .medium-offset-4 { + margin-left: 33.33333%; } + .medium-6 { + width: 50%; } + .medium-push-6 { + position: relative; + left: 50%; } + .medium-pull-6 { + position: relative; + left: -50%; } + .medium-offset-5 { + margin-left: 41.66667%; } + .medium-7 { + width: 58.33333%; } + .medium-push-7 { + position: relative; + left: 58.33333%; } + .medium-pull-7 { + position: relative; + left: -58.33333%; } + .medium-offset-6 { + margin-left: 50%; } + .medium-8 { + width: 66.66667%; } + .medium-push-8 { + position: relative; + left: 66.66667%; } + .medium-pull-8 { + position: relative; + left: -66.66667%; } + .medium-offset-7 { + margin-left: 58.33333%; } + .medium-9 { + width: 75%; } + .medium-push-9 { + position: relative; + left: 75%; } + .medium-pull-9 { + position: relative; + left: -75%; } + .medium-offset-8 { + margin-left: 66.66667%; } + .medium-10 { + width: 83.33333%; } + .medium-push-10 { + position: relative; + left: 83.33333%; } + .medium-pull-10 { + position: relative; + left: -83.33333%; } + .medium-offset-9 { + margin-left: 75%; } + .medium-11 { + width: 91.66667%; } + .medium-push-11 { + position: relative; + left: 91.66667%; } + .medium-pull-11 { + position: relative; + left: -91.66667%; } + .medium-offset-10 { + margin-left: 83.33333%; } + .medium-12 { + width: 100%; } + .medium-offset-11 { + margin-left: 91.66667%; } + .medium-up-1 > .column, .medium-up-1 > .columns { + float: left; + width: 100%; } + .medium-up-1 > .column:nth-of-type(1n), .medium-up-1 > .columns:nth-of-type(1n) { + clear: none; } + .medium-up-1 > .column:nth-of-type(1n+1), .medium-up-1 > .columns:nth-of-type(1n+1) { + clear: both; } + .medium-up-1 > .column:last-child, .medium-up-1 > .columns:last-child { + float: left; } + .medium-up-2 > .column, .medium-up-2 > .columns { + float: left; + width: 50%; } + .medium-up-2 > .column:nth-of-type(1n), .medium-up-2 > .columns:nth-of-type(1n) { + clear: none; } + .medium-up-2 > .column:nth-of-type(2n+1), .medium-up-2 > .columns:nth-of-type(2n+1) { + clear: both; } + .medium-up-2 > .column:last-child, .medium-up-2 > .columns:last-child { + float: left; } + .medium-up-3 > .column, .medium-up-3 > .columns { + float: left; + width: 33.33333%; } + .medium-up-3 > .column:nth-of-type(1n), .medium-up-3 > .columns:nth-of-type(1n) { + clear: none; } + .medium-up-3 > .column:nth-of-type(3n+1), .medium-up-3 > .columns:nth-of-type(3n+1) { + clear: both; } + .medium-up-3 > .column:last-child, .medium-up-3 > .columns:last-child { + float: left; } + .medium-up-4 > .column, .medium-up-4 > .columns { + float: left; + width: 25%; } + .medium-up-4 > .column:nth-of-type(1n), .medium-up-4 > .columns:nth-of-type(1n) { + clear: none; } + .medium-up-4 > .column:nth-of-type(4n+1), .medium-up-4 > .columns:nth-of-type(4n+1) { + clear: both; } + .medium-up-4 > .column:last-child, .medium-up-4 > .columns:last-child { + float: left; } + .medium-up-5 > .column, .medium-up-5 > .columns { + float: left; + width: 20%; } + .medium-up-5 > .column:nth-of-type(1n), .medium-up-5 > .columns:nth-of-type(1n) { + clear: none; } + .medium-up-5 > .column:nth-of-type(5n+1), .medium-up-5 > .columns:nth-of-type(5n+1) { + clear: both; } + .medium-up-5 > .column:last-child, .medium-up-5 > .columns:last-child { + float: left; } + .medium-up-6 > .column, .medium-up-6 > .columns { + float: left; + width: 16.66667%; } + .medium-up-6 > .column:nth-of-type(1n), .medium-up-6 > .columns:nth-of-type(1n) { + clear: none; } + .medium-up-6 > .column:nth-of-type(6n+1), .medium-up-6 > .columns:nth-of-type(6n+1) { + clear: both; } + .medium-up-6 > .column:last-child, .medium-up-6 > .columns:last-child { + float: left; } + .medium-up-7 > .column, .medium-up-7 > .columns { + float: left; + width: 14.28571%; } + .medium-up-7 > .column:nth-of-type(1n), .medium-up-7 > .columns:nth-of-type(1n) { + clear: none; } + .medium-up-7 > .column:nth-of-type(7n+1), .medium-up-7 > .columns:nth-of-type(7n+1) { + clear: both; } + .medium-up-7 > .column:last-child, .medium-up-7 > .columns:last-child { + float: left; } + .medium-up-8 > .column, .medium-up-8 > .columns { + float: left; + width: 12.5%; } + .medium-up-8 > .column:nth-of-type(1n), .medium-up-8 > .columns:nth-of-type(1n) { + clear: none; } + .medium-up-8 > .column:nth-of-type(8n+1), .medium-up-8 > .columns:nth-of-type(8n+1) { + clear: both; } + .medium-up-8 > .column:last-child, .medium-up-8 > .columns:last-child { + float: left; } + .medium-collapse > .column, .medium-collapse > .columns { + padding-right: 0; + padding-left: 0; } + .medium-collapse .row { + margin-right: 0; + margin-left: 0; } + .expanded.row .medium-collapse.row { + margin-right: 0; + margin-left: 0; } + .medium-uncollapse > .column, .medium-uncollapse > .columns { + padding-right: 0.9375rem; + padding-left: 0.9375rem; } + .medium-centered { + margin-right: auto; + margin-left: auto; } + .medium-centered, .medium-centered:last-child:not(:first-child) { + float: none; + clear: both; } + .medium-uncentered, + .medium-push-0, + .medium-pull-0 { + position: static; + float: left; + margin-right: 0; + margin-left: 0; } } + +@media print, screen and (min-width: 64em) { + .large-1 { + width: 8.33333%; } + .large-push-1 { + position: relative; + left: 8.33333%; } + .large-pull-1 { + position: relative; + left: -8.33333%; } + .large-offset-0 { + margin-left: 0%; } + .large-2 { + width: 16.66667%; } + .large-push-2 { + position: relative; + left: 16.66667%; } + .large-pull-2 { + position: relative; + left: -16.66667%; } + .large-offset-1 { + margin-left: 8.33333%; } + .large-3 { + width: 25%; } + .large-push-3 { + position: relative; + left: 25%; } + .large-pull-3 { + position: relative; + left: -25%; } + .large-offset-2 { + margin-left: 16.66667%; } + .large-4 { + width: 33.33333%; } + .large-push-4 { + position: relative; + left: 33.33333%; } + .large-pull-4 { + position: relative; + left: -33.33333%; } + .large-offset-3 { + margin-left: 25%; } + .large-5 { + width: 41.66667%; } + .large-push-5 { + position: relative; + left: 41.66667%; } + .large-pull-5 { + position: relative; + left: -41.66667%; } + .large-offset-4 { + margin-left: 33.33333%; } + .large-6 { + width: 50%; } + .large-push-6 { + position: relative; + left: 50%; } + .large-pull-6 { + position: relative; + left: -50%; } + .large-offset-5 { + margin-left: 41.66667%; } + .large-7 { + width: 58.33333%; } + .large-push-7 { + position: relative; + left: 58.33333%; } + .large-pull-7 { + position: relative; + left: -58.33333%; } + .large-offset-6 { + margin-left: 50%; } + .large-8 { + width: 66.66667%; } + .large-push-8 { + position: relative; + left: 66.66667%; } + .large-pull-8 { + position: relative; + left: -66.66667%; } + .large-offset-7 { + margin-left: 58.33333%; } + .large-9 { + width: 75%; } + .large-push-9 { + position: relative; + left: 75%; } + .large-pull-9 { + position: relative; + left: -75%; } + .large-offset-8 { + margin-left: 66.66667%; } + .large-10 { + width: 83.33333%; } + .large-push-10 { + position: relative; + left: 83.33333%; } + .large-pull-10 { + position: relative; + left: -83.33333%; } + .large-offset-9 { + margin-left: 75%; } + .large-11 { + width: 91.66667%; } + .large-push-11 { + position: relative; + left: 91.66667%; } + .large-pull-11 { + position: relative; + left: -91.66667%; } + .large-offset-10 { + margin-left: 83.33333%; } + .large-12 { + width: 100%; } + .large-offset-11 { + margin-left: 91.66667%; } + .large-up-1 > .column, .large-up-1 > .columns { + float: left; + width: 100%; } + .large-up-1 > .column:nth-of-type(1n), .large-up-1 > .columns:nth-of-type(1n) { + clear: none; } + .large-up-1 > .column:nth-of-type(1n+1), .large-up-1 > .columns:nth-of-type(1n+1) { + clear: both; } + .large-up-1 > .column:last-child, .large-up-1 > .columns:last-child { + float: left; } + .large-up-2 > .column, .large-up-2 > .columns { + float: left; + width: 50%; } + .large-up-2 > .column:nth-of-type(1n), .large-up-2 > .columns:nth-of-type(1n) { + clear: none; } + .large-up-2 > .column:nth-of-type(2n+1), .large-up-2 > .columns:nth-of-type(2n+1) { + clear: both; } + .large-up-2 > .column:last-child, .large-up-2 > .columns:last-child { + float: left; } + .large-up-3 > .column, .large-up-3 > .columns { + float: left; + width: 33.33333%; } + .large-up-3 > .column:nth-of-type(1n), .large-up-3 > .columns:nth-of-type(1n) { + clear: none; } + .large-up-3 > .column:nth-of-type(3n+1), .large-up-3 > .columns:nth-of-type(3n+1) { + clear: both; } + .large-up-3 > .column:last-child, .large-up-3 > .columns:last-child { + float: left; } + .large-up-4 > .column, .large-up-4 > .columns { + float: left; + width: 25%; } + .large-up-4 > .column:nth-of-type(1n), .large-up-4 > .columns:nth-of-type(1n) { + clear: none; } + .large-up-4 > .column:nth-of-type(4n+1), .large-up-4 > .columns:nth-of-type(4n+1) { + clear: both; } + .large-up-4 > .column:last-child, .large-up-4 > .columns:last-child { + float: left; } + .large-up-5 > .column, .large-up-5 > .columns { + float: left; + width: 20%; } + .large-up-5 > .column:nth-of-type(1n), .large-up-5 > .columns:nth-of-type(1n) { + clear: none; } + .large-up-5 > .column:nth-of-type(5n+1), .large-up-5 > .columns:nth-of-type(5n+1) { + clear: both; } + .large-up-5 > .column:last-child, .large-up-5 > .columns:last-child { + float: left; } + .large-up-6 > .column, .large-up-6 > .columns { + float: left; + width: 16.66667%; } + .large-up-6 > .column:nth-of-type(1n), .large-up-6 > .columns:nth-of-type(1n) { + clear: none; } + .large-up-6 > .column:nth-of-type(6n+1), .large-up-6 > .columns:nth-of-type(6n+1) { + clear: both; } + .large-up-6 > .column:last-child, .large-up-6 > .columns:last-child { + float: left; } + .large-up-7 > .column, .large-up-7 > .columns { + float: left; + width: 14.28571%; } + .large-up-7 > .column:nth-of-type(1n), .large-up-7 > .columns:nth-of-type(1n) { + clear: none; } + .large-up-7 > .column:nth-of-type(7n+1), .large-up-7 > .columns:nth-of-type(7n+1) { + clear: both; } + .large-up-7 > .column:last-child, .large-up-7 > .columns:last-child { + float: left; } + .large-up-8 > .column, .large-up-8 > .columns { + float: left; + width: 12.5%; } + .large-up-8 > .column:nth-of-type(1n), .large-up-8 > .columns:nth-of-type(1n) { + clear: none; } + .large-up-8 > .column:nth-of-type(8n+1), .large-up-8 > .columns:nth-of-type(8n+1) { + clear: both; } + .large-up-8 > .column:last-child, .large-up-8 > .columns:last-child { + float: left; } + .large-collapse > .column, .large-collapse > .columns { + padding-right: 0; + padding-left: 0; } + .large-collapse .row { + margin-right: 0; + margin-left: 0; } + .expanded.row .large-collapse.row { + margin-right: 0; + margin-left: 0; } + .large-uncollapse > .column, .large-uncollapse > .columns { + padding-right: 0.9375rem; + padding-left: 0.9375rem; } + .large-centered { + margin-right: auto; + margin-left: auto; } + .large-centered, .large-centered:last-child:not(:first-child) { + float: none; + clear: both; } + .large-uncentered, + .large-push-0, + .large-pull-0 { + position: static; + float: left; + margin-right: 0; + margin-left: 0; } } + +.column-block { + margin-bottom: 1.25rem; } + .column-block > :last-child { + margin-bottom: 0; } + @media print, screen and (min-width: 40em) { + .column-block { + margin-bottom: 1.875rem; } + .column-block > :last-child { + margin-bottom: 0; } } + +div, +dl, +dt, +dd, +ul, +ol, +li, +h1, +h2, +h3, +h4, +h5, +h6, +pre, +form, +p, +blockquote, +th, +td { + margin: 0; + padding: 0; } + +p { + margin-bottom: 1rem; + font-size: inherit; + line-height: 1.6; + text-rendering: optimizeLegibility; } + +em, +i { + font-style: italic; + line-height: inherit; } + +strong, +b { + font-weight: bold; + line-height: inherit; } + +small { + font-size: 80%; + line-height: inherit; } + +h1, +h2, +h3, +h4, +h5, +h6 { + font-family: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif; + font-style: normal; + font-weight: normal; + color: inherit; + text-rendering: optimizeLegibility; } + h1 small, + h2 small, + h3 small, + h4 small, + h5 small, + h6 small { + line-height: 0; + color: #cacaca; } + +h1 { + font-size: 1.5rem; + line-height: 1.4; + margin-top: 0; + margin-bottom: 0.5rem; } + +h2 { + font-size: 1.25rem; + line-height: 1.4; + margin-top: 0; + margin-bottom: 0.5rem; } + +h3 { + font-size: 1.1875rem; + line-height: 1.4; + margin-top: 0; + margin-bottom: 0.5rem; } + +h4 { + font-size: 1.125rem; + line-height: 1.4; + margin-top: 0; + margin-bottom: 0.5rem; } + +h5 { + font-size: 1.0625rem; + line-height: 1.4; + margin-top: 0; + margin-bottom: 0.5rem; } + +h6 { + font-size: 1rem; + line-height: 1.4; + margin-top: 0; + margin-bottom: 0.5rem; } + +@media print, screen and (min-width: 40em) { + h1 { + font-size: 3rem; } + h2 { + font-size: 2.5rem; } + h3 { + font-size: 1.9375rem; } + h4 { + font-size: 1.5625rem; } + h5 { + font-size: 1.25rem; } + h6 { + font-size: 1rem; } } + +a { + line-height: inherit; + color: #1779ba; + text-decoration: none; + cursor: pointer; } + a:hover, a:focus { + color: #1468a0; } + a img { + border: 0; } + +hr { + clear: both; + max-width: 75rem; + height: 0; + margin: 1.25rem auto; + border-top: 0; + border-right: 0; + border-bottom: 1px solid #cacaca; + border-left: 0; } + +ul, +ol, +dl { + margin-bottom: 1rem; + list-style-position: outside; + line-height: 1.6; } + +li { + font-size: inherit; } + +ul { + margin-left: 1.25rem; + list-style-type: disc; } + +ol { + margin-left: 1.25rem; } + +ul ul, ol ul, ul ol, ol ol { + margin-left: 1.25rem; + margin-bottom: 0; } + +dl { + margin-bottom: 1rem; } + dl dt { + margin-bottom: 0.3rem; + font-weight: bold; } + +blockquote { + margin: 0 0 1rem; + padding: 0.5625rem 1.25rem 0 1.1875rem; + border-left: 1px solid #cacaca; } + blockquote, blockquote p { + line-height: 1.6; + color: #8a8a8a; } + +cite { + display: block; + font-size: 0.8125rem; + color: #8a8a8a; } + cite:before { + content: "— "; } + +abbr { + border-bottom: 1px dotted #0a0a0a; + color: #0a0a0a; + cursor: help; } + +figure { + margin: 0; } + +code { + padding: 0.125rem 0.3125rem 0.0625rem; + border: 1px solid #cacaca; + background-color: #e6e6e6; + font-family: Consolas, "Liberation Mono", Courier, monospace; + font-weight: normal; + color: #0a0a0a; } + +kbd { + margin: 0; + padding: 0.125rem 0.25rem 0; + background-color: #e6e6e6; + font-family: Consolas, "Liberation Mono", Courier, monospace; + color: #0a0a0a; } + +.subheader { + margin-top: 0.2rem; + margin-bottom: 0.5rem; + font-weight: normal; + line-height: 1.4; + color: #8a8a8a; } + +.lead { + font-size: 125%; + line-height: 1.6; } + +.stat { + font-size: 2.5rem; + line-height: 1; } + p + .stat { + margin-top: -1rem; } + +.no-bullet { + margin-left: 0; + list-style: none; } + +.text-left { + text-align: left; } + +.text-right { + text-align: right; } + +.text-center { + text-align: center; } + +.text-justify { + text-align: justify; } + +@media print, screen and (min-width: 40em) { + .medium-text-left { + text-align: left; } + .medium-text-right { + text-align: right; } + .medium-text-center { + text-align: center; } + .medium-text-justify { + text-align: justify; } } + +@media print, screen and (min-width: 64em) { + .large-text-left { + text-align: left; } + .large-text-right { + text-align: right; } + .large-text-center { + text-align: center; } + .large-text-justify { + text-align: justify; } } + +.show-for-print { + display: none !important; } + +@media print { + * { + background: transparent !important; + -webkit-box-shadow: none !important; + box-shadow: none !important; + color: black !important; + text-shadow: none !important; } + .show-for-print { + display: block !important; } + .hide-for-print { + display: none !important; } + table.show-for-print { + display: table !important; } + thead.show-for-print { + display: table-header-group !important; } + tbody.show-for-print { + display: table-row-group !important; } + tr.show-for-print { + display: table-row !important; } + td.show-for-print { + display: table-cell !important; } + th.show-for-print { + display: table-cell !important; } + a, + a:visited { + text-decoration: underline; } + a[href]:after { + content: " (" attr(href) ")"; } + .ir a:after, + a[href^='javascript:']:after, + a[href^='#']:after { + content: ''; } + abbr[title]:after { + content: " (" attr(title) ")"; } + pre, + blockquote { + border: 1px solid #8a8a8a; + page-break-inside: avoid; } + thead { + display: table-header-group; } + tr, + img { + page-break-inside: avoid; } + img { + max-width: 100% !important; } + @page { + margin: 0.5cm; } + p, + h2, + h3 { + orphans: 3; + widows: 3; } + h2, + h3 { + page-break-after: avoid; } } + +[type='text'], [type='password'], [type='date'], [type='datetime'], [type='datetime-local'], [type='month'], [type='week'], [type='email'], [type='number'], [type='search'], [type='tel'], [type='time'], [type='url'], [type='color'], +textarea { + display: block; + -webkit-box-sizing: border-box; + box-sizing: border-box; + width: 100%; + height: 2.4375rem; + margin: 0 0 1rem; + padding: 0.5rem; + border: 1px solid #cacaca; + border-radius: 0; + background-color: #fefefe; + -webkit-box-shadow: inset 0 1px 2px rgba(10, 10, 10, 0.1); + box-shadow: inset 0 1px 2px rgba(10, 10, 10, 0.1); + font-family: inherit; + font-size: 1rem; + font-weight: normal; + color: #0a0a0a; + -webkit-transition: border-color 0.25s ease-in-out, -webkit-box-shadow 0.5s; + transition: border-color 0.25s ease-in-out, -webkit-box-shadow 0.5s; + transition: box-shadow 0.5s, border-color 0.25s ease-in-out; + transition: box-shadow 0.5s, border-color 0.25s ease-in-out, -webkit-box-shadow 0.5s; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; } + [type='text']:focus, [type='password']:focus, [type='date']:focus, [type='datetime']:focus, [type='datetime-local']:focus, [type='month']:focus, [type='week']:focus, [type='email']:focus, [type='number']:focus, [type='search']:focus, [type='tel']:focus, [type='time']:focus, [type='url']:focus, [type='color']:focus, + textarea:focus { + outline: none; + border: 1px solid #8a8a8a; + background-color: #fefefe; + -webkit-box-shadow: 0 0 5px #cacaca; + box-shadow: 0 0 5px #cacaca; + -webkit-transition: border-color 0.25s ease-in-out, -webkit-box-shadow 0.5s; + transition: border-color 0.25s ease-in-out, -webkit-box-shadow 0.5s; + transition: box-shadow 0.5s, border-color 0.25s ease-in-out; + transition: box-shadow 0.5s, border-color 0.25s ease-in-out, -webkit-box-shadow 0.5s; } + +textarea { + max-width: 100%; } + textarea[rows] { + height: auto; } + +input::-webkit-input-placeholder, +textarea::-webkit-input-placeholder { + color: #cacaca; } + +input::-moz-placeholder, +textarea::-moz-placeholder { + color: #cacaca; } + +input:-ms-input-placeholder, +textarea:-ms-input-placeholder { + color: #cacaca; } + +input::placeholder, +textarea::placeholder { + color: #cacaca; } + +input:disabled, input[readonly], +textarea:disabled, +textarea[readonly] { + background-color: #e6e6e6; + cursor: not-allowed; } + +[type='submit'], +[type='button'] { + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + border-radius: 0; } + +input[type='search'] { + -webkit-box-sizing: border-box; + box-sizing: border-box; } + +[type='file'], +[type='checkbox'], +[type='radio'] { + margin: 0 0 1rem; } + +[type='checkbox'] + label, +[type='radio'] + label { + display: inline-block; + vertical-align: baseline; + margin-left: 0.5rem; + margin-right: 1rem; + margin-bottom: 0; } + [type='checkbox'] + label[for], + [type='radio'] + label[for] { + cursor: pointer; } + +label > [type='checkbox'], +label > [type='radio'] { + margin-right: 0.5rem; } + +[type='file'] { + width: 100%; } + +label { + display: block; + margin: 0; + font-size: 0.875rem; + font-weight: normal; + line-height: 1.8; + color: #0a0a0a; } + label.middle { + margin: 0 0 1rem; + padding: 0.5625rem 0; } + +.help-text { + margin-top: -0.5rem; + font-size: 0.8125rem; + font-style: italic; + color: #0a0a0a; } + +.input-group { + display: table; + width: 100%; + margin-bottom: 1rem; } + .input-group > :first-child { + border-radius: 0 0 0 0; } + .input-group > :last-child > * { + border-radius: 0 0 0 0; } + +.input-group-label, .input-group-field, .input-group-button, .input-group-button a, +.input-group-button input, +.input-group-button button, +.input-group-button label { + margin: 0; + white-space: nowrap; + display: table-cell; + vertical-align: middle; } + +.input-group-label { + padding: 0 1rem; + border: 1px solid #cacaca; + background: #e6e6e6; + color: #0a0a0a; + text-align: center; + white-space: nowrap; + width: 1%; + height: 100%; } + .input-group-label:first-child { + border-right: 0; } + .input-group-label:last-child { + border-left: 0; } + +.input-group-field { + border-radius: 0; + height: 2.5rem; } + +.input-group-button { + padding-top: 0; + padding-bottom: 0; + text-align: center; + width: 1%; + height: 100%; } + .input-group-button a, + .input-group-button input, + .input-group-button button, + .input-group-button label { + height: 2.5rem; + padding-top: 0; + padding-bottom: 0; + font-size: 1rem; } + +.input-group .input-group-button { + display: table-cell; } + +fieldset { + margin: 0; + padding: 0; + border: 0; } + +legend { + max-width: 100%; + margin-bottom: 0.5rem; } + +.fieldset { + margin: 1.125rem 0; + padding: 1.25rem; + border: 1px solid #cacaca; } + .fieldset legend { + margin: 0; + margin-left: -0.1875rem; + padding: 0 0.1875rem; + background: #fefefe; } + +select { + height: 2.4375rem; + margin: 0 0 1rem; + padding: 0.5rem; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + border: 1px solid #cacaca; + border-radius: 0; + background-color: #fefefe; + font-family: inherit; + font-size: 1rem; + line-height: normal; + color: #0a0a0a; + background-image: url("data:image/svg+xml;utf8,"); + -webkit-background-origin: content-box; + background-origin: content-box; + background-position: right -1rem center; + background-repeat: no-repeat; + -webkit-background-size: 9px 6px; + background-size: 9px 6px; + padding-right: 1.5rem; + -webkit-transition: border-color 0.25s ease-in-out, -webkit-box-shadow 0.5s; + transition: border-color 0.25s ease-in-out, -webkit-box-shadow 0.5s; + transition: box-shadow 0.5s, border-color 0.25s ease-in-out; + transition: box-shadow 0.5s, border-color 0.25s ease-in-out, -webkit-box-shadow 0.5s; } + @media screen and (min-width: 0\0) { + select { + background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAYCAYAAACbU/80AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAIpJREFUeNrEkckNgDAMBBfRkEt0ObRBBdsGXUDgmQfK4XhH2m8czQAAy27R3tsw4Qfe2x8uOO6oYLb6GlOor3GF+swURAOmUJ+RwtEJs9WvTGEYxBXqI1MQAZhCfUQKRzDMVj+TwrAIV6jvSUEkYAr1LSkcyTBb/V+KYfX7xAeusq3sLDtGH3kEGACPWIflNZfhRQAAAABJRU5ErkJggg=="); } } + select:focus { + outline: none; + border: 1px solid #8a8a8a; + background-color: #fefefe; + -webkit-box-shadow: 0 0 5px #cacaca; + box-shadow: 0 0 5px #cacaca; + -webkit-transition: border-color 0.25s ease-in-out, -webkit-box-shadow 0.5s; + transition: border-color 0.25s ease-in-out, -webkit-box-shadow 0.5s; + transition: box-shadow 0.5s, border-color 0.25s ease-in-out; + transition: box-shadow 0.5s, border-color 0.25s ease-in-out, -webkit-box-shadow 0.5s; } + select:disabled { + background-color: #e6e6e6; + cursor: not-allowed; } + select::-ms-expand { + display: none; } + select[multiple] { + height: auto; + background-image: none; } + +.is-invalid-input:not(:focus) { + border-color: #cc4b37; + background-color: #f9ecea; } + .is-invalid-input:not(:focus)::-webkit-input-placeholder { + color: #cc4b37; } + .is-invalid-input:not(:focus)::-moz-placeholder { + color: #cc4b37; } + .is-invalid-input:not(:focus):-ms-input-placeholder { + color: #cc4b37; } + .is-invalid-input:not(:focus)::placeholder { + color: #cc4b37; } + +.is-invalid-label { + color: #cc4b37; } + +.form-error { + display: none; + margin-top: -0.5rem; + margin-bottom: 1rem; + font-size: 0.75rem; + font-weight: bold; + color: #cc4b37; } + .form-error.is-visible { + display: block; } + +.button { + display: inline-block; + vertical-align: middle; + margin: 0 0 1rem 0; + padding: 0.85em 1em; + -webkit-appearance: none; + border: 1px solid transparent; + border-radius: 0; + -webkit-transition: background-color 0.25s ease-out, color 0.25s ease-out; + transition: background-color 0.25s ease-out, color 0.25s ease-out; + font-size: 0.9rem; + line-height: 1; + text-align: center; + cursor: pointer; + background-color: #1779ba; + color: #fefefe; } + [data-whatinput='mouse'] .button { + outline: 0; } + .button:hover, .button:focus { + background-color: #14679e; + color: #fefefe; } + .button.tiny { + font-size: 0.6rem; } + .button.small { + font-size: 0.75rem; } + .button.large { + font-size: 1.25rem; } + .button.expanded { + display: block; + width: 100%; + margin-right: 0; + margin-left: 0; } + .button.primary { + background-color: #1779ba; + color: #fefefe; } + .button.primary:hover, .button.primary:focus { + background-color: #126195; + color: #fefefe; } + .button.secondary { + background-color: #767676; + color: #fefefe; } + .button.secondary:hover, .button.secondary:focus { + background-color: #5e5e5e; + color: #fefefe; } + .button.success { + background-color: #3adb76; + color: #0a0a0a; } + .button.success:hover, .button.success:focus { + background-color: #22bb5b; + color: #0a0a0a; } + .button.warning { + background-color: #ffae00; + color: #0a0a0a; } + .button.warning:hover, .button.warning:focus { + background-color: #cc8b00; + color: #0a0a0a; } + .button.alert { + background-color: #cc4b37; + color: #fefefe; } + .button.alert:hover, .button.alert:focus { + background-color: #a53b2a; + color: #fefefe; } + .button.hollow { + border: 1px solid #1779ba; + color: #1779ba; } + .button.hollow, .button.hollow:hover, .button.hollow:focus { + background-color: transparent; } + .button.hollow:hover, .button.hollow:focus { + border-color: #0c3d5d; + color: #0c3d5d; } + .button.hollow.primary { + border: 1px solid #1779ba; + color: #1779ba; } + .button.hollow.primary:hover, .button.hollow.primary:focus { + border-color: #0c3d5d; + color: #0c3d5d; } + .button.hollow.secondary { + border: 1px solid #767676; + color: #767676; } + .button.hollow.secondary:hover, .button.hollow.secondary:focus { + border-color: #3b3b3b; + color: #3b3b3b; } + .button.hollow.success { + border: 1px solid #3adb76; + color: #3adb76; } + .button.hollow.success:hover, .button.hollow.success:focus { + border-color: #157539; + color: #157539; } + .button.hollow.warning { + border: 1px solid #ffae00; + color: #ffae00; } + .button.hollow.warning:hover, .button.hollow.warning:focus { + border-color: #805700; + color: #805700; } + .button.hollow.alert { + border: 1px solid #cc4b37; + color: #cc4b37; } + .button.hollow.alert:hover, .button.hollow.alert:focus { + border-color: #67251a; + color: #67251a; } + .button.disabled, .button[disabled] { + opacity: 0.25; + cursor: not-allowed; } + .button.disabled, .button.disabled:hover, .button.disabled:focus, .button[disabled], .button[disabled]:hover, .button[disabled]:focus { + background-color: #1779ba; + color: #fefefe; } + .button.disabled.primary, .button[disabled].primary { + opacity: 0.25; + cursor: not-allowed; } + .button.disabled.primary, .button.disabled.primary:hover, .button.disabled.primary:focus, .button[disabled].primary, .button[disabled].primary:hover, .button[disabled].primary:focus { + background-color: #1779ba; + color: #fefefe; } + .button.disabled.secondary, .button[disabled].secondary { + opacity: 0.25; + cursor: not-allowed; } + .button.disabled.secondary, .button.disabled.secondary:hover, .button.disabled.secondary:focus, .button[disabled].secondary, .button[disabled].secondary:hover, .button[disabled].secondary:focus { + background-color: #767676; + color: #fefefe; } + .button.disabled.success, .button[disabled].success { + opacity: 0.25; + cursor: not-allowed; } + .button.disabled.success, .button.disabled.success:hover, .button.disabled.success:focus, .button[disabled].success, .button[disabled].success:hover, .button[disabled].success:focus { + background-color: #3adb76; + color: #0a0a0a; } + .button.disabled.warning, .button[disabled].warning { + opacity: 0.25; + cursor: not-allowed; } + .button.disabled.warning, .button.disabled.warning:hover, .button.disabled.warning:focus, .button[disabled].warning, .button[disabled].warning:hover, .button[disabled].warning:focus { + background-color: #ffae00; + color: #0a0a0a; } + .button.disabled.alert, .button[disabled].alert { + opacity: 0.25; + cursor: not-allowed; } + .button.disabled.alert, .button.disabled.alert:hover, .button.disabled.alert:focus, .button[disabled].alert, .button[disabled].alert:hover, .button[disabled].alert:focus { + background-color: #cc4b37; + color: #fefefe; } + .button.dropdown::after { + display: block; + width: 0; + height: 0; + border: inset 0.4em; + content: ''; + border-bottom-width: 0; + border-top-style: solid; + border-color: #fefefe transparent transparent; + position: relative; + top: 0.4em; + display: inline-block; + float: right; + margin-left: 1em; } + .button.arrow-only::after { + top: -0.1em; + float: none; + margin-left: 0; } + +.accordion { + margin-left: 0; + background: #fefefe; + list-style-type: none; } + +.accordion-item:first-child > :first-child { + border-radius: 0 0 0 0; } + +.accordion-item:last-child > :last-child { + border-radius: 0 0 0 0; } + +.accordion-title { + position: relative; + display: block; + padding: 1.25rem 1rem; + border: 1px solid #e6e6e6; + border-bottom: 0; + font-size: 0.75rem; + line-height: 1; + color: #1779ba; } + :last-child:not(.is-active) > .accordion-title { + border-bottom: 1px solid #e6e6e6; + border-radius: 0 0 0 0; } + .accordion-title:hover, .accordion-title:focus { + background-color: #e6e6e6; } + .accordion-title::before { + position: absolute; + top: 50%; + right: 1rem; + margin-top: -0.5rem; + content: '+'; } + .is-active > .accordion-title::before { + content: '\2013'; } + +.accordion-content { + display: none; + padding: 1rem; + border: 1px solid #e6e6e6; + border-bottom: 0; + background-color: #fefefe; + color: #0a0a0a; } + :last-child > .accordion-content:last-child { + border-bottom: 1px solid #e6e6e6; } + +.is-accordion-submenu-parent > a { + position: relative; } + .is-accordion-submenu-parent > a::after { + display: block; + width: 0; + height: 0; + border: inset 6px; + content: ''; + border-bottom-width: 0; + border-top-style: solid; + border-color: #1779ba transparent transparent; + position: absolute; + top: 50%; + margin-top: -3px; + right: 1rem; } + +.is-accordion-submenu-parent[aria-expanded='true'] > a::after { + -webkit-transform: rotate(180deg); + -ms-transform: rotate(180deg); + transform: rotate(180deg); + -webkit-transform-origin: 50% 50%; + -ms-transform-origin: 50% 50%; + transform-origin: 50% 50%; } + +.badge { + display: inline-block; + min-width: 2.1em; + padding: 0.3em; + border-radius: 50%; + font-size: 0.6rem; + text-align: center; + background: #1779ba; + color: #fefefe; } + .badge.primary { + background: #1779ba; + color: #fefefe; } + .badge.secondary { + background: #767676; + color: #fefefe; } + .badge.success { + background: #3adb76; + color: #0a0a0a; } + .badge.warning { + background: #ffae00; + color: #0a0a0a; } + .badge.alert { + background: #cc4b37; + color: #fefefe; } + +.breadcrumbs { + margin: 0 0 1rem 0; + list-style: none; } + .breadcrumbs::before, .breadcrumbs::after { + display: table; + content: ' '; } + .breadcrumbs::after { + clear: both; } + .breadcrumbs li { + float: left; + font-size: 0.6875rem; + color: #0a0a0a; + cursor: default; + text-transform: uppercase; } + .breadcrumbs li:not(:last-child)::after { + position: relative; + top: 1px; + margin: 0 0.75rem; + opacity: 1; + content: "/"; + color: #cacaca; } + .breadcrumbs a { + color: #1779ba; } + .breadcrumbs a:hover { + text-decoration: underline; } + .breadcrumbs .disabled { + color: #cacaca; + cursor: not-allowed; } + +.button-group { + margin-bottom: 1rem; + font-size: 0; } + .button-group::before, .button-group::after { + display: table; + content: ' '; } + .button-group::after { + clear: both; } + .button-group .button { + margin: 0; + margin-right: 1px; + margin-bottom: 1px; + font-size: 0.9rem; } + .button-group .button:last-child { + margin-right: 0; } + .button-group.tiny .button { + font-size: 0.6rem; } + .button-group.small .button { + font-size: 0.75rem; } + .button-group.large .button { + font-size: 1.25rem; } + .button-group.expanded { + margin-right: -1px; } + .button-group.expanded::before, .button-group.expanded::after { + display: none; } + .button-group.expanded .button:first-child:last-child { + width: 100%; } + .button-group.expanded .button:first-child:nth-last-child(2), .button-group.expanded .button:first-child:nth-last-child(2):first-child:nth-last-child(2) ~ .button { + display: inline-block; + width: calc(50% - 1px); + margin-right: 1px; } + .button-group.expanded .button:first-child:nth-last-child(2):last-child, .button-group.expanded .button:first-child:nth-last-child(2):first-child:nth-last-child(2) ~ .button:last-child { + margin-right: -6px; } + .button-group.expanded .button:first-child:nth-last-child(3), .button-group.expanded .button:first-child:nth-last-child(3):first-child:nth-last-child(3) ~ .button { + display: inline-block; + width: calc(33.33333% - 1px); + margin-right: 1px; } + .button-group.expanded .button:first-child:nth-last-child(3):last-child, .button-group.expanded .button:first-child:nth-last-child(3):first-child:nth-last-child(3) ~ .button:last-child { + margin-right: -6px; } + .button-group.expanded .button:first-child:nth-last-child(4), .button-group.expanded .button:first-child:nth-last-child(4):first-child:nth-last-child(4) ~ .button { + display: inline-block; + width: calc(25% - 1px); + margin-right: 1px; } + .button-group.expanded .button:first-child:nth-last-child(4):last-child, .button-group.expanded .button:first-child:nth-last-child(4):first-child:nth-last-child(4) ~ .button:last-child { + margin-right: -6px; } + .button-group.expanded .button:first-child:nth-last-child(5), .button-group.expanded .button:first-child:nth-last-child(5):first-child:nth-last-child(5) ~ .button { + display: inline-block; + width: calc(20% - 1px); + margin-right: 1px; } + .button-group.expanded .button:first-child:nth-last-child(5):last-child, .button-group.expanded .button:first-child:nth-last-child(5):first-child:nth-last-child(5) ~ .button:last-child { + margin-right: -6px; } + .button-group.expanded .button:first-child:nth-last-child(6), .button-group.expanded .button:first-child:nth-last-child(6):first-child:nth-last-child(6) ~ .button { + display: inline-block; + width: calc(16.66667% - 1px); + margin-right: 1px; } + .button-group.expanded .button:first-child:nth-last-child(6):last-child, .button-group.expanded .button:first-child:nth-last-child(6):first-child:nth-last-child(6) ~ .button:last-child { + margin-right: -6px; } + .button-group.primary .button { + background-color: #1779ba; + color: #fefefe; } + .button-group.primary .button:hover, .button-group.primary .button:focus { + background-color: #126195; + color: #fefefe; } + .button-group.secondary .button { + background-color: #767676; + color: #fefefe; } + .button-group.secondary .button:hover, .button-group.secondary .button:focus { + background-color: #5e5e5e; + color: #fefefe; } + .button-group.success .button { + background-color: #3adb76; + color: #0a0a0a; } + .button-group.success .button:hover, .button-group.success .button:focus { + background-color: #22bb5b; + color: #0a0a0a; } + .button-group.warning .button { + background-color: #ffae00; + color: #0a0a0a; } + .button-group.warning .button:hover, .button-group.warning .button:focus { + background-color: #cc8b00; + color: #0a0a0a; } + .button-group.alert .button { + background-color: #cc4b37; + color: #fefefe; } + .button-group.alert .button:hover, .button-group.alert .button:focus { + background-color: #a53b2a; + color: #fefefe; } + .button-group.stacked .button, .button-group.stacked-for-small .button, .button-group.stacked-for-medium .button { + width: 100%; } + .button-group.stacked .button:last-child, .button-group.stacked-for-small .button:last-child, .button-group.stacked-for-medium .button:last-child { + margin-bottom: 0; } + @media print, screen and (min-width: 40em) { + .button-group.stacked-for-small .button { + width: auto; + margin-bottom: 0; } } + @media print, screen and (min-width: 64em) { + .button-group.stacked-for-medium .button { + width: auto; + margin-bottom: 0; } } + @media screen and (max-width: 39.9375em) { + .button-group.stacked-for-small.expanded { + display: block; } + .button-group.stacked-for-small.expanded .button { + display: block; + margin-right: 0; } } + +.callout { + position: relative; + margin: 0 0 1rem 0; + padding: 1rem; + border: 1px solid rgba(10, 10, 10, 0.25); + border-radius: 0; + background-color: white; + color: #0a0a0a; } + .callout > :first-child { + margin-top: 0; } + .callout > :last-child { + margin-bottom: 0; } + .callout.primary { + background-color: #d7ecfa; + color: #0a0a0a; } + .callout.secondary { + background-color: #eaeaea; + color: #0a0a0a; } + .callout.success { + background-color: #e1faea; + color: #0a0a0a; } + .callout.warning { + background-color: #fff3d9; + color: #0a0a0a; } + .callout.alert { + background-color: #f7e4e1; + color: #0a0a0a; } + .callout.small { + padding-top: 0.5rem; + padding-right: 0.5rem; + padding-bottom: 0.5rem; + padding-left: 0.5rem; } + .callout.large { + padding-top: 3rem; + padding-right: 3rem; + padding-bottom: 3rem; + padding-left: 3rem; } + +.card { + margin-bottom: 1rem; + border: 1px solid #e6e6e6; + border-radius: 0; + background: #fefefe; + -webkit-box-shadow: none; + box-shadow: none; + overflow: hidden; + color: #0a0a0a; } + .card > :last-child { + margin-bottom: 0; } + +.card-divider { + padding: 1rem; + background: #e6e6e6; } + .card-divider > :last-child { + margin-bottom: 0; } + +.card-section { + padding: 1rem; } + .card-section > :last-child { + margin-bottom: 0; } + +.close-button { + position: absolute; + color: #8a8a8a; + cursor: pointer; } + [data-whatinput='mouse'] .close-button { + outline: 0; } + .close-button:hover, .close-button:focus { + color: #0a0a0a; } + .close-button.small { + right: 0.66rem; + top: 0.33em; + font-size: 1.5em; + line-height: 1; } + .close-button, .close-button.medium { + right: 1rem; + top: 0.5rem; + font-size: 2em; + line-height: 1; } + +.menu { + margin: 0; + list-style-type: none; } + .menu > li { + display: table-cell; + vertical-align: middle; } + [data-whatinput='mouse'] .menu > li { + outline: 0; } + .menu > li > a { + display: block; + padding: 0.7rem 1rem; + line-height: 1; } + .menu input, + .menu select, + .menu a, + .menu button { + margin-bottom: 0; } + .menu > li > a img, + .menu > li > a i, + .menu > li > a svg { + vertical-align: middle; } + .menu > li > a img + span, + .menu > li > a i + span, + .menu > li > a svg + span { + vertical-align: middle; } + .menu > li > a img, + .menu > li > a i, + .menu > li > a svg { + margin-right: 0.25rem; + display: inline-block; } + .menu > li, .menu.horizontal > li { + display: table-cell; } + .menu.expanded { + display: table; + width: 100%; + table-layout: fixed; } + .menu.expanded > li:first-child:last-child { + width: 100%; } + .menu.vertical > li { + display: block; } + @media print, screen and (min-width: 40em) { + .menu.medium-horizontal > li { + display: table-cell; } + .menu.medium-expanded { + display: table; + width: 100%; + table-layout: fixed; } + .menu.medium-expanded > li:first-child:last-child { + width: 100%; } + .menu.medium-vertical > li { + display: block; } } + @media print, screen and (min-width: 64em) { + .menu.large-horizontal > li { + display: table-cell; } + .menu.large-expanded { + display: table; + width: 100%; + table-layout: fixed; } + .menu.large-expanded > li:first-child:last-child { + width: 100%; } + .menu.large-vertical > li { + display: block; } } + .menu.simple li { + display: inline-block; + vertical-align: top; + line-height: 1; } + .menu.simple a { + padding: 0; } + .menu.simple li { + margin-left: 0; + margin-right: 1rem; } + .menu.simple.align-right li { + margin-right: 0; + margin-left: 1rem; } + .menu.align-right::before, .menu.align-right::after { + display: table; + content: ' '; } + .menu.align-right::after { + clear: both; } + .menu.align-right > li { + float: right; } + .menu.icon-top > li > a { + text-align: center; } + .menu.icon-top > li > a img, + .menu.icon-top > li > a i, + .menu.icon-top > li > a svg { + display: block; + margin: 0 auto 0.25rem; } + .menu.icon-top.vertical a > span { + margin: auto; } + .menu.nested { + margin-left: 1rem; } + .menu .active > a { + background: #1779ba; + color: #fefefe; } + .menu.menu-bordered li { + border: 1px solid #e6e6e6; } + .menu.menu-bordered li:not(:first-child) { + border-top: 0; } + .menu.menu-hover li:hover { + background-color: #e6e6e6; } + +.menu-text { + padding-top: 0; + padding-bottom: 0; + padding: 0.7rem 1rem; + font-weight: bold; + line-height: 1; + color: inherit; } + +.menu-centered { + text-align: center; } + .menu-centered > .menu { + display: inline-block; + vertical-align: top; } + +.no-js [data-responsive-menu] ul { + display: none; } + +.menu-icon { + position: relative; + display: inline-block; + vertical-align: middle; + width: 20px; + height: 16px; + cursor: pointer; } + .menu-icon::after { + position: absolute; + top: 0; + left: 0; + display: block; + width: 100%; + height: 2px; + background: #fefefe; + -webkit-box-shadow: 0 7px 0 #fefefe, 0 14px 0 #fefefe; + box-shadow: 0 7px 0 #fefefe, 0 14px 0 #fefefe; + content: ''; } + .menu-icon:hover::after { + background: #cacaca; + -webkit-box-shadow: 0 7px 0 #cacaca, 0 14px 0 #cacaca; + box-shadow: 0 7px 0 #cacaca, 0 14px 0 #cacaca; } + +.menu-icon.dark { + position: relative; + display: inline-block; + vertical-align: middle; + width: 20px; + height: 16px; + cursor: pointer; } + .menu-icon.dark::after { + position: absolute; + top: 0; + left: 0; + display: block; + width: 100%; + height: 2px; + background: #0a0a0a; + -webkit-box-shadow: 0 7px 0 #0a0a0a, 0 14px 0 #0a0a0a; + box-shadow: 0 7px 0 #0a0a0a, 0 14px 0 #0a0a0a; + content: ''; } + .menu-icon.dark:hover::after { + background: #8a8a8a; + -webkit-box-shadow: 0 7px 0 #8a8a8a, 0 14px 0 #8a8a8a; + box-shadow: 0 7px 0 #8a8a8a, 0 14px 0 #8a8a8a; } + +.is-drilldown { + position: relative; + overflow: hidden; } + .is-drilldown li { + display: block; } + .is-drilldown.animate-height { + -webkit-transition: height 0.5s; + transition: height 0.5s; } + +.is-drilldown-submenu { + position: absolute; + top: 0; + left: 100%; + z-index: -1; + width: 100%; + background: #fefefe; + -webkit-transition: -webkit-transform 0.15s linear; + transition: -webkit-transform 0.15s linear; + transition: transform 0.15s linear; + transition: transform 0.15s linear, -webkit-transform 0.15s linear; } + .is-drilldown-submenu.is-active { + z-index: 1; + display: block; + -webkit-transform: translateX(-100%); + -ms-transform: translateX(-100%); + transform: translateX(-100%); } + .is-drilldown-submenu.is-closing { + -webkit-transform: translateX(100%); + -ms-transform: translateX(100%); + transform: translateX(100%); } + +.drilldown-submenu-cover-previous { + min-height: 100%; } + +.is-drilldown-submenu-parent > a { + position: relative; } + .is-drilldown-submenu-parent > a::after { + display: block; + width: 0; + height: 0; + border: inset 6px; + content: ''; + border-right-width: 0; + border-left-style: solid; + border-color: transparent transparent transparent #1779ba; + position: absolute; + top: 50%; + margin-top: -6px; + right: 1rem; } + +.js-drilldown-back > a::before { + display: block; + width: 0; + height: 0; + border: inset 6px; + content: ''; + border-left-width: 0; + border-right-style: solid; + border-color: transparent #1779ba transparent transparent; + border-left-width: 0; + display: inline-block; + vertical-align: middle; + margin-right: 0.75rem; + border-left-width: 0; } + +.dropdown-pane { + position: absolute; + z-index: 10; + display: block; + width: 300px; + padding: 1rem; + visibility: hidden; + border: 1px solid #cacaca; + border-radius: 0; + background-color: #fefefe; + font-size: 1rem; } + .dropdown-pane.is-open { + visibility: visible; } + +.dropdown-pane.tiny { + width: 100px; } + +.dropdown-pane.small { + width: 200px; } + +.dropdown-pane.large { + width: 400px; } + +.dropdown.menu > li.opens-left > .is-dropdown-submenu { + top: 100%; + right: 0; + left: auto; } + +.dropdown.menu > li.opens-right > .is-dropdown-submenu { + top: 100%; + right: auto; + left: 0; } + +.dropdown.menu > li.is-dropdown-submenu-parent > a { + position: relative; + padding-right: 1.5rem; } + +.dropdown.menu > li.is-dropdown-submenu-parent > a::after { + display: block; + width: 0; + height: 0; + border: inset 6px; + content: ''; + border-bottom-width: 0; + border-top-style: solid; + border-color: #1779ba transparent transparent; + right: 5px; + margin-top: -3px; } + +[data-whatinput='mouse'] .dropdown.menu a { + outline: 0; } + +.no-js .dropdown.menu ul { + display: none; } + +.dropdown.menu.vertical > li .is-dropdown-submenu { + top: 0; } + +.dropdown.menu.vertical > li.opens-left > .is-dropdown-submenu { + right: 100%; + left: auto; } + +.dropdown.menu.vertical > li.opens-right > .is-dropdown-submenu { + right: auto; + left: 100%; } + +.dropdown.menu.vertical > li > a::after { + right: 14px; } + +.dropdown.menu.vertical > li.opens-left > a::after { + display: block; + width: 0; + height: 0; + border: inset 6px; + content: ''; + border-left-width: 0; + border-right-style: solid; + border-color: transparent #1779ba transparent transparent; } + +.dropdown.menu.vertical > li.opens-right > a::after { + display: block; + width: 0; + height: 0; + border: inset 6px; + content: ''; + border-right-width: 0; + border-left-style: solid; + border-color: transparent transparent transparent #1779ba; } + +@media print, screen and (min-width: 40em) { + .dropdown.menu.medium-horizontal > li.opens-left > .is-dropdown-submenu { + top: 100%; + right: 0; + left: auto; } + .dropdown.menu.medium-horizontal > li.opens-right > .is-dropdown-submenu { + top: 100%; + right: auto; + left: 0; } + .dropdown.menu.medium-horizontal > li.is-dropdown-submenu-parent > a { + position: relative; + padding-right: 1.5rem; } + .dropdown.menu.medium-horizontal > li.is-dropdown-submenu-parent > a::after { + display: block; + width: 0; + height: 0; + border: inset 6px; + content: ''; + border-bottom-width: 0; + border-top-style: solid; + border-color: #1779ba transparent transparent; + right: 5px; + margin-top: -3px; } + .dropdown.menu.medium-vertical > li .is-dropdown-submenu { + top: 0; } + .dropdown.menu.medium-vertical > li.opens-left > .is-dropdown-submenu { + right: 100%; + left: auto; } + .dropdown.menu.medium-vertical > li.opens-right > .is-dropdown-submenu { + right: auto; + left: 100%; } + .dropdown.menu.medium-vertical > li > a::after { + right: 14px; } + .dropdown.menu.medium-vertical > li.opens-left > a::after { + display: block; + width: 0; + height: 0; + border: inset 6px; + content: ''; + border-left-width: 0; + border-right-style: solid; + border-color: transparent #1779ba transparent transparent; } + .dropdown.menu.medium-vertical > li.opens-right > a::after { + display: block; + width: 0; + height: 0; + border: inset 6px; + content: ''; + border-right-width: 0; + border-left-style: solid; + border-color: transparent transparent transparent #1779ba; } } + +@media print, screen and (min-width: 64em) { + .dropdown.menu.large-horizontal > li.opens-left > .is-dropdown-submenu { + top: 100%; + right: 0; + left: auto; } + .dropdown.menu.large-horizontal > li.opens-right > .is-dropdown-submenu { + top: 100%; + right: auto; + left: 0; } + .dropdown.menu.large-horizontal > li.is-dropdown-submenu-parent > a { + position: relative; + padding-right: 1.5rem; } + .dropdown.menu.large-horizontal > li.is-dropdown-submenu-parent > a::after { + display: block; + width: 0; + height: 0; + border: inset 6px; + content: ''; + border-bottom-width: 0; + border-top-style: solid; + border-color: #1779ba transparent transparent; + right: 5px; + margin-top: -3px; } + .dropdown.menu.large-vertical > li .is-dropdown-submenu { + top: 0; } + .dropdown.menu.large-vertical > li.opens-left > .is-dropdown-submenu { + right: 100%; + left: auto; } + .dropdown.menu.large-vertical > li.opens-right > .is-dropdown-submenu { + right: auto; + left: 100%; } + .dropdown.menu.large-vertical > li > a::after { + right: 14px; } + .dropdown.menu.large-vertical > li.opens-left > a::after { + display: block; + width: 0; + height: 0; + border: inset 6px; + content: ''; + border-left-width: 0; + border-right-style: solid; + border-color: transparent #1779ba transparent transparent; } + .dropdown.menu.large-vertical > li.opens-right > a::after { + display: block; + width: 0; + height: 0; + border: inset 6px; + content: ''; + border-right-width: 0; + border-left-style: solid; + border-color: transparent transparent transparent #1779ba; } } + +.dropdown.menu.align-right .is-dropdown-submenu.first-sub { + top: 100%; + right: 0; + left: auto; } + +.is-dropdown-menu.vertical { + width: 100px; } + .is-dropdown-menu.vertical.align-right { + float: right; } + +.is-dropdown-submenu-parent { + position: relative; } + .is-dropdown-submenu-parent a::after { + position: absolute; + top: 50%; + right: 5px; + margin-top: -6px; } + .is-dropdown-submenu-parent.opens-inner > .is-dropdown-submenu { + top: 100%; + left: auto; } + .is-dropdown-submenu-parent.opens-left > .is-dropdown-submenu { + right: 100%; + left: auto; } + .is-dropdown-submenu-parent.opens-right > .is-dropdown-submenu { + right: auto; + left: 100%; } + +.is-dropdown-submenu { + position: absolute; + top: 0; + left: 100%; + z-index: 1; + display: none; + min-width: 200px; + border: 1px solid #cacaca; + background: #fefefe; } + .is-dropdown-submenu .is-dropdown-submenu-parent > a::after { + right: 14px; } + .is-dropdown-submenu .is-dropdown-submenu-parent.opens-left > a::after { + display: block; + width: 0; + height: 0; + border: inset 6px; + content: ''; + border-left-width: 0; + border-right-style: solid; + border-color: transparent #1779ba transparent transparent; } + .is-dropdown-submenu .is-dropdown-submenu-parent.opens-right > a::after { + display: block; + width: 0; + height: 0; + border: inset 6px; + content: ''; + border-right-width: 0; + border-left-style: solid; + border-color: transparent transparent transparent #1779ba; } + .is-dropdown-submenu .is-dropdown-submenu { + margin-top: -1px; } + .is-dropdown-submenu > li { + width: 100%; } + .is-dropdown-submenu.js-dropdown-active { + display: block; } + +.responsive-embed, +.flex-video { + position: relative; + height: 0; + margin-bottom: 1rem; + padding-bottom: 75%; + overflow: hidden; } + .responsive-embed iframe, + .responsive-embed object, + .responsive-embed embed, + .responsive-embed video, + .flex-video iframe, + .flex-video object, + .flex-video embed, + .flex-video video { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; } + .responsive-embed.widescreen, + .flex-video.widescreen { + padding-bottom: 56.25%; } + +.label { + display: inline-block; + padding: 0.33333rem 0.5rem; + border-radius: 0; + font-size: 0.8rem; + line-height: 1; + white-space: nowrap; + cursor: default; + background: #1779ba; + color: #fefefe; } + .label.primary { + background: #1779ba; + color: #fefefe; } + .label.secondary { + background: #767676; + color: #fefefe; } + .label.success { + background: #3adb76; + color: #0a0a0a; } + .label.warning { + background: #ffae00; + color: #0a0a0a; } + .label.alert { + background: #cc4b37; + color: #fefefe; } + +.media-object { + display: block; + margin-bottom: 1rem; } + .media-object img { + max-width: none; } + @media screen and (max-width: 39.9375em) { + .media-object.stack-for-small .media-object-section { + padding: 0; + padding-bottom: 1rem; + display: block; } + .media-object.stack-for-small .media-object-section img { + width: 100%; } } + +.media-object-section { + display: table-cell; + vertical-align: top; } + .media-object-section:first-child { + padding-right: 1rem; } + .media-object-section:last-child:not(:nth-child(2)) { + padding-left: 1rem; } + .media-object-section > :last-child { + margin-bottom: 0; } + .media-object-section.middle { + vertical-align: middle; } + .media-object-section.bottom { + vertical-align: bottom; } + +.is-off-canvas-open { + overflow: hidden; } + +.js-off-canvas-overlay { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + -webkit-transition: opacity 0.5s ease, visibility 0.5s ease; + transition: opacity 0.5s ease, visibility 0.5s ease; + background: rgba(254, 254, 254, 0.25); + opacity: 0; + visibility: hidden; + overflow: hidden; } + .js-off-canvas-overlay.is-visible { + opacity: 1; + visibility: visible; } + .js-off-canvas-overlay.is-closable { + cursor: pointer; } + .js-off-canvas-overlay.is-overlay-absolute { + position: absolute; } + .js-off-canvas-overlay.is-overlay-fixed { + position: fixed; } + +.off-canvas-wrapper { + position: relative; + overflow: hidden; } + +.off-canvas { + position: fixed; + z-index: 1; + -webkit-transition: -webkit-transform 0.5s ease; + transition: -webkit-transform 0.5s ease; + transition: transform 0.5s ease; + transition: transform 0.5s ease, -webkit-transform 0.5s ease; + -webkit-backface-visibility: hidden; + backface-visibility: hidden; + background: #e6e6e6; } + [data-whatinput='mouse'] .off-canvas { + outline: 0; } + .off-canvas.is-transition-overlap { + z-index: 10; } + .off-canvas.is-transition-overlap.is-open { + -webkit-box-shadow: 0 0 10px rgba(10, 10, 10, 0.7); + box-shadow: 0 0 10px rgba(10, 10, 10, 0.7); } + .off-canvas.is-open { + -webkit-transform: translate(0, 0); + -ms-transform: translate(0, 0); + transform: translate(0, 0); } + +.off-canvas-absolute { + position: absolute; + z-index: 1; + -webkit-transition: -webkit-transform 0.5s ease; + transition: -webkit-transform 0.5s ease; + transition: transform 0.5s ease; + transition: transform 0.5s ease, -webkit-transform 0.5s ease; + -webkit-backface-visibility: hidden; + backface-visibility: hidden; + background: #e6e6e6; } + [data-whatinput='mouse'] .off-canvas-absolute { + outline: 0; } + .off-canvas-absolute.is-transition-overlap { + z-index: 10; } + .off-canvas-absolute.is-transition-overlap.is-open { + -webkit-box-shadow: 0 0 10px rgba(10, 10, 10, 0.7); + box-shadow: 0 0 10px rgba(10, 10, 10, 0.7); } + .off-canvas-absolute.is-open { + -webkit-transform: translate(0, 0); + -ms-transform: translate(0, 0); + transform: translate(0, 0); } + +.position-left { + top: 0; + left: 0; + width: 250px; + height: 100%; + -webkit-transform: translateX(-250px); + -ms-transform: translateX(-250px); + transform: translateX(-250px); + overflow-y: auto; } + .position-left.is-open ~ .off-canvas-content { + -webkit-transform: translateX(250px); + -ms-transform: translateX(250px); + transform: translateX(250px); } + .position-left.is-transition-push::after { + position: absolute; + top: 0; + right: 0; + height: 100%; + width: 1px; + -webkit-box-shadow: 0 0 10px rgba(10, 10, 10, 0.7); + box-shadow: 0 0 10px rgba(10, 10, 10, 0.7); + content: " "; } + .position-left.is-transition-overlap.is-open ~ .off-canvas-content { + -webkit-transform: none; + -ms-transform: none; + transform: none; } + +.position-right { + top: 0; + right: 0; + width: 250px; + height: 100%; + -webkit-transform: translateX(250px); + -ms-transform: translateX(250px); + transform: translateX(250px); + overflow-y: auto; } + .position-right.is-open ~ .off-canvas-content { + -webkit-transform: translateX(-250px); + -ms-transform: translateX(-250px); + transform: translateX(-250px); } + .position-right.is-transition-push::after { + position: absolute; + top: 0; + left: 0; + height: 100%; + width: 1px; + -webkit-box-shadow: 0 0 10px rgba(10, 10, 10, 0.7); + box-shadow: 0 0 10px rgba(10, 10, 10, 0.7); + content: " "; } + .position-right.is-transition-overlap.is-open ~ .off-canvas-content { + -webkit-transform: none; + -ms-transform: none; + transform: none; } + +.position-top { + top: 0; + left: 0; + width: 100%; + height: 250px; + -webkit-transform: translateY(-250px); + -ms-transform: translateY(-250px); + transform: translateY(-250px); + overflow-x: auto; } + .position-top.is-open ~ .off-canvas-content { + -webkit-transform: translateY(250px); + -ms-transform: translateY(250px); + transform: translateY(250px); } + .position-top.is-transition-push::after { + position: absolute; + bottom: 0; + left: 0; + height: 1px; + width: 100%; + -webkit-box-shadow: 0 0 10px rgba(10, 10, 10, 0.7); + box-shadow: 0 0 10px rgba(10, 10, 10, 0.7); + content: " "; } + .position-top.is-transition-overlap.is-open ~ .off-canvas-content { + -webkit-transform: none; + -ms-transform: none; + transform: none; } + +.position-bottom { + bottom: 0; + left: 0; + width: 100%; + height: 250px; + -webkit-transform: translateY(250px); + -ms-transform: translateY(250px); + transform: translateY(250px); + overflow-x: auto; } + .position-bottom.is-open ~ .off-canvas-content { + -webkit-transform: translateY(-250px); + -ms-transform: translateY(-250px); + transform: translateY(-250px); } + .position-bottom.is-transition-push::after { + position: absolute; + top: 0; + left: 0; + height: 1px; + width: 100%; + -webkit-box-shadow: 0 0 10px rgba(10, 10, 10, 0.7); + box-shadow: 0 0 10px rgba(10, 10, 10, 0.7); + content: " "; } + .position-bottom.is-transition-overlap.is-open ~ .off-canvas-content { + -webkit-transform: none; + -ms-transform: none; + transform: none; } + +.off-canvas-content { + -webkit-transition: -webkit-transform 0.5s ease; + transition: -webkit-transform 0.5s ease; + transition: transform 0.5s ease; + transition: transform 0.5s ease, -webkit-transform 0.5s ease; + -webkit-backface-visibility: hidden; + backface-visibility: hidden; } + +@media print, screen and (min-width: 40em) { + .position-left.reveal-for-medium { + -webkit-transform: none; + -ms-transform: none; + transform: none; + z-index: 1; } + .position-left.reveal-for-medium ~ .off-canvas-content { + margin-left: 250px; } + .position-right.reveal-for-medium { + -webkit-transform: none; + -ms-transform: none; + transform: none; + z-index: 1; } + .position-right.reveal-for-medium ~ .off-canvas-content { + margin-right: 250px; } + .position-top.reveal-for-medium { + -webkit-transform: none; + -ms-transform: none; + transform: none; + z-index: 1; } + .position-top.reveal-for-medium ~ .off-canvas-content { + margin-top: 250px; } + .position-bottom.reveal-for-medium { + -webkit-transform: none; + -ms-transform: none; + transform: none; + z-index: 1; } + .position-bottom.reveal-for-medium ~ .off-canvas-content { + margin-bottom: 250px; } } + +@media print, screen and (min-width: 64em) { + .position-left.reveal-for-large { + -webkit-transform: none; + -ms-transform: none; + transform: none; + z-index: 1; } + .position-left.reveal-for-large ~ .off-canvas-content { + margin-left: 250px; } + .position-right.reveal-for-large { + -webkit-transform: none; + -ms-transform: none; + transform: none; + z-index: 1; } + .position-right.reveal-for-large ~ .off-canvas-content { + margin-right: 250px; } + .position-top.reveal-for-large { + -webkit-transform: none; + -ms-transform: none; + transform: none; + z-index: 1; } + .position-top.reveal-for-large ~ .off-canvas-content { + margin-top: 250px; } + .position-bottom.reveal-for-large { + -webkit-transform: none; + -ms-transform: none; + transform: none; + z-index: 1; } + .position-bottom.reveal-for-large ~ .off-canvas-content { + margin-bottom: 250px; } } + +.orbit { + position: relative; } + +.orbit-container { + position: relative; + height: 0; + margin: 0; + list-style: none; + overflow: hidden; } + +.orbit-slide { + width: 100%; } + .orbit-slide.no-motionui.is-active { + top: 0; + left: 0; } + +.orbit-figure { + margin: 0; } + +.orbit-image { + width: 100%; + max-width: 100%; + margin: 0; } + +.orbit-caption { + position: absolute; + bottom: 0; + width: 100%; + margin-bottom: 0; + padding: 1rem; + background-color: rgba(10, 10, 10, 0.5); + color: #fefefe; } + +.orbit-previous, .orbit-next { + position: absolute; + top: 50%; + -webkit-transform: translateY(-50%); + -ms-transform: translateY(-50%); + transform: translateY(-50%); + z-index: 10; + padding: 1rem; + color: #fefefe; } + [data-whatinput='mouse'] .orbit-previous, [data-whatinput='mouse'] .orbit-next { + outline: 0; } + .orbit-previous:hover, .orbit-next:hover, .orbit-previous:active, .orbit-next:active, .orbit-previous:focus, .orbit-next:focus { + background-color: rgba(10, 10, 10, 0.5); } + +.orbit-previous { + left: 0; } + +.orbit-next { + left: auto; + right: 0; } + +.orbit-bullets { + position: relative; + margin-top: 0.8rem; + margin-bottom: 0.8rem; + text-align: center; } + [data-whatinput='mouse'] .orbit-bullets { + outline: 0; } + .orbit-bullets button { + width: 1.2rem; + height: 1.2rem; + margin: 0.1rem; + border-radius: 50%; + background-color: #cacaca; } + .orbit-bullets button:hover { + background-color: #8a8a8a; } + .orbit-bullets button.is-active { + background-color: #8a8a8a; } + +.pagination { + margin-left: 0; + margin-bottom: 1rem; } + .pagination::before, .pagination::after { + display: table; + content: ' '; } + .pagination::after { + clear: both; } + .pagination li { + margin-right: 0.0625rem; + border-radius: 0; + font-size: 0.875rem; + display: none; } + .pagination li:last-child, .pagination li:first-child { + display: inline-block; } + @media print, screen and (min-width: 40em) { + .pagination li { + display: inline-block; } } + .pagination a, + .pagination button { + display: block; + padding: 0.1875rem 0.625rem; + border-radius: 0; + color: #0a0a0a; } + .pagination a:hover, + .pagination button:hover { + background: #e6e6e6; } + .pagination .current { + padding: 0.1875rem 0.625rem; + background: #1779ba; + color: #fefefe; + cursor: default; } + .pagination .disabled { + padding: 0.1875rem 0.625rem; + color: #cacaca; + cursor: not-allowed; } + .pagination .disabled:hover { + background: transparent; } + .pagination .ellipsis::after { + padding: 0.1875rem 0.625rem; + content: '\2026'; + color: #0a0a0a; } + +.pagination-previous a::before, +.pagination-previous.disabled::before { + display: inline-block; + margin-right: 0.5rem; + content: '\00ab'; } + +.pagination-next a::after, +.pagination-next.disabled::after { + display: inline-block; + margin-left: 0.5rem; + content: '\00bb'; } + +.progress { + height: 1rem; + margin-bottom: 1rem; + border-radius: 0; + background-color: #cacaca; } + .progress.primary .progress-meter { + background-color: #1779ba; } + .progress.secondary .progress-meter { + background-color: #767676; } + .progress.success .progress-meter { + background-color: #3adb76; } + .progress.warning .progress-meter { + background-color: #ffae00; } + .progress.alert .progress-meter { + background-color: #cc4b37; } + +.progress-meter { + position: relative; + display: block; + width: 0%; + height: 100%; + background-color: #1779ba; } + +.progress-meter-text { + position: absolute; + top: 50%; + left: 50%; + -webkit-transform: translate(-50%, -50%); + -ms-transform: translate(-50%, -50%); + transform: translate(-50%, -50%); + position: absolute; + margin: 0; + font-size: 0.75rem; + font-weight: bold; + color: #fefefe; + white-space: nowrap; } + +.slider { + position: relative; + height: 0.5rem; + margin-top: 1.25rem; + margin-bottom: 2.25rem; + background-color: #e6e6e6; + cursor: pointer; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + -ms-touch-action: none; + touch-action: none; } + +.slider-fill { + position: absolute; + top: 0; + left: 0; + display: inline-block; + max-width: 100%; + height: 0.5rem; + background-color: #cacaca; + -webkit-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; } + .slider-fill.is-dragging { + -webkit-transition: all 0s linear; + transition: all 0s linear; } + +.slider-handle { + position: absolute; + top: 50%; + -webkit-transform: translateY(-50%); + -ms-transform: translateY(-50%); + transform: translateY(-50%); + position: absolute; + left: 0; + z-index: 1; + display: inline-block; + width: 1.4rem; + height: 1.4rem; + border-radius: 0; + background-color: #1779ba; + -webkit-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; + -ms-touch-action: manipulation; + touch-action: manipulation; } + [data-whatinput='mouse'] .slider-handle { + outline: 0; } + .slider-handle:hover { + background-color: #14679e; } + .slider-handle.is-dragging { + -webkit-transition: all 0s linear; + transition: all 0s linear; } + +.slider.disabled, +.slider[disabled] { + opacity: 0.25; + cursor: not-allowed; } + +.slider.vertical { + display: inline-block; + width: 0.5rem; + height: 12.5rem; + margin: 0 1.25rem; + -webkit-transform: scale(1, -1); + -ms-transform: scale(1, -1); + transform: scale(1, -1); } + .slider.vertical .slider-fill { + top: 0; + width: 0.5rem; + max-height: 100%; } + .slider.vertical .slider-handle { + position: absolute; + top: 0; + left: 50%; + width: 1.4rem; + height: 1.4rem; + -webkit-transform: translateX(-50%); + -ms-transform: translateX(-50%); + transform: translateX(-50%); } + +.sticky-container { + position: relative; } + +.sticky { + position: relative; + z-index: 0; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); } + +.sticky.is-stuck { + position: fixed; + z-index: 5; } + .sticky.is-stuck.is-at-top { + top: 0; } + .sticky.is-stuck.is-at-bottom { + bottom: 0; } + +.sticky.is-anchored { + position: relative; + right: auto; + left: auto; } + .sticky.is-anchored.is-at-bottom { + bottom: 0; } + +body.is-reveal-open { + overflow: hidden; } + +html.is-reveal-open, +html.is-reveal-open body { + min-height: 100%; + overflow: hidden; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } + +.reveal-overlay { + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 1005; + display: none; + background-color: rgba(10, 10, 10, 0.45); + overflow-y: scroll; } + +.reveal { + z-index: 1006; + -webkit-backface-visibility: hidden; + backface-visibility: hidden; + display: none; + padding: 1rem; + border: 1px solid #cacaca; + border-radius: 0; + background-color: #fefefe; + position: relative; + top: 100px; + margin-right: auto; + margin-left: auto; + overflow-y: auto; } + [data-whatinput='mouse'] .reveal { + outline: 0; } + @media print, screen and (min-width: 40em) { + .reveal { + min-height: 0; } } + .reveal .column, .reveal .columns, + .reveal .columns { + min-width: 0; } + .reveal > :last-child { + margin-bottom: 0; } + @media print, screen and (min-width: 40em) { + .reveal { + width: 600px; + max-width: 75rem; } } + @media print, screen and (min-width: 40em) { + .reveal .reveal { + right: auto; + left: auto; + margin: 0 auto; } } + .reveal.collapse { + padding: 0; } + @media print, screen and (min-width: 40em) { + .reveal.tiny { + width: 30%; + max-width: 75rem; } } + @media print, screen and (min-width: 40em) { + .reveal.small { + width: 50%; + max-width: 75rem; } } + @media print, screen and (min-width: 40em) { + .reveal.large { + width: 90%; + max-width: 75rem; } } + .reveal.full { + top: 0; + left: 0; + width: 100%; + max-width: none; + height: 100%; + height: 100vh; + min-height: 100vh; + margin-left: 0; + border: 0; + border-radius: 0; } + @media screen and (max-width: 39.9375em) { + .reveal { + top: 0; + left: 0; + width: 100%; + max-width: none; + height: 100%; + height: 100vh; + min-height: 100vh; + margin-left: 0; + border: 0; + border-radius: 0; } } + .reveal.without-overlay { + position: fixed; } + +.switch { + height: 2rem; + position: relative; + margin-bottom: 1rem; + outline: 0; + font-size: 0.875rem; + font-weight: bold; + color: #fefefe; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } + +.switch-input { + position: absolute; + margin-bottom: 0; + opacity: 0; } + +.switch-paddle { + position: relative; + display: block; + width: 4rem; + height: 2rem; + border-radius: 0; + background: #cacaca; + -webkit-transition: all 0.25s ease-out; + transition: all 0.25s ease-out; + font-weight: inherit; + color: inherit; + cursor: pointer; } + input + .switch-paddle { + margin: 0; } + .switch-paddle::after { + position: absolute; + top: 0.25rem; + left: 0.25rem; + display: block; + width: 1.5rem; + height: 1.5rem; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + border-radius: 0; + background: #fefefe; + -webkit-transition: all 0.25s ease-out; + transition: all 0.25s ease-out; + content: ''; } + input:checked ~ .switch-paddle { + background: #1779ba; } + input:checked ~ .switch-paddle::after { + left: 2.25rem; } + [data-whatinput='mouse'] input:focus ~ .switch-paddle { + outline: 0; } + +.switch-active, .switch-inactive { + position: absolute; + top: 50%; + -webkit-transform: translateY(-50%); + -ms-transform: translateY(-50%); + transform: translateY(-50%); } + +.switch-active { + left: 8%; + display: none; } + input:checked + label > .switch-active { + display: block; } + +.switch-inactive { + right: 15%; } + input:checked + label > .switch-inactive { + display: none; } + +.switch.tiny { + height: 1.5rem; } + .switch.tiny .switch-paddle { + width: 3rem; + height: 1.5rem; + font-size: 0.625rem; } + .switch.tiny .switch-paddle::after { + top: 0.25rem; + left: 0.25rem; + width: 1rem; + height: 1rem; } + .switch.tiny input:checked ~ .switch-paddle::after { + left: 1.75rem; } + +.switch.small { + height: 1.75rem; } + .switch.small .switch-paddle { + width: 3.5rem; + height: 1.75rem; + font-size: 0.75rem; } + .switch.small .switch-paddle::after { + top: 0.25rem; + left: 0.25rem; + width: 1.25rem; + height: 1.25rem; } + .switch.small input:checked ~ .switch-paddle::after { + left: 2rem; } + +.switch.large { + height: 2.5rem; } + .switch.large .switch-paddle { + width: 5rem; + height: 2.5rem; + font-size: 1rem; } + .switch.large .switch-paddle::after { + top: 0.25rem; + left: 0.25rem; + width: 2rem; + height: 2rem; } + .switch.large input:checked ~ .switch-paddle::after { + left: 2.75rem; } + +table { + width: 100%; + margin-bottom: 1rem; + border-radius: 0; } + table thead, + table tbody, + table tfoot { + border: 1px solid #f1f1f1; + background-color: #fefefe; } + table caption { + padding: 0.5rem 0.625rem 0.625rem; + font-weight: bold; } + table thead { + background: #f8f8f8; + color: #0a0a0a; } + table tfoot { + background: #f1f1f1; + color: #0a0a0a; } + table thead tr, + table tfoot tr { + background: transparent; } + table thead th, + table thead td, + table tfoot th, + table tfoot td { + padding: 0.5rem 0.625rem 0.625rem; + font-weight: bold; + text-align: left; } + table tbody th, + table tbody td { + padding: 0.5rem 0.625rem 0.625rem; } + table tbody tr:nth-child(even) { + border-bottom: 0; + background-color: #f1f1f1; } + table.unstriped tbody { + background-color: #fefefe; } + table.unstriped tbody tr { + border-bottom: 0; + border-bottom: 1px solid #f1f1f1; + background-color: #fefefe; } + +@media screen and (max-width: 63.9375em) { + table.stack thead { + display: none; } + table.stack tfoot { + display: none; } + table.stack tr, + table.stack th, + table.stack td { + display: block; } + table.stack td { + border-top: 0; } } + +table.scroll { + display: block; + width: 100%; + overflow-x: auto; } + +table.hover thead tr:hover { + background-color: #f3f3f3; } + +table.hover tfoot tr:hover { + background-color: #ececec; } + +table.hover tbody tr:hover { + background-color: #f9f9f9; } + +table.hover:not(.unstriped) tr:nth-of-type(even):hover { + background-color: #ececec; } + +.table-scroll { + overflow-x: auto; } + .table-scroll table { + width: auto; } + +.tabs { + margin: 0; + border: 1px solid #e6e6e6; + background: #fefefe; + list-style-type: none; } + .tabs::before, .tabs::after { + display: table; + content: ' '; } + .tabs::after { + clear: both; } + +.tabs.vertical > li { + display: block; + float: none; + width: auto; } + +.tabs.simple > li > a { + padding: 0; } + .tabs.simple > li > a:hover { + background: transparent; } + +.tabs.primary { + background: #1779ba; } + .tabs.primary > li > a { + color: #fefefe; } + .tabs.primary > li > a:hover, .tabs.primary > li > a:focus { + background: #1673b1; } + +.tabs-title { + float: left; } + .tabs-title > a { + display: block; + padding: 1.25rem 1.5rem; + font-size: 0.75rem; + line-height: 1; + color: #1779ba; } + .tabs-title > a:hover { + background: #fefefe; + color: #1468a0; } + .tabs-title > a:focus, .tabs-title > a[aria-selected='true'] { + background: #e6e6e6; + color: #1779ba; } + +.tabs-content { + border: 1px solid #e6e6e6; + border-top: 0; + background: #fefefe; + color: #0a0a0a; + -webkit-transition: all 0.5s ease; + transition: all 0.5s ease; } + +.tabs-content.vertical { + border: 1px solid #e6e6e6; + border-left: 0; } + +.tabs-panel { + display: none; + padding: 1rem; } + .tabs-panel[aria-hidden="false"] { + display: block; } + +.thumbnail { + display: inline-block; + max-width: 100%; + margin-bottom: 1rem; + border: solid 4px #fefefe; + border-radius: 0; + -webkit-box-shadow: 0 0 0 1px rgba(10, 10, 10, 0.2); + box-shadow: 0 0 0 1px rgba(10, 10, 10, 0.2); + line-height: 0; } + +a.thumbnail { + -webkit-transition: -webkit-box-shadow 200ms ease-out; + transition: -webkit-box-shadow 200ms ease-out; + transition: box-shadow 200ms ease-out; + transition: box-shadow 200ms ease-out, -webkit-box-shadow 200ms ease-out; } + a.thumbnail:hover, a.thumbnail:focus { + -webkit-box-shadow: 0 0 6px 1px rgba(23, 121, 186, 0.5); + box-shadow: 0 0 6px 1px rgba(23, 121, 186, 0.5); } + a.thumbnail image { + -webkit-box-shadow: none; + box-shadow: none; } + +.title-bar { + padding: 0.5rem; + background: #0a0a0a; + color: #fefefe; } + .title-bar::before, .title-bar::after { + display: table; + content: ' '; } + .title-bar::after { + clear: both; } + .title-bar .menu-icon { + margin-left: 0.25rem; + margin-right: 0.25rem; } + +.title-bar-left { + float: left; } + +.title-bar-right { + float: right; + text-align: right; } + +.title-bar-title { + display: inline-block; + vertical-align: middle; + font-weight: bold; } + +.has-tip { + position: relative; + display: inline-block; + border-bottom: dotted 1px #8a8a8a; + font-weight: bold; + cursor: help; } + +.tooltip { + position: absolute; + top: calc(100% + 0.6495rem); + z-index: 1200; + max-width: 10rem; + padding: 0.75rem; + border-radius: 0; + background-color: #0a0a0a; + font-size: 80%; + color: #fefefe; } + .tooltip::before { + display: block; + width: 0; + height: 0; + border: inset 0.75rem; + content: ''; + border-top-width: 0; + border-bottom-style: solid; + border-color: transparent transparent #0a0a0a; + position: absolute; + bottom: 100%; + left: 50%; + -webkit-transform: translateX(-50%); + -ms-transform: translateX(-50%); + transform: translateX(-50%); } + .tooltip.top::before { + display: block; + width: 0; + height: 0; + border: inset 0.75rem; + content: ''; + border-bottom-width: 0; + border-top-style: solid; + border-color: #0a0a0a transparent transparent; + top: 100%; + bottom: auto; } + .tooltip.left::before { + display: block; + width: 0; + height: 0; + border: inset 0.75rem; + content: ''; + border-right-width: 0; + border-left-style: solid; + border-color: transparent transparent transparent #0a0a0a; + top: 50%; + bottom: auto; + left: 100%; + -webkit-transform: translateY(-50%); + -ms-transform: translateY(-50%); + transform: translateY(-50%); } + .tooltip.right::before { + display: block; + width: 0; + height: 0; + border: inset 0.75rem; + content: ''; + border-left-width: 0; + border-right-style: solid; + border-color: transparent #0a0a0a transparent transparent; + top: 50%; + right: 100%; + bottom: auto; + left: auto; + -webkit-transform: translateY(-50%); + -ms-transform: translateY(-50%); + transform: translateY(-50%); } + +.top-bar { + padding: 0.5rem; } + .top-bar::before, .top-bar::after { + display: table; + content: ' '; } + .top-bar::after { + clear: both; } + .top-bar, + .top-bar ul { + background-color: #e6e6e6; } + .top-bar input { + max-width: 200px; + margin-right: 1rem; } + .top-bar .input-group-field { + width: 100%; + margin-right: 0; } + .top-bar input.button { + width: auto; } + .top-bar .top-bar-left, + .top-bar .top-bar-right { + width: 100%; } + @media print, screen and (min-width: 40em) { + .top-bar .top-bar-left, + .top-bar .top-bar-right { + width: auto; } } + @media screen and (max-width: 63.9375em) { + .top-bar.stacked-for-medium .top-bar-left, + .top-bar.stacked-for-medium .top-bar-right { + width: 100%; } } + @media screen and (max-width: 74.9375em) { + .top-bar.stacked-for-large .top-bar-left, + .top-bar.stacked-for-large .top-bar-right { + width: 100%; } } + +.top-bar-title { + display: inline-block; + float: left; + padding: 0.5rem 1rem 0.5rem 0; } + .top-bar-title .menu-icon { + bottom: 2px; } + +.top-bar-left { + float: left; } + +.top-bar-right { + float: right; } + +.hide { + display: none !important; } + +.invisible { + visibility: hidden; } + +@media screen and (max-width: 39.9375em) { + .hide-for-small-only { + display: none !important; } } + +@media screen and (max-width: 0em), screen and (min-width: 40em) { + .show-for-small-only { + display: none !important; } } + +@media print, screen and (min-width: 40em) { + .hide-for-medium { + display: none !important; } } + +@media screen and (max-width: 39.9375em) { + .show-for-medium { + display: none !important; } } + +@media screen and (min-width: 40em) and (max-width: 63.9375em) { + .hide-for-medium-only { + display: none !important; } } + +@media screen and (max-width: 39.9375em), screen and (min-width: 64em) { + .show-for-medium-only { + display: none !important; } } + +@media print, screen and (min-width: 64em) { + .hide-for-large { + display: none !important; } } + +@media screen and (max-width: 63.9375em) { + .show-for-large { + display: none !important; } } + +@media screen and (min-width: 64em) and (max-width: 74.9375em) { + .hide-for-large-only { + display: none !important; } } + +@media screen and (max-width: 63.9375em), screen and (min-width: 75em) { + .show-for-large-only { + display: none !important; } } + +.show-for-sr, +.show-on-focus { + position: absolute !important; + width: 1px; + height: 1px; + overflow: hidden; + clip: rect(0, 0, 0, 0); } + +.show-on-focus:active, .show-on-focus:focus { + position: static !important; + width: auto; + height: auto; + overflow: visible; + clip: auto; } + +.show-for-landscape, +.hide-for-portrait { + display: block !important; } + @media screen and (orientation: landscape) { + .show-for-landscape, + .hide-for-portrait { + display: block !important; } } + @media screen and (orientation: portrait) { + .show-for-landscape, + .hide-for-portrait { + display: none !important; } } + +.hide-for-landscape, +.show-for-portrait { + display: none !important; } + @media screen and (orientation: landscape) { + .hide-for-landscape, + .show-for-portrait { + display: none !important; } } + @media screen and (orientation: portrait) { + .hide-for-landscape, + .show-for-portrait { + display: block !important; } } + +.float-left { + float: left !important; } + +.float-right { + float: right !important; } + +.float-center { + display: block; + margin-right: auto; + margin-left: auto; } + +.clearfix::before, .clearfix::after { + display: table; + content: ' '; } + +.clearfix::after { + clear: both; } + +/*# sourceMappingURL=foundation.css.map */ diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 33b15c239d..83f75d4577 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3,23 +3,41 @@ def index @users = User.all end - def create - existing_user= User.find_by(username: params[:username]) + # def create + # existing_user= User.find_by(username: params[:username]) + # @user = User.new user_params + # + # if existing_user + # flash[:success] = "Successfully logged in as existing user #{existing_user.username}" + # redirect_to root_path + # elsif @user.save + # flash[:success] = "Successfully created new user #{@user.username} with ID #{@user.id}" + # redirect_to root_path + # else + # render :new + # end + # end + + def new + @user = User.new + end + + def login + existing_user = User.find_by(name: params[:username]) @user = User.new user_params if existing_user flash[:success] = "Successfully logged in as existing user #{existing_user.username}" + session[:user_id] = existing_user.id redirect_to root_path elsif @user.save flash[:success] = "Successfully created new user #{@user.username} with ID #{@user.id}" redirect_to root_path else + flash[:error] = "User not created" render :new - end - end + end - def new - @user = User.new end def show diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index 9e2a63616c..fec177590e 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -1,19 +1,16 @@ class VotesController < ApplicationController def create - @vote = Vote.new vote_params + #def upvote + # user = User.find_by(id: params[:id]) + # user = User.find_by(username: params[:username]) + user = User.find_by(username: session[:username]) + work = Work.find_by(id: params[:id]) - if @vote.save - flash[:success] = "Successfully upvoted!" - redirect_to work_path(id: params[:id]) - else - render :show - end + @vote = Vote.new(user,work) - end + if @vote.save - private + end - def vote_params - return params.require(:vote).permit(:user_id, :work_id) end end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 4285555ca8..0e399a3780 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -43,11 +43,14 @@ def update def destroy @work= Work.find_by(id: params[:id]).destroy + #TODO: What if a work is not destroyed successfully? + flash[:success] = "Successfully destroyed #{@work.category} #{@work.id}" redirect_to root_path end def main @works= Work.all + #find collection of top works in each category here or in model end private diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index a01347edf5..c15ecae5b9 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -6,6 +6,7 @@ <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index f94c073de0..82a8a21ada 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1,4 +1,4 @@ -

List of works

+

List of works

@@ -10,9 +10,9 @@

<% end %> -<% albums = @works.where(category: "album")%> +<% albums = (@works.where(category: "album")).order(:id)%>
-

Albums

+

Albums

<% work_headers.each do |header| %> @@ -26,7 +26,7 @@ <% if key == "Votes" %> <%= "This will be # of votes" %> <% elsif key == "Title" %> - <%= "#{album.title}" %> + <%= link_to "#{album.title}", work_path(album.id) %> <% elsif key == "Created By" %> <%= "#{album.creator}"%> <% elsif key == "Published" %> @@ -41,10 +41,10 @@
-<% books = @works.where(category: "book")%> +<% books = (@works.where(category: "book")).order(:id)%>
-

Books

+

Books

<% work_headers.each do |header| %> @@ -58,7 +58,7 @@ <% if key == "Votes" %> <%= "This will be # of votes" %> <% elsif key == "Title" %> - <%= "#{book.title}" %> + <%= link_to "#{book.title}", work_path(book.id) %> <% elsif key == "Created By" %> <%= "#{book.creator}"%> <% elsif key == "Published" %> @@ -73,10 +73,10 @@
-<% movies = @works.where(category: "movie")%> +<% movies = (@works.where(category: "movie")).order(:id)%>
-

Movies

+

Movies

<% work_headers.each do |header| %> @@ -90,7 +90,7 @@ <% if key == "Votes" %> <%= "This will be # of votes" %> <% elsif key == "Title" %> - <%= "#{movie.title}" %> + <%= link_to "#{movie.title}", work_path(movie.id) %> <% elsif key == "Created By" %> <%= "#{movie.creator}"%> <% elsif key == "Published" %> diff --git a/app/views/works/main.html.erb b/app/views/works/main.html.erb index a66ee08086..53803b7fa4 100644 --- a/app/views/works/main.html.erb +++ b/app/views/works/main.html.erb @@ -11,14 +11,38 @@

Top Movies

+
    +
  • +

    by

    +
    • +

    + num votes +

    +

Top Books

+
    +
  • +

    by

    +
    • +

    + num votes +

    +

Top Albums

+
    +
  • +

    by

    +
    • +

    + num votes +

    +
diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index d50af74c3c..925de05f8f 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -26,7 +26,7 @@
<%= link_to "Back to media ranks", root_path, class: :button %> <%= link_to "Edit", edit_work_path, class: :button %> - <%= link_to "Delete", delete_work_path, method: :delete, class: :button %> + <%= link_to "Delete", delete_work_path, method: :delete, data: {confirm: "Are you sure?"}, class: :button %>
diff --git a/test/controllers/votes_controller_test.rb b/test/controllers/votes_controller_test.rb index 720b0fe9a6..cf4d03935f 100644 --- a/test/controllers/votes_controller_test.rb +++ b/test/controllers/votes_controller_test.rb @@ -1,9 +1,7 @@ require "test_helper" describe VotesController do - it "should get create" do - get votes_create_url - value(response).must_be :success? - end - + # it "must be a real test" do + # flunk "Need real tests" + # end end From b866ea23bcef45f1770031b4a881dd0036735f39 Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Fri, 13 Oct 2017 15:11:53 -0700 Subject: [PATCH 14/36] updated basic User controller methods, and validations between user and votes --- app/controllers/users_controller.rb | 51 +++++++++++++---------------- app/models/user.rb | 2 ++ app/models/vote.rb | 3 ++ 3 files changed, 27 insertions(+), 29 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 83f75d4577..9185938e4e 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3,41 +3,15 @@ def index @users = User.all end - # def create - # existing_user= User.find_by(username: params[:username]) - # @user = User.new user_params - # - # if existing_user - # flash[:success] = "Successfully logged in as existing user #{existing_user.username}" - # redirect_to root_path - # elsif @user.save - # flash[:success] = "Successfully created new user #{@user.username} with ID #{@user.id}" - # redirect_to root_path - # else - # render :new - # end - # end - def new @user = User.new end - def login - existing_user = User.find_by(name: params[:username]) + def create @user = User.new user_params + existing_user= User.find_by(username: user_params) - if existing_user - flash[:success] = "Successfully logged in as existing user #{existing_user.username}" - session[:user_id] = existing_user.id - redirect_to root_path - elsif @user.save - flash[:success] = "Successfully created new user #{@user.username} with ID #{@user.id}" - redirect_to root_path - else - flash[:error] = "User not created" - render :new - end - + @user.save unless existing_user end def show @@ -49,4 +23,23 @@ def show def user_params return params.require(:user).permit(:username) end + + + ##should reserve this for sessions controller? + # def login + # existing_user = User.find_by(username: params[:username]) + # + # if existing_user + # flash[:success] = "Successfully logged in as existing user #{existing_user.username}" + # session[:user_id] = existing_user.id + # redirect_to root_path + # elsif @user.save + # flash[:success] = "Successfully created new user #{@user.username} with ID #{@user.id}" + # redirect_to root_path + # else + # flash[:error] = "User not created" + # render :new + # end + # + # end end diff --git a/app/models/user.rb b/app/models/user.rb index 45a412a4eb..698d23eca7 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,4 +1,6 @@ class User < ApplicationRecord has_many :votes + validates :username, presence: true, uniqueness: true + #will automatically login if the username is not unique end diff --git a/app/models/vote.rb b/app/models/vote.rb index b8b6f9f0aa..93ab8f809d 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -1,4 +1,7 @@ class Vote < ApplicationRecord belongs_to :user belongs_to :work + + validates :user, presence: true + validates :work, presence: true end From ff8902e19b044906c3717ce22c67310b6e268035 Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Fri, 13 Oct 2017 15:13:38 -0700 Subject: [PATCH 15/36] Added owl favicon to application --- app/views/layouts/application.html.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index c15ecae5b9..9bd8e57758 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,6 +7,7 @@ <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + <%= favicon_link_tag 'owl.jpg' %> From 8657966e4159d30f137a8bf823ee7763f3177670 Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Fri, 13 Oct 2017 15:49:27 -0700 Subject: [PATCH 16/36] Set up Sessions controller and login page --- app/assets/javascripts/sessions.js | 2 ++ app/assets/stylesheets/sessions.scss | 3 ++ app/controllers/sessions_controller.rb | 29 ++++++++++++++++++++ app/helpers/sessions_helper.rb | 2 ++ app/views/sessions/login_form.html.erb | 23 ++++++++++++++++ config/routes.rb | 6 ++++ test/controllers/sessions_controller_test.rb | 7 +++++ 7 files changed, 72 insertions(+) create mode 100644 app/assets/javascripts/sessions.js create mode 100644 app/assets/stylesheets/sessions.scss create mode 100644 app/controllers/sessions_controller.rb create mode 100644 app/helpers/sessions_helper.rb create mode 100644 app/views/sessions/login_form.html.erb create mode 100644 test/controllers/sessions_controller_test.rb diff --git a/app/assets/javascripts/sessions.js b/app/assets/javascripts/sessions.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/sessions.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/sessions.scss b/app/assets/stylesheets/sessions.scss new file mode 100644 index 0000000000..ccb1ed25b2 --- /dev/null +++ b/app/assets/stylesheets/sessions.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Sessions 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/sessions_controller.rb b/app/controllers/sessions_controller.rb new file mode 100644 index 0000000000..db9f7787b9 --- /dev/null +++ b/app/controllers/sessions_controller.rb @@ -0,0 +1,29 @@ +class SessionsController < ApplicationController + def login_form + end + + def login + user = User.find_by(username: params[:username]) + + if user + flash[:success] = "Successfully logged in as existing user #{user.username}" + session[:user_id] = user.id + redirect_to root_path + else + #create new user + new_user = User.new(username: params[:username]) + if new_user.save + flash[:success] = "Successfully created new user #{new_user.username} with ID #{new_user.id}" + session[:user_id] = new_user.id + redirect_to root_path + end + end + + end + + def logout + session.delete(params[:user_id]) + @current_user = nil + end + +end diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb new file mode 100644 index 0000000000..309f8b2eb3 --- /dev/null +++ b/app/helpers/sessions_helper.rb @@ -0,0 +1,2 @@ +module SessionsHelper +end diff --git a/app/views/sessions/login_form.html.erb b/app/views/sessions/login_form.html.erb new file mode 100644 index 0000000000..564f741ba7 --- /dev/null +++ b/app/views/sessions/login_form.html.erb @@ -0,0 +1,23 @@ +
+

Login Form

+ + <%= form_tag do %> + <%= label_tag(:username, "Username") %> + <%= text_field_tag(:username) %> + <%= submit_tag("Log In", class: "button") %> + <% end %> + +
+

+

+ There is no password field. In fact, there is no indication whatsoever + that you are who you say you are. There's nothing special about users - + username is just another piece of data that the user entered and we have to keep + track of. +

+

+ We'll learn more about security and authentication in the next couple weeks. + For now, don't worry about it beyond what you can see here. +

+
+
diff --git a/config/routes.rb b/config/routes.rb index 8066ba0938..a89b8e521c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -34,6 +34,12 @@ root to: 'works#main', as: 'root' #root_path + ### LOGIN ### + + get '/login', to: 'sessions#login_form' + + post '/login', to: 'sessions#login' + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb new file mode 100644 index 0000000000..c2632a720b --- /dev/null +++ b/test/controllers/sessions_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe SessionsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From cec0cf46ea666931bbaae38f8c91d8400fe9f32b Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Fri, 13 Oct 2017 15:56:01 -0700 Subject: [PATCH 17/36] modified session logout method --- app/controllers/sessions_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index db9f7787b9..3e553f64a5 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -23,7 +23,9 @@ def login def logout session.delete(params[:user_id]) - @current_user = nil + # @current_user = nil + flash[:success] = "Successfully logged out" + redirect_to root_path end end From b023f4ee00b20c73ee5d2d74ab5feb25beefebb2 Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Fri, 13 Oct 2017 18:36:45 -0700 Subject: [PATCH 18/36] changed and styled the view of the Application and created a page for the loginform --- app/assets/stylesheets/application.css | 22 +++++++++++++++++++++- app/views/layouts/application.html.erb | 26 ++++++++++++++++---------- app/views/sessions/login_form.html.erb | 4 ++-- config/routes.rb | 2 +- 4 files changed, 40 insertions(+), 14 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 5c67b5a90e..0cec064572 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -67,9 +67,11 @@ a, h3 { color: #26A69A; } + h1, h2, h3, h4, h5 { + font-weight: bold; + } h3 { - font-weight: bold; font-size: 1.9375rem; } @@ -82,6 +84,24 @@ background-color: #26A69A; } + .page-header { + max-width: 100%; + background-color: #B2DFDB; + border-bottom: 1px solid #EEEEEE; + margin-bottom: 10px; + padding: 25px 20px 10px 20px; + } + + .page-header h2 a { + color: #FF5722; + padding-right: 25px; + margin-right: 15px; + border-right: white 2px solid; + } + + .page-header h2 small { + color: white; + } diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 9bd8e57758..dd13772f62 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -11,16 +11,22 @@ -

- <%= link_to "Media Ranker", root_path %> - Ranking the Best of Everything -

- +
+

+ <%= link_to "Media Ranker", root_path %> + Ranking the Best of Everything +

+ + +
<% flash.each do |name, message| %>
<%= message %>
diff --git a/app/views/sessions/login_form.html.erb b/app/views/sessions/login_form.html.erb index 564f741ba7..14c4d43f94 100644 --- a/app/views/sessions/login_form.html.erb +++ b/app/views/sessions/login_form.html.erb @@ -1,5 +1,5 @@
-

Login Form

+

Log In

<%= form_tag do %> <%= label_tag(:username, "Username") %> @@ -8,7 +8,7 @@ <% end %>
-

+

A note about logging in

There is no password field. In fact, there is no indication whatsoever that you are who you say you are. There's nothing special about users - diff --git a/config/routes.rb b/config/routes.rb index a89b8e521c..a5214de693 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -36,7 +36,7 @@ ### LOGIN ### - get '/login', to: 'sessions#login_form' + get '/login', to: 'sessions#login_form', as: 'login' #login_path post '/login', to: 'sessions#login' From a8ad7180f6de4d167b885c3c7e3f866e380c07b7 Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Sat, 14 Oct 2017 11:48:42 -0700 Subject: [PATCH 19/36] Modified User index page and tested that User index and show pages pull up correctly --- app/views/users/index.html.erb | 2 +- test/controllers/users_controller_test.rb | 19 +++++-------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 06540f37bb..28bee4b75f 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -12,7 +12,7 @@ <% @users.each do |user| %>

<% end %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 0e7e2eb5d2..104a237445 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,7 +1,28 @@

<%= "User Summary: #{@user.username}"%>

-

<%= "Joined site #{@user.created_at}"%>

+

<%= "Joined site #{(@user.created_at).to_date}"%>

Votes

- <%= "#{user.username}" %> + <%= link_to "#{user.username}", user_path(user.id) %> <%= "Future Votes" %> diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 5c27aad8d3..61feded6b6 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -2,23 +2,14 @@ describe UsersController do it "should get index" do - get users_index_url - value(response).must_be :success? - end - - it "should get create" do - get users_create_url - value(response).must_be :success? - end - - it "should get new" do - get users_new_url - value(response).must_be :success? + get users_path + must_respond_with :success end it "should get show" do - get users_show_url - value(response).must_be :success? + user = users(:user_one) + get user_path(user.id) + must_respond_with :success end end From c555edd1ab276caa35a34619d3701db5d1e91446 Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Sat, 14 Oct 2017 11:57:44 -0700 Subject: [PATCH 20/36] modified delete button class, tested that work deletes properly --- app/views/works/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 925de05f8f..6b86b854a2 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -26,7 +26,7 @@
<%= link_to "Back to media ranks", root_path, class: :button %> <%= link_to "Edit", edit_work_path, class: :button %> - <%= link_to "Delete", delete_work_path, method: :delete, data: {confirm: "Are you sure?"}, class: :button %> + <%= link_to "Delete", delete_work_path, method: :delete, data: {confirm: "Are you sure?"}, class: "button alert" %>
From 6c5e3c7c1813eeb674579a3e344ec7670010b563 Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Sat, 14 Oct 2017 12:19:38 -0700 Subject: [PATCH 21/36] modified Works show page with placeholder html for showing a votes table, pseudocode for upvote method added to Work model --- app/models/work.rb | 8 ++++- app/views/works/show.html.erb | 66 +++++++++++++++++++++-------------- 2 files changed, 47 insertions(+), 27 deletions(-) diff --git a/app/models/work.rb b/app/models/work.rb index b9b1ddb816..97ee2ef46f 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,5 +1,11 @@ class Work < ApplicationRecord has_many :votes - + validates :title, presence: true, uniqueness: {scope: :category, message: "There is already a Work of this category with this title " } + + def upvote + #if user is logged in + #then you can create a vote on a work + #else, flash error that says you must be logged in to upvote + end end diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 6b86b854a2..d51f7aa1f6 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -1,6 +1,43 @@ -

<%= @work.title %>

+
+
+

<%= @work.title %>

+

<%= "Created by: #{@work.creator}"%>

+

<%= "Published: #{@work.publication_year}"%>

+
+ <%= link_to "Back to media ranks", root_path, class: :button %> + <%= link_to "Edit", edit_work_path, class: :button %> + + <%= link_to "Delete", delete_work_path, method: :delete, data: {confirm: "Are you sure?"}, class: "button alert" %> +
+
-<% if @work.errors.any? %> +
+

<%= "#{@work.votes.count} votes for this #{@work.category}"%>

+ + + + + + + + + <% if @work.votes.count > 0%> + <%= @work.votes.each do |vote|%> + + + + + <% end %> + <% end %> + +
UserDate
<%= link_to "#{vote.user.username}", user_path(vote.user.id)%><%= "#{(vote.created_at).to_date} "%>
+
+ +
+ + + + From 700355ddae6fa51e477188d87afc20054710f1d2 Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Sat, 14 Oct 2017 21:44:12 -0700 Subject: [PATCH 22/36] Edited view for top media Main page, added some styling --- app/assets/stylesheets/application.css | 64 ++++++++++++++++++++++---- app/views/works/main.html.erb | 9 +++- 2 files changed, 61 insertions(+), 12 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 0cec064572..1212887cfc 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -61,9 +61,13 @@ body { font-family: "Gudea", sans-serif; } -/*@media print, screen and (min-width: 40em) h3 { - font-size: 1.9375rem; -}*/ + + main { + padding-top: 2rem; + padding-bottom: 2rem; + display: block; + } + a, h3 { color: #26A69A; } @@ -84,13 +88,7 @@ background-color: #26A69A; } - .page-header { - max-width: 100%; - background-color: #B2DFDB; - border-bottom: 1px solid #EEEEEE; - margin-bottom: 10px; - padding: 25px 20px 10px 20px; - } + .page-header h2 a { color: #FF5722; @@ -103,6 +101,52 @@ color: white; } + .media-spotlight-header { + color: #424242; + } + + .spotlight div { + padding: 0 2rem 2rem 2rem; + } + + hr { + clear: both; + max-width: 75rem; + height: 0; + margin: 1.25rem auto; + border-top: 0; + border-right: 0; + border-bottom: 1px solid #cacaca; + border-left: 0; + overflow: visible; + box-sizing: content-box; + } + + .row { + max-width: 75rem; + margin-right: auto; + margin-left: auto; + } + .root-hr { + margin: 0px auto 75px auto; + color: #EEEEEE; + } + + .page-header { + max-width: 100%; + background-color: #B2DFDB; + border-bottom: 1px solid #EEEEEE; + margin-bottom: 10px; + padding: 25px 20px 10px 20px; + } + + .top-ten h3 { + border-bottom: 2px solid; + border-bottom-color: #B2DFDB; + } + /*@media print, screen and (min-width: 40em) h3 { + font-size: 1.9375rem; + }*/ /* background-color: #26A69A;*/ diff --git a/app/views/works/main.html.erb b/app/views/works/main.html.erb index 53803b7fa4..01a1028cc2 100644 --- a/app/views/works/main.html.erb +++ b/app/views/works/main.html.erb @@ -4,11 +4,16 @@

Media Spotlight: <%= "eventual link_to to work's show page"%> by <%= "top work's creator"%> -

+ +

+ <%= "Work.votes"%> +

+
+

Top Movies

    @@ -33,7 +38,7 @@
-
+

Top Albums

  • From 2de536d682e709858423f575bce8667d10474f02 Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Sun, 15 Oct 2017 02:18:34 -0700 Subject: [PATCH 23/36] Setup pseudocode for Upvote method, setup login requirements for upvoting, setup view of Votes on the Work's show page and User's show page, added link to upvote from All Media page --- app/controllers/application_controller.rb | 23 +++++++++++++++++++++ app/controllers/votes_controller.rb | 17 ++++++++++++--- app/models/vote.rb | 2 +- app/views/users/index.html.erb | 2 +- app/views/users/show.html.erb | 25 +++++++++++++++++++++-- app/views/works/index.html.erb | 12 +++++------ app/views/works/show.html.erb | 2 +- config/routes.rb | 2 +- 8 files changed, 70 insertions(+), 15 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1c07694e9d..023e1b46a1 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,3 +1,26 @@ class ApplicationController < ActionController::Base protect_from_forgery with: :exception + + + + + private + ###Does below go in the model? + + # Returns the current logged-in user (if any). + def current_user + @current_user = User.find_by(id: session[:user_id]) + end + + # Returns true if the user is logged in, false otherwise. + def logged_in? + !current_user.nil? + end + + def require_login + unless logged_in? + flash[:error] = "You must log in to do that" + redirect_to works_path(work.id) + end + end end diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index fec177590e..b6470aaa82 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -1,16 +1,27 @@ class VotesController < ApplicationController + + before_action :require_login + def create #def upvote # user = User.find_by(id: params[:id]) # user = User.find_by(username: params[:username]) - user = User.find_by(username: session[:username]) + user = User.find_by(id: session[:user_id]) work = Work.find_by(id: params[:id]) - @vote = Vote.new(user,work) + @vote = Vote.new + @vote.user = user + @vote.work = work if @vote.save - + flash[:success] = "Successfully upvoted!" + #TODO: redirect to the same page you were on + redirect_back(fallback_location: root_path) + else + flash[:error] = "Could not upvote" end end + + end diff --git a/app/models/vote.rb b/app/models/vote.rb index 93ab8f809d..6bba411a12 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -3,5 +3,5 @@ class Vote < ApplicationRecord belongs_to :work validates :user, presence: true - validates :work, presence: true + validates :work, presence: true, uniqueness: {scope: :user, message: "There is already a vote from this user for this work" } end diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 28bee4b75f..ea9154d0de 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -18,7 +18,7 @@ <%= "Future Votes" %>
- <%= "#{user.created_at.to_date}" %> + <%= "#{(user.created_at).to_date}" %>
- This will be user's votes + + + + + + + + + + + <% if @user.votes.count > 0%> + <% @user.votes.each do |vote|%> + + + + + + + + <% end %> + <% end %> +
Media TitleCreated ByPublishedCategoryVoted On
<%= link_to "#{vote.work.title}", work_path(vote.work.id)%><%= "#{vote.work.creator} "%><%= "#{vote.work.publication_year} "%><%= "#{vote.work.category} "%><%= "#{(vote.created_at).to_date} "%>
diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 82a8a21ada..aa7c3141e5 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -24,7 +24,7 @@ <% work_headers.each do |key| %> <% if key == "Votes" %> - <%= "This will be # of votes" %> + <%= "#{(album.votes).count}" %> <% elsif key == "Title" %> <%= link_to "#{album.title}", work_path(album.id) %> <% elsif key == "Created By" %> @@ -32,7 +32,7 @@ <% elsif key == "Published" %> <%= "#{album.publication_year}" %> <% elsif key == "Upvote" %> - <%= "This will be a button" %> + <%= link_to "Upvote", upvote_path(album.id), method: :post %> <% end %> <% end %> @@ -56,7 +56,7 @@ <% work_headers.each do |key| %> <% if key == "Votes" %> - <%= "This will be # of votes" %> + <%= "#{(book.votes).count}" %> <% elsif key == "Title" %> <%= link_to "#{book.title}", work_path(book.id) %> <% elsif key == "Created By" %> @@ -64,7 +64,7 @@ <% elsif key == "Published" %> <%= "#{book.publication_year}" %> <% elsif key == "Upvote" %> - <%= "This will be a button" %> + <%= link_to "Upvote", upvote_path(book.id), method: :post %> <% end %> <% end %> @@ -88,7 +88,7 @@ <% work_headers.each do |key| %> <% if key == "Votes" %> - <%= "This will be # of votes" %> + <%= "#{(movie.votes).count}" %> <% elsif key == "Title" %> <%= link_to "#{movie.title}", work_path(movie.id) %> <% elsif key == "Created By" %> @@ -96,7 +96,7 @@ <% elsif key == "Published" %> <%= "#{movie.publication_year}" %> <% elsif key == "Upvote" %> - <%= "This will be a button" %> + <%= link_to "Upvote", upvote_path(movie.id), method: :post %> <% end %> <% end %> diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index d51f7aa1f6..f164c6c1a5 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -22,7 +22,7 @@ <% if @work.votes.count > 0%> - <%= @work.votes.each do |vote|%> + <% @work.votes.each do |vote|%> <%= link_to "#{vote.user.username}", user_path(vote.user.id)%> <%= "#{(vote.created_at).to_date} "%> diff --git a/config/routes.rb b/config/routes.rb index a5214de693..7e3e5dfdcc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,7 +2,7 @@ ### VOTE ### - post 'votes/', to: 'votes#create', as: 'create_vote' #create_vote_path + post 'works/:id/upvote', to: 'votes#create', as: 'upvote' #upvote_path get 'votes/create' From d6c41d2b5c6134129c3fa94f4c956b0ae8f9056a Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Sun, 15 Oct 2017 02:24:53 -0700 Subject: [PATCH 24/36] minor styling: added upvote linke to work's show page, added class id of button to the add/edit partial form --- app/views/works/_form.html.erb | 2 +- app/views/works/show.html.erb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb index 0030269970..3571590552 100644 --- a/app/views/works/_form.html.erb +++ b/app/views/works/_form.html.erb @@ -25,5 +25,5 @@ <%= f.label "Description" %> <%= f.text_area :description %> - <%= f.submit button_text%> + <%= f.submit button_text, class: :button%> <% end %> diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index f164c6c1a5..9473dececf 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -3,10 +3,11 @@

<%= @work.title %>

<%= "Created by: #{@work.creator}"%>

<%= "Published: #{@work.publication_year}"%>

+

<%= "#{@work.description}"%>

<%= link_to "Back to media ranks", root_path, class: :button %> <%= link_to "Edit", edit_work_path, class: :button %> - + <%= link_to "Upvote", upvote_path(@work.id), method: :post,class: :button %> <%= link_to "Delete", delete_work_path, method: :delete, data: {confirm: "Are you sure?"}, class: "button alert" %>
From 3587d7d7f8732e54d5688555a0d345ecb39c39c3 Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Sun, 15 Oct 2017 10:21:12 -0700 Subject: [PATCH 25/36] Added logic for checking for log_in status to sessions helper, refactored login/logout method using SessionsHelper methods, added preliminary logic for requiring login to vote, added buton for logout, added display logic in application html to show buttons depending on login status, added route to logout --- app/controllers/application_controller.rb | 17 ++++------------- app/controllers/sessions_controller.rb | 8 +++----- app/helpers/sessions_helper.rb | 19 +++++++++++++++++++ app/views/layouts/application.html.erb | 7 ++++++- config/routes.rb | 2 ++ 5 files changed, 34 insertions(+), 19 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 023e1b46a1..7d96ba99b8 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,26 +1,17 @@ class ApplicationController < ActionController::Base protect_from_forgery with: :exception - - + include SessionsHelper + before_action :logged_in? private ###Does below go in the model? - # Returns the current logged-in user (if any). - def current_user - @current_user = User.find_by(id: session[:user_id]) - end - - # Returns true if the user is logged in, false otherwise. - def logged_in? - !current_user.nil? - end - def require_login unless logged_in? flash[:error] = "You must log in to do that" - redirect_to works_path(work.id) + # redirect_to works_path(params[:id]) + redirect_back(fallback_location: works_path) end end end diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 3e553f64a5..532f0cac78 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -7,23 +7,21 @@ def login if user flash[:success] = "Successfully logged in as existing user #{user.username}" - session[:user_id] = user.id + log_in(user) redirect_to root_path else #create new user new_user = User.new(username: params[:username]) if new_user.save flash[:success] = "Successfully created new user #{new_user.username} with ID #{new_user.id}" - session[:user_id] = new_user.id + log_in(new_user) redirect_to root_path end end - end def logout - session.delete(params[:user_id]) - # @current_user = nil + log_out flash[:success] = "Successfully logged out" redirect_to root_path end diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb index 309f8b2eb3..790b446ca8 100644 --- a/app/helpers/sessions_helper.rb +++ b/app/helpers/sessions_helper.rb @@ -1,2 +1,21 @@ module SessionsHelper + # Logs in the given user. + def log_in(user) + session[:user_id] = user.id + end + + # Returns the current logged-in user (if any). + def current_user + @current_user ||= User.find_by(id: session[:user_id]) + end + + # Returns true if the user is logged in, false otherwise. + def logged_in? + !current_user.nil? + end + + def log_out + session.delete(:user_id) + @current_user = nil + end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index dd13772f62..00c04e7de9 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -22,7 +22,12 @@ <%= link_to "Add a New Work", new_work_path, class: :button %> <%= link_to "View all users", users_path, class: :button %>
- <%= link_to "Log in", login_path, class: :button %> + <% if logged_in? %> + <%= link_to "Logged in as #{@current_user.username}", user_path(@current_user.id), class: :button%> + <%= link_to "Log Out", logout_path, method: :delete, class: :button%> + <% else %> + <%= (link_to "Log in", login_path, class: :button) %> + <% end %>
diff --git a/config/routes.rb b/config/routes.rb index 7e3e5dfdcc..d1dc964b60 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -40,6 +40,8 @@ post '/login', to: 'sessions#login' + delete '/logout', to: 'sessions#logout', as: 'logout' #logout_path + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From 43ece2dfa80133661bc3b91cf78aae75e8b1447d Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Sun, 15 Oct 2017 12:09:51 -0700 Subject: [PATCH 26/36] pseudocode of implementing upvote logic, flash notice and error displaying separately but should display together --- app/assets/stylesheets/application.css | 25 +++++++++++++++++++++-- app/controllers/application_controller.rb | 4 ++-- app/controllers/users_controller.rb | 2 +- app/controllers/votes_controller.rb | 13 ++++++++++-- app/models/vote.rb | 2 +- app/views/layouts/application.html.erb | 20 +++++++++++++----- 6 files changed, 53 insertions(+), 13 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 1212887cfc..ff698c48a0 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -79,10 +79,11 @@ font-size: 1.9375rem; } - .flash .success { + /*.flash .success { background-color: lightgreen; display:block; - } + }*/ + .button { background-color: #26A69A; @@ -145,6 +146,26 @@ border-bottom: 2px solid; border-bottom-color: #B2DFDB; } + + .status { + border-radius: 5px; + background-color: #e6e6e6; + padding: 20px 25px; + margin-top: 30px; + } + + .status h3 { + font-weight: normal; + font-size: 1em; + } + + .success h3 { + color: #8a8a8a; + } + + .failure h3 { + color: #C70039; + } /*@media print, screen and (min-width: 40em) h3 { font-size: 1.9375rem; }*/ diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7d96ba99b8..8cf15f9ae9 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -9,9 +9,9 @@ class ApplicationController < ActionController::Base def require_login unless logged_in? - flash[:error] = "You must log in to do that" + flash[:failure] = "You must log in to do that" # redirect_to works_path(params[:id]) - redirect_back(fallback_location: works_path) + redirect_back(fallback_location: works_path) end end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 9185938e4e..b5c989a444 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -37,7 +37,7 @@ def user_params # flash[:success] = "Successfully created new user #{@user.username} with ID #{@user.id}" # redirect_to root_path # else - # flash[:error] = "User not created" + # flash[:failure] = "User not created" # render :new # end # diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index b6470aaa82..7278014281 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -18,10 +18,19 @@ def create #TODO: redirect to the same page you were on redirect_back(fallback_location: root_path) else - flash[:error] = "Could not upvote" + + if logged_in? + flash[:failure] = "Could not upvote" #if already voted, then display error message + @errors = @vote.errors + # flash[:errors] = "#{@errors.first[1]}" + redirect_back(fallback_location: root_path, notice: "#{@errors.first[1]}") + else + flash[:failure] = "You must log in to do that" + redirect_back(fallback_location: root_path) + end + end end - end diff --git a/app/models/vote.rb b/app/models/vote.rb index 6bba411a12..621ebb0d01 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -3,5 +3,5 @@ class Vote < ApplicationRecord belongs_to :work validates :user, presence: true - validates :work, presence: true, uniqueness: {scope: :user, message: "There is already a vote from this user for this work" } + validates :work, presence: true, uniqueness: {scope: :user, message: "user: has already voted for this work" } end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 00c04e7de9..d65389c296 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -32,11 +32,21 @@ -
- <% flash.each do |name, message| %> -
<%= message %>
- <% end %> -
+ + <% flash.each do |name, message| %> + +
+

<%= message %>

+ <% if params[:notice] %> +
    +
  • + <%= params[:notice] %> +
    • +
+ <% end %> + +
+ <% end %> <%= yield %> From 3438e03df5064f608a6f24ccef3885e732b0e8b3 Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Sun, 15 Oct 2017 13:15:11 -0700 Subject: [PATCH 27/36] added some model testing for users, votes, and works --- app/assets/stylesheets/application.css | 5 ++++ app/models/work.rb | 16 +++++++++--- app/views/works/main.html.erb | 31 +++++++++++++++++------ test/controllers/works_controller_test.rb | 18 ++++++++----- test/fixtures/votes.yml | 1 + test/models/user_test.rb | 3 +-- test/models/vote_test.rb | 3 +-- test/models/work_test.rb | 8 ++++++ 8 files changed, 63 insertions(+), 22 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index ff698c48a0..a01faa125c 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -166,6 +166,11 @@ .failure h3 { color: #C70039; } + + .top-ten ul { + list-style-type: none; + margin-left: 0px; + } /*@media print, screen and (min-width: 40em) h3 { font-size: 1.9375rem; }*/ diff --git a/app/models/work.rb b/app/models/work.rb index 97ee2ef46f..31d0f9ac2c 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -3,9 +3,17 @@ class Work < ApplicationRecord validates :title, presence: true, uniqueness: {scope: :category, message: "There is already a Work of this category with this title " } - def upvote - #if user is logged in - #then you can create a vote on a work - #else, flash error that says you must be logged in to upvote + def self.top_ten(category) + works_in_category = self.where(category: category) + sorted = works_in_category.sort{ |x,y| x.votes.count <=> y.votes.count } + + top_ten = sorted.reverse.take(10) + + return top_ten + end + + def self.top_work + sorted_by_votes = self.all.sort{ |x,y| x.votes.count <=> y.votes.count } + return sorted_by_votes.last end end diff --git a/app/views/works/main.html.erb b/app/views/works/main.html.erb index 01a1028cc2..8acf6fb98e 100644 --- a/app/views/works/main.html.erb +++ b/app/views/works/main.html.erb @@ -3,51 +3,66 @@

Media Spotlight: - <%= "eventual link_to to work's show page"%> by <%= "top work's creator"%> + <%spotlight = @works.top_work %> + <%= link_to "#{spotlight.title}", work_path(spotlight.id)%> by <%= "#{spotlight.creator}"%>

- <%= "Work.votes"%> + <%= "#{spotlight.votes.count}"%> votes

+ + + + +
+ <% top_movies = @works.top_ten("movie")%>

Top Movies

+ <% top_movies.each do |movie| %>
  • -

    by

    +

    <%=link_to "#{movie.title}", work_path(movie.id)%> by <%=movie.creator%>

    • - num votes + <%=movie.votes.count%> votes

+ <% end %>
+ <% top_books = @works.top_ten("book")%>

Top Books

+ <% top_books.each do |book| %>
  • -

    by

    +

    <%=link_to "#{book.title}", work_path(book.id)%> by <%=book.creator%>

    • - num votes + <%=book.votes.count%> votes

+ <% end %>
+ <% top_albums = @works.top_ten("album")%>

Top Albums

+ <% top_albums.each do |album| %>
  • -

    by

    +

    <%=link_to "#{album.title}", work_path(album.id)%> by <%=album.creator%>

    • - num votes + <%=album.votes.count%> votes

+ <% end %>
diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index b51f29cb8b..2fe6ed4e39 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -9,12 +9,6 @@ end - it " pulls up the main top ten page" do - get root_path - - must_respond_with :success - end - it "should be able to visit a work's detail page" do #Arrange @@ -103,4 +97,16 @@ end end + describe "The main, top works page" do + it " pulls up the main top ten page" do + get root_path + + must_respond_with :success + end + + it "displays a max of ten works per category" do + + end + end + end diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml index 4db7675eb7..c972ef1957 100644 --- a/test/fixtures/votes.yml +++ b/test/fixtures/votes.yml @@ -14,4 +14,5 @@ vote_two: created_at: 2017-10-13 user: users(:user_two) work: works(:movie_one) + # column: value diff --git a/test/models/user_test.rb b/test/models/user_test.rb index cc862ac2d9..9757aba5cd 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -1,9 +1,8 @@ require "test_helper" describe User do - let(:user) { User.new } it "must be valid" do - value(user).must_be :valid? + users(:user_one).must_be :valid? end end diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index fc15947bd3..638dd6c030 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -1,9 +1,8 @@ require "test_helper" describe Vote do - let(:vote) { Vote.new } it "must be valid" do - value(vote).must_be :valid? + votes(:vote_one).must_be :valid? end end diff --git a/test/models/work_test.rb b/test/models/work_test.rb index 829e1eea3a..6bf19da6bd 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -35,4 +35,12 @@ end + describe "self.top_ten method" do + it "returns a max of ten works per category" do + ((Work.all).top_ten("movie").count).must_be :<=, 10 + ((Work.all).top_ten("album").count).must_be :<=, 10 + ((Work.all).top_ten("book").count).must_be :<=, 10 + end + end + end From 3611c7e0176d39a893f99cecc51fe406bbe70f00 Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Sun, 15 Oct 2017 13:20:47 -0700 Subject: [PATCH 28/36] show vote count on all users table --- app/views/users/index.html.erb | 2 +- test/controllers/works_controller_test.rb | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index ea9154d0de..6c2fce21fe 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -15,7 +15,7 @@ <%= link_to "#{user.username}", user_path(user.id) %> - <%= "Future Votes" %> + <%= "#{user.votes.count}" %> <%= "#{(user.created_at).to_date}" %> diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index 2fe6ed4e39..559d8da731 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -103,10 +103,6 @@ must_respond_with :success end - - it "displays a max of ten works per category" do - - end end end From df03a1d7fadb2d1dfcb5470c87ea3692f27776df Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Sun, 15 Oct 2017 22:59:45 -0700 Subject: [PATCH 29/36] changed display of error messages --- app/assets/stylesheets/application.css | 5 ++ app/controllers/users_controller.rb | 25 +++------ app/controllers/votes_controller.rb | 5 +- app/controllers/works_controller.rb | 28 ++++++---- app/models/work.rb | 8 ++- app/views/layouts/application.html.erb | 16 +++--- app/views/sessions/login_form.html.erb | 41 +++++++-------- app/views/users/index.html.erb | 55 ++++++++++---------- app/views/works/_form.html.erb | 10 ---- app/views/works/index.html.erb | 19 ++----- app/views/works/main.html.erb | 6 +-- test/controllers/sessions_controller_test.rb | 33 ++++++++++-- test/controllers/users_controller_test.rb | 13 +++++ 13 files changed, 139 insertions(+), 125 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index a01faa125c..2c79654d19 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -142,6 +142,11 @@ padding: 25px 20px 10px 20px; } + .page-header h2 { + text-align: center; + margin: 25px auto 40px auto; + } + .top-ten h3 { border-bottom: 2px solid; border-bottom-color: #B2DFDB; diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index b5c989a444..a83b7b1d14 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,4 +1,9 @@ class UsersController < ApplicationController + + def render_404 + render file: "#{Rails.root}/public/404.html", layout: false, status: 404 + end + def index @users = User.all end @@ -16,6 +21,7 @@ def create def show @user = User.find_by(id: params[:id]) + render_404 unless @user end private @@ -23,23 +29,4 @@ def show def user_params return params.require(:user).permit(:username) end - - - ##should reserve this for sessions controller? - # def login - # existing_user = User.find_by(username: params[:username]) - # - # if existing_user - # flash[:success] = "Successfully logged in as existing user #{existing_user.username}" - # session[:user_id] = existing_user.id - # redirect_to root_path - # elsif @user.save - # flash[:success] = "Successfully created new user #{@user.username} with ID #{@user.id}" - # redirect_to root_path - # else - # flash[:failure] = "User not created" - # render :new - # end - # - # end end diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index 7278014281..02a5c1b129 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -3,9 +3,6 @@ class VotesController < ApplicationController before_action :require_login def create - #def upvote - # user = User.find_by(id: params[:id]) - # user = User.find_by(username: params[:username]) user = User.find_by(id: session[:user_id]) work = Work.find_by(id: params[:id]) @@ -15,7 +12,6 @@ def create if @vote.save flash[:success] = "Successfully upvoted!" - #TODO: redirect to the same page you were on redirect_back(fallback_location: root_path) else @@ -23,6 +19,7 @@ def create flash[:failure] = "Could not upvote" #if already voted, then display error message @errors = @vote.errors # flash[:errors] = "#{@errors.first[1]}" + redirect_back(fallback_location: root_path, notice: "#{@errors.first[1]}") else flash[:failure] = "You must log in to do that" diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 0e399a3780..8b85eea019 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,15 +1,23 @@ class WorksController < ApplicationController + before_action :find_work, only: [:show, :edit, :destroy, :update] + + def render_404 + render file: "#{Rails.root}/public/404.html", layout: false, status: 404 + end + def index @works = Work.all end def create - @new_work = Work.new work_params + @work = Work.new work_params - if @new_work.save - flash[:success] = "Successfully created #{@new_work.category} #{@new_work.id}" - redirect_to work_path(@new_work.id) + if @work.save + flash[:success] = "Successfully created #{@work.category} #{@work.id}" + redirect_to work_path(@work.id) else + @errors = @work.errors + flash[:failure] = "A problem occurred: Could not create #{@work.category}" render :new end end @@ -19,21 +27,19 @@ def new end def edit - @work = Work.find_by(id: params[:id]) - redirect_to root_path unless @work end def show - @work = Work.find_by(id: params[:id]) + render_404 unless @work # @votes = @work.votes.order(:created_at) end def update - @work = Work.find_by(id: params[:id]) redirect_to root_path unless @work if @work.update_attributes work_params + flash[:success] = "Successfully updated #{@work.category} #{@work.id}" redirect_to work_path(@work.id) else render :edit @@ -41,9 +47,8 @@ def update end def destroy - @work= Work.find_by(id: params[:id]).destroy + @work.destroy - #TODO: What if a work is not destroyed successfully? flash[:success] = "Successfully destroyed #{@work.category} #{@work.id}" redirect_to root_path end @@ -59,5 +64,8 @@ def work_params return params.require(:work).permit(:category, :title, :creator, :publication_year, :description) end + def find_work + @work = Work.find_by(id: params[:id]) + end end diff --git a/app/models/work.rb b/app/models/work.rb index 31d0f9ac2c..3a14c60b10 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,15 +1,13 @@ class Work < ApplicationRecord has_many :votes - validates :title, presence: true, uniqueness: {scope: :category, message: "There is already a Work of this category with this title " } + validates :title, presence: true, uniqueness: {scope: :category, message: "has already been taken" } - def self.top_ten(category) + def self.sorted_by_votes(category) works_in_category = self.where(category: category) sorted = works_in_category.sort{ |x,y| x.votes.count <=> y.votes.count } - top_ten = sorted.reverse.take(10) - - return top_ten + return sorted.reverse end def self.top_work diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index d65389c296..9ec301e2be 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -32,21 +32,23 @@ - <% flash.each do |name, message| %> -

<%= message %>

- <% if params[:notice] %> -
    + <% @object ||= (@work||@vote||@user||nil) %> + <% if @object != nil && @object.errors.any?%> +
      + <% @object.errors.each do |column, message| %>
    • - <%= params[:notice] %> + <%= column %>: <%= message %>
      • + <% end %>
    <% end %> -
<% end %> - <%= yield %> +
+ <%= yield %> +
diff --git a/app/views/sessions/login_form.html.erb b/app/views/sessions/login_form.html.erb index 14c4d43f94..6a8447342c 100644 --- a/app/views/sessions/login_form.html.erb +++ b/app/views/sessions/login_form.html.erb @@ -1,23 +1,22 @@ -
-

Log In

- <%= form_tag do %> - <%= label_tag(:username, "Username") %> - <%= text_field_tag(:username) %> - <%= submit_tag("Log In", class: "button") %> - <% end %> +

Log In

-
-

A note about logging in

-

- There is no password field. In fact, there is no indication whatsoever - that you are who you say you are. There's nothing special about users - - username is just another piece of data that the user entered and we have to keep - track of. -

-

- We'll learn more about security and authentication in the next couple weeks. - For now, don't worry about it beyond what you can see here. -

-
-
+<%= form_tag do %> + <%= label_tag(:username, "Username") %> + <%= text_field_tag(:username) %> + <%= submit_tag("Log In", class: "button") %> +<% end %> + +
+

A note about logging in

+

+ There is no password field. In fact, there is no indication whatsoever + that you are who you say you are. There's nothing special about users - + username is just another piece of data that the user entered and we have to keep + track of. +

+

+ We'll learn more about security and authentication in the next couple weeks. + For now, don't worry about it beyond what you can see here. +

+
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 6c2fce21fe..657b89d70b 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -1,29 +1,28 @@ -
-

List of Users

- - - - - - - - - - <% @users.each do |user| %> - - - - - - <% end %> - -
UsernameVotesJoined
- <%= link_to "#{user.username}", user_path(user.id) %> - - <%= "#{user.votes.count}" %> - - <%= "#{(user.created_at).to_date}" %> -
- <%= link_to "Back to Media List", root_path, class: :button %> -
+

List of Users

+ + + + + + + + + + <% @users.each do |user| %> + + + + + + <% end %> + +
UsernameVotesJoined
+ <%= link_to "#{user.username}", user_path(user.id) %> + + <%= "#{user.votes.count}" %> + + <%= "#{(user.created_at).to_date}" %> +
+ + <%= link_to "Back to Media List", root_path, class: :button %> diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb index 3571590552..d55b5df2ab 100644 --- a/app/views/works/_form.html.erb +++ b/app/views/works/_form.html.erb @@ -1,13 +1,3 @@ -<% if @work.errors.any? %> -
    - <% @work.errors.each do |column, message| %> -
  • - <%= column.upcase %> <%= message %> -
    • - <% end %> -
-<% end %> - <%= form_for @work do |f| %> <%= f.label "Category" %> diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index aa7c3141e5..51cee26521 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1,7 +1,5 @@

List of works

- - <% work_headers = ["Votes", "Title", "Created By", "Published", "Upvote"] %> <% if @works.count < 1 %> @@ -10,7 +8,7 @@

<% end %> -<% albums = (@works.where(category: "album")).order(:id)%> +<% albums = @works.sorted_by_votes("album")%>

Albums

@@ -32,7 +30,7 @@ <% elsif key == "Published" %> <%= "#{album.publication_year}" %> <% elsif key == "Upvote" %> - <%= link_to "Upvote", upvote_path(album.id), method: :post %> + <%= link_to "Upvote", upvote_path(album.id), method: :post, class: :button %> <% end %> <% end %> @@ -41,7 +39,7 @@
-<% books = (@works.where(category: "book")).order(:id)%> +<% books= @works.sorted_by_votes("book")%>

Books

@@ -73,7 +71,7 @@
-<% movies = (@works.where(category: "movie")).order(:id)%> +<% movies = @works.sorted_by_votes("movie")%>

Movies

@@ -105,12 +103,3 @@
- - - diff --git a/app/views/works/main.html.erb b/app/views/works/main.html.erb index 8acf6fb98e..f6ca39d198 100644 --- a/app/views/works/main.html.erb +++ b/app/views/works/main.html.erb @@ -21,7 +21,7 @@
- <% top_movies = @works.top_ten("movie")%> + <% top_movies = (@works.sorted_by_votes("movie")).take(10)%>

Top Movies

<% top_movies.each do |movie| %>
    @@ -36,7 +36,7 @@
- <% top_books = @works.top_ten("book")%> + <% top_books = (@works.sorted_by_votes("book")).take(10)%>

Top Books

<% top_books.each do |book| %>
    @@ -51,7 +51,7 @@
- <% top_albums = @works.top_ten("album")%> + <% top_albums = (@works.sorted_by_votes("album")).take(10)%>

Top Albums

<% top_albums.each do |album| %>
    diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb index c2632a720b..5147aef6df 100644 --- a/test/controllers/sessions_controller_test.rb +++ b/test/controllers/sessions_controller_test.rb @@ -1,7 +1,34 @@ require "test_helper" describe SessionsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + it "should get the login form" do + get login_path + must_respond_with :success + end + + describe "Logging in" do + it "starts session for existing user if logging in as existing user" do + user_one = users(:user_one) + post login_path, params: { username: user_one.username} + + session[:user_id].must_equal user_one.id + end + end + + it "creates a new user if logging in with a new username" do + new_username = "buoy" + + proc { + post login_path, params: { username: new_username} + }.must_change 'User.count', 1 + + new_user = User.find_by(username: new_username) + session[:user_id].must_equal new_user.id + end + + it "raises an error if you try to login without a username (blank/empty username field)" do + proc { + post login_path, params: { username: ""} + }.must_change 'User.count', 0 + end end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 61feded6b6..e86ce9e709 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -12,4 +12,17 @@ must_respond_with :success end + it "should respond with a 404 if it's not found" do + #Arrange + users(:user_one).destroy() + + #Act + + get user_path(users(:user_one).id) + + #Assert + + must_respond_with :not_found + end + end From 8b76f41f5adde69c23e2666e45d353741b4ffdb0 Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Sun, 15 Oct 2017 23:05:26 -0700 Subject: [PATCH 30/36] added button class to each upvote link on work index page for styling --- app/views/works/index.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 51cee26521..6bcb4fa6ef 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -62,7 +62,7 @@ <% elsif key == "Published" %> <%= "#{book.publication_year}" %> <% elsif key == "Upvote" %> - <%= link_to "Upvote", upvote_path(book.id), method: :post %> + <%= link_to "Upvote", upvote_path(book.id), method: :post, class: :button %> <% end %> <% end %> @@ -94,7 +94,7 @@ <% elsif key == "Published" %> <%= "#{movie.publication_year}" %> <% elsif key == "Upvote" %> - <%= link_to "Upvote", upvote_path(movie.id), method: :post %> + <%= link_to "Upvote", upvote_path(movie.id), method: :post, class: :button %> <% end %> <% end %> From 5b5d9e20c20fb31195eb6f9bcfc3bc65c21993c4 Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Sun, 15 Oct 2017 23:19:10 -0700 Subject: [PATCH 31/36] Added @media rules for styling --- app/assets/stylesheets/application.css | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 2c79654d19..900067a472 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -176,8 +176,28 @@ list-style-type: none; margin-left: 0px; } - /*@media print, screen and (min-width: 40em) h3 { - font-size: 1.9375rem; - }*/ + + .spotlight a { + border-bottom: 2px solid; + } + + table { + width: 100%; + margin-bottom: 1rem; + border-radius: 0; + } + + @media print, screen and (min-width: 40em) { + h3 { + font-size: 1.9375rem; + } + + .column, .columns { + padding-right: 0.9375rem; + padding-left: 0.9375rem; + } + } + + /* background-color: #26A69A;*/ From ea778a590f3083af1e6f5d695f8f4ed5299d9064 Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Sun, 15 Oct 2017 23:50:27 -0700 Subject: [PATCH 32/36] Added dependencies to user and work models for when works with votes get deleted --- app/models/user.rb | 2 +- app/models/work.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 698d23eca7..f10094b938 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,5 +1,5 @@ class User < ApplicationRecord - has_many :votes + has_many :votes, dependent: :delete validates :username, presence: true, uniqueness: true #will automatically login if the username is not unique diff --git a/app/models/work.rb b/app/models/work.rb index 3a14c60b10..06872f87bd 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,5 +1,5 @@ class Work < ApplicationRecord - has_many :votes + has_many :votes, dependent: :delete validates :title, presence: true, uniqueness: {scope: :category, message: "has already been taken" } From 6dc92bbcdc4525b73847e3c5486348fc720e2d85 Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Mon, 16 Oct 2017 00:03:46 -0700 Subject: [PATCH 33/36] Fixed issue in model from using delete instead of destroy when establishing dependencies --- app/models/user.rb | 2 +- app/models/work.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index f10094b938..ffadab5ef0 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,5 +1,5 @@ class User < ApplicationRecord - has_many :votes, dependent: :delete + has_many :votes, dependent: :destroy validates :username, presence: true, uniqueness: true #will automatically login if the username is not unique diff --git a/app/models/work.rb b/app/models/work.rb index 06872f87bd..f303eb890f 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,5 +1,5 @@ class Work < ApplicationRecord - has_many :votes, dependent: :delete + has_many :votes, dependent: :destroy validates :title, presence: true, uniqueness: {scope: :category, message: "has already been taken" } From 23715008f69bbbc45293fe6b7e2a8a24faa2fd31 Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Mon, 16 Oct 2017 07:19:16 -0700 Subject: [PATCH 34/36] Edited fixtures and tests --- test/controllers/votes_controller_test.rb | 36 ++++++++++++++-- test/controllers/works_controller_test.rb | 39 ++++++++++------- test/fixtures/users.yml | 4 ++ test/fixtures/votes.yml | 10 +++-- test/fixtures/works.yml | 3 ++ test/models/user_test.rb | 21 +++++++++- test/models/vote_test.rb | 47 ++++++++++++++++++++- test/models/work_test.rb | 51 +++++++++++++++++++---- 8 files changed, 176 insertions(+), 35 deletions(-) diff --git a/test/controllers/votes_controller_test.rb b/test/controllers/votes_controller_test.rb index cf4d03935f..53dc1c0c81 100644 --- a/test/controllers/votes_controller_test.rb +++ b/test/controllers/votes_controller_test.rb @@ -1,7 +1,37 @@ require "test_helper" describe VotesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + + it "will create an upvote given work and user login" do + user = users(:user_two) + work = works(:album_one) + + post login_path, params: {username: user.username} + + proc { post upvote_path(work.id)}.must_change 'Vote.count', 1 + must_respond_with :redirect + + end + + it "user can't vote for same work twice" do + user = users(:user_two) + work = works(:album_one) + + post login_path, params: {username: user.username} + + post upvote_path(work.id) + + proc { post upvote_path(work.id)}.must_change 'Vote.count', 0 + must_respond_with :redirect + + end + + it "will not create an upvote if not logged in" do + work = works(:album_one) + + proc { post upvote_path(work.id)}.must_change 'Vote.count', 0 + must_respond_with :redirect + + end + end diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index 559d8da731..8a02f824cf 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -19,19 +19,33 @@ must_respond_with :success end + describe "updating a work" do + before do + @work = works(:movie_one) + end - it "should stay on the add work page and display the error message banner if we are unsuccessful in creating or updating a work" do + it "should not update a work if missing a title" do + patch update_work_path(@work.id), params: { work: {category: "album", title: nil} } - end + (@work.title).must_equal "Rosemary's Baby" + end - it "should be able to update a work" do + it "should be able to update a work with valid data and redirect to show page" do - end + patch update_work_path(@work.id), params: { work: {category: "album", title: "new title"} } - it "should redirect to the show page if updated successfuly" do + work = Work.find_by(id: @work.id) + (work.title).must_equal "new title" + + must_respond_with :redirect + must_redirect_to work_path(@work.id) + + end end + + describe 'creating a new Work' do it "should be able to visit the 'Add New Work' page " do get new_work_path @@ -48,10 +62,10 @@ work.valid?.must_equal true end - it "raises an error if there is a Work that has the same category AND same title" do - # existing_book = works(:book_one) - # - # proc { post works_path, params: { work: {category: existing_book.category, title: existing_book.title} } }.must_raise ArugmentError.new + it "does not allow you to create a Work that has the same category AND same title" do + existing_book = works(:book_one) + + proc { post works_path, params: { work: {category: existing_book.category, title: existing_book.title} } }.must_change 'Work.count', 0 end @@ -76,13 +90,6 @@ end - it "should stay on the add work page and display the error message banner if we are unsuccessful in creating a work" do - - end - - it "should stay on the add work page if we are unsuccessful in creating a work" do - - end end describe "Deleting a Work" do diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 46d76b6887..79f1e18580 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -6,8 +6,12 @@ # user_one: username: plop + id: 1 + # column: value # user_two: username: 100luftredballoons + id: 2 + # column: value diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml index c972ef1957..266bec0730 100644 --- a/test/fixtures/votes.yml +++ b/test/fixtures/votes.yml @@ -6,13 +6,15 @@ # vote_one: created_at: 2017-10-13 - user: users(:user_one) - work: works(:book_one) + id: 1 + work_id: book_one.id + user_id: user_one.id # column: value # vote_two: created_at: 2017-10-13 - user: users(:user_two) - work: works(:movie_one) + id: 2 + work: movie_one + user: user_two # column: value diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index 120576b184..05645ec9a7 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -6,6 +6,7 @@ album_one: creator: King Krule publication_year: "2013" description: King Krule's first major studio release + id: 1 book_one: category: book @@ -13,6 +14,7 @@ book_one: creator: Etgar Keret publication_year: "2012" description: Keret's latest book + id: 2 movie_one: category: movie @@ -20,3 +22,4 @@ movie_one: creator: Roman Polanski publication_year: "1968" description: Horror classic + id: 3 diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 9757aba5cd..e3d3df100a 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -2,7 +2,26 @@ describe User do - it "must be valid" do + it "must be valid if it has a username" do users(:user_one).must_be :valid? end + + it "must have a username" do + user_two = users(:user_two) + + user_two.username = "" + + (user_two.valid?).must_equal false + end + + it "can have votes" do + movie = works(:movie_one) + user = users(:user_two) + @vote = Vote.new + @vote.work = movie + @vote.user = user + @vote.save + + ((user.votes).last).id.must_equal @vote.id + end end diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index 638dd6c030..bdf23da9eb 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -1,8 +1,51 @@ require "test_helper" +require 'pry' describe Vote do + before do + @vote = Vote.new + # Create two models + @work = works(:movie_one) + @user = users(:user_one) + end + + it 'is valid if it has a user and work' do + first_vote = votes(:vote_one) + (first_vote.valid?).must_equal false + + first_vote.user = @user + first_vote.work = @work + + first_vote.must_be :valid? + end + + describe 'relations' do + + it 'can set the work and author through "work" and "author"' do + + # Make the models relate to one another + @vote.work = @work + @vote.user = @user + + # author_id should have changed accordingly + ((@vote.work).id).must_equal @work.id + ((@vote.user).username).must_equal @user.username + + @vote.must_be :valid? + end + + it 'can set the work and user through "work_id" and "user_id"' do + + + # Make the models relate to one another + @vote.user_id = @user.id + @vote.work_id = @work.id + + # author should have changed accordingly + @vote.user.must_equal @user + @vote.work.must_equal @work - it "must be valid" do - votes(:vote_one).must_be :valid? + @vote.must_be :valid? + end end end diff --git a/test/models/work_test.rb b/test/models/work_test.rb index 6bf19da6bd..d993bd27f7 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -1,13 +1,10 @@ require "test_helper" +require 'pry' describe Work do describe 'validations' do let(:work) { Work.new } - # it "must be valid" do - # value(work).must_be :valid? - # end - it "is invalid without a title" do result = work.valid? result.must_equal false @@ -15,6 +12,16 @@ work.errors.messages.must_include :title end + it "is valid with a title" do + movie = works(:movie_one) + movie.title = nil + (movie.valid?).must_equal false + + movie.title = "New Movie Title" + (movie.valid?).must_equal true + + end + it "is invalid with a title shared by another work in the same category" do existing_book = works(:book_one) new_book_same_title = Work.new(category: existing_book.category, title: existing_book.title) @@ -35,12 +42,38 @@ end - describe "self.top_ten method" do - it "returns a max of ten works per category" do - ((Work.all).top_ten("movie").count).must_be :<=, 10 - ((Work.all).top_ten("album").count).must_be :<=, 10 - ((Work.all).top_ten("book").count).must_be :<=, 10 + describe "self.sorted_by_votes method" do + it "returns an array sorted by ascend" do + sorted_movies = ((Work.all).sorted_by_votes("movie")) + sorted_albums = ((Work.all).sorted_by_votes("album")) + sorted_books = ((Work.all).sorted_by_votes("book")) + + sorted_movies.each do |movie| + movie.category.must_equal "movie" + end + sorted_albums.each do |album| + album.category.must_equal "album" + end + sorted_books.each do |book| + book.category.must_equal "book" + end + + [sorted_movies, sorted_albums, sorted_books].each do |works| + ((works[0]).votes.count).must_be :>=, ((works[-1]).votes.count) + end + end end + it "can have votes" do + movie = works(:movie_one) + user = users(:user_two) + @vote = Vote.new + @vote.work = movie + @vote.user = user + @vote.save + + ((movie.votes).last).id.must_equal @vote.id + end + end From 0be48a006112c1374b3a32a516d42ba43574e601 Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Mon, 16 Oct 2017 07:27:58 -0700 Subject: [PATCH 35/36] Updated button hover color on app stylesheet --- app/assets/stylesheets/application.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 900067a472..450901a164 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -187,6 +187,10 @@ border-radius: 0; } + .button:hover { + background-color: #00796B; + } + @media print, screen and (min-width: 40em) { h3 { font-size: 1.9375rem; From 833e610f359acb976bce7c04bc8784c0104f0bf9 Mon Sep 17 00:00:00 2001 From: Amy Lee Date: Mon, 16 Oct 2017 08:58:16 -0700 Subject: [PATCH 36/36] added test to ensure that Work.sorted_by_category method can return an empty array --- test/models/work_test.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/models/work_test.rb b/test/models/work_test.rb index d993bd27f7..70a4a139c1 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -63,6 +63,15 @@ end end + + it "can be an empty array if there are no works of that category" do + movie = works(:movie_one) + movie.delete + + sorted_movies = ((Work.all).sorted_by_votes("movie")) + sorted_movies.count.must_equal 0 + + end end it "can have votes" do