From ab050764bc1da4bdad1ad9e1a06b5952c26be0ea Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Tue, 9 Oct 2018 15:50:38 -0700 Subject: [PATCH 01/18] set up new rails project --- .DS_Store | Bin 0 -> 6148 bytes .gitignore | 27 ++ .ruby-version | 1 + Gemfile | 81 +++++ Gemfile.lock | 277 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/.DS_Store | Bin 0 -> 6148 bytes 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 | 10 + tmp/.keep | 0 vendor/.keep | 0 82 files changed, 1392 insertions(+) create mode 100644 .DS_Store 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/.DS_Store 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/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..94a561308006d8b622a48f33d46ffc3c2eba056a GIT binary patch literal 6148 zcmeH~JqiLr422W55Nx)zoW=uqgF*BJUcf)B1O>65qx41vI)z6#m+=T zboDqbMLH3g!cApiVPJ~=SoU(0+xc`q9SKuI zy&YPzuBNuoXcx`lL-WmQQw&U_U9?~W)9S)N0wgdXFphm^=l=%&Y5pIya7zLt@Mi>c zvfi#&_^3Qv-#*XsyUg0U!J%G`@Nx;j#*X4S+zro*Eub~Eg(3svMZhsIkib_7JOS^e B5p4hf literal 0 HcmV?d00001 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..e8933351d9 --- /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.5 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/.DS_Store b/app/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..40049958de1ee017395153d827d0b24786b9f12d GIT binary patch literal 6148 zcmeHKJFWsT4733~A<4-ZW$e#hzg+>KFt-uXF6%~*G literal 0 HcmV?d00001 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..a052c5217c --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +45/2UuW8aQu0evhdm2Ca/AYXCFT8wldPeN4hY8FKE9xUCniJoy6tfa/RL35x8EB+PcrrZC6HMLaT0cnkznqwP0gx1WAkaCfMTrE/cZE3v/pYmkGJDwqaEw5MeaphFvSQHFcjmqAXjdtF19017lb/uRw58X9fYEdnJxofyMEtv58eYHpyPvY9eiz2jcmeU9FSIfstnOgzjBuVDQ+wd+86SctMhA7uqgR7yWEXvzXQoJ+IimlpNu9S5ikv5Nwa8+A4zF54z6aW5TuyPrW4lfKL8N1+k99aegsUa38MjGcGTvElpnjdL9Bzb3luW8ZLRlkNvzfRrbYJ/4KE/3HoKPkpPfkejqYQGO8nLPBw6MqOwgm7YO7vY9x3N5K7/jYILgEMpyhP7ucXi2hyjRqQe7seu2XEkHjYEZRG5W7S--xWI+mwEd3XDP/IHE--rgxOi1xUzV2kAmjukJSe5A== \ 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..3ab84e3d14 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,10 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +require 'rails/test_help' + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 0000000000..e69de29bb2 From a101ae571f4b174ab67e9da6537d6eb450047311 Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Tue, 9 Oct 2018 16:21:20 -0700 Subject: [PATCH 02/18] created work model and seeded database --- app/assets/javascripts/works.js | 2 + app/assets/stylesheets/works.scss | 3 + app/controllers/works_controller.rb | 57 +++++++++++++++++++ app/helpers/works_helper.rb | 2 + app/models/work.rb | 8 +++ app/views/works/edit.html.erb | 2 + app/views/works/index.html.erb | 2 + app/views/works/new.html.erb | 2 + app/views/works/show.html.erb | 2 + config/routes.rb | 2 +- db/migrate/20181009231134_create_works.rb | 13 +++++ ...20181009231757_change_column_work_model.rb | 5 ++ db/schema.rb | 28 +++++++++ db/seeds.rb | 33 ++++++++--- test/controllers/works_controller_test.rb | 24 ++++++++ test/fixtures/works.yml | 15 +++++ test/models/work_test.rb | 9 +++ 17 files changed, 201 insertions(+), 8 deletions(-) create mode 100644 app/assets/javascripts/works.js create mode 100644 app/assets/stylesheets/works.scss create mode 100644 app/controllers/works_controller.rb create mode 100644 app/helpers/works_helper.rb create mode 100644 app/models/work.rb create mode 100644 app/views/works/edit.html.erb create mode 100644 app/views/works/index.html.erb create mode 100644 app/views/works/new.html.erb create mode 100644 app/views/works/show.html.erb create mode 100644 db/migrate/20181009231134_create_works.rb create mode 100644 db/migrate/20181009231757_change_column_work_model.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..c08a56dbba --- /dev/null +++ b/app/controllers/works_controller.rb @@ -0,0 +1,57 @@ +class WorksController < ApplicationController + def main + @works = Work.all + end + + def show + @work = Work.find_by(id: params[:id].to_i) + if @work.nil? + render :not_found, status: :not_found + end + end + + def index + @works = Work.all + end + + def new + @work = Work.new + end + + def create + @work = Work.new(work_params) + if @work.save + flash[:success] = 'Work added!' + redirect_to work_path(@work.id) + else + flash.now[:error] = 'Work not added' + render :new + end + end + + def edit + @work = Work.find_by(id: params[:id].to_i) + end + + def update + @work = Work.find_by(id: params[:id]) + @work.update(work_params) + if @work.save + redirect_to work_path + else + render :new + end + end + + def destroy + work = Work.find_by(id: params[:id].to_i) + work.destroy + redirect_to works_path + end + + private + + def work_params + return params.require(:work).permit(:title, :publication_year, :creator, :description, :category) + 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..a2e8df818f --- /dev/null +++ b/app/models/work.rb @@ -0,0 +1,8 @@ +class Work < ApplicationRecord + has_many :votes + + validates :title, uniqueness: true, length: {in: 5..25} + validates :publication_year, numericality: true, length: {is: 4} + validates :creator, presence: true + +end diff --git a/app/views/works/edit.html.erb b/app/views/works/edit.html.erb new file mode 100644 index 0000000000..b717b97f84 --- /dev/null +++ b/app/views/works/edit.html.erb @@ -0,0 +1,2 @@ +

Works#edit

+

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

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

Works#index

+

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

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

Works#new

+

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

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

Works#show

+

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

diff --git a/config/routes.rb b/config/routes.rb index 787824f888..55ff7ddb61 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,3 @@ 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/20181009231134_create_works.rb b/db/migrate/20181009231134_create_works.rb new file mode 100644 index 0000000000..f286cc56e5 --- /dev/null +++ b/db/migrate/20181009231134_create_works.rb @@ -0,0 +1,13 @@ +class CreateWorks < ActiveRecord::Migration[5.2] + def change + create_table :works do |t| + t.string :title + t.string :creator + t.integer :publication_year + t.string :caategory + t.string :description + + t.timestamps + end + end +end diff --git a/db/migrate/20181009231757_change_column_work_model.rb b/db/migrate/20181009231757_change_column_work_model.rb new file mode 100644 index 0000000000..eebd1753cd --- /dev/null +++ b/db/migrate/20181009231757_change_column_work_model.rb @@ -0,0 +1,5 @@ +class ChangeColumnWorkModel < ActiveRecord::Migration[5.2] + def change + rename_column :works, :caategory, :category + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000000..f7f4e7324c --- /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_231757) 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.integer "publication_year" + t.string "category" + t.string "description" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/db/seeds.rb b/db/seeds.rb index 1beea2accd..26dbb43d4d 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,7 +1,26 @@ -# 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) +require 'csv' + +MEDIA_FILE = Rails.root.join('db', 'media_seeds.csv') +puts "Loading raw media data from #{MEDIA_FILE}" + +media_failures = [] +CSV.foreach(MEDIA_FILE, :headers => true) do |row| + work = Work.new + work.category = row['category'] + work.title = row['title'] + work.creator = row['creator'] + work.publication_year = row['publication_year'] + work.description = row['description'] + successful = work.save + if !successful + media_failures << work + puts "Failed to save work: #{work.inspect}" + else + puts "Created work: #{work.inspect}" + end +end + +puts "Added #{Work.count} work records" +puts "#{media_failures.length} works failed to save" + +puts "done" diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb new file mode 100644 index 0000000000..91f2942d44 --- /dev/null +++ b/test/controllers/works_controller_test.rb @@ -0,0 +1,24 @@ +require "test_helper" + +describe WorksController do + it "should get new" do + get works_new_url + value(response).must_be :success? + end + + it "should get show" do + get works_show_url + value(response).must_be :success? + end + + it "should get edit" do + get works_edit_url + value(response).must_be :success? + end + + it "should get index" do + get works_index_url + value(response).must_be :success? + end + +end diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml new file mode 100644 index 0000000000..db6da7ec59 --- /dev/null +++ b/test/fixtures/works.yml @@ -0,0 +1,15 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + creator: MyString + publication_year: 1 + caategory: MyString + description: MyString + +two: + title: MyString + creator: MyString + publication_year: 1 + caategory: MyString + description: MyString diff --git a/test/models/work_test.rb b/test/models/work_test.rb new file mode 100644 index 0000000000..f6fba7104d --- /dev/null +++ b/test/models/work_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Work do + let(:work) { Work.new } + + it "must be valid" do + value(work).must_be :valid? + end +end From 889fa78277c506c42ac35aaf60c745c84b97cf57 Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Tue, 9 Oct 2018 17:01:15 -0700 Subject: [PATCH 03/18] added validations/flash errors for adding new work --- app/controllers/works_controller.rb | 94 ++++++++++++++------------ app/models/work.rb | 4 +- app/views/application/_form.html.erb | 20 ++++++ app/views/layouts/application.html.erb | 23 +++++++ app/views/sessions/new.html.erb | 6 ++ app/views/works/edit.html.erb | 5 +- app/views/works/index.html.erb | 28 +++++++- app/views/works/main.html.erb | 11 +++ app/views/works/new.html.erb | 5 +- app/views/works/show.html.erb | 16 ++++- config/initializers/action_view.rb | 1 + config/routes.rb | 2 + 12 files changed, 161 insertions(+), 54 deletions(-) create mode 100644 app/views/application/_form.html.erb create mode 100644 app/views/sessions/new.html.erb create mode 100644 app/views/works/main.html.erb create mode 100644 config/initializers/action_view.rb diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index c08a56dbba..1d8babe628 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,57 +1,61 @@ class WorksController < ApplicationController def main - @works = Work.all - end - - def show - @work = Work.find_by(id: params[:id].to_i) - if @work.nil? - render :not_found, status: :not_found + @works = Work.all + end + + def show + @work = Work.find_by(id: params[:id].to_i) + if @work.nil? + render :not_found, status: :not_found + end + end + + def index + @works = Work.all + end + + def new + @work = Work.new + end + + def create + @work = Work.new(work_params) + if @work.save + flash[:success] = 'Work added!' + redirect_to work_path(@work.id) + else + flash.now[:error] = 'Work not added' + @work.errors.messages.each do |field, messages| + flash.now[field] = messages end + render :new end - def index - @works = Work.all - end - - def new - @work = Work.new - end - - def create - @work = Work.new(work_params) - if @work.save - flash[:success] = 'Work added!' - redirect_to work_path(@work.id) - else - flash.now[:error] = 'Work not added' - render :new - end - end + end - def edit - @work = Work.find_by(id: params[:id].to_i) - end + def edit + @work = Work.find_by(id: params[:id].to_i) + end - def update - @work = Work.find_by(id: params[:id]) - @work.update(work_params) - if @work.save - redirect_to work_path - else - render :new - end + def update + @work = Work.find_by(id: params[:id]) + @work.update(work_params) + if @work.save + redirect_to work_path + else + render :new end + end - def destroy - work = Work.find_by(id: params[:id].to_i) - work.destroy - redirect_to works_path - end + def destroy + work = Work.find_by(id: params[:id].to_i) + work.destroy + redirect_to works_path + end - private + private - def work_params - return params.require(:work).permit(:title, :publication_year, :creator, :description, :category) - end + def work_params + return params.require(:work).permit(:title, :publication_year, :creator, :description, :category) + end end diff --git a/app/models/work.rb b/app/models/work.rb index a2e8df818f..0dc662ec38 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,8 +1,10 @@ class Work < ApplicationRecord has_many :votes - validates :title, uniqueness: true, length: {in: 5..25} + validates :title, uniqueness: {scope: :category} validates :publication_year, numericality: true, length: {is: 4} validates :creator, presence: true + + end diff --git a/app/views/application/_form.html.erb b/app/views/application/_form.html.erb new file mode 100644 index 0000000000..5caf34057f --- /dev/null +++ b/app/views/application/_form.html.erb @@ -0,0 +1,20 @@ +<%= form_with model: @work, method: method do |f|%> +

<%= action_name %>

+ <%= f.label :category, "Category"%> + <%= f.select :category, ['movie', 'album','book']%> +
+ <%= f.label :title , "Title"%> + <%= f.text_field :title%> +
+ <%= f.label :creator , "Creator"%> + <%= f.text_field :creator%> +
+ <%= f.label :publication_year , "Published"%> + <%= f.text_field :publication_year%> + + <%= f.label :description, "Description"%> + <%= f.text_field :description %> +
+ + <%= f.submit %> +<%end%> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f32268a271..e6a1050285 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,6 +10,29 @@ +
+
+ <%flash.each do |name, message|%> + <% if message.class == Array %> + <%message.each do |msg|%> +
+ <%= "#{name}:" %> <%= " #{msg}"%>
+ <%end%> + <%else%> +
+ <%=message %> +
+ <%end%> + <%end%> +
+

<%= link_to "Media Ranker", root_path %>

+ +
<%= yield %> diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb new file mode 100644 index 0000000000..ea6dd2b495 --- /dev/null +++ b/app/views/sessions/new.html.erb @@ -0,0 +1,6 @@ +

Please log in.

+<%= form_with model: @user, url: login_path, method: :post do |f| %> +<%= f.label :name, 'Username'%> +<%=f.text_field :name, placeholder: 'Username'%> +<%= f.submit 'Login' %> +<%end%> diff --git a/app/views/works/edit.html.erb b/app/views/works/edit.html.erb index b717b97f84..a4dff06cb1 100644 --- a/app/views/works/edit.html.erb +++ b/app/views/works/edit.html.erb @@ -1,2 +1,3 @@ -

Works#edit

-

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

+ +<%= render partial: "form", + locals: { method: :patch, action_name: 'Edit Work'} %> diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index e519642270..f50a015b32 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1,2 +1,26 @@ -

Works#index

-

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

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

<%=category%>s

+ + + + + + + + + + <% @works.each do |work| %> + + <%if category == work.category%> + + + + + + <%end%> + <%end%> + +
VotesTitleCreated ByPublishedUpvote
VOTES<%=link_to work.title, work_path(work.id) %><%=work.creator%><%=work.publication_year%><%= link_to "Upvote", work_upvote_path(work.id) %>
+ + +<%end%> diff --git a/app/views/works/main.html.erb b/app/views/works/main.html.erb new file mode 100644 index 0000000000..266995c5e6 --- /dev/null +++ b/app/views/works/main.html.erb @@ -0,0 +1,11 @@ +<%categories = ['movie', 'book', 'album']%> +<%categories.each do |category|%> +

Top 10 <%=category%>s

+ <% @works.each do |work| %> + <%if category == work.category%> +

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

+ <%end%> + <%end%> +
+
+<% end %> diff --git a/app/views/works/new.html.erb b/app/views/works/new.html.erb index fad0dfea61..f9407e38b9 100644 --- a/app/views/works/new.html.erb +++ b/app/views/works/new.html.erb @@ -1,2 +1,3 @@ -

Works#new

-

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

+ +<%= render partial: "form", + locals: { method: :post, action_name: 'Add a new work'} %> diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index c096804302..a5a242fd94 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -1,2 +1,14 @@ -

Works#show

-

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

+<% if @work.nil? %> +

<%= "404: NOT FOUND" %>

+<% else %> +

<%= @work.title %>

+
    +
  • Created by: <%= @work.creator %>
    • +
  • Published: <%= @work.publication_year%>
    • +
  • <%= @work.description%>
    • +
+
    +
  • <%= link_to "Edit", edit_work_path(@work.id)%>
    • +
  • <%= link_to "Delete", work_path(@work.id), method: :delete, data: {confirm:"Are you sure you want to delete?"} %>
    • +
+<%end%> diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 0000000000..142d382f87 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/routes.rb b/config/routes.rb index 55ff7ddb61..1634566f1f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,5 @@ Rails.application.routes.draw do + root 'works#main' + get 'works/:id/votes', to: 'works#upvote', as: 'work_upvote' resources :works end From 6ede5642149a0b21a404fcf5b7dba3710276f4b4 Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Wed, 10 Oct 2018 15:30:30 -0700 Subject: [PATCH 04/18] fixed error messages, added tests for works model, added controler filter --- app/controllers/application_controller.rb | 14 ++++ app/controllers/works_controller.rb | 43 ++++++----- app/models/work.rb | 2 +- app/views/application/_form.html.erb | 3 +- app/views/application/notfound.html.erb | 1 + app/views/layouts/application.html.erb | 6 +- test/fixtures/works.yml | 31 +++++--- test/models/work_test.rb | 91 ++++++++++++++++++++++- 8 files changed, 153 insertions(+), 38 deletions(-) create mode 100644 app/views/application/notfound.html.erb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 09705d12ab..2f617c06d8 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,16 @@ class ApplicationController < ActionController::Base + # before_action :set_cache_headers + # #before_action :find_user + # + # private + # + # def find_user + # @current_user = User.find_by(id: session[:user_id]) + # end + # + # def set_cache_headers + # response.headers["Cache-Control"] = "no-cache, no-store" + # response.headers["Pragma"] = "no-cache" + # response.headers["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT" + # end end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 1d8babe628..6b54a7b48c 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,14 +1,11 @@ class WorksController < ApplicationController + before_action :find_work, only:[:show, :edit, :update, :destroy] + def main @works = Work.all end - def show - @work = Work.find_by(id: params[:id].to_i) - if @work.nil? - render :not_found, status: :not_found - end - end + def show; end def index @works = Work.all @@ -30,30 +27,36 @@ def create end render :new end - end - def edit - @work = Work.find_by(id: params[:id].to_i) - end + def edit; end def update - @work = Work.find_by(id: params[:id]) - @work.update(work_params) - if @work.save - redirect_to work_path - else - render :new - end + if @work && @work.update(work_params) + redirect_to work_path(@work.id) + elsif @work + render :edit end +end + def destroy - work = Work.find_by(id: params[:id].to_i) - work.destroy - redirect_to works_path + unless @work.nil? + @work.destroy + flash[:success] = "#{@work.title} deleted" + redirect_to root_path + end end private + def find_work + @work= Work.find_by(id: params[:id].to_i) + + if @work.nil? + flash.now[:warning] = 'Cannot find work' + render :notfound + end + end def work_params return params.require(:work).permit(:title, :publication_year, :creator, :description, :category) diff --git a/app/models/work.rb b/app/models/work.rb index 0dc662ec38..5bf57ec388 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,5 +1,5 @@ class Work < ApplicationRecord - has_many :votes +# has_many :votes validates :title, uniqueness: {scope: :category} validates :publication_year, numericality: true, length: {is: 4} diff --git a/app/views/application/_form.html.erb b/app/views/application/_form.html.erb index 5caf34057f..d1298c5784 100644 --- a/app/views/application/_form.html.erb +++ b/app/views/application/_form.html.erb @@ -1,4 +1,5 @@ -<%= form_with model: @work, method: method do |f|%> + +<%= form_with model: @work, method: method, local: true do |f|%>

<%= action_name %>

<%= f.label :category, "Category"%> <%= f.select :category, ['movie', 'album','book']%> diff --git a/app/views/application/notfound.html.erb b/app/views/application/notfound.html.erb new file mode 100644 index 0000000000..e3bf31464a --- /dev/null +++ b/app/views/application/notfound.html.erb @@ -0,0 +1 @@ +Not Found diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index e6a1050285..0584c383b8 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -11,15 +11,15 @@
-
+
<%flash.each do |name, message|%> <% if message.class == Array %> <%message.each do |msg|%> -
+
<%= "#{name}:" %> <%= " #{msg}"%>
<%end%> <%else%> -
+
<%=message %>
<%end%> diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index db6da7ec59..4e9f34a233 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -1,15 +1,22 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - title: MyString - creator: MyString - publication_year: 1 - caategory: MyString - description: MyString +harrypotter: + title: Harry Potter + creator: JK Rowling + publication_year: 1990 + category: movie + description: magical movie -two: - title: MyString - creator: MyString - publication_year: 1 - caategory: MyString - description: MyString +poodrbook: + title: Practical OOD in Ruby + creator: metz + publication_year: 2014 + category: book + description: Not Poopr + +poodrmovie: + title: Practical OOD in Ruby + creator: metz + publication_year: 2014 + category: movie + description: Not Poopr diff --git a/test/models/work_test.rb b/test/models/work_test.rb index f6fba7104d..5d0fc9136c 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -1,9 +1,98 @@ require "test_helper" describe Work do - let(:work) { Work.new } + let(:work) {:harrypotter } it "must be valid" do value(work).must_be :valid? end + + it 'has required fields' do + fields = [:title, :publication_year, :creator] + + fields.each do |field| + expect(work).must_respond_to field + end + end + + describe 'Relationships' do + it 'belongs to a user' do + # Arrange (done with let) + + # Act + user = work.user + + # Assert + expect(user).must_be_instance_of User + expect(user.id).must_equal work.user_id + end + + it 'can have many votes' do + # Arrange, did with let + + # Act + work.votes << Vote.first + votes = work.votes + + + # Assert + expect(votes.length).must_be :>=, 1 + votes.each do |vote| + expect(vote).must_be_instance_of Vote + end + end + end + + describe 'validations' do + it 'must have a title' do + # Arrange + work = works(:harrypotter) + work.title = nil + + # Act + #valid = book.valid? + valid = book.save + + # Assert + expect(valid).must_equal false + expect(work.errors.messages).must_include :title + expect(work.errors.messages[:title]).must_equal ["can't be blank"] + end + + it 'must have a publication_year with a 4 integers' do + work.publication_year = 0 + 2.times do + # Arrange + work.publication_year += 999 + + # Act + valid = work.valid? + + # Assert + expect(valid).must_equal false + expect(work.errors.messages).must_include :publication_year + end + + work.publication_year += 100 + valid = book.valid? + expect(valid).must_equal true + end + + it 'requires a unique title and category' do + #other_book = book.clone + poodr = works(:poodrbook) + + + valid = poodr.valid? + + expect(valid).must_equal true + + poodr.category = 'movie' + valid = poodr.valid? + expect(valid).must_equal false + expect(poodr.errors.messages).must_include :title + end + end + + end From 7e7e667082a1a0363d9de457c56da63ac12b86ee Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Wed, 10 Oct 2018 18:04:57 -0700 Subject: [PATCH 05/18] passed all tests wave 1 --- app/models/work.rb | 2 +- test/fixtures/works.yml | 2 ++ test/models/work_test.rb | 67 ++++++++++++++++++++-------------------- test/test_helper.rb | 8 +++++ 4 files changed, 45 insertions(+), 34 deletions(-) diff --git a/app/models/work.rb b/app/models/work.rb index 5bf57ec388..08bea72d76 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,7 +1,7 @@ class Work < ApplicationRecord # has_many :votes - validates :title, uniqueness: {scope: :category} + validates :title, presence: true, uniqueness: {scope: :category} validates :publication_year, numericality: true, length: {is: 4} validates :creator, presence: true diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index 4e9f34a233..fb2d30d2a3 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -7,6 +7,8 @@ harrypotter: category: movie description: magical movie + + poodrbook: title: Practical OOD in Ruby creator: metz diff --git a/test/models/work_test.rb b/test/models/work_test.rb index 5d0fc9136c..131687b0e2 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe Work do - let(:work) {:harrypotter } + let(:work) { Work.new(title: ' Talking Rain', publication_year:1990, creator: 'tangering') } it "must be valid" do value(work).must_be :valid? @@ -15,43 +15,45 @@ end end - describe 'Relationships' do - it 'belongs to a user' do - # Arrange (done with let) - - # Act - user = work.user - - # Assert - expect(user).must_be_instance_of User - expect(user.id).must_equal work.user_id - end - - it 'can have many votes' do - # Arrange, did with let - - # Act - work.votes << Vote.first - votes = work.votes - - - # Assert - expect(votes.length).must_be :>=, 1 - votes.each do |vote| - expect(vote).must_be_instance_of Vote - end - end - end + # describe 'Relationships' do + # it 'belongs to a user' do + # # Arrange (done with let) + # + # # Act + # user = work.user + # + # # Assert + # expect(user).must_be_instance_of User + # expect(user.id).must_equal work.user_id + # end + # + # it 'can have many votes' do + # # Arrange, did with let + # + # # Act + # work.votes << Vote.first + # votes = work.votes + # + # + # # Assert + # expect(votes.length).must_be :>=, 1 + # votes.each do |vote| + # expect(vote).must_be_instance_of Vote + # end + # end + # end describe 'validations' do it 'must have a title' do # Arrange work = works(:harrypotter) work.title = nil + work.save + # Act - #valid = book.valid? - valid = book.save + valid = work.valid? + # Assert expect(valid).must_equal false @@ -61,7 +63,6 @@ it 'must have a publication_year with a 4 integers' do work.publication_year = 0 - 2.times do # Arrange work.publication_year += 999 @@ -71,10 +72,10 @@ # Assert expect(valid).must_equal false expect(work.errors.messages).must_include :publication_year - end + work.publication_year += 100 - valid = book.valid? + valid = work.valid? expect(valid).must_equal true end diff --git a/test/test_helper.rb b/test/test_helper.rb index 3ab84e3d14..659bef2d54 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,6 +1,14 @@ ENV['RAILS_ENV'] ||= 'test' require_relative '../config/environment' require 'rails/test_help' +require "minitest/rails" +require "minitest/reporters" + +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) class ActiveSupport::TestCase # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. From 2b6268161255e79f42ab1cc3e64108d2da0c0ccb Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Wed, 10 Oct 2018 18:33:30 -0700 Subject: [PATCH 06/18] added user/votes models and added references to works --- app/models/user.rb | 4 ++++ app/models/vote.rb | 4 ++++ app/models/work.rb | 2 +- db/migrate/20181011012823_create_users.rb | 9 +++++++++ db/migrate/20181011013002_create_votes.rb | 8 ++++++++ ...1011013240_add_references_to_work_model.rb | 6 ++++++ db/schema.rb | 19 ++++++++++++++++++- test/fixtures/users.yml | 7 +++++++ test/fixtures/votes.yml | 11 +++++++++++ test/models/user_test.rb | 9 +++++++++ test/models/vote_test.rb | 9 +++++++++ 11 files changed, 86 insertions(+), 2 deletions(-) create mode 100644 app/models/user.rb create mode 100644 app/models/vote.rb create mode 100644 db/migrate/20181011012823_create_users.rb create mode 100644 db/migrate/20181011013002_create_votes.rb create mode 100644 db/migrate/20181011013240_add_references_to_work_model.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/models/user.rb b/app/models/user.rb new file mode 100644 index 0000000000..5b6a2b944f --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,4 @@ +class User < ApplicationRecord + has_many :works + has_many :votes +end diff --git a/app/models/vote.rb b/app/models/vote.rb new file mode 100644 index 0000000000..02a6df4eba --- /dev/null +++ b/app/models/vote.rb @@ -0,0 +1,4 @@ +class Vote < ApplicationRecord + belongs_to :users + belongs_to :works +end diff --git a/app/models/work.rb b/app/models/work.rb index 08bea72d76..c4d2e262bb 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,5 +1,5 @@ class Work < ApplicationRecord -# has_many :votes + has_many :votes validates :title, presence: true, uniqueness: {scope: :category} validates :publication_year, numericality: true, length: {is: 4} diff --git a/db/migrate/20181011012823_create_users.rb b/db/migrate/20181011012823_create_users.rb new file mode 100644 index 0000000000..9c711e759b --- /dev/null +++ b/db/migrate/20181011012823_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/20181011013002_create_votes.rb b/db/migrate/20181011013002_create_votes.rb new file mode 100644 index 0000000000..aa134a1296 --- /dev/null +++ b/db/migrate/20181011013002_create_votes.rb @@ -0,0 +1,8 @@ +class CreateVotes < ActiveRecord::Migration[5.2] + def change + create_table :votes do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20181011013240_add_references_to_work_model.rb b/db/migrate/20181011013240_add_references_to_work_model.rb new file mode 100644 index 0000000000..18b5e2dd02 --- /dev/null +++ b/db/migrate/20181011013240_add_references_to_work_model.rb @@ -0,0 +1,6 @@ +class AddReferencesToWorkModel < ActiveRecord::Migration[5.2] + def change + add_reference :works, :user, foreign_key:true + add_reference :works, :vote, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index f7f4e7324c..44f413f3c6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,11 +10,22 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_10_09_231757) do +ActiveRecord::Schema.define(version: 2018_10_11_013240) 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.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" @@ -23,6 +34,12 @@ t.string "description" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.bigint "user_id" + t.bigint "vote_id" + t.index ["user_id"], name: "index_works_on_user_id" + t.index ["vote_id"], name: "index_works_on_vote_id" end + add_foreign_key "works", "users" + add_foreign_key "works", "votes" 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..dc3ee79b5d --- /dev/null +++ b/test/fixtures/votes.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/models/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 8572bdf39affabfa4633dba57aa2fb881b92c642 Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Thu, 11 Oct 2018 22:16:22 -0700 Subject: [PATCH 07/18] added votes controller, sessions controller, users controller, fixed table relationshps --- app/assets/javascripts/sessions.js | 2 + app/assets/javascripts/users.js | 2 + app/assets/javascripts/votes.js | 2 + app/assets/stylesheets/sessions.scss | 3 ++ app/assets/stylesheets/users.scss | 3 ++ app/assets/stylesheets/votes.scss | 3 ++ app/controllers/sessions_controller.rb | 24 +++++++++ app/controllers/users_controller.rb | 50 +++++++++++++++++++ app/controllers/votes_controller.rb | 32 ++++++++++++ app/helpers/sessions_helper.rb | 2 + app/helpers/users_helper.rb | 2 + app/helpers/votes_helper.rb | 2 + app/models/user.rb | 1 + app/models/vote.rb | 4 +- app/models/work.rb | 1 + app/views/layouts/application.html.erb | 12 +++++ app/views/sessions/destroy.html.erb | 0 app/views/sessions/login.html.erb | 7 +++ app/views/users/edit.html.erb | 2 + app/views/users/index.html.erb | 2 + app/views/users/new.html.erb | 2 + app/views/users/show.html.erb | 2 + config/routes.rb | 6 +++ .../20181011215500_add_references_to_votes.rb | 6 +++ db/migrate/20181011223629_remove_reference.rb | 5 ++ ...3817_add_votes_reference_to_works_model.rb | 5 ++ ...1224430_remove_work_id_from_votes_model.rb | 5 ++ ...10_add_user_and_work_references_to_vote.rb | 6 +++ db/schema.rb | 11 ++-- test/controllers/sessions_controller_test.rb | 7 +++ test/controllers/users_controller_test.rb | 24 +++++++++ test/controllers/votes_controller_test.rb | 7 +++ test/models/vote_test.rb | 2 +- 33 files changed, 237 insertions(+), 7 deletions(-) create mode 100644 app/assets/javascripts/sessions.js create mode 100644 app/assets/javascripts/users.js create mode 100644 app/assets/javascripts/votes.js create mode 100644 app/assets/stylesheets/sessions.scss create mode 100644 app/assets/stylesheets/users.scss create mode 100644 app/assets/stylesheets/votes.scss create mode 100644 app/controllers/sessions_controller.rb create mode 100644 app/controllers/users_controller.rb create mode 100644 app/controllers/votes_controller.rb create mode 100644 app/helpers/sessions_helper.rb create mode 100644 app/helpers/users_helper.rb create mode 100644 app/helpers/votes_helper.rb create mode 100644 app/views/sessions/destroy.html.erb create mode 100644 app/views/sessions/login.html.erb create mode 100644 app/views/users/edit.html.erb create mode 100644 app/views/users/index.html.erb create mode 100644 app/views/users/new.html.erb create mode 100644 app/views/users/show.html.erb create mode 100644 db/migrate/20181011215500_add_references_to_votes.rb create mode 100644 db/migrate/20181011223629_remove_reference.rb create mode 100644 db/migrate/20181011223817_add_votes_reference_to_works_model.rb create mode 100644 db/migrate/20181011224430_remove_work_id_from_votes_model.rb create mode 100644 db/migrate/20181012034910_add_user_and_work_references_to_vote.rb create mode 100644 test/controllers/sessions_controller_test.rb create mode 100644 test/controllers/users_controller_test.rb create mode 100644 test/controllers/votes_controller_test.rb diff --git a/app/assets/javascripts/sessions.js b/app/assets/javascripts/sessions.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/sessions.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/javascripts/users.js b/app/assets/javascripts/users.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/users.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/javascripts/votes.js b/app/assets/javascripts/votes.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/votes.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/sessions.scss b/app/assets/stylesheets/sessions.scss new file mode 100644 index 0000000000..ccb1ed25b2 --- /dev/null +++ b/app/assets/stylesheets/sessions.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Sessions controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/users.scss b/app/assets/stylesheets/users.scss new file mode 100644 index 0000000000..31a2eacb84 --- /dev/null +++ b/app/assets/stylesheets/users.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Users controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/votes.scss b/app/assets/stylesheets/votes.scss new file mode 100644 index 0000000000..9a6720f80e --- /dev/null +++ b/app/assets/stylesheets/votes.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Votes controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb new file mode 100644 index 0000000000..ec3e3e531f --- /dev/null +++ b/app/controllers/sessions_controller.rb @@ -0,0 +1,24 @@ +class SessionsController < ApplicationController + def login + user = User.find_by(username: params[:user][:username]) + + if user.nil? + # Create a new author + 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 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/users_controller.rb b/app/controllers/users_controller.rb new file mode 100644 index 0000000000..e3b03bf98a --- /dev/null +++ b/app/controllers/users_controller.rb @@ -0,0 +1,50 @@ +class UsersController < ApplicationController + def show + @user = User.find_by(id: params[:id].to_i) + if id == nil + render :not_found, status: :not_found + end + end + + def index + @users = User.all + end + + def new + @user = User.new + end + + def create + @user = User.new(user_params) + if @user.save + redirect_to user_path + else + render :new + end + end + + def edit + @user = User.find_by(id: params[:id].to_i) + end + + def update + @user = User.find_by(id:params[:id]) + @user.update(user_params) + if @user.save + redirect_to user_path + else + render :new + end + end + + def destroy + user = User.find_by(id: params[:id].to_i) + user.destroy + redirect_to users_path + end + + private + def user_params + return params.require(:user).permit(:username) + end +end diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb new file mode 100644 index 0000000000..4dcbffde29 --- /dev/null +++ b/app/controllers/votes_controller.rb @@ -0,0 +1,32 @@ +class VotesController < ApplicationController + def new + @vote = Vote.new + end + + def index + @votes = Vote.all + end + + def create + @vote = Vote.new + if @vote.save + flash[:success] = 'Vote added!' + redirect_to work_path(@work.id) + else + flash.now[:error] = 'Work not added' + @vote.errors.messages.each do |field, messages| + flash.now[field] = messages + end + render :new + end + end + + def destroy + unless @vote.nil? + @vote.destroy + flash[:success] = "Vote deleted" + redirect_to root_path + end + end + +end diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb new file mode 100644 index 0000000000..309f8b2eb3 --- /dev/null +++ b/app/helpers/sessions_helper.rb @@ -0,0 +1,2 @@ +module SessionsHelper +end diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb new file mode 100644 index 0000000000..2310a240d7 --- /dev/null +++ b/app/helpers/users_helper.rb @@ -0,0 +1,2 @@ +module UsersHelper +end diff --git a/app/helpers/votes_helper.rb b/app/helpers/votes_helper.rb new file mode 100644 index 0000000000..5a82eed07d --- /dev/null +++ b/app/helpers/votes_helper.rb @@ -0,0 +1,2 @@ +module VotesHelper +end diff --git a/app/models/user.rb b/app/models/user.rb index 5b6a2b944f..6679ec46c1 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,4 +1,5 @@ class User < ApplicationRecord has_many :works has_many :votes + has_many :works, through: :votes end diff --git a/app/models/vote.rb b/app/models/vote.rb index 02a6df4eba..b8b6f9f0aa 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -1,4 +1,4 @@ class Vote < ApplicationRecord - belongs_to :users - belongs_to :works + belongs_to :user + belongs_to :work end diff --git a/app/models/work.rb b/app/models/work.rb index c4d2e262bb..b284461202 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,5 +1,6 @@ class Work < ApplicationRecord has_many :votes + # has_many :users, through :votes validates :title, presence: true, uniqueness: {scope: :category} validates :publication_year, numericality: true, length: {is: 4} diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 0584c383b8..34eab09a18 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -24,12 +24,24 @@
<%end%> <%end%> + + <% if @current_user %> +

Welcome <%= @current_user.name %>

+ <% end %> +

<%= link_to "Media Ranker", root_path %>

diff --git a/app/views/sessions/destroy.html.erb b/app/views/sessions/destroy.html.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/sessions/login.html.erb b/app/views/sessions/login.html.erb new file mode 100644 index 0000000000..1234e7c470 --- /dev/null +++ b/app/views/sessions/login.html.erb @@ -0,0 +1,7 @@ +

Please Log in

+ +<%= form_with model: @user, url: login_path, method: :post do |f| %> + <%= f.label :username, 'Username' %> + <%= f.text_field :username, placeholder: 'Username' %> + <%= f.submit 'Login' %> +<% end %> diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb new file mode 100644 index 0000000000..1881fbdba0 --- /dev/null +++ b/app/views/users/edit.html.erb @@ -0,0 +1,2 @@ +

Users#edit

+

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

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

Users#index

+

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

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

Users#new

+

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

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

Users#show

+

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

diff --git a/config/routes.rb b/config/routes.rb index 1634566f1f..da149b3621 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,11 @@ Rails.application.routes.draw do + root 'works#main' get 'works/:id/votes', to: 'works#upvote', as: 'work_upvote' + post 'sessions/login', to: 'sessions#login', as: 'login' + get 'sessions/login', to: 'sessions#new' + delete 'sessions/destroy', to: 'sessions#destroy', as: 'logout' + resources :works + resources :users end diff --git a/db/migrate/20181011215500_add_references_to_votes.rb b/db/migrate/20181011215500_add_references_to_votes.rb new file mode 100644 index 0000000000..8873179ea1 --- /dev/null +++ b/db/migrate/20181011215500_add_references_to_votes.rb @@ -0,0 +1,6 @@ +class AddReferencesToVotes < ActiveRecord::Migration[5.2] + def change + add_reference :votes, :user, foreign_key:true + add_reference :votes, :work, foreign_key: true + end +end diff --git a/db/migrate/20181011223629_remove_reference.rb b/db/migrate/20181011223629_remove_reference.rb new file mode 100644 index 0000000000..25b4b4ad55 --- /dev/null +++ b/db/migrate/20181011223629_remove_reference.rb @@ -0,0 +1,5 @@ +class RemoveReference < ActiveRecord::Migration[5.2] + def change + remove_reference(:works, :vote, foreign_key: true) + end +end diff --git a/db/migrate/20181011223817_add_votes_reference_to_works_model.rb b/db/migrate/20181011223817_add_votes_reference_to_works_model.rb new file mode 100644 index 0000000000..d7a3c685dc --- /dev/null +++ b/db/migrate/20181011223817_add_votes_reference_to_works_model.rb @@ -0,0 +1,5 @@ +class AddVotesReferenceToWorksModel < ActiveRecord::Migration[5.2] + def change + add_reference(:works, :votes, index: true, foreign_key: true) + end +end diff --git a/db/migrate/20181011224430_remove_work_id_from_votes_model.rb b/db/migrate/20181011224430_remove_work_id_from_votes_model.rb new file mode 100644 index 0000000000..c31e72500c --- /dev/null +++ b/db/migrate/20181011224430_remove_work_id_from_votes_model.rb @@ -0,0 +1,5 @@ +class RemoveWorkIdFromVotesModel < ActiveRecord::Migration[5.2] + def change + remove_reference(:votes, :work, foreign_key: true) + end +end diff --git a/db/migrate/20181012034910_add_user_and_work_references_to_vote.rb b/db/migrate/20181012034910_add_user_and_work_references_to_vote.rb new file mode 100644 index 0000000000..d2fd9f6a36 --- /dev/null +++ b/db/migrate/20181012034910_add_user_and_work_references_to_vote.rb @@ -0,0 +1,6 @@ +class AddUserAndWorkReferencesToVote < ActiveRecord::Migration[5.2] + def change + add_reference :votes, :work, foreign_key: true + remove_reference :works, :votes, index: true, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 44f413f3c6..7b13ff26e3 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_11_013240) do +ActiveRecord::Schema.define(version: 2018_10_12_034910) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -24,6 +24,10 @@ create_table "votes", force: :cascade do |t| 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| @@ -35,11 +39,10 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.bigint "user_id" - t.bigint "vote_id" t.index ["user_id"], name: "index_works_on_user_id" - t.index ["vote_id"], name: "index_works_on_vote_id" end + add_foreign_key "votes", "users" + add_foreign_key "votes", "works" add_foreign_key "works", "users" - add_foreign_key "works", "votes" end diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb new file mode 100644 index 0000000000..c2632a720b --- /dev/null +++ b/test/controllers/sessions_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe SessionsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb new file mode 100644 index 0000000000..e75bd7613b --- /dev/null +++ b/test/controllers/users_controller_test.rb @@ -0,0 +1,24 @@ +require "test_helper" + +describe UsersController do + it "should get show" do + get users_show_url + value(response).must_be :success? + end + + it "should get index" do + get users_index_url + value(response).must_be :success? + end + + it "should get edit" do + get users_edit_url + value(response).must_be :success? + end + + it "should get new" do + get users_new_url + value(response).must_be :success? + end + +end diff --git a/test/controllers/votes_controller_test.rb b/test/controllers/votes_controller_test.rb new file mode 100644 index 0000000000..cf4d03935f --- /dev/null +++ b/test/controllers/votes_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe VotesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index fc15947bd3..748df87df1 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -2,7 +2,7 @@ describe Vote do let(:vote) { Vote.new } - + let(:user) { User.new(username: 'Amanda')} it "must be valid" do value(vote).must_be :valid? end From 0a22eada12669fce60b8b36ad61470ff5272f78e Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Fri, 12 Oct 2018 16:16:29 -0700 Subject: [PATCH 08/18] added upvote and fixed user login --- app/controllers/application_controller.rb | 10 +++++----- app/controllers/sessions_controller.rb | 21 ++++++++++++++------- app/controllers/users_controller.rb | 6 +++--- app/controllers/votes_controller.rb | 17 ++++++++--------- app/controllers/works_controller.rb | 23 +++++++++++++++++++---- app/models/vote.rb | 3 +++ app/models/work.rb | 18 ++++++++++++++++++ app/views/application/_formlogin.html.erb | 7 +++++++ app/views/layouts/application.html.erb | 3 ++- app/views/sessions/new.html.erb | 8 ++------ app/views/users/edit.html.erb | 2 -- app/views/users/index.html.erb | 9 +++++++-- app/views/users/show.html.erb | 12 ++++++++++-- app/views/works/index.html.erb | 10 ++++------ app/views/works/show.html.erb | 6 ++++++ config/routes.rb | 4 +++- 16 files changed, 111 insertions(+), 48 deletions(-) create mode 100644 app/views/application/_formlogin.html.erb delete mode 100644 app/views/users/edit.html.erb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 2f617c06d8..7c7ab93ed1 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,12 +1,12 @@ class ApplicationController < ActionController::Base # before_action :set_cache_headers - # #before_action :find_user + before_action :find_user # - # private + private # - # def find_user - # @current_user = User.find_by(id: session[:user_id]) - # end + def find_user + @current_user = User.find_by(id: session[:user_id]) + end # # def set_cache_headers # response.headers["Cache-Control"] = "no-cache, no-store" diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index ec3e3e531f..aa4b5ffdb5 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -3,13 +3,20 @@ def login user = User.find_by(username: params[:user][:username]) if user.nil? - # Create a new author - user = User.create(username: params[:user][:username]) - end - - session[:user_id] = user.id - flash[:success] = "#{user.username} Successfully logged in!" - redirect_to root_path + user = User.new(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 was not successfully added" + redirect_to login_path + end + else + session[:user_id] = user.id + flash[:success] = "#{user.username} Successfully logged in!" + redirect_to root_path + end end def new diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index e3b03bf98a..95d744c580 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,9 +1,9 @@ class UsersController < ApplicationController def show @user = User.find_by(id: params[:id].to_i) - if id == nil - render :not_found, status: :not_found - end + # if id == nil + # render :not_found, status: :not_found + # end end def index diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index 4dcbffde29..0b5add49ec 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -8,16 +8,15 @@ def index end def create - @vote = Vote.new - if @vote.save - flash[:success] = 'Vote added!' - redirect_to work_path(@work.id) + @work = Work.find_by(id: params[:id]) + vote = Vote.new(user_id: @current_user.id, work_id: @work.id) + if @current_user.nil? + flash[:warning] = "You must be logged in to vote" + redirect_to root_path else - flash.now[:error] = 'Work not added' - @vote.errors.messages.each do |field, messages| - flash.now[field] = messages - end - render :new + upvote = Vote.new(user_id: @current_user.id, work_id: @work.id) + vote.save + flash[:message] = "Vote added to #{@work.title}" end end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 6b54a7b48c..2e324958ac 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, :destroy, :upvote] def main @works = Work.all @@ -48,10 +48,25 @@ def destroy end end - private - def find_work - @work= Work.find_by(id: params[:id].to_i) + def upvote + if @current_user.nil? + flash[:warning] = "You must be logged in to vote" + redirect_to root_path + else + @upvote = Vote.new(user_id: @current_user.id, work_id: @work.id) + if @upvote.save + flash[:message] = "Vote added to #{@work.title}" + else + flash[:warning] = "Could not vote for title" + redirect_to work_path + end + end + end +private + + def find_work + @work = Work.find_by(id:params[:id].to_i) if @work.nil? flash.now[:warning] = 'Cannot find work' render :notfound diff --git a/app/models/vote.rb b/app/models/vote.rb index b8b6f9f0aa..ff7308ea58 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -1,4 +1,7 @@ class Vote < ApplicationRecord belongs_to :user belongs_to :work + + validates :user_id, presence: true, uniqueness: { scope: :work, message: "You can only add one vote per work"} + # validates :work_id, presence: true end diff --git a/app/models/work.rb b/app/models/work.rb index b284461202..cd59b22686 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -5,6 +5,24 @@ class Work < ApplicationRecord validates :title, presence: true, uniqueness: {scope: :category} validates :publication_year, numericality: true, length: {is: 4} validates :creator, presence: true +CATEGORIES = ['movie', 'album', 'book'] + + def self.sort_by_category(category) + selected_works = [] + @works = Work.all + @works.each do |work| + if category == work.category + selected_works << work + end + end + return selected_works + end + + def self.sort_by_votes(category) + @works = self.sort_by_category(category) + #return top_10 = @works.sort_by{|work| work.votes}(10) + end + diff --git a/app/views/application/_formlogin.html.erb b/app/views/application/_formlogin.html.erb new file mode 100644 index 0000000000..97fa004931 --- /dev/null +++ b/app/views/application/_formlogin.html.erb @@ -0,0 +1,7 @@ +

Please Log in

+ +<%= form_with model: @user, url: login_path, method: method do |f| %> + <%= f.label :username, 'Username' %> + <%= f.text_field :username, placeholder: 'Username' %> + <%= f.submit action_button %> +<% end %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 34eab09a18..9a673c9afe 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -26,7 +26,7 @@ <%end%> <% if @current_user %> -

Welcome <%= @current_user.name %>

+

Welcome <%= @current_user.username %>

<% end %> @@ -35,6 +35,7 @@
  • <%= link_to "Add a New Work", "/works/new" %>
  • <%= link_to "View all Works", "/works" %>
    • +
  • <%= link_to "View all Users", "/users" %>
  • <% if @current_user %> <%= link_to "Log Out", logout_path, method: :delete, class: 'btn btn-primary' %> diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index ea6dd2b495..7432b4c7a3 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -1,6 +1,2 @@ -

    Please log in.

    -<%= form_with model: @user, url: login_path, method: :post do |f| %> -<%= f.label :name, 'Username'%> -<%=f.text_field :name, placeholder: 'Username'%> -<%= f.submit 'Login' %> -<%end%> + +<%= render partial: "formlogin", locals: {method: :post, action_button: 'Log in'} %> diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb deleted file mode 100644 index 1881fbdba0..0000000000 --- a/app/views/users/edit.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

    Users#edit

    -

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

    diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 51968c88d2..5a7193b5e0 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -1,2 +1,7 @@ -

    Users#index

    -

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

    + +

    Users List

    +<% @users.each do |user| %> +

    <%= link_to "#{user.username}", user_path(user.id) %> +

    + <%= link_to "Delete", user_path(user.id), method: :delete %> +<% end %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index e5fa3adf14..698dc4effe 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,2 +1,10 @@ -

    Users#show

    -

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

    +<% if @user.nil? %> +

    404 Not found

    +<% else %> +

    <%=@user.username %>

    +
      +
    • Number of upvotes: <%=@user.votes.length%> votes
      • +
    +
    + <%= link_to "Delete #{@user.username}", user_path(@user.id), method: :delete %> +<% end %> diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index f50a015b32..b8a1b11a76 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1,5 +1,5 @@ -<%['movie', 'book', 'album'].each do |category| %> -

    <%=category%>s

    + @@ -8,16 +8,14 @@ - +<%@works = Work.sort_by_category('movies')%> <% @works.each do |work| %> - <%if category == work.category%> - - <%end%> + <%end%>
    VotesPublished Upvote
    VOTES <%=link_to work.title, work_path(work.id) %> <%=work.creator%> <%=work.publication_year%><%= link_to "Upvote", work_upvote_path(work.id) %><%= link_to "Upvote", upvote_path(work.id), method: :post, class: "btn btn-primary" %>
    diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index a5a242fd94..2640769eff 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -6,6 +6,12 @@
  • Created by: <%= @work.creator %>
  • Published: <%= @work.publication_year%>
  • <%= @work.description%>
    • +
  • Votes:
      + <% @work.votes.each do |vote|%> +
    • <%= "#{vote.user.username}"%>
      • + <%end%> +
    +
  • <%= link_to "Edit", edit_work_path(@work.id)%>
    • diff --git a/config/routes.rb b/config/routes.rb index da149b3621..1393e5da23 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,9 @@ Rails.application.routes.draw do root 'works#main' - get 'works/:id/votes', to: 'works#upvote', as: 'work_upvote' + resources :users + resources :works + post 'works/:id/upvote', to: 'works#upvote', as: 'upvote' post 'sessions/login', to: 'sessions#login', as: 'login' get 'sessions/login', to: 'sessions#new' delete 'sessions/destroy', to: 'sessions#destroy', as: 'logout' From 09edabec9cfd89c86368096505b7f7540ce9959f Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Sat, 13 Oct 2018 16:41:34 -0700 Subject: [PATCH 09/18] updated views and controllers, for all show pages --- app/controllers/sessions_controller.rb | 4 +-- app/controllers/works_controller.rb | 5 +-- app/models/work.rb | 2 +- app/views/layouts/application.html.erb | 10 +++--- app/views/users/show.html.erb | 32 ++++++++++++++++--- app/views/works/index.html.erb | 30 ++++++++--------- app/views/works/main.html.erb | 8 ++++- app/views/works/show.html.erb | 1 + config/routes.rb | 2 -- db/migrate/20181012231726_add_date_to_vote.rb | 5 +++ .../20181012231851_remove_date_from_votes.rb | 5 +++ db/schema.rb | 2 +- 12 files changed, 71 insertions(+), 35 deletions(-) create mode 100644 db/migrate/20181012231726_add_date_to_vote.rb create mode 100644 db/migrate/20181012231851_remove_date_from_votes.rb diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index aa4b5ffdb5..e36c18f800 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -6,7 +6,7 @@ def login user = User.new(username: params[:user][:username]) if user.save session[:user_id] = user.id - flash[:success] = "#{user.username} Successfully logged in!" + flash[:success] = "Successfully created account and logged in as #{user.username}!" redirect_to root_path else flash[:warning] = "User was not successfully added" @@ -14,7 +14,7 @@ def login end else session[:user_id] = user.id - flash[:success] = "#{user.username} Successfully logged in!" + flash[:success] = "Successfully logged in as existing user #{user.username}!" redirect_to root_path end end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 2e324958ac..13ad60ded9 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -18,7 +18,7 @@ def new def create @work = Work.new(work_params) if @work.save - flash[:success] = 'Work added!' + flash[:success] = "Successfully created #{@work.category} #{@work.title}!" redirect_to work_path(@work.id) else flash.now[:error] = 'Work not added' @@ -56,8 +56,9 @@ def upvote @upvote = Vote.new(user_id: @current_user.id, work_id: @work.id) if @upvote.save flash[:message] = "Vote added to #{@work.title}" + redirect_to works_path else - flash[:warning] = "Could not vote for title" + flash[:warning] = "A problem occurred: #{@current_user.username.capitalize} has already voted for this work" redirect_to work_path end end diff --git a/app/models/work.rb b/app/models/work.rb index cd59b22686..fadd804cac 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -20,7 +20,7 @@ def self.sort_by_category(category) def self.sort_by_votes(category) @works = self.sort_by_category(category) - #return top_10 = @works.sort_by{|work| work.votes}(10) + return top_10 = @works.sort_by{|work| work.votes.count}.reverse! end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 9a673c9afe..2643fdd0f0 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -25,19 +25,17 @@ <%end%> <%end%> - <% if @current_user %> -

    Welcome <%= @current_user.username %>

    - <% end %> - -

    <%= link_to "Media Ranker", root_path %>

    +

    <%= link_to "Media Ranker", root_path %> | 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%> + +
    <%= yield %> diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 7dd8c0d096..dbeae1d344 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -21,8 +21,7 @@ <%=work.title%> <%=work.creator%> <%=work.publication_year%> - Upvote + Upvote <%end%> @@ -31,5 +30,5 @@ <%end%> View Top Media - Add a new work + Add a new work diff --git a/app/views/works/main.html.erb b/app/views/works/main.html.erb index b614e8403c..2ac400762f 100644 --- a/app/views/works/main.html.erb +++ b/app/views/works/main.html.erb @@ -1,8 +1,12 @@
    -

    Media Spotlight: +

    + + Media Spotlight + <% spotlight = @works.sample%> - <%=link_to spotlight.title, work_path(spotlight.id)%> by <%=spotlight.creator%>

    +     <%=spotlight.title%> + by <%=spotlight.creator%>

    <%=spotlight.votes.count%> votes - <%=spotlight.description%>

    diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 6c13d19305..5b2f370475 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -1,31 +1,43 @@ -<% if @work.nil? %> +
    + <% if @work.nil? %>

    <%= "404: NOT FOUND" %>

    -<% else %> -

    <%= @work.title %>

    -
      -
    • Created by: <%= @work.creator %>
      • -
    • Published: <%= @work.publication_year%>
      • -
    • <%= @work.description%>
      • -
    -
      -
    • <%= link_to "Back to Media Ranks", works_path, class: 'btn btn-primary'%>
      • -
    • <%= 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_path(@work.id), method: :delete, data: {confirm:"Are you sure you want to delete?"}, class: 'btn btn-primary' %>
      • -
    - -

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

    - - - - - - <%@work.votes.each do |vote| %> - <% user = User.find_by(id: vote.user_id.to_i)%> - - - - - <%end%> + <% else %> +
    +

    <%= @work.title %>

    +

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

    +

    Published: <%= @work.publication_year%>

    +

    <%= @work.description%>

    +
    + Back to Media Ranks + Edit + Upvote + Delete +
    +
    +
    +

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

    +
    UserDate
    <%=link_to user.username, user_path(user.id) %><%=vote.created_at%>
    + + + + + + + <%@work.votes.each do |vote| %> + <% user = User.find_by(id: vote.user_id.to_i)%> + + + + + + <%end%> + +
    UserDate
    + <%=user.username%> + <%=vote.created_at%>
    + + + <%end%> +
    From 6124babd5c70d2f4632aeea692b769075074108d Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Sun, 14 Oct 2018 22:06:37 -0700 Subject: [PATCH 15/18] updated work controller --- app/controllers/works_controller.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 0d0f8d587a..13ad60ded9 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -42,11 +42,6 @@ def update def destroy unless @work.nil? - # if @work.votes.count > 0 - # @work.votes do |vote| - # vote.destroy - # end - # end @work.destroy flash[:success] = "#{@work.title} deleted" redirect_to root_path From df4bf36afd096f23fc47511ada9b1b99774bf19f Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Sun, 14 Oct 2018 22:11:21 -0700 Subject: [PATCH 16/18] fixed button on index page --- app/views/works/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index dbeae1d344..7fbe0fbe51 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -30,5 +30,5 @@ <%end%> View Top Media - Add a new work + Add a new work
    From 2f0b742a7c7d7886aab6fc0eff7c63d69197b312 Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Sun, 14 Oct 2018 22:16:30 -0700 Subject: [PATCH 17/18] fiexed buttons on user show page --- app/views/users/show.html.erb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index e193a8e852..6c04eab663 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -25,8 +25,6 @@ <%end%>
    -
      -
    • <%= link_to "See all Users", users_path, class: "btn btn-primary"%>
      • -
    • <%= link_to "Back to Media List", works_path, class: "btn btn-primary"%>
      • - + See all Users + Back to Media List <% end %> From 6f9181829903537b862cdf5510235d477c28a12f Mon Sep 17 00:00:00 2001 From: Amanda Ungco Date: Sun, 14 Oct 2018 23:03:31 -0700 Subject: [PATCH 18/18] updated work tests --- app/assets/stylesheets/other.scss | 81 ----------------------- app/controllers/application_controller.rb | 11 +-- app/controllers/users_controller.rb | 18 ----- app/views/application/_formlogin.html.erb | 7 -- app/views/sessions/destroy.html.erb | 0 app/views/sessions/login.html.erb | 7 -- app/views/sessions/new.html.erb | 7 +- app/views/users/new.html.erb | 2 - test/fixtures/votes.yml | 10 ++- test/models/work_test.rb | 46 ++++++------- 10 files changed, 36 insertions(+), 153 deletions(-) delete mode 100644 app/assets/stylesheets/other.scss delete mode 100644 app/views/application/_formlogin.html.erb delete mode 100644 app/views/sessions/destroy.html.erb delete mode 100644 app/views/sessions/login.html.erb delete mode 100644 app/views/users/new.html.erb diff --git a/app/assets/stylesheets/other.scss b/app/assets/stylesheets/other.scss deleted file mode 100644 index 51f87b31c6..0000000000 --- a/app/assets/stylesheets/other.scss +++ /dev/null @@ -1,81 +0,0 @@ - -@import "bootstrap"; -/* Import scss content */ -@import "**/*"; - - .btn-primary { - background-color: teal; - } - - .app_header { - font-family: sans-serif; - line-height: 1.15; - box-sizing: border-box; - max-width: 100%; - background-color: #B2DFDB; - margin-bottom: 0.5rem; - padding: 2rem 1rem 0.5rem 1rem; - } - - .app_header h1 { - text-align: center; - font-weight: bold; - font-size: 2.5rem; - margin-bottom: 0.5rem; - } - .app_header h1 a { - color: #FF5722; - padding-right: 25px; - margin-right: 15px; - border-right: white 2px solid; -} - -.app_header h1 small { - color: white; - font-size: 80%; - font-weight: 400; -} - -.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; -} - -ul { - margin-block-start: 1em; - margin-block-end: 1em; - margin-inline-start: 0px; - margin-inline-end: 0px; - padding-inline-start: 40px; -} -body { - font-size: 1rem; - font-weight: 400; - line-height: 1.5; - color: #212529; - text-align: left; - background-color: #fff; -} - -.nav-link { - display: block; - padding: 0.5rem 1rem; -} - -.app-header__site-nav-container .app-header__nav_item { - margin-right: 2rem; - margin-top: 1rem; -} -li { - display: list-item; - text-align: -webkit-match-parent; -} diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7c7ab93ed1..473269f711 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,16 +1,11 @@ class ApplicationController < ActionController::Base # before_action :set_cache_headers before_action :find_user - # + private - # + def find_user @current_user = User.find_by(id: session[:user_id]) end - # - # def set_cache_headers - # response.headers["Cache-Control"] = "no-cache, no-store" - # response.headers["Pragma"] = "no-cache" - # response.headers["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT" - # end + end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 95d744c580..30a9f0cb64 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,19 +1,12 @@ class UsersController < ApplicationController def show @user = User.find_by(id: params[:id].to_i) - # if id == nil - # render :not_found, status: :not_found - # end end def index @users = User.all end - def new - @user = User.new - end - def create @user = User.new(user_params) if @user.save @@ -23,12 +16,7 @@ def create end end - def edit - @user = User.find_by(id: params[:id].to_i) - end - def update - @user = User.find_by(id:params[:id]) @user.update(user_params) if @user.save redirect_to user_path @@ -37,12 +25,6 @@ def update end end - def destroy - user = User.find_by(id: params[:id].to_i) - user.destroy - redirect_to users_path - end - private def user_params return params.require(:user).permit(:username) diff --git a/app/views/application/_formlogin.html.erb b/app/views/application/_formlogin.html.erb deleted file mode 100644 index 97fa004931..0000000000 --- a/app/views/application/_formlogin.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -

      Please Log in

      - -<%= form_with model: @user, url: login_path, method: method do |f| %> - <%= f.label :username, 'Username' %> - <%= f.text_field :username, placeholder: 'Username' %> - <%= f.submit action_button %> -<% end %> diff --git a/app/views/sessions/destroy.html.erb b/app/views/sessions/destroy.html.erb deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/app/views/sessions/login.html.erb b/app/views/sessions/login.html.erb deleted file mode 100644 index 1234e7c470..0000000000 --- a/app/views/sessions/login.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -

      Please Log in

      - -<%= form_with model: @user, url: login_path, method: :post do |f| %> - <%= f.label :username, 'Username' %> - <%= f.text_field :username, placeholder: 'Username' %> - <%= f.submit 'Login' %> -<% end %> diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index 7432b4c7a3..571b8b394a 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -1,2 +1,7 @@ +

      Please Log in

      -<%= render partial: "formlogin", locals: {method: :post, action_button: 'Log in'} %> +<%= form_with model: @user, url: login_path, method: :post do |f| %> + <%= f.label :username, 'Username' %> + <%= f.text_field :username, placeholder: 'Username' %> + <%= f.submit 'Log in' %> +<% end %> diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb deleted file mode 100644 index c21a1adf19..0000000000 --- a/app/views/users/new.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

      Users#new

      -

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

      diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml index dc3ee79b5d..57b4b1eaa1 100644 --- a/test/fixtures/votes.yml +++ b/test/fixtures/votes.yml @@ -4,8 +4,14 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} +one: + user_id: 1 + work_id: 2 + # column: value # -two: {} +two: + user_id: 2 + work_id: 2 + # column: value diff --git a/test/models/work_test.rb b/test/models/work_test.rb index 131687b0e2..b48d1327a4 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -15,33 +15,25 @@ end end - # describe 'Relationships' do - # it 'belongs to a user' do - # # Arrange (done with let) - # - # # Act - # user = work.user - # - # # Assert - # expect(user).must_be_instance_of User - # expect(user.id).must_equal work.user_id - # end - # - # it 'can have many votes' do - # # Arrange, did with let - # - # # Act - # work.votes << Vote.first - # votes = work.votes - # - # - # # Assert - # expect(votes.length).must_be :>=, 1 - # votes.each do |vote| - # expect(vote).must_be_instance_of Vote - # end - # end - # end + describe 'Relationships' do + let(:work) { Work.new(title: ' Talking Rain', publication_year:1990, creator: 'tangering') } + it 'can have many votes' do + + work.votes << Vote.first + votes = work.votes + + expect(votes.length).must_be :>=, 1 + votes.each do |vote| + expect(vote).must_be_instance_of Vote + end + end + + it 'can only be voted on by a unique user once' do + # first_vote = Vote.first + # second_vote = Vote.new(user_id:1, work_id:2) + end + + end describe 'validations' do it 'must have a title' do