From 115d871ff2d32d4cd4b67fe0869fb6a42d279c59 Mon Sep 17 00:00:00 2001 From: ranuseh Date: Mon, 22 Apr 2019 15:49:28 -0700 Subject: [PATCH 01/37] Initial Rails setup --- .gitignore | 27 ++ .ruby-version | 1 + Gemfile | 81 +++++ Gemfile.lock | 279 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/assets/config/manifest.js | 3 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 19 ++ app/assets/javascripts/cable.js | 13 + app/assets/javascripts/channels/.keep | 0 app/assets/stylesheets/application.scss | 17 ++ 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 +++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/assets.rb | 14 + config/initializers/backtrace_silencers.rb | 7 + .../initializers/content_security_policy.rb | 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 81 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/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/assets.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/content_security_policy.rb create mode 100644 config/initializers/cookies_serializer.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 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..18b43c9cd2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +# 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 diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000000..e54d447e8f --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.4.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000000..afd9066d72 --- /dev/null +++ b/Gemfile @@ -0,0 +1,81 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.4.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.3' +# 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..4130ba7286 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,279 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + ansi (1.5.0) + archive-zip (0.12.0) + io-like (~> 0.3.0) + arel (9.0.0) + autoprefixer-rails (9.5.1) + execjs + better_errors (2.5.1) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) + bindex (0.7.0) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + bootsnap (1.4.3) + 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 (11.0.1) + capybara (3.18.0) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + childprocess (1.0.1) + rake (< 13.0) + chromedriver-helper (2.1.1) + archive-zip (~> 0.10) + nokogiri (~> 1.8) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + debug_inspector (0.0.3) + erubi (1.8.0) + execjs (2.7.0) + ffi (1.10.0) + formatador (0.2.5) + globalid (0.4.2) + activesupport (>= 4.2.0) + guard (2.15.0) + 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.6.0) + concurrent-ruby (~> 1.0) + io-like (0.3.0) + jbuilder (2.8.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.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.0.13) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.6) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.10) + multi_json (1.13.1) + nenv (0.3.0) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + notiffany (0.1.1) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.1.4) + popper_js (1.14.5) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + public_suffix (3.0.3) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + 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.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + regexp_parser (1.4.0) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + rubyzip (1.2.2) + sass (3.7.4) + 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.141.5926) + childprocess (>= 0.5, < 2.0) + 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.3) + thread_safe (0.3.6) + tilt (2.0.9) + turbolinks (5.2.0) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + tzinfo (1.2.5) + thread_safe (~> 0.1) + uglifier (4.1.20) + 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.2.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.3) + 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.4.1p111 + +BUNDLED WITH + 1.17.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..b0ef35b723 --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,19 @@ +// 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..b4d20f5641 --- /dev/null +++ b/app/assets/stylesheets/application.scss @@ -0,0 +1,17 @@ +/* + * 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..1258eeaf4d --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +aBhH+6/RILh4718jumxYYpamH6Ogj3aPFnfiMAayk81e+CQ5tbbw8P2E9jny5JieajzK6WCdLnGlBGORx6UTnc5x4tAaaUzKvA6sRBg+3pJiD0fy/dh2wJQHtdcmgoSrHzJ2CPORn5eDbqqQRrwP5h0OI1NuLKYGdExn9D0/RWnyW40+mqwQjN9knTzzp9Y6dTGaW3XiCCw2qETgbT6Xz8aCLbb94flWBBToj9p2L3a37ejl1jAYN3kg7tsnsiktvHHCrkWvqT2l7aCX9RKFQi9QsEDVlydJbSMlwEyUIvBExyhlLbdxnVc4zftoplqHtwJ9JU6aNLSYCs22oU0ECBBFF3aUCPOD5LEsSR9Q/rMbZuZO0CdOqMRzjalc8auw9x6F5ldnfHZj2SaFv7Owia900k0RqPPXGz3b--SeKUgZSTgLE1MWOX--hm03r40/8u6MHo6pwvd9zw== \ 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/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 0000000000..142d382f87 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 0000000000..89d2efab2b --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb new file mode 100644 index 0000000000..4b828e80cb --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# Version of your assets, change this if you want to expire all your assets. +Rails.application.config.assets.version = '1.0' + +# Add additional assets to the asset load path. +# Rails.application.config.assets.paths << Emoji.images_path +# Add Yarn node_modules folder to the asset load path. +Rails.application.config.assets.paths << Rails.root.join('node_modules') + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in the app/assets +# folder are already added. +# Rails.application.config.assets.precompile += %w( admin.js admin.css ) diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 0000000000..59385cdf37 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb new file mode 100644 index 0000000000..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 143988e05dced02ca70cd9684a654adc2bccfe10 Mon Sep 17 00:00:00 2001 From: ranuseh Date: Mon, 22 Apr 2019 16:17:24 -0700 Subject: [PATCH 02/37] Added models, controllers and routes --- app/assets/javascripts/users.js | 2 + app/assets/javascripts/works.js | 2 + app/assets/stylesheets/users.scss | 3 ++ app/assets/stylesheets/works.scss | 3 ++ app/controllers/users_controller.rb | 2 + app/controllers/works_controller.rb | 2 + app/helpers/users_helper.rb | 2 + app/helpers/works_helper.rb | 2 + app/models/user.rb | 4 ++ app/models/work.rb | 4 ++ config/routes.rb | 5 +++ db/migrate/20190422230306_create_works.rb | 13 ++++++ db/migrate/20190422230505_create_users.rb | 10 +++++ .../20190422230615_add_votes_to_works.rb | 5 +++ .../20190422231018_create_users_works_join.rb | 8 ++++ db/schema.rb | 43 +++++++++++++++++++ test/controllers/users_controller_test.rb | 7 +++ test/controllers/works_controller_test.rb | 7 +++ test/fixtures/users.yml | 9 ++++ test/fixtures/works.yml | 15 +++++++ test/models/user_test.rb | 9 ++++ test/models/work_test.rb | 9 ++++ 22 files changed, 166 insertions(+) create mode 100644 app/assets/javascripts/users.js create mode 100644 app/assets/javascripts/works.js create mode 100644 app/assets/stylesheets/users.scss create mode 100644 app/assets/stylesheets/works.scss create mode 100644 app/controllers/users_controller.rb create mode 100644 app/controllers/works_controller.rb create mode 100644 app/helpers/users_helper.rb create mode 100644 app/helpers/works_helper.rb create mode 100644 app/models/user.rb create mode 100644 app/models/work.rb create mode 100644 db/migrate/20190422230306_create_works.rb create mode 100644 db/migrate/20190422230505_create_users.rb create mode 100644 db/migrate/20190422230615_add_votes_to_works.rb create mode 100644 db/migrate/20190422231018_create_users_works_join.rb create mode 100644 db/schema.rb create mode 100644 test/controllers/users_controller_test.rb create mode 100644 test/controllers/works_controller_test.rb create mode 100644 test/fixtures/users.yml create mode 100644 test/fixtures/works.yml create mode 100644 test/models/user_test.rb create mode 100644 test/models/work_test.rb diff --git a/app/assets/javascripts/users.js b/app/assets/javascripts/users.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/users.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/javascripts/works.js b/app/assets/javascripts/works.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/works.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/users.scss b/app/assets/stylesheets/users.scss new file mode 100644 index 0000000000..31a2eacb84 --- /dev/null +++ b/app/assets/stylesheets/users.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Users controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/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/users_controller.rb b/app/controllers/users_controller.rb new file mode 100644 index 0000000000..3e74dea87f --- /dev/null +++ b/app/controllers/users_controller.rb @@ -0,0 +1,2 @@ +class UsersController < ApplicationController +end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb new file mode 100644 index 0000000000..56b02c9f2e --- /dev/null +++ b/app/controllers/works_controller.rb @@ -0,0 +1,2 @@ +class WorksController < ApplicationController +end diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb new file mode 100644 index 0000000000..2310a240d7 --- /dev/null +++ b/app/helpers/users_helper.rb @@ -0,0 +1,2 @@ +module UsersHelper +end diff --git a/app/helpers/works_helper.rb b/app/helpers/works_helper.rb new file mode 100644 index 0000000000..ccb78c2b73 --- /dev/null +++ b/app/helpers/works_helper.rb @@ -0,0 +1,2 @@ +module WorksHelper +end diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 0000000000..497a13b160 --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,4 @@ +class User < ApplicationRecord + has_and_belongs_to_many :works + +end diff --git a/app/models/work.rb b/app/models/work.rb new file mode 100644 index 0000000000..a30c3617ac --- /dev/null +++ b/app/models/work.rb @@ -0,0 +1,4 @@ +class Work < ApplicationRecord + has_and_belongs_to_many :users + +end diff --git a/config/routes.rb b/config/routes.rb index 787824f888..ad2b39b2b9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,8 @@ Rails.application.routes.draw do + resources :works + resources :users + + + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/db/migrate/20190422230306_create_works.rb b/db/migrate/20190422230306_create_works.rb new file mode 100644 index 0000000000..d6e24fdb58 --- /dev/null +++ b/db/migrate/20190422230306_create_works.rb @@ -0,0 +1,13 @@ +class CreateWorks < ActiveRecord::Migration[5.2] + def change + create_table :works do |t| + t.string :category + t.string :title + t.string :creator + t.integer :publication_year + t.string :description + + t.timestamps + end + end +end diff --git a/db/migrate/20190422230505_create_users.rb b/db/migrate/20190422230505_create_users.rb new file mode 100644 index 0000000000..540c46e1d5 --- /dev/null +++ b/db/migrate/20190422230505_create_users.rb @@ -0,0 +1,10 @@ +class CreateUsers < ActiveRecord::Migration[5.2] + def change + create_table :users do |t| + t.string :username + t.integer :votes + + t.timestamps + end + end +end diff --git a/db/migrate/20190422230615_add_votes_to_works.rb b/db/migrate/20190422230615_add_votes_to_works.rb new file mode 100644 index 0000000000..0598032a0e --- /dev/null +++ b/db/migrate/20190422230615_add_votes_to_works.rb @@ -0,0 +1,5 @@ +class AddVotesToWorks < ActiveRecord::Migration[5.2] + def change + add_column :works, :votes, :integer + end +end diff --git a/db/migrate/20190422231018_create_users_works_join.rb b/db/migrate/20190422231018_create_users_works_join.rb new file mode 100644 index 0000000000..590d4a1413 --- /dev/null +++ b/db/migrate/20190422231018_create_users_works_join.rb @@ -0,0 +1,8 @@ +class CreateUsersWorksJoin < ActiveRecord::Migration[5.2] + def change + create_table :users_works_joins do |t| + t.belongs_to :user, index: true + t.belongs_to :work, index: true + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000000..67cb100cdb --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,43 @@ +# 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: 2019_04_22_231018) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "users", force: :cascade do |t| + t.string "username" + t.integer "votes" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "users_works_joins", force: :cascade do |t| + t.bigint "user_id" + t.bigint "work_id" + t.index ["user_id"], name: "index_users_works_joins_on_user_id" + t.index ["work_id"], name: "index_users_works_joins_on_work_id" + end + + create_table "works", force: :cascade do |t| + t.string "category" + t.string "title" + t.string "creator" + t.integer "publication_year" + t.string "description" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "votes" + end + +end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb new file mode 100644 index 0000000000..89decb54e0 --- /dev/null +++ b/test/controllers/users_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe UsersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb new file mode 100644 index 0000000000..d95073c22e --- /dev/null +++ b/test/controllers/works_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe WorksController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 0000000000..235b3c208d --- /dev/null +++ b/test/fixtures/users.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + username: MyString + votes: 1 + +two: + username: MyString + votes: 1 diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml new file mode 100644 index 0000000000..6772d84de5 --- /dev/null +++ b/test/fixtures/works.yml @@ -0,0 +1,15 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + category: MyString + title: MyString + creator: MyString + publication_year: 1 + description: MyString + +two: + category: MyString + title: MyString + creator: MyString + publication_year: 1 + description: 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 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 05c51b9ee371ca5d4dc5eafc19da465bc93eb369 Mon Sep 17 00:00:00 2001 From: ranuseh Date: Mon, 22 Apr 2019 17:01:46 -0700 Subject: [PATCH 03/37] Seeded database --- app/controllers/users_controller.rb | 5 +++ app/controllers/works_controller.rb | 4 +++ config/routes.rb | 3 ++ db/seeds.rb | 54 +++++++++++++++++++++++++++++ 4 files changed, 66 insertions(+) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 3e74dea87f..854e54c738 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,2 +1,7 @@ class UsersController < ApplicationController + + def index + @users = Users.all.sort_by(&:id) + end + end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 56b02c9f2e..84a066be9e 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,2 +1,6 @@ class WorksController < ApplicationController + + def index + @works = Works.all.sort_by(&:id) + end end diff --git a/config/routes.rb b/config/routes.rb index ad2b39b2b9..32159b75ce 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,7 @@ Rails.application.routes.draw do + + root 'works#index', as: 'home' + resources :works resources :users diff --git a/db/seeds.rb b/db/seeds.rb index 1beea2accd..af5ab9f23c 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,3 +1,57 @@ +require 'csv' + +WORK_FILE = Rails.root.join('db', 'media_seeds.csv') +puts "Loading raw work data from #{WORK_FILE}" + +work_failures = [] +CSV.foreach(WORK_FILE, :headers => true) do |row| + work = Work.new + work.id = row['id'] + work.category = row['category'] + work.title = row['title'] + work.creator = row['creator'] + work.publication_year = row['publication year'] + work.description = row['description'] + work.votes = row['votes'] + + + 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} work records" +puts "#{work_failures.length} works failed to save" + +require 'csv' + +USER_FILE = Rails.root.join('db', 'media_seeds.csv') +puts "Loading raw user data from #{USER_FILE}" + +user_failures = [] +CSV.foreach(USER_FILE, :headers => true) do |row| + user = User.new + user.id = row['id'] + user.username = row['username'] + user.votes = row['votes'] + successful = user.save + if !successful + user_failures << user + puts "Failed to save user: #{user.inspect}" + else + puts "Created user: #{user.inspect}" + end +end + +puts "Added #{User.count} user records" +puts "#{user_failures.length} users failed to save" + + + # 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). # From 804758309791e0602446920b1a66549b6981dc66 Mon Sep 17 00:00:00 2001 From: ranuseh Date: Mon, 22 Apr 2019 17:25:35 -0700 Subject: [PATCH 04/37] Added method skeleton to users and works controllers --- app/controllers/users_controller.rb | 65 ++++++++++++++++++++++++++ app/controllers/works_controller.rb | 71 +++++++++++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 854e54c738..a9e052a80e 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -4,4 +4,69 @@ def index @users = Users.all.sort_by(&:id) end + def new + @user = User.new + end + + def create + @user = User.new(user_params) + + if @user.save + redirect_to users_path + else + render :new + end + end + + def show + user_id = params[:id] + @user = User.find(user_id) + @works = Work.where(user_id: user_id.to_i) + end + + def edit + user_id = params[:id] + @user = User.find_by(id: user_id) + redirect_to user_path if @user.nil? + end + + def update + begin + user_id = params[:id] + user = User.find(user_id) + rescue + flash[:error] = "Could not find user with id: #{params['id']}" + redirect_to user_path(user_id) + return + end + + if user.update(user_params) + redirect_to users_path + else + render :new + end + end + + def destroy + begin + user = User.find(params[:id]) + rescue + flash[:error] = "Could not find user with id: #{params['id']}" + redirect_to users_path + return + end + user.destroy + redirect_to users_path + end + +end + +private + +def user_params + params.require(:user).permit( + :username, + :votes + ) end + \ No newline at end of file diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 84a066be9e..a2141ccb6d 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -3,4 +3,75 @@ class WorksController < ApplicationController def index @works = Works.all.sort_by(&:id) end + + def new + @work = Work.new + end + + def create + @work = Work.new(work_params) + + if @work.save + redirect_to works_path + else + render :new + end + end + + def show + work_id = params[:id] + @work = Work.find(work_id) + @users = User.where(work_id: work_id.to_i) + end + + def edit + work_id = params[:id] + @work = Work.find_by(id: work_id) + redirect_to work_path if @work.nil? + end + + def update + begin + work_id = params[:id] + work = Work.find(work_id) + rescue + flash[:error] = "Could not find work with id: #{params['id']}" + redirect_to work_path(work_id) + return + end + + if work.update(work_params) + redirect_to works_path + else + render :new + end + end + + def destroy + begin + work = Work.find(params[:id]) + rescue + flash[:error] = "Could not find work with id: #{params['id']}" + redirect_to works_path + return + end + work.destroy + redirect_to works_path + end + +end + +private + +def work_params + params.require(:work).permit( + :category, + :title, + :creator, + :publication_year, + :description, + :votes + ) + end + end From 47d41cf2d47da7216bfbee99470fd8f9fabd160f Mon Sep 17 00:00:00 2001 From: ranuseh Date: Mon, 22 Apr 2019 18:38:01 -0700 Subject: [PATCH 05/37] built html and styled css for main page --- app/assets/stylesheets/application.css | 113 ++++++++++++++++++++++++ app/assets/stylesheets/application.scss | 17 ---- app/controllers/works_controller.rb | 4 +- app/views/layouts/application.html.erb | 19 ++++ app/views/works/index.html.erb | 13 +++ 5 files changed, 146 insertions(+), 20 deletions(-) create mode 100644 app/assets/stylesheets/application.css delete mode 100644 app/assets/stylesheets/application.scss create mode 100644 app/views/works/index.html.erb diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css new file mode 100644 index 0000000000..bf2e736592 --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,113 @@ + body { + display: flex; + flex-direction: column; + background-color: white; + font-family: 'Raleway', sans-serif; + margin: 0px; +} + +.nav_list { + display: flex; + flex-direction: row; + justify-content: space-around; + margin: 20px; +} + +header { + background-color: #EAFFFD; + color: #FFFFFF; +} + +.main_title { + margin: 70px; + text-align: center; + +} + +.media_spotlight { + padding: 0; + font-size: 25px; + flex-direction: row; + margin-left: 50px; +} +.main_options { + display: flex; + padding: 0; + font-size: 25px; + flex-direction: row; + justify-content: space-around; +} + +.main_options li { + margin: 75px; + list-style-type: none; +} + +a { + text-decoration: none; + color: black; + font-weight: bold; +} + +footer { + background-color: #D5CAD6; + grid-column: span 2; + height: 50px; + position: fixed; + bottom: 0; + width: 100%; +} + +footer p { +text-align: center; +} + +a:hover { + color: #000000 +} + +table { + font-family: arial, sans-serif; + border-collapse: collapse; + width: auto; + text-align: left; + margin: 20px; +} + +td, th { + border: 1px solid #dddddd; + text-align: left; + padding: 8px; +} + +tr:nth-child(even) { + background-color: #dddddd; +} + +h2, .rating, form { + margin-left: 20px; +} + +form div { + margin: 0 10px 20px 0px; +} + + + +/* + * 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/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss deleted file mode 100644 index b4d20f5641..0000000000 --- a/app/assets/stylesheets/application.scss +++ /dev/null @@ -1,17 +0,0 @@ -/* - * 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/controllers/works_controller.rb b/app/controllers/works_controller.rb index a2141ccb6d..6227a75ca5 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,7 +1,7 @@ class WorksController < ApplicationController def index - @works = Works.all.sort_by(&:id) + # @works = Works.all.sort_by(&:id) end def new @@ -72,6 +72,4 @@ def work_params :description, :votes ) - end - end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f32268a271..968da346b1 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -2,6 +2,7 @@ MediaRanker + <%= csrf_meta_tags %> <%= csp_meta_tag %> @@ -10,6 +11,24 @@ +
+

+ <%= link_to 'Media Ranker | Ranking the Best of Everything', home_path %> +

+
+ <%=link_to 'View Top Media'%> + <%= link_to 'View All Media'%> + <%= link_to 'Add New Work'%> + <%= link_to 'View all users'%> + <%=link_to 'Log In'%> +
+
+
<%= yield %> +
+ +
+

© Rosalyn Development 2019

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

+ <%= link_to 'Media Spotlight: ' %> + <%=link_to 'Some information about votes'%> +

+
+
+
    +
  • <%= link_to 'Top Movies'%>
    • +
  • <%= link_to 'Top Books'%>
    • +
  • <%= link_to 'Top Albums'%>
    • +
+
\ No newline at end of file From c7b1a321e64830d9a883945843b2fd5fc4144aad Mon Sep 17 00:00:00 2001 From: ranuseh Date: Mon, 22 Apr 2019 19:16:45 -0700 Subject: [PATCH 06/37] Added spotlight feature --- app/assets/javascripts/homepages.js | 2 ++ app/assets/stylesheets/application.css | 3 ++- app/assets/stylesheets/homepages.scss | 3 +++ app/controllers/homepages_controller.rb | 4 ++++ app/controllers/works_controller.rb | 3 ++- app/helpers/homepages_helper.rb | 2 ++ app/views/homepages/index.html.erb | 16 ++++++++++++++++ app/views/layouts/application.html.erb | 5 +++-- app/views/works/index.html.erb | 13 ------------- config/routes.rb | 2 +- test/controllers/homepages_controller_test.rb | 7 +++++++ 11 files changed, 42 insertions(+), 18 deletions(-) create mode 100644 app/assets/javascripts/homepages.js create mode 100644 app/assets/stylesheets/homepages.scss create mode 100644 app/controllers/homepages_controller.rb create mode 100644 app/helpers/homepages_helper.rb create mode 100644 app/views/homepages/index.html.erb delete mode 100644 app/views/works/index.html.erb create mode 100644 test/controllers/homepages_controller_test.rb diff --git a/app/assets/javascripts/homepages.js b/app/assets/javascripts/homepages.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/homepages.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index bf2e736592..19a6f5726f 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -28,8 +28,9 @@ header { padding: 0; font-size: 25px; flex-direction: row; - margin-left: 50px; + margin: 50px 0 0 100px; } + .main_options { display: flex; padding: 0; diff --git a/app/assets/stylesheets/homepages.scss b/app/assets/stylesheets/homepages.scss new file mode 100644 index 0000000000..e42583ae81 --- /dev/null +++ b/app/assets/stylesheets/homepages.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the homepages 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/homepages_controller.rb b/app/controllers/homepages_controller.rb new file mode 100644 index 0000000000..78d21c8797 --- /dev/null +++ b/app/controllers/homepages_controller.rb @@ -0,0 +1,4 @@ +class HomepagesController < ApplicationController + + +end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 6227a75ca5..e4805024e4 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,7 +1,8 @@ class WorksController < ApplicationController def index - # @works = Works.all.sort_by(&:id) + @works = Works.all.sort_by(&:id) + @spotlight = @works.sample end def new diff --git a/app/helpers/homepages_helper.rb b/app/helpers/homepages_helper.rb new file mode 100644 index 0000000000..4bd8098f37 --- /dev/null +++ b/app/helpers/homepages_helper.rb @@ -0,0 +1,2 @@ +module HomepagesHelper +end diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb new file mode 100644 index 0000000000..3507aa3012 --- /dev/null +++ b/app/views/homepages/index.html.erb @@ -0,0 +1,16 @@ +
+

+ <% if @spotlight %> + Media Spotlight: <%= @spotlight %> + <% else %> +

No spotlight today

+ <% end %> +

+
+
+
    +
  • <%= link_to 'Top Movies'%>
    • +
  • <%= link_to 'Top Books'%>
    • +
  • <%= link_to 'Top Albums'%>
    • +
+
\ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 968da346b1..bc1fd2e26c 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -2,18 +2,19 @@ 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' %> + <%= favicon_link_tag asset_path('owl.jpg')%> +

- <%= link_to 'Media Ranker | Ranking the Best of Everything', home_path %> + <%= link_to 'Media Ranker | Ranking the Best of Everything'%>

<%=link_to 'View Top Media'%> diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb deleted file mode 100644 index 977bacd964..0000000000 --- a/app/views/works/index.html.erb +++ /dev/null @@ -1,13 +0,0 @@ -
-

- <%= link_to 'Media Spotlight: ' %> - <%=link_to 'Some information about votes'%> -

-
-
-
    -
  • <%= link_to 'Top Movies'%>
    • -
  • <%= link_to 'Top Books'%>
    • -
  • <%= link_to 'Top Albums'%>
    • -
-
\ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 32159b75ce..e1c5a90b7a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ Rails.application.routes.draw do - root 'works#index', as: 'home' + root 'homepages#index' resources :works resources :users diff --git a/test/controllers/homepages_controller_test.rb b/test/controllers/homepages_controller_test.rb new file mode 100644 index 0000000000..5ba3024fa1 --- /dev/null +++ b/test/controllers/homepages_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe HomepagesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 3d903aacd56e87b2a22c453b5809754301885160 Mon Sep 17 00:00:00 2001 From: ranuseh Date: Mon, 22 Apr 2019 19:34:06 -0700 Subject: [PATCH 07/37] moved spotlight feature to homepages controller --- app/controllers/homepages_controller.rb | 4 ++++ app/controllers/works_controller.rb | 4 ++-- app/views/homepages/index.html.erb | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/controllers/homepages_controller.rb b/app/controllers/homepages_controller.rb index 78d21c8797..7b07bab137 100644 --- a/app/controllers/homepages_controller.rb +++ b/app/controllers/homepages_controller.rb @@ -1,4 +1,8 @@ class HomepagesController < ApplicationController + def index + @works = Work.all.sort_by(&:id) + @spotlight = @works.sample + end end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index e4805024e4..bcf626e690 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,10 +1,10 @@ class WorksController < ApplicationController def index - @works = Works.all.sort_by(&:id) - @spotlight = @works.sample + @works = Work.all.sort_by(&:id) end + def new @work = Work.new end diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb index 3507aa3012..718ed5d93c 100644 --- a/app/views/homepages/index.html.erb +++ b/app/views/homepages/index.html.erb @@ -1,9 +1,9 @@

<% if @spotlight %> - Media Spotlight: <%= @spotlight %> + Media Spotlight: <%= @spotlight.title %> by <%= @spotlight.creator %> <% else %> -

No spotlight today

+

Media Spotlight: No Spotlight Today

<% end %>

From 1d6914be5e364852d387e90217752635e3205258 Mon Sep 17 00:00:00 2001 From: ranuseh Date: Tue, 23 Apr 2019 09:02:35 -0700 Subject: [PATCH 08/37] Added top ten methods and rendered in view --- app/assets/stylesheets/application.css | 2 +- app/controllers/homepages_controller.rb | 18 ++++++++++++ app/models/work.rb | 2 ++ app/views/homepages/index.html.erb | 39 +++++++++++++++++++++---- config/routes.rb | 4 +++ 5 files changed, 58 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 19a6f5726f..1c784f6db1 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -36,7 +36,7 @@ header { padding: 0; font-size: 25px; flex-direction: row; - justify-content: space-around; + /* justify-content: space-around; */ } .main_options li { diff --git a/app/controllers/homepages_controller.rb b/app/controllers/homepages_controller.rb index 7b07bab137..d4da36b830 100644 --- a/app/controllers/homepages_controller.rb +++ b/app/controllers/homepages_controller.rb @@ -3,6 +3,24 @@ class HomepagesController < ApplicationController def index @works = Work.all.sort_by(&:id) @spotlight = @works.sample + top_ten_movies + top_ten_books + top_ten_albums + end + + def top_ten_movies + @movies = Work.where(category: "movie") + @top_ten_movies = @movies.sample(10) + end + + def top_ten_books + @books = Work.where(category: "book") + @top_ten_books = @books.sample(10) + end + + def top_ten_albums + @albums = Work.where(category: "album") + @top_ten_albums = @albums.sample(10) end end diff --git a/app/models/work.rb b/app/models/work.rb index a30c3617ac..70fb9ff8ec 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,4 +1,6 @@ class Work < ApplicationRecord has_and_belongs_to_many :users + + end diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb index 718ed5d93c..0596f9d456 100644 --- a/app/views/homepages/index.html.erb +++ b/app/views/homepages/index.html.erb @@ -7,10 +7,37 @@ <% end %>
-
-
    -
  • <%= link_to 'Top Movies'%>
    • -
  • <%= link_to 'Top Books'%>
    • -
  • <%= link_to 'Top Albums'%>
    • -
+ +
+ + + + + <% @top_ten_movies.each do |movie| %> + + + + + <% end %> +
Top Movies
<%= movie.title %><%= movie.creator %><%= movie.category %>
+ + + + + <% @top_ten_books.each do |book| %> + + + + <% end %> +
Top Books
<%= book.title %><%= book.creator %>
+ + + + + <% @top_ten_albums.each do |album| %> + + + + <% end %> +
Top Albums
<%= album.title %><%= album.creator %>
\ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index e1c5a90b7a..5a25be5fd1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,10 @@ root 'homepages#index' + # get '/homepages#top_ten_books' + # get '/homepages#top_ten_movies' + # get '/homepages#top_ten_albums' + resources :works resources :users From babeeabbb850e488bc07349ea6b24a12c29a7adf Mon Sep 17 00:00:00 2001 From: ranuseh Date: Tue, 23 Apr 2019 12:25:10 -0700 Subject: [PATCH 09/37] Built index page with list of works for all categories --- app/assets/stylesheets/application.css | 3 +- app/controllers/works_controller.rb | 1 - app/views/layouts/application.html.erb | 8 +-- app/views/works/index.html.erb | 67 ++++++++++++++++++++++++++ config/routes.rb | 6 +-- db/seeds.rb | 2 +- 6 files changed, 76 insertions(+), 11 deletions(-) create mode 100644 app/views/works/index.html.erb diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 1c784f6db1..50ccb9cefa 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -36,7 +36,6 @@ header { padding: 0; font-size: 25px; flex-direction: row; - /* justify-content: space-around; */ } .main_options li { @@ -54,7 +53,7 @@ footer { background-color: #D5CAD6; grid-column: span 2; height: 50px; - position: fixed; + /* position: fixed; */ bottom: 0; width: 100%; } diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index bcf626e690..f126b1aca6 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -4,7 +4,6 @@ def index @works = Work.all.sort_by(&:id) end - def new @work = Work.new end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index bc1fd2e26c..31fddbaa50 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -14,14 +14,16 @@

- <%= link_to 'Media Ranker | Ranking the Best of Everything'%> + <%= link_to 'Media Ranker | Ranking the Best of Everything', home_path%>

<%=link_to 'View Top Media'%> - <%= link_to 'View All Media'%> + <%= link_to 'View All Media', works_path%> <%= link_to 'Add New Work'%> <%= link_to 'View all users'%> - <%=link_to 'Log In'%> +
+ Login +
diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb new file mode 100644 index 0000000000..9274c6cce8 --- /dev/null +++ b/app/views/works/index.html.erb @@ -0,0 +1,67 @@ +
+ + + + + + + + + + + + + <% @books = Work.where(category: "book") %> + <% @books.each do |book| %> + + + + + + + <% end %> + + + + + + + + + + + + + <% @albums = Work.where(category: "album") %> + <% @albums.each do |album| %> + + + + + + + <% end %> + + + + + + + + + + + + + <% @movies = Work.where(category: "movie") %> + <% @movies.each do |movie| %> + + + + + + + <% end %> + +
Books
VotesTitleCreatorPublicationUpVote
<%= link_to 'Votes' %><%= book.title %><%= book.creator %><%= book.publication_year %><%= link_to 'Up Vote' %>
Albums
VotesTitleCreatorPublication YearUpVote
<%= link_to 'Votes' %><%= album.title %><%= album.creator %><%= album.publication_year%><%= link_to 'Up Vote' %>
Movies
VotesTitleCreatorPublication YearUpVote
<%= link_to 'Votes' %><%= movie.title %><%= movie.creator %><%= movie.publication_year %><%= link_to 'Up Vote' %>
+
\ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 5a25be5fd1..d1728c171c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,10 +1,8 @@ Rails.application.routes.draw do - root 'homepages#index' + root 'homepages#index', as: 'home' - # get '/homepages#top_ten_books' - # get '/homepages#top_ten_movies' - # get '/homepages#top_ten_albums' + get '/works', to: 'works#index', as: 'works' resources :works resources :users diff --git a/db/seeds.rb b/db/seeds.rb index af5ab9f23c..20ca3ce85f 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -10,7 +10,7 @@ work.category = row['category'] work.title = row['title'] work.creator = row['creator'] - work.publication_year = row['publication year'] + work.publication_year = row['publication_year'].to_i work.description = row['description'] work.votes = row['votes'] From 7f5c89ee1120f007efb6c2f967dcd289fa92ff53 Mon Sep 17 00:00:00 2001 From: ranuseh Date: Tue, 23 Apr 2019 12:31:56 -0700 Subject: [PATCH 10/37] Allowed user to add new work --- app/views/layouts/application.html.erb | 2 +- app/views/works/new.html.erb | 35 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 app/views/works/new.html.erb diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 31fddbaa50..e062c4f6af 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -19,7 +19,7 @@
<%=link_to 'View Top Media'%> <%= link_to 'View All Media', works_path%> - <%= link_to 'Add New Work'%> + <%= link_to 'Add New Work', new_work_path%> <%= link_to 'View all users'%>
Login diff --git a/app/views/works/new.html.erb b/app/views/works/new.html.erb new file mode 100644 index 0000000000..64132366b8 --- /dev/null +++ b/app/views/works/new.html.erb @@ -0,0 +1,35 @@ +

Add New Work

+ +<%= form_with model: @work, class: 'create_work' do |f| %> +

Please fill out the details of your new Work

+ +
+ <%= f.label :category, "Category:" %> + <%= f.text_field :name, placeholder: "Do my taxes" %> +
+ +
+ <%= f.label :title, "Title:" %> + <%= f.text_field :description, placeholder: "Get T4 forms" %> +
+ +
+ <%= f.label :creator, "Creator:" %> + <%= f.date_field :completion_date, placeholder: "April 15 2019" %> +
+ +
+ <%= f.label :publication_year, "Publication Year:" %> + <%= f.date_field :completion_date, placeholder: "April 15 2019" %> +
+ + +
+ <%= f.label :description, "Description:" %> + <%= f.date_field :completion_date, placeholder: "April 15 2019" %> +
+ + + <%= f.submit "Add new work", class: 'create_work_button' %> + +<% end %> \ No newline at end of file From d7ab2219288c32cc2c4206ea39035d87e49a296a Mon Sep 17 00:00:00 2001 From: ranuseh Date: Tue, 23 Apr 2019 13:46:13 -0700 Subject: [PATCH 11/37] Built details page for each piece of media --- app/views/works/index.html.erb | 6 +++--- app/views/works/show.html.erb | 39 ++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 app/views/works/show.html.erb diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 9274c6cce8..455e5ade8e 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -14,7 +14,7 @@ <% @books = Work.where(category: "book") %> <% @books.each do |book| %> <%= link_to 'Votes' %> - <%= book.title %> + <%= link_to "#{book.title}", work_path(book.id) %> <%= book.creator %> <%= book.publication_year %> <%= link_to 'Up Vote' %> @@ -35,7 +35,7 @@ <% @albums = Work.where(category: "album") %> <% @albums.each do |album| %> <%= link_to 'Votes' %> - <%= album.title %> + <%= link_to "#{album.title}", work_path(album.id) %> <%= album.creator %> <%= album.publication_year%> <%= link_to 'Up Vote' %> @@ -56,7 +56,7 @@ <% @movies = Work.where(category: "movie") %> <% @movies.each do |movie| %> <%= link_to 'Votes' %> - <%= movie.title %> + <%= link_to "#{movie.title}", work_path(movie.id) %> <%= movie.creator %> <%= movie.publication_year %> <%= link_to 'Up Vote' %> diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb new file mode 100644 index 0000000000..e31c48fab3 --- /dev/null +++ b/app/views/works/show.html.erb @@ -0,0 +1,39 @@ +

Media details page

+ +
    +
  • + Name: + <%= @work.title %> +
    • +
  • + Creator: + <%= @work.creator %> +
    • +
  • + Published_by: + <%= @work.publication_year %> +
    • + +
  • + Description: + <%= @work.description %> +
    • + +
  • + <%= link_to "Back to Media ranks" %> +
    • + +
  • + <%= link_to "Edit"%> +
    • + +
  • + <%= link_to "upvote"%> +
    • + + +
  • + <%= link_to "Delete"%> +
    • + +
From b4b8537f883e2733edb905b2bb77ca223d13aeb5 Mon Sep 17 00:00:00 2001 From: ranuseh Date: Tue, 23 Apr 2019 14:13:50 -0700 Subject: [PATCH 12/37] Added abilty to edit and delete works --- app/views/homepages/index.html.erb | 8 +++---- app/views/works/edit.html.erb | 35 ++++++++++++++++++++++++++++++ app/views/works/show.html.erb | 4 ++-- 3 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 app/views/works/edit.html.erb diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb index 0596f9d456..28c7917bbe 100644 --- a/app/views/homepages/index.html.erb +++ b/app/views/homepages/index.html.erb @@ -1,7 +1,7 @@

<% if @spotlight %> - Media Spotlight: <%= @spotlight.title %> by <%= @spotlight.creator %> + Media Spotlight: <%= link_to "#{@spotlight.title}", work_path(@spotlight.id) %> by <%= @spotlight.creator %> <% else %>

Media Spotlight: No Spotlight Today

<% end %> @@ -14,7 +14,7 @@ Top Movies <% @top_ten_movies.each do |movie| %> - <%= movie.title %> + <%= link_to "#{movie.title}", work_path(movie.id) %> <%= movie.creator %> <%= movie.category %> @@ -25,7 +25,7 @@ Top Books <% @top_ten_books.each do |book| %> - <%= book.title %> + <%= link_to "#{book.title}", work_path(book.id) %> <%= book.creator %> <% end %> @@ -35,7 +35,7 @@ Top Albums <% @top_ten_albums.each do |album| %> - <%= album.title %> + <%= link_to "#{album.title}", work_path(album.id) %> <%= album.creator %> <% end %> diff --git a/app/views/works/edit.html.erb b/app/views/works/edit.html.erb new file mode 100644 index 0000000000..0d4edac293 --- /dev/null +++ b/app/views/works/edit.html.erb @@ -0,0 +1,35 @@ +

Edit Work

+ +<%= form_with model: @work, class: 'edit_work' do |f| %> +

Please edit your Work

+ +
+ <%= f.label :category, "Category:" %> + <%= f.text_field :name, placeholder: "Do my taxes" %> +
+ +
+ <%= f.label :title, "Title:" %> + <%= f.text_field :description, placeholder: "Get T4 forms" %> +
+ +
+ <%= f.label :creator, "Creator:" %> + <%= f.date_field :completion_date, placeholder: "April 15 2019" %> +
+ +
+ <%= f.label :publication_year, "Publication Year:" %> + <%= f.date_field :completion_date, placeholder: "April 15 2019" %> +
+ + +
+ <%= f.label :description, "Description:" %> + <%= f.date_field :completion_date, placeholder: "April 15 2019" %> +
+ + + <%= f.submit "Edit Work", class: 'edit_work_button' %> + +<% end %> \ No newline at end of file diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index e31c48fab3..dac9e6ee46 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -24,7 +24,7 @@
  • - <%= link_to "Edit"%> + <%= link_to "Edit", edit_work_path(@work.id)%>
  • @@ -33,7 +33,7 @@
  • - <%= link_to "Delete"%> + <%= link_to "Delete", work_path(@work.id), method: :delete, data: { confirm: "Do you really want to delete?" } %>
    • From 75da106f50ffc4943139d187ced9b63a23e52d03 Mon Sep 17 00:00:00 2001 From: ranuseh Date: Tue, 23 Apr 2019 14:25:24 -0700 Subject: [PATCH 13/37] Added homepages model and moved top ten methods there --- app/assets/stylesheets/application.css | 1 - app/controllers/homepages_controller.rb | 16 ---------------- app/models/homepage.rb | 17 +++++++++++++++++ db/migrate/20190423212243_create_homepages.rb | 8 ++++++++ db/schema.rb | 7 ++++++- test/fixtures/homepages.yml | 11 +++++++++++ test/models/homepage_test.rb | 9 +++++++++ 7 files changed, 51 insertions(+), 18 deletions(-) create mode 100644 app/models/homepage.rb create mode 100644 db/migrate/20190423212243_create_homepages.rb create mode 100644 test/fixtures/homepages.yml create mode 100644 test/models/homepage_test.rb diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 50ccb9cefa..a605e8a142 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -53,7 +53,6 @@ footer { background-color: #D5CAD6; grid-column: span 2; height: 50px; - /* position: fixed; */ bottom: 0; width: 100%; } diff --git a/app/controllers/homepages_controller.rb b/app/controllers/homepages_controller.rb index d4da36b830..9c52af3882 100644 --- a/app/controllers/homepages_controller.rb +++ b/app/controllers/homepages_controller.rb @@ -7,20 +7,4 @@ def index top_ten_books top_ten_albums end - - def top_ten_movies - @movies = Work.where(category: "movie") - @top_ten_movies = @movies.sample(10) - end - - def top_ten_books - @books = Work.where(category: "book") - @top_ten_books = @books.sample(10) - end - - def top_ten_albums - @albums = Work.where(category: "album") - @top_ten_albums = @albums.sample(10) - end - end diff --git a/app/models/homepage.rb b/app/models/homepage.rb new file mode 100644 index 0000000000..9553d2d54f --- /dev/null +++ b/app/models/homepage.rb @@ -0,0 +1,17 @@ +class Homepage < ApplicationRecord + def top_ten_movies + @movies = Work.where(category: "movie") + @top_ten_movies = @movies.sample(10) + end + + def top_ten_books + @books = Work.where(category: "book") + @top_ten_books = @books.sample(10) + end + + def top_ten_albums + @albums = Work.where(category: "album") + @top_ten_albums = @albums.sample(10) + end + +end diff --git a/db/migrate/20190423212243_create_homepages.rb b/db/migrate/20190423212243_create_homepages.rb new file mode 100644 index 0000000000..bd9ae83d37 --- /dev/null +++ b/db/migrate/20190423212243_create_homepages.rb @@ -0,0 +1,8 @@ +class CreateHomepages < ActiveRecord::Migration[5.2] + def change + create_table :homepages do |t| + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 67cb100cdb..e78bf16cac 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,11 +10,16 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_04_22_231018) do +ActiveRecord::Schema.define(version: 2019_04_23_212243) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "homepages", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "users", force: :cascade do |t| t.string "username" t.integer "votes" diff --git a/test/fixtures/homepages.yml b/test/fixtures/homepages.yml new file mode 100644 index 0000000000..dc3ee79b5d --- /dev/null +++ b/test/fixtures/homepages.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/models/homepage_test.rb b/test/models/homepage_test.rb new file mode 100644 index 0000000000..f8323f0301 --- /dev/null +++ b/test/models/homepage_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Homepage do + let(:homepage) { Homepage.new } + + it "must be valid" do + value(homepage).must_be :valid? + end +end From 9bc06d7b56ff55c3684801d1e22ab46c672261c1 Mon Sep 17 00:00:00 2001 From: ranuseh Date: Tue, 23 Apr 2019 15:26:42 -0700 Subject: [PATCH 14/37] formatted edit and new forms --- app/assets/stylesheets/application.css | 1 + app/controllers/homepages_controller.rb | 16 +++++++ app/models/homepage.rb | 13 ------ app/views/layouts/application.html.erb | 27 ++++++------ app/views/works/edit.html.erb | 56 +++++++++++-------------- app/views/works/new.html.erb | 56 +++++++++++-------------- 6 files changed, 81 insertions(+), 88 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index a605e8a142..402cf5be66 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -53,6 +53,7 @@ footer { background-color: #D5CAD6; grid-column: span 2; height: 50px; + position: fixed; bottom: 0; width: 100%; } diff --git a/app/controllers/homepages_controller.rb b/app/controllers/homepages_controller.rb index 9c52af3882..a11321954f 100644 --- a/app/controllers/homepages_controller.rb +++ b/app/controllers/homepages_controller.rb @@ -7,4 +7,20 @@ def index top_ten_books top_ten_albums end + + def top_ten_movies + @movies = Work.where(category: "movie") + @top_ten_movies = @movies.sample(10) + end + + def top_ten_books + @books = Work.where(category: "book") + @top_ten_books = @books.sample(10) + end + + def top_ten_albums + @albums = Work.where(category: "album") + @top_ten_albums = @albums.sample(10) + end + end diff --git a/app/models/homepage.rb b/app/models/homepage.rb index 9553d2d54f..16a97ebc03 100644 --- a/app/models/homepage.rb +++ b/app/models/homepage.rb @@ -1,17 +1,4 @@ class Homepage < ApplicationRecord - def top_ten_movies - @movies = Work.where(category: "movie") - @top_ten_movies = @movies.sample(10) - end - def top_ten_books - @books = Work.where(category: "book") - @top_ten_books = @books.sample(10) - end - - def top_ten_albums - @albums = Work.where(category: "album") - @top_ten_albums = @albums.sample(10) - end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index e062c4f6af..f5920be9c3 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -12,20 +12,21 @@ -
    -

    - <%= link_to 'Media Ranker | Ranking the Best of Everything', home_path%> -

    -
    - <%=link_to 'View Top Media'%> - <%= link_to 'View All Media', works_path%> - <%= link_to 'Add New Work', new_work_path%> - <%= link_to 'View all users'%> -
    - Login -
    -
    +
    +

    + <%= link_to 'Media Ranker | Ranking the Best of Everything', home_path%> +

    +
    + <%=link_to 'View Top Media'%> + <%= link_to 'View All Media', works_path%> + <%= link_to 'Add New Work', new_work_path%> + <%= link_to 'View all users'%> +
    + Login +
    +
    +
    <%= yield %>
    diff --git a/app/views/works/edit.html.erb b/app/views/works/edit.html.erb index 0d4edac293..3db1a81c4b 100644 --- a/app/views/works/edit.html.erb +++ b/app/views/works/edit.html.erb @@ -1,35 +1,29 @@ -

    Edit Work

    - -<%= form_with model: @work, class: 'edit_work' do |f| %> -

    Please edit your Work

    - -
    - <%= f.label :category, "Category:" %> - <%= f.text_field :name, placeholder: "Do my taxes" %> +

    Edit this Work

    +
    +
    + +
    - -
    - <%= f.label :title, "Title:" %> - <%= f.text_field :description, placeholder: "Get T4 forms" %> +
    + +
    - -
    - <%= f.label :creator, "Creator:" %> - <%= f.date_field :completion_date, placeholder: "April 15 2019" %> +
    + +
    - -
    - <%= f.label :publication_year, "Publication Year:" %> - <%= f.date_field :completion_date, placeholder: "April 15 2019" %> +
    + + +
    +
    + +
    - - -
    - <%= f.label :description, "Description:" %> - <%= f.date_field :completion_date, placeholder: "April 15 2019" %> -
    - - - <%= f.submit "Edit Work", class: 'edit_work_button' %> - -<% end %> \ No newline at end of file + + \ No newline at end of file diff --git a/app/views/works/new.html.erb b/app/views/works/new.html.erb index 64132366b8..5312fb5778 100644 --- a/app/views/works/new.html.erb +++ b/app/views/works/new.html.erb @@ -1,35 +1,29 @@ -

    Add New Work

    - -<%= form_with model: @work, class: 'create_work' do |f| %> -

    Please fill out the details of your new Work

    - -
    - <%= f.label :category, "Category:" %> - <%= f.text_field :name, placeholder: "Do my taxes" %> +

    Add New Work

    +
    +
    + +
    - -
    - <%= f.label :title, "Title:" %> - <%= f.text_field :description, placeholder: "Get T4 forms" %> +
    + +
    - -
    - <%= f.label :creator, "Creator:" %> - <%= f.date_field :completion_date, placeholder: "April 15 2019" %> +
    + +
    - -
    - <%= f.label :publication_year, "Publication Year:" %> - <%= f.date_field :completion_date, placeholder: "April 15 2019" %> +
    + + +
    +
    + +
    - - -
    - <%= f.label :description, "Description:" %> - <%= f.date_field :completion_date, placeholder: "April 15 2019" %> -
    - - - <%= f.submit "Add new work", class: 'create_work_button' %> - -<% end %> \ No newline at end of file + + \ No newline at end of file From 1937400c4663e4ec7a065ad312f588cb6bb34a94 Mon Sep 17 00:00:00 2001 From: ranuseh Date: Tue, 23 Apr 2019 15:46:52 -0700 Subject: [PATCH 15/37] Writting tests for works controller --- test/controllers/works_controller_test.rb | 131 +++++++++++++++++++++- test/test_helper.rb | 3 +- 2 files changed, 130 insertions(+), 4 deletions(-) diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index d95073c22e..554d32317d 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -1,7 +1,132 @@ require "test_helper" describe WorksController do - # it "must be a real test" do - # flunk "Need real tests" - # end + let(:work) do + Work.create category: 'album', title: 'this great world', + creator: 'jonny', publication_year: 1995, description: 'A great song about a new work', votes: 3 + end + + describe "index" do + it 'can get the index path' do + get works_path + + must_respond_with :success + end + + it "works with no works" do + work.destroy + get works_path + must_respond_with :success + end + end + + describe "show" do + it 'can get a valid work' do + get works_path(work.id) + + must_respond_with :success + end + end + + describe "edit" do + it 'can get the edit page for an existing work' do + get edit_work_path(work) + + must_respond_with :success + end + end + + describe "update" do + it 'can update an existing work' do + work = Work.create!(category: 'album', title: 'this great world', + creator: 'jonny', publication_year: 1995, description: 'A great song about a new work', votes: 3) + work_hash = { + work: { + category: 'album', + title: 'this great world', + creator: 'jonny', + publication_year: 1995, + description: 'A great song about a new work', + votes: 3 + } + } + patch work_path(work), params: work_hash + + must_respond_with :redirect + must_redirect_to work_path(work) + + work.reload + expect(work.category).must_equal(work_hash[:work][:category]) + end + + it "flashes an error if the work does not exist" do + work_id = 123456789 + + patch work_path(work_id), params: {} + + must_respond_with :redirect + expect(flash[:error]).must_equal "Could not find work with id: #{work_id}" + end + end + + describe "new" do + it 'can get the new work page' do + get new_work_path + + must_respond_with :success + end + end + + describe "create" do + it 'can create a new work' do + work_hash = { + work: { + category: 'album', + title: 'this great world', + creator: 'jonny', + publication_year: 1995, + description: 'A great song about a new work', + votes: 3 + } + } + + expect do + post works_path, params: work_hash + end.must_change 'Work.count', 1 + + new_work = Work.find_by(id: work_hash[:work][:id]) + expect(new_work.id).must_equal work_hash[:work][:id] + + must_respond_with :redirect + must_redirect_to work_path(new_work.id) + end + end + + describe "destroy" do + it 'removes the work from the database' do + work = Work.create!(category: 'album', title: 'this great world', + creator: 'jonny', publication_year: 1995, description: 'A great song about a new work', votes: 3) + + expect do + delete work_path(work) + end.must_change 'Work.count', -1 + + must_respond_with :redirect + must_redirect_to works_path + + after_work = Work.find_by(id: work.id) + expect(after_work).must_be_nil + end + + it "flashes an error if the work does not exist" do + work_id = 123456789 + + expect { + delete work_path(work_id) + }.wont_change "Work.count" + + must_respond_with :redirect + expect(flash[:error]).must_equal "Could not find work with id: #{work_id}" + end + end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b5172a7d6..bae6fad59f 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 796bddf0b9ec99f6af5ed80db192a04e7ce0bb92 Mon Sep 17 00:00:00 2001 From: ranuseh Date: Tue, 23 Apr 2019 18:12:02 -0700 Subject: [PATCH 16/37] Continue writing tests for works --- .../{application.css => application.scss} | 0 app/controllers/works_controller.rb | 58 ++++-- app/views/layouts/application.html.erb | 6 + app/views/works/edit.html.erb | 54 ++--- app/views/works/new.html.erb | 54 ++--- config/routes.rb | 2 - test/controllers/works_controller_test.rb | 186 +++++++++++------- 7 files changed, 216 insertions(+), 144 deletions(-) rename app/assets/stylesheets/{application.css => application.scss} (100%) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.scss similarity index 100% rename from app/assets/stylesheets/application.css rename to app/assets/stylesheets/application.scss diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index f126b1aca6..ed89995087 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,5 +1,6 @@ +# frozen_string_literal: true + class WorksController < ApplicationController - def index @works = Work.all.sort_by(&:id) end @@ -11,54 +12,69 @@ def new def create @work = Work.new(work_params) - if @work.save + successful = @work.save + if successful + flash[:status] = :success + flash[:message] = "successfully saved a work with ID #{@work.id}" redirect_to works_path else - render :new + flash.now[:status] = :error + flash.now[:message] = 'Could not save work' + render :new, status: :bad_request end end def show work_id = params[:id] - @work = Work.find(work_id) - @users = User.where(work_id: work_id.to_i) + + @work = Work.find_by(id: work_id) + + head :not_found unless @work end def edit work_id = params[:id] + @work = Work.find_by(id: work_id) - redirect_to work_path if @work.nil? + + head :not_found unless @work end def update - begin - work_id = params[:id] - work = Work.find(work_id) - rescue - flash[:error] = "Could not find work with id: #{params['id']}" - redirect_to work_path(work_id) + @work = Work.find_by(id: params[:id]) + + unless @work + head :not_found return end - if work.update(work_params) - redirect_to works_path + if @work.update(work_params) + flash[:status] = :success + flash[:message] = "Successfully updated work #{@work.id}" + redirect_to work_path(@work) else - render :new + flash.now[:status] = :error + flash.now[:message] = "Could not save work #{@work.id}" + render :edit, status: :bad_request end end def destroy - begin - work = Work.find(params[:id]) - rescue - flash[:error] = "Could not find work with id: #{params['id']}" - redirect_to works_path + work_id = params[:id] + + work = Work.find_by(id: work_id) + + unless work + head :not_found return end + work.destroy + + flash[:status] = :success + flash[:message] = "Successfully deleted work #{work.id}" redirect_to works_path end - end private diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f5920be9c3..19b6427c7c 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -27,6 +27,12 @@
    + + <% alert_type = flash[:status] == :error ? :danger : flash[:status] %> +
    + <%= flash[:message] %> +
    +
    <%= yield %>
    diff --git a/app/views/works/edit.html.erb b/app/views/works/edit.html.erb index 3db1a81c4b..762730d679 100644 --- a/app/views/works/edit.html.erb +++ b/app/views/works/edit.html.erb @@ -1,29 +1,33 @@ -

    Edit this Work

    -
    -
    - - +

    Edit This Work

    + +<%= form_with model: @work, class: 'update_work' do |f| %> +

    Update Work Details Below

    + +
    + <%= f.label :category, "Title of Work:" %> + <%= f.select :category, options_for_select(['Album','Book','Movie']) %>
    -
    - - + +
    + <%= f.label :title, "Title:" %> + <%= f.text_field :title, placeholder: @work.title %>
    -
    - - + +
    + <%= f.label :creator, "Creator:" %> + <%= f.text_field :creator, placeholder: @work.creator %>
    -
    - - -
    -
    - - + +
    + <%= f.label :publication_year, "Publication Year:" %> + <%= f.text_field :publication_year, placeholder: @work.publication_year %>
    - - \ No newline at end of file + +
    + <%= f.label :description, "Description:" %> + <%= f.text_field :description, placeholder: @work.description %> +
    + + <%= f.submit "Update Work", class: 'update_class_button' %> + +<% end %> \ No newline at end of file diff --git a/app/views/works/new.html.erb b/app/views/works/new.html.erb index 5312fb5778..3d7ba3ef25 100644 --- a/app/views/works/new.html.erb +++ b/app/views/works/new.html.erb @@ -1,29 +1,33 @@ -

    Add New Work

    -
    -
    - - +

    Add New Work

    + +<%= form_with model: @work, class: 'new_work' do |f| %> +

    Update Work Details Below

    + +
    + <%= f.label :category, "Title of Work:" %> + <%= f.select :category, options_for_select(['Album','Book','Movie']) %>
    -
    - - + +
    + <%= f.label :title, "Title:" %> + <%= f.text_field :title, placeholder: @work.title %>
    -
    - - + +
    + <%= f.label :creator, "Creator:" %> + <%= f.text_field :creator, placeholder: @work.creator %>
    -
    - - -
    -
    - - + +
    + <%= f.label :publication_year, "Publication Year:" %> + <%= f.text_field :publication_year, placeholder: @work.publication_year %>
    - - \ No newline at end of file + +
    + <%= f.label :description, "Description:" %> + <%= f.text_field :description, placeholder: @work.description %> +
    + + <%= f.submit "Add Work", class: 'new_class_button' %> + +<% end %> \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index d1728c171c..cc56e704c0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,8 +2,6 @@ root 'homepages#index', as: 'home' - get '/works', to: 'works#index', as: 'works' - resources :works resources :users diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index 554d32317d..b974d490f3 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -1,132 +1,176 @@ require "test_helper" describe WorksController do - let(:work) do - Work.create category: 'album', title: 'this great world', - creator: 'jonny', publication_year: 1995, description: 'A great song about a new work', votes: 3 + before do + @work = Work.create!(category: "test work", title: 'title', creator: 'Someone', publication_year: 2016, description: 'About a book', votes: 2) end - describe "index" do - it 'can get the index path' do + it "renders without crashing" do get works_path - must_respond_with :success + must_respond_with :ok end - it "works with no works" do - work.destroy + it "renders even if there are zero works" do + Work.destroy_all + get works_path - must_respond_with :success + + must_respond_with :ok end end describe "show" do - it 'can get a valid work' do - get works_path(work.id) + it "returns a 404 status code if the work doesn't exist" do + work_id = 12345 - must_respond_with :success + get work_path(work_id) + + must_respond_with :not_found end - end - describe "edit" do - it 'can get the edit page for an existing work' do - get edit_work_path(work) + it "works for a work that exists" do + get work_path(@work.id) - must_respond_with :success + must_respond_with :ok end end - describe "update" do - it 'can update an existing work' do - work = Work.create!(category: 'album', title: 'this great world', - creator: 'jonny', publication_year: 1995, description: 'A great song about a new work', votes: 3) - work_hash = { + describe "new" do + it "returns status code 200" do + get new_work_path + must_respond_with :ok + end + end + + describe "create" do + it "creates a new work" do + work_data = { work: { - category: 'album', - title: 'this great world', - creator: 'jonny', - publication_year: 1995, - description: 'A great song about a new work', - votes: 3 - } + category: 'album', + title: "Create a new work", + creator: 'some person', + publication_year: 2018, + description: 'Some details about a work', + votes: 2 + }, } - patch work_path(work), params: work_hash + + expect { + post works_path, params: work_data + }.must_change "Work.count", +1 must_respond_with :redirect - must_redirect_to work_path(work) + must_redirect_to works_path - work.reload - expect(work.category).must_equal(work_hash[:work][:category]) + work = Work.last + expect(work.title).must_equal work_data[:work][:title] end - it "flashes an error if the work does not exist" do - work_id = 123456789 + it "sends back bad_request if no work data is sent" do + work_data = { + work: { + category: "", + title: "", + creator: "", + publication_year: "", + description: "", + votes: "", + }, + } + expect(Work.create(work_data[:work])).wont_be :valid? - patch work_path(work_id), params: {} + expect { + post works_path, params: work_data + }.wont_change "Work.count" - must_respond_with :redirect - expect(flash[:error]).must_equal "Could not find work with id: #{work_id}" + must_respond_with :bad_request + + check_flash(:error) end end - describe "new" do - it 'can get the new work page' do - get new_work_path + describe "edit" do + it "responds with OK for a real work" do + get edit_work_path(@work) + must_respond_with :ok + end - must_respond_with :success + it "responds with NOT FOUND for a fake work" do + work_id = Work.last.id + 1 + get edit_work_path(work_id) + must_respond_with :not_found end end - describe "create" do - it 'can create a new work' do - work_hash = { + describe "update" do + let(:work_data) { + { work: { - category: 'album', - title: 'this great world', - creator: 'jonny', - publication_year: 1995, - description: 'A great song about a new work', - votes: 3 - } + category: "album", + }, } + } + it "changes the data on the model" do + @work.assign_attributes(work_data[:work]) + expect(@work).must_be :valid? + @work.reload - expect do - post works_path, params: work_hash - end.must_change 'Work.count', 1 - - new_work = Work.find_by(id: work_hash[:work][:id]) - expect(new_work.id).must_equal work_hash[:work][:id] + patch work_path(@work), params: work_data must_respond_with :redirect - must_redirect_to work_path(new_work.id) + must_redirect_to work_path(@work) + + @work.reload + expect(@work.category).must_equal(work_data[:work][:category]) + end + + it "responds with NOT FOUND for a fake work" do + work_id = Work.last.id + 1 + patch work_path(work_id), params: work_data + must_respond_with :not_found + end + + it "responds with BAD REQUEST for bad data" do + work_data[:work][:title] = "" + + @work.assign_attributes(work_data[:work]) + expect(@work).wont_be :valid? + @work.reload + + patch work_path(@work), params: work_data + + must_respond_with :bad_request + + check_flash(:error) end end describe "destroy" do - it 'removes the work from the database' do - work = Work.create!(category: 'album', title: 'this great world', - creator: 'jonny', publication_year: 1995, description: 'A great song about a new work', votes: 3) - - expect do - delete work_path(work) - end.must_change 'Work.count', -1 + it "removes the work from the database" do + expect { + delete work_path(@work) + }.must_change "Work.count", -1 must_respond_with :redirect must_redirect_to works_path - after_work = Work.find_by(id: work.id) + check_flash + + after_work = Work.find_by(id: @work.id) expect(after_work).must_be_nil end - it "flashes an error if the work does not exist" do - work_id = 123456789 + it "returns a 404 if the work does not exist" do + work_id = 123456 + + expect(Work.find_by(id: work_id)).must_be_nil expect { delete work_path(work_id) }.wont_change "Work.count" - must_respond_with :redirect - expect(flash[:error]).must_equal "Could not find work with id: #{work_id}" + must_respond_with :not_found end end end From 3a2b86c7664305378b5b7cef24a1d7c3c0621431 Mon Sep 17 00:00:00 2001 From: ranuseh Date: Tue, 23 Apr 2019 18:41:30 -0700 Subject: [PATCH 17/37] Started tests for homepages methods --- app/assets/stylesheets/_bootstrap.scss | 0 ...change_users_works_joins_to_users_works.rb | 5 ++++ db/schema.rb | 8 ++--- test/controllers/homepages_controller_test.rb | 29 +++++++++++++++++-- test/controllers/works_controller_test.rb | 9 +----- 5 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 app/assets/stylesheets/_bootstrap.scss create mode 100644 db/migrate/20190424011626_change_users_works_joins_to_users_works.rb diff --git a/app/assets/stylesheets/_bootstrap.scss b/app/assets/stylesheets/_bootstrap.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/db/migrate/20190424011626_change_users_works_joins_to_users_works.rb b/db/migrate/20190424011626_change_users_works_joins_to_users_works.rb new file mode 100644 index 0000000000..47e1ea9849 --- /dev/null +++ b/db/migrate/20190424011626_change_users_works_joins_to_users_works.rb @@ -0,0 +1,5 @@ +class ChangeUsersWorksJoinsToUsersWorks < ActiveRecord::Migration[5.2] + def change + rename_table :users_works_joins, :users_works + end +end diff --git a/db/schema.rb b/db/schema.rb index e78bf16cac..c014426fc6 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: 2019_04_23_212243) do +ActiveRecord::Schema.define(version: 2019_04_24_011626) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -27,11 +27,11 @@ t.datetime "updated_at", null: false end - create_table "users_works_joins", force: :cascade do |t| + create_table "users_works", force: :cascade do |t| t.bigint "user_id" t.bigint "work_id" - t.index ["user_id"], name: "index_users_works_joins_on_user_id" - t.index ["work_id"], name: "index_users_works_joins_on_work_id" + t.index ["user_id"], name: "index_users_works_on_user_id" + t.index ["work_id"], name: "index_users_works_on_work_id" end create_table "works", force: :cascade do |t| diff --git a/test/controllers/homepages_controller_test.rb b/test/controllers/homepages_controller_test.rb index 5ba3024fa1..ea2cea08dd 100644 --- a/test/controllers/homepages_controller_test.rb +++ b/test/controllers/homepages_controller_test.rb @@ -1,7 +1,30 @@ require "test_helper" describe HomepagesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + before do + @work = Work.create!(category: "test work", title: 'title', creator: 'Someone', publication_year: 2016, description: 'About a book', votes: 2) + end + describe "index" do + it "renders without crashing" do + + end + + it "It can randomly determine a spotlight" do + + end + end + + describe "top ten" do + it "it samples 10 albums" do + + end + + it "it samples 10 books" do + + end + + it "it samples 10 movies" do + + end + end end diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index b974d490f3..b849abb698 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -71,14 +71,9 @@ work_data = { work: { category: "", - title: "", - creator: "", - publication_year: "", - description: "", - votes: "", }, } - expect(Work.create(work_data[:work])).wont_be :valid? + expect(Work.new(work_data[:work])).wont_be :valid? expect { post works_path, params: work_data @@ -155,8 +150,6 @@ must_respond_with :redirect must_redirect_to works_path - check_flash - after_work = Work.find_by(id: @work.id) expect(after_work).must_be_nil end From 50b5d454ed1fc1a832ab09448fdca7271e10495b Mon Sep 17 00:00:00 2001 From: ranuseh Date: Tue, 23 Apr 2019 20:17:24 -0700 Subject: [PATCH 18/37] All works controller and model tests passing --- app/models/work.rb | 4 ++-- test/controllers/works_controller_test.rb | 1 + test/models/user_test.rb | 14 +++++++------- test/models/work_test.rb | 2 +- test/test_helper.rb | 5 +++++ 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/app/models/work.rb b/app/models/work.rb index 70fb9ff8ec..9c1280ce36 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,6 +1,6 @@ class Work < ApplicationRecord has_and_belongs_to_many :users - - + validates :title, presence: true + validates :category, presence: true end diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index b849abb698..d2b783f648 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -129,6 +129,7 @@ it "responds with BAD REQUEST for bad data" do work_data[:work][:title] = "" + # puts work_data @work.assign_attributes(work_data[:work]) expect(@work).wont_be :valid? @work.reload diff --git a/test/models/user_test.rb b/test/models/user_test.rb index cc862ac2d9..8a009158b8 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -1,9 +1,9 @@ -require "test_helper" +# require "test_helper" -describe User do - let(:user) { User.new } +# describe User do +# let(:user) { User.new } - it "must be valid" do - value(user).must_be :valid? - end -end +# it "must be valid" do +# value(user).must_be :valid? +# end +# end diff --git a/test/models/work_test.rb b/test/models/work_test.rb index f6fba7104d..d0d5c69cd2 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe Work do - let(:work) { Work.new } + let(:work) { Work.new(title: "some title", category: "album") } it "must be valid" do value(work).must_be :valid? diff --git a/test/test_helper.rb b/test/test_helper.rb index bae6fad59f..4dfffe144d 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -22,4 +22,9 @@ 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... + def check_flash(expected_status=:success) + expect(flash[:status]).must_equal(expected_status) + expect(flash[:message]).wont_be_nil + end + end From 3f50b92647eda33c72a6381ca06d25500edbee49 Mon Sep 17 00:00:00 2001 From: ranuseh Date: Tue, 23 Apr 2019 21:38:07 -0700 Subject: [PATCH 19/37] Wave 1 complete --- test/controllers/homepages_controller_test.rb | 19 +- test/controllers/works_controller_test.rb | 340 +++++++++--------- 2 files changed, 172 insertions(+), 187 deletions(-) diff --git a/test/controllers/homepages_controller_test.rb b/test/controllers/homepages_controller_test.rb index ea2cea08dd..fa5d8504e0 100644 --- a/test/controllers/homepages_controller_test.rb +++ b/test/controllers/homepages_controller_test.rb @@ -6,25 +6,10 @@ end describe "index" do it "renders without crashing" do + get works_path - end - - it "It can randomly determine a spotlight" do - + must_respond_with :ok end end - describe "top ten" do - it "it samples 10 albums" do - - end - - it "it samples 10 books" do - - end - - it "it samples 10 movies" do - - end - end end diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index d2b783f648..61359bdc05 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -1,170 +1,170 @@ -require "test_helper" - -describe WorksController do - before do - @work = Work.create!(category: "test work", title: 'title', creator: 'Someone', publication_year: 2016, description: 'About a book', votes: 2) - end - describe "index" do - it "renders without crashing" do - get works_path - - must_respond_with :ok - end - - it "renders even if there are zero works" do - Work.destroy_all - - get works_path - - must_respond_with :ok - end - end - - describe "show" do - it "returns a 404 status code if the work doesn't exist" do - work_id = 12345 - - get work_path(work_id) - - must_respond_with :not_found - end - - it "works for a work that exists" do - get work_path(@work.id) - - must_respond_with :ok - end - end - - describe "new" do - it "returns status code 200" do - get new_work_path - must_respond_with :ok - end - end - - describe "create" do - it "creates a new work" do - work_data = { - work: { - category: 'album', - title: "Create a new work", - creator: 'some person', - publication_year: 2018, - description: 'Some details about a work', - votes: 2 - }, - } - - expect { - post works_path, params: work_data - }.must_change "Work.count", +1 - - must_respond_with :redirect - must_redirect_to works_path - - work = Work.last - expect(work.title).must_equal work_data[:work][:title] - end - - it "sends back bad_request if no work data is sent" do - work_data = { - work: { - category: "", - }, - } - expect(Work.new(work_data[:work])).wont_be :valid? - - expect { - post works_path, params: work_data - }.wont_change "Work.count" - - must_respond_with :bad_request - - check_flash(:error) - end - end - - describe "edit" do - it "responds with OK for a real work" do - get edit_work_path(@work) - must_respond_with :ok - end - - it "responds with NOT FOUND for a fake work" do - work_id = Work.last.id + 1 - get edit_work_path(work_id) - must_respond_with :not_found - end - end - - describe "update" do - let(:work_data) { - { - work: { - category: "album", - }, - } - } - it "changes the data on the model" do - @work.assign_attributes(work_data[:work]) - expect(@work).must_be :valid? - @work.reload - - patch work_path(@work), params: work_data - - must_respond_with :redirect - must_redirect_to work_path(@work) - - @work.reload - expect(@work.category).must_equal(work_data[:work][:category]) - end - - it "responds with NOT FOUND for a fake work" do - work_id = Work.last.id + 1 - patch work_path(work_id), params: work_data - must_respond_with :not_found - end - - it "responds with BAD REQUEST for bad data" do - work_data[:work][:title] = "" - - # puts work_data - @work.assign_attributes(work_data[:work]) - expect(@work).wont_be :valid? - @work.reload - - patch work_path(@work), params: work_data - - must_respond_with :bad_request - - check_flash(:error) - end - end - - describe "destroy" do - it "removes the work from the database" do - expect { - delete work_path(@work) - }.must_change "Work.count", -1 - - must_respond_with :redirect - must_redirect_to works_path - - after_work = Work.find_by(id: @work.id) - expect(after_work).must_be_nil - end - - it "returns a 404 if the work does not exist" do - work_id = 123456 - - expect(Work.find_by(id: work_id)).must_be_nil - - expect { - delete work_path(work_id) - }.wont_change "Work.count" - - must_respond_with :not_found - end - end -end +# require "test_helper" + +# describe WorksController do +# before do +# @work = Work.create!(category: "test work", title: 'title', creator: 'Someone', publication_year: 2016, description: 'About a book', votes: 2) +# end +# describe "index" do +# it "renders without crashing" do +# get works_path + +# must_respond_with :ok +# end + +# it "renders even if there are zero works" do +# Work.destroy_all + +# get works_path + +# must_respond_with :ok +# end +# end + +# describe "show" do +# it "returns a 404 status code if the work doesn't exist" do +# work_id = 12345 + +# get work_path(work_id) + +# must_respond_with :not_found +# end + +# it "works for a work that exists" do +# get work_path(@work.id) + +# must_respond_with :ok +# end +# end + +# describe "new" do +# it "returns status code 200" do +# get new_work_path +# must_respond_with :ok +# end +# end + +# describe "create" do +# it "creates a new work" do +# work_data = { +# work: { +# category: 'album', +# title: "Create a new work", +# creator: 'some person', +# publication_year: 2018, +# description: 'Some details about a work', +# votes: 2 +# }, +# } + +# expect { +# post works_path, params: work_data +# }.must_change "Work.count", +1 + +# must_respond_with :redirect +# must_redirect_to works_path + +# work = Work.last +# expect(work.title).must_equal work_data[:work][:title] +# end + +# it "sends back bad_request if no work data is sent" do +# work_data = { +# work: { +# category: "", +# }, +# } +# expect(Work.new(work_data[:work])).wont_be :valid? + +# expect { +# post works_path, params: work_data +# }.wont_change "Work.count" + +# must_respond_with :bad_request + +# check_flash(:error) +# end +# end + +# describe "edit" do +# it "responds with OK for a real work" do +# get edit_work_path(@work) +# must_respond_with :ok +# end + +# it "responds with NOT FOUND for a fake work" do +# work_id = Work.last.id + 1 +# get edit_work_path(work_id) +# must_respond_with :not_found +# end +# end + +# describe "update" do +# let(:work_data) { +# { +# work: { +# category: "album", +# }, +# } +# } +# it "changes the data on the model" do +# @work.assign_attributes(work_data[:work]) +# expect(@work).must_be :valid? +# @work.reload + +# patch work_path(@work), params: work_data + +# must_respond_with :redirect +# must_redirect_to work_path(@work) + +# @work.reload +# expect(@work.category).must_equal(work_data[:work][:category]) +# end + +# it "responds with NOT FOUND for a fake work" do +# work_id = Work.last.id + 1 +# patch work_path(work_id), params: work_data +# must_respond_with :not_found +# end + +# it "responds with BAD REQUEST for bad data" do +# work_data[:work][:title] = "" + +# # puts work_data +# @work.assign_attributes(work_data[:work]) +# expect(@work).wont_be :valid? +# @work.reload + +# patch work_path(@work), params: work_data + +# must_respond_with :bad_request + +# check_flash(:error) +# end +# end + +# describe "destroy" do +# it "removes the work from the database" do +# expect { +# delete work_path(@work) +# }.must_change "Work.count", -1 + +# must_respond_with :redirect +# must_redirect_to works_path + +# after_work = Work.find_by(id: @work.id) +# expect(after_work).must_be_nil +# end + +# it "returns a 404 if the work does not exist" do +# work_id = 123456 + +# expect(Work.find_by(id: work_id)).must_be_nil + +# expect { +# delete work_path(work_id) +# }.wont_change "Work.count" + +# must_respond_with :not_found +# end +# end +# end From 6f1e8f9a927d894693ca7132bb6fae2158c3c46b Mon Sep 17 00:00:00 2001 From: ranuseh Date: Wed, 24 Apr 2019 10:18:47 -0700 Subject: [PATCH 20/37] addeing login functionality --- app/assets/stylesheets/application.scss | 1 + app/controllers/works_controller.rb | 42 +-- config/routes.rb | 6 + test/controllers/works_controller_test.rb | 340 +++++++++++----------- 4 files changed, 200 insertions(+), 189 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 402cf5be66..9d3aa87d4f 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -4,6 +4,7 @@ background-color: white; font-family: 'Raleway', sans-serif; margin: 0px; + padding-bottom: 50px; } .nav_list { diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index ed89995087..daf79194da 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class WorksController < ApplicationController + before_action :find_work, only: %i[show edit destroy update] + def index @works = Work.all.sort_by(&:id) end @@ -25,28 +27,27 @@ def create end def show - work_id = params[:id] + # work_id = params[:id] - @work = Work.find_by(id: work_id) + # @work = Work.find_by(id: work_id) - head :not_found unless @work + # head :not_found unless @work end def edit - work_id = params[:id] + # work_id = params[:id] - @work = Work.find_by(id: work_id) + # @work = Work.find_by(id: work_id) - head :not_found unless @work + # head :not_found unless @work end def update - @work = Work.find_by(id: params[:id]) + # work_id = params[:id] - unless @work - head :not_found - return - end + # @work = Work.find_by(id: work_id) + + # head :not_found unless @work if @work.update(work_params) flash[:status] = :success @@ -60,19 +61,16 @@ def update end def destroy - work_id = params[:id] + # work_id = params[:id] - work = Work.find_by(id: work_id) + # @work = Work.find_by(id: work_id) - unless work - head :not_found - return - end + # head :not_found unless @work - work.destroy + @work.destroy flash[:status] = :success - flash[:message] = "Successfully deleted work #{work.id}" + flash[:message] = "Successfully deleted work #{@work.id}" redirect_to works_path end end @@ -89,3 +87,9 @@ def work_params :votes ) end + +# Method so i dont repeat this +def find_work + @work = Work.find_by_id(params[:id]) + head :not_found unless @work +end diff --git a/config/routes.rb b/config/routes.rb index cc56e704c0..bafb7d8e96 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,6 +5,12 @@ resources :works resources :users + get '/login', to: 'users#login_form', as: 'login' + post '/login', to: 'users#login' + post '/logout', to: 'users#logout', as: 'logout' + get '/users/current', to: 'users#current', as: 'current_user' + + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index 61359bdc05..d2b783f648 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -1,170 +1,170 @@ -# require "test_helper" - -# describe WorksController do -# before do -# @work = Work.create!(category: "test work", title: 'title', creator: 'Someone', publication_year: 2016, description: 'About a book', votes: 2) -# end -# describe "index" do -# it "renders without crashing" do -# get works_path - -# must_respond_with :ok -# end - -# it "renders even if there are zero works" do -# Work.destroy_all - -# get works_path - -# must_respond_with :ok -# end -# end - -# describe "show" do -# it "returns a 404 status code if the work doesn't exist" do -# work_id = 12345 - -# get work_path(work_id) - -# must_respond_with :not_found -# end - -# it "works for a work that exists" do -# get work_path(@work.id) - -# must_respond_with :ok -# end -# end - -# describe "new" do -# it "returns status code 200" do -# get new_work_path -# must_respond_with :ok -# end -# end - -# describe "create" do -# it "creates a new work" do -# work_data = { -# work: { -# category: 'album', -# title: "Create a new work", -# creator: 'some person', -# publication_year: 2018, -# description: 'Some details about a work', -# votes: 2 -# }, -# } - -# expect { -# post works_path, params: work_data -# }.must_change "Work.count", +1 - -# must_respond_with :redirect -# must_redirect_to works_path - -# work = Work.last -# expect(work.title).must_equal work_data[:work][:title] -# end - -# it "sends back bad_request if no work data is sent" do -# work_data = { -# work: { -# category: "", -# }, -# } -# expect(Work.new(work_data[:work])).wont_be :valid? - -# expect { -# post works_path, params: work_data -# }.wont_change "Work.count" - -# must_respond_with :bad_request - -# check_flash(:error) -# end -# end - -# describe "edit" do -# it "responds with OK for a real work" do -# get edit_work_path(@work) -# must_respond_with :ok -# end - -# it "responds with NOT FOUND for a fake work" do -# work_id = Work.last.id + 1 -# get edit_work_path(work_id) -# must_respond_with :not_found -# end -# end - -# describe "update" do -# let(:work_data) { -# { -# work: { -# category: "album", -# }, -# } -# } -# it "changes the data on the model" do -# @work.assign_attributes(work_data[:work]) -# expect(@work).must_be :valid? -# @work.reload - -# patch work_path(@work), params: work_data - -# must_respond_with :redirect -# must_redirect_to work_path(@work) - -# @work.reload -# expect(@work.category).must_equal(work_data[:work][:category]) -# end - -# it "responds with NOT FOUND for a fake work" do -# work_id = Work.last.id + 1 -# patch work_path(work_id), params: work_data -# must_respond_with :not_found -# end - -# it "responds with BAD REQUEST for bad data" do -# work_data[:work][:title] = "" - -# # puts work_data -# @work.assign_attributes(work_data[:work]) -# expect(@work).wont_be :valid? -# @work.reload - -# patch work_path(@work), params: work_data - -# must_respond_with :bad_request - -# check_flash(:error) -# end -# end - -# describe "destroy" do -# it "removes the work from the database" do -# expect { -# delete work_path(@work) -# }.must_change "Work.count", -1 - -# must_respond_with :redirect -# must_redirect_to works_path - -# after_work = Work.find_by(id: @work.id) -# expect(after_work).must_be_nil -# end - -# it "returns a 404 if the work does not exist" do -# work_id = 123456 - -# expect(Work.find_by(id: work_id)).must_be_nil - -# expect { -# delete work_path(work_id) -# }.wont_change "Work.count" - -# must_respond_with :not_found -# end -# end -# end +require "test_helper" + +describe WorksController do + before do + @work = Work.create!(category: "test work", title: 'title', creator: 'Someone', publication_year: 2016, description: 'About a book', votes: 2) + end + describe "index" do + it "renders without crashing" do + get works_path + + must_respond_with :ok + end + + it "renders even if there are zero works" do + Work.destroy_all + + get works_path + + must_respond_with :ok + end + end + + describe "show" do + it "returns a 404 status code if the work doesn't exist" do + work_id = 12345 + + get work_path(work_id) + + must_respond_with :not_found + end + + it "works for a work that exists" do + get work_path(@work.id) + + must_respond_with :ok + end + end + + describe "new" do + it "returns status code 200" do + get new_work_path + must_respond_with :ok + end + end + + describe "create" do + it "creates a new work" do + work_data = { + work: { + category: 'album', + title: "Create a new work", + creator: 'some person', + publication_year: 2018, + description: 'Some details about a work', + votes: 2 + }, + } + + expect { + post works_path, params: work_data + }.must_change "Work.count", +1 + + must_respond_with :redirect + must_redirect_to works_path + + work = Work.last + expect(work.title).must_equal work_data[:work][:title] + end + + it "sends back bad_request if no work data is sent" do + work_data = { + work: { + category: "", + }, + } + expect(Work.new(work_data[:work])).wont_be :valid? + + expect { + post works_path, params: work_data + }.wont_change "Work.count" + + must_respond_with :bad_request + + check_flash(:error) + end + end + + describe "edit" do + it "responds with OK for a real work" do + get edit_work_path(@work) + must_respond_with :ok + end + + it "responds with NOT FOUND for a fake work" do + work_id = Work.last.id + 1 + get edit_work_path(work_id) + must_respond_with :not_found + end + end + + describe "update" do + let(:work_data) { + { + work: { + category: "album", + }, + } + } + it "changes the data on the model" do + @work.assign_attributes(work_data[:work]) + expect(@work).must_be :valid? + @work.reload + + patch work_path(@work), params: work_data + + must_respond_with :redirect + must_redirect_to work_path(@work) + + @work.reload + expect(@work.category).must_equal(work_data[:work][:category]) + end + + it "responds with NOT FOUND for a fake work" do + work_id = Work.last.id + 1 + patch work_path(work_id), params: work_data + must_respond_with :not_found + end + + it "responds with BAD REQUEST for bad data" do + work_data[:work][:title] = "" + + # puts work_data + @work.assign_attributes(work_data[:work]) + expect(@work).wont_be :valid? + @work.reload + + patch work_path(@work), params: work_data + + must_respond_with :bad_request + + check_flash(:error) + end + end + + describe "destroy" do + it "removes the work from the database" do + expect { + delete work_path(@work) + }.must_change "Work.count", -1 + + must_respond_with :redirect + must_redirect_to works_path + + after_work = Work.find_by(id: @work.id) + expect(after_work).must_be_nil + end + + it "returns a 404 if the work does not exist" do + work_id = 123456 + + expect(Work.find_by(id: work_id)).must_be_nil + + expect { + delete work_path(work_id) + }.wont_change "Work.count" + + must_respond_with :not_found + end + end +end From 5a3f7e87f74e13864614175ff0985651d00ceafa Mon Sep 17 00:00:00 2001 From: ranuseh Date: Wed, 24 Apr 2019 14:07:57 -0700 Subject: [PATCH 21/37] Added logout methods and views --- app/controllers/users_controller.rb | 47 ++++++++++++++++++++++---- app/helpers/application_helper.rb | 1 + app/views/layouts/application.html.erb | 13 ++++--- app/views/users/current.html.erb | 1 + app/views/users/login_form.html.erb | 6 ++++ config/routes.rb | 2 -- 6 files changed, 55 insertions(+), 15 deletions(-) create mode 100644 app/views/users/current.html.erb create mode 100644 app/views/users/login_form.html.erb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index a9e052a80e..25f2c7979e 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,9 +1,10 @@ -class UsersController < ApplicationController +# frozen_string_literal: true +class UsersController < ApplicationController def index - @users = Users.all.sort_by(&:id) + @users = User.all.sort_by(&:id) end - + def new @user = User.new end @@ -34,7 +35,7 @@ def update begin user_id = params[:id] user = User.find(user_id) - rescue + rescue StandardError flash[:error] = "Could not find user with id: #{params['id']}" redirect_to user_path(user_id) return @@ -45,12 +46,13 @@ def update else render :new end + end def destroy begin user = User.find(params[:id]) - rescue + rescue StandardError flash[:error] = "Could not find user with id: #{params['id']}" redirect_to users_path return @@ -59,6 +61,40 @@ def destroy redirect_to users_path end + # def login_form + # @user = User.new + # end + + # def login + # username = params[:user][:username] + # user = User.find_by(username: username) + + # if user + # session[:user_id] = user.id + # flash[:success] = "Successfully logged in as returning user #{username}" + # else + # user = User.create(username: username) # may want to have validation that user.create worked + # session[:user_id] = user.id + # flash[:success] = "Successfully logged in as new user #{username}" + # end + + # redirect_to home_path + # end + + # def current + # @current_user = User.find_by(id: session[:user_id]) + # unless @current_user + # flash[:error] = 'You must be logged in to see this page' + # redirect_to login_path + # return + # end + # end + + # def logout + # session[:user_id] = nil + # flash[:success] = "You have successfully logged out" + # redirect_to home_path + # end end private @@ -69,4 +105,3 @@ def user_params :votes ) end - \ No newline at end of file diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index de6be7945c..a01ee1ed4f 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,2 +1,3 @@ module ApplicationHelper + end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 19b6427c7c..de08399025 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -21,17 +21,16 @@ <%= link_to 'View All Media', works_path%> <%= link_to 'Add New Work', new_work_path%> <%= link_to 'View all users'%> -
    - Login -
    + <%= link_to 'Log in', login_path %> + <%= link_to 'Log out', logout_path %>
    - <% alert_type = flash[:status] == :error ? :danger : flash[:status] %> -
    - <%= flash[:message] %> -
    + <% alert_type = flash[:status] == :error ? :danger : flash[:status] %> +
    + <%= flash[:message] %> +
    <%= yield %> diff --git a/app/views/users/current.html.erb b/app/views/users/current.html.erb new file mode 100644 index 0000000000..d03e48d3eb --- /dev/null +++ b/app/views/users/current.html.erb @@ -0,0 +1 @@ +

    You are logged in as user <%= @current_user.username %>

    \ No newline at end of file diff --git a/app/views/users/login_form.html.erb b/app/views/users/login_form.html.erb new file mode 100644 index 0000000000..448f30413d --- /dev/null +++ b/app/views/users/login_form.html.erb @@ -0,0 +1,6 @@ +<%= form_with model: @user, url: login_path do |f| %> + <%= f.label :username %> + <%= f.text_field :username %> + + <%= f.submit "Log In" %> +<% end %> \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index bafb7d8e96..a94a90ecc3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -11,7 +11,5 @@ get '/users/current', to: 'users#current', as: 'current_user' - - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From 7fe7747730eebbe1fad76cb146d54f625827dc21 Mon Sep 17 00:00:00 2001 From: ranuseh Date: Wed, 24 Apr 2019 15:44:14 -0700 Subject: [PATCH 22/37] Added user seeds, user log in and log out, user forms and view pages --- app/controllers/users_controller.rb | 72 +++++++++--------- app/views/homepages/index.html.erb | 4 +- app/views/layouts/application.html.erb | 6 +- app/views/users/index.html.erb | 20 +++++ app/views/users/show.html.erb | 33 +++++++++ db/generate_seeds.rb | 14 +++- db/media_seeds.csv | 74 +++++++++++++------ db/user_seeds.csv | 26 +++++++ test/controllers/homepages_controller_test.rb | 18 +++++ 9 files changed, 201 insertions(+), 66 deletions(-) create mode 100644 app/views/users/index.html.erb create mode 100644 app/views/users/show.html.erb create mode 100644 db/user_seeds.csv diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 25f2c7979e..ee8a78a4ac 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -2,7 +2,7 @@ class UsersController < ApplicationController def index - @users = User.all.sort_by(&:id) + @users = User.all end def new @@ -22,7 +22,7 @@ def create def show user_id = params[:id] @user = User.find(user_id) - @works = Work.where(user_id: user_id.to_i) + @users = Work.where(user_id: user_id.to_i) end def edit @@ -61,40 +61,40 @@ def destroy redirect_to users_path end - # def login_form - # @user = User.new - # end - - # def login - # username = params[:user][:username] - # user = User.find_by(username: username) - - # if user - # session[:user_id] = user.id - # flash[:success] = "Successfully logged in as returning user #{username}" - # else - # user = User.create(username: username) # may want to have validation that user.create worked - # session[:user_id] = user.id - # flash[:success] = "Successfully logged in as new user #{username}" - # end - - # redirect_to home_path - # end - - # def current - # @current_user = User.find_by(id: session[:user_id]) - # unless @current_user - # flash[:error] = 'You must be logged in to see this page' - # redirect_to login_path - # return - # end - # end - - # def logout - # session[:user_id] = nil - # flash[:success] = "You have successfully logged out" - # redirect_to home_path - # end + def login_form + @user = User.new + end + + def login + username = params[:user][:username] + user = User.find_by(username: username) + + if user + session[:user_id] = user.id + flash[:success] = "Successfully logged in as returning user #{username}" + else + user = User.create(username: username) # may want to have validation that user.create worked + session[:user_id] = user.id + flash[:success] = "Successfully logged in as new user #{username}" + end + + redirect_to home_path + end + + def current + @current_user = User.find_by(id: session[:user_id]) + unless @current_user + flash[:error] = 'You must be logged in to see this page' + redirect_to login_path + return + end + end + + def logout + session[:user_id] = nil + flash[:success] = "You have successfully logged out" + redirect_to home_path + end end private diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb index 28c7917bbe..3e19d0bc57 100644 --- a/app/views/homepages/index.html.erb +++ b/app/views/homepages/index.html.erb @@ -12,17 +12,18 @@ + <% @top_ten_movies.each do |movie| %> - <% end %>
    Top MoviesCreator
    <%= link_to "#{movie.title}", work_path(movie.id) %> <%= movie.creator %><%= movie.category %>
    + <% @top_ten_books.each do |book| %> @@ -33,6 +34,7 @@
    Top BooksCreator
    <%= link_to "#{book.title}", work_path(book.id) %>
    + <% @top_ten_albums.each do |album| %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index de08399025..fc4ac95b41 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,7 +7,7 @@ <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> - <%= favicon_link_tag asset_path('owl.jpg')%> + <%= favicon_link_tag asset_path("owl.jpg")%> @@ -20,9 +20,9 @@ <%=link_to 'View Top Media'%><%= link_to 'View All Media', works_path%><%= link_to 'Add New Work', new_work_path%> - <%= link_to 'View all users'%> + <%= link_to 'View all users', users_path%><%= link_to 'Log in', login_path %> - <%= link_to 'Log out', logout_path %> + <%= link_to 'Log out', logout_path, method: :post %> diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb new file mode 100644 index 0000000000..755a678e36 --- /dev/null +++ b/app/views/users/index.html.erb @@ -0,0 +1,20 @@ + +
    +
    Top AlbumsCreator
    <%= link_to "#{album.title}", work_path(album.id) %>
    + + + + + + + + + + <% @users.each do |user| %> + + + + + <% end %> +
    List of Users
    UsernameVotesJoined
    <%= link_to "#{user.username}", user_path(user.id) %><%= user.votes %><%= user.created_at %>
    + \ No newline at end of file diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb new file mode 100644 index 0000000000..0271ff0768 --- /dev/null +++ b/app/views/users/show.html.erb @@ -0,0 +1,33 @@ + +

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

    +Joined site: <%= @user.created_at %> + +
    + + + + + + + + + + + + + + + + + + + + + <% end %> +
    Votes
    Media TitleCreated byPublishedCategoryVoted On
    <% @user.works.each do |work|%><%= work.title%><%= work.creator%><%= work.published_by%><%= work.category%><%= work.votes%>
    +
    + +<%= link_to 'See all Users', users_path%> +<%= link_to 'Back to Media List', works_path%> + + diff --git a/db/generate_seeds.rb b/db/generate_seeds.rb index 19fca77936..318dc4b054 100644 --- a/db/generate_seeds.rb +++ b/db/generate_seeds.rb @@ -12,8 +12,8 @@ CSV.open("db/media_seeds.csv", "w", :write_headers => true, :headers => ["category", "title", "creator", "publication_year", "description"]) do |csv| - 25.times do - category = %w(album book).sample + 50.times do + category = %w(album book movie).sample title = Faker::Coffee.blend_name creator = Faker::Name.name publication_year = rand(Date.today.year - 100..Date.today.year) @@ -22,3 +22,13 @@ csv << [category, title, creator, publication_year, description] end end + +CSV.open("db/user_seeds.csv", "w", :write_headers => true, + :headers => ["username", "votes"]) do |csv| + 25.times do + username = Faker::Name.name + votes = rand(0..10) + + csv << [username, votes] + end +end diff --git a/db/media_seeds.csv b/db/media_seeds.csv index 5f5b252a25..47037406dc 100644 --- a/db/media_seeds.csv +++ b/db/media_seeds.csv @@ -1,25 +1,51 @@ 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,Wake-up Breaker,Dr. Astrid Keeling,1946,Quisquam dolorum magnam placeat. +movie,Goodbye Mug,Tiffany Powlowski DVM,1959,Neque voluptatem quis occaecati. +movie,Huggy Select,Jaye Kuhic,1994,Repellendus recusandae aut doloribus. +book,KrebStar Bean,Candi Weber IV,2014,A quaerat aut maxime. +album,Major Town,Mozella Purdy,1942,Corporis praesentium ducimus inventore. +book,Veranda Extract,Ms. Shalon Rolfson,1962,Quidem quae natus sint. +book,Holiday Symphony,Dayle O'Kon PhD,1997,Dolore aliquam error voluptatem. +book,Postmodern Utopia,Elia O'Kon,1995,Exercitationem aperiam sint aut. +movie,Red Forrester,Randal Mertz II,1929,Qui quam modi voluptatem. +book,Spilt Coffee,Devin Jaskolski,1949,Voluptatum repellat aut ut. +movie,Split Cup,Robena Zboncak,1969,Perspiciatis quia autem nisi. +movie,Cascara Bean,Diedra Konopelski,1978,Sint a aut provident. +book,Captain's Java,Mrs. Vincenzo Rowe,1921,Cupiditate tempore et voluptatem. +book,Café Equinox,Latonya Kemmer,1944,Exercitationem laborum velit ipsum. +book,Bluebery Level,Carlton Huels,1951,Officiis incidunt nemo libero. +movie,The Star,Kerry Veum,1934,Officia in pariatur eos. +book,Brooklyn Coffee,Miss Casimira Gulgowski,1949,Omnis nam velit earum. +movie,Brooklyn Bean,Ed Abbott,1973,Facilis earum eos doloremque. +movie,KrebStar Coffee,Sebastian Stehr,1949,Et ea sit minima. +movie,Major Select,Dr. Alvin Murphy,1988,Culpa distinctio quo voluptatem. +movie,Veranda Utopia,Mrs. Son Huels,1932,Est qui nihil architecto. +book,Reg's Java,Herman Kessler Sr.,1947,Nostrum est repudiandae non. +movie,KrebStar America,Toccara Williamson DDS,1958,Ipsam velit nihil voluptate. +album,Captain's Java,Georgene Schiller I,1946,Rerum ratione laboriosam sequi. +movie,Postmodern Volcano,Perry Stokes II,2004,Consectetur ut aut aspernatur. +movie,Evening Equinox,Theron Schimmel,1944,Velit asperiores aspernatur recusandae. +album,Wake-up Coffee,Mr. Laverne Moore,1953,Distinctio nam quod inventore. +movie,KrebStar Cup,Jamar Rempel,1960,Eligendi cumque consequatur sequi. +album,The Cowboy,Desmond Erdman,1970,Enim ut id commodi. +book,Blacktop Look,Ferdinand Kuvalis,1992,Facere sequi suscipit in. +book,Spilt Forrester,Mr. Brian Cronin,1931,Consequatur iusto voluptatem molestiae. +movie,Thanksgiving Select,Mauro Homenick,1959,Et neque aperiam natus. +album,Street Pie,Rafael Klein,2011,Magnam quo voluptatibus accusantium. +book,Kreb-Full-o Equinox,Marjory Kulas,2017,Reprehenderit molestias voluptas facilis. +book,Red Extract,Carleen Nicolas MD,1933,Dolore iste minus quibusdam. +album,Summer Been,Hortencia Streich,1952,Expedita illum mollitia eum. +movie,Captain's ,Afton Larson,2010,Esse veritatis necessitatibus voluptatem. +movie,Bluebery Blend,Sirena Wiza,1987,Sit id temporibus suscipit. +album,Thanksgiving Pie,Hortensia Littel,1953,Exercitationem consequuntur neque quod. +movie,Hello Mug,Jonna Wilkinson,2017,Voluptatem doloribus repellendus possimus. +album,Joe Look,Bulah Muller III,1924,Cupiditate nemo sed velit. +book,Wake-up Select,Alaine Dibbert IV,2003,Eum molestiae aut sit. +album,Joe America,Wyatt Berge,2013,Fugit quam beatae qui. +movie,Jacked Nuts,Raul Wisozk,1919,Ut enim doloremque ipsa. +movie,The Breaker,Mr. Lincoln Barton,1988,Adipisci ad mollitia et. +book,The Treat,Elisha Torp,1936,Natus est soluta nihil. +book,Melty Been,Setsuko Bayer,1985,Alias a consequuntur quia. +book,The Treat,Yong Gerlach,1989,Sunt architecto sint veniam. +movie,Dark Been,Sherise Ward,2006,Deserunt eos laborum distinctio. +album,Dark Town,Gerry Kuhic,2018,Et nisi sed cum. diff --git a/db/user_seeds.csv b/db/user_seeds.csv new file mode 100644 index 0000000000..6b509da6a5 --- /dev/null +++ b/db/user_seeds.csv @@ -0,0 +1,26 @@ +username,votes +Carmine Lesch,5 +Josue Ankunding,10 +Mason Rolfson V,10 +Rex Smitham,6 +Marin Dooley,1 +Johnnie Towne,9 +Ms. Ariel Boehm,2 +Gracie Kessler,2 +Merrie West,10 +Alexandra Gleason,7 +Ms. Al Luettgen,8 +Rebecca Bernier,7 +Harris Pollich,9 +Zachariah Klein,10 +Tamar Cormier,4 +Bulah Quitzon,4 +Rob Marks,8 +Neta Casper,0 +Lauretta Rosenbaum,9 +Weldon D'Amore,8 +Ms. Delmer Nolan,5 +Patrick Glover,3 +Scott Sipes IV,2 +Glennis Larson,1 +Hans Gerhold,7 diff --git a/test/controllers/homepages_controller_test.rb b/test/controllers/homepages_controller_test.rb index fa5d8504e0..473c649d0e 100644 --- a/test/controllers/homepages_controller_test.rb +++ b/test/controllers/homepages_controller_test.rb @@ -9,6 +9,24 @@ get works_path must_respond_with :ok + + # user = User.first + # login_data = { + # user: { + # username: user.username + # } + # } + # post login_path, params: login_data + + # # Verify the user ID was saved - if that didn't work, this test is invalid + # expect(session[:user_id]).must_equal user.id + + # # Act + # get current_user_path + + # # Assert + # must_respond_with :success + end end From a96b2517305b0a1cf9f7c1a0573346c512aa8332 Mon Sep 17 00:00:00 2001 From: ranuseh Date: Wed, 24 Apr 2019 17:56:20 -0700 Subject: [PATCH 23/37] Small edits on votes method --- app/controllers/users_controller.rb | 3 ++- app/controllers/works_controller.rb | 11 ++++++++++- app/models/user.rb | 2 ++ app/views/works/show.html.erb | 2 +- config/routes.rb | 1 + db/migrate/20190422231018_create_users_works_join.rb | 1 + 6 files changed, 17 insertions(+), 3 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index ee8a78a4ac..7a6f9a8710 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -102,6 +102,7 @@ def logout def user_params params.require(:user).permit( :username, - :votes + :votes, + works_id: [], ) end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index daf79194da..c17adbbfb5 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -73,6 +73,13 @@ def destroy flash[:message] = "Successfully deleted work #{@work.id}" redirect_to works_path end + + def upvote + @work = Work.find(params[:id]) + @work.upvote.create + redirect_to(works_path) + end + end private @@ -84,7 +91,9 @@ def work_params :creator, :publication_year, :description, - :votes + :votes, + user_ids: [], + ) end diff --git a/app/models/user.rb b/app/models/user.rb index 497a13b160..56a14317d6 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,4 +1,6 @@ class User < ApplicationRecord has_and_belongs_to_many :works + + end diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index dac9e6ee46..ddf1cd17f0 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -28,7 +28,7 @@
  • - <%= link_to "upvote"%> + <%= link_to "Upvote", upvote_path(@work.id)%>
    • diff --git a/config/routes.rb b/config/routes.rb index a94a90ecc3..f70b144886 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -10,6 +10,7 @@ post '/logout', to: 'users#logout', as: 'logout' get '/users/current', to: 'users#current', as: 'current_user' + get '/works/:id/upvote', to: 'works#upvote', as: 'upvote' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/db/migrate/20190422231018_create_users_works_join.rb b/db/migrate/20190422231018_create_users_works_join.rb index 590d4a1413..71fc0db39e 100644 --- a/db/migrate/20190422231018_create_users_works_join.rb +++ b/db/migrate/20190422231018_create_users_works_join.rb @@ -6,3 +6,4 @@ def change end end end + From 5fb2f54ce3ff2d04f03faaf3b7928ff55b409d06 Mon Sep 17 00:00:00 2001 From: ranuseh Date: Wed, 24 Apr 2019 18:05:37 -0700 Subject: [PATCH 24/37] Created new model for votes. Intending to remove join table --- app/controllers/users_controller.rb | 1 - app/controllers/works_controller.rb | 4 +--- app/models/vote.rb | 4 ++++ app/models/work.rb | 1 + db/migrate/20190425005633_create_votes.rb | 10 ++++++++++ db/schema.rb | 9 ++++++++- test/fixtures/votes.yml | 9 +++++++++ test/models/vote_test.rb | 9 +++++++++ 8 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 app/models/vote.rb create mode 100644 db/migrate/20190425005633_create_votes.rb create mode 100644 test/fixtures/votes.yml create mode 100644 test/models/vote_test.rb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 7a6f9a8710..9d3fbfa5f1 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -103,6 +103,5 @@ def user_params params.require(:user).permit( :username, :votes, - works_id: [], ) end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index c17adbbfb5..c1eccf70a2 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -76,7 +76,7 @@ def destroy def upvote @work = Work.find(params[:id]) - @work.upvote.create + @work.votes.create redirect_to(works_path) end @@ -92,8 +92,6 @@ def work_params :publication_year, :description, :votes, - user_ids: [], - ) end diff --git a/app/models/vote.rb b/app/models/vote.rb new file mode 100644 index 0000000000..684551f081 --- /dev/null +++ b/app/models/vote.rb @@ -0,0 +1,4 @@ +class Vote < ApplicationRecord + belongs_to :works + belongs_to :users +end diff --git a/app/models/work.rb b/app/models/work.rb index 9c1280ce36..30f678e960 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,5 +1,6 @@ class Work < ApplicationRecord has_and_belongs_to_many :users + has_many :votes, dependent: :destroy validates :title, presence: true validates :category, presence: true diff --git a/db/migrate/20190425005633_create_votes.rb b/db/migrate/20190425005633_create_votes.rb new file mode 100644 index 0000000000..7ee86107b2 --- /dev/null +++ b/db/migrate/20190425005633_create_votes.rb @@ -0,0 +1,10 @@ +class CreateVotes < ActiveRecord::Migration[5.2] + def change + create_table :votes do |t| + t.integer :user_id + t.integer :work_id + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index c014426fc6..cb5a2b6f79 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: 2019_04_24_011626) do +ActiveRecord::Schema.define(version: 2019_04_25_005633) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -34,6 +34,13 @@ t.index ["work_id"], name: "index_users_works_on_work_id" end + create_table "votes", force: :cascade do |t| + t.integer "user_id" + t.integer "work_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "works", force: :cascade do |t| t.string "category" t.string "title" diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml new file mode 100644 index 0000000000..eb63afacaa --- /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_id: 1 + work_id: 1 + +two: + user_id: 1 + work_id: 1 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 2cd4d1310abff82d8ba796a252097ebe1fd6466c Mon Sep 17 00:00:00 2001 From: ranuseh Date: Wed, 24 Apr 2019 20:37:39 -0700 Subject: [PATCH 25/37] Added ability to upvote --- app/controllers/users_controller.rb | 1 + app/controllers/works_controller.rb | 25 ++++- app/models/user.rb | 5 +- app/models/work.rb | 2 +- app/views/users/index.html.erb | 2 +- app/views/users/show.html.erb | 2 +- app/views/works/index.html.erb | 12 +-- app/views/works/show.html.erb | 24 ++++- config/routes.rb | 2 +- db/generate_seeds.rb | 2 +- db/media_seeds.csv | 100 +++++++++--------- .../20190425021622_rename_column_of_users.rb | 6 ++ db/schema.rb | 6 +- db/seeds.rb | 7 +- db/user_seeds.csv | 50 ++++----- 15 files changed, 144 insertions(+), 102 deletions(-) create mode 100644 db/migrate/20190425021622_rename_column_of_users.rb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 9d3fbfa5f1..a062b423fd 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -95,6 +95,7 @@ def logout flash[:success] = "You have successfully logged out" redirect_to home_path end + end private diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index c1eccf70a2..44f0ec97bb 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -74,12 +74,29 @@ def destroy redirect_to works_path end - def upvote + def upvote @work = Work.find(params[:id]) - @work.votes.create + user_id = session[:user_id] + @user = User.find(user_id ) + + # @work.votes.create(work_id: @work.id, user_id: @work.users) + + if @work.number_of_votes.nil? + @work.update(number_of_votes: 1) + else + @work.update(number_of_votes: @work.number_of_votes + 1) + end + + if @user.number_of_votes.nil? + @user.update(number_of_votes: 1) + else + @user.update(number_of_votes: @user.number_of_votes + 1) + end + + puts @work.errors.messages + redirect_to(works_path) end - end private @@ -91,7 +108,7 @@ def work_params :creator, :publication_year, :description, - :votes, + :votes ) end diff --git a/app/models/user.rb b/app/models/user.rb index 56a14317d6..90fd21110f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,6 +1,5 @@ class User < ApplicationRecord - has_and_belongs_to_many :works - - + # has_many :works + has_many :votes end diff --git a/app/models/work.rb b/app/models/work.rb index 30f678e960..7e4a17dd0c 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,5 +1,5 @@ class Work < ApplicationRecord - has_and_belongs_to_many :users + # belongs_to :users has_many :votes, dependent: :destroy validates :title, presence: true diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 755a678e36..3ce663f6f2 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -12,7 +12,7 @@ <% @users.each do |user| %> <%= link_to "#{user.username}", user_path(user.id) %> - <%= user.votes %> + <%= user.number_of_votes %> <%= user.created_at %> <% end %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 0271ff0768..d4a29821a5 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -20,7 +20,7 @@ <%= work.creator%> <%= work.published_by%> <%= work.category%> - <%= work.votes%> + <%= work.number_of_votes%> <% end %> diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 455e5ade8e..5441f44f1e 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -13,11 +13,11 @@ <% @books = Work.where(category: "book") %> <% @books.each do |book| %> - <%= link_to 'Votes' %> + <%= book.number_of_votes %> <%= link_to "#{book.title}", work_path(book.id) %> <%= book.creator %> <%= book.publication_year %> - <%= link_to 'Up Vote' %> + <%= link_to 'Up Vote', upvote_path(book.id), method: :post %> <% end %> @@ -34,11 +34,11 @@ <% @albums = Work.where(category: "album") %> <% @albums.each do |album| %> - <%= link_to 'Votes' %> + <%= album.number_of_votes %> <%= link_to "#{album.title}", work_path(album.id) %> <%= album.creator %> <%= album.publication_year%> - <%= link_to 'Up Vote' %> + <%= link_to 'Up Vote', upvote_path(album.id), method: :post %> <% end %> @@ -55,11 +55,11 @@ <% @movies = Work.where(category: "movie") %> <% @movies.each do |movie| %> - <%= link_to 'Votes' %> + <%= movie.number_of_votes %> <%= link_to "#{movie.title}", work_path(movie.id) %> <%= movie.creator %> <%= movie.publication_year %> - <%= link_to 'Up Vote' %> + <%= link_to 'Up Vote', upvote_path(movie.id), method: :post %> <% end %> diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index ddf1cd17f0..1a4a6e4d4d 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -1,4 +1,3 @@ -

    Media details page

    • @@ -19,6 +18,27 @@ <%= @work.description %>
      • +
      + + + + + + + + + + + +
      <%=@work.number_of_votes%>
      UserDate
      <%= @work.users%>
      +
      + + + + + + +
    • <%= link_to "Back to Media ranks" %>
      • @@ -28,7 +48,7 @@
    • - <%= link_to "Upvote", upvote_path(@work.id)%> + <%= link_to "Upvote", upvote_path(@work.id), method: :post %>
      • diff --git a/config/routes.rb b/config/routes.rb index f70b144886..2db8ca4021 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -10,7 +10,7 @@ post '/logout', to: 'users#logout', as: 'logout' get '/users/current', to: 'users#current', as: 'current_user' - get '/works/:id/upvote', to: 'works#upvote', as: 'upvote' + post '/works/:id/upvote', to: 'works#upvote', as: 'upvote' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/db/generate_seeds.rb b/db/generate_seeds.rb index 318dc4b054..704342bdf9 100644 --- a/db/generate_seeds.rb +++ b/db/generate_seeds.rb @@ -26,7 +26,7 @@ CSV.open("db/user_seeds.csv", "w", :write_headers => true, :headers => ["username", "votes"]) do |csv| 25.times do - username = Faker::Name.name + username = Faker::Name.first_name votes = rand(0..10) csv << [username, votes] diff --git a/db/media_seeds.csv b/db/media_seeds.csv index 47037406dc..eb31d881a6 100644 --- a/db/media_seeds.csv +++ b/db/media_seeds.csv @@ -1,51 +1,51 @@ category,title,creator,publication_year,description -album,Wake-up Breaker,Dr. Astrid Keeling,1946,Quisquam dolorum magnam placeat. -movie,Goodbye Mug,Tiffany Powlowski DVM,1959,Neque voluptatem quis occaecati. -movie,Huggy Select,Jaye Kuhic,1994,Repellendus recusandae aut doloribus. -book,KrebStar Bean,Candi Weber IV,2014,A quaerat aut maxime. -album,Major Town,Mozella Purdy,1942,Corporis praesentium ducimus inventore. -book,Veranda Extract,Ms. Shalon Rolfson,1962,Quidem quae natus sint. -book,Holiday Symphony,Dayle O'Kon PhD,1997,Dolore aliquam error voluptatem. -book,Postmodern Utopia,Elia O'Kon,1995,Exercitationem aperiam sint aut. -movie,Red Forrester,Randal Mertz II,1929,Qui quam modi voluptatem. -book,Spilt Coffee,Devin Jaskolski,1949,Voluptatum repellat aut ut. -movie,Split Cup,Robena Zboncak,1969,Perspiciatis quia autem nisi. -movie,Cascara Bean,Diedra Konopelski,1978,Sint a aut provident. -book,Captain's Java,Mrs. Vincenzo Rowe,1921,Cupiditate tempore et voluptatem. -book,Café Equinox,Latonya Kemmer,1944,Exercitationem laborum velit ipsum. -book,Bluebery Level,Carlton Huels,1951,Officiis incidunt nemo libero. -movie,The Star,Kerry Veum,1934,Officia in pariatur eos. -book,Brooklyn Coffee,Miss Casimira Gulgowski,1949,Omnis nam velit earum. -movie,Brooklyn Bean,Ed Abbott,1973,Facilis earum eos doloremque. -movie,KrebStar Coffee,Sebastian Stehr,1949,Et ea sit minima. -movie,Major Select,Dr. Alvin Murphy,1988,Culpa distinctio quo voluptatem. -movie,Veranda Utopia,Mrs. Son Huels,1932,Est qui nihil architecto. -book,Reg's Java,Herman Kessler Sr.,1947,Nostrum est repudiandae non. -movie,KrebStar America,Toccara Williamson DDS,1958,Ipsam velit nihil voluptate. -album,Captain's Java,Georgene Schiller I,1946,Rerum ratione laboriosam sequi. -movie,Postmodern Volcano,Perry Stokes II,2004,Consectetur ut aut aspernatur. -movie,Evening Equinox,Theron Schimmel,1944,Velit asperiores aspernatur recusandae. -album,Wake-up Coffee,Mr. Laverne Moore,1953,Distinctio nam quod inventore. -movie,KrebStar Cup,Jamar Rempel,1960,Eligendi cumque consequatur sequi. -album,The Cowboy,Desmond Erdman,1970,Enim ut id commodi. -book,Blacktop Look,Ferdinand Kuvalis,1992,Facere sequi suscipit in. -book,Spilt Forrester,Mr. Brian Cronin,1931,Consequatur iusto voluptatem molestiae. -movie,Thanksgiving Select,Mauro Homenick,1959,Et neque aperiam natus. -album,Street Pie,Rafael Klein,2011,Magnam quo voluptatibus accusantium. -book,Kreb-Full-o Equinox,Marjory Kulas,2017,Reprehenderit molestias voluptas facilis. -book,Red Extract,Carleen Nicolas MD,1933,Dolore iste minus quibusdam. -album,Summer Been,Hortencia Streich,1952,Expedita illum mollitia eum. -movie,Captain's ,Afton Larson,2010,Esse veritatis necessitatibus voluptatem. -movie,Bluebery Blend,Sirena Wiza,1987,Sit id temporibus suscipit. -album,Thanksgiving Pie,Hortensia Littel,1953,Exercitationem consequuntur neque quod. -movie,Hello Mug,Jonna Wilkinson,2017,Voluptatem doloribus repellendus possimus. -album,Joe Look,Bulah Muller III,1924,Cupiditate nemo sed velit. -book,Wake-up Select,Alaine Dibbert IV,2003,Eum molestiae aut sit. -album,Joe America,Wyatt Berge,2013,Fugit quam beatae qui. -movie,Jacked Nuts,Raul Wisozk,1919,Ut enim doloremque ipsa. -movie,The Breaker,Mr. Lincoln Barton,1988,Adipisci ad mollitia et. -book,The Treat,Elisha Torp,1936,Natus est soluta nihil. -book,Melty Been,Setsuko Bayer,1985,Alias a consequuntur quia. -book,The Treat,Yong Gerlach,1989,Sunt architecto sint veniam. -movie,Dark Been,Sherise Ward,2006,Deserunt eos laborum distinctio. -album,Dark Town,Gerry Kuhic,2018,Et nisi sed cum. +book,Split America,Brad Schaefer,1951,Nesciunt harum tenetur nulla. +album,Major Treat,Alissa Abbott,1932,Id velit ratione rerum. +album,Blue Level,Dr. Grant Kub,1932,Dicta quam est voluptate. +album,Melty America,Raul Hammes PhD,2009,Fugiat repellat eos sint. +album,Holiday Look,September Veum,1942,Dolorem omnis animi eos. +book,Thanksgiving Choice,Serena Ruecker,1928,Sequi voluptas rem vel. +album,Green Forrester,Mrs. Carson Sawayn,1939,Ut optio non fuga. +album,Red Forrester,Millard Beatty,1927,Aut magnam et repellat. +movie,Brooklyn Cake,Ira Kling,1977,Alias et nesciunt quo. +book,Major Solstice,Reuben Upton,1935,Impedit laboriosam repellat sint. +movie,Street Coffee,Flossie Schultz,1969,Magnam rem ad cum. +movie,Bluebery Solstice,Philip Homenick I,2019,Reiciendis sit impedit asperiores. +album,Kreb-Full-o Extract,Ms. Claudette Turner,1998,Dicta nam adipisci voluptatibus. +album,Blacktop Star,Milton Zieme,1976,Quas eligendi dolores voluptatem. +movie,Seattle Bean,Ms. Josh Satterfield,2001,Architecto officia sapiente molestias. +album,Blue Volcano,Danille Gerhold IV,1943,Commodi quaerat omnis voluptas. +book,Melty Select,Chia Gerlach,1924,At quia exercitationem vitae. +album,KrebStar Forrester,Eddy Walsh MD,1960,Dolores praesentium earum minima. +book,Chocolate Cowboy,Dr. Erlene Zemlak,1972,Numquam voluptatibus magnam ut. +album,Brooklyn Volcano,Chris Leuschke,1919,Et consectetur non et. +book,Huggy Volcano,Karri Weimann,1930,Consequuntur aut sint et. +book,Veranda Equinox,Arnoldo Lindgren DVM,1965,Atque ut ut sapiente. +movie,Dark Select,Dr. Bobbie Larkin,2000,Recusandae id ut veritatis. +book,Pumpkin-spice Pie,Devin Murazik PhD,1955,Non omnis aut autem. +movie,KrebStar Choice,Brady Jacobs,1989,Quis sunt sed non. +album,Wake-up Volcano,Elinore McDermott,1920,Id ipsam iusto quia. +movie,American Breaker,Mr. Cecile Watsica,2012,Et quaerat est laboriosam. +book,Jacked Level,Ashlea Russel,1990,Sit voluptatibus quis rerum. +movie,Hello Blend,Gennie Collins I,1926,Facilis voluptas non et. +album,Wake-up Breaker,Cindie Anderson,1939,Velit dicta quia dignissimos. +movie,Blacktop Volcano,Brady Johnston,1965,Maxime eaque fugit voluptas. +book,Wake-up Town,Leila Klocko DVM,2004,Minima magnam nesciunt voluptatem. +book,Evening ,Fermin Hettinger MD,1926,Architecto ad quia saepe. +album,Red Extract,Miss Steve Schaden,1975,Est repellendus eum ab. +book,Green Look,Terrell Ratke,1954,Sequi molestias tempora doloribus. +movie,Melty America,Jake Brown,1921,Tempore accusamus blanditiis incidunt. +album,Pumpkin-spice Treat,Irma Daniel,1937,Quia sit est voluptas. +book,Captain's Light,Elden Dooley,1983,Ut quis fugit nam. +album,Winter Solstice,Mrs. Claude Stroman,1922,Minima tempora adipisci quibusdam. +book,Holiday Treat,Coy Prosacco,2009,Animi dolores et provident. +movie,Strong Enlightenment,Lizzie Jaskolski Jr.,1922,Qui eum minima hic. +movie,Seattle Delight,Orlando Franecki,1933,Dignissimos aliquid ducimus rem. +movie,Jacked Select,Mr. Ezequiel Boyer,2015,Distinctio voluptate quia dicta. +book,Joe Bean,Mr. Hyman Dicki,1942,Fugit quis optio voluptas. +book,Split Treat,Kristina Kulas,1926,Culpa et esse provident. +book,Split Level,Mr. Earle Maggio,2000,Ut accusamus fuga voluptates. +album,Spilt Breaker,Miss Cameron Kuvalis,1990,Velit accusantium autem voluptate. +album,Winter Forrester,January Rempel IV,1983,Libero doloremque ut veritatis. +movie,Hello Level,Loria Hudson,2005,Quam rerum laborum provident. +book,Cascara Utopia,Miss Andres Welch,1995,Quia quas in et. diff --git a/db/migrate/20190425021622_rename_column_of_users.rb b/db/migrate/20190425021622_rename_column_of_users.rb new file mode 100644 index 0000000000..2e728b7ddc --- /dev/null +++ b/db/migrate/20190425021622_rename_column_of_users.rb @@ -0,0 +1,6 @@ +class RenameColumnOfUsers < ActiveRecord::Migration[5.2] + def change + rename_column :users, :votes, :number_of_votes + rename_column :works, :votes, :number_of_votes + end +end diff --git a/db/schema.rb b/db/schema.rb index cb5a2b6f79..e3bfabe685 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: 2019_04_25_005633) do +ActiveRecord::Schema.define(version: 2019_04_25_021622) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -22,7 +22,7 @@ create_table "users", force: :cascade do |t| t.string "username" - t.integer "votes" + t.integer "number_of_votes" t.datetime "created_at", null: false t.datetime "updated_at", null: false end @@ -49,7 +49,7 @@ t.string "description" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.integer "votes" + t.integer "number_of_votes" end end diff --git a/db/seeds.rb b/db/seeds.rb index 20ca3ce85f..3b6fe47c58 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -12,7 +12,7 @@ work.creator = row['creator'] work.publication_year = row['publication_year'].to_i work.description = row['description'] - work.votes = row['votes'] + work.number_of_votes = row['votes'] successful = work.save @@ -27,9 +27,8 @@ puts "Added #{Work.count} work records" puts "#{work_failures.length} works failed to save" -require 'csv' -USER_FILE = Rails.root.join('db', 'media_seeds.csv') +USER_FILE = Rails.root.join('db', 'user_seeds.csv') puts "Loading raw user data from #{USER_FILE}" user_failures = [] @@ -37,7 +36,7 @@ user = User.new user.id = row['id'] user.username = row['username'] - user.votes = row['votes'] + user.number_of_votes = row['votes'] successful = user.save if !successful user_failures << user diff --git a/db/user_seeds.csv b/db/user_seeds.csv index 6b509da6a5..e6a7d41784 100644 --- a/db/user_seeds.csv +++ b/db/user_seeds.csv @@ -1,26 +1,26 @@ username,votes -Carmine Lesch,5 -Josue Ankunding,10 -Mason Rolfson V,10 -Rex Smitham,6 -Marin Dooley,1 -Johnnie Towne,9 -Ms. Ariel Boehm,2 -Gracie Kessler,2 -Merrie West,10 -Alexandra Gleason,7 -Ms. Al Luettgen,8 -Rebecca Bernier,7 -Harris Pollich,9 -Zachariah Klein,10 -Tamar Cormier,4 -Bulah Quitzon,4 -Rob Marks,8 -Neta Casper,0 -Lauretta Rosenbaum,9 -Weldon D'Amore,8 -Ms. Delmer Nolan,5 -Patrick Glover,3 -Scott Sipes IV,2 -Glennis Larson,1 -Hans Gerhold,7 +Micki,10 +Sandra,3 +Jewel,1 +Dianna,3 +Nick,3 +Clement,8 +Racquel,8 +Cora,0 +Lottie,5 +Jae,5 +Lucio,2 +Rusty,5 +Carmelia,0 +Annabelle,3 +Julius,6 +Wilburn,0 +Allene,5 +Agnes,4 +Herbert,4 +Luigi,0 +Dorathy,4 +Luisa,9 +Ester,2 +Gregg,7 +Le,2 From 1f749ec015af153387be3a189e03fc99f4cc17d7 Mon Sep 17 00:00:00 2001 From: ranuseh Date: Wed, 24 Apr 2019 22:48:19 -0700 Subject: [PATCH 26/37] Added ability to sort by ratings --- app/controllers/works_controller.rb | 11 ++++++----- app/views/users/show.html.erb | 14 ++++++-------- app/views/works/index.html.erb | 3 --- app/views/works/show.html.erb | 1 - db/seeds.rb | 2 +- 5 files changed, 13 insertions(+), 18 deletions(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 44f0ec97bb..7466c4826c 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -4,7 +4,10 @@ class WorksController < ApplicationController before_action :find_work, only: %i[show edit destroy update] def index - @works = Work.all.sort_by(&:id) + @works = Work.all.sort_by(&:number_of_votes).reverse + @books = @works.select { |work| work.category == 'book'} + @albums = @works.select { |work| work.category == 'album'} + @movies = @works.select { |work| work.category == 'movie'} end def new @@ -77,9 +80,9 @@ def destroy def upvote @work = Work.find(params[:id]) user_id = session[:user_id] - @user = User.find(user_id ) + @user = User.find(user_id) - # @work.votes.create(work_id: @work.id, user_id: @work.users) + Vote.create(work_id: @work.id, user_id: @user.id) if @work.number_of_votes.nil? @work.update(number_of_votes: 1) @@ -93,8 +96,6 @@ def upvote @user.update(number_of_votes: @user.number_of_votes + 1) end - puts @work.errors.messages - redirect_to(works_path) end end diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index d4a29821a5..8dad13457e 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -12,18 +12,16 @@ Created by Published Category - Voted On + Voted On - <% @user.works.each do |work|%> - <%= work.title%> - <%= work.creator%> - <%= work.published_by%> - <%= work.category%> - <%= work.number_of_votes%> + <%= @user.votes.count %> + <%= @user.votes.count %> + <%= @user.votes.count %> + <%= @user.votes.count %> + <%= @user.votes.count %> - <% end %> diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 5441f44f1e..e8315867e7 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -11,7 +11,6 @@ UpVote - <% @books = Work.where(category: "book") %> <% @books.each do |book| %> <%= book.number_of_votes %> <%= link_to "#{book.title}", work_path(book.id) %> @@ -32,7 +31,6 @@ UpVote - <% @albums = Work.where(category: "album") %> <% @albums.each do |album| %> <%= album.number_of_votes %> <%= link_to "#{album.title}", work_path(album.id) %> @@ -53,7 +51,6 @@ UpVote - <% @movies = Work.where(category: "movie") %> <% @movies.each do |movie| %> <%= movie.number_of_votes %> <%= link_to "#{movie.title}", work_path(movie.id) %> diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 1a4a6e4d4d..b66474e8d3 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -28,7 +28,6 @@ Date - <%= @work.users%> diff --git a/db/seeds.rb b/db/seeds.rb index 3b6fe47c58..2c663277fd 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -12,7 +12,7 @@ work.creator = row['creator'] work.publication_year = row['publication_year'].to_i work.description = row['description'] - work.number_of_votes = row['votes'] + work.number_of_votes = 0 successful = work.save From 5884101d273ea33781b60061ff8db9d402493236 Mon Sep 17 00:00:00 2001 From: ranuseh Date: Thu, 25 Apr 2019 09:24:01 -0700 Subject: [PATCH 27/37] Added error checking for upvote if the user is not logged in --- app/controllers/works_controller.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 7466c4826c..9d6ed13f43 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -80,8 +80,16 @@ def destroy def upvote @work = Work.find(params[:id]) user_id = session[:user_id] + g + if user_id.nil? + flash[:error] = 'You must be logged in to see this page' + redirect_to login_path + return + end + @user = User.find(user_id) + Vote.create(work_id: @work.id, user_id: @user.id) if @work.number_of_votes.nil? From a57aa40094707aecfa04f2cb209709c2bbd214ce Mon Sep 17 00:00:00 2001 From: ranuseh Date: Thu, 25 Apr 2019 17:22:49 -0700 Subject: [PATCH 28/37] Spotlight picked based on number of votes --- app/assets/images/{owl.jpg => owl.png} | Bin app/controllers/homepages_controller.rb | 2 +- app/controllers/works_controller.rb | 2 +- app/views/homepages/index.html.erb | 6 +++--- app/views/layouts/application.html.erb | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename app/assets/images/{owl.jpg => owl.png} (100%) diff --git a/app/assets/images/owl.jpg b/app/assets/images/owl.png similarity index 100% rename from app/assets/images/owl.jpg rename to app/assets/images/owl.png diff --git a/app/controllers/homepages_controller.rb b/app/controllers/homepages_controller.rb index a11321954f..ca8f63801a 100644 --- a/app/controllers/homepages_controller.rb +++ b/app/controllers/homepages_controller.rb @@ -2,7 +2,7 @@ class HomepagesController < ApplicationController def index @works = Work.all.sort_by(&:id) - @spotlight = @works.sample + @spotlight = Work.all.max_by(&:number_of_votes) top_ten_movies top_ten_books top_ten_albums diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 9d6ed13f43..0c6653413b 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -80,7 +80,7 @@ def destroy def upvote @work = Work.find(params[:id]) user_id = session[:user_id] - g + if user_id.nil? flash[:error] = 'You must be logged in to see this page' redirect_to login_path diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb index 3e19d0bc57..0d581cca48 100644 --- a/app/views/homepages/index.html.erb +++ b/app/views/homepages/index.html.erb @@ -11,7 +11,7 @@
      - + <% @top_ten_movies.each do |movie| %> @@ -22,7 +22,7 @@
      Top MoviesTop 10 Movies Creator
      - + <% @top_ten_books.each do |book| %> @@ -33,7 +33,7 @@
      Top BooksTop 10 Books Creator
      - + <% @top_ten_albums.each do |album| %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index fc4ac95b41..c0fddc3548 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,7 +7,7 @@ <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> - <%= favicon_link_tag asset_path("owl.jpg")%> + <%# <%= favicon_link_tag asset_path("owl.jpg") %> From 5c1968770f239f21ea25209a1891581d9ff951d1 Mon Sep 17 00:00:00 2001 From: ranuseh Date: Thu, 25 Apr 2019 22:17:42 -0700 Subject: [PATCH 29/37] Added ability to list users who voted for a particular media --- app/assets/javascripts/votes.js | 2 ++ app/assets/stylesheets/votes.scss | 3 +++ app/controllers/homepages_controller.rb | 14 +++++++------- app/controllers/users_controller.rb | 5 ++++- app/controllers/votes_controller.rb | 8 ++++++++ app/controllers/works_controller.rb | 16 +++++++--------- app/helpers/votes_helper.rb | 2 ++ app/models/vote.rb | 4 ++-- app/views/users/show.html.erb | 10 ++++------ app/views/works/show.html.erb | 10 +++++++--- test/controllers/votes_controller_test.rb | 7 +++++++ 11 files changed, 53 insertions(+), 28 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 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/homepages_controller.rb b/app/controllers/homepages_controller.rb index ca8f63801a..b222eedcd9 100644 --- a/app/controllers/homepages_controller.rb +++ b/app/controllers/homepages_controller.rb @@ -1,5 +1,6 @@ -class HomepagesController < ApplicationController +# frozen_string_literal: true +class HomepagesController < ApplicationController def index @works = Work.all.sort_by(&:id) @spotlight = Work.all.max_by(&:number_of_votes) @@ -7,20 +8,19 @@ def index top_ten_books top_ten_albums end - + def top_ten_movies - @movies = Work.where(category: "movie") + @movies = Work.where(category: 'movie') @top_ten_movies = @movies.sample(10) end def top_ten_books - @books = Work.where(category: "book") + @books = Work.where(category: 'book') @top_ten_books = @books.sample(10) end - def top_ten_albums - @albums = Work.where(category: "album") + def top_ten_albums + @albums = Work.where(category: 'album') @top_ten_albums = @albums.sample(10) end - end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index a062b423fd..bb6021fae3 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -23,6 +23,9 @@ def show user_id = params[:id] @user = User.find(user_id) @users = Work.where(user_id: user_id.to_i) + @votes = Vote.all + @users_votes = @votes.where(user_id: user_id) + # puts @users_votes.count end def edit @@ -103,6 +106,6 @@ def logout def user_params params.require(:user).permit( :username, - :votes, + :number_of_votes, ) end diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb new file mode 100644 index 0000000000..3dafb5adbb --- /dev/null +++ b/app/controllers/votes_controller.rb @@ -0,0 +1,8 @@ +class VotesController < + def index + @votes = Vote.all.sort_by(&:number_of_votes).reverse + @users_votes = @votes.find(params[:user_id]) + @works_votes = @votes.find(params[:work_id]) + end + +end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 0c6653413b..583dad379f 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -30,19 +30,18 @@ def create end def show - # work_id = params[:id] - + work_id = params[:id] # @work = Work.find_by(id: work_id) - # head :not_found unless @work + @votes = Vote.all + @works_votes = @votes.where(work_id: work_id) end def edit # work_id = params[:id] - # @work = Work.find_by(id: work_id) - # head :not_found unless @work + end def update @@ -80,7 +79,7 @@ def destroy def upvote @work = Work.find(params[:id]) user_id = session[:user_id] - + if user_id.nil? flash[:error] = 'You must be logged in to see this page' redirect_to login_path @@ -89,8 +88,7 @@ def upvote @user = User.find(user_id) - - Vote.create(work_id: @work.id, user_id: @user.id) + @user.votes.create!(work_id: @work.id) if @work.number_of_votes.nil? @work.update(number_of_votes: 1) @@ -117,7 +115,7 @@ def work_params :creator, :publication_year, :description, - :votes + :number_of_votes ) end diff --git a/app/helpers/votes_helper.rb b/app/helpers/votes_helper.rb new file mode 100644 index 0000000000..5a82eed07d --- /dev/null +++ b/app/helpers/votes_helper.rb @@ -0,0 +1,2 @@ +module VotesHelper +end diff --git a/app/models/vote.rb b/app/models/vote.rb index 684551f081..68bda1c814 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -1,4 +1,4 @@ class Vote < ApplicationRecord - belongs_to :works - belongs_to :users + belongs_to :work + belongs_to :user end diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 8dad13457e..09e584f7a1 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -12,14 +12,12 @@ - + - - - - - + + +
      Top AlbumsTop 10 Albums Creator
      Created by Published CategoryVoted OnVoted On
      <%= @user.votes.count %><%= @user.votes.count %><%= @user.votes.count %><%= @user.votes.count %><%= @user.votes.count %><%= @users_votes.count %><%= @users_votes.count %>
      diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index b66474e8d3..6656ad28f8 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -18,17 +18,21 @@ <%= @work.description %> +Number of Votes for this <%=@work.category%> +<%=@work.number_of_votes%> +
      - - - + <% @works_votes.each do |vote| %> + + + <% end %>
      <%=@work.number_of_votes%>
      User Date
      <%=vote.user.username%><%=vote.created_at%>
      diff --git a/test/controllers/votes_controller_test.rb b/test/controllers/votes_controller_test.rb new file mode 100644 index 0000000000..cf4d03935f --- /dev/null +++ b/test/controllers/votes_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe VotesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From a0a92a673a591cb610b8ba9d4042197f686b703f Mon Sep 17 00:00:00 2001 From: ranuseh Date: Thu, 25 Apr 2019 22:25:08 -0700 Subject: [PATCH 30/37] Added ability for user to see the media they have voted for --- app/controllers/users_controller.rb | 1 - app/views/users/show.html.erb | 11 +++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index bb6021fae3..4771cbe221 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -25,7 +25,6 @@ def show @users = Work.where(user_id: user_id.to_i) @votes = Vote.all @users_votes = @votes.where(user_id: user_id) - # puts @users_votes.count end def edit diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 09e584f7a1..44a741a7c5 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -14,12 +14,15 @@ Category Voted On + <% @users_votes.each do |vote| %> - <%= @users_votes.count %> - <%= @users_votes.count %> - - + <%=vote.work.title%> + <%=vote.work.creator%> + <%=vote.work.publication_year%> + <%=vote.work.category%> + <%=vote.work.created_at%> + <% end %>
      From fdcbdc9dd3beb369469d1bef4e38b28c5938466e Mon Sep 17 00:00:00 2001 From: ranuseh Date: Fri, 26 Apr 2019 10:16:19 -0700 Subject: [PATCH 31/37] Adding new features to check if user already voted --- app/controllers/works_controller.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 583dad379f..4874c4db27 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -77,6 +77,7 @@ def destroy end def upvote + @work = Work.find(params[:id]) user_id = session[:user_id] @@ -87,6 +88,11 @@ def upvote end @user = User.find(user_id) + + @user.votes.filter {} is found in votes_user.id + flash[:error] = 'You have already voted for this media' + return + end @user.votes.create!(work_id: @work.id) From 259d91b363ec1d6da958399765d027ec4713e78d Mon Sep 17 00:00:00 2001 From: ranuseh Date: Fri, 26 Apr 2019 14:27:32 -0700 Subject: [PATCH 32/37] Added restrictions to voting more than twice --- app/controllers/votes_controller.rb | 4 ++++ app/controllers/works_controller.rb | 19 +++++++++++++------ config/routes.rb | 2 ++ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index 3dafb5adbb..fd11e659ca 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -5,4 +5,8 @@ def index @works_votes = @votes.find(params[:work_id]) end + def new + @vote = Vote.new + end + end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 4874c4db27..b6c89aebb6 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -88,14 +88,21 @@ def upvote end @user = User.find(user_id) - - @user.votes.filter {} is found in votes_user.id - flash[:error] = 'You have already voted for this media' + + users_votes = @user.votes + + results = users_votes.where(work_id: @work.id).present? + + puts results + + if results + flash[:error] = 'You Already voted' + redirect_to(works_path) return + else + @user.votes.create(work_id: @work.id) end - @user.votes.create!(work_id: @work.id) - if @work.number_of_votes.nil? @work.update(number_of_votes: 1) else @@ -108,7 +115,7 @@ def upvote @user.update(number_of_votes: @user.number_of_votes + 1) end - redirect_to(works_path) + redirect_to(work_path) end end diff --git a/config/routes.rb b/config/routes.rb index 2db8ca4021..e6466e212f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,6 +4,8 @@ resources :works resources :users + resources :votes + get '/login', to: 'users#login_form', as: 'login' post '/login', to: 'users#login' From d8c5b51c424817a2a2d3830a8dacd9b0da178ccb Mon Sep 17 00:00:00 2001 From: ranuseh Date: Sun, 28 Apr 2019 14:53:11 -0700 Subject: [PATCH 33/37] added validate uniquness to vote model for user id and work id --- app/controllers/users_controller.rb | 18 +++++++++--------- app/models/vote.rb | 3 +++ app/views/homepages/index.html.erb | 5 ++++- app/views/layouts/application.html.erb | 2 +- db/schema.rb | 12 ++++++------ 5 files changed, 23 insertions(+), 17 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 4771cbe221..3639405fb9 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -75,7 +75,7 @@ def login session[:user_id] = user.id flash[:success] = "Successfully logged in as returning user #{username}" else - user = User.create(username: username) # may want to have validation that user.create worked + user = User.create(username: username) session[:user_id] = user.id flash[:success] = "Successfully logged in as new user #{username}" end @@ -83,14 +83,14 @@ def login redirect_to home_path end - def current - @current_user = User.find_by(id: session[:user_id]) - unless @current_user - flash[:error] = 'You must be logged in to see this page' - redirect_to login_path - return - end - end + # def current + # @current_user = User.find_by(id: session[:user_id]) + # unless @current_user + # flash[:error] = 'You must be logged in to see this page' + # redirect_to login_path + # return + # end + # end def logout session[:user_id] = nil diff --git a/app/models/vote.rb b/app/models/vote.rb index 68bda1c814..1e97157db2 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -1,4 +1,7 @@ class Vote < ApplicationRecord belongs_to :work belongs_to :user + + validates :user_id, uniqness: true + validates :work_id, uniqness: true end diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb index 0d581cca48..9b4f2cd813 100644 --- a/app/views/homepages/index.html.erb +++ b/app/views/homepages/index.html.erb @@ -11,12 +11,15 @@
      - + + + <% @top_ten_movies.each do |movie| %> + <% end %>
      Top 10 MoviesTop Movies CreatorVotes
      <%= link_to "#{movie.title}", work_path(movie.id) %> <%= movie.creator %><%= movie.number_of_votes %>
      diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index c0fddc3548..192a176009 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,7 +7,7 @@ <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> - <%# <%= favicon_link_tag asset_path("owl.jpg") %> + <%= favicon_link_tag asset_path("owl.png")%> diff --git a/db/schema.rb b/db/schema.rb index e3bfabe685..be87fa0d28 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -27,12 +27,12 @@ t.datetime "updated_at", null: false end - create_table "users_works", force: :cascade do |t| - t.bigint "user_id" - t.bigint "work_id" - t.index ["user_id"], name: "index_users_works_on_user_id" - t.index ["work_id"], name: "index_users_works_on_work_id" - end + # create_table "users_works", force: :cascade do |t| + # t.bigint "user_id" + # t.bigint "work_id" + # t.index ["user_id"], name: "index_users_works_on_user_id" + # t.index ["work_id"], name: "index_users_works_on_work_id" + # end create_table "votes", force: :cascade do |t| t.integer "user_id" From 84c27d1e610ddd2f67ce293751812899bae9f14c Mon Sep 17 00:00:00 2001 From: ranuseh Date: Sun, 28 Apr 2019 18:58:18 -0700 Subject: [PATCH 34/37] Testing works controller --- app/controllers/homepages_controller.rb | 2 +- app/controllers/users_controller.rb | 16 +++--- app/controllers/votes_controller.rb | 12 ----- app/controllers/works_controller.rb | 40 ++++++--------- app/models/vote.rb | 4 +- app/models/work.rb | 2 +- test/controllers/homepages_controller_test.rb | 50 +++++++++---------- test/controllers/users_controller_test.rb | 12 ++--- test/controllers/votes_controller_test.rb | 7 --- test/controllers/works_controller_test.rb | 27 +++++++++- test/fixtures/users.yml | 4 +- test/fixtures/works.yml | 34 ++++++++----- test/models/homepage_test.rb | 14 +++--- test/models/vote_test.rb | 31 +++++++++--- test/models/work_test.rb | 1 + 15 files changed, 139 insertions(+), 117 deletions(-) delete mode 100644 app/controllers/votes_controller.rb delete mode 100644 test/controllers/votes_controller_test.rb diff --git a/app/controllers/homepages_controller.rb b/app/controllers/homepages_controller.rb index b222eedcd9..f42f0d01a1 100644 --- a/app/controllers/homepages_controller.rb +++ b/app/controllers/homepages_controller.rb @@ -3,7 +3,7 @@ class HomepagesController < ApplicationController def index @works = Work.all.sort_by(&:id) - @spotlight = Work.all.max_by(&:number_of_votes) + @spotlight = @works.max_by(&:number_of_votes) top_ten_movies top_ten_books top_ten_albums diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 3639405fb9..279348913e 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -83,14 +83,14 @@ def login redirect_to home_path end - # def current - # @current_user = User.find_by(id: session[:user_id]) - # unless @current_user - # flash[:error] = 'You must be logged in to see this page' - # redirect_to login_path - # return - # end - # end + def current + @current_user = User.find_by(id: session[:user_id]) + unless @current_user + flash[:error] = 'You must be logged in to see this page' + redirect_to login_path + return + end + end def logout session[:user_id] = nil diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb deleted file mode 100644 index fd11e659ca..0000000000 --- a/app/controllers/votes_controller.rb +++ /dev/null @@ -1,12 +0,0 @@ -class VotesController < - def index - @votes = Vote.all.sort_by(&:number_of_votes).reverse - @users_votes = @votes.find(params[:user_id]) - @works_votes = @votes.find(params[:work_id]) - end - - def new - @vote = Vote.new - end - -end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index b6c89aebb6..fda88946eb 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -4,18 +4,28 @@ class WorksController < ApplicationController before_action :find_work, only: %i[show edit destroy update] def index - @works = Work.all.sort_by(&:number_of_votes).reverse - @books = @works.select { |work| work.category == 'book'} - @albums = @works.select { |work| work.category == 'album'} - @movies = @works.select { |work| work.category == 'movie'} + @works = Work.all + @books = @works.select { |work| work.category == 'book'}.sort_by(&:number_of_votes).reverse + @albums = @works.select { |work| work.category == 'album'}.sort_by(&:number_of_votes).reverse + @movies = @works.select { |work| work.category == 'movie'}.sort_by(&:number_of_votes).reverse end def new @work = Work.new + + user_id = session[:user_id] + + if user_id.nil? + flash[:error] = 'You must be logged in to see this page' + redirect_to login_path + end + end def create @work = Work.new(work_params) + @work.number_of_votes = 0 + successful = @work.save if successful @@ -31,26 +41,13 @@ def create def show work_id = params[:id] - # @work = Work.find_by(id: work_id) - # head :not_found unless @work @votes = Vote.all @works_votes = @votes.where(work_id: work_id) end - def edit - # work_id = params[:id] - # @work = Work.find_by(id: work_id) - # head :not_found unless @work - - end + def edit; end def update - # work_id = params[:id] - - # @work = Work.find_by(id: work_id) - - # head :not_found unless @work - if @work.update(work_params) flash[:status] = :success flash[:message] = "Successfully updated work #{@work.id}" @@ -63,12 +60,6 @@ def update end def destroy - # work_id = params[:id] - - # @work = Work.find_by(id: work_id) - - # head :not_found unless @work - @work.destroy flash[:status] = :success @@ -134,6 +125,7 @@ def work_params # Method so i dont repeat this def find_work + work_id = params[:id] @work = Work.find_by_id(params[:id]) head :not_found unless @work end diff --git a/app/models/vote.rb b/app/models/vote.rb index 1e97157db2..c000116b9e 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -2,6 +2,6 @@ class Vote < ApplicationRecord belongs_to :work belongs_to :user - validates :user_id, uniqness: true - validates :work_id, uniqness: true + validates :user_id, uniqueness: true + validates :work_id, uniqueness: true end diff --git a/app/models/work.rb b/app/models/work.rb index 7e4a17dd0c..93f061c69d 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,6 +1,6 @@ class Work < ApplicationRecord # belongs_to :users - has_many :votes, dependent: :destroy + has_many :votes validates :title, presence: true validates :category, presence: true diff --git a/test/controllers/homepages_controller_test.rb b/test/controllers/homepages_controller_test.rb index 473c649d0e..738bffcd58 100644 --- a/test/controllers/homepages_controller_test.rb +++ b/test/controllers/homepages_controller_test.rb @@ -1,33 +1,33 @@ -require "test_helper" +# require "test_helper" -describe HomepagesController do - before do - @work = Work.create!(category: "test work", title: 'title', creator: 'Someone', publication_year: 2016, description: 'About a book', votes: 2) - end - describe "index" do - it "renders without crashing" do - get works_path +# describe HomepagesController do +# before do +# @work = Work.create!(category: "test work", title: 'title', creator: 'Someone', publication_year: 2016, description: 'About a book', votes: 2) +# end +# describe "index" do +# it "renders without crashing" do +# get works_path - must_respond_with :ok +# must_respond_with :ok - # user = User.first - # login_data = { - # user: { - # username: user.username - # } - # } - # post login_path, params: login_data +# # user = User.first +# # login_data = { +# # user: { +# # username: user.username +# # } +# # } +# # post login_path, params: login_data - # # Verify the user ID was saved - if that didn't work, this test is invalid - # expect(session[:user_id]).must_equal user.id +# # # Verify the user ID was saved - if that didn't work, this test is invalid +# # expect(session[:user_id]).must_equal user.id - # # Act - # get current_user_path +# # # Act +# # get current_user_path - # # Assert - # must_respond_with :success +# # # Assert +# # must_respond_with :success - end - end +# end +# end -end +# end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 89decb54e0..3f2b0961b0 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -1,7 +1,7 @@ -require "test_helper" +# require "test_helper" -describe UsersController do - # it "must be a real test" do - # flunk "Need real tests" - # end -end +# describe UsersController do +# # it "must be a real test" do +# # flunk "Need real tests" +# # end +# end diff --git a/test/controllers/votes_controller_test.rb b/test/controllers/votes_controller_test.rb deleted file mode 100644 index cf4d03935f..0000000000 --- a/test/controllers/votes_controller_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require "test_helper" - -describe VotesController do - # it "must be a real test" do - # flunk "Need real tests" - # end -end diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index d2b783f648..c6474dcb3a 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -2,7 +2,14 @@ describe WorksController do before do - @work = Work.create!(category: "test work", title: 'title', creator: 'Someone', publication_year: 2016, description: 'About a book', votes: 2) + @work = Work.create!( + category: "test work", + title: 'title', + creator: 'Someone', + publication_year: 2016, + description: 'About a book', + number_of_votes: '5' + ) end describe "index" do it "renders without crashing" do @@ -39,7 +46,7 @@ describe "new" do it "returns status code 200" do get new_work_path - must_respond_with :ok + must_redirect_to login_path end end @@ -167,4 +174,20 @@ must_respond_with :not_found end end + + describe 'upvote' do + it 'Allows you to vote for your work' do + + end + + it 'Wont let you vote for the same work more than once' do + + end + + it 'You must be logged in to vote' do + + end + + + end end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 235b3c208d..418ab435b3 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -2,8 +2,8 @@ one: username: MyString - votes: 1 + number_of_votes: 1 two: username: MyString - votes: 1 + number_of_votes: 1 diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index 6772d84de5..c86e528d4a 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -1,15 +1,23 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - category: MyString - title: MyString - creator: MyString - publication_year: 1 - description: MyString - -two: - category: MyString - title: MyString - creator: MyString - publication_year: 1 - description: MyString +austen: + category: book + title: Pride and Prejudice + creator: Amber + publication_year: 1898 + description: A book about pride + +rowling: + category: album + title: Goblet of fire + creator: Samuel + publication_year: 2009 + description: Lots of firey stuff + +lee: + category: movie + title: looper + creator: Mike + publication_year: 2018 + description: Going back in time doing bad things + diff --git a/test/models/homepage_test.rb b/test/models/homepage_test.rb index f8323f0301..ab89819e81 100644 --- a/test/models/homepage_test.rb +++ b/test/models/homepage_test.rb @@ -1,9 +1,9 @@ -require "test_helper" +# require "test_helper" -describe Homepage do - let(:homepage) { Homepage.new } +# describe Homepage do +# let(:homepage) { Homepage.new } - it "must be valid" do - value(homepage).must_be :valid? - end -end +# it "must be valid" do +# value(homepage).must_be :valid? +# end +# end diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index fc15947bd3..615e5d4b04 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -1,9 +1,26 @@ -require "test_helper" +# require "test_helper" -describe Vote do - let(:vote) { Vote.new } +# describe Vote do +# before do +# @user = User.create( +# username: 'Bob', +# number_of_votes: 1 +# ) +# @work = Work.create!( +# category: "test work", +# title: 'new title', +# creator: 'Someone', +# publication_year: 2016, +# description: 'About a book', +# number_of_votes: '5' +# ) +# end + +# let(:vote) { +# Vote.create!(user_id: @user.id, work_id: @work.id) +# } - it "must be valid" do - value(vote).must_be :valid? - end -end +# it "must be valid" do +# value(vote).must_be :valid? +# end +# end diff --git a/test/models/work_test.rb b/test/models/work_test.rb index d0d5c69cd2..58dcf702fc 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -6,4 +6,5 @@ it "must be valid" do value(work).must_be :valid? end + end From cd80d70c2feb466e6da03f1349dc06813b692cef Mon Sep 17 00:00:00 2001 From: ranuseh Date: Sun, 28 Apr 2019 20:03:29 -0700 Subject: [PATCH 35/37] All test complete for work controller and model --- app/controllers/users_controller.rb | 1 + app/controllers/works_controller.rb | 16 +++---- app/models/vote.rb | 3 +- db/seeds.rb | 2 +- test/controllers/homepages_controller_test.rb | 32 +++++++------- test/controllers/works_controller_test.rb | 43 ++++++++++++++++--- 6 files changed, 64 insertions(+), 33 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 279348913e..2a155c5828 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -11,6 +11,7 @@ def new def create @user = User.new(user_params) + @user.number_of_votes = 0 if @user.save redirect_to users_path diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index fda88946eb..c706565757 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -69,7 +69,6 @@ def destroy def upvote - @work = Work.find(params[:id]) user_id = session[:user_id] if user_id.nil? @@ -78,32 +77,33 @@ def upvote return end + @work = Work.find(params[:id]) + @user = User.find(user_id) users_votes = @user.votes results = users_votes.where(work_id: @work.id).present? - puts results - if results flash[:error] = 'You Already voted' redirect_to(works_path) return else - @user.votes.create(work_id: @work.id) + @user.votes.create!(work_id: @work.id) end if @work.number_of_votes.nil? - @work.update(number_of_votes: 1) + @work.update!(number_of_votes: 1) else - @work.update(number_of_votes: @work.number_of_votes + 1) + @work.update!(number_of_votes: @work.number_of_votes + 1) end + if @user.number_of_votes.nil? - @user.update(number_of_votes: 1) + @user.update!(number_of_votes: 1) else - @user.update(number_of_votes: @user.number_of_votes + 1) + @user.update!(number_of_votes: @user.number_of_votes + 1) end redirect_to(work_path) diff --git a/app/models/vote.rb b/app/models/vote.rb index c000116b9e..6e7230c621 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -2,6 +2,5 @@ class Vote < ApplicationRecord belongs_to :work belongs_to :user - validates :user_id, uniqueness: true - validates :work_id, uniqueness: true + validates :user_id,uniqueness: { scope: :work_id } end diff --git a/db/seeds.rb b/db/seeds.rb index 2c663277fd..a8d0d360a9 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -36,7 +36,7 @@ user = User.new user.id = row['id'] user.username = row['username'] - user.number_of_votes = row['votes'] + user.number_of_votes = 0 successful = user.save if !successful user_failures << user diff --git a/test/controllers/homepages_controller_test.rb b/test/controllers/homepages_controller_test.rb index 738bffcd58..59363797dd 100644 --- a/test/controllers/homepages_controller_test.rb +++ b/test/controllers/homepages_controller_test.rb @@ -10,22 +10,22 @@ # must_respond_with :ok -# # user = User.first -# # login_data = { -# # user: { -# # username: user.username -# # } -# # } -# # post login_path, params: login_data - -# # # Verify the user ID was saved - if that didn't work, this test is invalid -# # expect(session[:user_id]).must_equal user.id - -# # # Act -# # get current_user_path - -# # # Assert -# # must_respond_with :success +# user = User.first +# login_data = { +# user: { +# username: user.username +# } +# } +# post login_path, params: login_data + +# # Verify the user ID was saved - if that didn't work, this test is invalid +# expect(session[:user_id]).must_equal user.id + +# # Act +# get current_user_path + +# # Assert +# must_respond_with :success # end # end diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index c6474dcb3a..7e3d8ff919 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -3,11 +3,11 @@ describe WorksController do before do @work = Work.create!( - category: "test work", - title: 'title', - creator: 'Someone', - publication_year: 2016, - description: 'About a book', + category: "test work", + title: 'title', + creator: 'Someone', + publication_year: 2016, + description: 'About a book', number_of_votes: '5' ) end @@ -41,6 +41,7 @@ must_respond_with :ok end + end describe "new" do @@ -177,15 +178,45 @@ describe 'upvote' do it 'Allows you to vote for your work' do + post login_path, params:{user: {username: 'Micki'}} + + @work = Work.create!( + category: "test work", + title: 'new title', + creator: 'Someone', + publication_year: 2016, + description: 'About a book', + number_of_votes: 5 + ) + post upvote_path(@work.id) + must_redirect_to work_path + end it 'Wont let you vote for the same work more than once' do + post login_path, params:{user: {username: 'Micki'}} + + @work = Work.create!( + category: "test work", + title: 'new title', + creator: 'Someone', + publication_year: 2016, + description: 'About a book', + number_of_votes: 5 + ) + + post upvote_path(@work.id) + must_redirect_to work_path + + post upvote_path(@work.id) + must_redirect_to works_path end it 'You must be logged in to vote' do - + post upvote_path(10) + must_redirect_to login_path end From e394764b04f3744967253ad6ec5451659d9603c1 Mon Sep 17 00:00:00 2001 From: ranuseh Date: Sun, 28 Apr 2019 22:28:05 -0700 Subject: [PATCH 36/37] All test passing --- app/assets/stylesheets/application.scss | 4 + app/controllers/homepages_controller.rb | 6 +- app/controllers/users_controller.rb | 67 ++------------ app/controllers/works_controller.rb | 1 - app/views/layouts/application.html.erb | 7 +- test/controllers/homepages_controller_test.rb | 71 ++++++++------- test/controllers/users_controller_test.rb | 90 +++++++++++++++++-- test/controllers/works_controller_test.rb | 2 - test/models/homepage_test.rb | 14 +-- test/models/user_test.rb | 14 +-- test/models/vote_test.rb | 46 +++++----- 11 files changed, 178 insertions(+), 144 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 9d3aa87d4f..1641335039 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -50,6 +50,10 @@ a { font-weight: bold; } +form{ + padding: 40px; +} + footer { background-color: #D5CAD6; grid-column: span 2; diff --git a/app/controllers/homepages_controller.rb b/app/controllers/homepages_controller.rb index f42f0d01a1..a8a0cba821 100644 --- a/app/controllers/homepages_controller.rb +++ b/app/controllers/homepages_controller.rb @@ -11,16 +11,16 @@ def index def top_ten_movies @movies = Work.where(category: 'movie') - @top_ten_movies = @movies.sample(10) + @top_ten_movies = @movies.sort_by(&:number_of_votes).first(10) end def top_ten_books @books = Work.where(category: 'book') - @top_ten_books = @books.sample(10) + @top_ten_books = @books.sort_by(&:number_of_votes).first(10) end def top_ten_albums @albums = Work.where(category: 'album') - @top_ten_albums = @albums.sample(10) + @top_ten_albums = @albums.sort_by(&:number_of_votes).first(10) end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 2a155c5828..ea222b1616 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -9,59 +9,15 @@ def new @user = User.new end - def create - @user = User.new(user_params) - @user.number_of_votes = 0 - - if @user.save - redirect_to users_path - else - render :new - end - end - def show - user_id = params[:id] - @user = User.find(user_id) - @users = Work.where(user_id: user_id.to_i) - @votes = Vote.all - @users_votes = @votes.where(user_id: user_id) - end - - def edit user_id = params[:id] @user = User.find_by(id: user_id) - redirect_to user_path if @user.nil? - end - - def update - begin - user_id = params[:id] - user = User.find(user_id) - rescue StandardError - flash[:error] = "Could not find user with id: #{params['id']}" - redirect_to user_path(user_id) + if @user.nil? + head :not_found return end - if user.update(user_params) - redirect_to users_path - else - render :new - end - - end - - def destroy - begin - user = User.find(params[:id]) - rescue StandardError - flash[:error] = "Could not find user with id: #{params['id']}" - redirect_to users_path - return - end - user.destroy - redirect_to users_path + @users_votes = Vote.where(user_id: user_id) end def login_form @@ -76,7 +32,7 @@ def login session[:user_id] = user.id flash[:success] = "Successfully logged in as returning user #{username}" else - user = User.create(username: username) + user = User.create(username: username, number_of_votes: 0) session[:user_id] = user.id flash[:success] = "Successfully logged in as new user #{username}" end @@ -84,19 +40,10 @@ def login redirect_to home_path end - def current - @current_user = User.find_by(id: session[:user_id]) - unless @current_user - flash[:error] = 'You must be logged in to see this page' - redirect_to login_path - return - end - end - def logout - session[:user_id] = nil - flash[:success] = "You have successfully logged out" - redirect_to home_path + session[:user_id] = nil + flash[:success] = "You have successfully logged out" + redirect_to home_path end end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index c706565757..48459bbed2 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -26,7 +26,6 @@ def create @work = Work.new(work_params) @work.number_of_votes = 0 - successful = @work.save if successful flash[:status] = :success diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 192a176009..23ebf6c93a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -21,8 +21,11 @@ <%= link_to 'View All Media', works_path%> <%= link_to 'Add New Work', new_work_path%> <%= link_to 'View all users', users_path%> - <%= link_to 'Log in', login_path %> - <%= link_to 'Log out', logout_path, method: :post %> + <% if session[:user_id] == nil %> + <%= link_to 'Log in', login_path %> + <% else %> + <%= link_to 'Log out', logout_path, method: :post %> + <% end %>
      diff --git a/test/controllers/homepages_controller_test.rb b/test/controllers/homepages_controller_test.rb index 59363797dd..5a250fef61 100644 --- a/test/controllers/homepages_controller_test.rb +++ b/test/controllers/homepages_controller_test.rb @@ -1,33 +1,38 @@ -# require "test_helper" - -# describe HomepagesController do -# before do -# @work = Work.create!(category: "test work", title: 'title', creator: 'Someone', publication_year: 2016, description: 'About a book', votes: 2) -# end -# describe "index" do -# it "renders without crashing" do -# get works_path - -# must_respond_with :ok - -# user = User.first -# login_data = { -# user: { -# username: user.username -# } -# } -# post login_path, params: login_data - -# # Verify the user ID was saved - if that didn't work, this test is invalid -# expect(session[:user_id]).must_equal user.id - -# # Act -# get current_user_path - -# # Assert -# must_respond_with :success - -# end -# end - -# end +require "test_helper" + +describe HomepagesController do + describe "index" do + it "renders without crashing" do + get home_path + + must_respond_with :ok + end + + it "return top 10 movies" do + 10.times do |i| + Work.create!( + category: "test work", + title: 'title', + creator: 'Someone', + publication_year: 2016, + description: 'About a book', + number_of_votes: i + ) + end + expect + end + + it "determines spotlight based on number of votes" do + 10.times do |i| + Work.create!( + category: "test work", + title: 'title', + creator: 'Someone', + publication_year: 2016, + description: 'About a book', + number_of_votes: i + ) + end + end + end +end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 3f2b0961b0..0c61e1e2f4 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -1,7 +1,85 @@ -# require "test_helper" +require 'pp' +require "test_helper" -# describe UsersController do -# # it "must be a real test" do -# # flunk "Need real tests" -# # end -# end +describe UsersController do + before do + @user = User.create!( + username: "Rabbit", + ) + end + describe "index" do + it "renders without crashing" do + get users_path + + must_respond_with :ok + end + + it "renders even if there are zero users" do + User.destroy_all + + get users_path + + must_respond_with :ok + end + end + + describe "show" do + it "returns a 404 status code if the user doesn't exist" do + user_id = 12345 + + get user_path(user_id) + + must_respond_with :not_found + end + + it "works for a user that exists" do + get user_path(@user.id) + + must_respond_with :ok + end + + end + + describe 'login_form' do + it 'Renders a new form to log in' do + post login_path, params:{user: {username: 'Micki'}} + + must_redirect_to home_path + end + end + + describe 'login' do + it 'Allows you to log in with a username' do + post login_path, params:{user: {username: 'Micki'}} + + expect(session[:user_id]).wont_be_nil + must_redirect_to home_path + end + + it 'Creates a new user if first time user' do + user = User.find_by(username: 'Random2') + + expect(user).must_be_nil + + post login_path, params:{user: {username: 'Random2'}} + + user = User.find_by(username: 'Random2') + + expect(user).wont_be_nil + end + end + + describe 'logout' do + it 'logs you out' do + post login_path, params:{user: {username: 'Micki'}} + + expect(session[:user_id]).wont_be_nil + + post logout_path + + expect(session[:user_id]).must_be_nil + + must_redirect_to home_path + end + end +end diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index 7e3d8ff919..1300f80733 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -137,7 +137,6 @@ it "responds with BAD REQUEST for bad data" do work_data[:work][:title] = "" - # puts work_data @work.assign_attributes(work_data[:work]) expect(@work).wont_be :valid? @work.reload @@ -219,6 +218,5 @@ must_redirect_to login_path end - end end diff --git a/test/models/homepage_test.rb b/test/models/homepage_test.rb index ab89819e81..f8323f0301 100644 --- a/test/models/homepage_test.rb +++ b/test/models/homepage_test.rb @@ -1,9 +1,9 @@ -# require "test_helper" +require "test_helper" -# describe Homepage do -# let(:homepage) { Homepage.new } +describe Homepage do + let(:homepage) { Homepage.new } -# it "must be valid" do -# value(homepage).must_be :valid? -# end -# end + it "must be valid" do + value(homepage).must_be :valid? + end +end diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 8a009158b8..cc862ac2d9 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -1,9 +1,9 @@ -# require "test_helper" +require "test_helper" -# describe User do -# let(:user) { User.new } +describe User do + let(:user) { User.new } -# it "must be valid" do -# value(user).must_be :valid? -# end -# end + it "must be valid" do + value(user).must_be :valid? + end +end diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index 615e5d4b04..f3dd7706b7 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -1,26 +1,26 @@ -# require "test_helper" +require "test_helper" -# describe Vote do -# before do -# @user = User.create( -# username: 'Bob', -# number_of_votes: 1 -# ) -# @work = Work.create!( -# category: "test work", -# title: 'new title', -# creator: 'Someone', -# publication_year: 2016, -# description: 'About a book', -# number_of_votes: '5' -# ) -# end +describe Vote do + before do + @user = User.create( + username: 'Bob', + number_of_votes: 1 + ) + @work = Work.create!( + category: "test work", + title: 'new title', + creator: 'Someone', + publication_year: 2016, + description: 'About a book', + number_of_votes: '5' + ) + end -# let(:vote) { -# Vote.create!(user_id: @user.id, work_id: @work.id) -# } + let(:vote) { + Vote.create!(user_id: @user.id, work_id: @work.id) + } -# it "must be valid" do -# value(vote).must_be :valid? -# end -# end + it "must be valid" do + value(vote).must_be :valid? + end +end From 2d833da7e8005ff65c4cc076d92ab52a12b5eae3 Mon Sep 17 00:00:00 2001 From: ranuseh Date: Sun, 28 Apr 2019 22:51:06 -0700 Subject: [PATCH 37/37] added require jqery3 --- app/assets/javascripts/application.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b0ef35b723..b0309760cb 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -17,3 +17,4 @@ //= require activestorage //= require turbolinks //= require_tree . +//= require jquery3