From 1f38c73c8846c78b09cade00c87b70a01a2b0f3f Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Mon, 8 Oct 2018 14:31:08 -0700 Subject: [PATCH 01/48] initial rails setup --- .gitignore | 28 ++ .ruby-version | 1 + Gemfile | 81 +++++ Gemfile.lock | 277 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/assets/config/manifest.js | 3 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 20 ++ app/assets/javascripts/cable.js | 13 + app/assets/javascripts/channels/.keep | 0 app/assets/stylesheets/application.scss | 18 ++ app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/helpers/application_helper.rb | 2 + app/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 | 15 + 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 | 36 +++ bin/spring | 17 ++ bin/update | 31 ++ bin/yarn | 11 + config.ru | 5 + config/application.rb | 25 ++ config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 ++++++ config/environment.rb | 5 + config/environments/development.rb | 61 ++++ config/environments/production.rb | 94 ++++++ config/environments/test.rb | 46 +++ .../application_controller_renderer.rb | 8 + config/initializers/assets.rb | 14 + config/initializers/backtrace_silencers.rb | 7 + .../initializers/content_security_policy.rb | 25 ++ 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 | 34 +++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 +++ 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 + storage/.keep | 0 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 | 24 ++ tmp/.keep | 0 vendor/.keep | 0 80 files changed, 1407 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/assets/config/manifest.js create mode 100644 app/assets/images/.keep create mode 100644 app/assets/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.scss create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/helpers/application_helper.rb create mode 100644 app/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/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/assets.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/content_security_policy.rb create mode 100644 config/initializers/cookies_serializer.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 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 storage/.keep 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..b156f1c736 --- /dev/null +++ b/.gitignore @@ -0,0 +1,28 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +/node_modules +/yarn-error.log + +/public/assets +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key +.idea diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000000..25c81fe399 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000000..6219256bd8 --- /dev/null +++ b/Gemfile @@ -0,0 +1,81 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.1' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# 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 'mini_racer', 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', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + # Access an interactive console on exception pages or by calling 'console' anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '>= 3.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 + +group :test do + # Adds support for Capybara system testing and selenium driver + gem 'capybara', '>= 2.15' + gem 'selenium-webdriver' + # Easy installation and use of chromedriver to run system tests with Chrome + gem 'chromedriver-helper' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +gem 'jquery-rails' +gem 'jquery-turbolinks' +gem 'bootstrap', '~> 4.1.3' +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'better_errors' + gem 'binding_of_caller' + gem 'guard' + gem 'guard-minitest' +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..c2238a0a0a --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,277 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.1) + actionpack (= 5.2.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.1) + actionview (= 5.2.1) + activesupport (= 5.2.1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.1) + activesupport (= 5.2.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.1) + activesupport (= 5.2.1) + globalid (>= 0.3.6) + activemodel (5.2.1) + activesupport (= 5.2.1) + activerecord (5.2.1) + activemodel (= 5.2.1) + activesupport (= 5.2.1) + arel (>= 9.0) + activestorage (5.2.1) + actionpack (= 5.2.1) + activerecord (= 5.2.1) + marcel (~> 0.3.1) + activesupport (5.2.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + ansi (1.5.0) + archive-zip (0.11.0) + io-like (~> 0.3.0) + arel (9.0.0) + autoprefixer-rails (9.1.4) + execjs + better_errors (2.5.0) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) + bindex (0.5.0) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + bootsnap (1.3.2) + msgpack (~> 1.0) + bootstrap (4.1.3) + autoprefixer-rails (>= 6.0.3) + popper_js (>= 1.12.9, < 2) + sass (>= 3.5.2) + builder (3.2.3) + byebug (10.0.2) + capybara (3.9.0) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + xpath (~> 3.1) + childprocess (0.9.0) + ffi (~> 1.0, >= 1.0.11) + chromedriver-helper (2.1.0) + archive-zip (~> 0.10) + nokogiri (~> 1.8) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crass (1.0.4) + debug_inspector (0.0.3) + erubi (1.7.1) + execjs (2.7.0) + ffi (1.9.25) + formatador (0.2.5) + globalid (0.4.1) + activesupport (>= 4.2.0) + guard (2.14.2) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) + i18n (1.1.0) + concurrent-ruby (~> 1.0) + io-like (0.3.0) + jbuilder (2.7.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + jquery-rails (4.3.3) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.2) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.0.13) + mail (2.7.0) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.0) + mimemagic (0.3.2) + mini_mime (1.0.1) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.5) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.4) + multi_json (1.13.1) + nenv (0.3.0) + nio4r (2.3.1) + nokogiri (1.8.5) + mini_portile2 (~> 2.3.0) + notiffany (0.1.1) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.1.3) + popper_js (1.14.3) + pry (0.11.3) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + public_suffix (3.0.3) + puma (3.12.0) + rack (2.0.5) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.1) + actioncable (= 5.2.1) + actionmailer (= 5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + activemodel (= 5.2.1) + activerecord (= 5.2.1) + activestorage (= 5.2.1) + activesupport (= 5.2.1) + bundler (>= 1.3.0) + railties (= 5.2.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.1) + actionpack (= 5.2.1) + activesupport (= 5.2.1) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + rubyzip (1.2.2) + sass (3.6.0) + 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.7) + 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.14.1) + childprocess (~> 0.5) + rubyzip (~> 1.2, >= 1.2.2) + shellany (0.0.1) + 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.2) + 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.2.0) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + tzinfo (1.2.5) + thread_safe (~> 0.1) + uglifier (4.1.19) + execjs (>= 0.3.0, < 3) + web-console (3.7.0) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.1.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + bootsnap (>= 1.1.0) + bootstrap (~> 4.1.3) + byebug + capybara (>= 2.15) + chromedriver-helper + guard + guard-minitest + jbuilder (~> 2.5) + jquery-rails + jquery-turbolinks + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.1) + 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) + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 1.16.3 diff --git a/Guardfile b/Guardfile new file mode 100644 index 0000000000..e34f706f4a --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000000..e85f913914 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 0000000000..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..4f73c21a7d --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,20 @@ +// 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 jquery3 + //= require popper + //= require bootstrap-sprockets + +// +//= require rails-ujs +//= require activestorage +//= 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.scss b/app/assets/stylesheets/application.scss new file mode 100644 index 0000000000..8b1701e581 --- /dev/null +++ b/app/assets/stylesheets/application.scss @@ -0,0 +1,18 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's + * vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS + * files in this directory. Styles in this file should be added after the last require_* statement. + * It is generally better to create a new file per style scope. + * + */ + +/* Custom bootstrap variables must be set or imported *before* bootstrap. */ +@import "bootstrap"; +/* Import scss content */ +@import "**/*"; diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 0000000000..d672697283 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 0000000000..0ff5442f47 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 0000000000..09705d12ab --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::Base +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb new file mode 100644 index 0000000000..de6be7945c --- /dev/null +++ b/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/app/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..f32268a271 --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,15 @@ + + + + MediaRanker + <%= csrf_meta_tags %> + <%= csp_meta_tag %> + + <%= 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..f19acf5b5c --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +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..94fd4d7977 --- /dev/null +++ b/bin/setup @@ -0,0 +1,36 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +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..58bfaed518 --- /dev/null +++ b/bin/update @@ -0,0 +1,31 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +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') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + + 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..460dd565b4 --- /dev/null +++ b/bin/yarn @@ -0,0 +1,11 @@ +#!/usr/bin/env ruby +APP_ROOT = File.expand_path('..', __dir__) +Dir.chdir(APP_ROOT) do + begin + exec "yarnpkg", *ARGV + rescue Errno::ENOENT + $stderr.puts "Yarn executable was not detected in the system." + $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install" + exit 1 + end +end diff --git a/config.ru b/config.ru new file mode 100644 index 0000000000..f7ba0b527b --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 0000000000..08db79cb25 --- /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.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 0000000000..b9e460cef3 --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 0000000000..0b286f676e --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: MediaRanker_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 0000000000..a414eb0307 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +MacZ/0xwqLDfpQcbyc0Rgc31UXe0rviZZlH4REKTgprG2+FwkOr+1fLrkf8iiGJ6OGjIKGMonCTsSvl/AbYbb8ZO8cwJgaRyPKZgHGX9WbJyJ6CoTamBuLVQ3fOLuyIuahJcRF5nRAyspYIaPbeEHjZ5WqrcaYmPP//fQ2Ea9YGu50nYVJp63N8rG1fXFSTeIGJDF+hdML8WejXW8Se5MefIWYRa5ChjimBV5muUWKZgk+96afiErGzmP/4XA6RA6mKYFLQEKgwSytpfed0Z6Y7ZWXNshkNOh3eJG2AZFCKhY+L/BoZgYJMxetZ6kufd6D/apfAsctS1Q1X40TQBYH+VO5wpaIBlZeMg4iE6t9eSIZ7NLogw9WEpNd5bv86+l0wAmK+AX2a8suYhvIhTqivJMhM7X4Dy+5gg--QeM60kNczdJlvPwL--mLZH7sOGtSoYojeCrhZZGw== \ No newline at end of file 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..1311e3e4ef --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,61 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + # Debug mode disables concatenation and preprocessing of assets. + # This option may cause significant delays in view rendering with a large + # number of complex assets. + config.assets.debug = true + + # Suppress logger output for asset requests. + config.assets.quiet = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 0000000000..bd39d9d752 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,94 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Compress 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 + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "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..0a38fd3ce9 --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +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.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 + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 0000000000..89d2efab2b --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb new file mode 100644 index 0000000000..4b828e80cb --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# Version of your assets, change this if you want to expire all your assets. +Rails.application.config.assets.version = '1.0' + +# Add additional assets to the asset load path. +# Rails.application.config.assets.paths << Emoji.images_path +# Add Yarn node_modules folder to the asset load path. +Rails.application.config.assets.paths << Rails.root.join('node_modules') + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in the app/assets +# folder are already added. +# Rails.application.config.assets.precompile += %w( admin.js admin.css ) diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 0000000000..59385cdf37 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb new file mode 100644 index 0000000000..d3bcaa5ec8 --- /dev/null +++ b/config/initializers/content_security_policy.rb @@ -0,0 +1,25 @@ +# Be sure to restart your server when you modify this file. + +# Define an application-wide content security policy +# For further information see the following documentation +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy + +# Rails.application.config.content_security_policy do |policy| +# policy.default_src :self, :https +# policy.font_src :self, :https, :data +# policy.img_src :self, :https, :data +# policy.object_src :none +# policy.script_src :self, :https +# policy.style_src :self, :https + +# # Specify URI for violation reports +# # policy.report_uri "/csp-violation-report-endpoint" +# end + +# If you are using UJS then enable automatic nonce generation +# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) } + +# Report CSP violations to a specified URI +# For further information see the following documentation: +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only +# Rails.application.config.content_security_policy_report_only = true diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb new file mode 100644 index 0000000000..5a6a32d371 --- /dev/null +++ b/config/initializers/cookies_serializer.rb @@ -0,0 +1,5 @@ +# Be sure to restart your server when you modify this file. + +# Specify a serializer for the signed and encrypted cookie jars. +# Valid options are :json, :marshal, and :hybrid. +Rails.application.config.action_dispatch.cookies_serializer = :json diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 0000000000..4a994e1e7b --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 0000000000..ac033bf9dc --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 0000000000..dc1899682b --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 0000000000..bbfc3961bf --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 0000000000..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..a5eccf816b --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# 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. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 0000000000..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/spring.rb b/config/spring.rb new file mode 100644 index 0000000000..9fa7863f99 --- /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/config/storage.yml b/config/storage.yml new file mode 100644 index 0000000000..d32f76e8fb --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/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/storage/.keep b/storage/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb new file mode 100644 index 0000000000..d19212abd5 --- /dev/null +++ b/test/application_system_test_case.rb @@ -0,0 +1,5 @@ +require "test_helper" + +class ApplicationSystemTestCase < ActionDispatch::SystemTestCase + driven_by :selenium, using: :chrome, screen_size: [1400, 1400] +end diff --git a/test/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..2b5172a7d6 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,24 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails"require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 0000000000..e69de29bb2 From 8e21f356e30836e142cd91c20c8e08e9766ffeb7 Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Mon, 8 Oct 2018 14:53:48 -0700 Subject: [PATCH 02/48] create Works contoller --- app/assets/javascripts/works.js | 2 + app/assets/stylesheets/works.scss | 3 ++ app/controllers/works_controller.rb | 19 +++++++++ app/helpers/works_helper.rb | 2 + app/views/works/create.html.erb | 2 + app/views/works/destroy.html.erb | 2 + app/views/works/index.html.erb | 2 + app/views/works/new.html.erb | 2 + app/views/works/show.html.erb | 2 + app/views/works/update.html.erb | 2 + config/routes.rb | 6 +++ db/media_seeds.csv | 49 ++++++++++++----------- db/seeds.rb | 24 +++++++++++ test/controllers/works_controller_test.rb | 34 ++++++++++++++++ 14 files changed, 127 insertions(+), 24 deletions(-) create mode 100644 app/assets/javascripts/works.js create mode 100644 app/assets/stylesheets/works.scss create mode 100644 app/controllers/works_controller.rb create mode 100644 app/helpers/works_helper.rb create mode 100644 app/views/works/create.html.erb create mode 100644 app/views/works/destroy.html.erb create mode 100644 app/views/works/index.html.erb create mode 100644 app/views/works/new.html.erb create mode 100644 app/views/works/show.html.erb create mode 100644 app/views/works/update.html.erb create mode 100644 test/controllers/works_controller_test.rb diff --git a/app/assets/javascripts/works.js b/app/assets/javascripts/works.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/works.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/works.scss b/app/assets/stylesheets/works.scss new file mode 100644 index 0000000000..5618452f3e --- /dev/null +++ b/app/assets/stylesheets/works.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Works controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb new file mode 100644 index 0000000000..e62b82780a --- /dev/null +++ b/app/controllers/works_controller.rb @@ -0,0 +1,19 @@ +class WorksController < ApplicationController + def index + end + + def show + end + + def update + end + + def create + end + + def new + end + + def destroy + end +end diff --git a/app/helpers/works_helper.rb b/app/helpers/works_helper.rb new file mode 100644 index 0000000000..ccb78c2b73 --- /dev/null +++ b/app/helpers/works_helper.rb @@ -0,0 +1,2 @@ +module WorksHelper +end diff --git a/app/views/works/create.html.erb b/app/views/works/create.html.erb new file mode 100644 index 0000000000..5bc7fb6058 --- /dev/null +++ b/app/views/works/create.html.erb @@ -0,0 +1,2 @@ +

Works#create

+

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

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

Works#destroy

+

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

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

Works#index

+

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

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

Works#new

+

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

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

Works#show

+

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

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

Works#update

+

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

diff --git a/config/routes.rb b/config/routes.rb index 787824f888..fb01da27d2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,9 @@ Rails.application.routes.draw do + get 'works/index' + get 'works/show' + get 'works/update' + get 'works/create' + get 'works/new' + get 'works/destroy' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/db/media_seeds.csv b/db/media_seeds.csv index 5f5b252a25..1abbd178da 100644 --- a/db/media_seeds.csv +++ b/db/media_seeds.csv @@ -1,25 +1,26 @@ category,title,creator,publication_year,description -album,Blue Breaker,Dr. Sarai Langosh,1949,Et et expedita non aut quo. -book,Joe Treat,Blaise Lesch,1968,Voluptatem adipisci qui velit. -album,Kreb-Full-o Been,Ms. Trevion Buckridge,2016,Vero consectetur delectus consequatur id aut accusantium unde excepturi. -album,Wake-up Pie,Timmy Streich I,1919,Voluptatem consequatur qui consectetur nisi officiis culpa. -album,Major Cup,Jayde Bartoletti,1944,Quis recusandae cum est facere consequatur minima magni et. -book,Summer Select,Ms. Gwendolyn Ortiz,1946,Et molestiae eos nam odit aut sed. -album,Holiday Choice,Alexandria Lehner,1940,Excepturi voluptas ut voluptatum. -book,Postmodern Blend,Meredith Brekke,1970,Dolorem fugit accusantium qui. -book,Green Forrester,Raquel Hirthe,1933,Omnis qui quia odio. -album,Winter Mug,Tia Weissnat II,1990,Laboriosam autem iusto quae sed voluptate et. -book,Red Pie,Davon Kub,1961,Id dolorem qui laborum quia. -album,Major Equinox,Queen Satterfield,1997,Fugit perferendis est quam sunt porro vel rerum. -book,Melty Breaker,Montana Dickinson Sr.,1991,Perferendis harum fuga corporis. -book,Winter Pie,Mr. Syble Kuhn,1970,Incidunt molestias deserunt laudantium. -album,Goodbye Utopia,Orion Spencer,1962,Praesentium enim pariatur voluptatem sed quod dolorum. -album,Green Select,Berneice Jenkins,1957,Hic repudiandae molestiae id nulla aliquid maiores necessitatibus. -book,Blacktop Enlightenment,Seamus D'Amore,1928,Ea id cumque et pariatur magni nemo dolorem. -album,Express Extract,Dorothy Jast I,1969,Dolores dolorum aut ea aperiam et voluptatem. -album,Winter Been,Mackenzie Wilkinson,1932,Culpa repudiandae et at sint et amet fugiat et. -book,Heart Mug,Orpha Douglas,2009,Qui voluptas alias quia. -album,Blue Treat,Eliseo Gorczany,1979,Sit est quis veniam saepe. -book,Hello Town,Laury Walter,2005,Est sed ut asperiores sed fugiat. -album,Blacktop Choice,Casey Feil,2008,Temporibus ex maxime labore quam et natus quia ipsum. -book,Huggy Star,Nigel Lesch DVM,1962,Voluptatem ea aspernatur nesciunt ipsa quis error corporis placeat. +album,Melty Enlightenment,Yong Gutkowski,1943,Iure perspiciatis magnam nesciunt. +book,Seattle Level,Ike Trantow,1965,Architecto ut similique fuga. +book,Veranda Extract,Dr. Miquel Kling,2000,Quia consequuntur totam enim. +book,Spilt Cup,Dennis Quigley,1957,Cumque aperiam aliquam deleniti. +book,Dark ,Dorothea Medhurst,1953,Iure corrupti quisquam earum. +album,Wake-up Delight,Dr. Pasquale Russel,2013,Reprehenderit ipsam et quam. +book,Captain's Cup,Olen Herzog,1928,Sunt aut at quasi. +album,Red Town,Hayden Klocko,1967,Quo dolorem est voluptates. +book,Jacked Symphony,Isaura Schmidt,1977,Et sapiente et illum. +album,Evening Light,Miss Soila Lakin,1945,Et tempore dolorem et. +book,Pumpkin-spice Town,Brett Grant,2011,Fuga nam reprehenderit aliquam. +album,Reg's ,Jacob Moore,1961,Accusamus veritatis aspernatur id. +album,Veranda Forrester,Inell Littel,1969,Dolores perferendis molestiae voluptas. +album,Bluebery Bean,Kyla Auer,1948,Explicabo repudiandae id autem. +book,Split Symphony,Paris Strosin,1940,Accusantium saepe quia vero. +album,Street Been,Tashia Schroeder Sr.,2007,Expedita aut ea cumque. +album,Blacktop Look,Yajaira Gorczany,1949,Dolores voluptatibus autem molestiae. +book,Cascara Bean,Luigi Crooks,2017,Quia asperiores aliquam aut. +book,Split America,Neville Graham,1923,Et eos sequi veniam. +book,Street Select,Marcelo Blanda,2016,Perspiciatis ipsa laudantium aut. +book,Brooklyn Extract,Shirl Braun,1938,Sit velit ut id. +book,Cascara Utopia,Minh Cartwright,1969,Voluptatem itaque optio soluta. +book,Strong Mug,Winford Mann,1927,Inventore autem laborum ipsam. +book,Spilt Breaker,Dr. Hillary Lemke,1919,Fuga consequatur ea est. +album,Heart Extract,Quintin Carroll I,2003,Voluptatem inventore ipsam corporis. diff --git a/db/seeds.rb b/db/seeds.rb index 1beea2accd..6dca154957 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,3 +5,27 @@ # # movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) # Character.create(name: 'Luke', movie: movies.first) +require 'csv' +# create join path to get to media seed file +MEDIA_FILE = Rails.root.join('db', 'media_seeds.csv') +puts "Loading raw seed data from #{MEDIA_FILE}" + +work_failures = [] +CSV.foreach(DRIVER_FILE, :headers => true) do |row| + work = Work.new + work.category = row['category'] + work.title = row['title'] + work.creator = row['creator'] + work.publication_year = row['publication_year'] + work.description = row['description'] + successful = work.save + if !successful + work_failures << work + puts "Failed to save work: #{work.inspect}" + else + puts "Created work: #{work.inspect}" + end +end + +puts "Added #{Work.count} works records" +puts "#{work_failures.length} works failed to save" \ No newline at end of file diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb new file mode 100644 index 0000000000..7b71ba6b8b --- /dev/null +++ b/test/controllers/works_controller_test.rb @@ -0,0 +1,34 @@ +require "test_helper" + +describe WorksController do + it "should get index" do + get works_index_url + value(response).must_be :success? + end + + it "should get show" do + get works_show_url + value(response).must_be :success? + end + + it "should get update" do + get works_update_url + value(response).must_be :success? + end + + it "should get create" do + get works_create_url + value(response).must_be :success? + end + + it "should get new" do + get works_new_url + value(response).must_be :success? + end + + it "should get destroy" do + get works_destroy_url + value(response).must_be :success? + end + +end From a1497f2f7092784d4850d2cb1bcec0ae5fa17fa9 Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Mon, 8 Oct 2018 15:07:50 -0700 Subject: [PATCH 03/48] tried generate scaffold for Work --- app/assets/stylesheets/scaffolds.scss | 84 +++++++++++++++++++++++ app/assets/stylesheets/works.scss | 2 +- app/controllers/works_controller.rb | 59 +++++++++++++++- app/models/work.rb | 2 + app/views/works/_form.html.erb | 42 ++++++++++++ app/views/works/_work.json.jbuilder | 2 + app/views/works/edit.html.erb | 6 ++ app/views/works/index.html.erb | 37 +++++++++- app/views/works/index.json.jbuilder | 1 + app/views/works/new.html.erb | 7 +- app/views/works/show.html.erb | 31 ++++++++- app/views/works/show.json.jbuilder | 1 + config/routes.rb | 1 + db/migrate/20181008220609_create_works.rb | 13 ++++ test/controllers/works_controller_test.rb | 40 +++++++---- test/fixtures/works.yml | 15 ++++ test/models/work_test.rb | 9 +++ 17 files changed, 329 insertions(+), 23 deletions(-) create mode 100644 app/assets/stylesheets/scaffolds.scss create mode 100644 app/models/work.rb create mode 100644 app/views/works/_form.html.erb create mode 100644 app/views/works/_work.json.jbuilder create mode 100644 app/views/works/edit.html.erb create mode 100644 app/views/works/index.json.jbuilder create mode 100644 app/views/works/show.json.jbuilder create mode 100644 db/migrate/20181008220609_create_works.rb create mode 100644 test/fixtures/works.yml create mode 100644 test/models/work_test.rb diff --git a/app/assets/stylesheets/scaffolds.scss b/app/assets/stylesheets/scaffolds.scss new file mode 100644 index 0000000000..6045188032 --- /dev/null +++ b/app/assets/stylesheets/scaffolds.scss @@ -0,0 +1,84 @@ +body { + background-color: #fff; + color: #333; + margin: 33px; + font-family: verdana, arial, helvetica, sans-serif; + font-size: 13px; + line-height: 18px; +} + +p, ol, ul, td { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 13px; + line-height: 18px; +} + +pre { + background-color: #eee; + padding: 10px; + font-size: 11px; +} + +a { + color: #000; + + &:visited { + color: #666; + } + + &:hover { + color: #fff; + background-color: #000; + } +} + +th { + padding-bottom: 5px; +} + +td { + padding: 0 5px 7px; +} + +div { + &.field, &.actions { + margin-bottom: 10px; + } +} + +#notice { + color: green; +} + +.field_with_errors { + padding: 2px; + background-color: red; + display: table; +} + +#error_explanation { + width: 450px; + border: 2px solid red; + padding: 7px 7px 0; + margin-bottom: 20px; + background-color: #f0f0f0; + + h2 { + text-align: left; + font-weight: bold; + padding: 5px 5px 5px 15px; + font-size: 12px; + margin: -7px -7px 0; + background-color: #c00; + color: #fff; + } + + ul li { + font-size: 12px; + list-style: square; + } +} + +label { + display: block; +} diff --git a/app/assets/stylesheets/works.scss b/app/assets/stylesheets/works.scss index 5618452f3e..8c84be8c43 100644 --- a/app/assets/stylesheets/works.scss +++ b/app/assets/stylesheets/works.scss @@ -1,3 +1,3 @@ -// Place all the styles related to the Works controller here. +// Place all the styles related to the works controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index e62b82780a..35c418858d 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,19 +1,74 @@ class WorksController < ApplicationController + before_action :set_work, only: [:show, :edit, :update, :destroy] + + # GET /works + # GET /works.json def index + @works = Work.all end + # GET /works/1 + # GET /works/1.json def show end - def update + # GET /works/new + def new + @work = Work.new + end + + # GET /works/1/edit + def edit end + # POST /works + # POST /works.json def create + @work = Work.new(work_params) + + respond_to do |format| + if @work.save + format.html { redirect_to @work, notice: 'Work was successfully created.' } + format.json { render :show, status: :created, location: @work } + else + format.html { render :new } + format.json { render json: @work.errors, status: :unprocessable_entity } + end + end end - def new + # PATCH/PUT /works/1 + # PATCH/PUT /works/1.json + def update + respond_to do |format| + if @work.update(work_params) + format.html { redirect_to @work, notice: 'Work was successfully updated.' } + format.json { render :show, status: :ok, location: @work } + else + format.html { render :edit } + format.json { render json: @work.errors, status: :unprocessable_entity } + end + end end + # DELETE /works/1 + # DELETE /works/1.json def destroy + @work.destroy + respond_to do |format| + format.html { redirect_to works_url, notice: 'Work was successfully destroyed.' } + format.json { head :no_content } + end end + + private + # Use callbacks to share common setup or constraints between actions. + def set_work + @work = Work.find(params[:id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def work_params + params.require(:work).permit(:title, :creator, :description, :category, :publication_year) + end end diff --git a/app/models/work.rb b/app/models/work.rb new file mode 100644 index 0000000000..95322dd45e --- /dev/null +++ b/app/models/work.rb @@ -0,0 +1,2 @@ +class Work < ApplicationRecord +end diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb new file mode 100644 index 0000000000..720f46bdcb --- /dev/null +++ b/app/views/works/_form.html.erb @@ -0,0 +1,42 @@ +<%= form_with(model: work, local: true) do |form| %> + <% if work.errors.any? %> +
+

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

+ +
    + <% work.errors.full_messages.each do |message| %> +
  • <%= message %>
    • + <% end %> +
+
+ <% end %> + +
+ <%= form.label :title %> + <%= form.text_field :title %> +
+ +
+ <%= form.label :creator %> + <%= form.text_field :creator %> +
+ +
+ <%= form.label :description %> + <%= form.text_field :description %> +
+ +
+ <%= form.label :category %> + <%= form.text_field :category %> +
+ +
+ <%= form.label :publication_year %> + <%= form.date_select :publication_year %> +
+ +
+ <%= form.submit %> +
+<% end %> diff --git a/app/views/works/_work.json.jbuilder b/app/views/works/_work.json.jbuilder new file mode 100644 index 0000000000..ba76d0b964 --- /dev/null +++ b/app/views/works/_work.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! work, :id, :title, :creator, :description, :category, :publication_year, :created_at, :updated_at +json.url work_url(work, format: :json) diff --git a/app/views/works/edit.html.erb b/app/views/works/edit.html.erb new file mode 100644 index 0000000000..a89fa88f51 --- /dev/null +++ b/app/views/works/edit.html.erb @@ -0,0 +1,6 @@ +

Editing Work

+ +<%= render 'form', work: @work %> + +<%= link_to 'Show', @work %> | +<%= link_to 'Back', works_path %> diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index e519642270..77030bc402 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1,2 +1,35 @@ -

Works#index

-

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

+

<%= notice %>

+ +

Works

+ + + + + + + + + + + + + + + <% @works.each do |work| %> + + + + + + + + + + + <% end %> + +
TitleCreatorDescriptionCategoryPublication year
<%= work.title %><%= work.creator %><%= work.description %><%= work.category %><%= work.publication_year %><%= link_to 'Show', work %><%= link_to 'Edit', edit_work_path(work) %><%= link_to 'Destroy', work, method: :delete, data: { confirm: 'Are you sure?' } %>
+ +
+ +<%= link_to 'New Work', new_work_path %> diff --git a/app/views/works/index.json.jbuilder b/app/views/works/index.json.jbuilder new file mode 100644 index 0000000000..d03359bd40 --- /dev/null +++ b/app/views/works/index.json.jbuilder @@ -0,0 +1 @@ +json.array! @works, partial: 'works/work', as: :work diff --git a/app/views/works/new.html.erb b/app/views/works/new.html.erb index fad0dfea61..d1c85f7def 100644 --- a/app/views/works/new.html.erb +++ b/app/views/works/new.html.erb @@ -1,2 +1,5 @@ -

Works#new

-

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

+

New Work

+ +<%= render 'form', work: @work %> + +<%= link_to 'Back', works_path %> diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index c096804302..45419f25ce 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -1,2 +1,29 @@ -

Works#show

-

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

+

<%= notice %>

+ +

+ Title: + <%= @work.title %> +

+ +

+ Creator: + <%= @work.creator %> +

+ +

+ Description: + <%= @work.description %> +

+ +

+ Category: + <%= @work.category %> +

+ +

+ Publication year: + <%= @work.publication_year %> +

+ +<%= link_to 'Edit', edit_work_path(@work) %> | +<%= link_to 'Back', works_path %> diff --git a/app/views/works/show.json.jbuilder b/app/views/works/show.json.jbuilder new file mode 100644 index 0000000000..32d502be3e --- /dev/null +++ b/app/views/works/show.json.jbuilder @@ -0,0 +1 @@ +json.partial! "works/work", work: @work diff --git a/config/routes.rb b/config/routes.rb index fb01da27d2..88896fda3a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,5 @@ Rails.application.routes.draw do + resources :works get 'works/index' get 'works/show' get 'works/update' diff --git a/db/migrate/20181008220609_create_works.rb b/db/migrate/20181008220609_create_works.rb new file mode 100644 index 0000000000..9957f66382 --- /dev/null +++ b/db/migrate/20181008220609_create_works.rb @@ -0,0 +1,13 @@ +class CreateWorks < ActiveRecord::Migration[5.2] + def change + create_table :works do |t| + t.string :title + t.string :creator + t.string :description + t.string :category + t.date :publication_year + + t.timestamps + end + end +end diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index 7b71ba6b8b..c2e2dc55e9 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -1,34 +1,46 @@ require "test_helper" describe WorksController do - it "should get index" do - get works_index_url + let(:work) { works :one } + + it "gets index" do + get works_url value(response).must_be :success? end - it "should get show" do - get works_show_url + it "gets new" do + get new_work_url value(response).must_be :success? end - it "should get update" do - get works_update_url - value(response).must_be :success? + it "creates work" do + expect { + post works_url, params: { work: { category: work.category, creator: work.creator, description: work.description, publication_year: work.publication_year, title: work.title } } + }.must_change "Work.count" + + must_redirect_to work_path(Work.last) end - it "should get create" do - get works_create_url + it "shows work" do + get work_url(work) value(response).must_be :success? end - it "should get new" do - get works_new_url + it "gets edit" do + get edit_work_url(work) value(response).must_be :success? end - it "should get destroy" do - get works_destroy_url - value(response).must_be :success? + it "updates work" do + patch work_url(work), params: { work: { category: work.category, creator: work.creator, description: work.description, publication_year: work.publication_year, title: work.title } } + must_redirect_to work_path(work) end + it "destroys work" do + expect { + delete work_url(work) + }.must_change "Work.count", -1 + + must_redirect_to works_path + end end diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml new file mode 100644 index 0000000000..6311b8c770 --- /dev/null +++ b/test/fixtures/works.yml @@ -0,0 +1,15 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + creator: MyString + description: MyString + category: MyString + publication_year: 2018-10-08 + +two: + title: MyString + creator: MyString + description: MyString + category: MyString + publication_year: 2018-10-08 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 ed315c89a7362cd3d66e9d8be8bedc28e9213b90 Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Mon, 8 Oct 2018 16:00:06 -0700 Subject: [PATCH 04/48] created seeds.rb and seeded db --- app/controllers/works_controller.rb | 7 ++----- db/schema.rb | 28 ++++++++++++++++++++++++++++ db/seeds.rb | 9 +++++---- 3 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 db/schema.rb diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 35c418858d..35bc88cc56 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -2,13 +2,11 @@ class WorksController < ApplicationController before_action :set_work, only: [:show, :edit, :update, :destroy] # GET /works - # GET /works.json def index @works = Work.all end # GET /works/1 - # GET /works/1.json def show end @@ -22,7 +20,7 @@ def edit end # POST /works - # POST /works.json + def create @work = Work.new(work_params) @@ -38,7 +36,7 @@ def create end # PATCH/PUT /works/1 - # PATCH/PUT /works/1.json + def update respond_to do |format| if @work.update(work_params) @@ -52,7 +50,6 @@ def update end # DELETE /works/1 - # DELETE /works/1.json def destroy @work.destroy respond_to do |format| diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000000..2e50c6034b --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,28 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2018_10_08_220609) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "works", force: :cascade do |t| + t.string "title" + t.string "creator" + t.string "description" + t.string "category" + t.date "publication_year" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/db/seeds.rb b/db/seeds.rb index 6dca154957..a12e54a84d 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -7,16 +7,17 @@ # Character.create(name: 'Luke', movie: movies.first) require 'csv' # create join path to get to media seed file -MEDIA_FILE = Rails.root.join('db', 'media_seeds.csv') -puts "Loading raw seed data from #{MEDIA_FILE}" +WORK_FILE = Rails.root.join('db', 'media_seeds.csv') +puts "Loading raw seed data from #{WORK_FILE}" work_failures = [] -CSV.foreach(DRIVER_FILE, :headers => true) do |row| +CSV.foreach(WORK_FILE, :headers => true) do |row| work = Work.new work.category = row['category'] work.title = row['title'] work.creator = row['creator'] - work.publication_year = row['publication_year'] + # handle year only in view strftime(%Y) + work.publication_year = Date.strptime(row['publication_year'], '%Y') work.description = row['description'] successful = work.save if !successful From e3fc991bfe3cf2bff25fcb4e381af8be95123188 Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Mon, 8 Oct 2018 17:14:00 -0700 Subject: [PATCH 05/48] work model validations and tests --- app/assets/images/{owl.jpg => favicon.ico} | Bin app/controllers/works_controller.rb | 14 ---------- app/models/work.rb | 7 +++++ app/views/layouts/application.html.erb | 3 ++ app/views/works/_form.html.erb | 3 +- app/views/works/_work.json.jbuilder | 2 -- app/views/works/index.json.jbuilder | 1 - app/views/works/show.json.jbuilder | 1 - config/routes.rb | 1 + test/fixtures/works.yml | 24 ++++++++-------- test/models/work_test.rb | 31 ++++++++++++++++++++- test/test_helper.rb | 3 +- 12 files changed, 57 insertions(+), 33 deletions(-) rename app/assets/images/{owl.jpg => favicon.ico} (100%) delete mode 100644 app/views/works/_work.json.jbuilder delete mode 100644 app/views/works/index.json.jbuilder delete mode 100644 app/views/works/show.json.jbuilder diff --git a/app/assets/images/owl.jpg b/app/assets/images/favicon.ico similarity index 100% rename from app/assets/images/owl.jpg rename to app/assets/images/favicon.ico diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 35bc88cc56..f7815e0c54 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,60 +1,46 @@ class WorksController < ApplicationController before_action :set_work, only: [:show, :edit, :update, :destroy] - # GET /works def index @works = Work.all end - # GET /works/1 def show end - # GET /works/new def new @work = Work.new end - # GET /works/1/edit def edit end - # POST /works - def create @work = Work.new(work_params) respond_to do |format| if @work.save format.html { redirect_to @work, notice: 'Work was successfully created.' } - format.json { render :show, status: :created, location: @work } else format.html { render :new } - format.json { render json: @work.errors, status: :unprocessable_entity } end end end - # PATCH/PUT /works/1 - def update respond_to do |format| if @work.update(work_params) format.html { redirect_to @work, notice: 'Work was successfully updated.' } - format.json { render :show, status: :ok, location: @work } else format.html { render :edit } - format.json { render json: @work.errors, status: :unprocessable_entity } end end end - # DELETE /works/1 def destroy @work.destroy respond_to do |format| format.html { redirect_to works_url, notice: 'Work was successfully destroyed.' } - format.json { head :no_content } end end diff --git a/app/models/work.rb b/app/models/work.rb index 95322dd45e..ebad398656 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,2 +1,9 @@ class Work < ApplicationRecord + # relationships + + # validation + validates :creator, :publication_year, :title, :category, presence: true + validates :title, length: { in: 1..200 } + validates :title, uniqueness: true + end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f32268a271..c6be06e7eb 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,7 +1,10 @@ + + MediaRanker + <%= csrf_meta_tags %> <%= csp_meta_tag %> diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb index 720f46bdcb..e3d9a9ba8a 100644 --- a/app/views/works/_form.html.erb +++ b/app/views/works/_form.html.erb @@ -33,7 +33,8 @@
<%= form.label :publication_year %> - <%= form.date_select :publication_year %> + <%# form.select_year :publication_year, (Time.zone.now.year - 100)..(Time.zone.now.year + 1) %> + <%= form.text_field :publication_year %>
diff --git a/app/views/works/_work.json.jbuilder b/app/views/works/_work.json.jbuilder deleted file mode 100644 index ba76d0b964..0000000000 --- a/app/views/works/_work.json.jbuilder +++ /dev/null @@ -1,2 +0,0 @@ -json.extract! work, :id, :title, :creator, :description, :category, :publication_year, :created_at, :updated_at -json.url work_url(work, format: :json) diff --git a/app/views/works/index.json.jbuilder b/app/views/works/index.json.jbuilder deleted file mode 100644 index d03359bd40..0000000000 --- a/app/views/works/index.json.jbuilder +++ /dev/null @@ -1 +0,0 @@ -json.array! @works, partial: 'works/work', as: :work diff --git a/app/views/works/show.json.jbuilder b/app/views/works/show.json.jbuilder deleted file mode 100644 index 32d502be3e..0000000000 --- a/app/views/works/show.json.jbuilder +++ /dev/null @@ -1 +0,0 @@ -json.partial! "works/work", work: @work diff --git a/config/routes.rb b/config/routes.rb index 88896fda3a..b15818b424 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,5 @@ Rails.application.routes.draw do + root "works#index" resources :works get 'works/index' get 'works/show' diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index 6311b8c770..575d70a2d4 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -1,15 +1,15 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - title: MyString - creator: MyString - description: MyString - category: MyString - publication_year: 2018-10-08 +cookies: + title: Batches 'n' Cookies + creator: Lizzo + description: music video by Lizzo feat. Sophia Eris + category: video + publication_year: 2013-10-08 -two: - title: MyString - creator: MyString - description: MyString - category: MyString - publication_year: 2018-10-08 +fitness: + title: Fitness + creator: Lizzo + description: I been workin on my fitness + category: music + publication_year: 2017-10-08 diff --git a/test/models/work_test.rb b/test/models/work_test.rb index f6fba7104d..cd0cbb778e 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -1,9 +1,38 @@ require "test_helper" describe Work do - let(:work) { Work.new } + let(:work) { works :cookies } it "must be valid" do value(work).must_be :valid? end + + describe 'validations' do + it 'must have a title' do + work.title = nil + # validations .valid? will run all validations + valid = work.valid? + # assert + expect(valid).must_equal false + expect(work.errors.messages).must_include :title + end + it 'must have a creator' do + work.creator = nil + valid = work.valid? + expect(valid).must_equal false + expect(work.errors.messages).must_include :creator + end + it 'must have a publication year' do + work.publication_year = nil + valid = work.valid? + expect(valid).must_equal false + expect(work.errors.messages).must_include :publication_year + end + it 'must have a category' do + work.category = nil + valid = work.valid? + expect(valid).must_equal false + expect(work.errors.messages).must_include :category + end + end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b5172a7d6..fb7dd505e2 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,8 @@ ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" -require "minitest/rails"require "minitest/reporters" # for Colorized output +require "minitest/rails" +require "minitest/reporters" # for Colorized output # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, From 42af3db109632fb280181dcddfda418fe7b1f7d5 Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Mon, 8 Oct 2018 22:12:36 -0700 Subject: [PATCH 06/48] added guard and minitest gems --- app/views/works/_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb index e3d9a9ba8a..1c64c7938b 100644 --- a/app/views/works/_form.html.erb +++ b/app/views/works/_form.html.erb @@ -34,7 +34,7 @@
<%= form.label :publication_year %> <%# form.select_year :publication_year, (Time.zone.now.year - 100)..(Time.zone.now.year + 1) %> - <%= form.text_field :publication_year %> + <%= form.select_year(Date.today, start_year: 2018, end_year: 1900) %>
From 47c30f0b01c73cb82db3987f8582a0a9e3f05ba4 Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Mon, 8 Oct 2018 22:50:06 -0700 Subject: [PATCH 07/48] added set default form_with --- app/views/works/_form.html.erb | 6 +++--- config/initializers/action_view.rb | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 config/initializers/action_view.rb diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb index 1c64c7938b..ea67e95ab4 100644 --- a/app/views/works/_form.html.erb +++ b/app/views/works/_form.html.erb @@ -4,8 +4,8 @@

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

    - <% work.errors.full_messages.each do |message| %> -
  • <%= message %>
    • + <% work.errors.full_messages.each do |msg| %> +
  • <%= msg %>
    • <% end %>
@@ -34,7 +34,7 @@
<%= form.label :publication_year %> <%# form.select_year :publication_year, (Time.zone.now.year - 100)..(Time.zone.now.year + 1) %> - <%= form.select_year(Date.today, start_year: 2018, end_year: 1900) %> + <%= form.text_field :publication_year, value: work.publication_year.strftime('%Y') %>
diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 0000000000..9fe3b69749 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false \ No newline at end of file From 93075950c623da1752669297d56363d52ab29018 Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Tue, 9 Oct 2018 10:37:33 -0700 Subject: [PATCH 08/48] added some flash verification for create work --- app/controllers/works_controller.rb | 5 +++++ app/views/layouts/application.html.erb | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index f7815e0c54..13cf8a6303 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -20,8 +20,13 @@ def create respond_to do |format| if @work.save + flash[:success] = 'Work successfully created' format.html { redirect_to @work, notice: 'Work was successfully created.' } else + flash.now[:error] = 'Work not created!' + @work.errors.messages.each do |field, messages| + flash.now[field] = messages + end format.html { render :new } end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index c6be06e7eb..92f556550d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -13,6 +13,13 @@ +
+
+ <% flash.each do |name, message| %> +
<%= message %>
+ <% end %> +
+
<%= yield %> From 4b34d9ac87c16212504ef8e874d0903ecebaa928 Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Tue, 9 Oct 2018 10:44:31 -0700 Subject: [PATCH 09/48] session controller created --- app/assets/javascripts/sessions.js | 2 ++ app/assets/stylesheets/sessions.scss | 3 +++ app/controllers/sessions_controller.rb | 11 +++++++++++ app/helpers/sessions_helper.rb | 2 ++ app/views/sessions/destroy.html.erb | 2 ++ app/views/sessions/login.html.erb | 2 ++ app/views/sessions/new.html.erb | 4 ++++ config/routes.rb | 5 +++++ test/controllers/sessions_controller_test.rb | 19 +++++++++++++++++++ 9 files changed, 50 insertions(+) create mode 100644 app/assets/javascripts/sessions.js create mode 100644 app/assets/stylesheets/sessions.scss create mode 100644 app/controllers/sessions_controller.rb create mode 100644 app/helpers/sessions_helper.rb create mode 100644 app/views/sessions/destroy.html.erb create mode 100644 app/views/sessions/login.html.erb create mode 100644 app/views/sessions/new.html.erb create mode 100644 test/controllers/sessions_controller_test.rb diff --git a/app/assets/javascripts/sessions.js b/app/assets/javascripts/sessions.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/sessions.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/sessions.scss b/app/assets/stylesheets/sessions.scss new file mode 100644 index 0000000000..ccb1ed25b2 --- /dev/null +++ b/app/assets/stylesheets/sessions.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Sessions controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb new file mode 100644 index 0000000000..782b2a1af2 --- /dev/null +++ b/app/controllers/sessions_controller.rb @@ -0,0 +1,11 @@ +class SessionsController < ApplicationController + def login + end + + def new + @user = User.new + end + + def destroy + 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/destroy.html.erb b/app/views/sessions/destroy.html.erb new file mode 100644 index 0000000000..d75237d982 --- /dev/null +++ b/app/views/sessions/destroy.html.erb @@ -0,0 +1,2 @@ +

Sessions#destroy

+

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

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

Sessions#login

+

Find me in app/views/sessions/login.html.erb

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

Please Login

+ +<%= form_with model: @user, url: login_path, method: :post do |form| %> + diff --git a/config/routes.rb b/config/routes.rb index b15818b424..b870015344 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,9 @@ Rails.application.routes.draw do + # create session for user login + post 'sessions/login', to: 'sessions#login', as: 'login' + get 'sessions/login' + get 'sessions/new', to: 'sessions#new', as: 'new_session' + get 'sessions/destroy', to: 'sessions#destroy', as: 'logout' root "works#index" resources :works get 'works/index' diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb new file mode 100644 index 0000000000..1516a4a7c1 --- /dev/null +++ b/test/controllers/sessions_controller_test.rb @@ -0,0 +1,19 @@ +require "test_helper" + +describe SessionsController do + it "should get login" do + get sessions_login_url + value(response).must_be :success? + end + + it "should get new" do + get sessions_new_url + value(response).must_be :success? + end + + it "should get destroy" do + get sessions_destroy_url + value(response).must_be :success? + end + +end From bef2d6334a4d418a31b21a65a6250e40014ce8d1 Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Tue, 9 Oct 2018 11:26:42 -0700 Subject: [PATCH 10/48] session routes and actions created --- app/assets/javascripts/users.js | 2 + app/assets/stylesheets/users.scss | 3 ++ app/controllers/sessions_controller.rb | 19 +++++++ app/controllers/users_controller.rb | 66 +++++++++++++++++++++++ app/helpers/users_helper.rb | 2 + app/models/user.rb | 2 + app/views/layouts/application.html.erb | 15 +++++- app/views/sessions/new.html.erb | 4 +- app/views/users/_form.html.erb | 22 ++++++++ app/views/users/_user.json.jbuilder | 2 + app/views/users/edit.html.erb | 6 +++ app/views/users/index.html.erb | 27 ++++++++++ app/views/users/index.json.jbuilder | 1 + app/views/users/new.html.erb | 5 ++ app/views/users/show.html.erb | 9 ++++ app/views/users/show.json.jbuilder | 1 + config/routes.rb | 21 ++++---- db/migrate/20181009174856_create_users.rb | 9 ++++ test/controllers/users_controller_test.rb | 46 ++++++++++++++++ test/fixtures/users.yml | 7 +++ test/models/user_test.rb | 9 ++++ 21 files changed, 267 insertions(+), 11 deletions(-) create mode 100644 app/assets/javascripts/users.js create mode 100644 app/assets/stylesheets/users.scss create mode 100644 app/controllers/users_controller.rb create mode 100644 app/helpers/users_helper.rb create mode 100644 app/models/user.rb create mode 100644 app/views/users/_form.html.erb create mode 100644 app/views/users/_user.json.jbuilder create mode 100644 app/views/users/edit.html.erb create mode 100644 app/views/users/index.html.erb create mode 100644 app/views/users/index.json.jbuilder create mode 100644 app/views/users/new.html.erb create mode 100644 app/views/users/show.html.erb create mode 100644 app/views/users/show.json.jbuilder create mode 100644 db/migrate/20181009174856_create_users.rb create mode 100644 test/controllers/users_controller_test.rb create mode 100644 test/fixtures/users.yml create mode 100644 test/models/user_test.rb diff --git a/app/assets/javascripts/users.js b/app/assets/javascripts/users.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/users.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/users.scss b/app/assets/stylesheets/users.scss new file mode 100644 index 0000000000..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/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 782b2a1af2..f478f655aa 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,5 +1,18 @@ class SessionsController < ApplicationController def login + user = User.find_by(name: params[:user][:name]) + + if user.nil? + # create a new user + user= User.create(name: params[:user][:name]) + else + # login existing user + end + # store user id for session + session[:user_id] = user.id + flash[:success] = "Welcome #{user.name}!" + redirect_to root_path + end def new @@ -7,5 +20,11 @@ def new end def destroy + # wipe the user id for the session + session[:user_id] = nil + # flash msg to user confirming logout + flash[:success] = 'Goodbye' + # go back to prev page or use fallback location to root + redirect_back fallback_location: root_path end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb new file mode 100644 index 0000000000..f4013e3514 --- /dev/null +++ b/app/controllers/users_controller.rb @@ -0,0 +1,66 @@ +class UsersController < ApplicationController + before_action :set_user, only: [:show, :edit, :update, :destroy] + + def index + @current_user = User.find_by(id: session[:user_id]) + + @users = User.all + end + + + def show + end + + + def new + @user = User.new + end + + def edit + end + + def create + @user = User.new(user_params) + + respond_to do |format| + if @user.save + format.html { redirect_to @user, notice: 'User was successfully created.' } + format.json { render :show, status: :created, location: @user } + else + format.html { render :new } + format.json { render json: @user.errors, status: :unprocessable_entity } + end + end + end + + def update + respond_to do |format| + if @user.update(user_params) + format.html { redirect_to @user, notice: 'User was successfully updated.' } + format.json { render :show, status: :ok, location: @user } + else + format.html { render :edit } + format.json { render json: @user.errors, status: :unprocessable_entity } + end + end + end + + def destroy + @user.destroy + respond_to do |format| + format.html { redirect_to users_url, notice: 'User was successfully destroyed.' } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_user + @user = User.find(params[:id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def user_params + params.require(:user).permit(:name) + end +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/models/user.rb b/app/models/user.rb new file mode 100644 index 0000000000..379658a509 --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,2 @@ +class User < ApplicationRecord +end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 92f556550d..47735fcc6c 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -16,9 +16,22 @@
<% flash.each do |name, message| %> -
<%= message %>
+
+ <%= message %>
+ <% end %> + + <% if @current_user %> +

Logged in as: <%= @current_user.name %>

<% end %>
+
<%= yield %> diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index 2d2bbf6197..b6fbbf81e7 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -1,4 +1,6 @@

Please Login

<%= form_with model: @user, url: login_path, method: :post do |form| %> - +<%= form.label :name, 'Username'%> +<%= form.text_field :name, placeholder: 'username' %> +<%= form.submit 'Login' %> diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb new file mode 100644 index 0000000000..60869930b7 --- /dev/null +++ b/app/views/users/_form.html.erb @@ -0,0 +1,22 @@ +<%= form_with(model: user, local: true) do |form| %> + <% if user.errors.any? %> +
+

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

+ +
    + <% user.errors.full_messages.each do |message| %> +
  • <%= message %>
    • + <% end %> +
+
+ <% end %> + +
+ <%= form.label :name %> + <%= form.text_field :name %> +
+ +
+ <%= form.submit %> +
+<% end %> diff --git a/app/views/users/_user.json.jbuilder b/app/views/users/_user.json.jbuilder new file mode 100644 index 0000000000..df793f1e08 --- /dev/null +++ b/app/views/users/_user.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! user, :id, :name, :created_at, :updated_at +json.url user_url(user, format: :json) diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb new file mode 100644 index 0000000000..1a5c2a64f0 --- /dev/null +++ b/app/views/users/edit.html.erb @@ -0,0 +1,6 @@ +

Editing User

+ +<%= render 'form', user: @user %> + +<%= link_to 'Show', @user %> | +<%= link_to 'Back', users_path %> diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb new file mode 100644 index 0000000000..ac0b9c6569 --- /dev/null +++ b/app/views/users/index.html.erb @@ -0,0 +1,27 @@ +

<%= notice %>

+ +

Users

+ + + + + + + + + + + <% @users.each do |user| %> + + + + + + + <% end %> + +
Name
<%= user.name %><%= link_to 'Show', user %><%= link_to 'Edit', edit_user_path(user) %><%= link_to 'Destroy', user, method: :delete, data: { confirm: 'Are you sure?' } %>
+ +
+ +<%= link_to 'New User', new_user_path %> diff --git a/app/views/users/index.json.jbuilder b/app/views/users/index.json.jbuilder new file mode 100644 index 0000000000..2faf5af047 --- /dev/null +++ b/app/views/users/index.json.jbuilder @@ -0,0 +1 @@ +json.array! @users, partial: 'users/user', as: :user diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb new file mode 100644 index 0000000000..844c39b14d --- /dev/null +++ b/app/views/users/new.html.erb @@ -0,0 +1,5 @@ +

New User

+ +<%= render 'form', user: @user %> + +<%= link_to 'Back', users_path %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb new file mode 100644 index 0000000000..3f5c2a29db --- /dev/null +++ b/app/views/users/show.html.erb @@ -0,0 +1,9 @@ +

<%= notice %>

+ +

+ Name: + <%= @user.name %> +

+ +<%= link_to 'Edit', edit_user_path(@user) %> | +<%= link_to 'Back', users_path %> diff --git a/app/views/users/show.json.jbuilder b/app/views/users/show.json.jbuilder new file mode 100644 index 0000000000..ff40bb9607 --- /dev/null +++ b/app/views/users/show.json.jbuilder @@ -0,0 +1 @@ +json.partial! "users/user", user: @user diff --git a/config/routes.rb b/config/routes.rb index b870015344..4680ab97fa 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,16 +1,19 @@ Rails.application.routes.draw do + root "works#index" + + resources :users # create session for user login post 'sessions/login', to: 'sessions#login', as: 'login' - get 'sessions/login' - get 'sessions/new', to: 'sessions#new', as: 'new_session' + # route to sessions new with login form + get 'sessions/login', to: 'sessions#new' get 'sessions/destroy', to: 'sessions#destroy', as: 'logout' - root "works#index" + resources :works - get 'works/index' - get 'works/show' - get 'works/update' - get 'works/create' - get 'works/new' - get 'works/destroy' + # get 'works/index' + # get 'works/show' + # get 'works/update' + # get 'works/create' + # get 'works/new' + # get 'works/destroy' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/db/migrate/20181009174856_create_users.rb b/db/migrate/20181009174856_create_users.rb new file mode 100644 index 0000000000..ad388a5465 --- /dev/null +++ b/db/migrate/20181009174856_create_users.rb @@ -0,0 +1,9 @@ +class CreateUsers < ActiveRecord::Migration[5.2] + def change + create_table :users do |t| + t.string :name + + t.timestamps + end + end +end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb new file mode 100644 index 0000000000..e77006ad01 --- /dev/null +++ b/test/controllers/users_controller_test.rb @@ -0,0 +1,46 @@ +require "test_helper" + +describe UsersController do + let(:user) { users :one } + + it "gets index" do + get users_url + value(response).must_be :success? + end + + it "gets new" do + get new_user_url + value(response).must_be :success? + end + + it "creates user" do + expect { + post users_url, params: { user: { name: user.name } } + }.must_change "User.count" + + must_redirect_to user_path(User.last) + end + + it "shows user" do + get user_url(user) + value(response).must_be :success? + end + + it "gets edit" do + get edit_user_url(user) + value(response).must_be :success? + end + + it "updates user" do + patch user_url(user), params: { user: { name: user.name } } + must_redirect_to user_path(user) + end + + it "destroys user" do + expect { + delete user_url(user) + }.must_change "User.count", -1 + + must_redirect_to users_path + end +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/models/user_test.rb b/test/models/user_test.rb new file mode 100644 index 0000000000..cc862ac2d9 --- /dev/null +++ b/test/models/user_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe User do + let(:user) { User.new } + + it "must be valid" do + value(user).must_be :valid? + end +end From c3d3bb5ce2e1702c8f9dceeea8ebb4dcd722c52a Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Tue, 9 Oct 2018 16:01:20 -0700 Subject: [PATCH 11/48] enabled login logout for user --- app/controllers/sessions_controller.rb | 1 + app/controllers/users_controller.rb | 6 +--- app/views/layouts/application.html.erb | 39 +++++++++++++++++--------- app/views/sessions/new.html.erb | 7 +++-- app/views/users/_user.json.jbuilder | 2 -- app/views/users/index.json.jbuilder | 1 - app/views/users/show.json.jbuilder | 1 - config/routes.rb | 2 +- db/schema.rb | 8 +++++- 9 files changed, 39 insertions(+), 28 deletions(-) delete mode 100644 app/views/users/_user.json.jbuilder delete mode 100644 app/views/users/index.json.jbuilder delete mode 100644 app/views/users/show.json.jbuilder diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index f478f655aa..f9f0a1758f 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -10,6 +10,7 @@ def login end # store user id for session session[:user_id] = user.id + session[:user_name] = user.name flash[:success] = "Welcome #{user.name}!" redirect_to root_path diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index f4013e3514..6212599cd9 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -9,6 +9,7 @@ def index def show + # call model method to retrieve all votes user has cast end @@ -25,10 +26,8 @@ def create respond_to do |format| if @user.save format.html { redirect_to @user, notice: 'User was successfully created.' } - format.json { render :show, status: :created, location: @user } else format.html { render :new } - format.json { render json: @user.errors, status: :unprocessable_entity } end end end @@ -37,10 +36,8 @@ def update respond_to do |format| if @user.update(user_params) format.html { redirect_to @user, notice: 'User was successfully updated.' } - format.json { render :show, status: :ok, location: @user } else format.html { render :edit } - format.json { render json: @user.errors, status: :unprocessable_entity } end end end @@ -49,7 +46,6 @@ def destroy @user.destroy respond_to do |format| format.html { redirect_to users_url, notice: 'User was successfully destroyed.' } - format.json { head :no_content } end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 47735fcc6c..04f599ca96 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -13,25 +13,36 @@ -
-
- <% flash.each do |name, message| %> -
- <%= message %>
- <% end %> + +
+
+ <% flash.each do |name, message| %> + <% if message.class == Array %> + <% message.each do |msg| %> +
+ <%= "#{name}:" %><%= " #{msg}" %>
+ <% end %> + <% else %> +
+ <%= message %> +
+ <% end %> + <% end %> +
+
<% if @current_user %>

Logged in as: <%= @current_user.name %>

<% end %> -
-
-
<%= yield %> diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index b6fbbf81e7..8c97bb2329 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -1,6 +1,7 @@

Please Login

<%= form_with model: @user, url: login_path, method: :post do |form| %> -<%= form.label :name, 'Username'%> -<%= form.text_field :name, placeholder: 'username' %> -<%= form.submit 'Login' %> + <%= form.label :name, 'Username'%> + <%= form.text_field :name, placeholder: 'username' %> + <%= form.submit 'Login' %> +<% end %> diff --git a/app/views/users/_user.json.jbuilder b/app/views/users/_user.json.jbuilder deleted file mode 100644 index df793f1e08..0000000000 --- a/app/views/users/_user.json.jbuilder +++ /dev/null @@ -1,2 +0,0 @@ -json.extract! user, :id, :name, :created_at, :updated_at -json.url user_url(user, format: :json) diff --git a/app/views/users/index.json.jbuilder b/app/views/users/index.json.jbuilder deleted file mode 100644 index 2faf5af047..0000000000 --- a/app/views/users/index.json.jbuilder +++ /dev/null @@ -1 +0,0 @@ -json.array! @users, partial: 'users/user', as: :user diff --git a/app/views/users/show.json.jbuilder b/app/views/users/show.json.jbuilder deleted file mode 100644 index ff40bb9607..0000000000 --- a/app/views/users/show.json.jbuilder +++ /dev/null @@ -1 +0,0 @@ -json.partial! "users/user", user: @user diff --git a/config/routes.rb b/config/routes.rb index 4680ab97fa..2b662d71db 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,7 +6,7 @@ post 'sessions/login', to: 'sessions#login', as: 'login' # route to sessions new with login form get 'sessions/login', to: 'sessions#new' - get 'sessions/destroy', to: 'sessions#destroy', as: 'logout' + delete 'sessions/destroy', to: 'sessions#destroy', as: 'logout' resources :works # get 'works/index' diff --git a/db/schema.rb b/db/schema.rb index 2e50c6034b..543bfb3e53 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,11 +10,17 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_10_08_220609) do +ActiveRecord::Schema.define(version: 2018_10_09_174856) 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 "works", force: :cascade do |t| t.string "title" t.string "creator" From cba26f7bc6a31360db8074b64d4d1294ca224827 Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Tue, 9 Oct 2018 21:25:46 -0700 Subject: [PATCH 12/48] setup vote relationship model to user and work --- app/models/user.rb | 2 ++ app/models/vote.rb | 4 ++++ app/models/work.rb | 2 ++ db/migrate/20181010035155_create_votes.rb | 10 ++++++++++ db/schema.rb | 13 ++++++++++++- test/fixtures/votes.yml | 9 +++++++++ test/models/vote_test.rb | 9 +++++++++ 7 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 app/models/vote.rb create mode 100644 db/migrate/20181010035155_create_votes.rb create mode 100644 test/fixtures/votes.yml create mode 100644 test/models/vote_test.rb diff --git a/app/models/user.rb b/app/models/user.rb index 379658a509..b1f986dd41 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,2 +1,4 @@ class User < ApplicationRecord + has_many :votes + has_many :works, through: :votes end diff --git a/app/models/vote.rb b/app/models/vote.rb new file mode 100644 index 0000000000..68bda1c814 --- /dev/null +++ b/app/models/vote.rb @@ -0,0 +1,4 @@ +class Vote < ApplicationRecord + belongs_to :work + belongs_to :user +end diff --git a/app/models/work.rb b/app/models/work.rb index ebad398656..26fc6c3004 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,5 +1,7 @@ class Work < ApplicationRecord # relationships + has_many :votes + has_many :users, through: :votes # validation validates :creator, :publication_year, :title, :category, presence: true diff --git a/db/migrate/20181010035155_create_votes.rb b/db/migrate/20181010035155_create_votes.rb new file mode 100644 index 0000000000..5b84adc296 --- /dev/null +++ b/db/migrate/20181010035155_create_votes.rb @@ -0,0 +1,10 @@ +class CreateVotes < ActiveRecord::Migration[5.2] + 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 543bfb3e53..8196d1a1a3 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_10_09_174856) do +ActiveRecord::Schema.define(version: 2018_10_10_035155) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -21,6 +21,15 @@ t.datetime "updated_at", null: false end + create_table "votes", force: :cascade do |t| + t.bigint "user_id" + t.bigint "work_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["user_id"], name: "index_votes_on_user_id" + t.index ["work_id"], name: "index_votes_on_work_id" + end + create_table "works", force: :cascade do |t| t.string "title" t.string "creator" @@ -31,4 +40,6 @@ t.datetime "updated_at", null: false end + add_foreign_key "votes", "users" + add_foreign_key "votes", "works" end 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/models/vote_test.rb b/test/models/vote_test.rb new file mode 100644 index 0000000000..fc15947bd3 --- /dev/null +++ b/test/models/vote_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Vote do + let(:vote) { Vote.new } + + it "must be valid" do + value(vote).must_be :valid? + end +end From dd4ddd9f3e2bbdb9a00e79387ee361159ca030d3 Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Tue, 9 Oct 2018 21:45:33 -0700 Subject: [PATCH 13/48] vote tests --- test/controllers/users_controller_test.rb | 2 +- test/controllers/works_controller_test.rb | 2 +- test/fixtures/users.yml | 11 +++++++---- test/fixtures/votes.yml | 16 ++++++++++------ test/fixtures/works.yml | 9 ++++++++- 5 files changed, 27 insertions(+), 13 deletions(-) diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index e77006ad01..51d7062774 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe UsersController do - let(:user) { users :one } + let(:user) { users :coco } it "gets index" do get users_url diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index c2e2dc55e9..dc88fbf58d 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe WorksController do - let(:work) { works :one } + let(:work) { works :fitness } it "gets index" do get works_url diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 56066c68af..8667cdc239 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -1,7 +1,10 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - name: MyString +ellejohnnie: + name: elle-johnnie -two: - name: MyString +jojo: + name: Jo Jo + +coco: + name: CoCo Dopo diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml index b5db71052e..3266ba3613 100644 --- a/test/fixtures/votes.yml +++ b/test/fixtures/votes.yml @@ -1,9 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - user: one - work: one +vote-one: + user: ellejohnnie + work: cookies -two: - user: two - work: two +vote-two: + user: jojo + work: fitness + +vote-three: + user: coco + work: fitness diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index 575d70a2d4..107e7dee42 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -11,5 +11,12 @@ fitness: title: Fitness creator: Lizzo description: I been workin on my fitness - category: music + category: album publication_year: 2017-10-08 + +i-like-that: + title: I Like That + creator: Janelle Monae + description: sometimes I wanna roll, but wanna stay at home + category: album + publication_year: 2018-02-18 From c20f1a6b735c0e2fbed0e67c2494daacbe20ff88 Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Tue, 9 Oct 2018 22:10:21 -0700 Subject: [PATCH 14/48] changed pub year col to integer, fixed date issues throughout --- app/models/work.rb | 3 +++ app/views/works/_form.html.erb | 2 +- db/migrate/20181010044752_change_date_column.rb | 6 ++++++ db/schema.rb | 4 ++-- db/seeds.rb | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20181010044752_change_date_column.rb diff --git a/app/models/work.rb b/app/models/work.rb index 26fc6c3004..fae580609e 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -7,5 +7,8 @@ class Work < ApplicationRecord validates :creator, :publication_year, :title, :category, presence: true validates :title, length: { in: 1..200 } validates :title, uniqueness: true + # pub year must be number in year range 0 - 2018 + validates :publication_year, numericality: true, inclusion: 0..2018 + end diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb index ea67e95ab4..f6657c1748 100644 --- a/app/views/works/_form.html.erb +++ b/app/views/works/_form.html.erb @@ -34,7 +34,7 @@
<%= form.label :publication_year %> <%# form.select_year :publication_year, (Time.zone.now.year - 100)..(Time.zone.now.year + 1) %> - <%= form.text_field :publication_year, value: work.publication_year.strftime('%Y') %> + <%= form.text_field :publication_year %>
diff --git a/db/migrate/20181010044752_change_date_column.rb b/db/migrate/20181010044752_change_date_column.rb new file mode 100644 index 0000000000..3d60b24b3f --- /dev/null +++ b/db/migrate/20181010044752_change_date_column.rb @@ -0,0 +1,6 @@ +class ChangeDateColumn < ActiveRecord::Migration[5.2] + def change + remove_column :works, :publication_year + add_column :works, :publication_year, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 8196d1a1a3..27e0f8b3bb 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_10_10_035155) do +ActiveRecord::Schema.define(version: 2018_10_10_044752) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -35,9 +35,9 @@ t.string "creator" t.string "description" t.string "category" - t.date "publication_year" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "publication_year" end add_foreign_key "votes", "users" diff --git a/db/seeds.rb b/db/seeds.rb index a12e54a84d..5daa85574a 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -17,7 +17,7 @@ work.title = row['title'] work.creator = row['creator'] # handle year only in view strftime(%Y) - work.publication_year = Date.strptime(row['publication_year'], '%Y') + work.publication_year = row['publication_year'].to_i work.description = row['description'] successful = work.save if !successful From af00348c070594248469af6aeb4eb198a229e7a4 Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Tue, 9 Oct 2018 22:18:04 -0700 Subject: [PATCH 15/48] testing --- test/fixtures/works.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index 107e7dee42..546683d98f 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -5,18 +5,18 @@ cookies: creator: Lizzo description: music video by Lizzo feat. Sophia Eris category: video - publication_year: 2013-10-08 + publication_year: 2013 fitness: title: Fitness creator: Lizzo description: I been workin on my fitness category: album - publication_year: 2017-10-08 + publication_year: 2017 i-like-that: title: I Like That creator: Janelle Monae description: sometimes I wanna roll, but wanna stay at home category: album - publication_year: 2018-02-18 + publication_year: 2018 From 0393dd1cb3111b622631ef30b359c0ac6dd39d26 Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Tue, 9 Oct 2018 22:30:50 -0700 Subject: [PATCH 16/48] votes controller added --- app/assets/javascripts/votes.js | 2 + app/assets/stylesheets/votes.scss | 3 ++ app/controllers/votes_controller.rb | 48 +++++++++++++++++++++++ app/helpers/votes_helper.rb | 2 + app/views/votes/create.html.erb | 2 + app/views/votes/destroy.html.erb | 2 + app/views/votes/index.html.erb | 2 + app/views/votes/new.html.erb | 2 + app/views/votes/show.html.erb | 2 + app/views/votes/upvote.html.erb | 2 + config/routes.rb | 8 +--- test/controllers/votes_controller_test.rb | 34 ++++++++++++++++ test/fixtures/works.yml | 6 +-- 13 files changed, 106 insertions(+), 9 deletions(-) create mode 100644 app/assets/javascripts/votes.js create mode 100644 app/assets/stylesheets/votes.scss create mode 100644 app/controllers/votes_controller.rb create mode 100644 app/helpers/votes_helper.rb create mode 100644 app/views/votes/create.html.erb create mode 100644 app/views/votes/destroy.html.erb create mode 100644 app/views/votes/index.html.erb create mode 100644 app/views/votes/new.html.erb create mode 100644 app/views/votes/show.html.erb create mode 100644 app/views/votes/upvote.html.erb create mode 100644 test/controllers/votes_controller_test.rb diff --git a/app/assets/javascripts/votes.js b/app/assets/javascripts/votes.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/votes.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/votes.scss b/app/assets/stylesheets/votes.scss new file mode 100644 index 0000000000..9a6720f80e --- /dev/null +++ b/app/assets/stylesheets/votes.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Votes controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb new file mode 100644 index 0000000000..4d53c92132 --- /dev/null +++ b/app/controllers/votes_controller.rb @@ -0,0 +1,48 @@ +class VotesController < ApplicationController + before_action :set_vote, only: [:show, :edit, :update, :destroy] + + def new + @vote = Vote.new + end + + def destroy + end + + def upvote + end + + def index + end + + def show + @votes = Vote.all + end + + def create + @vote = Vote.new(vote_params) + + respond_to do |format| + if @vote.save + flash[:success] = 'vote successfully created' + format.html { redirect_to @vote, notice: 'vote was successfully created.' } + else + flash.now[:error] = 'vote not created!' + @vote.errors.messages.each do |field, messages| + flash.now[field] = messages + end + format.html { render :new } + end + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_vote + @vote = Vote.find(params[:id]) + end + + def vote_params + params.require(:vote).permit(:user_id, :work_id) + end + +end diff --git a/app/helpers/votes_helper.rb b/app/helpers/votes_helper.rb new file mode 100644 index 0000000000..5a82eed07d --- /dev/null +++ b/app/helpers/votes_helper.rb @@ -0,0 +1,2 @@ +module VotesHelper +end diff --git a/app/views/votes/create.html.erb b/app/views/votes/create.html.erb new file mode 100644 index 0000000000..36aaa30279 --- /dev/null +++ b/app/views/votes/create.html.erb @@ -0,0 +1,2 @@ +

Votes#create

+

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

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

Votes#destroy

+

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

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

Votes#index

+

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

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

Votes#new

+

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

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

Votes#show

+

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

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

Votes#upvote

+

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

diff --git a/config/routes.rb b/config/routes.rb index 2b662d71db..1b7cd880cf 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,7 @@ root "works#index" resources :users + resources :votes # create session for user login post 'sessions/login', to: 'sessions#login', as: 'login' # route to sessions new with login form @@ -9,11 +10,6 @@ delete 'sessions/destroy', to: 'sessions#destroy', as: 'logout' resources :works - # get 'works/index' - # get 'works/show' - # get 'works/update' - # get 'works/create' - # get 'works/new' - # get 'works/destroy' + # 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 new file mode 100644 index 0000000000..02890444ab --- /dev/null +++ b/test/controllers/votes_controller_test.rb @@ -0,0 +1,34 @@ +require "test_helper" + +describe VotesController do + it "should get new" do + get votes_new_url + value(response).must_be :success? + end + + it "should get destroy" do + get votes_destroy_url + value(response).must_be :success? + end + + it "should get upvote" do + get votes_upvote_url + value(response).must_be :success? + end + + it "should get index" do + get votes_index_url + value(response).must_be :success? + end + + it "should get show" do + get votes_show_url + value(response).must_be :success? + end + + it "should get create" do + get votes_create_url + value(response).must_be :success? + end + +end diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index 107e7dee42..27185c5be4 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -5,18 +5,18 @@ cookies: creator: Lizzo description: music video by Lizzo feat. Sophia Eris category: video - publication_year: 2013-10-08 + publication_year: 2013 fitness: title: Fitness creator: Lizzo description: I been workin on my fitness category: album - publication_year: 2017-10-08 + publication_year: 2017 i-like-that: title: I Like That creator: Janelle Monae description: sometimes I wanna roll, but wanna stay at home category: album - publication_year: 2018-02-18 + publication_year: 2018 \ No newline at end of file From b53031d91dd2e3ec97251f785f3054a2f15c7606 Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Tue, 9 Oct 2018 22:35:52 -0700 Subject: [PATCH 17/48] votes routes --- config/routes.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 2b662d71db..7e6f65cec0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,11 +9,6 @@ delete 'sessions/destroy', to: 'sessions#destroy', as: 'logout' resources :works - # get 'works/index' - # get 'works/show' - # get 'works/update' - # get 'works/create' - # get 'works/new' - # get 'works/destroy' + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From 0514ce009bbbf8976457bcd23a8086706daad85d Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Wed, 10 Oct 2018 10:38:15 -0700 Subject: [PATCH 18/48] vote test mods still not creating new in test --- test/models/vote_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index fc15947bd3..611351167e 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe Vote do - let(:vote) { Vote.new } + let(:vote) { Vote.new(user_id: 1, work_id: 1) } it "must be valid" do value(vote).must_be :valid? From 9eb8cd89fe1a4a051f8f5915b0f957e564c28675 Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Wed, 10 Oct 2018 10:59:53 -0700 Subject: [PATCH 19/48] added before action filter --- app/controllers/application_controller.rb | 9 +++++++++ app/controllers/users_controller.rb | 2 -- app/views/layouts/application.html.erb | 6 ++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 09705d12ab..cf38e56991 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,11 @@ class ApplicationController < ActionController::Base + # before anything call method to find user applied before any controller + before_action :find_user + + private + def find_user + # @current_user can be used in every view + @current_user = User.find_by(id: session[:user_id]) + end + end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 6212599cd9..75f813f2e3 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -2,8 +2,6 @@ class UsersController < ApplicationController before_action :set_user, only: [:show, :edit, :update, :destroy] def index - @current_user = User.find_by(id: session[:user_id]) - @users = User.all end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 04f599ca96..4fbb9da7d1 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -14,8 +14,10 @@
<% end %> - -
+
+
+
<%= form.label :name %> - <%= form.text_field :name %> + <%= form.text_field :name, class: "form-control"%>
-
- <%= form.submit %> -
+ <% end %> +
+
\ No newline at end of file diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index ac0b9c6569..aaa47b85ec 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -1,22 +1,21 @@

<%= notice %>

- +

Users

- - +
- - + + <% @users.each do |user| %> - - - - + + + + <% end %> @@ -24,4 +23,6 @@
-<%= link_to 'New User', new_user_path %> + + +<%= link_to 'New User', new_user_path, class: "btn btn-primary btn-center d-flex justify-content-center" %> diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb index f6657c1748..e95fda5301 100644 --- a/app/views/works/_form.html.erb +++ b/app/views/works/_form.html.erb @@ -1,43 +1,36 @@ <%= form_with(model: work, local: true) do |form| %> - <% if work.errors.any? %> -
-

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

- -
    - <% work.errors.full_messages.each do |msg| %> -
  • <%= msg %>
    • - <% end %> -
-
- <% end %> - -
+ <%= render 'layouts/form_errors' %> +
+
+
<%= form.label :title %> - <%= form.text_field :title %> + <%= form.text_field :title, class: "form-control"%>
-
+
<%= form.label :creator %> - <%= form.text_field :creator %> + <%= form.text_field :creator, class: "form-control" %>
-
+
<%= form.label :description %> - <%= form.text_field :description %> + <%= form.text_field :description, class: "form-control" %>
-
+
<%= form.label :category %> - <%= form.text_field :category %> + <%= form.select :category, [["Album", "album"], ["Book", "book"], ["Movie", "movie"]], {}, {class: "form-control"} %>
-
+
<%= form.label :publication_year %> - <%# form.select_year :publication_year, (Time.zone.now.year - 100)..(Time.zone.now.year + 1) %> - <%= form.text_field :publication_year %> -
+ <%= form.text_field :publication_year, class: "form-control" %> -
- <%= form.submit %>
+ + <% end %> + +
+ + \ No newline at end of file diff --git a/app/views/works/_spotlight.html.erb b/app/views/works/_spotlight.html.erb deleted file mode 100644 index 8f9dbe5b56..0000000000 --- a/app/views/works/_spotlight.html.erb +++ /dev/null @@ -1,6 +0,0 @@ -
- -

MEDIA SPOTLIGHT:

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

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

diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index e040969eef..8f4afbf6a7 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1,32 +1,34 @@

<%= notice %>

-

List of Works

-<% ['album', 'book', 'movie'].each do |cat| %> -

<%= cat.capitalize %>s

- <% works = @works.where(category: cat) %> -
NameNameVotes Cast
<%= user.name %><%= link_to 'Show', user %><%= link_to 'Edit', edit_user_path(user) %><%= link_to 'Destroy', user, method: :delete, data: { confirm: 'Are you sure?' } %><%= link_to "#{user.name}", user %><%= user.votes.count %><%= link_to 'Edit', edit_user_path(user), class: "btn btn-primary" %><%= link_to 'Remove', user, method: :delete, data: { confirm: 'Are you sure?' }, class: "btn btn-primary" %>
- - - - - - - - - - - <% works.each do |work| %> +
+

List of Works

+ <% ['album', 'book', 'movie'].each do |cat| %> +

<%= cat.capitalize %>s

+ <% works = @works.where(category: cat) %> +
VotesTitleCreated ByPublishedUpvote
+ - - - - - + + + + - <% end %> - -
<%= work.votes_count%><%= link_to "#{work.title}", work_path(work.id) %><%= work.creator %><%= work.publication_year %><%= link_to "Upvote", works_upvote_path(work.id), method: :patch, class: "btn btn-primary" %> - + VotesTitleCreated ByPublishedUpvote
- <% end %> -
+ + + <% works.each do |work| %> + + <%= work.votes_count%> + <%= link_to "#{work.title}", work_path(work.id) %> + <%= work.creator %> + <%= work.publication_year %> + <%= link_to "Upvote", works_upvote_path(work.id), method: :patch, class: "btn btn-primary" %> + + + <% end %> + + + <% end %> +
+
diff --git a/app/views/works/new.html.erb b/app/views/works/new.html.erb index 9f90e73ab9..0785ae18df 100644 --- a/app/views/works/new.html.erb +++ b/app/views/works/new.html.erb @@ -1,6 +1,5 @@ -

New Work

+

New Work

-<%= partial: "layouts/form_errors", locals: { model: @book } %> <%= render 'form', work: @work %> <%= link_to 'Back', works_path %> diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index c90466d756..846aed667f 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -1,12 +1,10 @@

<%= notice %>

+
+

<%= @work.title %>

-

- Title: - <%= @work.title %> -

- Creator: + Created by: <%= @work.creator %>

@@ -38,14 +36,13 @@ <% end %>

-<%= link_to 'Edit', edit_work_path(@work), class: "btn btn-primary" %> | -<%= link_to 'Destroy', @work, method: :delete, class: "btn btn-primary", data: { confirm: 'Are you sure?' } %> -<%= link_to 'Back', works_path, class: "btn btn-primary" %> - -
-
- <%= link_to "Upvote", works_upvote_path(@work.id), method: :patch, class: "btn btn-primary" %> -
+
+ <%= link_to 'Back', works_path, class: "btn btn-primary" %> + <%= link_to 'Edit', edit_work_path(@work), class: "btn btn-primary" %> + <%= link_to 'Destroy', @work, method: :delete, class: "btn btn-primary", data: { confirm: 'Are you sure?' } %> + <%= link_to "Upvote", works_upvote_path(@work.id), method: :patch, class: "btn btn-primary" %> +
+ diff --git a/app/views/works/top.html.erb b/app/views/works/top.html.erb index 67ca506725..efe7e0891f 100644 --- a/app/views/works/top.html.erb +++ b/app/views/works/top.html.erb @@ -1,5 +1,12 @@ -
-
+
+

MEDIA SPOTLIGHT: <%=link_to "#{@spot.title}", work_path(@spot.id) %> by <%= @spot.creator %>

+

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

+ +
+ +
+
+

Top Movies

    <% if @movies.empty? %> @@ -17,7 +24,7 @@
-
+

Top Books

    <% if @books.empty? %> @@ -36,7 +43,7 @@
-
+

Top Albums

    <% if @albums.empty? %> @@ -53,5 +60,6 @@ <% end %>
+
From bfb86af66759bef1410adc35ec97beb6d0f87cc1 Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Mon, 15 Oct 2018 08:50:36 -0700 Subject: [PATCH 34/48] favicon bug --- app/views/layouts/application.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 2ec8edb74f..31763d4ad4 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -2,7 +2,7 @@ - + <%= favicon_link_tag(source='favicon.ico', options={}) %> MediaRanker <%= csrf_meta_tags %> From fa04a0b370f889969d9a3eae715bbe79572c047b Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Tue, 16 Oct 2018 00:11:59 -0700 Subject: [PATCH 35/48] flash and css fixes --- app/assets/stylesheets/application.scss | 75 +++++++++++++++++++------ app/controllers/sessions_controller.rb | 8 ++- app/controllers/users_controller.rb | 10 ++-- app/controllers/votes_controller.rb | 4 +- app/controllers/works_controller.rb | 10 ++-- app/views/layouts/application.html.erb | 5 +- app/views/sessions/new.html.erb | 7 ++- app/views/users/index.html.erb | 17 +++++- app/views/users/show.html.erb | 54 +++++++++++++++--- app/views/votes/upvote.html.erb | 3 +- app/views/works/_form.html.erb | 3 + app/views/works/index.html.erb | 17 +++++- app/views/works/show.html.erb | 57 +++++++++++++------ 13 files changed, 204 insertions(+), 66 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index d127c0816f..931957a312 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -30,9 +30,11 @@ colors { color: #ff3a00; color: #a4e2dd; } + a { text-decoration: none; } + body { margin: 0; } @@ -44,6 +46,7 @@ a:visited { .btn:not(:disabled):not(.disabled) { cursor: pointer; } + .app-header__header { max-width: 100%; background-color: #B2DFDB; @@ -51,27 +54,39 @@ a:visited { padding: 2rem 1rem 0.5rem 1rem; } +//.app-header__header { +// padding: 0; +//} .app-header__header h1 { text-align: center; + margin-bottom: 2rem; + padding-top: 2rem; } + .app-header__header h1 small { color: white; } + .app-header__header h1 a { color: #FF5722; padding-right: 25px; margin-right: 15px; border-right: white 2px solid; } + +.btn-danger { + background-color: #FF5722; +} + .nav-link:hover, .nav-link:focus { background-color: transparent; text-decoration: underline; - - } + .app-header__nav_item .nav-link { color: #00796B; font-size: 1rem; + margin-bottom: 1rem; } .works-index{ @@ -86,7 +101,7 @@ a:visited { font-weight: bold; } -td{ +td { font-family: "Gudea", sans-serif; font-size: 1rem; } @@ -114,12 +129,6 @@ td{ transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; } - - -.app-header__header { - padding: 0; -} - .spotlight { border-bottom: 1px solid lightgray; text-align: center; @@ -130,17 +139,26 @@ td{ .spotlight a{ color: #00ab9d; } +.container { + max-width: none; + margin: 1rem 1rem auto 1rem; + padding-left: 2rem; + padding-right: 3.5rem; + +} + .top-ten-container { background-color: white; color: grey; font-family: "Gudea", sans-serif; - } + h2.top-ten-header { border-bottom: 5px solid #b5dfdb; margin-bottom: 0.5rem; font-weight: bolder; - font-size: 2rem; + font-size: 2.5rem; + padding-bottom: 1rem } .top-title { @@ -166,6 +184,11 @@ h2.top-ten-header { margin-bottom: 1rem; font-family: "Gudea", sans-serif; padding: 2rem; + text-align: center; +} + +.table thead th { + border: none; } .table td{ @@ -182,6 +205,12 @@ h2.top-ten-header { color: #26A69A; } +.new-user { + width: 20rem; +} +.btn-user { + margin-top: 1rem; +} #error_explanation { color: red; ul { @@ -200,12 +229,18 @@ h2.top-ten-header { .show-work { text-align: center; font-family: "Gudea", sans-serif; - font-size: 1rem; + font-size: 4rem; margin-top: 2rem; } +.show-work > p { + font-size: 1.5rem; + +} + .show-work h2 { color: #26A69A; + font-weight: bolder; } .show-btns a { @@ -216,14 +251,18 @@ h2.top-ten-header { color: #26A69A; } -.user_index { - margin: 1rem 4rem auto 4rem; -} - -.table thead th { - border: none; +.user_index, .user-show{ + margin: 1rem 5rem auto 5rem; } .btn-center { margin: 1rem 25rem auto 25rem; +} + +.table-sm { + margin-left: 10rem; + margin-right: 10rem; + text-align: center; + background-color: lightskyblue; + border-radius: 10%; } \ No newline at end of file diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 9a012ef1da..4d3545d1d8 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -4,14 +4,16 @@ def login if user.nil? # create a new user - user= User.create(name: params[:user][:name]) + user = User.create(name: params[:user][:name]) + flash[:success] = "Welcome #{user.name}, you have been added as a new user. Your ID is #{user.id}." else # login existing user + flash[:primary] = "Welcome back #{user.name}!" end # store user id for session session[:user_id] = user.id session[:user_name] = user.name - flash[:success] = "Welcome #{user.name}!" + redirect_to root_path end @@ -24,7 +26,7 @@ def destroy # wipe the user id for the session session[:user_id] = nil # flash msg to user confirming logout - flash[:notice] = 'Goodbye' + flash[:secondary] = "Goodbye #{session[:user_name]}, come back soon!" # go back to prev page or use fallback location to root redirect_to root_path end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 21d66eff90..bdbe3fb475 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -5,7 +5,6 @@ def index @users = User.all end - def show; end # call model method to retrieve all votes user has cast @@ -15,15 +14,14 @@ def new @user = User.new end - def edit - end + def edit; end def create @user = User.new(user_params) respond_to do |format| if @user.save - format.html { redirect_to @user, notice: 'User was successfully created.' } + format.html { redirect_to @user, primary: 'User was successfully created.' } else format.html { render :new } end @@ -33,7 +31,7 @@ def create def update respond_to do |format| if @user.update(user_params) - format.html { redirect_to @user, notice: 'User was successfully updated.' } + format.html { redirect_to @user, info: 'User was successfully updated.' } else format.html { render :edit } end @@ -43,7 +41,7 @@ def update def destroy @user.destroy respond_to do |format| - format.html { redirect_to users_url, notice: 'User was successfully destroyed.' } + format.html { redirect_to users_url, dark: 'User was successfully destroyed.' } end end diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index c33dd4177a..5e45947aec 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -17,10 +17,10 @@ def create @vote = Vote.new(vote_params) respond_to do |format| if @vote.save - flash[:success] = 'vote successfully created' + flash[:success] = 'Vote successfully created' format.html { redirect_to @vote.work, notice: 'vote was successfully created.' } else - flash.now[:error] = 'vote not created!' + flash.now[:danger] = 'Vote not created!' @vote.errors.messages.each do |field, messages| flash.now[field] = messages end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index e8b0da3b7c..78fe124c8c 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -33,6 +33,8 @@ def create def update respond_to do |format| if @work.update(work_params) + # flash[:primary] = 'Work was successfully updated.' + # redirect_to work_path(@work.id) format.html { redirect_to @work, notice: 'Work was successfully updated.' } else format.html { render :edit } @@ -43,13 +45,13 @@ def update def destroy @work.destroy respond_to do |format| - format.html { redirect_to works_url, notice: 'Work was successfully destroyed.' } + format.html { redirect_to works_url, dark: 'Work was successfully destroyed.' } end end def upvote if @current_user.nil? - flash[:error] = 'You must be logged in to vote.' + flash[:warning] = 'You must be logged in to vote.' redirect_back(fallback_location: root_path) else work, user = @work.id, @current_user.id @@ -58,7 +60,7 @@ def upvote flash[:success] = "Upvote successful." redirect_back(fallback_location: root_path) else - flash[:error] = 'A user can only vote on each work once.' + flash[:danger] = 'A user can only vote on each work once.' redirect_back(fallback_location: root_path) end end @@ -82,7 +84,7 @@ def spotlight def set_work @work = Work.find(params[:id]) if @work.nil? - flash.now[:error] = 'Work not found' + flash.now[:warning] = 'Work not found' render :not_found end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 31763d4ad4..862ee8e28b 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,8 +1,9 @@ - <%= favicon_link_tag(source='favicon.ico', options={}) %> + <%# %> + MediaRanker <%= csrf_meta_tags %> @@ -36,7 +37,7 @@ <% if @current_user %> <%= link_to "Logged in as: #{@current_user.name}", user_path(@current_user.id), class: "btn btn-primary" %>
  • - <%= link_to "Log Out", logout_path, method: :delete, class: "btn btn-primary" %>
    • + <%= link_to "Log Out", logout_path, method: :delete, class: "btn btn-danger btn-red" %> <% else %>
  • <%= link_to "Log In", login_path, class: "btn btn-primary" %>
    • diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index 8c97bb2329..ad3f30aeb1 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -1,7 +1,10 @@ +

    Please Login

    <%= form_with model: @user, url: login_path, method: :post do |form| %> <%= form.label :name, 'Username'%> - <%= form.text_field :name, placeholder: 'username' %> - <%= form.submit 'Login' %> + <%= form.text_field :name, placeholder: 'username', class: "form-control" %> + <% end %> + +
    \ No newline at end of file diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index aaa47b85ec..344b0a785d 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -1,4 +1,19 @@ -

    <%= notice %>

    +
    + <% flash.each do |name, message| %> + <% if message.class == Array %> +
    + <% message.each do |msg| %> +

    <%= "#{name}:" %><%= " #{msg}" %>

    + <% end %> +
    + <% else %> +
    + <%= message %> +
    + <% end %> + <% end %> +
    +

    Users

    diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 6dddd9e068..f799f4bd35 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,17 +1,53 @@ -

    <%= notice %>

    +
    + <% flash.each do |name, message| %> + <% if message.class == Array %> +
    + <% message.each do |msg| %> +

    <%= "#{name}:" %><%= " #{msg}" %>

    + <% end %> +
    + <% else %> +
    + <%= message %> +
    + <% end %> + <% end %> +
    +

    - Name: + User Summary: <%= @user.name %>

    +

    <%=@user.created_at.strftime("A contributing member since %B, %d, %Y") %>

    Works Voted on: - <% @user.votes.each do |vote| %> - <% work = Work.find(vote.work_id) %> - <%= work.title %>
    - <% end %> -

    +
    + + + + + + + + + + <% @user.votes.each do |vote| %> + <% work = Work.find(vote.work_id) %> + + + + + + + + <% end %> +
    TitleCreated ByPublishedCategoryTotal Votes
    <%= work.title %><%= work.creator %><%= work.publication_year %><%= work.category %><%= work.votes_count %>
    + +
    -<%= link_to 'Edit', edit_user_path(@user) %> | -<%= link_to 'Back', users_path %> +
    + <%= link_to 'Edit', edit_user_path(@user), class: "btn btn-secondary" %> | + <%= link_to 'Back', users_path, class: "btn btn-secondary" %> +
    \ No newline at end of file diff --git a/app/views/votes/upvote.html.erb b/app/views/votes/upvote.html.erb index 5c86f2170c..8b13789179 100644 --- a/app/views/votes/upvote.html.erb +++ b/app/views/votes/upvote.html.erb @@ -1,2 +1 @@ -

    Votes#upvote

    -

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

    + diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb index e95fda5301..20478fffce 100644 --- a/app/views/works/_form.html.erb +++ b/app/views/works/_form.html.erb @@ -25,7 +25,10 @@
    <%= form.label :publication_year %> <%= form.text_field :publication_year, class: "form-control" %> +
    +
    + <%= form.submit :Submit, class: 'btn btn-primary' %>
    diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 8f4afbf6a7..34dcc7d141 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1,4 +1,19 @@ -

    <%= notice %>

    +
    + <% flash.each do |name, message| %> + <% if message.class == Array %> +
    + <% message.each do |msg| %> +

    <%= "#{name}:" %><%= " #{msg}" %>

    + <% end %> +
    + <% else %> +
    + <%= message %> +
    + <% end %> + <% end %> +
    +

    List of Works

    <% ['album', 'book', 'movie'].each do |cat| %> diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 846aed667f..0ec328f96f 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -1,4 +1,21 @@ -

    <%= notice %>

    + +
    + <% flash.each do |name, message| %> + <% if message.class == Array %> +
    + <% message.each do |msg| %> +

    <%= "#{name}:" %><%= " #{msg}" %>

    + <% end %> +
    + <% else %> +
    + <%= message %> +
    + <% end %> + <% end %> +
    + +

    <%= @work.title %>

    @@ -24,25 +41,33 @@

    - Votes: + Total Votes: <%= @work.votes_count %>

    -

    - User Votes: - <% @work.votes.each do |vote| %> - <% user = User.find(vote.user_id) %> - <%= user.name %>
    - <% end %> -

    -
    -
    - <%= link_to 'Back', works_path, class: "btn btn-primary" %> - <%= link_to 'Edit', edit_work_path(@work), class: "btn btn-primary" %> - <%= link_to 'Destroy', @work, method: :delete, class: "btn btn-primary", data: { confirm: 'Are you sure?' } %> - <%= link_to "Upvote", works_upvote_path(@work.id), method: :patch, class: "btn btn-primary" %> -
    + + + + + + + + <% @work.votes.each do |vote| %> + <% user = User.find(vote.user_id) %> + + + <% end %> + +
    Biggest Fans:
    <%= user.name %>
    + +
    +
    + <%= link_to 'Back', works_path, class: "btn btn-secondary" %> + <%= link_to 'Edit', edit_work_path(@work), class: "btn btn-secondary" %> + <%= link_to 'Destroy', @work, method: :delete, class: "btn btn-secondary", data: { confirm: 'Are you sure?' } %> + <%= link_to "Upvote", works_upvote_path(@work.id), method: :patch, class: "btn btn-secondary" %> +
    \ No newline at end of file From 4de5dae6d925b174fef152252c5e3f6e1f707381 Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Tue, 16 Oct 2018 00:22:26 -0700 Subject: [PATCH 36/48] ico --- public/favicon.1.ico | Bin 13982 -> 0 bytes public/favicon.ico | Bin 0 -> 13982 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 public/favicon.1.ico diff --git a/public/favicon.1.ico b/public/favicon.1.ico deleted file mode 100644 index 4962799324879ca87e3ed12fa6d8c9d2971659cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13982 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 diff --git a/public/favicon.ico b/public/favicon.ico index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..4962799324879ca87e3ed12fa6d8c9d2971659cb 100644 GIT binary patch literal 13982 zcmbVz2T&AmlxHI-iV7kiL4r!ok~3oh1cZ^CL6QhKRI>bk}Y$GqSKSGv2zz#=*a^5R7*Dss}9rE>G9r_RckR7MEKt)AKMg5OI6c_x-CnY`A#k&%hZa&nbw)JGVC;9d=Z zLz+IBy1O;EmKdylo^^;Ocni;cx80G=A}p9puj1-a-ss&?{BOzrqL_9CLT-x*5xKqe zF~ehnY48^g;r^N!&!iejmuVfL3%?$Ozq$1`;*J8{$1u5X zJAP@78BvHO>dm8{dn==70*CnW5LM2Atms^s^>eZLltyMLW$f%qTg9&M0-BE9F-StiRL)_;*7F;YCX95n!=c_gZ{OQRwse*KY1bGM^- z4w~r#iH0UzUc_1<4x`KeMr0wUu|&#MOy8+4ZyzB7R6Y`R(9obp0;n-NPSiGVu6&M$ z-{PEqPlS#LM<@?g+c0W)?TK_y!Em#%q?%SKN!zsFrSe@aI@dME^DJm19wACbF zp`-F%qJ80nMP7%7Gqkml`;+UoA@YC(g!ik~Ru)1T?%Bjyi$ak{^dz9koyaqe`XlYW z+q**o?uFHofYdP1GTDf$>Fp$7|In2LyxDl%B`~G=Plvk|78^__Bp_4Th7E6;AMi($ zNI;#?gU>I0*w@~+Sro6-uEsBAfD*-;bqn1^Ff}-dOYU!LrHQeLqdafYOu%x) z1aI8C0>NMUv=5ok^6G__yfs4ulAg{58>q-UA@HpL>zRY^(~#8H7zPCrpj}n&KDTk%ZR_=l8QlH#3%Q$@2kgJgb2V9p{Jh@d@BiCF zzQcDnAagiUh~fGB#jmv{=5>BpyTKBBlslQ(EUOEL2ojD z(uUGQ7Ui{HQoXq}w|~KepZ^V%Z8_353U+0z)L8W4YV*_p&d+V!eA>!J=XJ*(QcTjt z7>B?!d_cfrQ<74w(5j)uxf!)>hIkZn&q4={6;Wf@e{fxig#zDxM2^SWEGmVN~$ zJT>SX7{&$?HGTi~9fU5j`*q&LtW#dfW2rVZqY7C6Wtrg(e^)CtGxu$2_(=75M@_Fl zx8`r{Ak@YV?}^6z!W@W^+fstfclmB3yRCYd33(|epE6h%yT3m=2wd3JfJ~oPf)Hw@ z3viXMG=fffx4Emw?bl)jD0@&Y;M2RRd?cX3h9DIEMtKA!4Kk(y z1Sl!nC%?8Lip^W*e}w)Z)e{8#RTK0@dljk!qH>Q@iD z`eo0Yy{fDUs>QhygA?YnG7VDM8LWrb_>l=o#KXhjq8goPvEQDTpR?b+gJZw;_H8FR zdLWH6m20kDe4}yadqpQx4631I5fLm`giq^Tyu)+j;V+I2<78te5q=>rgLgIN#SPDT z#(g+IMsYt*ZYhP+^2b6#&X3%t1AqR!SM#2OYqlxS=NuVQ35Tx?JK{C1V^bu+c^o#A z)(MD0L|tgQ~FzNuFJr%O+wNZ7SHUEtsgD=~?K-Txk|@eXCE;Vcr>ty)^sC;9_5+J;-);A>EHl-~>O&tcWwEg3*@_!! z&wE$|J0vN#w@rm%?_VW))i+&{{L%;C_@L-r7)-;~oaJ98BN-d&TX;jvg3*20Ev zUSLHC%ww-Wofr>OcE6_m6&11tuR|k3)BF9$oc)g)b^X~pT;4DA>S0|crmWVf z4(&U>JMts>#b-JpLMdqR{Yf@)8hTJB1ng_!hX|$u7eux2YiyS3C4PTv0*zsWmZDDh z@TwPUa$P8xW=WhY`Y74ty$p0I7-XH$&n4HEnK0%-?4g@UUphXVD*M}h5?oX?jc-7g zNSME^0`EQz3Ii^L#$(M12CS-qA}X~(C|#`Fv|0Hfh-W|otJkW~e!h2XkL^F0@U_rR zTlxAt>?JvLP&{CinHKcTmDN`H+^4&$t8f$WkXrSAcQ_z<(caj)_jqHIXl@n87Faa0 zg8Kb^&30ES=EOxhA3hA_JKS^E{=T zOB&A91__VuL)lK*bvaF4s*A+3gTlCWR)#vXoOL)L-lt5<|7+@CK-n+6|M>95XIh(1 zImbi!O?6o_zE)YBs(r}dcW3}Z4G~cEK}^aUh?^=?IbfPqtkcLr@&ibC&@LlgFO z*fq2%DA(qV-QEv5)`2J0KXMg0nMr^n)9Sw9c*(h0Xb%a<$vj2eG71|><&07YoNfvo zk8bE&Eq}ZiJ(>5#x#&-CaLGX0QPs5{aXGY}LteT8fLE}w%tq^b_LVA3_%Gv5W5ZYF z4adCGr_kS`TAb{=vWfE&_eaFqMt;g^GN|t&OXaUeQVQouO1+C+;Fh=DJt*%@QUpm2 z_kD*lryCf#n01z$_#GlGNPyM#Xq@u>&veS)>NQn)o;GO-Ak%z|?DuA+5UPKeQnKP{ z?#Cc4tHQ$eV$Kgirg=i{*F`LS(z&xXoO=73A!`Wxp$&sQkI%H;M!O9k4k|S(#Oo+H zdS1xWD^)n`QA&nW&j)Nr&z5Hl!&Eh(8)vJbx40s9|3uULc%5vb*=+8zK90onBa}F} zsJE)WZT9?ndrak_=GUs_sUP3B<1&)U+LJSuV*wt!sF&FnqW<>w?_tXu%3WJYGAchE zyr2j4df@C0iJFlSR9;oX%IUG{)cfUWwxMAD+ktZZ(3T!zOqKsp046?vzT2nN^rJ7! zP60os-35(hxvr={c={tbBW%Qc`~Eo;-~^O)rG*$X7|V*#ti76oqG zx9E)$+gfSNST@To^j_EOCi)UCs%I7HN-tDvhITI0B{hPdg)Kk=kLf>*)Xm)sb?<874nt4rYCIVhahi8DAOR8FzXtju5YKW);Qx zRh~>74sX~epIFU?T09tcLXGPyd3~#;Z%q~{ieco9vV^NzXQ~9-=ZT=MnoJ7S7;B^c zhEg-E$UECw--=E7iz{<3Om3-P$2IgHpkNqeSb$J?AEQ0bLUMFw|06N42{yeV#W8NJ ztRICV)(HFFP2Z;)@wA_d?CY~|0~T)*8@WMm+()8QoDStnZL$Pq(~av~2ex-d32v1F zMh0JQt4rz%>)dpia&CYqy$TA|I|ZIo#|AXa!J7i-D<5rWTR2y2i#asj?Db&i-e;+z zEp&T*Gw`{WM2<-xn8Nzzq81T4js>L-j_v%_epC5)av-GAd~K^)`nbhPu4)5ml(jag z6A`W8TU#IfS7Elk?P`wSfK>e0_S`EZW2)>H2Cs110f~!OVpe`)l-w|zM7U}+6u82> z%eTsx?CSjK8Tz!4w!kiN5Yq=rEGb}C)^f&6Up@&@wvOn1OS=AYd<#H9oCCo~L4#a;EPXdh4D`;`H znZ;{w8?6FO42DzAxCX0$aN(nhTViRFv99|5;IpYOr_DhOU-Zx=6~n=;S)E6!CDoeA zt^)LZK=;+eeTsF(^F2u^b)lFX!?|4zcaV7gic@8UhuzMnj^Q-Ug6hy<)dc)`@z~g) zQT&rMnIze3v62~;XH{b6h3068zDu${crFyv&Fi~ZUw@XLzRPDIWW*_% z5;{)U7L+?CM+&7%Y4s(ae1U(easD)=0G_;gwRjeccax7EF`!fbDP>lac6xtvI&_10 zb!h$9i?RimGU+r_xD_@XFWKbGsXZ@hbQq_zb^D&o?R$^$0#XT`Jjq)+ezvRU0!>?o zVW=IZv}y6ivoN;z9;3F8ZmU@wy2H1&Fe68Q)>Ll?7+*IxtIPFlQ{_Vc3G4$)X?FZc z|C=OrNZA}{Hg3x<{l6WV)*I&?iA3fGu zt;Hl=o#2`R!OpCl(6MUs{8;;zx{U7mMRRjo$n$Dvc@Ly{! zBevQ5TvDO;nFcA9Oua0*{6+eNmPXD7c}u&CKzuU^#qdG@l^Jqz_b6xonPi;d*i(eR z#t3oSWQ8lMrIS)w|Dp7!zSyLWb`H}QrPNex1ThAK=o~+%!CG{UtTJd`yP5s;#TDF@ z?udAaEm*_e(VFGhw=yqZ!4|X7wX^c_v+er&p{0)5HTzN_nX!>E3-zXniS04-!SQ~- zBTlhlxL(M4dQC`3>#K~|bH?k5hn*vhMYu0wCc4Bpi`^wmFY$VdIpWGFYOAarvCWtN zx3P8~)%7W${K?&#uuGTJ?UM6hz2>?y_mZExk6_C+cvV^22lQi$SSD7df=H zIIY%T12ePNoQm+B`cyyahTA4iCO0;USQXl7+6D6DotAYvW`y{1*%~W~Ru(mbdhORe zPRcTZ@aPom_%{E{!VYZP7sBb|xNEiE5LN9Sp@ z(q%viRjs^-JvO0Le4f7FQ5kd!Do}#and`3+A60m2!N{~|Sy%&RUsc_gLsJ24u^npA zvUbV=PhR-=OpvqmYDEF%z{d-fLk)PQyMC>f&2MMB_r^p|qpQ13-}AKcMx18IbJuZffzt<@$f}ge?p}~a z1CgrW#1a8r;J7zRoYxfBl~hgg;RISdjp=iO_A= z28U2}2I|MubWV?Ct%4esv8QIDuTv-Nf2pz}ca0mF;!xd}Pq+A$MI_=Yzj#A05}_3f;Yvc;H0=wX1Y0ZKYPwYLYCaG$n6C0e@{(Uv#wC_6 z>d$V4u|Cw{tB&9MM7XUzYk6=dR$+9ygxljC3?l7w`XxkGw-ysC<+ISE=4R@noK*f3 z>Ujmb7sJTO>cqddGd{|!yZKFaCZ3cnyXr_zR4yio%Z6wQDd;r$rCLUE1!l{4;%hpC zI^R?ynbv#hqv}$Vz)oevJyf$}ZMsIe#`H_3yT;XDgv}LECSQqlx@QLpUHbb*Ek^1| z^GghOb5GRxB44{nKG(>+sGALzHdwpOI8|k*1!M@w{)_Go-ous{JLMPfhe)6Z& z-wn^qDzH#PdH9REgopFGmE|qE+Yx8AhK{r`KDEdRc>H-etT|IRho9E;V5+z5&#Fv` zJ;vvwOt!qS;QMEeaoV=yf&VxT4zDF&6|ByQF+_|YK2k~7xM(r8b zx*CNJX7=w4SLE^0VU3rKvFAPAug;FbbXd+*-<59M^Dds~_4wA|;8pNOg}PLEPJ^GF zW~*NwCf-vn#8N6fjpEucsowH<-s5WgwY*e~Zxen9-BF&736gs+GyT%+E86Ec%ha?m zs+lSA1J#YT7tx!ryjh_l0YhXM7$57pl#xYq$nCg}>KhtwVGk&On$Xuc@-pcTg}8gv zgR_X01DLjA>*(~}8DbAfc;*<9HD&WS$=AWpM85(?MIU}WC^0EXKL+{oy7XpS@tw~X z-f+27H86-6?-Iyrjhn;qHy0-0&D z?k`wY_S*xK2Rw$;g&-TQMKA=csDGRdVzp}T%E>fd>zV;Myv-aLn8D+@ZR}+K6A)C8 zk&)WG$g`whl(dz9dV8o>LjL`hkv1V1Iko9zx4 z4>KY)$Cc49N*%QQ+sEc4U}aI+*v#U3cOQCr6FrI1!G(e!?grRgJkbo1D3Z*5w9hr= z|Lq$u?T}haP;BI&Zsu0NLhlzsRYIM!s_Ar5eY&wZ1lfeuIdUEA`R18Zaby#Lz?MhzE;mUhcAyBlA4PHq#tLUk|CE8CYT_@rX?n=%! z%TzqA_fWidUaH|PqpQB@$8LG|u>2iSOnn2p6RSq93Z3SzagoaQW-8pmsxV3>X6k48 z-QGYOmyaE~fn0(dfr##1h9brNRIbRane=_kHl}e;9&YpMub(8mh-*sf$KLB`4n^Kx zxvm?%3cPPmpLPx2nQt+;`my{`1gpMZ5HSe)G(<1DGO`n=RxZKEL@vS3hM=I|PM*XUE=g_;jD?Kwhh;A~l4op#G+AmxYGD)%yL&=?N znuRZH%6&bi(KERDx#1?W5moUpMyOM$nbyoR5`Gzzs^Jn($afl^f`H&(d%dG;J=w=> zB-0WsgjMkMd;5)l@Jb^KLx=tPlTzo|-wU#?QO0uL_Z*bJ^n}}=*9u%25aOixJ;BlZ ztGTtzJ0bN+ zOf5o1a~d<1U)k!JckgChKymHl`t&(=M>gf#pARmzDIp8KZf8o^9R|Ho5t&OCP?i(T zLY_Ab#-5>-S32!JKW)hr5?=SP)O*_|>eO|H1)tEhY_^*DyhJ=I3)8Q5-9~RY$&;ac zWsZ5%>zxrY1-CS4lCBJKd4#!-w@gL`+vpgk=OvJFeeUkIrJBz;V_H6T(1p6RQBDP4 zCB_=cs1zv)GHB|F-)J}wEb}}T7i(tj-dGx13@{~Ix$L7CqOijsX$`^=G!bsO;hj`T zII-zedvIoyN+Uv;Dc?BOB4^aNq2aW-68pG`E={+gSu5MMX(H^yL)gYu_p85Vw`q!U zp3?H8z}4LB@v?6mRJ@Zudjuj9I(OY@V^DI+`4H&ssolmk4Y4Avfo5=u2npy8le<_y zUdQ82PG7s+RQq97;i5$v7e8!Yx!&~YCw)A%)~Pa-dA>aOJJdI@yqSorM7I=gnFi@7 zE6Z#h1{0<%U|s_;MN_ZNg3Km9?4{JWCC1d;^wPBNRwe;Lr#Z$##bV{VO@Ff+38qbfhC!6Qt2Ys!s6ZnQ%lxo;OCtPB2JB_4-tjeZs`gY#rWy*S3k z1gfIQep+rCgXEW}T`NyyX;(ob&~4!|PAi73PCu>T`J`Vl`eTEDCqQ)t7oX zDSokZ@dMsg()+OxA35g4Y z)rXokw}AKHeJ#3%2JUB#*mpUw$oIuthxiFllpB@eYvxNVO99#4eV-X0Sa`|)#ka}J z^RVBdY!Mc_{^djGy#3>wn+5PSn_A;?ziAx2+dpCIWu_zR0(VpvcHhM60O_jMobQ^m zR9q>df2q;H=V$$d)nL}!c+*P?J<0EC7is?>hWBZ&x6Yd%i6{C_SLRK-2m98+J?-{f zSWmHQ)u#ub3Bnz8EVI{4tj&H02(h?3i9@r?Abd#k zLAR!+<{)86MDMHTg{AFQP@5fMQQG)D*H_O?)f29kKPl(m`h=K1mFQx>aplep#aWXC z?YE_!H`bAPTS#9lD%cITL@|da2O{H_Y#*?L+LT;f`M-@qaJU83_ojI2#w$^N5ihCkuYd$NJi|jTslpgp{#$^Ib2hk z$4=d{{JxskB~KD?f%D{W$BZZmm$4O+pOCH9Jqww{oUJMvuJ$qs>E<>+(stL5*frFZcCcmIM1R+dGS!UGg20SX)8oOvO`_5sP{>L7mfaG2G2 z#Y(@6=DgF@7Q+KD>?^*hav<$Taz72wJtn@Wn46XW>%B257Jqux3xdNaEpfvj1u6r9 zG-{!j9wz_jsawvki6^=@oKEc^opgj;q?e+~n!AYN4eK~`9a>qVlao)!zHNk%Bn_b% zxP``vn%;=JJeLu#x(mGfbMYRkKyr&Y?zKoBx2E>oFpSF(7wT_3@#+vc5=k-o9%gnv za)>@7GgU8@kpp_hBh+!9sBR9*Wv#tYH+UO)H{PPsF~uW}&4^H^DJamRHRw z9o+!ke(bz|(@ZbIZ)|LB9(#vJ>N5eFvILq1XxP=5vq})}Po*V(e4!^9~&`USPDIFPOcw6da zG3muK>!z_0eZlarLXFBh5}j_TJB+V7qCKNkZS^C#yt1l^i5Ya=Jg>jZr}{mO8^#O~ z?{L{su-q|eeX*PR&8XnxXPiJ&ehKCa&F)e@UTP~=Z5Z;p?y7xE_IE2yV_&P1pR_!b zIcMxb`G{Vdg5J2Qj2v#C&D;tc(j86$yfxj6@~}*~_7Z^*1wrAXP%=)`FGi^7bTKzH zNoI`-C<29als(DEF`Yij|MKgAaW71|{9SPg#&TF&H@6aw6dT`YPSS`;_f&k(D8T_j z$emn|d3Jw-kOa!>tJ=3qd9yFE&_6@nvk>>4h4Rk3oCGmtZEF@(rP}&2)|%iKnp$}T zaqw#4c0tuf`)y#)h^ZACwgr_DEBVXKQysA{;?*QB{OKH62V0VW%j^sX2o1@3Onj@d z%2QaFb=GOiJs2I==u_Wn)VrNB{a_eJ76$uFK z)E0F=cOuTDuQS@<1+>R)l4X<`$RvMpCJC@al_I2MNI*#Gy7zMawy%l~a(@8$OiSHn zUeq2RQ*P78ZP9Fwt1W-}GW+F}>7R;-r>uWFy=kwUrg&WptNMLln>K4}CfsNa);?X& zOVie!F;C8#FNlQc<`|tq_#H#dTUs=or?!>r>8@LJ%)QLq5*@`Svb4GU^r3ysp74TM zz7v>lX=3VN5`NKAkz^q%Ju;=5b!z5Qm-)*k${ERCHFjhkN>JVIYA$v5#0qIjqi?5l zNxpw%CF%Et@>S~!aQG8gZrl?SO0(#v`SimY>5ML~@!Q*;vex^ zGEEQ>5ubCx@j1gzj|)0Hn@kxuWlOlXUgTVdArurA(z)6Ka;$}?^dZvIl}M{(V?XUf zzcH+cG1R!uXJ@TRZXM$Yfw-SQwrB7%Cwd(Hn`{Hk96jd0?gog!FAxvj?KRn##X4NL z6u@JGiW>AZi=%Ti;>klgPn2(MeJN{^GhDKgTY;yn*)HaH>BJIywZ8mb@4j&0Dlt zJ71*H`s=*D-%)m@<3ydu+B9S;kY&)`x^Gnvj-!5wd`)!qUao3X%!doA&k>uNQe!FRnU*Q{^^Jg-BB_nSqw zSH2>bmn~idc+r3-m74swgK;B+MA`-`lL#48NNuIqnj8Q3B&$+gDRSM4DG5P9^|Rl91? z3EoJ-EfYg%79TbA>Eqo1b!W9)Apwa7&qx5=W)zc|MFLt34;A*o$H=_m>A)3=+eZc3_tMS7$Zm^UkWP1Lp=xknV2VImY>Puc`4qvo0V;c0oy z=sbm3<1=Ll#}nj|0=rl^N;}{4s*9PHCBDOGYFmj;61e=1 z&<2tD*Yye;%e5D=r_lVaO)@h`y^bh;99*hRoABy0E6>=+czub%t{+ajl#@TG)A*+J zl`|c7ydYrREXYY-(Hz}{HMVDd$B?GyO_MZ#E$^^&v6uO<{#4#mDIfklyEZ%~s@r4g zA`ObHQ!-yakW()I&zNlK+kfGxzCFKC&iJB7>ze`<`wi#f`K<;%J$+qClV|PYZgncG z?H$?DQN@~qQ?F0bSR6Y1-oJixU-xh9Ed9V0#Ar2j_`tWBfoA#r$6?#Pp}zY#bQgX_ zrYNeX>iS6bQrh4a8oW{3G{=kFP4Oz~$S?le4q@x)mEwHN&_J;30xn2}f9CXzWlu;O z+)eo&gc|$0@-k_7W{n5u-`cGqrNy0G8(eD$B(C9}r(#qes=?ttyvk6B-T z%w7up<&iI;oS1V#68fn3`=or3reSR3Se=fmtI|Pz+0mMV5BSe`Db7*wVe=^jKDkwi zc>Hmn{B~s&lTj<-FQToduTnR z@ONhOrl~7~GgH2u1oYB<(AqmePEG~d>~1tY+b<2)G%v)$1`kx@DKGpm@c6H!4!~zB zU$c7wMbCGi$|B{|xmNb>u&uSuug?jUjXFAW=QBkV#T2g@nSjq42Rpqh0#xURBQj< zZB`I}QjqZNRU--boCIAhbzMENAne)9L9Kchrg(O z3qxkf-?em0Ql}~4r{p=$nuF>3I(*TQ#j2Id+v*ze_FnX#V5ddw8a%BFm$Ie87|6|N z5QZLZdFTfDPG;{z3@fK*pk7le_AwY$!40|H zZl-88dj?K6iOdVLaYYFj1%UHn=#0f&BwLI@hoP72*C`B<5=l^ATRspZ0hhAff8?c; z02+crXNc;KE^J}i5bL6^i?qAH4==Rq7X+@Cfq7;r@_vRf9qP)zPD&s1ps&p%+K3|H z(KGIYY4Ce+Rjndu#OtK$(=Zr1%Q3D#+x}v1istoNp_}rf9-mEOzGb_6ElEWDAN8KV zNzUE7^YO1TZ0A$`xf33ND7G$By?EnVa5cL8eOb9)YGHhc@vStW>>?v8(E5r(>4`4s|0%5pbxj(B&|BM@-guqj^5vC%>rdWLN#nIAyowhqpTPCu7_D4ATF)>1w2 zJ+wxx)aS}7IDbuIHCIS1NTg*oeerHpEwqSjsPdwIHqxoTM@+1bJF(#W1GU215Jpy9 z?6&?1-5sID zYkL}$9flQ-S{JDt0r~4_>Nfy46{o6o{)g0Wf7;FCjL|I(_=A?_x;1#ZQmK=vfSi?g zsjs;bHZ-X6cx?4p14II@gw>}BIzpf_brq22o7dE8_oo4VxUP3{_e$28B0F_jM|tH( z%e~MeC_l7y++38F-HBeeSwlZppuL57JRPbcjfTYDvinIHOZ(=U$=I9+O9%(yJtXv) z0On?nZ?oqqvbOA}t8d6!_X!_o<;xtnB|lmtaYUJHC6(jcndR2ox1`xU!TFESb@sQYv+#j~k@h20($CKwQim*30 z(Tb!cUqSnQ_Ck-^yAxHTX;i?a2PA;6rRI943=_Yyj_6DpSzk#E1!t20<7xA}f!KO; z?BE%0=y&5zYM;(WM1|9FY!@|AIlQ@Kx7dO&$?F_7o8vY2BgE*h$xI~boo`B9PW#IT ztn#P^{yn;^1Jt-Of(R{$Ip^je0jfpEbPYQxBZAKEoAUreZPZmR+lY>^LX$W#xt~RR z$q>j2(I#rOGg6|maI9&)7O$KBaEC7oZ8}&oqvPo;9J0n@`p35ZlZORI!cctbqTR_% zfwO*eEHB0nB^qX(+rRL8reAv!M5g5S4^$&}Rw8O`Xn)sepywLw0B4{t?$Ev)j!Z2x z3K`>B+Bow&S9JE;tr8Uz zVVurQ;!-fQ&luWH%5soCE%>Ez!vykaPQ5xYA$mF! zquN9s>%F(oOGU4ev$Al^LRf@o7_Y06S)ys}>*1$f_bHT;;~N#if;<%cV+4mRn|^Do z9-Tt7q<@X32=_2dnj?%*bMB29Mgu|r$jW_<{VMGt?(SY34#twbtbpXLsXc;UiE7(I z9mGt)ORdrvadx1rmCEEiP-yPzNC?6%25luE)+Vze8Zt!k_j|ypsI$YP49nKYyI!!; z-LW0tk_~~?*M9R&+oMYdw@UsSBP6@&tF5FhZy&Faw9xA*)yWpVSpNXqgS_AO0T6lSM3&&(W61_lupWfk8u?FM~h=JqEa~FdS+%k?OtNR(cXbwURRe?dP%TibU{2p2(n*5X9Igv}7Hy)be7?{jzZ#s+~d5+9Oz1m<>|14c3e zAAmZ^0#)rmyH8O2bhsb>cs!o@lo~H$!vq~NAOXDdBw+p(vGW%R;3wbqf$Dd$`};dK zi(LQNjDr7Z#r^-T5o+CG!Y3o9&-7h^FL8FA6L-$bW3O$J00(cJxiW(0_(R$@tglre zjZbn#e;l{j5PWd2_9TD)T=VL$a-2w!>FrlfUj*MUpe6wof*L}tzvmMEu@Bi;FIKjc zv%P1t$ct^;X0{r5nQwgkE`^tK!Qycw;6_Dpo`qGYeUg3VA+zR literal 0 HcmV?d00001 From 6d05569a16c8d6ef9b316b1c13f4e3fe293d3d8a Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Tue, 16 Oct 2018 00:48:23 -0700 Subject: [PATCH 37/48] comment out rm col vote_count to fix heroku migration --- .../20181012175434_rm_dup_vote_count_col_from_works_table.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20181012175434_rm_dup_vote_count_col_from_works_table.rb b/db/migrate/20181012175434_rm_dup_vote_count_col_from_works_table.rb index c0cee0f93c..44cf738a25 100644 --- a/db/migrate/20181012175434_rm_dup_vote_count_col_from_works_table.rb +++ b/db/migrate/20181012175434_rm_dup_vote_count_col_from_works_table.rb @@ -1,5 +1,5 @@ class RmDupVoteCountColFromWorksTable < ActiveRecord::Migration[5.2] def change - remove_column :works, :vote_count + # remove_column :works, :vote_count end end From 0d1a7b5b716f968bfaa2d076626081d304127fb0 Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Tue, 16 Oct 2018 01:13:09 -0700 Subject: [PATCH 38/48] fixed login bug --- app/views/sessions/new.html.erb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index ad3f30aeb1..35cc2a498c 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -1,10 +1,9 @@ -

    Please Login

    <%= form_with model: @user, url: login_path, method: :post do |form| %> - <%= form.label :name, 'Username'%> - <%= form.text_field :name, placeholder: 'username', class: "form-control" %> - + + <%= form.label :name, 'Username'%> + <%= form.text_field :name, placeholder: 'username', class: "form-control" %> + <%= form.submit 'Login', class: "btn btn-primary" %> +
    <% end %> - - \ No newline at end of file From 49ac0abf3b20cecf140f1912e65a2027595efe4e Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Tue, 16 Oct 2018 01:24:30 -0700 Subject: [PATCH 39/48] fixed login css --- app/assets/stylesheets/application.scss | 1 + app/views/sessions/destroy.html.erb | 3 +-- app/views/sessions/login.html.erb | 3 +-- app/views/sessions/new.html.erb | 7 +++++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 931957a312..575fb4d60f 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -207,6 +207,7 @@ h2.top-ten-header { .new-user { width: 20rem; + } .btn-user { margin-top: 1rem; diff --git a/app/views/sessions/destroy.html.erb b/app/views/sessions/destroy.html.erb index d75237d982..8b13789179 100644 --- a/app/views/sessions/destroy.html.erb +++ b/app/views/sessions/destroy.html.erb @@ -1,2 +1 @@ -

    Sessions#destroy

    -

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

    + diff --git a/app/views/sessions/login.html.erb b/app/views/sessions/login.html.erb index 6fbfe54fd5..8b13789179 100644 --- a/app/views/sessions/login.html.erb +++ b/app/views/sessions/login.html.erb @@ -1,2 +1 @@ -

    Sessions#login

    -

    Find me in app/views/sessions/login.html.erb

    + diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index 35cc2a498c..9720830c53 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -1,9 +1,12 @@ +

    Please Login

    <%= form_with model: @user, url: login_path, method: :post do |form| %> -
    + <%= form.label :name, 'Username'%> <%= form.text_field :name, placeholder: 'username', class: "form-control" %> - <%= form.submit 'Login', class: "btn btn-primary" %> + <%= form.submit 'Login', class: "btn btn-primary btn-user" %>
    <% end %> + +
    From a6a03a4856218bbddaba8c8581d9e0ce9663780c Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Tue, 16 Oct 2018 08:58:07 -0700 Subject: [PATCH 40/48] works and users not found fixed --- .../images/pexels-photo-963486-no-user.jpeg | Bin 0 -> 7922 bytes app/assets/images/pexels-photo-no-work.jpg | Bin 0 -> 13555 bytes app/controllers/users_controller.rb | 6 +++++- app/controllers/works_controller.rb | 4 ++-- app/views/users/notfound.html.erb | 5 +++++ app/views/works/notfound.html.erb | 3 +++ 6 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 app/assets/images/pexels-photo-963486-no-user.jpeg create mode 100644 app/assets/images/pexels-photo-no-work.jpg create mode 100644 app/views/users/notfound.html.erb create mode 100644 app/views/works/notfound.html.erb diff --git a/app/assets/images/pexels-photo-963486-no-user.jpeg b/app/assets/images/pexels-photo-963486-no-user.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..0d0c87a1f91b9509c4abf8c4eb5e13923bb05b94 GIT binary patch literal 7922 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 Not Found 404 +<%= image_tag 'pexels-photo-963486-no-user.jpeg', :alt => 'empty room empty chair' %> + + diff --git a/app/views/works/notfound.html.erb b/app/views/works/notfound.html.erb new file mode 100644 index 0000000000..3b64075ae7 --- /dev/null +++ b/app/views/works/notfound.html.erb @@ -0,0 +1,3 @@ +

    Work Not Found 404

    +<%= image_tag 'pexels-photo-no-work.jpg', :alt => 'empty room' %> + From efc2ee5d05358ea3ddb5aca40c1c828ee83b9a6a Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Tue, 16 Oct 2018 18:04:01 -0700 Subject: [PATCH 41/48] rm unnecesary file --- app/views/sessions/login.html.erb | 1 - 1 file changed, 1 deletion(-) delete mode 100644 app/views/sessions/login.html.erb diff --git a/app/views/sessions/login.html.erb b/app/views/sessions/login.html.erb deleted file mode 100644 index 8b13789179..0000000000 --- a/app/views/sessions/login.html.erb +++ /dev/null @@ -1 +0,0 @@ - From 5192717cf4aa0a6422786c8d9eeec55e81f1feba Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Tue, 16 Oct 2018 18:31:43 -0700 Subject: [PATCH 42/48] file cleanup complete --- app/controllers/users_controller.rb | 30 ++++++++++------------- app/controllers/votes_controller.rb | 17 ++++++------- app/controllers/works_controller.rb | 38 ++++++++++++----------------- app/views/sessions/destroy.html.erb | 1 - app/views/votes/create.html.erb | 2 -- app/views/votes/destroy.html.erb | 2 -- app/views/votes/index.html.erb | 2 -- app/views/votes/new.html.erb | 2 -- app/views/votes/show.html.erb | 2 -- app/views/works/create.html.erb | 2 -- app/views/works/destroy.html.erb | 2 -- app/views/works/spotlight.html.erb | 7 ------ app/views/works/update.html.erb | 2 -- app/views/works/upvote.html.erb | 2 -- config/routes.rb | 4 +-- 15 files changed, 37 insertions(+), 78 deletions(-) delete mode 100644 app/views/sessions/destroy.html.erb delete mode 100644 app/views/votes/create.html.erb delete mode 100644 app/views/votes/destroy.html.erb delete mode 100644 app/views/votes/index.html.erb delete mode 100644 app/views/votes/new.html.erb delete mode 100644 app/views/votes/show.html.erb delete mode 100644 app/views/works/create.html.erb delete mode 100644 app/views/works/destroy.html.erb delete mode 100644 app/views/works/spotlight.html.erb delete mode 100644 app/views/works/update.html.erb delete mode 100644 app/views/works/upvote.html.erb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index dec9818c2b..32bb96a2d3 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -6,9 +6,6 @@ def index end def show; end - # call model method to retrieve all votes user has cast - - def new @user = User.new @@ -18,10 +15,9 @@ def edit; end def create @user = User.new(user_params) - respond_to do |format| if @user.save - format.html { redirect_to @user, primary: 'User was successfully created.' } + format.html { redirect_to @user, notice: 'User was successfully created.' } else format.html { render :new } end @@ -31,7 +27,7 @@ def create def update respond_to do |format| if @user.update(user_params) - format.html { redirect_to @user, info: 'User was successfully updated.' } + format.html { redirect_to @user, notice: 'User was successfully updated.' } else format.html { render :edit } end @@ -41,22 +37,22 @@ def update def destroy @user.destroy respond_to do |format| - format.html { redirect_to users_url, dark: 'User was successfully destroyed.' } + format.html { redirect_to users_url, notice: 'User was successfully destroyed.' } end end private - # Use callbacks to share common setup or constraints between actions. - def set_user - @user = User.find_by(id: params[:id].to_i) - if @user.nil? - flash.now[:danger] = "Cannot find the user #{params[:id]}" - render :notfound - end + + def set_user + @user = User.find_by(id: params[:id].to_i) + if @user.nil? + flash.now[:danger] = "Cannot find the user #{params[:id]}" + render :notfound end + end # Never trust parameters from the scary internet, only allow the white list through. - def user_params - params.require(:user).permit(:name) - end + def user_params + params.require(:user).permit(:name) + end end diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index 5e45947aec..46693ae47a 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -15,17 +15,14 @@ def show; end def create @vote = Vote.new(vote_params) - respond_to do |format| - if @vote.save - flash[:success] = 'Vote successfully created' - format.html { redirect_to @vote.work, notice: 'vote was successfully created.' } - else - flash.now[:danger] = 'Vote not created!' - @vote.errors.messages.each do |field, messages| - flash.now[field] = messages - end - format.html { render :new } + if @vote.save + flash[:success] = 'Vote successfully created' + else + flash.now[:danger] = 'Vote not created!' + @vote.errors.messages.each do |field, messages| + flash.now[field] = messages end + render :new end end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index b46a944d08..a682752be7 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -15,38 +15,31 @@ def edit; end def create @work = Work.new(work_params) - - respond_to do |format| - if @work.save - flash[:success] = 'Work successfully created' - format.html { redirect_to @work, notice: 'Work was successfully created.' } - else - flash.now[:warning] = 'Work not created!' - @work.errors.messages.each do |field, messages| - flash.now[field] = messages - end - format.html { render :new } + if @work.save + flash[:success] = 'Work successfully created' + redirect_to work_path(@work.id) + else + flash.now[:warning] = 'Work not created!' + @work.errors.messages.each do |field, messages| + flash.now[field] = messages end + render :new end end def update - respond_to do |format| - if @work.update(work_params) - # flash[:primary] = 'Work was successfully updated.' - # redirect_to work_path(@work.id) - format.html { redirect_to @work, notice: 'Work was successfully updated.' } - else - format.html { render :edit } - end + if @work.update(work_params) + flash[:primary] = 'Work was successfully updated.' + redirect_to work_path(@work.id) + else + render :edit end end def destroy @work.destroy - respond_to do |format| - format.html { redirect_to works_url, dark: 'Work was successfully destroyed.' } - end + flash[:secondary] = 'Work was successfully destroyed.' + redirect_to works_path end def upvote @@ -78,7 +71,6 @@ def spotlight end - private # Use callbacks to share common setup or constraints between actions. def set_work diff --git a/app/views/sessions/destroy.html.erb b/app/views/sessions/destroy.html.erb deleted file mode 100644 index 8b13789179..0000000000 --- a/app/views/sessions/destroy.html.erb +++ /dev/null @@ -1 +0,0 @@ - diff --git a/app/views/votes/create.html.erb b/app/views/votes/create.html.erb deleted file mode 100644 index 36aaa30279..0000000000 --- a/app/views/votes/create.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

    Votes#create

    -

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

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

    Votes#destroy

    -

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

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

    Votes#index

    -

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

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

    Votes#new

    -

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

    diff --git a/app/views/votes/show.html.erb b/app/views/votes/show.html.erb deleted file mode 100644 index 4e770528dc..0000000000 --- a/app/views/votes/show.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

    Votes#show

    -

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

    diff --git a/app/views/works/create.html.erb b/app/views/works/create.html.erb deleted file mode 100644 index 5bc7fb6058..0000000000 --- a/app/views/works/create.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

    Works#create

    -

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

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

    Works#destroy

    -

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

    diff --git a/app/views/works/spotlight.html.erb b/app/views/works/spotlight.html.erb deleted file mode 100644 index 51f2680e77..0000000000 --- a/app/views/works/spotlight.html.erb +++ /dev/null @@ -1,7 +0,0 @@ - -
    - -

    MEDIA SPOTLIGHT:

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

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

    \ No newline at end of file diff --git a/app/views/works/update.html.erb b/app/views/works/update.html.erb deleted file mode 100644 index 171f6d1516..0000000000 --- a/app/views/works/update.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

    Works#update

    -

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

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

    Works#upvote

    -

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

    diff --git a/config/routes.rb b/config/routes.rb index 012a6a161e..36b51790a8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,15 +3,15 @@ resources :users resources :votes, only: [:create, :destroy] + # create session for user login post 'sessions/login', to: 'sessions#login', as: 'login' # route to sessions new with login form get 'sessions/login', to: 'sessions#new' delete 'sessions/destroy', to: 'sessions#destroy', as: 'logout' - get 'works/top', to: 'works#top', as: 'works_top' - get 'works/spotlight', to: 'works#spotlight', as: 'works_spotlight' + # get 'works/spotlight', to: 'works#spotlight', as: 'works_spotlight' resources :works From 490048f01d34bf7fbae1a6f579672b9809ae3e75 Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Tue, 16 Oct 2018 20:33:54 -0700 Subject: [PATCH 43/48] created and cleaned up partials --- app/assets/stylesheets/application.scss | 15 +++- app/views/layouts/_flash_errs.html.erb | 15 ++++ app/views/layouts/_form_errors.html.erb | 24 +++--- app/views/layouts/_tops.html.erb | 19 ----- app/views/sessions/new.html.erb | 2 +- app/views/users/_form.html.erb | 33 +++----- app/views/users/edit.html.erb | 2 +- app/views/users/index.html.erb | 18 +---- app/views/users/new.html.erb | 5 -- app/views/users/show.html.erb | 16 +--- app/views/works/_form.html.erb | 65 +++++++-------- app/views/works/_top.html.erb | 19 +++++ app/views/works/edit.html.erb | 2 +- app/views/works/index.html.erb | 16 +--- app/views/works/show.html.erb | 103 ++++++++++-------------- app/views/works/top.html.erb | 60 ++------------ 16 files changed, 154 insertions(+), 260 deletions(-) create mode 100644 app/views/layouts/_flash_errs.html.erb delete mode 100644 app/views/layouts/_tops.html.erb delete mode 100644 app/views/users/new.html.erb create mode 100644 app/views/works/_top.html.erb diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 575fb4d60f..aaded9d894 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -199,10 +199,14 @@ h2.top-ten-header { margin: 3rem 5rem auto 5rem; } -.new-work { - font-size: 2rem; - font-weight: bold; +.new-work, .new-user h1, .works-index h1, .user_index h1 { + font-size: 3rem; color: #26A69A; + margin: 2rem auto auto 2rem; +} + +h2 { + margin: 1rem auto 1rem 2rem; } .new-user { @@ -212,6 +216,11 @@ h2.top-ten-header { .btn-user { margin-top: 1rem; } + +.form_errors { + margin-left: 5rem; +} + #error_explanation { color: red; ul { diff --git a/app/views/layouts/_flash_errs.html.erb b/app/views/layouts/_flash_errs.html.erb new file mode 100644 index 0000000000..5b1726431a --- /dev/null +++ b/app/views/layouts/_flash_errs.html.erb @@ -0,0 +1,15 @@ +
    + <% flash.each do |name, message| %> + <% if message.class == Array %> +
    + <% message.each do |msg| %> +

    <%= "#{name}:" %><%= " #{msg}" %>

    + <% end %> +
    + <% else %> +
    + <%= message %> +
    + <% end %> + <% end %> +
    diff --git a/app/views/layouts/_form_errors.html.erb b/app/views/layouts/_form_errors.html.erb index 3fffd3f3a8..3976573cf6 100644 --- a/app/views/layouts/_form_errors.html.erb +++ b/app/views/layouts/_form_errors.html.erb @@ -1,12 +1,14 @@ -<% if @work.errors.any? %> -
    -
    - The form contains <%= pluralize(@work.errors.count, "error") %>. +
    + <% if err_hash.errors.any? %> +
    +
    + The form contains <%= pluralize(err_hash.errors.count, "error") %>. +
    +
      + <% err_hash.errors.full_messages.each do |msg| %> +
    • <%= msg %>
      • + <% end %> +
    -
      - <% @work.errors.full_messages.each do |msg| %> -
    • <%= msg %>
      • - <% end %> -
    -
    -<% end %> \ No newline at end of file + <% end %> +
    \ No newline at end of file diff --git a/app/views/layouts/_tops.html.erb b/app/views/layouts/_tops.html.erb deleted file mode 100644 index 7240337f5d..0000000000 --- a/app/views/layouts/_tops.html.erb +++ /dev/null @@ -1,19 +0,0 @@ - -
    -
    -

    Top Movies

    -
      - <% if @movies.empty? %> -

      No movies have been added to the database.

      - <% else %> - <% @movies.each do |movie| %> -
    • -

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

      -

      <%= pluralize movie.votes_count, "vote" %>

      • - <% end %> - <% end %> -
    -
    diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index 9720830c53..ac21c593a1 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -1,5 +1,5 @@
    -

    Please Login

    +

    Please Login

    <%= form_with model: @user, url: login_path, method: :post do |form| %>
    diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb index 9e3a66996d..31982e5cae 100644 --- a/app/views/users/_form.html.erb +++ b/app/views/users/_form.html.erb @@ -1,24 +1,15 @@ <%= form_with(model: user, local: true) do |form| %> - <% if user.errors.any? %> -
    -

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

    -
      - <% user.errors.full_messages.each do |message| %> -
    • <%= message %>
      • - <% end %> -
    -
    - <% end %> - -
    -
    - <%= form.label :name %> - <%= form.text_field :name, class: "form-control"%> -
    + <%= render partial: '/layouts/form_errors', locals: { err_hash: user } %> - -<% end %> -
    -
    \ No newline at end of file +
    +
    +
    + <%= form.label :name %> + <%= form.text_field :name, class: "form-control"%> +
    + +
    +
    + +<% end %> \ No newline at end of file diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index 1a5c2a64f0..dc50788360 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -1,4 +1,4 @@ -

    Editing User

    +

    Edit User

    <%= render 'form', user: @user %> diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 344b0a785d..f8a828d716 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -1,18 +1,5 @@ -
    - <% flash.each do |name, message| %> - <% if message.class == Array %> -
    - <% message.each do |msg| %> -

    <%= "#{name}:" %><%= " #{msg}" %>

    - <% end %> -
    - <% else %> -
    - <%= message %> -
    - <% end %> - <% end %> -
    +<%= render partial: "/layouts/flash_errs" %> +

    Users

    @@ -40,4 +27,3 @@
    -<%= link_to 'New User', new_user_path, class: "btn btn-primary btn-center d-flex justify-content-center" %> diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb deleted file mode 100644 index 844c39b14d..0000000000 --- a/app/views/users/new.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -

    New User

    - -<%= render 'form', user: @user %> - -<%= link_to 'Back', users_path %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index f799f4bd35..ba2d43defe 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,18 +1,4 @@ -
    - <% flash.each do |name, message| %> - <% if message.class == Array %> -
    - <% message.each do |msg| %> -

    <%= "#{name}:" %><%= " #{msg}" %>

    - <% end %> -
    - <% else %> -
    - <%= message %> -
    - <% end %> - <% end %> -
    +<%= render partial: "/layouts/flash_errs" %>

    diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb index 20478fffce..139e77617e 100644 --- a/app/views/works/_form.html.erb +++ b/app/views/works/_form.html.erb @@ -1,39 +1,32 @@ <%= form_with(model: work, local: true) do |form| %> - <%= render 'layouts/form_errors' %> -

    -
    -
    - <%= form.label :title %> - <%= form.text_field :title, class: "form-control"%> -
    - -
    - <%= form.label :creator %> - <%= form.text_field :creator, class: "form-control" %> -
    - -
    - <%= form.label :description %> - <%= form.text_field :description, class: "form-control" %> -
    - -
    - <%= form.label :category %> - <%= form.select :category, [["Album", "album"], ["Book", "book"], ["Movie", "movie"]], {}, {class: "form-control"} %> -
    - -
    - <%= form.label :publication_year %> - <%= form.text_field :publication_year, class: "form-control" %> -
    - -
    - <%= form.submit :Submit, class: 'btn btn-primary' %> -
    - - -<% end %> - -
    + <%= render partial: '/layouts/form_errors', locals: { err_hash: @work } %> + + +
    +
    + <%= form.label :title %> + <%= form.text_field :title, class: "form-control"%> +
    +
    + <%= form.label :creator %> + <%= form.text_field :creator, class: "form-control" %> +
    +
    + <%= form.label :description %> + <%= form.text_field :description, class: "form-control" %> +
    +
    + <%= form.label :category %> + <%= form.select :category, [["Album", "album"], ["Book", "book"], ["Movie", "movie"]], {}, {class: "form-control"} %> +
    +
    + <%= form.label :publication_year %> + <%= form.text_field :publication_year, class: "form-control" %> +
    +
    + <%= form.submit :Submit, class: 'btn btn-primary' %> +
    + <% end %> +
    \ No newline at end of file diff --git a/app/views/works/_top.html.erb b/app/views/works/_top.html.erb new file mode 100644 index 0000000000..78f54eed13 --- /dev/null +++ b/app/views/works/_top.html.erb @@ -0,0 +1,19 @@ +
    +
    +

    Top <%=cat.pluralize.capitalize %>

    +
      + <% if cat_list.empty? %> +

      No <%=cat.pluralize%> have been added to the database.

      + <% else %> + <% cat_list.each do |item| %> +
    • +

      <%= link_to "#{item.title}", work_path(item.id), class: "top_title" %> + by + <%= item.creator %> +

      +

      <%= pluralize item.votes_count, "vote" %>

      • + <% end %> + <% end %> +
    +
    +
    diff --git a/app/views/works/edit.html.erb b/app/views/works/edit.html.erb index a89fa88f51..bdb90408a0 100644 --- a/app/views/works/edit.html.erb +++ b/app/views/works/edit.html.erb @@ -1,4 +1,4 @@ -

    Editing Work

    +

    Edit Work

    <%= render 'form', work: @work %> diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 34dcc7d141..0fbce62fd0 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1,18 +1,4 @@ -
    - <% flash.each do |name, message| %> - <% if message.class == Array %> -
    - <% message.each do |msg| %> -

    <%= "#{name}:" %><%= " #{msg}" %>

    - <% end %> -
    - <% else %> -
    - <%= message %> -
    - <% end %> - <% end %> -
    +<%= render partial: "/layouts/flash_errs" %>

    List of Works

    diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 0ec328f96f..8067da4152 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -1,70 +1,51 @@ -
    - <% flash.each do |name, message| %> - <% if message.class == Array %> -
    - <% message.each do |msg| %> -

    <%= "#{name}:" %><%= " #{msg}" %>

    - <% end %> -
    - <% else %> -
    - <%= message %> -
    - <% end %> - <% end %> -
    - +<%= render partial: "/layouts/flash_errs" %>
    -

    <%= @work.title %>

    - - -

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

    - -

    - Description: - <%= @work.description %> -

    - -

    - Category: - <%= @work.category %> -

    - -

    - Publication year: - <%= @work.publication_year %> -

    - -

    - Total Votes: - <%= @work.votes_count %> -

    - - - - - - - - - - <% @work.votes.each do |vote| %> - <% user = User.find(vote.user_id) %> - +

    <%= @work.title %>

    +

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

    + +

    + Description: + <%= @work.description %> +

    + +

    + Category: + <%= @work.category %> +

    + +

    + Publication year: + <%= @work.publication_year %> +

    + +

    + Total Votes: + <%= @work.votes_count %> +

    + + + +
    Biggest Fans:
    <%= user.name %>
    + + + - <% end %> - -
    Biggest Fans:
    - - - + + + <% @work.votes.each do |vote| %> + <% user = User.find(vote.user_id) %> + <%= user.name %> + + <% end %> +
    +
    <%= link_to 'Back', works_path, class: "btn btn-secondary" %> <%= link_to 'Edit', edit_work_path(@work), class: "btn btn-secondary" %> diff --git a/app/views/works/top.html.erb b/app/views/works/top.html.erb index efe7e0891f..b80bba58b9 100644 --- a/app/views/works/top.html.erb +++ b/app/views/works/top.html.erb @@ -3,63 +3,13 @@

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

    -
    -
    -

    Top Movies

    -
      - <% if @movies.empty? %> -

      No movies have been added to the database.

      - <% else %> - <% @movies.each do |movie| %> -
    • -

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

      -

      <%= pluralize movie.votes_count, "vote" %>

      • - <% end %> - <% end %> -
    -
    - -
    -

    Top Books

    -
      - <% if @books.empty? %> -

      No books have been added to the database.

      - <% else %> - <% @books.each do |book| %> -
    • -

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

      -

      <%= pluralize book.votes_count, "vote" %>

      • - <% end %> - <% end %> -
    -
    - - -
    -

    Top Albums

    -
      - <% if @albums.empty? %> -

      No albums have been added to the database.

      - <% else %> - <% @albums.each do |album| %> -
    • -

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

      -

      <%= pluralize album.votes_count, "vote" %>

      • - <% end %> - <% end %> -
    -
    + <%= render partial: "top", locals: { cat: "movie", cat_list: @movies } %> + <%= render partial: "top", locals: { cat: "book", cat_list: @books } %> + <%= render partial: "top", locals: { cat: "album", cat_list: @albums } %>
    + + From a1a0bfa2da8deaf2fcc5ddd052957182e41242d5 Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Tue, 16 Oct 2018 20:56:30 -0700 Subject: [PATCH 44/48] tests cleanup --- test/models/work_test.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/models/work_test.rb b/test/models/work_test.rb index 31c13b7d61..dce4d3da6f 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -66,6 +66,12 @@ end end + describe 'top' do + it 'returns works with votes counts in descending order' do + + end + end + end From e46866a759834a0562679ed2a8587c8bc8bfe664 Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Tue, 16 Oct 2018 22:33:31 -0700 Subject: [PATCH 45/48] factory bot created for some additional test data in works model --- Gemfile | 3 +++ Gemfile.lock | 9 +++++++++ test/factories/user.rb | 5 +++++ test/factories/work.rb | 11 +++++++++++ test/models/work_test.rb | 36 +++++++++++++++++++++++++++++++++++- test/test_helper.rb | 7 +++++++ 6 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 test/factories/user.rb create mode 100644 test/factories/work.rb diff --git a/Gemfile b/Gemfile index 6219256bd8..0d785926e2 100644 --- a/Gemfile +++ b/Gemfile @@ -56,6 +56,9 @@ group :test do gem 'selenium-webdriver' # Easy installation and use of chromedriver to run system tests with Chrome gem 'chromedriver-helper' + gem "factory_bot_rails" + gem "faker" + end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem diff --git a/Gemfile.lock b/Gemfile.lock index c2238a0a0a..b42936ed5a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -83,6 +83,13 @@ GEM debug_inspector (0.0.3) erubi (1.7.1) execjs (2.7.0) + factory_bot (4.11.1) + activesupport (>= 3.0.0) + factory_bot_rails (4.11.1) + factory_bot (~> 4.11.1) + railties (>= 3.0.0) + faker (1.9.1) + i18n (>= 0.7) ffi (1.9.25) formatador (0.2.5) globalid (0.4.1) @@ -249,6 +256,8 @@ DEPENDENCIES byebug capybara (>= 2.15) chromedriver-helper + factory_bot_rails + faker guard guard-minitest jbuilder (~> 2.5) diff --git a/test/factories/user.rb b/test/factories/user.rb new file mode 100644 index 0000000000..934af69ebd --- /dev/null +++ b/test/factories/user.rb @@ -0,0 +1,5 @@ +FactoryBot.define do + factory :user do + name { Faker::Name.first_name } + end +end diff --git a/test/factories/work.rb b/test/factories/work.rb new file mode 100644 index 0000000000..2df6bb63af --- /dev/null +++ b/test/factories/work.rb @@ -0,0 +1,11 @@ +FactoryBot.define do + factory :work do + title { Faker::Music.unique.album } + creator { Faker::RuPaul.queen } + description { Faker::RuPaul.quote } + category { "movie" } + publication_year { Faker::Number.between(1888, 2018) } + votes_count { Faker::Number.between(0, 15) } + end +end + diff --git a/test/models/work_test.rb b/test/models/work_test.rb index dce4d3da6f..de6e700b67 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -68,14 +68,48 @@ describe 'top' do it 'returns works with votes counts in descending order' do + 10.times do + work = create(:work) + end + + top_movies = Work.top?("movie") + expect(top_movies.count).must_equal 10 + expect(top_movies.first.votes_count).must_be :>, top_movies.last.votes_count + end + it 'returns an empty array if no works in a category' do + albums = Work.where(category: "album") + albums.destroy_all + + top_albums = Work.top?("album") + expect(top_albums).must_be_empty + expect(top_albums).must_be_instance_of Array end end + describe 'spotlight' do + it 'randomly selects a work' do + 10.times do + work = create(:work) + end - end + # implement a handful of runs to make sure the same works are not + # being selected + work1 = Work.spotlight? + work2 = Work.spotlight? + work3 = Work.spotlight? + work4 = Work.spotlight? + work5 = Work.spotlight? + expect(work1).wont_equal work2 + expect(work2).wont_equal work3 + expect(work3).wont_equal work4 + expect(work4).wont_equal work5 + expect(work1).must_be_instance_of Work + end + end + end end diff --git a/test/test_helper.rb b/test/test_helper.rb index fb7dd505e2..09dd667091 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -22,4 +22,11 @@ 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... + include FactoryBot::Syntax::Methods + +end + +# for Spec expectation style +class MiniTest::Spec + include FactoryBot::Syntax::Methods end From ee7087881d0a88cbc1d09fb75f62a9f0800941f3 Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Tue, 16 Oct 2018 22:48:05 -0700 Subject: [PATCH 46/48] heroku custom 404 not showing --- app/controllers/users_controller.rb | 2 +- app/controllers/works_controller.rb | 2 +- config/initializers/assets.rb | 4 ++++ public/pexels-photo-963486-no-user.jpeg | Bin 0 -> 7922 bytes public/pexels-photo-no-work.jpg | Bin 0 -> 13555 bytes 5 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 public/pexels-photo-963486-no-user.jpeg create mode 100644 public/pexels-photo-no-work.jpg diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 32bb96a2d3..ccbcab51fb 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -47,7 +47,7 @@ def set_user @user = User.find_by(id: params[:id].to_i) if @user.nil? flash.now[:danger] = "Cannot find the user #{params[:id]}" - render :notfound + render :notfound, status: :not_found end end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index a682752be7..6bf5c61910 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -77,7 +77,7 @@ def set_work @work = Work.find_by(id: params[:id].to_i) if @work.nil? flash.now[:warning] = 'Work not found' - render :notfound + render :notfound, status: :not_found end end diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 4b828e80cb..71e5503f79 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -12,3 +12,7 @@ # 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 ) +Rails.application.config.assets.precompile << /\.(?:png|jpg|jpeg|gif)\z/ +Rails.application.config.assets.precompile << /\.(?:svg|eot|woff|ttf)\z/ + +Rails.application.config.assets.precompile += %w( .svg .eot .woff .ttf .png .jpg .gif) \ No newline at end of file diff --git a/public/pexels-photo-963486-no-user.jpeg b/public/pexels-photo-963486-no-user.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..0d0c87a1f91b9509c4abf8c4eb5e13923bb05b94 GIT binary patch literal 7922 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 Date: Tue, 16 Oct 2018 22:54:13 -0700 Subject: [PATCH 47/48] config initializer assets.rb fixed to render custom 404 not found pages for works and users --- app/controllers/users_controller.rb | 2 +- config/initializers/assets.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index ccbcab51fb..150255a9b8 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -46,7 +46,7 @@ def destroy def set_user @user = User.find_by(id: params[:id].to_i) if @user.nil? - flash.now[:danger] = "Cannot find the user #{params[:id]}" + flash.now[:warning] = "Cannot find the user #{params[:id]}" render :notfound, status: :not_found end end diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 71e5503f79..95556aa7f4 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -12,7 +12,7 @@ # 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 ) -Rails.application.config.assets.precompile << /\.(?:png|jpg|jpeg|gif)\z/ -Rails.application.config.assets.precompile << /\.(?:svg|eot|woff|ttf)\z/ +# Rails.application.config.assets.precompile << /\.(?:png|jpg|jpeg|gif)\z/ +# Rails.application.config.assets.precompile << /\.(?:svg|eot|woff|ttf)\z/ -Rails.application.config.assets.precompile += %w( .svg .eot .woff .ttf .png .jpg .gif) \ No newline at end of file +Rails.application.config.assets.precompile += %w( .svg .eot .woff .ttf .png .jpg .jpeg .gif) \ No newline at end of file From 12a703492d645285df21abb41edce21da3ff7cbe Mon Sep 17 00:00:00 2001 From: xLJohnsonx Date: Tue, 16 Oct 2018 23:02:14 -0700 Subject: [PATCH 48/48] modify jpg to try and render in heroku --- ...963486-no-user.jpeg => pexels-photo-no-user.jpg} | Bin app/views/users/notfound.html.erb | 2 +- config/initializers/assets.rb | 4 ++-- ...963486-no-user.jpeg => pexels-photo-no-user.jpg} | Bin 4 files changed, 3 insertions(+), 3 deletions(-) rename app/assets/images/{pexels-photo-963486-no-user.jpeg => pexels-photo-no-user.jpg} (100%) rename public/{pexels-photo-963486-no-user.jpeg => pexels-photo-no-user.jpg} (100%) diff --git a/app/assets/images/pexels-photo-963486-no-user.jpeg b/app/assets/images/pexels-photo-no-user.jpg similarity index 100% rename from app/assets/images/pexels-photo-963486-no-user.jpeg rename to app/assets/images/pexels-photo-no-user.jpg diff --git a/app/views/users/notfound.html.erb b/app/views/users/notfound.html.erb index c1c89caeb3..ad83b9bed4 100644 --- a/app/views/users/notfound.html.erb +++ b/app/views/users/notfound.html.erb @@ -1,5 +1,5 @@

    User Not Found 404

    -<%= image_tag 'pexels-photo-963486-no-user.jpeg', :alt => 'empty room empty chair' %> +<%= image_tag 'pexels-photo-no-user.jpg', :alt => 'empty room empty chair' %> diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 95556aa7f4..f73ed89f6b 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -12,7 +12,7 @@ # 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 ) -# Rails.application.config.assets.precompile << /\.(?:png|jpg|jpeg|gif)\z/ -# Rails.application.config.assets.precompile << /\.(?:svg|eot|woff|ttf)\z/ +Rails.application.config.assets.precompile << /\.(?:png|jpg|jpeg|gif)\z/ +Rails.application.config.assets.precompile << /\.(?:svg|eot|woff|ttf)\z/ Rails.application.config.assets.precompile += %w( .svg .eot .woff .ttf .png .jpg .jpeg .gif) \ No newline at end of file diff --git a/public/pexels-photo-963486-no-user.jpeg b/public/pexels-photo-no-user.jpg similarity index 100% rename from public/pexels-photo-963486-no-user.jpeg rename to public/pexels-photo-no-user.jpg