From 259e76eb3fdb08f74ab3ca55852b7c28dce015d3 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Sun, 8 Oct 2017 22:40:10 -0700 Subject: [PATCH 01/38] Initial Rails project --- .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/schema.rb | 18 ++ 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 | 9 + tmp/.keep | 0 vendor/.keep | 0 76 files changed, 1292 insertions(+) create mode 100644 .gitignore create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Rakefile create mode 100644 app/assets/config/manifest.js create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/javascripts/cable.js create mode 100644 app/assets/javascripts/channels/.keep create mode 100644 app/assets/stylesheets/application.css create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/helpers/application_helper.rb create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/application.html.erb create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100755 bin/yarn create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/assets.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cookies_serializer.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/secrets.yml create mode 100644 config/spring.rb create mode 100644 db/schema.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..198e0521f2 --- /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.6.1) + 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.4 diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000000..e85f913914 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 0000000000..b16e53d6d5 --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css diff --git a/app/assets/images/.keep b/app/assets/images/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js new file mode 100644 index 0000000000..46b20359fa --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,15 @@ +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's +// vendor/assets/javascripts directory can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// compiled file. JavaScript code in this file should be added after the last require_* statement. +// +// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details +// about supported directives. +// +//= require rails-ujs +//= require turbolinks +//= require_tree . diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js new file mode 100644 index 0000000000..739aa5f022 --- /dev/null +++ b/app/assets/javascripts/cable.js @@ -0,0 +1,13 @@ +// Action Cable provides the framework to deal with WebSockets in Rails. +// You can generate new channels where WebSocket features live using the `rails generate channel` command. +// +//= require action_cable +//= require_self +//= require_tree ./channels + +(function() { + this.App || (this.App = {}); + + App.cable = ActionCable.createConsumer(); + +}).call(this); diff --git a/app/assets/javascripts/channels/.keep b/app/assets/javascripts/channels/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css new file mode 100644 index 0000000000..d05ea0f511 --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,15 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's + * vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS + * files in this directory. Styles in this file should be added after the last require_* statement. + * It is generally better to create a new file per style scope. + * + *= require_tree . + *= require_self + */ diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 0000000000..d672697283 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 0000000000..0ff5442f47 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 0000000000..1c07694e9d --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,3 @@ +class ApplicationController < ActionController::Base + protect_from_forgery with: :exception +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb new file mode 100644 index 0000000000..de6be7945c --- /dev/null +++ b/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 0000000000..a009ace51c --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 0000000000..286b2239d1 --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 0000000000..10a4cba84d --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 0000000000..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..7980b87b19 --- /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: b914c156658287a43ebdd30f814de6894ef563dde0f569d873b9979487e850f95e1dbfca7b16bbf7a51ee7ca406808fcc614aabec18ab027beb08703c9997b47 + +test: + secret_key_base: e4e4cdfc0e68bad11c289fa58d5e23e8d37f8ef7c1adf1a5134c82c65ed79f9440f7f943910d040d998c300e4aae2218eef2a809625f65aa6f0fb9f24832dd74 + +# 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/schema.rb b/db/schema.rb new file mode 100644 index 0000000000..2611543b38 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,18 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# 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: 0) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + +end 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..e3c4ff0b8e --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,9 @@ +require File.expand_path('../../config/environment', __FILE__) +require 'rails/test_help' + +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 4405e124b5a7097e9391a204f4081d3f4a000366 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Tue, 10 Oct 2017 15:07:38 -0700 Subject: [PATCH 02/38] created seed file --- db/{ => seed_data}/media_seeds.csv | 0 db/seeds.rb | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) rename db/{ => seed_data}/media_seeds.csv (100%) diff --git a/db/media_seeds.csv b/db/seed_data/media_seeds.csv similarity index 100% rename from db/media_seeds.csv rename to db/seed_data/media_seeds.csv diff --git a/db/seeds.rb b/db/seeds.rb index 1beea2accd..3c6df52a36 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,3 +5,31 @@ # # 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', 'seed_data', 'media_seeds.csv') +puts "Loading raw work data from #{MEDIA_FILE}" + +work_failures = [] +CSV.foreach(MEDIA_FILE, :headers => true) do |row| + work = Work.new + work.id = row['id'] + work.name = row['name'] + work.vin = row['vin'] + puts "Created work: #{work.inspect}" + successful = work.save + if !successful + work_failures << work + end +end + +puts "Added #{Work.count} driver records" +puts "#{media_failures.length} drivers failed to save" + +puts "Manually resetting PK sequence on each table" +ActiveRecord::Base.connection.tables.each do |t| + ActiveRecord::Base.connection.reset_pk_sequence!(t) +end + +puts "done" From 95b6dd54b48cfdfb28fb23d64bb1e64842014c05 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Tue, 10 Oct 2017 15:55:48 -0700 Subject: [PATCH 03/38] users, works, votes controllers generated --- app/assets/javascripts/users.js | 2 ++ app/assets/javascripts/votes.js | 2 ++ app/assets/javascripts/works.js | 2 ++ app/assets/stylesheets/users.scss | 3 +++ app/assets/stylesheets/votes.scss | 3 +++ app/assets/stylesheets/works.scss | 3 +++ app/controllers/users_controller.rb | 2 ++ app/controllers/votes_controller.rb | 2 ++ app/controllers/works_controller.rb | 2 ++ app/helpers/users_helper.rb | 2 ++ app/helpers/votes_helper.rb | 2 ++ app/helpers/works_helper.rb | 2 ++ test/controllers/users_controller_test.rb | 7 +++++++ test/controllers/votes_controller_test.rb | 7 +++++++ test/controllers/works_controller_test.rb | 7 +++++++ 15 files changed, 48 insertions(+) create mode 100644 app/assets/javascripts/users.js create mode 100644 app/assets/javascripts/votes.js create mode 100644 app/assets/javascripts/works.js create mode 100644 app/assets/stylesheets/users.scss create mode 100644 app/assets/stylesheets/votes.scss create mode 100644 app/assets/stylesheets/works.scss create mode 100644 app/controllers/users_controller.rb create mode 100644 app/controllers/votes_controller.rb create mode 100644 app/controllers/works_controller.rb create mode 100644 app/helpers/users_helper.rb create mode 100644 app/helpers/votes_helper.rb create mode 100644 app/helpers/works_helper.rb create mode 100644 test/controllers/users_controller_test.rb create mode 100644 test/controllers/votes_controller_test.rb create mode 100644 test/controllers/works_controller_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/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/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/users.scss b/app/assets/stylesheets/users.scss new file mode 100644 index 0000000000..1efc835ccd --- /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/assets/stylesheets/votes.scss b/app/assets/stylesheets/votes.scss new file mode 100644 index 0000000000..4756424f13 --- /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/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/users_controller.rb b/app/controllers/users_controller.rb new file mode 100644 index 0000000000..3e74dea87f --- /dev/null +++ b/app/controllers/users_controller.rb @@ -0,0 +1,2 @@ +class UsersController < ApplicationController +end diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb new file mode 100644 index 0000000000..ffdb2760e0 --- /dev/null +++ b/app/controllers/votes_controller.rb @@ -0,0 +1,2 @@ +class VotesController < ApplicationController +end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb new file mode 100644 index 0000000000..56b02c9f2e --- /dev/null +++ b/app/controllers/works_controller.rb @@ -0,0 +1,2 @@ +class WorksController < ApplicationController +end diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb new file mode 100644 index 0000000000..2310a240d7 --- /dev/null +++ b/app/helpers/users_helper.rb @@ -0,0 +1,2 @@ +module UsersHelper +end diff --git a/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/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/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb new file mode 100644 index 0000000000..89decb54e0 --- /dev/null +++ b/test/controllers/users_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe UsersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/votes_controller_test.rb b/test/controllers/votes_controller_test.rb new file mode 100644 index 0000000000..cf4d03935f --- /dev/null +++ b/test/controllers/votes_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe VotesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb new file mode 100644 index 0000000000..d95073c22e --- /dev/null +++ b/test/controllers/works_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe WorksController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From ca845ea318ad76f85c5585aad82f45f4e6a3495c Mon Sep 17 00:00:00 2001 From: Shaunna Date: Tue, 10 Oct 2017 16:45:27 -0700 Subject: [PATCH 04/38] user, work and vote model added --- app/models/user.rb | 2 ++ app/models/vote.rb | 4 ++++ app/models/work.rb | 2 ++ db/migrate/20171010233807_create_users.rb | 9 +++++++ db/migrate/20171010233928_create_works.rb | 13 ++++++++++ db/migrate/20171010234049_create_votes.rb | 10 ++++++++ db/schema.rb | 29 ++++++++++++++++++++++- test/fixtures/users.yml | 7 ++++++ test/fixtures/votes.yml | 9 +++++++ test/fixtures/works.yml | 15 ++++++++++++ test/models/user_test.rb | 9 +++++++ test/models/vote_test.rb | 9 +++++++ test/models/work_test.rb | 9 +++++++ 13 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 app/models/user.rb create mode 100644 app/models/vote.rb create mode 100644 app/models/work.rb create mode 100644 db/migrate/20171010233807_create_users.rb create mode 100644 db/migrate/20171010233928_create_works.rb create mode 100644 db/migrate/20171010234049_create_votes.rb create mode 100644 test/fixtures/users.yml create mode 100644 test/fixtures/votes.yml create mode 100644 test/fixtures/works.yml create mode 100644 test/models/user_test.rb create mode 100644 test/models/vote_test.rb create mode 100644 test/models/work_test.rb 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/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 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/db/migrate/20171010233807_create_users.rb b/db/migrate/20171010233807_create_users.rb new file mode 100644 index 0000000000..db0e1e3734 --- /dev/null +++ b/db/migrate/20171010233807_create_users.rb @@ -0,0 +1,9 @@ +class CreateUsers < ActiveRecord::Migration[5.1] + def change + create_table :users do |t| + t.string :name + + t.timestamps + end + end +end diff --git a/db/migrate/20171010233928_create_works.rb b/db/migrate/20171010233928_create_works.rb new file mode 100644 index 0000000000..c637bf64fa --- /dev/null +++ b/db/migrate/20171010233928_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.integer :publication_year + t.text :description + + t.timestamps + end + end +end diff --git a/db/migrate/20171010234049_create_votes.rb b/db/migrate/20171010234049_create_votes.rb new file mode 100644 index 0000000000..5e97336605 --- /dev/null +++ b/db/migrate/20171010234049_create_votes.rb @@ -0,0 +1,10 @@ +class CreateVotes < ActiveRecord::Migration[5.1] + def change + create_table :votes do |t| + t.references :user, foreign_key: true + t.references :work, foreign_key: true + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 2611543b38..7e4164c2b8 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,9 +10,36 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 0) do +ActiveRecord::Schema.define(version: 20171010234049) 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 "name" + t.datetime "created_at", null: false + 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" + t.string "creator" + t.integer "publication_year" + t.text "description" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + add_foreign_key "votes", "users" + add_foreign_key "votes", "works" end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 0000000000..56066c68af --- /dev/null +++ b/test/fixtures/users.yml @@ -0,0 +1,7 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + +two: + name: MyString diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml new file mode 100644 index 0000000000..b5db71052e --- /dev/null +++ b/test/fixtures/votes.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + user: one + work: one + +two: + user: two + work: two diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml new file mode 100644 index 0000000000..e791c80766 --- /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: 1 + description: MyText + +two: + category: MyString + title: MyString + creator: MyString + publication_year: 1 + description: MyText 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 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 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 7469f1629bac67165849dd9d16cb63c5ae0bc009 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Tue, 10 Oct 2017 16:55:01 -0700 Subject: [PATCH 05/38] modified work and user models to has_many votes --- app/models/user.rb | 1 + app/models/work.rb | 1 + db/seeds.rb | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index 379658a509..db11855600 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,2 +1,3 @@ class User < ApplicationRecord + has_many :votes end diff --git a/app/models/work.rb b/app/models/work.rb index 95322dd45e..0ee427352c 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,2 +1,3 @@ class Work < ApplicationRecord + has_many :votes end diff --git a/db/seeds.rb b/db/seeds.rb index 3c6df52a36..0326a062ef 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -17,11 +17,11 @@ work.id = row['id'] work.name = row['name'] work.vin = row['vin'] - puts "Created work: #{work.inspect}" successful = work.save if !successful work_failures << work end + puts "Created work: #{work.inspect}" end puts "Added #{Work.count} driver records" From ac826d6fb5f46e05f1debd3f36476350fee3d8e6 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Tue, 10 Oct 2017 22:50:37 -0700 Subject: [PATCH 06/38] routes for works added --- config/routes.rb | 3 +++ db/seeds.rb | 12 +++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 787824f888..fc04180cde 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,6 @@ Rails.application.routes.draw do + + resources :works + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/db/seeds.rb b/db/seeds.rb index 0326a062ef..285d2e8aef 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -9,14 +9,16 @@ require 'csv' WORK_FILE = Rails.root.join('db', 'seed_data', 'media_seeds.csv') -puts "Loading raw work data from #{MEDIA_FILE}" +puts "Loading raw work data from #{WORK_FILE}" work_failures = [] -CSV.foreach(MEDIA_FILE, :headers => true) do |row| +CSV.foreach(WORK_FILE, :headers => true) do |row| work = Work.new - work.id = row['id'] - work.name = row['name'] - work.vin = row['vin'] + work.category = row['category'] + work.title = row['title'] + work.creator = row['creator'] + work.publication_year = row['publication_year'] + work.description = ['description'] successful = work.save if !successful work_failures << work From 6acde23c7d41751135c8a6451142df3d9e055851 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Wed, 11 Oct 2017 11:29:24 -0700 Subject: [PATCH 07/38] index page works --- Gemfile | 2 +- Gemfile.lock | 5 ----- app/controllers/works_controller.rb | 8 ++++++++ app/models/work.rb | 14 ++++++++++++++ app/views/works/_table.html.erb | 20 ++++++++++++++++++++ app/views/works/_work.html.erb | 7 +++++++ app/views/works/index.html.erb | 18 ++++++++++++++++++ test/controllers/users_controller_test.rb | 4 +--- test/controllers/works_controller_test.rb | 8 +++++--- 9 files changed, 74 insertions(+), 12 deletions(-) create mode 100644 app/views/works/_table.html.erb create mode 100644 app/views/works/_work.html.erb create mode 100644 app/views/works/index.html.erb diff --git a/Gemfile b/Gemfile index 88aee9dc96..11895450b2 100644 --- a/Gemfile +++ b/Gemfile @@ -55,7 +55,7 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] gem 'jquery-turbolinks' group :development do - gem 'better_errors' + # gem 'better_errors' gem 'pry-rails' gem 'binding_of_caller' end diff --git a/Gemfile.lock b/Gemfile.lock index 198e0521f2..1be05db6b9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,10 +42,6 @@ GEM 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) @@ -196,7 +192,6 @@ PLATFORMS ruby DEPENDENCIES - better_errors binding_of_caller byebug capybara (~> 2.13) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 56b02c9f2e..eaa4adc720 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,2 +1,10 @@ class WorksController < ApplicationController + + def index + @albums = Work.albums + @books = Work.books + @movies = Work.movies + end + + end diff --git a/app/models/work.rb b/app/models/work.rb index 0ee427352c..8d199da824 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,3 +1,17 @@ class Work < ApplicationRecord has_many :votes + + def self.albums + @albums = Work.where(category: "album") + end + + def self.books + @books = Work.where(category: "book") + end + + def self.movies + @movies = Work.where(category: "movie") + end + + end diff --git a/app/views/works/_table.html.erb b/app/views/works/_table.html.erb new file mode 100644 index 0000000000..f5ef27d02f --- /dev/null +++ b/app/views/works/_table.html.erb @@ -0,0 +1,20 @@ + + + Votes + Title + Created By + Published + Upvote + + + <% works.each do |work| %> + + + + + + + + <% end %> + +
<%= work.votes.count %><%= work.title %><%= work.creator %><%= work.publication_year %>UPVOTE BUTTON
diff --git a/app/views/works/_work.html.erb b/app/views/works/_work.html.erb new file mode 100644 index 0000000000..e7563f6ebb --- /dev/null +++ b/app/views/works/_work.html.erb @@ -0,0 +1,7 @@ + + <%= work.votes.count %> + <%= work.title %> + <%= work.creator %> + <%= work.publication_year %> + UPVOTE BUTTON + diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb new file mode 100644 index 0000000000..ce691d6a09 --- /dev/null +++ b/app/views/works/index.html.erb @@ -0,0 +1,18 @@ +
+

List of works

+
+
+

Albums

+ <%= render partial: "table", locals: {works: @albums} %> + +

Books

+ <%= render partial: "table", locals: {works: @books} %> + +

Movies

+ <%= render partial: "table", locals: {works: @movies} %> + +
+
+

View top media

+

Add a new work

+
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 89decb54e0..4400b05f90 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -1,7 +1,5 @@ require "test_helper" describe UsersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + end diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index d95073c22e..9432fa4646 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -1,7 +1,9 @@ require "test_helper" describe WorksController do - # it "must be a real test" do - # flunk "Need real tests" - # end + it "the books index page is successful" do + get works_path + must_respond_with :success + end + end From 55e6c66efcc75aa1f86256c269664a0bcc0a09c9 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Wed, 11 Oct 2017 12:28:41 -0700 Subject: [PATCH 08/38] title and category validate presence --- app/models/work.rb | 2 ++ test/fixtures/works.yml | 32 +++++++++++++++++++------------- test/models/user_test.rb | 12 ++++-------- test/models/vote_test.rb | 11 ++++------- test/models/work_test.rb | 16 ++++++++++++++-- test/test_helper.rb | 15 +++++++++++++-- 6 files changed, 56 insertions(+), 32 deletions(-) diff --git a/app/models/work.rb b/app/models/work.rb index 8d199da824..cf3d0a2e55 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,5 +1,7 @@ class Work < ApplicationRecord has_many :votes + validates :title, presence: true + validates :category, presence: true def self.albums @albums = Work.where(category: "album") diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index e791c80766..132e68a5ae 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -1,15 +1,21 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - category: MyString - title: MyString - creator: MyString - publication_year: 1 - description: MyText - -two: - category: MyString - title: MyString - creator: MyString - publication_year: 1 - description: MyText +book: + category: book + title: Field of Stars + creator: St. James + publication_year: 1983 + description: A book about the Camino de Santiago + +movie: + category: movie + title: Anna Karenina + creator: Tolstoy + publication_year: 1999 + + +album: + category: album + title: MXPX + creator: Jessica + publication_year: 2002 diff --git a/test/models/user_test.rb b/test/models/user_test.rb index cc862ac2d9..a86913d95a 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -1,9 +1,5 @@ require "test_helper" - -describe User do - let(:user) { User.new } - - it "must be valid" do - value(user).must_be :valid? - end -end +# +# describe "User" do +# +# end diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index fc15947bd3..c498f7fc44 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -1,9 +1,6 @@ require "test_helper" -describe Vote do - let(:vote) { Vote.new } - - it "must be valid" do - value(vote).must_be :valid? - end -end +# describe Vote do +# +# +# end diff --git a/test/models/work_test.rb b/test/models/work_test.rb index f6fba7104d..b9e2e12d06 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -2,8 +2,20 @@ describe Work do let(:work) { Work.new } + let(:book) { works(:book) } + + it "must have a title" do + #book currently has title, should return true + book.valid?.must_equal true + + book.category = nil + book.title = nil + book.save + + book.errors.keys.must_include :title + book.errors.keys.must_include :category - it "must be valid" do - value(work).must_be :valid? end + + end diff --git a/test/test_helper.rb b/test/test_helper.rb index e3c4ff0b8e..207c3a7b00 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,5 +1,16 @@ -require File.expand_path('../../config/environment', __FILE__) -require 'rails/test_help' +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 +) + class ActiveSupport::TestCase # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. From 32c9ad36dad6d7029e69f7e68155b1939ad48bae Mon Sep 17 00:00:00 2001 From: Shaunna Date: Wed, 11 Oct 2017 16:35:26 -0700 Subject: [PATCH 09/38] new work form added --- app/controllers/works_controller.rb | 3 +++ app/models/work.rb | 4 ++++ app/views/works/_form.html.erb | 29 +++++++++++++++++++++++ app/views/works/_work.html.erb | 7 ------ app/views/works/new.html.erb | 5 ++++ test/controllers/works_controller_test.rb | 5 ++++ test/models/work_test.rb | 2 -- 7 files changed, 46 insertions(+), 9 deletions(-) create mode 100644 app/views/works/_form.html.erb delete mode 100644 app/views/works/_work.html.erb create mode 100644 app/views/works/new.html.erb diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index eaa4adc720..1ad07fce4f 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -6,5 +6,8 @@ def index @movies = Work.movies end + def new + @work = Work.new + end end diff --git a/app/models/work.rb b/app/models/work.rb index cf3d0a2e55..1630986e32 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -15,5 +15,9 @@ def self.movies @movies = Work.where(category: "movie") end + def self.categories + @categories = ["album", "book", "movie",] + end + end diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb new file mode 100644 index 0000000000..f42510bec1 --- /dev/null +++ b/app/views/works/_form.html.erb @@ -0,0 +1,29 @@ +

In the partial

+ +<%= form_for @work do |f| %> +
+ <%= f.label :category %> + <%= f.select :category, options_for_select(Work.categories) %> +
+ +
+ <%= f.label :title %> + <%= f.text_field :title %> +
+ +
+ <%= f.label :creator %> + <%= f.text_field :creator %> +
+ +
+ <%= f.label :publication_year %> + <%= f.text_field :publication_year %> +
+ +
+ <%= f.label :description %> + <%= f.text_area :description %> +
+ +<% end %> diff --git a/app/views/works/_work.html.erb b/app/views/works/_work.html.erb deleted file mode 100644 index e7563f6ebb..0000000000 --- a/app/views/works/_work.html.erb +++ /dev/null @@ -1,7 +0,0 @@ - - <%= work.votes.count %> - <%= work.title %> - <%= work.creator %> - <%= work.publication_year %> - UPVOTE BUTTON - diff --git a/app/views/works/new.html.erb b/app/views/works/new.html.erb new file mode 100644 index 0000000000..08923ffa3c --- /dev/null +++ b/app/views/works/new.html.erb @@ -0,0 +1,5 @@ +

Add a new work

+ +
+ <%= render partial: "form" %> +
diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index 9432fa4646..c6a6cd3e4d 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -6,4 +6,9 @@ must_respond_with :success end + it "successfully loads the new_work form" do + get new_work_path + must_respond_with :success + end + end diff --git a/test/models/work_test.rb b/test/models/work_test.rb index b9e2e12d06..a5e79a5378 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -16,6 +16,4 @@ book.errors.keys.must_include :category end - - end From 232cca91b043e6c6df0fdd08714bc13e1648999c Mon Sep 17 00:00:00 2001 From: Shaunna Date: Wed, 11 Oct 2017 17:17:20 -0700 Subject: [PATCH 10/38] create new work complete --- app/controllers/works_controller.rb | 18 ++++++++++++++++++ app/views/works/_form.html.erb | 4 ++++ test/controllers/works_controller_test.rb | 9 +++++++++ 3 files changed, 31 insertions(+) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 1ad07fce4f..e78b7ec830 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -10,4 +10,22 @@ def new @work = Work.new end + def create + @work = Work.new + + @work = Work.create work_params + if @work.id != nil + flash[:success] = "Book added successfully!" + redirect_to works_path + else + flash[:error] = "A problem occurred. Coult not create work" + render :new + end + end + +private + + def work_params + return params.require(:work).permit(:category, :title, :creator, :publication_year, :description) + end end diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb index f42510bec1..9969bde668 100644 --- a/app/views/works/_form.html.erb +++ b/app/views/works/_form.html.erb @@ -26,4 +26,8 @@ <%= f.text_area :description %> +
+ <%= f.submit %> +
+ <% end %> diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index c6a6cd3e4d..cce866c5c2 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -11,4 +11,13 @@ must_respond_with :success end + it "creates a new work that saves to the database" do + proc { + post works_path, params: { work: {category: "album", title: "New Title", creator: "Newton", publication_year: "1983", description: "This is a fantastic album. You should listen to it!"}} + }.must_change 'Work.count', 1 + + must_respond_with :redirect + must_redirect_to works_path + end + end From 81c9e23801d13cef52016c12af424faf9f171812 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Wed, 11 Oct 2017 17:29:58 -0700 Subject: [PATCH 11/38] more tests in controller --- test/controllers/works_controller_test.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index cce866c5c2..395401c574 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -20,4 +20,15 @@ must_redirect_to works_path end + it "creates a new work in the database correctly" do + proc { + post works_path, params: { work: {category: "movie", title: "Anna Karenina", creator: "Tolstoy", publication_year: 1807, description: "description"}} + }.must_change 'Work.count', 1 + + work = Work.find_by(title: "Anna Karenina") + work.creator.must_equal "Tolstoy" + work.publication_year.must_equal "1807" + work.description.must_equal "description" + end + end From a701a4854f51cb8c2ed5978889f22ad9538445aa Mon Sep 17 00:00:00 2001 From: Shaunna Date: Wed, 11 Oct 2017 21:23:55 -0700 Subject: [PATCH 12/38] edit action and view --- app/controllers/works_controller.rb | 4 ++++ app/views/works/edit.html.erb | 5 +++++ test/controllers/works_controller_test.rb | 9 +++++++-- 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 app/views/works/edit.html.erb diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index e78b7ec830..528ec9d946 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -23,6 +23,10 @@ def create end end + def edit + @work = Work.find_by(id: params[:id]) + end + private def work_params diff --git a/app/views/works/edit.html.erb b/app/views/works/edit.html.erb new file mode 100644 index 0000000000..b45d2f3ef3 --- /dev/null +++ b/app/views/works/edit.html.erb @@ -0,0 +1,5 @@ +

Edit this movie

+ +
+ <%= render partial: "form" %> +
diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index 395401c574..a1d8039d8c 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -27,8 +27,13 @@ work = Work.find_by(title: "Anna Karenina") work.creator.must_equal "Tolstoy" - work.publication_year.must_equal "1807" - work.description.must_equal "description" + # work.publication_year.must_equal 1807 + # work.description.must_equal "description" + end + + it "successfully loads the edit work form" do + get edit_work_path( works(:movie) ) + must_respond_with :success end end From ca0c661fcbac5b6c253b69e5c80c4bc3ad7fdfc8 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Wed, 11 Oct 2017 22:13:41 -0700 Subject: [PATCH 13/38] update feature and tests added --- app/controllers/works_controller.rb | 17 +++++++++++ test/controllers/works_controller_test.rb | 36 +++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 528ec9d946..0d96c668c5 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -27,6 +27,23 @@ def edit @work = Work.find_by(id: params[:id]) end + def update + @work = Work.find_by(id: params[:id]) + + unless @work + flash[:error] = "Driver with id #{params[:id]} not found" + redirect_to works_path + end + + if @work.update_attributes work_params + flash[:success] = "Book added successfully!" + redirect_to works_path + else + flash[:error] = "Book unable to update" + render :edit + end + end + private def work_params diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index a1d8039d8c..047e1b32ed 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -36,4 +36,40 @@ must_respond_with :success end + it "should be able to successfully update a title of work" do + put work_path( works(:album)), params: { work: { title: "Updated Title"} } + updated_work = Work.find( works(:album).id ) + updated_work.title.must_equal "Updated Title" + must_redirect_to works_path + end + + it "should be able to successfully update a category of a work" do + put work_path( works(:album)), params: { work: { category: "book"} } + updated_work = Work.find( works(:album).id ) + updated_work.category.must_equal "book" + must_redirect_to works_path + + end + + it "should be able to successfully update a creator of a work" do + put work_path( works(:album)), params: { work: { creator: "Nathan K"} } + updated_work = Work.find( works(:album).id ) + updated_work.creator.must_equal "Nathan K" + must_redirect_to works_path + end + + it "should be able to successfully update the publication year of a work" do + put work_path( works(:album)), params: { work: { publication_year: 2005} } + updated_work = Work.find( works(:album).id ) + updated_work.publication_year.must_equal 2005 + must_redirect_to works_path + end + + it "should be able to update the description of a work" do + put work_path( works(:album)), params: { work: {description: "new description"} } + updated_work = Work.find( works(:album).id ) + updated_work.description.must_equal "new description" + must_redirect_to works_path + end + end From 7cefa00a76fc6544463892677f61b1951c48870f Mon Sep 17 00:00:00 2001 From: Shaunna Date: Wed, 11 Oct 2017 22:15:33 -0700 Subject: [PATCH 14/38] edit form edited --- app/views/works/edit.html.erb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 app/views/works/edit.html.erb diff --git a/app/views/works/edit.html.erb b/app/views/works/edit.html.erb new file mode 100644 index 0000000000..b45d2f3ef3 --- /dev/null +++ b/app/views/works/edit.html.erb @@ -0,0 +1,5 @@ +

Edit this movie

+ +
+ <%= render partial: "form" %> +
From c4d30939781751a234ec6c8af54f713955e87cbb Mon Sep 17 00:00:00 2001 From: Shaunna Date: Wed, 11 Oct 2017 22:44:26 -0700 Subject: [PATCH 15/38] show work controller and view added --- app/controllers/works_controller.rb | 4 ++++ app/views/works/show.html.erb | 11 +++++++++++ db/seeds.rb | 2 +- test/controllers/works_controller_test.rb | 5 +++++ 4 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 app/views/works/show.html.erb diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 0d96c668c5..67b3718aab 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -6,6 +6,10 @@ def index @movies = Work.movies end + def show + @work = Work.find( params[:id].to_i ) + end + def new @work = Work.new end diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb new file mode 100644 index 0000000000..ed3b34b703 --- /dev/null +++ b/app/views/works/show.html.erb @@ -0,0 +1,11 @@ +
+
+

<%= @work.title %>

+

Created by: <%= @work.creator %>

+

Published: <%= @work.publication_year %>

+

<%= @work.description %>

+
+
+ +
+
diff --git a/db/seeds.rb b/db/seeds.rb index 285d2e8aef..38c8b9df6a 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -18,7 +18,7 @@ work.title = row['title'] work.creator = row['creator'] work.publication_year = row['publication_year'] - work.description = ['description'] + work.description = row['description'] successful = work.save if !successful work_failures << work diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index 047e1b32ed..7a77159a9a 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -6,6 +6,11 @@ must_respond_with :success end + it "successfully loads a show page for an individual work" do + work = Work.find( works(:movie).id ) + get work_path(work.id) + end + it "successfully loads the new_work form" do get new_work_path must_respond_with :success From c469d5ef61303a29542d8aea3f0888a4630378bc Mon Sep 17 00:00:00 2001 From: Shaunna Date: Wed, 11 Oct 2017 23:11:23 -0700 Subject: [PATCH 16/38] delete work action and tests --- app/controllers/works_controller.rb | 6 ++++++ test/controllers/works_controller_test.rb | 14 +++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 67b3718aab..26676cb174 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -48,6 +48,12 @@ def update end end + def destroy + Work.find_by(id: params[:id]).destroy + + redirect_to works_path + end + private def work_params diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index 7a77159a9a..5915331f42 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -9,6 +9,7 @@ it "successfully loads a show page for an individual work" do work = Work.find( works(:movie).id ) get work_path(work.id) + must_respond_with :success end it "successfully loads the new_work form" do @@ -25,7 +26,7 @@ must_redirect_to works_path end - it "creates a new work in the database correctly" do + it "creates a new work in the database with attributes" do proc { post works_path, params: { work: {category: "movie", title: "Anna Karenina", creator: "Tolstoy", publication_year: 1807, description: "description"}} }.must_change 'Work.count', 1 @@ -36,6 +37,17 @@ # work.description.must_equal "description" end + it "successfully deletes a work from the database" do + post works_path, params: { work: {category: "movie", title: "A new movie", creator: "someone", publication_year: 2003, description: "description"}} + + proc { + delete work_path(Work.find_by(title: "Anna Karenina")) + }.must_change 'Work.count', -1 + + must_respond_with :redirect + must_redirect_to works_path + end + it "successfully loads the edit work form" do get edit_work_path( works(:movie) ) must_respond_with :success From 99f6a58afc3b4687214851e195a540f4ead841bf Mon Sep 17 00:00:00 2001 From: Shaunna Date: Thu, 12 Oct 2017 09:46:22 -0700 Subject: [PATCH 17/38] home page renders, details still needed --- app/controllers/application_controller.rb | 4 ++++ app/controllers/works_controller.rb | 11 ++++++++++ app/views/works/home.html.erb | 25 +++++++++++++++++++++++ config/routes.rb | 2 ++ test/controllers/works_controller_test.rb | 16 ++++++++++----- 5 files changed, 53 insertions(+), 5 deletions(-) create mode 100644 app/views/works/home.html.erb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1c07694e9d..d936b3b30e 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,3 +1,7 @@ class ApplicationController < ActionController::Base protect_from_forgery with: :exception + + def render_404 + render file: "/public/404.html", status: 404 + end end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 26676cb174..b90bf5456d 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,5 +1,12 @@ class WorksController < ApplicationController + def home + @top_work = Work.order(:id).first + @albums = Work.albums + @books = Work.books + @movies = Work.movies + end + def index @albums = Work.albums @books = Work.books @@ -8,6 +15,10 @@ def index def show @work = Work.find( params[:id].to_i ) + + unless @work + render_404 + end end def new diff --git a/app/views/works/home.html.erb b/app/views/works/home.html.erb new file mode 100644 index 0000000000..e8a640e5fc --- /dev/null +++ b/app/views/works/home.html.erb @@ -0,0 +1,25 @@ +
+
+

Media Spotlight: <%= @top_work.title %> by <%= @top_work.creator %> +

+

+ <%= @top_work.votes %> +

+
+
+
+

Top Movies

+
    + <% @movies.each do |movie| %> +
  • <%= movie.title %> by <%= movie.creator %>
    • +
  • <%= movie.votes %> votes
    • + <% end %> +
+ + +
+
+ + + +
diff --git a/config/routes.rb b/config/routes.rb index fc04180cde..154927eb1f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,7 @@ Rails.application.routes.draw do + root to: 'works#home' + resources :works # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index 5915331f42..d766a1a8c5 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -1,6 +1,11 @@ require "test_helper" describe WorksController do + it "successfully loads the home page" do + get root_path + must_respond_with :success + end + it "the books index page is successful" do get works_path must_respond_with :success @@ -28,13 +33,14 @@ it "creates a new work in the database with attributes" do proc { - post works_path, params: { work: {category: "movie", title: "Anna Karenina", creator: "Tolstoy", publication_year: 1807, description: "description"}} + post works_path, params: { work: {category: "movie", title: "Factory Girl", creator: "Rails", publication_year: 2005, description: "about a girl"}} }.must_change 'Work.count', 1 - work = Work.find_by(title: "Anna Karenina") - work.creator.must_equal "Tolstoy" - # work.publication_year.must_equal 1807 - # work.description.must_equal "description" + work = Work.find_by(title: "Factory Girl") + work.creator.must_equal "Rails" + work.category.must_equal "movie" + work.publication_year.must_equal 2005 + work.description.must_equal "about a girl" end it "successfully deletes a work from the database" do From 1abb554ddc96e126f1d6ffc0b09dfbcf78af5bf5 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Thu, 12 Oct 2017 09:48:00 -0700 Subject: [PATCH 18/38] minor changes home_page --- app/views/works/home.html.erb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/works/home.html.erb b/app/views/works/home.html.erb index e8a640e5fc..708b0abd99 100644 --- a/app/views/works/home.html.erb +++ b/app/views/works/home.html.erb @@ -1,6 +1,6 @@
-

Media Spotlight: <%= @top_work.title %> by <%= @top_work.creator %> +

Media Spotlight: <%= @top_work %> by <%= @top_work.creator %>

<%= @top_work.votes %> @@ -12,7 +12,6 @@

    <% @movies.each do |movie| %>
  • <%= movie.title %> by <%= movie.creator %>
    • -
  • <%= movie.votes %> votes
    • <% end %>
From 890db7b8162de668ded1a79559111db80366e563 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Thu, 12 Oct 2017 13:02:29 -0700 Subject: [PATCH 19/38] partials on home page --- app/assets/stylesheets/application.css | 2 + app/assets/stylesheets/foundation.css | 4001 ++++++++++++++++++++++++ app/controllers/works_controller.rb | 6 +- app/views/works/_ulhome.html.erb | 6 + app/views/works/home.html.erb | 12 +- 5 files changed, 4023 insertions(+), 4 deletions(-) create mode 100644 app/assets/stylesheets/foundation.css create mode 100644 app/views/works/_ulhome.html.erb diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index d05ea0f511..e695c65f65 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -1,3 +1,5 @@ + @import url('foundation'); + /* * This is a manifest file that'll be compiled into application.css, which will include all the files * listed below. 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/works_controller.rb b/app/controllers/works_controller.rb index b90bf5456d..b0347e4569 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -2,9 +2,9 @@ class WorksController < ApplicationController def home @top_work = Work.order(:id).first - @albums = Work.albums - @books = Work.books - @movies = Work.movies + @albums = Work.albums.first(10) + @books = Work.books.first(10) + @movies = Work.movies.first(10) end def index diff --git a/app/views/works/_ulhome.html.erb b/app/views/works/_ulhome.html.erb new file mode 100644 index 0000000000..7e1199ea40 --- /dev/null +++ b/app/views/works/_ulhome.html.erb @@ -0,0 +1,6 @@ +
    + <% works.each do |work| %> +
  • <%= work.title %> by <%= work.creator %>
    • +

    <%= work.votes %> votes

    + <% end %> +
diff --git a/app/views/works/home.html.erb b/app/views/works/home.html.erb index 708b0abd99..e93019155d 100644 --- a/app/views/works/home.html.erb +++ b/app/views/works/home.html.erb @@ -1,6 +1,6 @@
-

Media Spotlight: <%= @top_work %> by <%= @top_work.creator %> +

Media Spotlight: <%= @top_work.title %> by <%= @top_work.creator %>

<%= @top_work.votes %> @@ -9,9 +9,19 @@

Top Movies

+ <%= render partial: "ulhome", locals: {works: @movies} %> + +

Top Books

+ <%= render partial: "ulhome", locals: {works: @books} %> + +

Top Albums

+ <%= render partial: "ulhome", locals: {works: @albums} %> + +
    <% @movies.each do |movie| %>
  • <%= movie.title %> by <%= movie.creator %>
    • +

    <%= movie.votes %> votes

    <% end %>
From 39946da48cf4747d2140e9f814977e75616c1269 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Thu, 12 Oct 2017 13:12:38 -0700 Subject: [PATCH 20/38] changed seeds file --- db/seeds.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index 38c8b9df6a..f3c2cfe144 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -26,8 +26,8 @@ puts "Created work: #{work.inspect}" end -puts "Added #{Work.count} driver records" -puts "#{media_failures.length} drivers failed to save" +puts "Added #{Work.count} work records" +puts "#{work_failures.length} work failed to save" puts "Manually resetting PK sequence on each table" ActiveRecord::Base.connection.tables.each do |t| From 3561723d40bdaf7e50a3fac367da030e5cf63193 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Thu, 12 Oct 2017 14:44:18 -0700 Subject: [PATCH 21/38] login and logout feature added --- app/assets/javascripts/sessions.js | 2 + app/assets/stylesheets/sessions.scss | 3 + app/controllers/sessions_controller.rb | 35 ++++++++++ app/helpers/sessions_helper.rb | 2 + app/views/sessions/login_form.html.erb | 7 ++ app/views/works/home.html.erb | 10 --- config/routes.rb | 5 ++ test/controllers/sessions_controller_test.rb | 67 ++++++++++++++++++++ 8 files changed, 121 insertions(+), 10 deletions(-) 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..7bef9cf826 --- /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..62343d75c2 --- /dev/null +++ b/app/controllers/sessions_controller.rb @@ -0,0 +1,35 @@ +class SessionsController < ApplicationController + + def login_form + end + + def login + user = User.find_by(name: params[:username]) + + if user + session[:user_id] = user.id + flash[:success] = "Successfully logged in as existing user #{ user.name }" + redirect_to root_path + else + user = User.new + user.name = params[:username] + if user.save + session[:user_id] = user.id + redirect_to root_path + else + render login_path + end + end + end + + def logout + if session[:user_id] + session[:user_id] = nil + else + #some sort of alert message + end + redirect_to root_path + 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..8e58b4352c --- /dev/null +++ b/app/views/sessions/login_form.html.erb @@ -0,0 +1,7 @@ +

Log In

+ +<%= form_tag do %> + <%= label_tag(:username, "Username") %> + <%= text_field_tag(:username) %> + <%= submit_tag("Log In", class: "button") %> +<% end %> diff --git a/app/views/works/home.html.erb b/app/views/works/home.html.erb index e93019155d..e42e54b498 100644 --- a/app/views/works/home.html.erb +++ b/app/views/works/home.html.erb @@ -16,16 +16,6 @@

Top Albums

<%= render partial: "ulhome", locals: {works: @albums} %> - - -
    - <% @movies.each do |movie| %> -
  • <%= movie.title %> by <%= movie.creator %>
    • -

    <%= movie.votes %> votes

    - <% end %> -
- -
diff --git a/config/routes.rb b/config/routes.rb index 154927eb1f..6f2bd6a3e6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,5 +4,10 @@ resources :works + get '/login', to: 'sessions#login_form' + post '/login', to: 'sessions#login' + + post 'logout', to: 'sessions#logout' + # 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..fa12cf16ca --- /dev/null +++ b/test/controllers/sessions_controller_test.rb @@ -0,0 +1,67 @@ +require "test_helper" + +describe SessionsController do + it "must be able to load the login page" do + get login_path + must_respond_with :success + end + + it "creates a new user if the username doesn't already exit" do + proc { + post login_path, params: { username: "Ada Lovelace"} + }.must_change 'User.count', 1 + + must_respond_with :redirect + must_redirect_to root_path + end + + it "recognizes an existing user name and logs in as that user without creating a new user" do + proc { + post login_path, params: { username: "Heather Michelle" } + }.must_change 'User.count', 1 + + proc { + post login_path, params: { username: "Heather Michelle"} + }.must_change 'User.count', 0 + + must_respond_with :redirect + must_redirect_to root_path + end + + it "keeps track of the users login status through sessions" do + post login_path, params: { username: "Carol Kay"} + + user_id = User.find_by(name: "Carol Kay").id + + session[:user_id].must_equal user_id + + get works_path + work = Work.find( works(:movie).id ) + get work_path(work) + + session[:user_id].must_equal user_id + end + + #Probably not necessary as a test after the previous one, but learning how session works + it "clears the session if someone logs out" do + post login_path, params: { username: "Nathan"} + user_id = session[:user_id] + user = User.find(user_id) + user.name.must_equal "Nathan" + + post logout_path + session[:user_id].must_be_nil + + must_respond_with :redirect + must_redirect_to root_path + end + + it "keeps the username as a User after the uesr logs out" do + post login_path, params: { username: "Richard"} + + post logout_path + + user = User.find_by(name: "Richard") + user.name.must_equal "Richard" + end +end From 6af55765885d052ac6a91747fe217b8609519374 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Thu, 12 Oct 2017 15:03:40 -0700 Subject: [PATCH 22/38] show all users feature added --- app/controllers/users_controller.rb | 6 ++++++ app/views/users/index.html.erb | 21 +++++++++++++++++++++ config/routes.rb | 3 ++- test/controllers/users_controller_test.rb | 7 ++++++- 4 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 app/views/users/index.html.erb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 3e74dea87f..064a136c3d 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,2 +1,8 @@ class UsersController < ApplicationController + + def index + @users = User.all + end + + end diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb new file mode 100644 index 0000000000..04ed2d121d --- /dev/null +++ b/app/views/users/index.html.erb @@ -0,0 +1,21 @@ +
+

List of Users

+ + + + + + + + + <% @users.each do |user| %> + + + + + + <% end %> + + +
UsernameVotesJoined
<%= user.name %><%= user.votes.count %><%= user.created_at.strftime("%B %d, %Y")%>
+
diff --git a/config/routes.rb b/config/routes.rb index 6f2bd6a3e6..b46556f448 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,9 +4,10 @@ resources :works + get '/users', to: "users#index" + get '/login', to: 'sessions#login_form' post '/login', to: 'sessions#login' - post 'logout', to: 'sessions#logout' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 4400b05f90..6f4fdde5c3 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -1,5 +1,10 @@ require "test_helper" describe UsersController do - + it "can successfully load an index page" do + get users_path + must_respond_with :success + end + + end From d0d29b7bcc18ba6d0e1a552cc0e6431493f7a3a2 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Thu, 12 Oct 2017 19:47:35 -0700 Subject: [PATCH 23/38] show user feature added --- app/controllers/users_controller.rb | 4 +++ app/views/users/show.html.erb | 30 +++++++++++++++++++++++ config/routes.rb | 1 + test/controllers/users_controller_test.rb | 5 ++++ test/fixtures/users.yml | 4 +-- 5 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 app/views/users/show.html.erb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 064a136c3d..f2b32cbf27 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -4,5 +4,9 @@ def index @users = User.all end + def show + @user = User.find_by(id: params[:id]) + end + end diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb new file mode 100644 index 0000000000..91f5a42e8d --- /dev/null +++ b/app/views/users/show.html.erb @@ -0,0 +1,30 @@ +
+
+ +
+

User Summary: <%= @user.name %>

+

Joined site <%= @user.created_at.strftime("%B %d, %Y")%>

+

Votes

+ + + + + + + + + + + + <%= @user.votes.each do |vote| %> + + + + + + + + <% end %> + +
Media TitleCreated ByPublishedCategoryVoted On
<%= vote.work.title %><%= vote.work.creator %><%= vote.work.publication_year %><%= vote.work.category %><%= vote.created_at.strftime("%B %d, %Y") %>
+
diff --git a/config/routes.rb b/config/routes.rb index b46556f448..3235298d5f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,6 +5,7 @@ resources :works get '/users', to: "users#index" + get '/users/:id', to: "users#show", as: "user" get '/login', to: 'sessions#login_form' post '/login', to: 'sessions#login' diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 6f4fdde5c3..23fd35826a 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -6,5 +6,10 @@ must_respond_with :success end + it "can successfuly load an individual user page" do + user = User.find(users(:jake).id) + get user_path(user.id) + must_respond_with :success + end end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 56066c68af..3a4ab701a6 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -1,7 +1,7 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - name: MyString +jake: + name: Jake two: name: MyString From 6e81f5c2d01da20c32490f5269b47edc076e34e3 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Thu, 12 Oct 2017 22:58:32 -0700 Subject: [PATCH 24/38] update vote feature added --- app/controllers/users_controller.rb | 1 - app/controllers/votes_controller.rb | 17 +++++++ app/models/user.rb | 12 +++++ app/models/vote.rb | 2 + app/views/layouts/application.html.erb | 1 + app/views/works/_table.html.erb | 2 +- app/views/works/show.html.erb | 6 ++- config/routes.rb | 4 +- test/controllers/votes_controller_test.rb | 54 +++++++++++++++++++++-- test/fixtures/users.yml | 4 +- test/models/user_test.rb | 36 +++++++++++++-- test/models/work_test.rb | 1 - 12 files changed, 126 insertions(+), 14 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index f2b32cbf27..0976cad087 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -8,5 +8,4 @@ def show @user = User.find_by(id: params[:id]) end - end diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index ffdb2760e0..0556f38113 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -1,2 +1,19 @@ class VotesController < ApplicationController + def create + @user = User.find_by(id: session[:user_id]) + @work = Work.find_by(id: params[:work]) + + # if @user.include_work?(work) + # flash[:error] = "Unable to " + # render #back to where you came from + # else + @vote = Vote.new + @vote.user = @user + @vote.work = @work + if @vote.save + flash[:success] = "Successfully upvoted!" + redirect_back(fallback_location: root_path) + end + # end + end end diff --git a/app/models/user.rb b/app/models/user.rb index db11855600..03b6cfb737 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,3 +1,15 @@ class User < ApplicationRecord has_many :votes + validates :name, presence: true + validates :name, uniqueness: true + + def include_work?(work) + votes.each do |vote| + if vote.work = work + return true + end + end + return false + end + end diff --git a/app/models/vote.rb b/app/models/vote.rb index b8b6f9f0aa..77ac1db12a 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -1,4 +1,6 @@ class Vote < ApplicationRecord belongs_to :user belongs_to :work + + validates :user, uniqueness: { scope: :work, 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 6af511b830..5da7d971b4 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,6 +9,7 @@ +

params are <%= params %>

<%= yield %> diff --git a/app/views/works/_table.html.erb b/app/views/works/_table.html.erb index f5ef27d02f..1160b8a03b 100644 --- a/app/views/works/_table.html.erb +++ b/app/views/works/_table.html.erb @@ -13,7 +13,7 @@ <%= work.title %> <%= work.creator %> <%= work.publication_year %> - UPVOTE BUTTON + <%= link_to("Upvote", votes_path(:work => work.id), method: :post )%> <% end %> diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index ed3b34b703..9e078785a8 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -1,4 +1,7 @@
+ + +

<%= @work.title %>

Created by: <%= @work.creator %>

@@ -6,6 +9,7 @@

<%= @work.description %>

- +
+ <%= link_to("Upvote", votes_path(:work => @work.id), method: :post )%>
diff --git a/config/routes.rb b/config/routes.rb index 3235298d5f..ec94574283 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,9 +7,11 @@ get '/users', to: "users#index" get '/users/:id', to: "users#show", as: "user" + post '/votes', to: "votes#create" + get '/login', to: 'sessions#login_form' post '/login', to: 'sessions#login' - post 'logout', to: 'sessions#logout' + post '/logout', to: 'sessions#logout' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/votes_controller_test.rb b/test/controllers/votes_controller_test.rb index cf4d03935f..7240ec4628 100644 --- a/test/controllers/votes_controller_test.rb +++ b/test/controllers/votes_controller_test.rb @@ -1,7 +1,55 @@ require "test_helper" describe VotesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + before do + @work_id = Work.find( works(:movie).id ).id + + post login_path, params: { username: "Ada Lovelace"} + end + + it "must be able to create a vote that has a user and a work" do + # work_id = Work.find( works(:movie).id ).id + # post login_path, params: { username: "Ada Lovelace"} + + proc{ + post votes_path, params: { work: @work_id} + }.must_change 'Vote.count', 1 + end + + ### ummmmmmmmmm + it "must have a user and a work" do + # post votes_path, params: { work: @work_id} + end + + it "must not let a user vote for the same work more than once" do + work2_id = Work.find( works(:book).id ).id + + post votes_path, params: { work: work2_id} + + proc { + post votes_path, params: { work: work2_id} + }.must_change 'Vote.count', 0 + end + + it "can make a new vote for the same work for a new user" do + + work = Work.create(category: "album", title: "Work") + + post login_path, params: { username: "Ada Lovelace"} + + proc { + post votes_path, params: { work: work.id } + }.must_change 'Vote.count', 1 + + post login_path, params: { username: "Tesla"} + + proc { + post votes_path, params: { work: work.id } + }.must_change 'Vote.count', 1 + end + end + +# proc { +# post works_path, params: { work: {category: "album", title: "New Title", creator: "Newton", publication_year: "1983", description: "This is a fantastic album. You should listen to it!"}} +# }.must_change 'Work.count', 1 diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 3a4ab701a6..f96bcc2b49 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -3,5 +3,5 @@ jake: name: Jake -two: - name: MyString +molly: + name: Molly diff --git a/test/models/user_test.rb b/test/models/user_test.rb index a86913d95a..13c8747e1b 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -1,5 +1,33 @@ require "test_helper" -# -# describe "User" do -# -# end + +describe User do + let(:jake) { users(:jake) } + let(:work) { Work.create(title: "News", category: "movie") } + let(:work2) { Work.create(title: "More News", category: "album") } + + it "must have a name" do + jake.name = nil + jake.save + + jake.valid?.must_equal false + + jake.name = "Jake" + jake.save + jake.valid?.must_equal true + end + + it "requires a unique username" do + proc {User.create(name: "Jake")}.must_change 'User.count', 0 + end + + it "returns true for include_work? if the user already has a vote for that work" do + # work = Work.create(title: "News", category: "movie") + Vote.create(user: jake, work: work) + + jake.include_work?(work).must_equal true + end + + it "returns false for include_work? if the user already has a vote for that work" do + jake.include_work?(work2).must_equal false + end +end diff --git a/test/models/work_test.rb b/test/models/work_test.rb index a5e79a5378..e1867045a2 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -14,6 +14,5 @@ book.errors.keys.must_include :title book.errors.keys.must_include :category - end end From 28ead6c3ca6c20570b2b9629a774e8d9dbd818ca Mon Sep 17 00:00:00 2001 From: Shaunna Date: Fri, 13 Oct 2017 00:38:47 -0700 Subject: [PATCH 25/38] updates to html --- app/controllers/works_controller.rb | 2 +- app/models/work.rb | 9 ++++++++- app/views/users/show.html.erb | 2 +- app/views/works/_table.html.erb | 2 +- app/views/works/_ulhome.html.erb | 4 ++-- app/views/works/home.html.erb | 6 ++++-- app/views/works/show.html.erb | 25 ++++++++++++++++++++++--- 7 files changed, 39 insertions(+), 11 deletions(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index b0347e4569..f532460447 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,7 +1,7 @@ class WorksController < ApplicationController def home - @top_work = Work.order(:id).first + @top_work = Work.first @albums = Work.albums.first(10) @books = Work.books.first(10) @movies = Work.movies.first(10) diff --git a/app/models/work.rb b/app/models/work.rb index 1630986e32..8732e1eb67 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,4 +1,5 @@ class Work < ApplicationRecord + has_many :votes validates :title, presence: true validates :category, presence: true @@ -16,8 +17,14 @@ def self.movies end def self.categories - @categories = ["album", "book", "movie",] + @categories = ["album", "book", "movie"] end + # def self.order_by_popularity(works) + # works.each do |work| + # + # end + # end + end diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 91f5a42e8d..21772feac2 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -16,7 +16,7 @@ - <%= @user.votes.each do |vote| %> + <% @user.votes.each do |vote| %> <%= vote.work.title %> <%= vote.work.creator %> diff --git a/app/views/works/_table.html.erb b/app/views/works/_table.html.erb index 1160b8a03b..404b7ff1be 100644 --- a/app/views/works/_table.html.erb +++ b/app/views/works/_table.html.erb @@ -10,7 +10,7 @@ <% works.each do |work| %> <%= work.votes.count %> - <%= work.title %> + <%= link_to(work.title, work_path(work.id)) %> <%= work.creator %> <%= work.publication_year %> <%= link_to("Upvote", votes_path(:work => work.id), method: :post )%> diff --git a/app/views/works/_ulhome.html.erb b/app/views/works/_ulhome.html.erb index 7e1199ea40..9959d198c8 100644 --- a/app/views/works/_ulhome.html.erb +++ b/app/views/works/_ulhome.html.erb @@ -1,6 +1,6 @@
    <% works.each do |work| %> -
  • <%= work.title %> by <%= work.creator %>
    • -

    <%= work.votes %> votes

    +
  • <%= link_to(work.title, work_path(work.id)) %> by <%= work.creator %>
    • +

    <%= work.votes.count %> votes

    <% end %>
diff --git a/app/views/works/home.html.erb b/app/views/works/home.html.erb index e42e54b498..d9570a30eb 100644 --- a/app/views/works/home.html.erb +++ b/app/views/works/home.html.erb @@ -1,9 +1,11 @@
-

Media Spotlight: <%= @top_work.title %> by <%= @top_work.creator %> +

Media Spotlight: + <%= link_to(@top_work.title, work_path(@top_work.id)) %> by <%= @top_work.creator %>

- <%= @top_work.votes %> + <%= @top_work.votes.count %> votes - + <%= @top_work.description %>

diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 9e078785a8..d60c031b6a 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -1,15 +1,34 @@
- -

<%= @work.title %>

Created by: <%= @work.creator %>

Published: <%= @work.publication_year %>

<%= @work.description %>

+ <%= link_to("Back to media ranks", works_path) %> + <%= link_to("Edit", edit_work_path(@work.id))%> + <%= link_to("Upvote", votes_path(:work => @work.id), method: :post )%> + <%= link_to("Delete", work_path(@work.id), method: :delete )%>
+

<%= @work.votes.count %> Votes for this <%= @work.category %>

+ + + + + + + + + <% @work.votes.each do |vote| %> + + + + + <% end %> + +
UserDate
<%= link_to(vote.user.name, user_path(vote.user.id)) %><%= vote.created_at.strftime("%B %d, %Y") %>
- <%= link_to("Upvote", votes_path(:work => @work.id), method: :post )%> +
From 9cf3d96709af4e27da58ae1161ff5000e90ca5bb Mon Sep 17 00:00:00 2001 From: Shaunna Date: Fri, 13 Oct 2017 08:02:32 -0700 Subject: [PATCH 26/38] determine order of works by votes method added to work.rb --- app/controllers/works_controller.rb | 8 ++++---- app/models/work.rb | 8 +++----- app/views/layouts/application.html.erb | 15 ++++++++++++++- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index f532460447..5208222146 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,10 +1,10 @@ class WorksController < ApplicationController def home - @top_work = Work.first - @albums = Work.albums.first(10) - @books = Work.books.first(10) - @movies = Work.movies.first(10) + @top_work = Work.order_by_popularity(Work.all).first + @albums = Work.order_by_popularity(Work.albums).first(10) + @books = Work.order_by_popularity(Work.books).first(10) + @movies = Work.order_by_popularity(Work.movies).first(10) end def index diff --git a/app/models/work.rb b/app/models/work.rb index 8732e1eb67..b5d378b908 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -20,11 +20,9 @@ def self.categories @categories = ["album", "book", "movie"] end - # def self.order_by_popularity(works) - # works.each do |work| - # - # end - # end + def self.order_by_popularity(works) + return works.sort { |x,y| y.votes.length <=> x.votes.length} + end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 5da7d971b4..cbf231491e 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,7 +9,20 @@ -

params are <%= params %>

+
+

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

+ +
<%= yield %> From 03e1c8b2cc3f94e443ccb3d7d9d58a5a411299f2 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Fri, 13 Oct 2017 10:23:20 -0700 Subject: [PATCH 27/38] logout button and logged in as button --- .DS_Store | Bin 0 -> 6148 bytes app/.DS_Store | Bin 0 -> 6148 bytes app/assets/.DS_Store | Bin 0 -> 6148 bytes app/assets/images/favicon.ico | Bin 0 -> 4286 bytes app/controllers/application_controller.rb | 7 +++++++ app/views/layouts/application.html.erb | 13 +++++++++++-- 6 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 .DS_Store create mode 100644 app/.DS_Store create mode 100644 app/assets/.DS_Store create mode 100644 app/assets/images/favicon.ico diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..fadd49af93a07740151b4698fdea46e28fdbf625 GIT binary patch literal 6148 zcmeH~I}XA?3`A{6fkcy%avKi74OR$FzyR_M(RA8jQJo4Vo|2_QM{6A`8N(HFEpDCc- z?y%e9rSfe3cs;8hvuf)G2mNw{x1Rtcb`-DRZrCrj0Bf=ZQGxMCz-3^d0zXyY1qdw> AZU6uP literal 0 HcmV?d00001 diff --git a/app/.DS_Store b/app/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..c32883842752acf742ff9e4a68f0123bb24f31f0 GIT binary patch literal 6148 zcmeHKISv9b4733uBpOP}e1RWC2wuPkI6EYYg?=mE#nTuc1!$pz0yJJZlQ^ENc8Yi{ zB09h9XCf038Nm(ZYD3p--@IeJj3^L}GtScNo857HIvqRNuLH&%%0?PIhey6`(5L_v zpaN8Y3Q&QME0862H2(O>Jdg@dfnQg^?uP<5tch))UmX~{1pp2ZcEj9z31G1RuqL*F zh`==`Eo-SGgIZ^>C@T@>TmJ_T0OZc1q z|Cz)U6`%rtrGO3=tHm6jl(n_U%pabM+2j!Q2{DI1*iZOpaKt9AWLlX_VAN=AQhkj&#r)d9}3*CCXRvr>A>JE0C0}58|L0i z0E-2HHE|3?1g1d+2351g(4Zq;GOs3%fk79|=0o#l%??HVcAQ^4U9<*rqykjnUV)cb zwpRaF@L&4>dlFYvfC~I81$5rO_Z^;;wRQ41tF;BbhFi`RZicy2FnBozdO60z%JIUJ bBCpsS`!#V4bUNZr2l8jYbfHm!zgFM|YL^v< literal 0 HcmV?d00001 diff --git a/app/assets/images/favicon.ico b/app/assets/images/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..28d727eca71175cb70b1d69e1dd38f2dd43a208e GIT binary patch literal 4286 zcmc&&c~q1~5+60$&6>P@x+We8qDEFl29ZTYkXu9!MUeYc5kXP$M7adya1<0l5XBR5 zQHVE)_pzvnibk>?tB70!!-yOLa?ikTs~bjrc|Mc4e{B1j{-(RSe!r@&uCG1?fqG>npEYCkrCQi#)gqK+cipY!YoE@5nb!?Dv5*tQ&(e0x zJ5^7;jx*x~-uu%{a$cui!|8Y(ZdbISjkvMB{|i34yU;}(I%VW*YUxj85Z!L)&-HKG zP+i*q>8mExHni}$EqB|o|8XaOZl^P0dll{7lVaw#M`pi5hn${|^-PvCBtug^kq_5(CEx4u>0)%7XJboTGjGaZ$a}I@xdm!{3gJHj9D-NE>Lu-4FFXTK%-ctI_hpt}v`ld#N zBp$*vr*)X-5D7!uBxp}R458{}Oi;ZK^-;wbuT%yN;S-D-aTAmDj={(#h4@8dibDXr z0=MGHi!zQUlgocsEXaH9mQ>fn(Ki);pOA`)>Q^vkXaSV}T!e20RTv_u!RUcf2#1Ra zzZ~O7RA8{+6}}TxL+MY&P#IEyNg9_S)J}zwqX>ETA9D_J7RVoI%umera!D<$7e`~v zm@^O#X(2o*;gW8_OAPNT!FPQsq4G^R)RhUF@YP0@V_2UG4DVM-9HbaVazlxy+Tb@B zt9lVrY}exI?H&&ApX>Wn7lQ(y!c40wuy{K2Z5u zO!mLSA1aU#w@S`o5b;~Qs1TduPa`t+JT@jA#oEp3sB38EcUtxKW{#dnNGibKK2;dr=Nr95pZc8Y@3@0}j*?MEq z%1DHWQgA%?+FO$qF)63GV6EU$A?CO*hq}H!v`pQhGT9m$25#_J7J!xhWf&kJ`#)ng zGW#Xme&+vQ<16>8!a$N;v#JaZ3;i+C&>d>JcKBY)3Tk@xaPeM)XD`Y*rXtR>FXmyg zsSDkug%rO&yqh~Ng{G-968C09d#n`S2$*l_>={1UH)d!BG{|nDas?)g7GoIsUYXXE z`&Qv=!q-=;Lc*RC&@^_2nZr_;+WW%9#uqx43ov!2C$8Se=N!b+YG|9fVVtfF3~7C= z_AD6A_QnK5XV}d5L2y7N{wfe-1liuxnSKd|d|nErfkjXr_#8?DO1RBReWg(TT!N9G zNoh|x!b8e1(`7#XVd4fItN9o=We$vO7Gn(gR^Ms?<d2@~4|*nQwI2DFL#V5MTZuhsKM|HErdrI$OecTxvpZ(kFXiKbBiV>ePJ^bQ6LiTh8U{`(-(zgIY#S%aH*%W(Ezw-K`|6B`l^;n?LHxOu-Axw+Md z+E4=vy-JK7Afdey%yTS5NNhYtO|+y~UJ8v~EOo+)-nJJv?moZ-0|#iEd(s&#!AQ+n z2#iX?)`Mp-PM8L@@z>zya~6kB{)p79T&#$qJij0clja0ts!bTQ?Lz69^0CWC_=Y4Q z>7OTY{K6fq*?10GI_EG}{SZf9ixn+ITm`8pUnMZ;qLCYZTKz|gN5GcQv7Erf=#3&n#w3@qnCTvg3u@al~_P?=-} zGkZT|&uMACLpxh?~%NjfSyP zI6{+8Am`pQl9k}n!(!~n%!4hxi>BBF!QO8hj^tc}o|P9=b>?Ds+OeKH*qe()+xH+Y z^(dVEcR1g^4(G?=fm= zjmeZ#9;>9WhWcZw5qvi6h32evSQL_q*pv)dI{BjEO$*P3yoMv)tocXmBkT<@a0o|M zUI7|uuBfdIVj5plXF8v^b>J0^zr3u$O!Ctd>ma0G&PM~y6}7d4WfsO+Lj5`YW*&Z6 z+lV>7anQC2#WLbj+t5?LvHF777`^YE;MgP3qPX%1*oktP45b}ykP^4+4Lck+Zvv760^NU5L2yL*3k(m>ACUrDapFw{M~$1zbCsT?Hnf2Im}rci#IK; z9G79U+EJ1JPhQE#M6)$mw>^vVE^2M#{yvg>4qyDGKMtSH=D(k|wxW*q?mTk~UZJVn zAIwk8-zP6$L;wC?AvN;{E?Y>luShmC?*TMsu0~iw7D=)C=H0uvhX+ty*9aquBfrSQ zgx`(g&Q27|WvHO%!lovQfo_!2@8b3j?&Iy5SKzujnR6}al%a%tRzbRpNLE6!WmGp7 zceJC1o)4bC4WZd;T+jax$5*_6_>cGaY~7!OX?7uaRM$klCk}MprKG!p>Jm1VbjVOf zbrp-VMPYj=R>G(@uA><3#*4O2ln`eLnWm5}C0Q1iUZH#8vSJ&rW%;=)fO|(iM|ky3 zt(fH%jb);A?$;_hBBrB+bhEL7-j^&c_vYS$K4I%otgay0D%#6pt&F}^N?JR(yqN57 zqPg^o_nq#<7{r5NnwvMf$tG&Upo*mcU2>yUNsr(Wz2A@e2rL*F~S^+4wN zAF1XH!SamiA^`CRayWn@&J}1M8reB84(z+jKVm=S&q&z#Zsod7TqAj|*LS8`*d+pn zeB4O&cLa=_qo8XS4m0;C*ig>1U$PArlpowyCenTDpl>KSSbg<-n&KRul}hM7gkd__ zsBIgHm5~P!7N3Cy0m*P&wjH+g4Ps08*?wsp+*c=IP0S& MediaRanker + <%= csrf_meta_tags %> + <%= favicon_link_tag 'favicon.ico' %> <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> @@ -19,8 +21,15 @@ <%= link_to("View all media", works_path) %> <%= link_to("Add a new work", new_work_path) %> <%= link_to("View all users", users_path) %> - +
+ <% if session[:user_id] %> + <%= link_to("Logged in as #{@user_in_session.name}" , root_path) %> + <%= link_to('Log Out', logout_path, method: :post) %> + <% else %> + <%= link_to('Log In', login_path) %> + <% end %> + +
<%= yield %> From 2387a76ae49df7ec0a1d005a192472f053f44c66 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Fri, 13 Oct 2017 10:39:55 -0700 Subject: [PATCH 28/38] footer nav buttons added --- app/views/users/index.html.erb | 1 + app/views/works/index.html.erb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 04ed2d121d..546f10ea52 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -18,4 +18,5 @@ + <%= link_to("Back to Media List", root_path) %>
diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index ce691d6a09..d2f2a87f45 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -13,6 +13,6 @@
-

View top media

-

Add a new work

+

<%= link_to("View top media", root_path) %>

+

<%= link_to("Add a new work", new_work_path) %>

From bdb800997531d3b112639c217d4292db28994e9a Mon Sep 17 00:00:00 2001 From: Shaunna Date: Fri, 13 Oct 2017 11:00:54 -0700 Subject: [PATCH 29/38] successfull flash notifications added --- app/controllers/sessions_controller.rb | 2 ++ app/controllers/votes_controller.rb | 9 ++++----- app/controllers/works_controller.rb | 2 +- app/views/layouts/application.html.erb | 5 +++++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 62343d75c2..3dbdb7bbd9 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -15,6 +15,7 @@ def login user.name = params[:username] if user.save session[:user_id] = user.id + flash[:success] = "Successfully created new user #{user.name} with ID #{user.id}" redirect_to root_path else render login_path @@ -25,6 +26,7 @@ def login def logout if session[:user_id] session[:user_id] = nil + flash[:success] = "Successfully logged out" else #some sort of alert message end diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index 0556f38113..9c37e3801e 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -3,10 +3,7 @@ def create @user = User.find_by(id: session[:user_id]) @work = Work.find_by(id: params[:work]) - # if @user.include_work?(work) - # flash[:error] = "Unable to " - # render #back to where you came from - # else + if session[:user_id] @vote = Vote.new @vote.user = @user @vote.work = @work @@ -14,6 +11,8 @@ def create flash[:success] = "Successfully upvoted!" redirect_back(fallback_location: root_path) end - # end + else + flash[:error] = "You must log in to do that" + end end end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 5208222146..260fe777a8 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -30,7 +30,7 @@ def create @work = Work.create work_params if @work.id != nil - flash[:success] = "Book added successfully!" + flash[:success] = "Successfully created #{work.category} #{work.id}" redirect_to works_path else flash[:error] = "A problem occurred. Coult not create work" diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 48cd5a6794..166eb386ef 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -32,6 +32,11 @@ +
+ <% flash.each do |name, message| %> +
<%= message %>
+ <% end %> +
<%= yield %> From 7cf7fc50ff5a409f00ae2f3bc2a666d30b1271d0 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Fri, 13 Oct 2017 13:36:17 -0700 Subject: [PATCH 30/38] header style changes --- app/assets/stylesheets/application.css | 39 ++++++++++++++++++++++++++ app/controllers/sessions_controller.rb | 22 ++++++++------- app/views/layouts/application.html.erb | 36 +++++++++++++----------- app/views/sessions/login_form.html.erb | 10 +++++++ 4 files changed, 80 insertions(+), 27 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index e695c65f65..d1bd6bdad6 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -15,3 +15,42 @@ *= require_tree . *= require_self */ + + +h1, h2, h3, h4, h5 { + font-weight: bold; + font-style: normal; +} + +body, h1, h2, h3, h4, h5 { + font-family: "Gudea", sans-serif; +} + +.button { + background-color: #26A69A; + display: inline-block; +} + +.float_right { + float: right; +} +.page-header { + background-color: #B2DFDB; + border-bottom: 1px solid #EEEEEE; + } + +.page-header h2 { + text-align: center; + margin: 25px auto 40px auto; +} + + .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/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 3dbdb7bbd9..e98a4ab7f6 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,24 +1,26 @@ class SessionsController < ApplicationController def login_form + @user = User.new end def login - user = User.find_by(name: params[:username]) + @user = User.find_by(name: params[:username]) - if user - session[:user_id] = user.id - flash[:success] = "Successfully logged in as existing user #{ user.name }" + if @user + session[:user_id] = @user.id + flash[:success] = "Successfully logged in as existing user #{ @user.name }" redirect_to root_path else - user = User.new - user.name = params[:username] - if user.save - session[:user_id] = user.id - flash[:success] = "Successfully created new user #{user.name} with ID #{user.id}" + @user = User.new + @user.name = params[:username] + if @user.save + session[:user_id] = @user.id + flash[:success] = "Successfully created new user #{@user.name} with ID #{@user.id}" redirect_to root_path else - render login_path + flash.now[:error] = "A problem occured: Could not log in" + render :login_form end end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 166eb386ef..e0b34b8d10 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -11,32 +11,34 @@ -
-

+
+

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

-
-
- <% flash.each do |name, message| %> -
<%= message %>
- <% end %> -
+ + <% flash.each do |name, message| %> +
+
<%= message %>
+
+ <% end %> + + <%= yield %> diff --git a/app/views/sessions/login_form.html.erb b/app/views/sessions/login_form.html.erb index 8e58b4352c..18352931b1 100644 --- a/app/views/sessions/login_form.html.erb +++ b/app/views/sessions/login_form.html.erb @@ -1,3 +1,13 @@ +<% if @user.errors.any? %> +
    + <% @user.errors.each do |column, message| %> +
  • + <%= column.capitalize %> <%= message %> +
    • + <% end %> +
+<% end %> +

Log In

<%= form_tag do %> From 352c0ae0a795df7aa4297dd1885f7a3f16907e1a Mon Sep 17 00:00:00 2001 From: Shaunna Date: Fri, 13 Oct 2017 20:50:19 -0700 Subject: [PATCH 31/38] updated css --- app/assets/stylesheets/application.css | 83 ++++- app/assets/stylesheets/normalize.css | 447 +++++++++++++++++++++++++ app/controllers/sessions_controller.rb | 7 +- app/controllers/votes_controller.rb | 7 +- app/controllers/works_controller.rb | 2 +- app/views/layouts/application.html.erb | 25 +- app/views/sessions/login_form.html.erb | 24 +- 7 files changed, 570 insertions(+), 25 deletions(-) create mode 100644 app/assets/stylesheets/normalize.css diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index d1bd6bdad6..ce0b6a574f 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -17,6 +17,11 @@ */ +main { + padding-top: 2rem; + padding-bottom: 2rem; + } + h1, h2, h3, h4, h5 { font-weight: bold; font-style: normal; @@ -26,17 +31,67 @@ body, h1, h2, h3, h4, h5 { font-family: "Gudea", sans-serif; } +h2 { + font-size: 1.25rem; + line-height: 1.4; + margin-top: 0; + margin-bottom: 0.5rem; +} + +h3 { + line-height: 1.4; + margin-top: 0; + margin-bottom: 0.5rem; +} + +body { + font-weight: normal; + line-height: 1.5; + color: #0a0a0a; +} + +ul { + margin-left: 1.25rem; + list-style-type: disc; +} + +li { + font-size: inherit; + margin: 0; + padding: 0; + display: list-item; +} + +ul, ol, dl { + margin-bottom: 1rem; + line-style-position: outside; + line-height: 1.6; +} + + .button { - background-color: #26A69A; display: inline-block; + background-color: #26A69A; + margin: 0 0 1rem 0; + padding: 0.85rem 1em; + border: 1px solid transparent; + border-radius: 0; + font-size: 0.9rem; + text-align: center; + line-height: 1; + color: #fefefe; + } .float_right { float: right; } .page-header { + max-width: 100%; background-color: #B2DFDB; border-bottom: 1px solid #EEEEEE; + margin-bottom: 10px; + padding: 25px 20px 10px 20px } .page-header h2 { @@ -54,3 +109,29 @@ body, h1, h2, h3, h4, h5 { .page-header h2 small { color: white; } + + row { + margin-right: auto; + } + + .row { + max-width: 75rem; + margin-right: auto; + margin-left: auto; + } + + .status { + border-radius: 5px; + background-color: #e6e6e6; + padding: 20px 25px; + margin-top: 30px; + } + + .status.failure h3, .status.success h3 { + font-weight: normal; + font-size: 1em; + } + + .status.failure h3 { + color: #C70039; + } diff --git a/app/assets/stylesheets/normalize.css b/app/assets/stylesheets/normalize.css new file mode 100644 index 0000000000..fa4e73dd41 --- /dev/null +++ b/app/assets/stylesheets/normalize.css @@ -0,0 +1,447 @@ +/*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */ + +/* Document + ========================================================================== */ + +/** + * 1. Correct the line height in all browsers. + * 2. Prevent adjustments of font size after orientation changes in + * IE on Windows Phone and in iOS. + */ + +html { + line-height: 1.15; /* 1 */ + -ms-text-size-adjust: 100%; /* 2 */ + -webkit-text-size-adjust: 100%; /* 2 */ +} + +/* 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-. + * 1. Add the correct display in IE. + */ + +figcaption, +figure, +main { /* 1 */ + 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 { + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ +} + +/** + * 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 */ +} + +/* Text-level semantics + ========================================================================== */ + +/** + * 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 */ +} + +/** + * 1. Remove the bottom border in Chrome 57- and 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. + * 1. Show the overflow in Edge. + */ + +button, +input { /* 1 */ + 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"], /* 1 */ +[type="reset"], +[type="submit"] { + -webkit-appearance: button; /* 2 */ +} + +/** + * Remove the inner border and padding in Firefox. + */ + +button::-moz-focus-inner, +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + border-style: none; + padding: 0; +} + +/** + * Restore the focus styles unset by the previous rule. + */ + +button:-moz-focusring, +[type="button"]:-moz-focusring, +[type="reset"]:-moz-focusring, +[type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; +} + +/** + * Correct the padding in Firefox. + */ + +fieldset { + padding: 0.35em 0.75em 0.625em; +} + +/** + * 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 { + box-sizing: border-box; /* 1 */ + color: inherit; /* 2 */ + display: table; /* 1 */ + max-width: 100%; /* 1 */ + padding: 0; /* 3 */ + 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; +} + +/** + * 1. Add the correct box sizing in IE 10-. + * 2. Remove the padding in IE 10-. + */ + +[type="checkbox"], +[type="radio"] { + 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 */ +} + +/* Interactive + ========================================================================== */ + +/* + * Add the correct display in IE 9-. + * 1. Add the correct display in Edge, IE, and Firefox. + */ + +details, /* 1 */ +menu { + display: block; +} + +/* + * Add the correct display in all browsers. + */ + +summary { + display: list-item; +} + +/* 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; +} diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index e98a4ab7f6..6a070e2b5b 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -19,7 +19,12 @@ def login flash[:success] = "Successfully created new user #{@user.name} with ID #{@user.id}" redirect_to root_path else - flash.now[:error] = "A problem occured: Could not log in" + flash.now[:failure] = "A problem occured: Could not log in" + + if @user.errors.any? + flash.now[:errors] = @user.errors + end + render :login_form end end diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index 9c37e3801e..524fa67da5 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -1,9 +1,11 @@ class VotesController < ApplicationController def create @user = User.find_by(id: session[:user_id]) + + @work = Work.find_by(id: params[:work]) - if session[:user_id] + if @user @vote = Vote.new @vote.user = @user @vote.work = @work @@ -12,7 +14,8 @@ def create redirect_back(fallback_location: root_path) end else - flash[:error] = "You must log in to do that" + flash[:fatal] = "You must log in to do that" + redirect_back(fallback_location: root_path) end end end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 260fe777a8..7f52d4bfc0 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -30,7 +30,7 @@ def create @work = Work.create work_params if @work.id != nil - flash[:success] = "Successfully created #{work.category} #{work.id}" + flash[:success] = "Successfully created #{@work.category} #{@work.id}" redirect_to works_path else flash[:error] = "A problem occurred. Coult not create work" diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index e0b34b8d10..dc05cf5a57 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,6 +7,7 @@ <%= favicon_link_tag 'favicon.ico' %> <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> @@ -32,12 +33,28 @@
- <% flash.each do |name, message| %> -
-
<%= message %>
+ <% if flash[:failure] %> +
+

<%= flash[:failure] %>

+ <% if flash[:errors] %> +
    + <% flash[:errors].each do |column, message| %> +
  • + <%= column.capitalize %>: <%= message %> +
    • + <% end %> +
+ <% end %>
- <% end %> + <% end %> + <% if flash[:success] %> +
+ <% flash.each do |name, message| %> +

<%= message %>

+ <% end %> +
+ <% end %> <%= yield %> diff --git a/app/views/sessions/login_form.html.erb b/app/views/sessions/login_form.html.erb index 18352931b1..8a158b3c87 100644 --- a/app/views/sessions/login_form.html.erb +++ b/app/views/sessions/login_form.html.erb @@ -1,17 +1,9 @@ -<% if @user.errors.any? %> -
    - <% @user.errors.each do |column, message| %> -
  • - <%= column.capitalize %> <%= message %> -
    • - <% end %> -
-<% end %> +
+

Log In

-

Log In

- -<%= form_tag do %> - <%= label_tag(:username, "Username") %> - <%= text_field_tag(:username) %> - <%= submit_tag("Log In", class: "button") %> -<% end %> + <%= form_tag do %> + <%= label_tag(:username, "Username") %> + <%= text_field_tag(:username) %> + <%= submit_tag("Log In", class: "button") %> + <% end %> +
From 579366f88f631c6c9ffe7d8e57e4e52d28484ba5 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Sat, 14 Oct 2017 13:25:47 -0700 Subject: [PATCH 32/38] notification bar css --- app/assets/stylesheets/application.css | 48 +++++++++++++++++++------- app/controllers/votes_controller.rb | 8 ++--- app/controllers/works_controller.rb | 2 +- app/views/layouts/application.html.erb | 2 +- app/views/works/home.html.erb | 41 ++++++++++------------ app/views/works/show.html.erb | 4 +-- 6 files changed, 61 insertions(+), 44 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index ce0b6a574f..628c43a927 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -15,7 +15,9 @@ *= require_tree . *= require_self */ - +* { + box-sizing: inherit; +} main { padding-top: 2rem; @@ -68,6 +70,19 @@ ul, ol, dl { line-height: 1.6; } +row { + margin-right: auto; + } + +.row { + max-width: 75rem; + margin-right: auto; + margin-left: auto; + } + +.columns { + float: left; +} .button { display: inline-block; @@ -83,6 +98,10 @@ ul, ol, dl { } +.button:hover { + background-color: #00796B; +} + .float_right { float: right; } @@ -106,32 +125,35 @@ ul, ol, dl { border-right: white 2px solid; } - .page-header h2 small { +.page-header h2 small { color: white; } - row { - margin-right: auto; - } - .row { - max-width: 75rem; - margin-right: auto; - margin-left: auto; - } - .status { +.small-12 { + width: 100%; +} + +.status { border-radius: 5px; background-color: #e6e6e6; padding: 20px 25px; margin-top: 30px; } - .status.failure h3, .status.success h3 { +.status.failure h3, status.success h3 { font-weight: normal; font-size: 1em; } - .status.failure h3 { +.status.failure h3 { color: #C70039; } + + @media print, screen and (min-width: 40em) + + .columns { + padding-right: 0.9375rem; + padding-left: 0.9375rem; + } diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index 524fa67da5..fae9930da2 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -1,11 +1,9 @@ class VotesController < ApplicationController def create - @user = User.find_by(id: session[:user_id]) - - + # @user = User.find_by(id: session[:user_id]) @work = Work.find_by(id: params[:work]) - if @user + if @user_in_session @vote = Vote.new @vote.user = @user @vote.work = @work @@ -14,7 +12,7 @@ def create redirect_back(fallback_location: root_path) end else - flash[:fatal] = "You must log in to do that" + flash[:failure] = "You must log in to do that" redirect_back(fallback_location: root_path) end end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 7f52d4bfc0..0c64cc5e56 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -14,7 +14,7 @@ def index end def show - @work = Work.find( params[:id].to_i ) + @work = Work.find_by(id: params[:id].to_i ) unless @work render_404 diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index dc05cf5a57..3e67d3ed51 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -13,7 +13,7 @@
-

+

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

diff --git a/app/views/works/home.html.erb b/app/views/works/home.html.erb index d9570a30eb..abbecf9fa4 100644 --- a/app/views/works/home.html.erb +++ b/app/views/works/home.html.erb @@ -1,26 +1,23 @@
-
-

Media Spotlight: - <%= link_to(@top_work.title, work_path(@top_work.id)) %> by <%= @top_work.creator %> -

-

- <%= @top_work.votes.count %> votes - - <%= @top_work.description %> -

-
-
-
-

Top Movies

- <%= render partial: "ulhome", locals: {works: @movies} %> - -

Top Books

- <%= render partial: "ulhome", locals: {works: @books} %> - -

Top Albums

- <%= render partial: "ulhome", locals: {works: @albums} %> -
-
- +
+

Media Spotlight: + <%= link_to(@top_work.title, work_path(@top_work.id)) %> by <%= @top_work.creator %> +

+

+ <%= @top_work.votes.count %> votes - + <%= @top_work.description %> +

+
+
+
+

Top Movies

+ <%= render partial: "ulhome", locals: {works: @movies} %> +

Top Books

+ <%= render partial: "ulhome", locals: {works: @books} %> +

Top Albums

+ <%= render partial: "ulhome", locals: {works: @albums} %> +
+
diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index d60c031b6a..243ebffa0f 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -1,6 +1,6 @@ -
+
-
+

<%= @work.title %>

Created by: <%= @work.creator %>

Published: <%= @work.publication_year %>

From d8fac86626421a7fd018cbf6167cd1ffcf3ebcb9 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Sat, 14 Oct 2017 13:42:57 -0700 Subject: [PATCH 33/38] fixed header font size --- app/assets/stylesheets/application.css | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 628c43a927..86180d662a 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -15,6 +15,9 @@ *= require_tree . *= require_self */ + + + * { box-sizing: inherit; } @@ -34,7 +37,6 @@ body, h1, h2, h3, h4, h5 { } h2 { - font-size: 1.25rem; line-height: 1.4; margin-top: 0; margin-bottom: 0.5rem; @@ -66,13 +68,10 @@ li { ul, ol, dl { margin-bottom: 1rem; - line-style-position: outside; line-height: 1.6; } -row { - margin-right: auto; - } + .row { max-width: 75rem; @@ -95,7 +94,6 @@ row { text-align: center; line-height: 1; color: #fefefe; - } .button:hover { @@ -105,6 +103,7 @@ row { .float_right { float: right; } + .page-header { max-width: 100%; background-color: #B2DFDB; @@ -129,8 +128,6 @@ row { color: white; } - - .small-12 { width: 100%; } @@ -150,10 +147,3 @@ row { .status.failure h3 { color: #C70039; } - - @media print, screen and (min-width: 40em) - - .columns { - padding-right: 0.9375rem; - padding-left: 0.9375rem; - } From 2f6cc86249dbbe2be06f1ae2d276adf8f2e5ee59 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Sun, 15 Oct 2017 18:12:55 -0700 Subject: [PATCH 34/38] columns working --- app/assets/.DS_Store | Bin 6148 -> 6148 bytes app/assets/stylesheets/.DS_Store | Bin 0 -> 6148 bytes app/assets/stylesheets/application.css | 82 ++++++++++++++++--------- app/views/works/_ulhome.html.erb | 2 +- app/views/works/home.html.erb | 40 +++++++----- app/views/works/show.html.erb | 17 ++--- 6 files changed, 87 insertions(+), 54 deletions(-) create mode 100644 app/assets/stylesheets/.DS_Store diff --git a/app/assets/.DS_Store b/app/assets/.DS_Store index 10f526f8e4dd7b7acd1ba2e1d98b71aa58834ebe..6b56a5d51ea6b2853f6a23bd1fe41b5d59629618 100644 GIT binary patch delta 77 zcmZoMXfc=|&e%S&P;8=}A|unp0PD#HA}ka8B}KUziWy26Dj9MZQh}@tAeqWgvT>Fd f`(}0y0S?CYjT^r+Pv#fVWn|dwC~}y2Vgm~RHm?;< delta 57 zcmZoMXfc=|&e%4wP;8=}A|vC(0Ba!8BeU_e4g16g%A46a1UMMmHeUSBJeglamz9x$ Mf#JYrTam-e016fnivR!s diff --git a/app/assets/stylesheets/.DS_Store b/app/assets/stylesheets/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0div { + padding: 0 2rem 2rem 2rem; +} + +.spotlight p { + margin-bottom: 0; +} + +.top-ten h3 { + border-bottom: 2px solid #B2DFDB; +} + +.top-ten ul { + list-style-type: none; + margin-left: 0px; +} + .page-header h2 { text-align: center; margin: 25px auto 40px auto; } - .page-header h2 a { +.page-header h2 a { color: #FF5722; padding-right: 25px; margin-right: 15px; @@ -139,7 +150,7 @@ ul, ol, dl { margin-top: 30px; } -.status.failure h3, status.success h3 { +.status.failure h3, .status.success h3 { font-weight: normal; font-size: 1em; } @@ -147,3 +158,18 @@ ul, ol, dl { .status.failure h3 { color: #C70039; } + + .status.success h3 { + color: #8a8a8a; + } + + .root-hr { + margin: 0px auto 75px auto; + color: #EEEEEE; + } + + @media print, screen and (min-width: 64em) { + .large-4 { + width: 33.33333%; + } + } diff --git a/app/views/works/_ulhome.html.erb b/app/views/works/_ulhome.html.erb index 9959d198c8..f929f69d89 100644 --- a/app/views/works/_ulhome.html.erb +++ b/app/views/works/_ulhome.html.erb @@ -1,6 +1,6 @@
    <% works.each do |work| %> -
  • <%= link_to(work.title, work_path(work.id)) %> by <%= work.creator %>
    • +

  • <%= link_to(work.title, work_path(work.id)) %> by <%= work.creator %>

    • <%= work.votes.count %> votes

    <% end %>
diff --git a/app/views/works/home.html.erb b/app/views/works/home.html.erb index abbecf9fa4..ad20c734af 100644 --- a/app/views/works/home.html.erb +++ b/app/views/works/home.html.erb @@ -1,23 +1,29 @@ -
+
-

Media Spotlight: - <%= link_to(@top_work.title, work_path(@top_work.id)) %> by <%= @top_work.creator %> -

-

- <%= @top_work.votes.count %> votes - - <%= @top_work.description %> -

+
+

+ Media Spotlight: + <%= link_to(@top_work.title, work_path(@top_work.id)) %> by <%= @top_work.creator %> +

+

+ <%= @top_work.votes.count %> votes - + <%= @top_work.description %> +

+
-
-
+
+ +

Top Movies

<%= render partial: "ulhome", locals: {works: @movies} %> - -

Top Books

- <%= render partial: "ulhome", locals: {works: @books} %> - -

Top Albums

- <%= render partial: "ulhome", locals: {works: @albums} %> -
+
+

Top Books

+ <%= render partial: "ulhome", locals: {works: @books} %> +
+
+

Top Albums

+ <%= render partial: "ulhome", locals: {works: @albums} %> +
+
diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 243ebffa0f..22413ee245 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -1,16 +1,18 @@
- -
+

<%= @work.title %>

Created by: <%= @work.creator %>

Published: <%= @work.publication_year %>

<%= @work.description %>

- <%= link_to("Back to media ranks", works_path) %> - <%= link_to("Edit", edit_work_path(@work.id))%> - <%= link_to("Upvote", votes_path(:work => @work.id), method: :post )%> - <%= link_to("Delete", work_path(@work.id), method: :delete )%> +
+ <%= link_to("Back to media ranks", works_path, :class => "button") %> + <%= link_to("Edit", edit_work_path(@work.id), :class => "button")%> + <%= link_to("Upvote", votes_path(:work => @work.id), method: :post, :class => "button" )%> + <%= link_to("Delete", work_path(@work.id), method: :delete, data: {confirm: "Are you sure?"}, :class => "alert button")%> +
-
+ +

<%= @work.votes.count %> Votes for this <%= @work.category %>

@@ -28,7 +30,6 @@ <% end %>
-
From a3499e6f588fdc1a91e93df1b9dab7e41b3535a1 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Sun, 15 Oct 2017 18:54:27 -0700 Subject: [PATCH 35/38] works index page styled --- app/assets/stylesheets/application.css | 12 ++- app/views/works/_table.html.erb | 14 +-- app/views/works/index.html.erb | 32 +++---- controller_filters_notes | 120 +++++++++++++++++++++++++ 4 files changed, 149 insertions(+), 29 deletions(-) create mode 100644 controller_filters_notes diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 405db04b47..2ac5abd26e 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -59,12 +59,6 @@ ul { line-height: 1.6; } -table { - width: 100%; - margin-bottom: 1rem; - border-radius: 0; -} - body small { color: slategrey; } @@ -106,6 +100,10 @@ a:hover { color: #424242; } +.media_table.upvote.button { + margin:0; +} + section.spotlight>div { padding: 0 2rem 2rem 2rem; } @@ -163,7 +161,7 @@ section.spotlight>div { color: #8a8a8a; } - .root-hr { +.root-hr { margin: 0px auto 75px auto; color: #EEEEEE; } diff --git a/app/views/works/_table.html.erb b/app/views/works/_table.html.erb index 404b7ff1be..df351f2573 100644 --- a/app/views/works/_table.html.erb +++ b/app/views/works/_table.html.erb @@ -1,10 +1,12 @@ - Votes - Title - Created By - Published - Upvote + + + + + + + <% works.each do |work| %> @@ -13,7 +15,7 @@ - + <% end %> diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index d2f2a87f45..7c6ffbfe4c 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1,18 +1,18 @@ -
-

List of works

-
-
-

Albums

- <%= render partial: "table", locals: {works: @albums} %> - -

Books

- <%= render partial: "table", locals: {works: @books} %> - -

Movies

- <%= render partial: "table", locals: {works: @movies} %> +
+

List of works

+
+

Albums

+ <%= render partial: "table", locals: {works: @albums} %> +
+
+

Books

+ <%= render partial: "table", locals: {works: @books} %> +
+
+

Movies

+ <%= render partial: "table", locals: {works: @movies} %> +
+ <%= link_to("View top media", root_path, :class => "button") %> + <%= link_to("Add a new work", new_work_path, :class => "button") %>
-
-

<%= link_to("View top media", root_path) %>

-

<%= link_to("Add a new work", new_work_path) %>

-
diff --git a/controller_filters_notes b/controller_filters_notes new file mode 100644 index 0000000000..41a56d6fad --- /dev/null +++ b/controller_filters_notes @@ -0,0 +1,120 @@ +Controller Filters +Learning Goals + +What is a controller filter? +Use controller filters to DRY up your controller code +What is a controller filter? + +From the rails docs: +Filters are methods that are run before, after or "around" a controller action. + +before_action and after_action are the most common, though there is also around_action. + +DRY Up Your Controllers + +Another good way to use controller filters is to DRY up your code. + +Let's examine a typical controller: + +class BooksController < ApplicationController + def index + @books = Book.all + end + + def show + @book = Book.find_by_id(params[:id]) + end + + def new + @book = Book.new + end + + def create + @book = Book.new(book_params) + if @book.save + redirect_to books_path + else + render :new + end + end + + def edit + @book = Book.find_by_id(params[:id]) + end + + def update + @book = Book.find_by_id(params[:id]) + if @book.update(book_params) + redirect_to books_path + else + render :edit + end + end + + private + + def book_params + params.require(:book).permit(:title, :description, :isbn, :author_id) + end +end +How many times did we duplicate the code @book = Book.find_by_id(params[:id])? A bunch! Instead of having this code duplicated in each controller action, we can use a before_action to DRY things up. + +First, we create a new private method in our controller. It is private because it is only used within this Controller, and is not needed outside of the Controller. + +private + +def find_book + @book = Book.find_by_id(params[:id]) +end +Next, we should set each of these controller methods up to use this new method using a controller filter. We specify the only portion to ensure that this before_action will only happen for the specified actions. + +class BooksController < ApplicationController + before_action :find_book, only: [:show, :edit, :update] + + ... +Similar to using resources routes, in a controller filter we can use only as well as except depending on whether we want to use the positive case or the negative one. + +Lastly, we can now remove each of the duplicated lines of code from our original controller methods. + +class BooksController < ApplicationController + before_action :find_book, only: [:show, :edit, :update] + + def index + @books = Book.all + end + + def show; end + + def new + @book = Book.new + end + + def create + @book = Book.new(book_params) + if @book.save + redirect_to books_path + else + render :new + end + end + + def edit; end + + def update + if @book.update(book_params) + redirect_to books_path + else + render :edit + end + end + + private + + def book_params + params.require(:book).permit(:title, :description, :isbn, :author_id) + end + + def find_book + @book = Book.find_by_id(params[:id]) + end +end From f32930b6ba773831acab44a045b448d39f45ebdb Mon Sep 17 00:00:00 2001 From: Shaunna Date: Mon, 16 Oct 2017 06:39:01 -0700 Subject: [PATCH 36/38] fixed selected drop down on edit form, css styling --- app/assets/stylesheets/application.css | 14 ++--- app/controllers/votes_controller.rb | 10 +++- app/controllers/works_controller.rb | 26 +++++++--- app/models/user.rb | 16 +++--- app/models/vote.rb | 2 +- app/models/work.rb | 8 +-- app/views/users/index.html.erb | 10 ++-- app/views/users/show.html.erb | 7 +-- app/views/works/_form.html.erb | 19 ++----- app/views/works/edit.html.erb | 11 ++-- app/views/works/new.html.erb | 10 ++-- app/views/works/show.html.erb | 4 +- test/controllers/votes_controller_test.rb | 30 +++++++++-- test/fixtures/works.yml | 23 +++++++++ test/models/user_test.rb | 20 +++---- test/models/vote_test.rb | 28 ++++++++-- test/models/work_test.rb | 63 +++++++++++++++++++---- 17 files changed, 204 insertions(+), 97 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 2ac5abd26e..56f7c750e8 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -112,6 +112,10 @@ section.spotlight>div { margin-bottom: 0; } +.spotlight a { + border-bottom: 2px solid; +} + .top-ten h3 { border-bottom: 2px solid #B2DFDB; } @@ -137,10 +141,6 @@ section.spotlight>div { color: white; } -.small-12 { - width: 100%; -} - .status { border-radius: 5px; background-color: #e6e6e6; @@ -165,9 +165,3 @@ section.spotlight>div { margin: 0px auto 75px auto; color: #EEEEEE; } - - @media print, screen and (min-width: 64em) { - .large-4 { - width: 33.33333%; - } - } diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index fae9930da2..b1ac39b80f 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -1,6 +1,6 @@ class VotesController < ApplicationController def create - # @user = User.find_by(id: session[:user_id]) + @user = User.find_by(id: session[:user_id]) @work = Work.find_by(id: params[:work]) if @user_in_session @@ -9,6 +9,14 @@ def create @vote.work = @work if @vote.save flash[:success] = "Successfully upvoted!" + redirect_back(fallback_location: root_path) + else + flash[:failure] = "Could not upvote" + + if @vote.errors.any? + flash[:errors] = @vote.errors + end + redirect_back(fallback_location: root_path) end else diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 0c64cc5e56..f9081f94a5 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,4 +1,5 @@ class WorksController < ApplicationController + before_action :find_work def home @top_work = Work.order_by_popularity(Work.all).first @@ -14,7 +15,7 @@ def index end def show - @work = Work.find_by(id: params[:id].to_i ) + # @work = Work.find_by(id: params[:id].to_i ) unless @work render_404 @@ -33,39 +34,48 @@ def create flash[:success] = "Successfully created #{@work.category} #{@work.id}" redirect_to works_path else - flash[:error] = "A problem occurred. Coult not create work" + flash[:failure] = "A problem occurred. Coult not create work" + + if @work.errors.any? + flash.now[:errors] = @work.errors + end + render :new end end def edit - @work = Work.find_by(id: params[:id]) + # @work = Work.find_by(id: params[:id]) end def update - @work = Work.find_by(id: params[:id]) + # @work = Work.find_by(id: params[:id]) unless @work - flash[:error] = "Driver with id #{params[:id]} not found" + flash[:error] = "Work with id #{params[:id]} not found" redirect_to works_path end if @work.update_attributes work_params - flash[:success] = "Book added successfully!" + flash[:success] = "Successfully updated #{@work.category} #{@work.id}" redirect_to works_path else - flash[:error] = "Book unable to update" + flash[:failure] = "Work #{@work.id} unable to update" render :edit end end def destroy - Work.find_by(id: params[:id]).destroy + # Work.find_by(id: params[:id]).destroy + @work.destroy redirect_to works_path end private + def find_work + @work = Work.find_by(id: params[:id].to_i ) + end def work_params return params.require(:work).permit(:category, :title, :creator, :publication_year, :description) diff --git a/app/models/user.rb b/app/models/user.rb index 03b6cfb737..a46bff5618 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -3,13 +3,13 @@ class User < ApplicationRecord validates :name, presence: true validates :name, uniqueness: true - def include_work?(work) - votes.each do |vote| - if vote.work = work - return true - end - end - return false - end + # def include_work?(work) + # votes.each do |vote| + # if vote.work = work + # return true + # end + # end + # return false + # end end diff --git a/app/models/vote.rb b/app/models/vote.rb index 77ac1db12a..4e465b0182 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -2,5 +2,5 @@ class Vote < ApplicationRecord belongs_to :user belongs_to :work - validates :user, uniqueness: { scope: :work, message: "user: has already voted for this work"} + validates :user, uniqueness: { scope: :work, message: "has already voted for this work"} end diff --git a/app/models/work.rb b/app/models/work.rb index b5d378b908..2631b3c563 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,9 +1,11 @@ class Work < ApplicationRecord - has_many :votes + has_many :votes, dependent: :destroy validates :title, presence: true validates :category, presence: true + validates :title, uniqueness: { scope: :category, message: "has already been taken"} + def self.albums @albums = Work.where(category: "album") end @@ -17,12 +19,10 @@ def self.movies end def self.categories - @categories = ["album", "book", "movie"] + works = ["album", "book", "movie"] end def self.order_by_popularity(works) return works.sort { |x,y| y.votes.length <=> x.votes.length} end - - end diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 546f10ea52..e24df7e169 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -1,16 +1,16 @@ -
+

List of Users

VotesTitleCreated byPublishedUpvote
<%= link_to(work.title, work_path(work.id)) %> <%= work.creator %> <%= work.publication_year %><%= link_to("Upvote", votes_path(:work => work.id), method: :post )%><%= link_to("Upvote", votes_path(:work => work.id), method: :post, :class => "button upvote" )%>
- - + + <% @users.each do |user| %> - + @@ -18,5 +18,5 @@
UsernameVotesJoinedVotesJoined
<%= user.name %><%= link_to user.name, user_path(user.id) %> <%= user.votes.count %> <%= user.created_at.strftime("%B %d, %Y")%>
- <%= link_to("Back to Media List", root_path) %> + <%= link_to("Back to Media List", root_path, :class => "button") %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 21772feac2..e350da0d7c 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,7 +1,4 @@ -
-
- -
+

User Summary: <%= @user.name %>

Joined site <%= @user.created_at.strftime("%B %d, %Y")%>

Votes

@@ -18,7 +15,7 @@ <% @user.votes.each do |vote| %> - <%= vote.work.title %> + <%= link_to vote.work.title, work_path(vote.work.id) %> <%= vote.work.creator %> <%= vote.work.publication_year %> <%= vote.work.category %> diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb index 9969bde668..3a60ab8ced 100644 --- a/app/views/works/_form.html.erb +++ b/app/views/works/_form.html.erb @@ -1,33 +1,20 @@ -

In the partial

- <%= form_for @work do |f| %> -
+ <%= f.label :category %> - <%= f.select :category, options_for_select(Work.categories) %> -
+ <%= f.select :category, options_for_select(Work.categories, :selected => @work.category) %> -
<%= f.label :title %> <%= f.text_field :title %> -
-
<%= f.label :creator %> <%= f.text_field :creator %> -
-
<%= f.label :publication_year %> <%= f.text_field :publication_year %> -
-
<%= f.label :description %> <%= f.text_area :description %> -
-
- <%= f.submit %> -
+ <%= f.submit :class => "button" %> <% end %> diff --git a/app/views/works/edit.html.erb b/app/views/works/edit.html.erb index b45d2f3ef3..6f0883e1e2 100644 --- a/app/views/works/edit.html.erb +++ b/app/views/works/edit.html.erb @@ -1,5 +1,8 @@ -

Edit this movie

+
+

Edit <%= @work.category %>

-
- <%= render partial: "form" %> -
+
+ <%= render partial: "form" %> +
+ +
diff --git a/app/views/works/new.html.erb b/app/views/works/new.html.erb index 08923ffa3c..a5abe7aeda 100644 --- a/app/views/works/new.html.erb +++ b/app/views/works/new.html.erb @@ -1,5 +1,7 @@ -

Add a new work

+
+

Add a new work

-
- <%= render partial: "form" %> -
+
+ <%= render partial: "form" %> +
+
diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 22413ee245..d162f00151 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -1,5 +1,5 @@
-
+

<%= @work.title %>

Created by: <%= @work.creator %>

Published: <%= @work.publication_year %>

@@ -12,7 +12,7 @@
-
+

<%= @work.votes.count %> Votes for this <%= @work.category %>

diff --git a/test/controllers/votes_controller_test.rb b/test/controllers/votes_controller_test.rb index 7240ec4628..ecfe82263d 100644 --- a/test/controllers/votes_controller_test.rb +++ b/test/controllers/votes_controller_test.rb @@ -7,10 +7,7 @@ post login_path, params: { username: "Ada Lovelace"} end - it "must be able to create a vote that has a user and a work" do - # work_id = Work.find( works(:movie).id ).id - # post login_path, params: { username: "Ada Lovelace"} - + it "must be able to create a vote" do proc{ post votes_path, params: { work: @work_id} }.must_change 'Vote.count', 1 @@ -18,7 +15,14 @@ ### ummmmmmmmmm it "must have a user and a work" do - # post votes_path, params: { work: @work_id} + album_id = Work.find( works(:album).id ).id + + post votes_path, params: {work: album_id} + + vote = Vote.find_by(work: album_id) + + vote.user.must_be_kind_of User + vote.work.must_be_kind_of Work end it "must not let a user vote for the same work more than once" do @@ -48,8 +52,24 @@ }.must_change 'Vote.count', 1 end + it "won't make a vote without a user signed in" do + post logout_path + + new_work = Work.create(title: "New Work", category: "album") + + proc { + post votes_path, params: { work: new_work.id } + }.must_change 'Vote.count', 0 + + post login_path, params: { username: "Ada Lovelace"} + end + + it "won't make a vote without a work assigned to it" do + proc {post votes_path}.must_change 'Vote.count', 0 + end end + # proc { # post works_path, params: { work: {category: "album", title: "New Title", creator: "Newton", publication_year: "1983", description: "This is a fantastic album. You should listen to it!"}} # }.must_change 'Work.count', 1 diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index 132e68a5ae..4adbe8af6d 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -7,15 +7,38 @@ book: publication_year: 1983 description: A book about the Camino de Santiago +book2: + category: book + title: book2 + +book3: + category: book + title: book3 + +book4: + category: book + title: book4 + movie: category: movie title: Anna Karenina creator: Tolstoy publication_year: 1999 +movie2: + category: movie + title: movie2 album: category: album title: MXPX creator: Jessica publication_year: 2002 + +album2: + category: album + title: album2 + +album3: + category: album + title: album3 diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 13c8747e1b..0d4126c0d5 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -20,14 +20,14 @@ proc {User.create(name: "Jake")}.must_change 'User.count', 0 end - it "returns true for include_work? if the user already has a vote for that work" do - # work = Work.create(title: "News", category: "movie") - Vote.create(user: jake, work: work) - - jake.include_work?(work).must_equal true - end - - it "returns false for include_work? if the user already has a vote for that work" do - jake.include_work?(work2).must_equal false - end + # it "returns true for include_work? if the user already has a vote for that work" do + # # work = Work.create(title: "News", category: "movie") + # Vote.create(user: jake, work: work) + # + # jake.include_work?(work).must_equal true + # end + + # it "returns false for include_work? if the user already has a vote for that work" do + # jake.include_work?(work2).must_equal false + # end end diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index c498f7fc44..c3f6e2ab15 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -1,6 +1,26 @@ require "test_helper" -# describe Vote do -# -# -# end +describe Vote do + it "has a user associated" do + + end + + it "has a work associated" do + + end + + it "will not be created if the same user tries to vote on the same work twice" do + + end + + it "exist? returns true if the vote for that user and work already exists" do + + end + + it "exist? returns false if the vote for that user and work doesn't exist yet" do + + end + + + +end diff --git a/test/models/work_test.rb b/test/models/work_test.rb index e1867045a2..2430c4b4d4 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -1,18 +1,61 @@ require "test_helper" describe Work do - let(:work) { Work.new } - let(:book) { works(:book) } + describe "Work" do + let(:work) { Work.new } + let(:book) { works(:book) } - it "must have a title" do - #book currently has title, should return true - book.valid?.must_equal true + it "must have a title and a category" do + #book currently has title, should return true + book.valid?.must_equal true - book.category = nil - book.title = nil - book.save + book.category = nil + book.title = nil + book.save - book.errors.keys.must_include :title - book.errors.keys.must_include :category + book.errors.keys.must_include :title + book.errors.keys.must_include :category + end + end + describe "category return methods" do + it "returns all of the albums" do + @albums = Work.albums + + @albums.length.must_equal 3 + @albums.each do |album| + album.category.must_equal "album" + end + end + + it "returns all of the movies" do + @movies = Work.movies + + @movies.length.must_equal 2 + @movies.each do |movie| + movie.category.must_equal "movie" + end + end + + it "returns all of the books" do + @books = Work.books + + @books.length.must_equal 4 + @books.each do |book| + book.category.must_equal "book" + end + end + + it "returns an array of categories available" do + Work.categories.must_be_kind_of Array + Work.categories.must_equal ["album", "book", "movie"] + end + end + + describe "other methods" do + + + it "returns the selection of works in order from highest votes to lowest votes" do + + end end end From 21ecb5091c0ddf3625212eee07c550d1808da103 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Mon, 16 Oct 2017 07:26:20 -0700 Subject: [PATCH 37/38] spacing on edit and new work form --- app/assets/stylesheets/application.css | 26 ++++---------------------- app/views/layouts/application.html.erb | 2 +- app/views/works/edit.html.erb | 2 +- 3 files changed, 6 insertions(+), 24 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 56f7c750e8..fdea93a834 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -31,24 +31,11 @@ body, h1, h2, h3, h4, h5 { font-family: "Gudea", sans-serif; } -h2 { - line-height: 1.4; - margin-top: 0; - margin-bottom: 0.5rem; -} - -h3 { - line-height: 1.4; - margin-top: 0; - margin-bottom: 0.5rem; -} - a, h3 { color: #26A69A; } li { - font-size: inherit; margin: 0; padding: 0; display: list-item; @@ -63,17 +50,12 @@ body small { color: slategrey; } +select, textarea { + margin-bottom: 1rem; +} + .button { - display: inline-block; background-color: #26A69A; - margin: 0 0 1rem 0; - padding: 0.85rem 1em; - border: 1px solid transparent; - border-radius: 0; - font-size: 0.9rem; - text-align: center; - line-height: 1; - color: #fefefe; } .button:hover { diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 3e67d3ed51..a1dbe72610 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -4,7 +4,7 @@ MediaRanker <%= csrf_meta_tags %> - + <%= favicon_link_tag 'favicon.ico' %> <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> diff --git a/app/views/works/edit.html.erb b/app/views/works/edit.html.erb index 6f0883e1e2..99f60a6133 100644 --- a/app/views/works/edit.html.erb +++ b/app/views/works/edit.html.erb @@ -1,5 +1,5 @@
-

Edit <%= @work.category %>

+

Edit this <%= @work.category %>

<%= render partial: "form" %> From 8ddabcd242e92e1794d2686ca9d887d9abf83b26 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Mon, 16 Oct 2017 08:37:39 -0700 Subject: [PATCH 38/38] updated tests --- .github/PULL_REQUEST_TEMPLATE | 4 ++-- app/models/work.rb | 1 + test/controllers/votes_controller_test.rb | 23 +++++++++++----------- test/fixtures/users.yml | 3 +++ test/fixtures/votes.yml | 24 +++++++++++++++++++---- test/models/vote_test.rb | 18 ++--------------- test/models/work_test.rb | 16 ++++++++++++++- 7 files changed, 54 insertions(+), 35 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE index c5a6ec2eec..769708c50e 100644 --- a/.github/PULL_REQUEST_TEMPLATE +++ b/.github/PULL_REQUEST_TEMPLATE @@ -4,8 +4,8 @@ Congratulations! You're submitting your assignment! ## Comprehension Questions Question | Answer --- | --- -Describe a custom model method you wrote. | -Describe how you approached testing that model method. What edge cases did you come up with? | +Describe a custom model method you wrote. | A method to return a collection of works ordered from highest number of votes to lowest number of votes +Describe how you approached testing that model method. What edge cases did you come up with? | I wrote a test that used fixtures. It ensured that the correct order was returned and if there were no votes that the full length array was still returned. Describe an edge case test you wrote for a controller | What are `session` and `flash`? What is the difference between them? | Describe a controller filter you wrote. | diff --git a/app/models/work.rb b/app/models/work.rb index 2631b3c563..b622af1fe7 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -20,6 +20,7 @@ def self.movies def self.categories works = ["album", "book", "movie"] + return works end def self.order_by_popularity(works) diff --git a/test/controllers/votes_controller_test.rb b/test/controllers/votes_controller_test.rb index ecfe82263d..1a63a8a76f 100644 --- a/test/controllers/votes_controller_test.rb +++ b/test/controllers/votes_controller_test.rb @@ -13,17 +13,17 @@ }.must_change 'Vote.count', 1 end - ### ummmmmmmmmm - it "must have a user and a work" do - album_id = Work.find( works(:album).id ).id - - post votes_path, params: {work: album_id} - - vote = Vote.find_by(work: album_id) - - vote.user.must_be_kind_of User - vote.work.must_be_kind_of Work - end + #Better in models test?? + # it "must have a user and a work" do + # album_id = Work.find( works(:album).id ).id + # + # post votes_path, params: {work: album_id} + # + # vote = Vote.find_by(work: album_id) + # + # vote.user.must_be_kind_of User + # vote.work.must_be_kind_of Work + # end it "must not let a user vote for the same work more than once" do work2_id = Work.find( works(:book).id ).id @@ -36,7 +36,6 @@ end it "can make a new vote for the same work for a new user" do - work = Work.create(category: "album", title: "Work") post login_path, params: { username: "Ada Lovelace"} diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index f96bcc2b49..45dff98f44 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -5,3 +5,6 @@ jake: molly: name: Molly + +cindy: + name: Cindy diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml index b5db71052e..40e0dfb535 100644 --- a/test/fixtures/votes.yml +++ b/test/fixtures/votes.yml @@ -1,9 +1,25 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - user: one - work: one + user: jake + work: book two: - user: two - work: two + user: molly + work: book + +three: + user: cindy + work: book + +four: + user: jake + work: book2 + +five: + user: molly + work: book2 + +six: + user: cindy + work: book3 diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index c3f6e2ab15..7e05a005ee 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -2,25 +2,11 @@ describe Vote do it "has a user associated" do - + votes(:one).user.must_equal users(:jake) end it "has a work associated" do - - end - - it "will not be created if the same user tries to vote on the same work twice" do - - end - - it "exist? returns true if the vote for that user and work already exists" do - - end - - it "exist? returns false if the vote for that user and work doesn't exist yet" do - + votes(:one).work.must_equal works(:book) end - - end diff --git a/test/models/work_test.rb b/test/models/work_test.rb index 2430c4b4d4..75bbff0e2f 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -52,10 +52,24 @@ end describe "other methods" do + it "returns the input selection of works in order from highest votes to lowest votes" do + ordered_books = Work.order_by_popularity(Work.books) + ordered_books.must_be_kind_of Array - it "returns the selection of works in order from highest votes to lowest votes" do + ordered_books[0].must_equal works(:book) + ordered_books[1].must_equal works(:book2) + ordered_books[2].must_equal works(:book3) + end + + it "returns an array of the same length even if there are no votes" do + movies = Work.movies + + ordered_movies = Work.order_by_popularity(movies) + + ordered_movies.must_be_kind_of Array + ordered_movies.length.must_equal movies.length end end end