From b5ec6bf192846df412bae8b949892ce38e2284db Mon Sep 17 00:00:00 2001 From: Maryam Shitu Date: Mon, 8 Oct 2018 16:59:01 -0700 Subject: [PATCH 01/23] Initial Rails setup --- .gitignore | 27 ++ .ruby-version | 1 + Gemfile | 81 +++++ Gemfile.lock | 277 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/assets/config/manifest.js | 3 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 20 ++ app/assets/javascripts/cable.js | 13 + app/assets/javascripts/channels/.keep | 0 app/assets/stylesheets/application.scss | 18 ++ app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/helpers/application_helper.rb | 2 + app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/application.html.erb | 15 + app/views/layouts/mailer.html.erb | 13 + app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 36 +++ bin/spring | 17 ++ bin/update | 31 ++ bin/yarn | 11 + config.ru | 5 + config/application.rb | 25 ++ config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 ++++++ config/environment.rb | 5 + config/environments/development.rb | 61 ++++ config/environments/production.rb | 94 ++++++ config/environments/test.rb | 46 +++ .../application_controller_renderer.rb | 8 + config/initializers/assets.rb | 14 + config/initializers/backtrace_silencers.rb | 7 + .../initializers/content_security_policy.rb | 25 ++ config/initializers/cookies_serializer.rb | 5 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 + config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 + config/locales/en.yml | 33 +++ config/puma.rb | 34 +++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 +++ db/seeds.rb | 7 + lib/assets/.keep | 0 lib/tasks/.keep | 0 log/.keep | 0 package.json | 5 + public/404.html | 67 +++++ public/422.html | 67 +++++ public/500.html | 66 +++++ public/apple-touch-icon-precomposed.png | 0 public/apple-touch-icon.png | 0 public/favicon.ico | 0 public/robots.txt | 1 + storage/.keep | 0 test/application_system_test_case.rb | 5 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/helpers/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/system/.keep | 0 test/test_helper.rb | 24 ++ tmp/.keep | 0 vendor/.keep | 0 80 files changed, 1406 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/assets/config/manifest.js create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/javascripts/cable.js create mode 100644 app/assets/javascripts/channels/.keep create mode 100644 app/assets/stylesheets/application.scss create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/helpers/application_helper.rb create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/application.html.erb create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100755 bin/yarn create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/assets.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/content_security_policy.rb create mode 100644 config/initializers/cookies_serializer.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 db/seeds.rb create mode 100644 lib/assets/.keep create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 package.json create mode 100644 public/404.html create mode 100644 public/422.html create mode 100644 public/500.html create mode 100644 public/apple-touch-icon-precomposed.png create mode 100644 public/apple-touch-icon.png create mode 100644 public/favicon.ico create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/application_system_test_case.rb create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/helpers/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/system/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..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..8406aeb8bb --- /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.1' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'mini_racer', platforms: :ruby + +# Use CoffeeScript for .coffee assets and views +# gem 'coffee-rails', '~> 4.2' +# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks +gem 'turbolinks', '~> 5' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + # Access an interactive console on exception pages or by calling 'console' anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +group :test do + # Adds support for Capybara system testing and selenium driver + gem 'capybara', '>= 2.15' + gem 'selenium-webdriver' + # Easy installation and use of chromedriver to run system tests with Chrome + gem 'chromedriver-helper' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +gem 'jquery-rails' +gem 'jquery-turbolinks' +gem 'bootstrap', '~> 4.1.3' +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'better_errors' + gem 'binding_of_caller' + gem 'guard' + gem 'guard-minitest' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000000..300c8b955a --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,277 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.1) + actionpack (= 5.2.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.1) + actionview (= 5.2.1) + activesupport (= 5.2.1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.1) + activesupport (= 5.2.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.1) + activesupport (= 5.2.1) + globalid (>= 0.3.6) + activemodel (5.2.1) + activesupport (= 5.2.1) + activerecord (5.2.1) + activemodel (= 5.2.1) + activesupport (= 5.2.1) + arel (>= 9.0) + activestorage (5.2.1) + actionpack (= 5.2.1) + activerecord (= 5.2.1) + marcel (~> 0.3.1) + activesupport (5.2.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + ansi (1.5.0) + archive-zip (0.11.0) + io-like (~> 0.3.0) + arel (9.0.0) + autoprefixer-rails (9.1.4) + execjs + better_errors (2.5.0) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) + bindex (0.5.0) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + bootsnap (1.3.2) + msgpack (~> 1.0) + bootstrap (4.1.3) + autoprefixer-rails (>= 6.0.3) + popper_js (>= 1.12.9, < 2) + sass (>= 3.5.2) + builder (3.2.3) + byebug (10.0.2) + capybara (3.9.0) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + xpath (~> 3.1) + childprocess (0.9.0) + ffi (~> 1.0, >= 1.0.11) + chromedriver-helper (2.1.0) + archive-zip (~> 0.10) + nokogiri (~> 1.8) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crass (1.0.4) + debug_inspector (0.0.3) + erubi (1.7.1) + execjs (2.7.0) + ffi (1.9.25) + formatador (0.2.5) + globalid (0.4.1) + activesupport (>= 4.2.0) + guard (2.14.2) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) + i18n (1.1.0) + concurrent-ruby (~> 1.0) + io-like (0.3.0) + jbuilder (2.7.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + jquery-rails (4.3.3) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.2) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.0.13) + mail (2.7.0) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.0) + mimemagic (0.3.2) + mini_mime (1.0.1) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.5) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.4) + multi_json (1.13.1) + nenv (0.3.0) + nio4r (2.3.1) + nokogiri (1.8.5) + mini_portile2 (~> 2.3.0) + notiffany (0.1.1) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.1.3) + popper_js (1.14.3) + pry (0.11.3) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + public_suffix (3.0.3) + puma (3.12.0) + rack (2.0.5) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.1) + actioncable (= 5.2.1) + actionmailer (= 5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + activemodel (= 5.2.1) + activerecord (= 5.2.1) + activestorage (= 5.2.1) + activesupport (= 5.2.1) + bundler (>= 1.3.0) + railties (= 5.2.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.1) + actionpack (= 5.2.1) + activesupport (= 5.2.1) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + rubyzip (1.2.2) + sass (3.6.0) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.0.7) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + selenium-webdriver (3.14.1) + childprocess (~> 0.5) + rubyzip (~> 1.2, >= 1.2.2) + shellany (0.0.1) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.0) + thread_safe (0.3.6) + tilt (2.0.8) + turbolinks (5.2.0) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + tzinfo (1.2.5) + thread_safe (~> 0.1) + uglifier (4.1.19) + execjs (>= 0.3.0, < 3) + web-console (3.7.0) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.1.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + bootsnap (>= 1.1.0) + bootstrap (~> 4.1.3) + byebug + capybara (>= 2.15) + chromedriver-helper + guard + guard-minitest + jbuilder (~> 2.5) + jquery-rails + jquery-turbolinks + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.1) + sass-rails (~> 5.0) + selenium-webdriver + spring + spring-watcher-listen (~> 2.0.0) + turbolinks (~> 5) + tzinfo-data + uglifier (>= 1.3.0) + web-console (>= 3.3.0) + +RUBY VERSION + ruby 2.4.1p111 + +BUNDLED WITH + 1.16.2 diff --git a/Guardfile b/Guardfile new file mode 100644 index 0000000000..e34f706f4a --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000000..e85f913914 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 0000000000..b16e53d6d5 --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css diff --git a/app/assets/images/.keep b/app/assets/images/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js new file mode 100644 index 0000000000..4f73c21a7d --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,20 @@ +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's +// vendor/assets/javascripts directory can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// compiled file. JavaScript code in this file should be added after the last require_* statement. +// +// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details +// about supported directives. + //= require jquery3 + //= require popper + //= require bootstrap-sprockets + +// +//= require rails-ujs +//= require activestorage +//= require turbolinks +//= require_tree . diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js new file mode 100644 index 0000000000..739aa5f022 --- /dev/null +++ b/app/assets/javascripts/cable.js @@ -0,0 +1,13 @@ +// Action Cable provides the framework to deal with WebSockets in Rails. +// You can generate new channels where WebSocket features live using the `rails generate channel` command. +// +//= require action_cable +//= require_self +//= require_tree ./channels + +(function() { + this.App || (this.App = {}); + + App.cable = ActionCable.createConsumer(); + +}).call(this); diff --git a/app/assets/javascripts/channels/.keep b/app/assets/javascripts/channels/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss new file mode 100644 index 0000000000..8b1701e581 --- /dev/null +++ b/app/assets/stylesheets/application.scss @@ -0,0 +1,18 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's + * vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS + * files in this directory. Styles in this file should be added after the last require_* statement. + * It is generally better to create a new file per style scope. + * + */ + +/* Custom bootstrap variables must be set or imported *before* bootstrap. */ +@import "bootstrap"; +/* Import scss content */ +@import "**/*"; diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 0000000000..d672697283 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 0000000000..0ff5442f47 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 0000000000..09705d12ab --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::Base +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb new file mode 100644 index 0000000000..de6be7945c --- /dev/null +++ b/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 0000000000..a009ace51c --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 0000000000..286b2239d1 --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 0000000000..10a4cba84d --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 0000000000..f32268a271 --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,15 @@ + + + + MediaRanker + <%= csrf_meta_tags %> + <%= csp_meta_tag %> + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 0000000000..cbd34d2e9d --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 0000000000..37f0bddbd7 --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 0000000000..f19acf5b5c --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 0000000000..5badb2fde0 --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 0000000000..d87d5f5781 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 0000000000..94fd4d7977 --- /dev/null +++ b/bin/setup @@ -0,0 +1,36 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 0000000000..fb2ec2ebb4 --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 0000000000..58bfaed518 --- /dev/null +++ b/bin/update @@ -0,0 +1,31 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/yarn b/bin/yarn new file mode 100755 index 0000000000..460dd565b4 --- /dev/null +++ b/bin/yarn @@ -0,0 +1,11 @@ +#!/usr/bin/env ruby +APP_ROOT = File.expand_path('..', __dir__) +Dir.chdir(APP_ROOT) do + begin + exec "yarnpkg", *ARGV + rescue Errno::ENOENT + $stderr.puts "Yarn executable was not detected in the system." + $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install" + exit 1 + end +end diff --git a/config.ru b/config.ru new file mode 100644 index 0000000000..f7ba0b527b --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 0000000000..08db79cb25 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,25 @@ +require_relative 'boot' + +require 'rails/all' + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module MediaRanker + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 0000000000..b9e460cef3 --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 0000000000..0b286f676e --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: MediaRanker_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 0000000000..bfb76a6d10 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +M8+Kq7k58ueDKX24u72MeFQDgEMMsj/AxzNjN0QXyqCM7RwC4vNdW3bAwgaJLAUMKLyeDWGUvxQZ9kmmJ2OuSNoM9um7QmyTBhGknVpv2Y2gg6ETTtsSJT6Ce0EOTkAUtqZprcGZN811FAGe2PRjYtxycVw4Px3UG39E65jAVkXkQoxjyPnOD9VzsDfpcjWbIJudHkSg/VseAGPtF0OpMZyYl2ndI/H85Ye7Mt67IYyIMD2/vyNhH7/0fQgMgI0a57Gq85EFzeJjc0E1sskt3YLKcN18rq3BnvVvrn9E0K1N1sivWJfQnUKnGv/K81FvRoyV2vhn64q3UnlrPzqFoa2OjFLU68WNveVs80I1t9hisHPRXrm5TidV8YSF0UqMDCHOaMAtE3nc1sGNnWcDLj7jgkOvYNTyXoTh--HrEHek11C4ddokHs--l2OG4LxcJsNgv1gLQNX7Vg== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 0000000000..0bd2511123 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: MediaRanker_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: MediaRanker + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: MediaRanker_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: MediaRanker_production + username: MediaRanker + password: <%= ENV['MEDIARANKER_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 0000000000..426333bb46 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 0000000000..1311e3e4ef --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,61 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + # Debug mode disables concatenation and preprocessing of assets. + # This option may cause significant delays in view rendering with a large + # number of complex assets. + config.assets.debug = true + + # Suppress logger output for asset requests. + config.assets.quiet = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 0000000000..bd39d9d752 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,94 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "MediaRanker_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 0000000000..0a38fd3ce9 --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 0000000000..89d2efab2b --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb new file mode 100644 index 0000000000..4b828e80cb --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# Version of your assets, change this if you want to expire all your assets. +Rails.application.config.assets.version = '1.0' + +# Add additional assets to the asset load path. +# Rails.application.config.assets.paths << Emoji.images_path +# Add Yarn node_modules folder to the asset load path. +Rails.application.config.assets.paths << Rails.root.join('node_modules') + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in the app/assets +# folder are already added. +# Rails.application.config.assets.precompile += %w( admin.js admin.css ) diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 0000000000..59385cdf37 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb new file mode 100644 index 0000000000..d3bcaa5ec8 --- /dev/null +++ b/config/initializers/content_security_policy.rb @@ -0,0 +1,25 @@ +# Be sure to restart your server when you modify this file. + +# Define an application-wide content security policy +# For further information see the following documentation +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy + +# Rails.application.config.content_security_policy do |policy| +# policy.default_src :self, :https +# policy.font_src :self, :https, :data +# policy.img_src :self, :https, :data +# policy.object_src :none +# policy.script_src :self, :https +# policy.style_src :self, :https + +# # Specify URI for violation reports +# # policy.report_uri "/csp-violation-report-endpoint" +# end + +# If you are using UJS then enable automatic nonce generation +# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) } + +# Report CSP violations to a specified URI +# For further information see the following documentation: +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only +# Rails.application.config.content_security_policy_report_only = true diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb new file mode 100644 index 0000000000..5a6a32d371 --- /dev/null +++ b/config/initializers/cookies_serializer.rb @@ -0,0 +1,5 @@ +# Be sure to restart your server when you modify this file. + +# Specify a serializer for the signed and encrypted cookie jars. +# Valid options are :json, :marshal, and :hybrid. +Rails.application.config.action_dispatch.cookies_serializer = :json diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 0000000000..4a994e1e7b --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 0000000000..ac033bf9dc --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 0000000000..dc1899682b --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 0000000000..bbfc3961bf --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 0000000000..decc5a8573 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 0000000000..a5eccf816b --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 0000000000..787824f888 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 0000000000..9fa7863f99 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 0000000000..d32f76e8fb --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/db/seeds.rb b/db/seeds.rb new file mode 100644 index 0000000000..1beea2accd --- /dev/null +++ b/db/seeds.rb @@ -0,0 +1,7 @@ +# This file should contain all the record creation needed to seed the database with its default values. +# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). +# +# Examples: +# +# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) +# Character.create(name: 'Luke', movie: movies.first) diff --git a/lib/assets/.keep b/lib/assets/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/log/.keep b/log/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/package.json b/package.json new file mode 100644 index 0000000000..625900f9d8 --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "name": "MediaRanker", + "private": true, + "dependencies": {} +} diff --git a/public/404.html b/public/404.html new file mode 100644 index 0000000000..2be3af26fc --- /dev/null +++ b/public/404.html @@ -0,0 +1,67 @@ + + + + The page you were looking for doesn't exist (404) + + + + + + +
+
+

The page you were looking for doesn't exist.

+

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

+
+

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

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

The change you wanted was rejected.

+

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

+
+

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

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

We're sorry, but something went wrong.

+
+

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

+
+ + diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 0000000000..37b576a4a0 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb new file mode 100644 index 0000000000..d19212abd5 --- /dev/null +++ b/test/application_system_test_case.rb @@ -0,0 +1,5 @@ +require "test_helper" + +class ApplicationSystemTestCase < ActionDispatch::SystemTestCase + driven_by :selenium, using: :chrome, screen_size: [1400, 1400] +end diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/helpers/.keep b/test/helpers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/system/.keep b/test/system/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 0000000000..2b5172a7d6 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,24 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails"require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 0000000000..e69de29bb2 From 5aabfac86809acabe6600e523076e36bcf7ce20f Mon Sep 17 00:00:00 2001 From: Maryam Shitu Date: Mon, 8 Oct 2018 18:00:43 -0700 Subject: [PATCH 02/23] Works controller with basic CRUD operation created, routes created, views not yet created --- app/assets/javascripts/works.js | 2 + app/assets/stylesheets/works.scss | 3 ++ app/controllers/works_controller.rb | 49 +++++++++++++++++++ app/helpers/works_helper.rb | 2 + app/models/work.rb | 3 ++ config/routes.rb | 1 + db/migrate/20181009001439_create_works.rb | 13 +++++ .../20181009004819_change_created_by.rb | 5 ++ db/schema.rb | 28 +++++++++++ test/controllers/works_controller_test.rb | 7 +++ test/fixtures/works.yml | 15 ++++++ test/models/work_test.rb | 9 ++++ 12 files changed, 137 insertions(+) create mode 100644 app/assets/javascripts/works.js create mode 100644 app/assets/stylesheets/works.scss create mode 100644 app/controllers/works_controller.rb create mode 100644 app/helpers/works_helper.rb create mode 100644 app/models/work.rb create mode 100644 db/migrate/20181009001439_create_works.rb create mode 100644 db/migrate/20181009004819_change_created_by.rb create mode 100644 db/schema.rb create mode 100644 test/controllers/works_controller_test.rb create mode 100644 test/fixtures/works.yml create mode 100644 test/models/work_test.rb diff --git a/app/assets/javascripts/works.js b/app/assets/javascripts/works.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/works.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/works.scss b/app/assets/stylesheets/works.scss new file mode 100644 index 0000000000..5618452f3e --- /dev/null +++ b/app/assets/stylesheets/works.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Works controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb new file mode 100644 index 0000000000..9c9b1eaa97 --- /dev/null +++ b/app/controllers/works_controller.rb @@ -0,0 +1,49 @@ +class WorksController < ApplicationController + def index + @works = Work # .order(:name) + end + + def show + @work = Work.find(params[:id].to_i) + end + + def new + @work = Work.new + end + + def create + @work = Work.new(work_params) + + if @work.save + # redirect_to root_path + else + render :new + end + end + + def edit + @work = Work.find(params[:id].to_i) + end + + def update + @work = Work.find_by(id: params[:id].to_i) + + if @work.update(work_params) + redirect_to work_path(@work.id) + else + render :edit + end + end + + def destroy + work = Work.find_by(id: params[:id].to_i) + @deleted_work = work.destroy + end + + private + + def work_params + return params.require(:work).permit(:category, :title, :creator, :publication_year, :description) + end + +end diff --git a/app/helpers/works_helper.rb b/app/helpers/works_helper.rb new file mode 100644 index 0000000000..ccb78c2b73 --- /dev/null +++ b/app/helpers/works_helper.rb @@ -0,0 +1,2 @@ +module WorksHelper +end diff --git a/app/models/work.rb b/app/models/work.rb new file mode 100644 index 0000000000..fd6de52e25 --- /dev/null +++ b/app/models/work.rb @@ -0,0 +1,3 @@ +class Work < ApplicationRecord + # has_many :votes, through: :works +end diff --git a/config/routes.rb b/config/routes.rb index 787824f888..8eb4b49d1e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + resources :works end diff --git a/db/migrate/20181009001439_create_works.rb b/db/migrate/20181009001439_create_works.rb new file mode 100644 index 0000000000..8c7bc32c2b --- /dev/null +++ b/db/migrate/20181009001439_create_works.rb @@ -0,0 +1,13 @@ +class CreateWorks < ActiveRecord::Migration[5.2] + def change + create_table :works do |t| + t.string :title + t.string :created_by + t.date :publication_year + t.string :description + t.string :category + + t.timestamps + end + end +end diff --git a/db/migrate/20181009004819_change_created_by.rb b/db/migrate/20181009004819_change_created_by.rb new file mode 100644 index 0000000000..3c0ad7d9b5 --- /dev/null +++ b/db/migrate/20181009004819_change_created_by.rb @@ -0,0 +1,5 @@ +class ChangeCreatedBy < ActiveRecord::Migration[5.2] + def change + rename_column :works, :created_by, :creator + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000000..16a36a07af --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,28 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2018_10_09_004819) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "works", force: :cascade do |t| + t.string "title" + t.string "creator" + t.date "publication_year" + t.string "description" + t.string "category" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + 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/works.yml b/test/fixtures/works.yml new file mode 100644 index 0000000000..7705978e36 --- /dev/null +++ b/test/fixtures/works.yml @@ -0,0 +1,15 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + created_by: MyString + publication_year: 2018-10-08 + description: MyString + category: MyString + +two: + title: MyString + created_by: MyString + publication_year: 2018-10-08 + description: MyString + category: MyString diff --git a/test/models/work_test.rb b/test/models/work_test.rb new file mode 100644 index 0000000000..f6fba7104d --- /dev/null +++ b/test/models/work_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Work do + let(:work) { Work.new } + + it "must be valid" do + value(work).must_be :valid? + end +end From 55d9812179ae82900ba9c700cb52b9ab33c39c48 Mon Sep 17 00:00:00 2001 From: Maryam Shitu Date: Tue, 9 Oct 2018 00:15:39 -0700 Subject: [PATCH 03/23] work#index and work#show views created, data seeded --- app/controllers/works_controller.rb | 2 +- app/views/works/index.html.erb | 8 +++++++ app/views/works/show.html.erb | 14 ++++++++++++ db/seeds.rb | 34 +++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 app/views/works/index.html.erb create mode 100644 app/views/works/show.html.erb diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 9c9b1eaa97..90e6a4462b 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,6 +1,6 @@ class WorksController < ApplicationController def index - @works = Work # .order(:name) + @works = Work.all # .order(:name) end def show diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb new file mode 100644 index 0000000000..5554e90c10 --- /dev/null +++ b/app/views/works/index.html.erb @@ -0,0 +1,8 @@ +

List of Works

+ +
    + <% @works.each do |work| %> +
  • <%= link_to "#{work.title}", work_path(work.id) %>
    • +

    number of votes here

    + <% end %> +
      diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb new file mode 100644 index 0000000000..c52b4ad860 --- /dev/null +++ b/app/views/works/show.html.erb @@ -0,0 +1,14 @@ +<% if @work.nil? %> +

      404 Not found

      +<% else %> +

      <%=@work.title %>

      +

      Creator: <%= @work.creator %>

      +

      Published:<%= @work.publication_year %>

      +

      Description: <%= @work.description %>

      +

      Category: <%= @work.category %>

      + + + <%= link_to "Edit", edit_work_path(@work.id) %> +
      + <%= link_to "Delete #{@work.title}", work_path(@work.id), method: :delete %> +<% end %> diff --git a/db/seeds.rb b/db/seeds.rb index 1beea2accd..58bfe4fa00 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,3 +5,37 @@ # # movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) # Character.create(name: 'Luke', movie: movies.first) +require 'date' +require 'csv' + +# we already provide a filled out media_seeds.csv file, but feel free to +# run this script in order to replace it and generate a new one +# run using the command: +# $ ruby db/generate_seeds.rb +# if satisfied with this new media_seeds.csv file, recreate the db with: +# $ rails db:reset +# doesn't currently check for if titles are unique against each other + +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.category = row["category"] + work.title = row["title"] + work.creator = row["creator"] + work.publication_year = row["publication_year"] + work.description = "description" + + successful = work.save + if !successful + work_failures << work + puts "Failed to save work: #{work.inspect}" + else + puts "Added a work: #{work.inspect}" + end +end + +puts "Added #{Work.count} work records" +puts "#{work_failures.length} works failed to save" From 4ba843375beab90943054507ac6dfe980ed9dca3 Mon Sep 17 00:00:00 2001 From: Maryam Shitu Date: Tue, 9 Oct 2018 17:35:27 -0700 Subject: [PATCH 04/23] crud operationa and views available for works --- app/assets/javascripts/users.js | 2 ++ app/assets/stylesheets/users.scss | 3 +++ app/controllers/users_controller.rb | 2 ++ app/controllers/works_controller.rb | 4 ++++ app/helpers/users_helper.rb | 2 ++ app/models/user.rb | 3 +++ app/models/vote.rb | 5 ++++ app/models/work.rb | 9 ++++++- app/views/layouts/application.html.erb | 12 ++++++++++ app/views/works/_form.html.erb | 24 +++++++++++++++++++ app/views/works/edit.html.erb | 3 +++ app/views/works/new.html.erb | 3 +++ app/views/works/notfound.html.erb | 1 + ...9223958_change_year_published_to_string.rb | 5 ++++ db/migrate/20181009230040_create_users.rb | 9 +++++++ db/migrate/20181010000555_create_votes.rb | 10 ++++++++ db/schema.rb | 17 +++++++++++-- db/seeds.rb | 5 ++-- test/controllers/users_controller_test.rb | 7 ++++++ test/fixtures/users.yml | 7 ++++++ test/fixtures/votes.yml | 9 +++++++ test/models/user_test.rb | 9 +++++++ test/models/vote_test.rb | 9 +++++++ 23 files changed, 155 insertions(+), 5 deletions(-) create mode 100644 app/assets/javascripts/users.js create mode 100644 app/assets/stylesheets/users.scss create mode 100644 app/controllers/users_controller.rb create mode 100644 app/helpers/users_helper.rb create mode 100644 app/models/user.rb create mode 100644 app/models/vote.rb create mode 100644 app/views/works/_form.html.erb create mode 100644 app/views/works/edit.html.erb create mode 100644 app/views/works/new.html.erb create mode 100644 app/views/works/notfound.html.erb create mode 100644 db/migrate/20181009223958_change_year_published_to_string.rb create mode 100644 db/migrate/20181009230040_create_users.rb create mode 100644 db/migrate/20181010000555_create_votes.rb create mode 100644 test/controllers/users_controller_test.rb create mode 100644 test/fixtures/users.yml create mode 100644 test/fixtures/votes.yml create mode 100644 test/models/user_test.rb create mode 100644 test/models/vote_test.rb diff --git a/app/assets/javascripts/users.js b/app/assets/javascripts/users.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/users.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/users.scss b/app/assets/stylesheets/users.scss new file mode 100644 index 0000000000..31a2eacb84 --- /dev/null +++ b/app/assets/stylesheets/users.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Users controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb new file mode 100644 index 0000000000..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 index 90e6a4462b..81f5b994d2 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -38,6 +38,10 @@ def update def destroy work = Work.find_by(id: params[:id].to_i) @deleted_work = work.destroy + + if @deleted_work + redirect_to works_path + end end private diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb new file mode 100644 index 0000000000..2310a240d7 --- /dev/null +++ b/app/helpers/users_helper.rb @@ -0,0 +1,2 @@ +module UsersHelper +end diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 0000000000..b4c0183bd6 --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,3 @@ +class User < ApplicationRecord + has_many :votes, through: :works +end diff --git a/app/models/vote.rb b/app/models/vote.rb new file mode 100644 index 0000000000..9650cc8b90 --- /dev/null +++ b/app/models/vote.rb @@ -0,0 +1,5 @@ +class Vote < ApplicationRecord + belongs_to :users + belongs_to :works + +end diff --git a/app/models/work.rb b/app/models/work.rb index fd6de52e25..208bcc1fb7 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,3 +1,10 @@ class Work < ApplicationRecord - # has_many :votes, through: :works + # validates :title, presence: true, length: { in: 5..100 } + # validates :creator, presence: true, length: { in: 5..100 } + # validates :category, presence: true + # validates :publication_year, presence: true, length: { in: 5..100 } + # validates :description, presence: true, length: { in: 5..100 } + + + has_many :votes, through: :works end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f32268a271..3301f963f9 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,6 +10,18 @@ +
      +

      Media Ranker

      +

      Ranking the best of everything

      + + +
      + <%= yield %> diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb new file mode 100644 index 0000000000..66e6612e78 --- /dev/null +++ b/app/views/works/_form.html.erb @@ -0,0 +1,24 @@ +

      <%= action_name %>

      + +<%= form_with model: @work, class: "work-form" do |f|%> +

      Please provide the following information to save your book to our database:

      + + <%= f.label :title %> + <%= f.text_field :title %> + + <%= f.label :creator %> + <%= f.text_field :creator %> + + <%= f.label :category %> + <%= f.text_field :category %> + + <%= f.label :publication_year %> + <%= f.text_field :publication_year %> + +
      + <%= f.label :description %> + <%= f.text_area :description %> +
      + + <%= f.submit button_title, class: "book-button" %> +<% end %> diff --git a/app/views/works/edit.html.erb b/app/views/works/edit.html.erb new file mode 100644 index 0000000000..19fe675123 --- /dev/null +++ b/app/views/works/edit.html.erb @@ -0,0 +1,3 @@ +<%= render partial: "form", + locals: { action_name: 'Edit Media', + button_title: 'Edit' } %> diff --git a/app/views/works/new.html.erb b/app/views/works/new.html.erb new file mode 100644 index 0000000000..5dfd42fea9 --- /dev/null +++ b/app/views/works/new.html.erb @@ -0,0 +1,3 @@ +<%= render partial: "form", + locals: { action_name: 'Add media', + button_title: 'Add' } %> diff --git a/app/views/works/notfound.html.erb b/app/views/works/notfound.html.erb new file mode 100644 index 0000000000..c37ab2ebaa --- /dev/null +++ b/app/views/works/notfound.html.erb @@ -0,0 +1 @@ +

      Not Found 404

      diff --git a/db/migrate/20181009223958_change_year_published_to_string.rb b/db/migrate/20181009223958_change_year_published_to_string.rb new file mode 100644 index 0000000000..5050547f5e --- /dev/null +++ b/db/migrate/20181009223958_change_year_published_to_string.rb @@ -0,0 +1,5 @@ +class ChangeYearPublishedToString < ActiveRecord::Migration[5.2] + def change + change_column :works, :publication_year, :string + end +end diff --git a/db/migrate/20181009230040_create_users.rb b/db/migrate/20181009230040_create_users.rb new file mode 100644 index 0000000000..9c711e759b --- /dev/null +++ b/db/migrate/20181009230040_create_users.rb @@ -0,0 +1,9 @@ +class CreateUsers < ActiveRecord::Migration[5.2] + def change + create_table :users do |t| + t.string :username + + t.timestamps + end + end +end diff --git a/db/migrate/20181010000555_create_votes.rb b/db/migrate/20181010000555_create_votes.rb new file mode 100644 index 0000000000..5b84403a29 --- /dev/null +++ b/db/migrate/20181010000555_create_votes.rb @@ -0,0 +1,10 @@ +class CreateVotes < ActiveRecord::Migration[5.2] + def change + create_table :votes do |t| + t.string :username + t.string :work + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 16a36a07af..256b9ff53a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,15 +10,28 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_10_09_004819) do +ActiveRecord::Schema.define(version: 2018_10_10_000555) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "users", force: :cascade do |t| + t.string "username" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "votes", force: :cascade do |t| + t.string "username" + t.string "work" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "works", force: :cascade do |t| t.string "title" t.string "creator" - t.date "publication_year" + t.string "publication_year" t.string "description" t.string "category" t.datetime "created_at", null: false diff --git a/db/seeds.rb b/db/seeds.rb index 58bfe4fa00..c86fc219e5 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -25,8 +25,8 @@ work.category = row["category"] work.title = row["title"] work.creator = row["creator"] - work.publication_year = row["publication_year"] - work.description = "description" + work.publication_year = row['publication_year'] + work.description = row["description"] successful = work.save if !successful @@ -39,3 +39,4 @@ puts "Added #{Work.count} work records" puts "#{work_failures.length} works failed to save" + # work.publication_year = Date.parse("#{row['publication_year']}-1-1") 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/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 0000000000..952febd97d --- /dev/null +++ b/test/fixtures/users.yml @@ -0,0 +1,7 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + username: MyString + +two: + username: MyString diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml new file mode 100644 index 0000000000..34f008f08d --- /dev/null +++ b/test/fixtures/votes.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + username: MyString + work: MyString + +two: + username: MyString + work: 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/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 92b842a86a00ab152e400ffe805f63ee1436a2c5 Mon Sep 17 00:00:00 2001 From: Maryam Shitu Date: Tue, 9 Oct 2018 17:37:08 -0700 Subject: [PATCH 05/23] create new work bug fix - redirect to works path --- app/controllers/works_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 81f5b994d2..2beed6eb8a 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -15,7 +15,7 @@ def create @work = Work.new(work_params) if @work.save - # redirect_to root_path + redirect_to works_path else render :new end From 15ef47ad9c2507827f2d93c1ba8e0d3b152913a9 Mon Sep 17 00:00:00 2001 From: Maryam Shitu Date: Tue, 9 Oct 2018 23:30:36 -0700 Subject: [PATCH 06/23] user crud functions and views created vote relationship incomplete works model test started continue on diff branch --- app/controllers/users_controller.rb | 51 ++++++++++++++++++++++++++ app/controllers/works_controller.rb | 4 ++ app/models/work.rb | 2 +- app/views/layouts/application.html.erb | 2 + app/views/users/_form.html.erb | 10 +++++ app/views/users/index.html.erb | 8 ++++ app/views/users/new.html.erb | 3 ++ app/views/users/show.html.erb | 8 ++++ config/routes.rb | 2 +- test/fixtures/works.yml | 24 ++++++------ test/models/work_test.rb | 12 ++++++ test/test_helper.rb | 3 +- 12 files changed, 114 insertions(+), 15 deletions(-) create mode 100644 app/views/users/_form.html.erb create mode 100644 app/views/users/index.html.erb create mode 100644 app/views/users/new.html.erb create mode 100644 app/views/users/show.html.erb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 3e74dea87f..25690f6d91 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,2 +1,53 @@ class UsersController < ApplicationController + before_action :find_book, only: [:show, :edit, :update] + + def index + @users = User.all.order(:username) + end + + def show; end + + def new + @users = User.new + end + + def create + @users = User.new(user_params) + + if @users.save + redirect_to users_path + else + render :new + end + end + + def update + if @users.update(users_params) + redirect_to users_path + else + render :edit + end + end + + def edit; end + + def destroy + user = User.find_by(id: params[:id].to_i) + @deleted_user = user.destroy + + if @deleted_user + redirect_to users_path + end + end + + def upvote + + end + + private + + def user_params + return params.require(:user).permit(:username, :upvote) + end + end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 2beed6eb8a..ac179da5cd 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -44,6 +44,10 @@ def destroy end end + def top_media + + end + private def work_params diff --git a/app/models/work.rb b/app/models/work.rb index 208bcc1fb7..b30b537a26 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,5 +1,5 @@ class Work < ApplicationRecord - # validates :title, presence: true, length: { in: 5..100 } + validates :title, presence: true, length: { in: 5..100 } # validates :creator, presence: true, length: { in: 5..100 } # validates :category, presence: true # validates :publication_year, presence: true, length: { in: 5..100 } diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 3301f963f9..9fd9c2bdee 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -18,6 +18,8 @@
      • <%= link_to "View All Media", works_path, class: "nav-link" %>
      • <%= link_to "Add New Work", new_work_path, class: "nav-link" %>
        • +
      • <%= link_to "View All Users", users_path, class: "nav-link" %>
        • +
      • <%= link_to "Login", new_user_path, class: "nav-link" %>
      diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb new file mode 100644 index 0000000000..6da429de76 --- /dev/null +++ b/app/views/users/_form.html.erb @@ -0,0 +1,10 @@ +

      <%= action_name %>

      + +<%= form_with model: @user, class: "user-form" do |f|%> +

      Please enter a username:

      + + <%= f.label :username %> + <%= f.text_field :username %> + + <%= f.submit button_title, class: "user-button" %> +<% end %> diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb new file mode 100644 index 0000000000..e2651a8652 --- /dev/null +++ b/app/views/users/index.html.erb @@ -0,0 +1,8 @@ +

      List of Users

      + +
        + <% @users.each do |user| %> +
      • <%= link_to "#{user.username}", user_path(user.id) %>
        • +

        number of votes here

        + <% end %> +
          diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb new file mode 100644 index 0000000000..b8554f7528 --- /dev/null +++ b/app/views/users/new.html.erb @@ -0,0 +1,3 @@ +<%= render partial: "form", + locals: { action_name: 'Log In', + button_title: 'Log In' } %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb new file mode 100644 index 0000000000..0ef63379d7 --- /dev/null +++ b/app/views/users/show.html.erb @@ -0,0 +1,8 @@ +<% if @user.nil? %> +

          404 Not found

          +<% else %> +

          <%= @user.username %>

          +

          <%= @user.created_at %>

          + +

          Votes go here

          +<% end %> diff --git a/config/routes.rb b/config/routes.rb index 8eb4b49d1e..fce70fd990 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,4 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - resources :works + resources :works, :users end diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index 7705978e36..f95fea8217 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -1,15 +1,15 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - title: MyString - created_by: MyString - publication_year: 2018-10-08 - description: MyString - category: MyString +breaker: + title: Blue Breaker + creator: Dr. Sarai Langosh + publication_year: 1949 + description: Et et expedita non aut quo. + category: album -two: - title: MyString - created_by: MyString - publication_year: 2018-10-08 - description: MyString - category: MyString +treat: + title: Joe Treat + creator: Blaise Lesch + publication_year: 1968 + description: Voluptatem adipisci qui velit. + category: book diff --git a/test/models/work_test.rb b/test/models/work_test.rb index f6fba7104d..d8ea4c3976 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -6,4 +6,16 @@ it "must be valid" do value(work).must_be :valid? end + + describe 'validation' do + + it 'is valid when all fields are present' do + work = works(:treat) + + result = work.valid? + expect(result).must_equal true + end + + end + end diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b5172a7d6..fb7dd505e2 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,8 @@ ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" -require "minitest/rails"require "minitest/reporters" # for Colorized output +require "minitest/rails" +require "minitest/reporters" # for Colorized output # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, From 93d18ffd2d2dc22b9174e4cc7c51668a05e2e8d6 Mon Sep 17 00:00:00 2001 From: Maryam Shitu Date: Wed, 10 Oct 2018 14:12:19 -0700 Subject: [PATCH 07/23] commiting minor chnages before switching branches --- app/controllers/application_controller.rb | 6 ++++++ app/controllers/users_controller.rb | 4 ++-- app/views/layouts/application.html.erb | 6 +++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 09705d12ab..c101733c0c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,8 @@ class ApplicationController < ActionController::Base +before_action :find_user + +private + def find_user + @current_user = User.find_by(id: session[:user_id]) + end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 25690f6d91..e99c1f8d91 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,5 +1,5 @@ class UsersController < ApplicationController - before_action :find_book, only: [:show, :edit, :update] + before_action :find_book, only: [:show, :edit, :update, :destroy] def index @users = User.all.order(:username) @@ -41,7 +41,7 @@ def destroy end def upvote - + end private diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 9fd9c2bdee..adb7c13268 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -19,7 +19,11 @@
        • <%= link_to "View All Media", works_path, class: "nav-link" %>
        • <%= link_to "Add New Work", new_work_path, class: "nav-link" %>
        • <%= link_to "View All Users", users_path, class: "nav-link" %>
          • -
        • <%= link_to "Login", new_user_path, class: "nav-link" %>
          • + +
        • <%= link_to "Login", new_user_path, class: "nav-link" %>
          • +
        From 5679493f18a9d0b13d8175c8f302ad95a06a3827 Mon Sep 17 00:00:00 2001 From: Maryam Shitu Date: Wed, 10 Oct 2018 14:30:42 -0700 Subject: [PATCH 08/23] updating master branch --- test/models/work_test.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/models/work_test.rb b/test/models/work_test.rb index d8ea4c3976..411f1ffaa2 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -16,6 +16,10 @@ expect(result).must_equal true end + it 'it has required fields' do + + end + end end From 83fd45449e40314c536f343996373159f1d7c8be Mon Sep 17 00:00:00 2001 From: Maryam Shitu Date: Wed, 10 Oct 2018 16:56:13 -0700 Subject: [PATCH 09/23] test passing --- app/assets/javascripts/sessions_controller.js | 2 + .../stylesheets/sessions_controller.scss | 3 ++ app/controllers/application_controller.rb | 2 +- .../sessions_controller_controller.rb | 18 ++++++++ app/controllers/users_controller.rb | 2 +- app/controllers/works_controller.rb | 43 ++++++++++++------- app/helpers/sessions_controller_helper.rb | 2 + app/models/user.rb | 3 +- app/models/work.rb | 12 +++--- app/views/sessions_controller/_form.html.erb | 10 +++++ app/views/works/top_media.html.erb | 0 config/routes.rb | 3 ++ .../sessions_controller_controller_test.rb | 7 +++ test/models/work_test.rb | 16 ++++--- 14 files changed, 93 insertions(+), 30 deletions(-) create mode 100644 app/assets/javascripts/sessions_controller.js create mode 100644 app/assets/stylesheets/sessions_controller.scss create mode 100644 app/controllers/sessions_controller_controller.rb create mode 100644 app/helpers/sessions_controller_helper.rb create mode 100644 app/views/sessions_controller/_form.html.erb create mode 100644 app/views/works/top_media.html.erb create mode 100644 test/controllers/sessions_controller_controller_test.rb diff --git a/app/assets/javascripts/sessions_controller.js b/app/assets/javascripts/sessions_controller.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/sessions_controller.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/sessions_controller.scss b/app/assets/stylesheets/sessions_controller.scss new file mode 100644 index 0000000000..2cde9c90fd --- /dev/null +++ b/app/assets/stylesheets/sessions_controller.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the SessionsController 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/application_controller.rb b/app/controllers/application_controller.rb index c101733c0c..2b4e1badeb 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,5 +1,5 @@ class ApplicationController < ActionController::Base -before_action :find_user + before_action :find_user private def find_user diff --git a/app/controllers/sessions_controller_controller.rb b/app/controllers/sessions_controller_controller.rb new file mode 100644 index 0000000000..9f78e13b88 --- /dev/null +++ b/app/controllers/sessions_controller_controller.rb @@ -0,0 +1,18 @@ +class SessionsControllerController < ApplicationController + def new + end + + def create + end + + def login + user = User.find_by(username: params[:username]) + + if user + session[:username] = user.id + flash[:success] = "#{ user.user_id } is successfully logged in!" + redirect_to root_path + end + end + +end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index e99c1f8d91..f42644cc2a 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,5 +1,5 @@ class UsersController < ApplicationController - before_action :find_book, only: [:show, :edit, :update, :destroy] + before_action :find_users, only: [:show, :edit, :update, :destroy] def index @users = User.all.order(:username) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index ac179da5cd..aed4f98c91 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,11 +1,11 @@ class WorksController < ApplicationController + before_action :find_work, only: [:show, :edit, :update, :destroy] + def index - @works = Work.all # .order(:name) + @works = Work.all #.order(:votes) end - def show - @work = Work.find(params[:id].to_i) - end + def show; end def new @work = Work.new @@ -15,41 +15,52 @@ def create @work = Work.new(work_params) if @work.save + flash[:success] = "Media Added!" redirect_to works_path else + flash.now[:warning] = "Media not Added!" + @work.errors.messages.each do |field, msg| + flash.now[field] = messages + end + render :new end end - def edit - @work = Work.find(params[:id].to_i) - end + def edit; end def update - @work = Work.find_by(id: params[:id].to_i) - - if @work.update(work_params) + if @work && @work.update(work_params) redirect_to work_path(@work.id) - else + elsif @work + flash.now[:warning] = @work.errors.messages render :edit end end def destroy - work = Work.find_by(id: params[:id].to_i) - @deleted_work = work.destroy - - if @deleted_work + unless @work.nil? + @work.destroy + flash[:success] = "#{@work.title} deleted" redirect_to works_path end end def top_media - + redirect_to top_media end private + def find_work + @work = Work.find_by_id(params[:id]) + + if @work.nil? + flash.now[:warning] = "Cannot find the media #{params[:title]}" + render :notfound + end + end + def work_params return params.require(:work).permit(:category, :title, :creator, :publication_year, :description) end diff --git a/app/helpers/sessions_controller_helper.rb b/app/helpers/sessions_controller_helper.rb new file mode 100644 index 0000000000..1eff852d2d --- /dev/null +++ b/app/helpers/sessions_controller_helper.rb @@ -0,0 +1,2 @@ +module SessionsControllerHelper +end diff --git a/app/models/user.rb b/app/models/user.rb index b4c0183bd6..b1f986dd41 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,3 +1,4 @@ class User < ApplicationRecord - has_many :votes, through: :works + has_many :votes + has_many :works, through: :votes end diff --git a/app/models/work.rb b/app/models/work.rb index b30b537a26..260387fca6 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,10 +1,10 @@ class Work < ApplicationRecord validates :title, presence: true, length: { in: 5..100 } - # validates :creator, presence: true, length: { in: 5..100 } - # validates :category, presence: true - # validates :publication_year, presence: true, length: { in: 5..100 } - # validates :description, presence: true, length: { in: 5..100 } + validates :creator, presence: true, length: { in: 5..100 } + validates :category, presence: true + validates :publication_year, presence: true + validates :description, presence: true, length: { in: 5..100 } - - has_many :votes, through: :works + has_many :votes + has_many :users, through: :votes end diff --git a/app/views/sessions_controller/_form.html.erb b/app/views/sessions_controller/_form.html.erb new file mode 100644 index 0000000000..6da429de76 --- /dev/null +++ b/app/views/sessions_controller/_form.html.erb @@ -0,0 +1,10 @@ +

        <%= action_name %>

        + +<%= form_with model: @user, class: "user-form" do |f|%> +

        Please enter a username:

        + + <%= f.label :username %> + <%= f.text_field :username %> + + <%= f.submit button_title, class: "user-button" %> +<% end %> diff --git a/app/views/works/top_media.html.erb b/app/views/works/top_media.html.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/routes.rb b/config/routes.rb index fce70fd990..d9eb39360e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,7 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + root to: "works#top_media" resources :works, :users + + end diff --git a/test/controllers/sessions_controller_controller_test.rb b/test/controllers/sessions_controller_controller_test.rb new file mode 100644 index 0000000000..3fe50b3cca --- /dev/null +++ b/test/controllers/sessions_controller_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe SessionsControllerController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/models/work_test.rb b/test/models/work_test.rb index 411f1ffaa2..39b049c4ac 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -1,25 +1,31 @@ require "test_helper" describe Work do - let(:work) { Work.new } + let(:work) { works(:treat) } it "must be valid" do value(work).must_be :valid? end - describe 'validation' do + describe 'Validations' do it 'is valid when all fields are present' do - work = works(:treat) - result = work.valid? expect(result).must_equal true end it 'it has required fields' do - + fields = [:title, :creator, :category, :publication_year, :description] + + fields.each do |field| + expect(work).must_respond_to field + end end end + describe 'Relationships' do + + end + end From 9a0877e2a59b3da2bf994a7ffc2e95ed34a069f5 Mon Sep 17 00:00:00 2001 From: Maryam Shitu Date: Wed, 10 Oct 2018 18:00:08 -0700 Subject: [PATCH 10/23] flash added to views --- .../sessions_controller_controller.rb | 24 ++++++++++----- app/controllers/users_controller.rb | 23 ++++++++------- app/controllers/works_controller.rb | 4 +-- app/views/layouts/application.html.erb | 29 +++++++++++++++---- .../sessions_controller/destroy.html.erb | 2 ++ app/views/sessions_controller/login.html.erb | 2 ++ .../{_form.html.erb => new.html.erb} | 0 app/views/works/top_media.html.erb | 1 + config/routes.rb | 6 +++- 9 files changed, 64 insertions(+), 27 deletions(-) create mode 100644 app/views/sessions_controller/destroy.html.erb create mode 100644 app/views/sessions_controller/login.html.erb rename app/views/sessions_controller/{_form.html.erb => new.html.erb} (100%) diff --git a/app/controllers/sessions_controller_controller.rb b/app/controllers/sessions_controller_controller.rb index 9f78e13b88..ffd0b909b5 100644 --- a/app/controllers/sessions_controller_controller.rb +++ b/app/controllers/sessions_controller_controller.rb @@ -1,18 +1,26 @@ class SessionsControllerController < ApplicationController def new + @user = User.new end - def create + def login + user = User.find_by(username: params[:user][:username]) + + if user.nil? + user = User.create(username: params[:user][:username]) + end + + session[:user_id] = user.id + flash[:success] = "#{ user.username } Successfully logged in!" + redirect_to root_path end - def login - user = User.find_by(username: params[:username]) - if user - session[:username] = user.id - flash[:success] = "#{ user.user_id } is successfully logged in!" - redirect_to root_path - end + def destroy + session[:user_id] = nil + flash[:success] = 'Successfully logged out' + redirect_back fallback_location: root_path end + end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index f42644cc2a..6521cb9639 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -22,23 +22,24 @@ def create end def update - if @users.update(users_params) - redirect_to users_path - else + if @user && @user.update(user_params) + redirect_to user_path(@user.id) + else @user + flash.now[:warning] = @user.errors.messages render :edit end end def edit; end - def destroy - user = User.find_by(id: params[:id].to_i) - @deleted_user = user.destroy - - if @deleted_user - redirect_to users_path - end - end + # def destroy + # user = User.find_by(id: params[:id].to_i) + # @deleted_user = user.destroy + # + # if @deleted_user + # redirect_to users_path + # end + # end def upvote diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index aed4f98c91..40d112e867 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -31,9 +31,10 @@ def edit; end def update if @work && @work.update(work_params) + flash[:success] = "#{@work.title} was edited." redirect_to work_path(@work.id) elsif @work - flash.now[:warning] = @work.errors.messages + flash.now[:warning] = @work.errors.messages render :edit end end @@ -47,7 +48,6 @@ def destroy end def top_media - redirect_to top_media end private diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index adb7c13268..6b8e759583 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -14,16 +14,35 @@

        Media Ranker

        Ranking the best of everything

        +
        + <% flash.each do |name, message| %> + <% if message.class == Array %> + <% message.each do |msg| %> +
        + <%= "#{name}:" %><%= " #{msg}" %>
        + <% end %> + <% else %> +
        + <%= message %> +
        + <% end %> + <% end %> + + <% if @current_user %> +

        Welcome <%= @current_user.name %>

        + <% end %> +
        + diff --git a/app/views/sessions_controller/destroy.html.erb b/app/views/sessions_controller/destroy.html.erb new file mode 100644 index 0000000000..d75237d982 --- /dev/null +++ b/app/views/sessions_controller/destroy.html.erb @@ -0,0 +1,2 @@ +

        Sessions#destroy

        +

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

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

        Sessions#login

        +

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

        diff --git a/app/views/sessions_controller/_form.html.erb b/app/views/sessions_controller/new.html.erb similarity index 100% rename from app/views/sessions_controller/_form.html.erb rename to app/views/sessions_controller/new.html.erb diff --git a/app/views/works/top_media.html.erb b/app/views/works/top_media.html.erb index e69de29bb2..27f82f7f43 100644 --- a/app/views/works/top_media.html.erb +++ b/app/views/works/top_media.html.erb @@ -0,0 +1 @@ +

        Top Media Page

        diff --git a/config/routes.rb b/config/routes.rb index d9eb39360e..17ec83df0c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,10 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - root to: "works#top_media" + post 'sessions/login', to: 'sessions#login', as: 'login' + get 'sessions/login', to: 'sessions#new' + delete 'sessions/destroy', to: 'sessions#destroy', as: 'logout' + + root "works#top_media" resources :works, :users From d6672dacf22d2b9119f26c5547de7365334c17d0 Mon Sep 17 00:00:00 2001 From: Maryam Shitu Date: Fri, 12 Oct 2018 11:31:33 -0700 Subject: [PATCH 11/23] there is currenltly a bug in sessions for user log in --- app/controllers/users_controller.rb | 26 ++++++++++++++++---------- app/controllers/works_controller.rb | 6 +++++- app/models/work.rb | 14 +++++++++++++- app/views/layouts/application.html.erb | 9 ++++++--- app/views/works/_form.html.erb | 10 ++++++++++ app/views/works/edit.html.erb | 1 + app/views/works/index.html.erb | 21 +++++++++++++++------ 7 files changed, 66 insertions(+), 21 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 6521cb9639..922802f153 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,11 +1,17 @@ class UsersController < ApplicationController - before_action :find_users, only: [:show, :edit, :update, :destroy] + before_action :find_users, only: [:edit, :update, :destroy] def index @users = User.all.order(:username) end - def show; end + def show + id = params[:id].to_i + @user = User.find_by(id: id) + + if @author.nil? + render :notfound, status: :note_found + end def new @users = User.new @@ -32,14 +38,14 @@ def update def edit; end - # def destroy - # user = User.find_by(id: params[:id].to_i) - # @deleted_user = user.destroy - # - # if @deleted_user - # redirect_to users_path - # end - # end + def destroy + user = User.find_by(id: params[:id].to_i) + @deleted_user = user.destroy + + if @deleted_user + redirect_to users_path + end + end def upvote diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 40d112e867..ce59883c17 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -3,6 +3,10 @@ class WorksController < ApplicationController def index @works = Work.all #.order(:votes) + + @albums = Work.albums + @books = Work.books + @movies = Work.movies end def show; end @@ -34,7 +38,7 @@ def update flash[:success] = "#{@work.title} was edited." redirect_to work_path(@work.id) elsif @work - flash.now[:warning] = @work.errors.messages + # flash.now[:warning] = @work.errors.messages render :edit end end diff --git a/app/models/work.rb b/app/models/work.rb index 260387fca6..2dfb921695 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,10 +1,22 @@ class Work < ApplicationRecord validates :title, presence: true, length: { in: 5..100 } validates :creator, presence: true, length: { in: 5..100 } - validates :category, presence: true + validates_inclusion_of :category, in: %w(book album movie) validates :publication_year, presence: true validates :description, presence: true, length: { in: 5..100 } has_many :votes has_many :users, through: :votes + + def self.albums + return Work.where(category: 'album') + end + + def self.books + return Work.where(category: 'book') + end + + def self.movies + return Work.where(category: 'movie') + end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 6b8e759583..ba517465ad 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,8 +10,8 @@ -
        -

        Media Ranker

        +
        +

        Media Ranke

        Ranking the best of everything

        @@ -38,6 +38,7 @@
      • <%= link_to "View All Media", works_path, class: "nav-link" %>
      • <%= link_to "Add New Work", new_work_path, class: "nav-link" %>
      • <%= link_to "View All Users", users_path, class: "nav-link" %>
        • + <% if session[:user_id] %> <%= link_to "Log Out", logout_path, method: :delete %> <% else %> @@ -47,6 +48,8 @@
        - <%= yield %> +
        + <%= yield %> +
        diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb index 66e6612e78..8b580d4a64 100644 --- a/app/views/works/_form.html.erb +++ b/app/views/works/_form.html.erb @@ -1,3 +1,13 @@ +<% if @work.errors.any? %> +
          + <% @work.errors.each do |column, message| %> +
        • + <%= column.capitalize %> <%= message %> +
          • + <% end %> +
        +<% end %> +

        <%= action_name %>

        <%= form_with model: @work, class: "work-form" do |f|%> diff --git a/app/views/works/edit.html.erb b/app/views/works/edit.html.erb index 19fe675123..9df783ce9c 100644 --- a/app/views/works/edit.html.erb +++ b/app/views/works/edit.html.erb @@ -1,3 +1,4 @@ + <%= render partial: "form", locals: { action_name: 'Edit Media', button_title: 'Edit' } %> diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 5554e90c10..0307a0e543 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1,8 +1,17 @@

        List of Works

        -
          - <% @works.each do |work| %> -
        • <%= link_to "#{work.title}", work_path(work.id) %>
          • -

          number of votes here

          - <% end %> -
            + +

            Albums

            +<% @albums.each do |album|%> +
          • <%= link_to "#{album.title}", work_path(album.id) %>
            • +<% end %> + +

            Books

            +<% @books.each do |book|%> +
          • <%= link_to "#{book.title}", work_path(book.id) %>
            • +<% end %> + +

            Movies

            +<% @movies.each do |movie|%> +
          • <%= link_to "#{movie.title}", work_path(movie.id) %>
            • +<% end %> From 19a4e378bb47f8737d2e8b791e1a963bb5e0022d Mon Sep 17 00:00:00 2001 From: Maryam Shitu Date: Fri, 12 Oct 2018 13:31:08 -0700 Subject: [PATCH 12/23] media title uniquenss validation tested and passing --- app/models/work.rb | 2 +- test/models/work_test.rb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/models/work.rb b/app/models/work.rb index 2dfb921695..1fe926e264 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,5 +1,5 @@ class Work < ApplicationRecord - validates :title, presence: true, length: { in: 5..100 } + validates :title, presence: true, uniqueness: true validates :creator, presence: true, length: { in: 5..100 } validates_inclusion_of :category, in: %w(book album movie) validates :publication_year, presence: true diff --git a/test/models/work_test.rb b/test/models/work_test.rb index 39b049c4ac..f5e8255181 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -22,6 +22,12 @@ end end + it 'is not valid when the title of the media is not unique' do + work_copy = work.dup + + assert_not work_copy.valid? + end + end describe 'Relationships' do From 325ee97c4bf4d1126afc570f09dae565b34b60f9 Mon Sep 17 00:00:00 2001 From: Maryam Shitu Date: Fri, 12 Oct 2018 13:49:58 -0700 Subject: [PATCH 13/23] new and edit media forms bugg fixed --- app/controllers/works_controller.rb | 4 ++-- app/views/works/_form.html.erb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index ce59883c17..59102fe5c1 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -38,8 +38,8 @@ def update flash[:success] = "#{@work.title} was edited." redirect_to work_path(@work.id) elsif @work - # flash.now[:warning] = @work.errors.messages - render :edit + flash.now[:warning] = @work.errors.messages + render :edit, status: :bad_request end end diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb index 8b580d4a64..b3f995d2a2 100644 --- a/app/views/works/_form.html.erb +++ b/app/views/works/_form.html.erb @@ -10,7 +10,7 @@

            <%= action_name %>

            -<%= form_with model: @work, class: "work-form" do |f|%> +<%= form_with model: @work, class: "work-form", local: true do |f|%>

            Please provide the following information to save your book to our database:

            <%= f.label :title %> From 0efd249d00b136e6c73aefad340d56389b56f950 Mon Sep 17 00:00:00 2001 From: Maryam Shitu Date: Fri, 12 Oct 2018 18:09:25 -0700 Subject: [PATCH 14/23] code clean up --- app/controllers/sessions_controller.rb | 38 + .../sessions_controller_controller.rb | 26 - app/controllers/users_controller.rb | 8 +- app/controllers/works_controller.rb | 15 +- app/models/user.rb | 2 + app/views/layouts/application.html.erb | 11 +- .../destroy.html.erb | 0 app/views/sessions/login.html.erb | 10 + app/views/sessions/new.html.erb | 10 + app/views/sessions_controller/login.html.erb | 2 - app/views/sessions_controller/new.html.erb | 10 - app/views/users/show.html.erb | 2 +- app/views/works/index.html.erb | 837 ++++++++++++++++++ app/views/works/show.html.erb | 7 + config/routes.rb | 9 +- .../20181012235321_change_vote_model.rb | 8 + db/schema.rb | 10 +- ...er_test.rb => sessions_controller_test.rb} | 0 18 files changed, 948 insertions(+), 57 deletions(-) create mode 100644 app/controllers/sessions_controller.rb delete mode 100644 app/controllers/sessions_controller_controller.rb rename app/views/{sessions_controller => sessions}/destroy.html.erb (100%) create mode 100644 app/views/sessions/login.html.erb create mode 100644 app/views/sessions/new.html.erb delete mode 100644 app/views/sessions_controller/login.html.erb delete mode 100644 app/views/sessions_controller/new.html.erb create mode 100644 db/migrate/20181012235321_change_vote_model.rb rename test/controllers/{sessions_controller_controller_test.rb => sessions_controller_test.rb} (100%) diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb new file mode 100644 index 0000000000..dff3050c8b --- /dev/null +++ b/app/controllers/sessions_controller.rb @@ -0,0 +1,38 @@ +class SessionsController < ApplicationController + def login + flash[:error] = 'Logging in' + + user = User.find_by(username: params[:user][:username]) + + if user.nil? + user = User.create(username: params[:user][:username]) + if user.save + session[:user_id] = user.id + flash[:success] = "#{ user.username } Successfully logged in!" + redirect_to root_path + else + flash[:warning] = "#{ user.username } Unable to log in!" + redirect_to root_path + end + + else + session[:user_id] = user.id + flash[:warning] = 'this ran' + flash[:success] = "#{ user.username } Successfully logged in!" + redirect_to root_path + end + + end + + def new + @user = User.new + end + + def destroy + session[:user_id] = nil + flash[:success] = 'Successfully logged out' + redirect_back fallback_location: root_path + end + + +end diff --git a/app/controllers/sessions_controller_controller.rb b/app/controllers/sessions_controller_controller.rb deleted file mode 100644 index ffd0b909b5..0000000000 --- a/app/controllers/sessions_controller_controller.rb +++ /dev/null @@ -1,26 +0,0 @@ -class SessionsControllerController < ApplicationController - def new - @user = User.new - end - - def login - user = User.find_by(username: params[:user][:username]) - - if user.nil? - user = User.create(username: params[:user][:username]) - end - - session[:user_id] = user.id - flash[:success] = "#{ user.username } Successfully logged in!" - redirect_to root_path - end - - - def destroy - session[:user_id] = nil - flash[:success] = 'Successfully logged out' - redirect_back fallback_location: root_path - end - - -end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 922802f153..6b28a182d4 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3,14 +3,16 @@ class UsersController < ApplicationController def index @users = User.all.order(:username) + # @current_user = User.find_by(id: session[:user_id]) end def show id = params[:id].to_i @user = User.find_by(id: id) - if @author.nil? + if @user.nil? render :notfound, status: :note_found + end end def new @@ -47,10 +49,6 @@ def destroy end end - def upvote - - end - private def user_params diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 59102fe5c1..7efc35c86d 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,5 +1,5 @@ class WorksController < ApplicationController - before_action :find_work, only: [:show, :edit, :update, :destroy] + before_action :find_work, only: [:show, :edit, :update, :upvote, :destroy] def index @works = Work.all #.order(:votes) @@ -51,6 +51,19 @@ def destroy end end + def upvote + + # if @current_user + vote = Vote.new(user_id: @current_user, work_id: @work.id) + @work.votes << vote + flash[:success] = "Vote successful." + # redirect_to(work_path) + # else + # flash[:warning] = "Unable to submit vote" + # # redirect_to(work_path) + # end + end + def top_media end diff --git a/app/models/user.rb b/app/models/user.rb index b1f986dd41..e4b18f2b06 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,4 +1,6 @@ class User < ApplicationRecord has_many :votes has_many :works, through: :votes + + validates :username, presence: true end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index ba517465ad..a5f7ed3c4e 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -11,7 +11,8 @@
            -

            Media Ranke

            + +

            Media Ranker

            Ranking the best of everything

            @@ -29,7 +30,7 @@ <% end %> <% if @current_user %> -

            Welcome <%= @current_user.name %>

            +

            Welcome <%= @current_user.username %>

            <% end %>
            @@ -39,10 +40,10 @@
          • <%= link_to "Add New Work", new_work_path, class: "nav-link" %>
          • <%= link_to "View All Users", users_path, class: "nav-link" %>
            • - <% if session[:user_id] %> - <%= link_to "Log Out", logout_path, method: :delete %> + <% if @current_user %> +
          • <%= link_to "Log Out", logout_path, method: :delete, data: { confirm: "Are you sure you want to log out?" } %>
            • <% else %> - <%= link_to "Log In", login_path %> +
          • <%= link_to "Log In", login_path, class: "btn btn-primary" %>
            • <% end %>
          diff --git a/app/views/sessions_controller/destroy.html.erb b/app/views/sessions/destroy.html.erb similarity index 100% rename from app/views/sessions_controller/destroy.html.erb rename to app/views/sessions/destroy.html.erb diff --git a/app/views/sessions/login.html.erb b/app/views/sessions/login.html.erb new file mode 100644 index 0000000000..76ade69739 --- /dev/null +++ b/app/views/sessions/login.html.erb @@ -0,0 +1,10 @@ +

          Log In

          + +<%= form_with model: @user, class: "user-form", method: :post do |f|%> +

          Please enter a username:

          + + <%= f.label :username %> + <%= f.text_field :username %> + + <%= f.submit "Log In", class: "user-button" %> +<% end %> diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb new file mode 100644 index 0000000000..15cf66ad94 --- /dev/null +++ b/app/views/sessions/new.html.erb @@ -0,0 +1,10 @@ +

          Log In

          + +<%= form_with model: @user, class: "user-form", url: login_path, method: :post do |f|%> +

          Please enter a username:

          + + <%= f.label :username %> + <%= f.text_field :username %> + + <%= f.submit "Log In", class: "user-button" %> +<% end %> diff --git a/app/views/sessions_controller/login.html.erb b/app/views/sessions_controller/login.html.erb deleted file mode 100644 index 6fbfe54fd5..0000000000 --- a/app/views/sessions_controller/login.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

          Sessions#login

          -

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

          diff --git a/app/views/sessions_controller/new.html.erb b/app/views/sessions_controller/new.html.erb deleted file mode 100644 index 6da429de76..0000000000 --- a/app/views/sessions_controller/new.html.erb +++ /dev/null @@ -1,10 +0,0 @@ -

          <%= action_name %>

          - -<%= form_with model: @user, class: "user-form" do |f|%> -

          Please enter a username:

          - - <%= f.label :username %> - <%= f.text_field :username %> - - <%= f.submit button_title, class: "user-button" %> -<% end %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 0ef63379d7..ce3d27c5b7 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -2,7 +2,7 @@

          404 Not found

          <% else %>

          <%= @user.username %>

          -

          <%= @user.created_at %>

          +

          Joined: <%= @user.created_at %>

          Votes go here

          <% end %> diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 0307a0e543..e09dc1b96e 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -4,14 +4,851 @@

          Albums

          <% @albums.each do |album|%>
        • <%= link_to "#{album.title}", work_path(album.id) %>
          • + <%= link_to "Upvote", upvote_path(album.id) %> <% end %>

          Books

          <% @books.each do |book|%>
        • <%= link_to "#{book.title}", work_path(book.id) %>
          • + <%= link_to "Upvote", upvote_path(book.id) %> <% end %>

          Movies

          <% @movies.each do |movie|%>
        • <%= link_to "#{movie.title}", work_path(movie.id) %>
          • + <%= link_to "Upvote", upvote_path(movie.id) %> <% end %> + + diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index c52b4ad860..4778381bc4 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -11,4 +11,11 @@ <%= link_to "Edit", edit_work_path(@work.id) %>
          <%= link_to "Delete #{@work.title}", work_path(@work.id), method: :delete %> +
          + <%= button_to "Upvote", upvote_path(@work.id), method: :put%> + <% end %> + +
          +
          +

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

          diff --git a/config/routes.rb b/config/routes.rb index 17ec83df0c..51229c3ef0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,11 +1,12 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - post 'sessions/login', to: 'sessions#login', as: 'login' - get 'sessions/login', to: 'sessions#new' - delete 'sessions/destroy', to: 'sessions#destroy', as: 'logout' - root "works#top_media" + resources :works, :users + post 'sessions/login', to: 'sessions#login', as: 'login' + get 'sessions/login', to: 'sessions#new' + delete 'sessions/destroy', to: 'sessions#destroy', as: 'logout' + put 'works/:id/upvote', to: 'works#upvote', as: 'upvote' end diff --git a/db/migrate/20181012235321_change_vote_model.rb b/db/migrate/20181012235321_change_vote_model.rb new file mode 100644 index 0000000000..746920084c --- /dev/null +++ b/db/migrate/20181012235321_change_vote_model.rb @@ -0,0 +1,8 @@ +class ChangeVoteModel < ActiveRecord::Migration[5.2] + def change + remove_column :votes, :username, :string + remove_column :votes, :work, :string + add_reference :votes, :user, foreign_key: true + add_reference :votes, :work, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 256b9ff53a..3593630ba9 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_10_10_000555) do +ActiveRecord::Schema.define(version: 2018_10_12_235321) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -22,10 +22,12 @@ end create_table "votes", force: :cascade do |t| - t.string "username" - t.string "work" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.bigint "user_id" + t.bigint "work_id" + t.index ["user_id"], name: "index_votes_on_user_id" + t.index ["work_id"], name: "index_votes_on_work_id" end create_table "works", force: :cascade do |t| @@ -38,4 +40,6 @@ t.datetime "updated_at", null: false end + add_foreign_key "votes", "users" + add_foreign_key "votes", "works" end diff --git a/test/controllers/sessions_controller_controller_test.rb b/test/controllers/sessions_controller_test.rb similarity index 100% rename from test/controllers/sessions_controller_controller_test.rb rename to test/controllers/sessions_controller_test.rb From f95d1e0c274fd158cfc1a128c83c1efbdd3ff75d Mon Sep 17 00:00:00 2001 From: Maryam Shitu Date: Sat, 13 Oct 2018 15:10:26 -0700 Subject: [PATCH 15/23] upvote bug fixed --- app/assets/stylesheets/application.scss | 46 ++++++++++++++++++++ app/controllers/sessions_controller.rb | 1 - app/controllers/users_controller.rb | 1 - app/controllers/works_controller.rb | 20 ++++----- app/models/vote.rb | 7 +-- app/views/layouts/application.html.erb | 42 ++++++++++-------- app/views/works/index.html.erb | 58 +++++++++++++++++++------ app/views/works/show.html.erb | 2 +- config/routes.rb | 5 ++- 9 files changed, 132 insertions(+), 50 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 8b1701e581..ee97183f02 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -16,3 +16,49 @@ @import "bootstrap"; /* Import scss content */ @import "**/*"; + + + +// element.style { +// } + +body, h1, h2, h3, h4, h5 { + font-family: "Gudea", sans-serif; +} + +.app-header__header { + max-width: 100%; + background-color: #B2DFDB; + margin-bottom: 0.5rem; + padding: 2rem 1rem 0.5rem 1rem; +} + +.app-header__header h1 { + text-align: center; + margin: 25px auto 40px auto; +} + +.app-header__header h1 a { + color: white; + padding-right: 25px; + margin-right: 15px; + border-right: white 2px solid; +} + +.app-header__nav { + display: flex; + flex-direction: row; + justify-content: space-between; +} + +.nav { + display: flex; + flex-wrap: wrap; + padding-left: 0; + margin-bottom: 0; + list-style: none; +} + +.app-header__user-nav-container .nav-item { + margin-left: 2rem; +} diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index dff3050c8b..d5c9136f8a 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -17,7 +17,6 @@ def login else session[:user_id] = user.id - flash[:warning] = 'this ran' flash[:success] = "#{ user.username } Successfully logged in!" redirect_to root_path end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 6b28a182d4..71a42f184f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3,7 +3,6 @@ class UsersController < ApplicationController def index @users = User.all.order(:username) - # @current_user = User.find_by(id: session[:user_id]) end def show diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 7efc35c86d..3814b114fe 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -52,16 +52,16 @@ def destroy end def upvote - - # if @current_user - vote = Vote.new(user_id: @current_user, work_id: @work.id) - @work.votes << vote - flash[:success] = "Vote successful." - # redirect_to(work_path) - # else - # flash[:warning] = "Unable to submit vote" - # # redirect_to(work_path) - # end + vote = Vote.new(user_id: @current_user.id, work_id: @work.id) + + if vote.save + flash[:success] = "Vote successful." + redirect_back fallback_location: works_path + else + raise + flash[:warning] = "Unable to submit vote" + redirect_back fallback_location: works_path + end end def top_media diff --git a/app/models/vote.rb b/app/models/vote.rb index 9650cc8b90..e521754b0c 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -1,5 +1,6 @@ class Vote < ApplicationRecord - belongs_to :users - belongs_to :works - + belongs_to :user + belongs_to :work + + validates :user_id, uniqueness: {scope: :work_id, message: "one vote!"} end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index a5f7ed3c4e..727e48183f 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,10 +10,27 @@ -
          +
          -

          Media Ranker

          -

          Ranking the best of everything

          +

          Media RankerRanking the best of everything

          + +
          <% flash.each do |name, message| %> @@ -29,24 +46,11 @@ <% end %> <% end %> - <% if @current_user %> -

          Welcome <%= @current_user.username %>

          - <% end %> +
          -
          diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index e09dc1b96e..95da0ad526 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1,24 +1,56 @@ -

          List of Works

          +

          List of Works

          +
          +

          Albums

          + + + + + + + + + + + + <% @albums.each do |album|%> +
        • <%= link_to "#{album.title}", work_path(album.id) %>
          • + <%= button_to "Upvote", upvote_path(album.id), method: :post %> + <% end %> + + +
          VotesTitleCreated ByPublishedUpvote
          +
          -

          Albums

          -<% @albums.each do |album|%> -
        • <%= link_to "#{album.title}", work_path(album.id) %>
          • - <%= link_to "Upvote", upvote_path(album.id) %> -<% end %> - -

          Books

          -<% @books.each do |book|%> -
        • <%= link_to "#{book.title}", work_path(book.id) %>
          • - <%= link_to "Upvote", upvote_path(book.id) %> -<% end %> +
          +

          Books

          + + + + + + + + + + + + <% @books.each do |book|%> +
        • <%= link_to "#{book.title}", work_path(book.id) %>
          • + <%= button_to "Upvote", upvote_path(book.id), method: :post %> + <% end %> + +
          VotesTitleCreated ByPublishedUpvote
          +
          +

          Movies

          <% @movies.each do |movie|%>
        • <%= link_to "#{movie.title}", work_path(movie.id) %>
          • - <%= link_to "Upvote", upvote_path(movie.id) %> + <%= button_to "Upvote", upvote_path(movie.id), method: :post %> <% end %> + + + + + + + + + + + + <% @movies.each do |movie| %> + + + + + + + <% end %> + +
          VotesTitleCreated ByPublishedUpvote
          <%= movie.votes.count %><%= link_to "#{movie.title}", work_path(movie.id) %><%= movie.creator %><%= movie.publication_year %><%= link_to "Upvote", upvote_path(book.id), method: :post %> +
          +
          diff --git a/app/views/works/top_media.html.erb b/app/views/works/top_media.html.erb index 27f82f7f43..5eac5d83b6 100644 --- a/app/views/works/top_media.html.erb +++ b/app/views/works/top_media.html.erb @@ -1 +1,31 @@ -

          Top Media Page

          +

          Top Media

          +
          +

          + Media Spotlight +

          Link to work Title by creator

          +

          +

          + work description +

          +
          + +
          +
          +

          Top Movies

          +
            +
          • Movies with top votes go here
            • +
          +
          +
          +

          Top Books

          +
            +
          • Books with top votes go here
            • +
          +
          +
          +

          Top Albums

          +
            +
          • Albums with top votes go here
            • +
          +
          +
          From 6b2b2fb04f31f4dd45e4f210d5de144bb2564492 Mon Sep 17 00:00:00 2001 From: Maryam Shitu Date: Sun, 14 Oct 2018 16:24:53 -0700 Subject: [PATCH 17/23] styling --- app/assets/stylesheets/application.scss | 5 +++++ app/assets/stylesheets/users.scss | 5 ----- app/controllers/sessions_controller.rb | 1 - app/views/layouts/application.html.erb | 1 - app/views/works/show.html.erb | 25 ++++++++++++++----------- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 6f439f1d74..e13a084f0e 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -30,6 +30,11 @@ a, h2, h3 { color: #26A69A; } +p { + margin-top: 0; + margin-bottom: 1rem; +} + main { margin: 1rem; } diff --git a/app/assets/stylesheets/users.scss b/app/assets/stylesheets/users.scss index 3dd599e42f..31a2eacb84 100644 --- a/app/assets/stylesheets/users.scss +++ b/app/assets/stylesheets/users.scss @@ -1,8 +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/ - -p { - margin-top: 0; - margin-bottom: 1rem; -} diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index d5c9136f8a..b6f8974542 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -33,5 +33,4 @@ def destroy redirect_back fallback_location: root_path end - end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 727e48183f..740d014582 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -50,7 +50,6 @@ Welcome <%= @current_user.username %> <% end %> --> -
          diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index a52a66b27c..f2c6f3b12f 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -1,21 +1,24 @@ <% if @work.nil? %> -

          404 Not found

          +

          404 Not found

          <% else %> -

          <%=@work.title %>

          + +
          +

          <%=@work.title %>

          Creator: <%= @work.creator %>

          Published:<%= @work.publication_year %>

          Description: <%= @work.description %>

          -

          Category: <%= @work.category %>

          - + +
          - <%= link_to "Edit", edit_work_path(@work.id) %> -
          - <%= link_to "Delete #{@work.title}", work_path(@work.id), method: :delete %> -
          - <%= link_to "Upvote", upvote_path(@work.id), method: :post%> +
          + Back to media ranks + <%= link_to "Edit", edit_work_path(@work.id), class:"btn btn-primary" %> + <%= link_to "Upvote", upvote_path(@work.id), method: :post, class:"btn btn-primary" %> + <%= link_to "Delete #{@work.title}", work_path(@work.id), method: :delete, class:"btn btn-danger" %> +
          +
          <% end %> -
          -
          +

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

          From a30eea4a746e46ec654c47a1fe5b51d01a2f3167 Mon Sep 17 00:00:00 2001 From: Maryam Shitu Date: Sun, 14 Oct 2018 16:25:40 -0700 Subject: [PATCH 18/23] testing setup --- app/controllers/works_controller.rb | 8 ++++---- app/models/work.rb | 6 +++--- test/fixtures/votes.yml | 9 --------- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 7bf2ce924d..0079276b4d 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -2,11 +2,11 @@ class WorksController < ApplicationController before_action :find_work, only: [:show, :edit, :update, :upvote, :destroy] def index - @works = Work.all #.order(:votes) + @works = Work.all.order(:votes) - @albums = Work.albums - @books = Work.books - @movies = Work.movies + @albums = Work.albums.order(:votes) + @books = Work.books.order(:votes) + @movies = Work.movies.order(:votes) end def show; end diff --git a/app/models/work.rb b/app/models/work.rb index a2f68f2f8c..e8e72f66fb 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -9,15 +9,15 @@ class Work < ApplicationRecord has_many :users, through: :votes def self.albums - return Work.where(category: 'album') + where(category: 'album') end def self.books - return Work.where(category: 'book') + where(category: 'book') end def self.movies - return Work.where(category: 'movie') + where(category: 'movie') end def self.work_with_max_votes diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml index 34f008f08d..e69de29bb2 100644 --- a/test/fixtures/votes.yml +++ b/test/fixtures/votes.yml @@ -1,9 +0,0 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: - username: MyString - work: MyString - -two: - username: MyString - work: MyString From a7990a746bf1e706cc3124a9ed16f93c07ccc18d Mon Sep 17 00:00:00 2001 From: Maryam Shitu Date: Sun, 14 Oct 2018 17:19:54 -0700 Subject: [PATCH 19/23] testing model relationshipspassing --- app/controllers/works_controller.rb | 29 +++++++++++++---------------- app/models/work.rb | 4 ++++ test/fixtures/users.yml | 4 ++-- test/models/work_test.rb | 18 ++++++++++++++++++ 4 files changed, 37 insertions(+), 18 deletions(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 0079276b4d..1fea81eb35 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -2,11 +2,9 @@ class WorksController < ApplicationController before_action :find_work, only: [:show, :edit, :update, :upvote, :destroy] def index - @works = Work.all.order(:votes) - - @albums = Work.albums.order(:votes) - @books = Work.books.order(:votes) - @movies = Work.movies.order(:votes) + @albums = Work.albums.highest_rated + @books = Work.books.highest_rated + @movies = Work.movies.highest_rated end def show; end @@ -16,6 +14,7 @@ def new end def create + @work = Work.new(work_params) if @work.save @@ -24,7 +23,7 @@ def create else flash.now[:warning] = "Media not Added!" @work.errors.messages.each do |field, msg| - flash.now[field] = messages + flash.now[field] = msg end render :new @@ -52,19 +51,17 @@ def destroy end def upvote - vote = Vote.new(user_id: @current_user.id, work_id: @work.id) - - if vote.save - flash[:success] = "Vote successful." - redirect_back fallback_location: works_path - else - - flash[:warning] = "Unable to submit vote" - redirect_back fallback_location: works_path + if @work.upvote(@current_user) + flash[:success] = "Vote successful." + else + flash[:warning] = "Unable to submit vote" end + + redirect_back fallback_location: works_path end def top_media + @movies = Work.movies.highest_rated.limit(10) end private @@ -79,7 +76,7 @@ def find_work end def work_params - return params.require(:work).permit(:category, :movies, :title, :creator, :publication_year, :description) + params.require(:work).permit(:category, :movies, :title, :creator, :publication_year, :description) end end diff --git a/app/models/work.rb b/app/models/work.rb index e8e72f66fb..8d3c9ec0a2 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -44,4 +44,8 @@ def self.top_movies return top_movies end + def upvote(user) + Vote.create(user: user, work: self) + end + end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 952febd97d..3b4484fe9c 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -1,7 +1,7 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - username: MyString + username: fred two: - username: MyString + username: fdjskla diff --git a/test/models/work_test.rb b/test/models/work_test.rb index f5e8255181..b00d4a4f69 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -31,6 +31,24 @@ end describe 'Relationships' do + describe "#upvote" do + let(:work) { works(:breaker) } + let(:user) { users(:one) } + + it "should create a new vote" do + expect(work.votes.count).must_equal 0 + + work.upvote(user) + + expect(work.votes.count).must_equal 1 + end + + it "should associate a user with the work" do + expect(work.users.count).must_equal 0 + work.upvote(user) + expect(work.users.count).must_equal 1 + end + end end From 5c70f72e38d0e65af7474ddb53dca4257cf963ee Mon Sep 17 00:00:00 2001 From: Maryam Shitu Date: Sun, 14 Oct 2018 17:20:27 -0700 Subject: [PATCH 20/23] added top media for movies --- app/models/work.rb | 8 ++++---- app/views/works/_form.html.erb | 14 +++++++------- app/views/works/index.html.erb | 2 +- app/views/works/top_media.html.erb | 4 +++- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/app/models/work.rb b/app/models/work.rb index 8d3c9ec0a2..3a29a4b246 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -20,10 +20,10 @@ def self.movies where(category: 'movie') end - def self.work_with_max_votes - max_work = work - - return max_work + def self.highest_rated + left_outer_joins(:votes) + .group("works.id") + .order("count(works.id) DESC") end def self.top_albums diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb index 4d9ba213c7..87689dd2c8 100644 --- a/app/views/works/_form.html.erb +++ b/app/views/works/_form.html.erb @@ -11,9 +11,9 @@

          <%= action_name %>

          <%= form_with model: @work, class: "work-form", local: true do |f|%> -
          +
          - @@ -22,25 +22,25 @@
          - <% f.text_field :title %> + <%= f.text_field :title, class: "form-control" %>
          - <% f.text_field :creator %> + <%= f.text_field :creator, class: "form-control" %>
          - <% f.text_field :publication_year %> + <%= f.text_field :publication_year, class: "form-control" %>
          - <% f.text_area :description %> + <%= f.text_area :description, class: "form-control" %>
          - <%= f.submit button_title %> + <%= f.submit button_title, class: "btn btn-primary" %>
          <% end %> diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index fb06da88e0..eb762b9e2b 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -70,7 +70,7 @@ <%= link_to "#{movie.title}", work_path(movie.id) %> <%= movie.creator %> <%= movie.publication_year %> - <%= link_to "Upvote", upvote_path(book.id), method: :post %> + <%= link_to "Upvote", upvote_path(movie.id), method: :post %> <% end %> diff --git a/app/views/works/top_media.html.erb b/app/views/works/top_media.html.erb index 5eac5d83b6..63817ec953 100644 --- a/app/views/works/top_media.html.erb +++ b/app/views/works/top_media.html.erb @@ -13,7 +13,9 @@

          Top Movies

            -
          • Movies with top votes go here
            • + <% @movies.each do |movie| %> +
          • <%= link_to movie.title, work_path(movie)%>
            • + <% end %>
          From e633be01dd03c9e84ce7fbcab8f1f7601ef83cf2 Mon Sep 17 00:00:00 2001 From: Maryam Shitu Date: Sun, 14 Oct 2018 20:30:34 -0700 Subject: [PATCH 21/23] user model test passing --- app/controllers/works_controller.rb | 2 ++ app/models/vote.rb | 6 +++--- app/models/work.rb | 23 +++-------------------- app/views/works/show.html.erb | 22 ++++++++++++++++++++-- app/views/works/top_media.html.erb | 8 ++++++-- test/fixtures/works.yml | 7 +++++++ test/models/user_test.rb | 2 +- test/models/vote_test.rb | 15 ++++++++++++--- test/models/work_test.rb | 21 +++++++++++++++++---- 9 files changed, 71 insertions(+), 35 deletions(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 1fea81eb35..e7ec2f89c6 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -62,6 +62,8 @@ def upvote def top_media @movies = Work.movies.highest_rated.limit(10) + @albums = Work.albums.highest_rated.limit(10) + @books = Work.books.highest_rated.limit(10) end private diff --git a/app/models/vote.rb b/app/models/vote.rb index e521754b0c..482abb062e 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -1,6 +1,6 @@ class Vote < ApplicationRecord - belongs_to :user - belongs_to :work + belongs_to :user + belongs_to :work - validates :user_id, uniqueness: {scope: :work_id, message: "one vote!"} + validates :user_id, uniqueness: {scope: :work_id, message: "one vote!"} end diff --git a/app/models/work.rb b/app/models/work.rb index 3a29a4b246..8d348fc843 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -23,29 +23,12 @@ def self.movies def self.highest_rated left_outer_joins(:votes) .group("works.id") - .order("count(works.id) DESC") - end - - def self.top_albums - top_albums = [] - - return top_albums - end - - def self.top_books - top_albums = [] - - return top_books - end - - def self.top_movies - top_albums = [] - - return top_movies + .order(Arel.sql("count(votes.id) DESC")) end def upvote(user) - Vote.create(user: user, work: self) + #Vote.create(user: user, work: self) + votes.create(user: user) end end diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index f2c6f3b12f..73edeb5723 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -17,8 +17,26 @@ <%= link_to "Delete #{@work.title}", work_path(@work.id), method: :delete, class:"btn btn-danger" %>
          -
          <% end %> -

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

          + +
          +

          Votes

          + + + + + + + + + <% @work.votes.each do |vote| %> + + + + + <% end %> + +
          UserDate
          <%= link_to "#{vote.user.username}", user_path(vote.user) %><%= vote.created_at %>
          +
          diff --git a/app/views/works/top_media.html.erb b/app/views/works/top_media.html.erb index 63817ec953..db93302c68 100644 --- a/app/views/works/top_media.html.erb +++ b/app/views/works/top_media.html.erb @@ -21,13 +21,17 @@

          Top Books

            -
          • Books with top votes go here
            • + <% @books.each do |book| %> +
          • <%= link_to book.title, work_path(book)%>
            • + <% end %>

          Top Albums

            -
          • Albums with top votes go here
            • + <% @albums.each do |album| %> +
          • <%= link_to album.title, work_path(album)%>
            • + <% end %>
          diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index f95fea8217..70cedbbd58 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -13,3 +13,10 @@ treat: publication_year: 1968 description: Voluptatem adipisci qui velit. category: book + +ben: + title: Ben goes to school + creator: Bens Mom + publication_year: 1996 + description: Adipisci qui velit. + category: movie diff --git a/test/models/user_test.rb b/test/models/user_test.rb index cc862ac2d9..b9111f650c 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe User do - let(:user) { User.new } + let(:user) { users(:one)} it "must be valid" do value(user).must_be :valid? diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index fc15947bd3..c100a9f06e 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -1,9 +1,18 @@ require "test_helper" describe Vote do - let(:vote) { Vote.new } - it "must be valid" do - value(vote).must_be :valid? + describe "Validate" do + + it "only allow one vote per work for a user" do + user = users(:one) + work = works(:ben) + + expect(work.votes.count).must_equal 0 + work.upvote(user) + work.upvote(user) + + expect(work.votes.count).must_equal 1 + end end end diff --git a/test/models/work_test.rb b/test/models/work_test.rb index b00d4a4f69..7eab3fb7b0 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -3,10 +3,6 @@ describe Work do let(:work) { works(:treat) } - it "must be valid" do - value(work).must_be :valid? - end - describe 'Validations' do it 'is valid when all fields are present' do @@ -49,7 +45,24 @@ expect(work.users.count).must_equal 1 end end + end + + describe 'highest_rated' do + it "should return works in order of votes" do + work_1 = works(:ben) + work_2 = works(:breaker) + work_3 = works(:treat) + user_1 = users(:one) + user_2 = users(:two) + + work_1.upvote(user_1) + work_1.upvote(user_2) + + work_2.upvote(user_1) + + expect(Work.highest_rated).must_equal([work_1, work_2, work_3]) + end end end From 7af7e1768ee124e7c2c111bb172affbac417a793 Mon Sep 17 00:00:00 2001 From: Maryam Shitu Date: Mon, 15 Oct 2018 00:15:39 -0700 Subject: [PATCH 22/23] media styling done --- app/assets/stylesheets/application.scss | 42 +++++++++++++++++++++++-- app/controllers/works_controller.rb | 5 +-- app/models/work.rb | 2 +- app/views/layouts/application.html.erb | 4 --- app/views/users/index.html.erb | 2 +- app/views/users/show.html.erb | 4 +-- app/views/works/show.html.erb | 32 +++++++++---------- app/views/works/top_media.html.erb | 32 ++++++++++++++----- 8 files changed, 86 insertions(+), 37 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index e13a084f0e..bb8115a848 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -26,7 +26,7 @@ body, h1, h2, h3, h4, h5 { font-family: "Gudea", sans-serif; } -a, h2, h3 { +a, h2 { color: #26A69A; } @@ -36,9 +36,10 @@ p { } main { - margin: 1rem; + margin: 2rem; } + .app-header__header { max-width: 100%; background-color: #B2DFDB; @@ -76,6 +77,10 @@ main { margin-left: 2rem; } +td.btn.btn-primary a { + color: white; +} + .top-ten__header { color: #26A69A; border-bottom: 2px solid; @@ -98,3 +103,36 @@ main { border-top-left-radius: 0.25rem; border-top-right-radius: 0.25rem; } + +.spotlight__header--prefix { + color: #424242; +} + +.spotlight { + padding: 0 2rem 2rem 2rem; +} + +.spotlight__header { + color: #26A69A; +} + +.spotlight__description { + margin-bottom: 0; +} + +.spotlight__link-to { + border-bottom: 2px solid; +} + +.root__hr { + margin: 0px auto 3rem auto; + color: #EEEEEE; +} + +.top-ten__creator { + color: slategrey; +} + +#votes-header { + margin-top: 2rem; +} diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index e7ec2f89c6..3171357869 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -61,9 +61,10 @@ def upvote end def top_media + @works = Work.all.highest_rated @movies = Work.movies.highest_rated.limit(10) @albums = Work.albums.highest_rated.limit(10) - @books = Work.books.highest_rated.limit(10) + @books = Work.books.highest_rated.limit(10) end private @@ -78,7 +79,7 @@ def find_work end def work_params - params.require(:work).permit(:category, :movies, :title, :creator, :publication_year, :description) + params.require(:work).permit(:category, :title, :creator, :publication_year, :description) end end diff --git a/app/models/work.rb b/app/models/work.rb index 8d348fc843..00cd970ce2 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -3,7 +3,7 @@ class Work < ApplicationRecord validates :creator, presence: true, length: { in: 5..100 } validates_inclusion_of :category, in: %w(book album movie) validates :publication_year, presence: true - validates :description, presence: true, length: { in: 5..100 } + validates :description, presence: true has_many :votes has_many :users, through: :votes diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 740d014582..21edf88d7f 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -45,10 +45,6 @@ <% end %> <% end %> - -
        diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index b0d42e4bd3..0b6088960b 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -12,7 +12,7 @@ <%= link_to "#{user.username}", user_path(user.id) %> <%= user.votes.count %> - <%= user.created_at %> + <%= user.created_at.strftime("%b %d, %Y") %> <% end %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 6b8e03a648..7b0e227dfb 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -2,7 +2,7 @@

        404 Not found

        <% else %>

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

        -

        Joined site: <%= @user.created_at %>

        +

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

        Votes

        @@ -23,7 +23,7 @@ <%= vote.work.creator %> <%= vote.work.publication_year %> <%= vote.work.category %> - <%= vote.created_at %> + <%= vote.created_at.strftime("%b %d, %Y") %> <% end %> diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 73edeb5723..a296aaf432 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -2,27 +2,23 @@

        404 Not found

        <% else %> -
        -

        <%=@work.title %>

        -

        Creator: <%= @work.creator %>

        -

        Published:<%= @work.publication_year %>

        -

        Description: <%= @work.description %>

        - -
        - -
        - Back to media ranks - <%= link_to "Edit", edit_work_path(@work.id), class:"btn btn-primary" %> - <%= link_to "Upvote", upvote_path(@work.id), method: :post, class:"btn btn-primary" %> - <%= link_to "Delete #{@work.title}", work_path(@work.id), method: :delete, class:"btn btn-danger" %> -
        +
        +

        <%=@work.title %>

        +

        Creator: <%= @work.creator %>

        +

        Published:<%= @work.publication_year %>

        +

        Description: <%= @work.description %>

        +
        +
        + Back to media ranks + <%= link_to "Edit", edit_work_path(@work.id), class:"btn btn-primary" %> + <%= link_to "Upvote", upvote_path(@work.id), method: :post, class:"btn btn-primary" %> + <%= link_to "Delete #{@work.title}", work_path(@work.id), method: :delete, class:"btn btn-danger" %> +
        <% end %> -

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

        -
        -

        Votes

        +

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

        @@ -34,7 +30,7 @@ <% @work.votes.each do |vote| %> - + <% end %> diff --git a/app/views/works/top_media.html.erb b/app/views/works/top_media.html.erb index db93302c68..c9290377ba 100644 --- a/app/views/works/top_media.html.erb +++ b/app/views/works/top_media.html.erb @@ -1,36 +1,54 @@ -

        Top Media

        - Media Spotlight -

        Link to work Title by creator

        + Media Spotlight: + <%= link_to "#{@works.first.title}", work_path(@works.first)%>

        - work description + <%= @works.first.votes.count %> votes - <%= @works.first.description %>

        +
        +

        Top Movies

          <% @movies.each do |movie| %> -
        • <%= link_to movie.title, work_path(movie)%>
          • +
        • +

          <%= link_to movie.title, work_path(movie)%> + by <%= movie.creator %> +

          +

          <%= movie.votes.count %> votes

          +
          • <% end %>
        +

        Top Books

          <% @books.each do |book| %> -
        • <%= link_to book.title, work_path(book)%>
          • +
        • +

          <%= link_to book.title, work_path(book)%> + by <%= book.creator %> +

          +

          <%= book.votes.count %> votes

          +
          • <% end %>
        +

        Top Albums

          <% @albums.each do |album| %> -
        • <%= link_to album.title, work_path(album)%>
          • +
        • +

          <%= link_to album.title, work_path(album)%> + by <%= album.creator %> +

          +

          <%= album.votes.count %> votes

          +
          • <% end %>
        From f3a3ca43c581d45f0b3cce28d14d59d21b79cd78 Mon Sep 17 00:00:00 2001 From: Maryam Shitu Date: Mon, 15 Oct 2018 00:35:50 -0700 Subject: [PATCH 23/23] username validation test passing --- test/models/user_test.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/models/user_test.rb b/test/models/user_test.rb index b9111f650c..e42e3b4297 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -6,4 +6,14 @@ it "must be valid" do value(user).must_be :valid? end + + describe "Validations" do + it "must have a username" do + expect(user).must_respond_to :username + + new_user = User.new(username: nil) + assert_not new_user.valid? + end + + end end
        <%= link_to "#{vote.user.username}", user_path(vote.user) %><%= vote.created_at %><%= vote.created_at.strftime("%b %d, %Y") %>