From 8f0e2b3f07fdc6d861e7373dc95fc9b2718deaf6 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Mon, 8 Oct 2018 15:47:04 -0700 Subject: [PATCH 01/47] rails init --- .gitignore | 27 ++ .ruby-version | 1 + Gemfile | 81 +++++ Gemfile.lock | 277 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/assets/config/manifest.js | 3 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 20 ++ app/assets/javascripts/cable.js | 13 + app/assets/javascripts/channels/.keep | 0 app/assets/stylesheets/application.scss | 18 ++ app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/helpers/application_helper.rb | 2 + app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/application.html.erb | 15 + app/views/layouts/mailer.html.erb | 13 + app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 36 +++ bin/spring | 17 ++ bin/update | 31 ++ bin/yarn | 11 + config.ru | 5 + config/application.rb | 25 ++ config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 ++++++ config/environment.rb | 5 + config/environments/development.rb | 61 ++++ config/environments/production.rb | 94 ++++++ config/environments/test.rb | 46 +++ .../application_controller_renderer.rb | 8 + config/initializers/assets.rb | 14 + config/initializers/backtrace_silencers.rb | 7 + .../initializers/content_security_policy.rb | 25 ++ config/initializers/cookies_serializer.rb | 5 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 + config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 + config/locales/en.yml | 33 +++ config/puma.rb | 34 +++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 +++ db/seeds.rb | 7 + lib/assets/.keep | 0 lib/tasks/.keep | 0 log/.keep | 0 package.json | 5 + public/404.html | 67 +++++ public/422.html | 67 +++++ public/500.html | 66 +++++ public/apple-touch-icon-precomposed.png | 0 public/apple-touch-icon.png | 0 public/favicon.ico | 0 public/robots.txt | 1 + storage/.keep | 0 test/application_system_test_case.rb | 5 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/helpers/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/system/.keep | 0 test/test_helper.rb | 24 ++ tmp/.keep | 0 vendor/.keep | 0 80 files changed, 1406 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/assets/config/manifest.js create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/javascripts/cable.js create mode 100644 app/assets/javascripts/channels/.keep create mode 100644 app/assets/stylesheets/application.scss create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/helpers/application_helper.rb create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/application.html.erb create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100755 bin/yarn create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/assets.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/content_security_policy.rb create mode 100644 config/initializers/cookies_serializer.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 db/seeds.rb create mode 100644 lib/assets/.keep create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 package.json create mode 100644 public/404.html create mode 100644 public/422.html create mode 100644 public/500.html create mode 100644 public/apple-touch-icon-precomposed.png create mode 100644 public/apple-touch-icon.png create mode 100644 public/favicon.ico create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/application_system_test_case.rb create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/helpers/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/system/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..18b43c9cd2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +/node_modules +/yarn-error.log + +/public/assets +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000000..25c81fe399 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000000..6219256bd8 --- /dev/null +++ b/Gemfile @@ -0,0 +1,81 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.1' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'mini_racer', platforms: :ruby + +# Use CoffeeScript for .coffee assets and views +# gem 'coffee-rails', '~> 4.2' +# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks +gem 'turbolinks', '~> 5' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + # Access an interactive console on exception pages or by calling 'console' anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +group :test do + # Adds support for Capybara system testing and selenium driver + gem 'capybara', '>= 2.15' + gem 'selenium-webdriver' + # Easy installation and use of chromedriver to run system tests with Chrome + gem 'chromedriver-helper' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +gem 'jquery-rails' +gem 'jquery-turbolinks' +gem 'bootstrap', '~> 4.1.3' +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'better_errors' + gem 'binding_of_caller' + gem 'guard' + gem 'guard-minitest' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000000..2ed655c894 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,277 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.1) + actionpack (= 5.2.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.1) + actionview (= 5.2.1) + activesupport (= 5.2.1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.1) + activesupport (= 5.2.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.1) + activesupport (= 5.2.1) + globalid (>= 0.3.6) + activemodel (5.2.1) + activesupport (= 5.2.1) + activerecord (5.2.1) + activemodel (= 5.2.1) + activesupport (= 5.2.1) + arel (>= 9.0) + activestorage (5.2.1) + actionpack (= 5.2.1) + activerecord (= 5.2.1) + marcel (~> 0.3.1) + activesupport (5.2.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + ansi (1.5.0) + archive-zip (0.11.0) + io-like (~> 0.3.0) + arel (9.0.0) + autoprefixer-rails (9.1.4) + execjs + better_errors (2.5.0) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) + bindex (0.5.0) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + bootsnap (1.3.2) + msgpack (~> 1.0) + bootstrap (4.1.3) + autoprefixer-rails (>= 6.0.3) + popper_js (>= 1.12.9, < 2) + sass (>= 3.5.2) + builder (3.2.3) + byebug (10.0.2) + capybara (3.9.0) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + xpath (~> 3.1) + childprocess (0.9.0) + ffi (~> 1.0, >= 1.0.11) + chromedriver-helper (2.1.0) + archive-zip (~> 0.10) + nokogiri (~> 1.8) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crass (1.0.4) + debug_inspector (0.0.3) + erubi (1.7.1) + execjs (2.7.0) + ffi (1.9.25) + formatador (0.2.5) + globalid (0.4.1) + activesupport (>= 4.2.0) + guard (2.14.2) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) + i18n (1.1.0) + concurrent-ruby (~> 1.0) + io-like (0.3.0) + jbuilder (2.7.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + jquery-rails (4.3.3) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.2) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.0.13) + mail (2.7.0) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.0) + mimemagic (0.3.2) + mini_mime (1.0.1) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.5) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.4) + multi_json (1.13.1) + nenv (0.3.0) + nio4r (2.3.1) + nokogiri (1.8.5) + mini_portile2 (~> 2.3.0) + notiffany (0.1.1) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.1.3) + popper_js (1.14.3) + pry (0.11.3) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + public_suffix (3.0.3) + puma (3.12.0) + rack (2.0.5) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.1) + actioncable (= 5.2.1) + actionmailer (= 5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + activemodel (= 5.2.1) + activerecord (= 5.2.1) + activestorage (= 5.2.1) + activesupport (= 5.2.1) + bundler (>= 1.3.0) + railties (= 5.2.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.1) + actionpack (= 5.2.1) + activesupport (= 5.2.1) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + rubyzip (1.2.2) + sass (3.6.0) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.0.7) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + selenium-webdriver (3.14.1) + childprocess (~> 0.5) + rubyzip (~> 1.2, >= 1.2.2) + shellany (0.0.1) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.0) + thread_safe (0.3.6) + tilt (2.0.8) + turbolinks (5.2.0) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + tzinfo (1.2.5) + thread_safe (~> 0.1) + uglifier (4.1.19) + execjs (>= 0.3.0, < 3) + web-console (3.7.0) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.1.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + bootsnap (>= 1.1.0) + bootstrap (~> 4.1.3) + byebug + capybara (>= 2.15) + chromedriver-helper + guard + guard-minitest + jbuilder (~> 2.5) + jquery-rails + jquery-turbolinks + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.1) + sass-rails (~> 5.0) + selenium-webdriver + spring + spring-watcher-listen (~> 2.0.0) + turbolinks (~> 5) + tzinfo-data + uglifier (>= 1.3.0) + web-console (>= 3.3.0) + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 1.16.2 diff --git a/Guardfile b/Guardfile new file mode 100644 index 0000000000..e34f706f4a --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000000..e85f913914 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 0000000000..b16e53d6d5 --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css diff --git a/app/assets/images/.keep b/app/assets/images/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js new file mode 100644 index 0000000000..4f73c21a7d --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,20 @@ +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's +// vendor/assets/javascripts directory can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// compiled file. JavaScript code in this file should be added after the last require_* statement. +// +// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details +// about supported directives. + //= require jquery3 + //= require popper + //= require bootstrap-sprockets + +// +//= require rails-ujs +//= require activestorage +//= require turbolinks +//= require_tree . diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js new file mode 100644 index 0000000000..739aa5f022 --- /dev/null +++ b/app/assets/javascripts/cable.js @@ -0,0 +1,13 @@ +// Action Cable provides the framework to deal with WebSockets in Rails. +// You can generate new channels where WebSocket features live using the `rails generate channel` command. +// +//= require action_cable +//= require_self +//= require_tree ./channels + +(function() { + this.App || (this.App = {}); + + App.cable = ActionCable.createConsumer(); + +}).call(this); diff --git a/app/assets/javascripts/channels/.keep b/app/assets/javascripts/channels/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss new file mode 100644 index 0000000000..8b1701e581 --- /dev/null +++ b/app/assets/stylesheets/application.scss @@ -0,0 +1,18 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's + * vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS + * files in this directory. Styles in this file should be added after the last require_* statement. + * It is generally better to create a new file per style scope. + * + */ + +/* Custom bootstrap variables must be set or imported *before* bootstrap. */ +@import "bootstrap"; +/* Import scss content */ +@import "**/*"; diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 0000000000..d672697283 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 0000000000..0ff5442f47 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 0000000000..09705d12ab --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::Base +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb new file mode 100644 index 0000000000..de6be7945c --- /dev/null +++ b/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 0000000000..a009ace51c --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 0000000000..286b2239d1 --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 0000000000..10a4cba84d --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 0000000000..9e16e967f0 --- /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..8675aa60b2 --- /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..eea5e45f1d --- /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..2b4de785fb --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +Ov57Yc5th2jRavwdFWai4DiC+xG6EewtGd8g0pI4iog0Fy8K+/91KOJdu3m1hSZj1Nw/rnnvIih2RU1q+Hn48meibCMDxQCEzDsQ34eVHsBRsUXFrPuWoV8o/7DyfiDG/Br1cVuXzre6n57PxSBQQ45ADyMb0I5E28MwjAvCTFuxcO65AbeDRgj6uAeASE8P7OnTcC1PyU1OuXYTf1UMnfr6EnUhuiO20/JdrUBze4IXbsQbjRi3XJXqQgY1jqYSzhyZVEphrkQ6fe3lyNVOFAprhAhMd4nlgKTE8xS8sDn+T1IXPMUrcIuwzOtGZqswpGoPHFevjo9khpq1RPbSTqvncfexc5ZNXKXWfPFI0dut9hCBuusk04U0/TEuHvLG55UoCW9GLMKHVeeVddAPSSZZ6/+vbJvalll6--oBtaPMnyhWPSLtHM--lQ3Foz81aqxQn32nM5NOwg== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 0000000000..37ba65367a --- /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..8dd4af6d57 --- /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..4cdcf5cdfa --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "name": "mediaranker", + "private": true, + "dependencies": {} +} diff --git a/public/404.html b/public/404.html new file mode 100644 index 0000000000..2be3af26fc --- /dev/null +++ b/public/404.html @@ -0,0 +1,67 @@ + + + + The page you were looking for doesn't exist (404) + + + + + + +
+
+

The page you were looking for doesn't exist.

+

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

+
+

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

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

The change you wanted was rejected.

+

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

+
+

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

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

We're sorry, but something went wrong.

+
+

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

+
+ + diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 0000000000..37b576a4a0 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb new file mode 100644 index 0000000000..d19212abd5 --- /dev/null +++ b/test/application_system_test_case.rb @@ -0,0 +1,5 @@ +require "test_helper" + +class ApplicationSystemTestCase < ActionDispatch::SystemTestCase + driven_by :selenium, using: :chrome, screen_size: [1400, 1400] +end diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/helpers/.keep b/test/helpers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/system/.keep b/test/system/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 0000000000..2b5172a7d6 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,24 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails"require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 0000000000..e69de29bb2 From efc7b09d0d48dfe68951242b1500e526ee5af961 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Mon, 8 Oct 2018 17:06:21 -0700 Subject: [PATCH 02/47] generate controllers and models --- app/assets/javascripts/media.js | 2 ++ app/assets/javascripts/users.js | 2 ++ app/assets/stylesheets/media.scss | 3 ++ app/assets/stylesheets/users.scss | 3 ++ app/controllers/media_controller.rb | 2 ++ app/controllers/users_controller.rb | 2 ++ app/helpers/media_helper.rb | 2 ++ app/helpers/users_helper.rb | 2 ++ app/models/medium.rb | 2 ++ app/models/user.rb | 2 ++ app/models/vote.rb | 2 ++ db/migrate/20181008235029_create_users.rb | 9 +++++ db/migrate/20181008235516_create_media.rb | 13 +++++++ db/migrate/20181008235734_create_votes.rb | 10 ++++++ db/schema.rb | 41 +++++++++++++++++++++++ test/controllers/media_controller_test.rb | 7 ++++ test/controllers/users_controller_test.rb | 7 ++++ test/fixtures/media.yml | 15 +++++++++ test/fixtures/users.yml | 7 ++++ test/fixtures/votes.yml | 9 +++++ test/models/medium_test.rb | 9 +++++ test/models/user_test.rb | 9 +++++ test/models/vote_test.rb | 9 +++++ 23 files changed, 169 insertions(+) create mode 100644 app/assets/javascripts/media.js create mode 100644 app/assets/javascripts/users.js create mode 100644 app/assets/stylesheets/media.scss create mode 100644 app/assets/stylesheets/users.scss create mode 100644 app/controllers/media_controller.rb create mode 100644 app/controllers/users_controller.rb create mode 100644 app/helpers/media_helper.rb create mode 100644 app/helpers/users_helper.rb create mode 100644 app/models/medium.rb create mode 100644 app/models/user.rb create mode 100644 app/models/vote.rb create mode 100644 db/migrate/20181008235029_create_users.rb create mode 100644 db/migrate/20181008235516_create_media.rb create mode 100644 db/migrate/20181008235734_create_votes.rb create mode 100644 db/schema.rb create mode 100644 test/controllers/media_controller_test.rb create mode 100644 test/controllers/users_controller_test.rb create mode 100644 test/fixtures/media.yml create mode 100644 test/fixtures/users.yml create mode 100644 test/fixtures/votes.yml create mode 100644 test/models/medium_test.rb create mode 100644 test/models/user_test.rb create mode 100644 test/models/vote_test.rb diff --git a/app/assets/javascripts/media.js b/app/assets/javascripts/media.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/media.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/stylesheets/media.scss b/app/assets/stylesheets/media.scss new file mode 100644 index 0000000000..ca9a0ec057 --- /dev/null +++ b/app/assets/stylesheets/media.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Media 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/controllers/media_controller.rb b/app/controllers/media_controller.rb new file mode 100644 index 0000000000..31e04ff7ca --- /dev/null +++ b/app/controllers/media_controller.rb @@ -0,0 +1,2 @@ +class MediaController < ApplicationController +end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb new file mode 100644 index 0000000000..3e74dea87f --- /dev/null +++ b/app/controllers/users_controller.rb @@ -0,0 +1,2 @@ +class UsersController < ApplicationController +end diff --git a/app/helpers/media_helper.rb b/app/helpers/media_helper.rb new file mode 100644 index 0000000000..d08298bc71 --- /dev/null +++ b/app/helpers/media_helper.rb @@ -0,0 +1,2 @@ +module MediaHelper +end diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb new file mode 100644 index 0000000000..2310a240d7 --- /dev/null +++ b/app/helpers/users_helper.rb @@ -0,0 +1,2 @@ +module UsersHelper +end diff --git a/app/models/medium.rb b/app/models/medium.rb new file mode 100644 index 0000000000..9858213ea2 --- /dev/null +++ b/app/models/medium.rb @@ -0,0 +1,2 @@ +class Medium < ApplicationRecord +end diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 0000000000..379658a509 --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,2 @@ +class User < ApplicationRecord +end diff --git a/app/models/vote.rb b/app/models/vote.rb new file mode 100644 index 0000000000..4c58e4f3d5 --- /dev/null +++ b/app/models/vote.rb @@ -0,0 +1,2 @@ +class Vote < ApplicationRecord +end diff --git a/db/migrate/20181008235029_create_users.rb b/db/migrate/20181008235029_create_users.rb new file mode 100644 index 0000000000..ad388a5465 --- /dev/null +++ b/db/migrate/20181008235029_create_users.rb @@ -0,0 +1,9 @@ +class CreateUsers < ActiveRecord::Migration[5.2] + def change + create_table :users do |t| + t.string :name + + t.timestamps + end + end +end diff --git a/db/migrate/20181008235516_create_media.rb b/db/migrate/20181008235516_create_media.rb new file mode 100644 index 0000000000..3e75af7d11 --- /dev/null +++ b/db/migrate/20181008235516_create_media.rb @@ -0,0 +1,13 @@ +class CreateMedia < ActiveRecord::Migration[5.2] + def change + create_table :media do |t| + t.string :title + t.string :description + t.string :ccategory + t.string :creator + t.integer :publication_year + + t.timestamps + end + end +end diff --git a/db/migrate/20181008235734_create_votes.rb b/db/migrate/20181008235734_create_votes.rb new file mode 100644 index 0000000000..b5c876b8f9 --- /dev/null +++ b/db/migrate/20181008235734_create_votes.rb @@ -0,0 +1,10 @@ +class CreateVotes < ActiveRecord::Migration[5.2] + def change + create_table :votes do |t| + t.integer :user_id + t.integer :medium_id + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000000..3c45ad2bd1 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,41 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2018_10_08_235734) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "media", force: :cascade do |t| + t.string "title" + t.string "description" + t.string "ccategory" + t.string "creator" + t.integer "publication_year" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "users", force: :cascade do |t| + t.string "name" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "votes", force: :cascade do |t| + t.integer "user_id" + t.integer "medium_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/controllers/media_controller_test.rb b/test/controllers/media_controller_test.rb new file mode 100644 index 0000000000..3f5aab50e7 --- /dev/null +++ b/test/controllers/media_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MediaController 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..89decb54e0 --- /dev/null +++ b/test/controllers/users_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe UsersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/fixtures/media.yml b/test/fixtures/media.yml new file mode 100644 index 0000000000..623553cdaf --- /dev/null +++ b/test/fixtures/media.yml @@ -0,0 +1,15 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + description: MyString + ccategory: MyString + creator: MyString + publication_year: + +two: + title: MyString + description: MyString + ccategory: MyString + creator: MyString + publication_year: diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 0000000000..56066c68af --- /dev/null +++ b/test/fixtures/users.yml @@ -0,0 +1,7 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + +two: + name: MyString diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml new file mode 100644 index 0000000000..ef5009d82e --- /dev/null +++ b/test/fixtures/votes.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + user_id: + medium_id: + +two: + user_id: + medium_id: diff --git a/test/models/medium_test.rb b/test/models/medium_test.rb new file mode 100644 index 0000000000..81052cf6ef --- /dev/null +++ b/test/models/medium_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Medium do + let(:medium) { Medium.new } + + it "must be valid" do + value(medium).must_be :valid? + end +end 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 4c484b8d0c6a2510830d3a5ec03e519b38b7d07f Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Mon, 8 Oct 2018 17:26:18 -0700 Subject: [PATCH 03/47] drop screwy db and start from scratch; define relationships btwn models --- app/models/medium.rb | 1 + app/models/user.rb | 1 + app/models/vote.rb | 2 ++ db/migrate/20181008235516_create_media.rb | 2 +- db/migrate/20181008235734_create_votes.rb | 2 -- ...81009002027_add_medium_id_and_user_id_to_votes.rb | 6 ++++++ db/schema.rb | 12 ++++++++---- 7 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 db/migrate/20181009002027_add_medium_id_and_user_id_to_votes.rb diff --git a/app/models/medium.rb b/app/models/medium.rb index 9858213ea2..2e9752ce17 100644 --- a/app/models/medium.rb +++ b/app/models/medium.rb @@ -1,2 +1,3 @@ class Medium < ApplicationRecord + has_many :votes end diff --git a/app/models/user.rb b/app/models/user.rb index 379658a509..db11855600 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,2 +1,3 @@ class User < ApplicationRecord + has_many :votes end diff --git a/app/models/vote.rb b/app/models/vote.rb index 4c58e4f3d5..54b5d96fd3 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -1,2 +1,4 @@ class Vote < ApplicationRecord + belongs_to :medium + belongs_to :user end diff --git a/db/migrate/20181008235516_create_media.rb b/db/migrate/20181008235516_create_media.rb index 3e75af7d11..fc4b2a9da2 100644 --- a/db/migrate/20181008235516_create_media.rb +++ b/db/migrate/20181008235516_create_media.rb @@ -3,7 +3,7 @@ def change create_table :media do |t| t.string :title t.string :description - t.string :ccategory + t.string :category t.string :creator t.integer :publication_year diff --git a/db/migrate/20181008235734_create_votes.rb b/db/migrate/20181008235734_create_votes.rb index b5c876b8f9..aa134a1296 100644 --- a/db/migrate/20181008235734_create_votes.rb +++ b/db/migrate/20181008235734_create_votes.rb @@ -1,8 +1,6 @@ class CreateVotes < ActiveRecord::Migration[5.2] def change create_table :votes do |t| - t.integer :user_id - t.integer :medium_id t.timestamps end diff --git a/db/migrate/20181009002027_add_medium_id_and_user_id_to_votes.rb b/db/migrate/20181009002027_add_medium_id_and_user_id_to_votes.rb new file mode 100644 index 0000000000..960e3bba2f --- /dev/null +++ b/db/migrate/20181009002027_add_medium_id_and_user_id_to_votes.rb @@ -0,0 +1,6 @@ +class AddMediumIdAndUserIdToVotes < ActiveRecord::Migration[5.2] + def change + add_reference :votes, :user, foreign_key: true + add_reference :votes, :medium, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 3c45ad2bd1..85a5fa09d7 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_08_235734) do +ActiveRecord::Schema.define(version: 2018_10_09_002027) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -18,7 +18,7 @@ create_table "media", force: :cascade do |t| t.string "title" t.string "description" - t.string "ccategory" + t.string "category" t.string "creator" t.integer "publication_year" t.datetime "created_at", null: false @@ -32,10 +32,14 @@ end create_table "votes", force: :cascade do |t| - t.integer "user_id" - t.integer "medium_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.bigint "user_id" + t.bigint "medium_id" + t.index ["medium_id"], name: "index_votes_on_medium_id" + t.index ["user_id"], name: "index_votes_on_user_id" end + add_foreign_key "votes", "media" + add_foreign_key "votes", "users" end From a8d24e4b27ccf27bc46fa39b93385d125e642d02 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Mon, 8 Oct 2018 17:39:43 -0700 Subject: [PATCH 04/47] seed db --- db/seeds.rb | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/db/seeds.rb b/db/seeds.rb index 1beea2accd..c42e8f800b 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,3 +5,28 @@ # # 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 driver data from #{MEDIA_FILE}" + +media_failures = [] +CSV.foreach(MEDIA_FILE, :headers => true) do |row| + medium = Medium.new + medium.category = row['category'] + medium.title = row['title'] + medium.creator = row['creator'] + medium.publication_year = row['publication_year'] + medium.description = row['description'] + successful = medium.save + if !successful + media_failures << medium + puts "Failed to save medium: #{medium.inspect}" + else + puts "Created medium: #{medium.inspect}" + end +end + +puts "Added #{Medium.count} medium records" +puts "#{media_failures.length} media failed to save" From 6358770e6dbf86a13470f0a378c28f4b2e1fd36e Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Tue, 9 Oct 2018 15:33:37 -0700 Subject: [PATCH 05/47] define initial routes and media_controller aactions --- app/controllers/media_controller.rb | 57 +++++++++++++++++++++++++++++ config/initializers/action_view.rb | 1 + config/routes.rb | 2 + 3 files changed, 60 insertions(+) create mode 100644 config/initializers/action_view.rb diff --git a/app/controllers/media_controller.rb b/app/controllers/media_controller.rb index 31e04ff7ca..c41b22b12e 100644 --- a/app/controllers/media_controller.rb +++ b/app/controllers/media_controller.rb @@ -1,2 +1,59 @@ class MediaController < ApplicationController + def index + @media = Medium.all + end + + def show + @medium = Medium.find_by(id: params[:id]) + if @medium.nil? + head :not_found + end + end + + def new + @medium = Medium.new + end + + def create + @medium = Medium.new(medium_params) + + if @medium.save + flash[:success] = "Successfully added a new #{@medium.category} to the database!" + redirect_to medium_path(@medium) + else + render :new, status: :bad_request + end + end + + def edit + @medium = Medium.find_by(id: params[:id]) + end + + def update + medium = Medium.find(params[:id]) + if medium.update(medium_params) + redirect_to medium_path(medium.id) + else + render :edit, status: :bad_request + end + end + + def destroy + medium = Medium.find_by(id: params[:id]) + + medium.destroy + redirect_to media_path + end + + private + + def medium_params + return params.require(:medium).permit( + :title, + :description, + :category, + :creator, + :publication_year + ) + end 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 787824f888..ee615b89ca 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,5 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + resources :media + resources :users, only: [:index] end From f8c56898573d2b1a7071941df0b9532aaff935da Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Tue, 9 Oct 2018 16:26:48 -0700 Subject: [PATCH 06/47] init media index and show views --- app/views/media/index.html.erb | 25 +++++++++++++++++++++++ app/views/media/show.html.erb | 36 ++++++++++++++++++++++++++++++++++ config/routes.rb | 1 + 3 files changed, 62 insertions(+) create mode 100644 app/views/media/index.html.erb create mode 100644 app/views/media/show.html.erb diff --git a/app/views/media/index.html.erb b/app/views/media/index.html.erb new file mode 100644 index 0000000000..567e58c4d4 --- /dev/null +++ b/app/views/media/index.html.erb @@ -0,0 +1,25 @@ +
+

Media

+ + + + + + + + + + + + <% @media.each do |medium| %> + + + + + + + + <% end %> + +
VotesTitleCreated ByPublishedUpvote
<%= medium.votes.length %><%= medium.title %><%= medium.creator %><%= medium.publication_year %><%= link_to "upvote", medium_path(medium.id) %>
+
diff --git a/app/views/media/show.html.erb b/app/views/media/show.html.erb new file mode 100644 index 0000000000..9fd8f01342 --- /dev/null +++ b/app/views/media/show.html.erb @@ -0,0 +1,36 @@ +
+

<%= @medium.title %>

+

Created By: <%= @medium.creator %>

+

Published: <%= @medium.publication_year %>

+

<%= @medium.description %>

+
+ + + +
+

<%= @medium.votes.length %> votes for this <%= @medium.category %>

+ + + + + + + + + <% @medium.votes.each do |vote| %> + + + + + <% end %> + +
+ User + + Date +
+ <%= vote.user.name %> + + <%= vote.created_at.to_date %> +
+
diff --git a/config/routes.rb b/config/routes.rb index ee615b89ca..d470c7e144 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,4 +2,5 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html resources :media resources :users, only: [:index] + post "/media/:id/upvote", to: "users#upvote", as: :upvote end From 14f44eb496bfdb3b1c2ea15a78b56859cd1162d8 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Tue, 9 Oct 2018 16:59:21 -0700 Subject: [PATCH 07/47] init new media view --- app/views/media/new.html.erb | 15 +++++++++++++++ config/routes.rb | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 app/views/media/new.html.erb diff --git a/app/views/media/new.html.erb b/app/views/media/new.html.erb new file mode 100644 index 0000000000..57424715c1 --- /dev/null +++ b/app/views/media/new.html.erb @@ -0,0 +1,15 @@ +

Add media to the database

+<%= form_with model: @medium do |f| %> +<%= f.label :category %> +<%= f.select :category, ['album', 'book', 'film'] %> +<%= f.label :title %> +<%= f.text_field :title %> +<%= f.label :creator %> +<%= f.text_field :creator %> +<%= f.label :publication_year %> +<%= f.text_field :publication_year %> +<%= f.label :description %> +<%= f.text_area :description %> +<%= f.submit "slurp" %> + +<% end %> diff --git a/config/routes.rb b/config/routes.rb index d470c7e144..e3a7363f1f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,5 +2,5 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html resources :media resources :users, only: [:index] - post "/media/:id/upvote", to: "users#upvote", as: :upvote + post '/media/:id/upvote', to: 'users#upvote', as: :upvote end From 0dd9b7565c7e4bd33c0c7be7d0572d725a1e25c3 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Tue, 9 Oct 2018 17:37:50 -0700 Subject: [PATCH 08/47] init media edit form, use partial --- app/views/media/edit.html.erb | 1 + app/views/media/new.html.erb | 15 +-------------- 2 files changed, 2 insertions(+), 14 deletions(-) create mode 100644 app/views/media/edit.html.erb diff --git a/app/views/media/edit.html.erb b/app/views/media/edit.html.erb new file mode 100644 index 0000000000..6ad75aba67 --- /dev/null +++ b/app/views/media/edit.html.erb @@ -0,0 +1 @@ +<%= render partial: "media_form" %> diff --git a/app/views/media/new.html.erb b/app/views/media/new.html.erb index 57424715c1..245c43cb1e 100644 --- a/app/views/media/new.html.erb +++ b/app/views/media/new.html.erb @@ -1,15 +1,2 @@

Add media to the database

-<%= form_with model: @medium do |f| %> -<%= f.label :category %> -<%= f.select :category, ['album', 'book', 'film'] %> -<%= f.label :title %> -<%= f.text_field :title %> -<%= f.label :creator %> -<%= f.text_field :creator %> -<%= f.label :publication_year %> -<%= f.text_field :publication_year %> -<%= f.label :description %> -<%= f.text_area :description %> -<%= f.submit "slurp" %> - -<% end %> +<%= render partial: "media_form" %> From 653b0294ebeb33746a60db23af90d6aa507f38b0 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Tue, 9 Oct 2018 17:38:23 -0700 Subject: [PATCH 09/47] add delete button to show page --- app/views/media/show.html.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/media/show.html.erb b/app/views/media/show.html.erb index 9fd8f01342..553aa006d6 100644 --- a/app/views/media/show.html.erb +++ b/app/views/media/show.html.erb @@ -5,6 +5,8 @@

<%= @medium.description %>

+<%= link_to "Delete", medium_path(@medium), method: :delete, data: { confirm: "Are you 1000% sure you want to delete the book #{@medium.title}?" } %> +
From b8f4cd728052d625808bf6a49b00957223221de8 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Tue, 9 Oct 2018 17:39:25 -0700 Subject: [PATCH 10/47] generate PagesController, init homepage, fix foreign_keys on Votes to enable media deletion, add routes for PagesController --- app/assets/javascripts/pages.js | 2 ++ app/assets/stylesheets/pages.scss | 3 +++ app/controllers/pages_controller.rb | 6 ++++++ app/helpers/pages_helper.rb | 2 ++ app/views/media/_media_form.html.erb | 13 +++++++++++++ app/views/media/_medium.html.erb | 7 +++++++ app/views/pages/home.html.erb | 16 ++++++++++++++++ config/routes.rb | 2 ++ db/migrate/20181010001925_update_foreign_key.rb | 12 ++++++++++++ db/schema.rb | 6 +++--- test/controllers/pages_controller_test.rb | 7 +++++++ 11 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 app/assets/javascripts/pages.js create mode 100644 app/assets/stylesheets/pages.scss create mode 100644 app/controllers/pages_controller.rb create mode 100644 app/helpers/pages_helper.rb create mode 100644 app/views/media/_media_form.html.erb create mode 100644 app/views/media/_medium.html.erb create mode 100644 app/views/pages/home.html.erb create mode 100644 db/migrate/20181010001925_update_foreign_key.rb create mode 100644 test/controllers/pages_controller_test.rb diff --git a/app/assets/javascripts/pages.js b/app/assets/javascripts/pages.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/pages.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/pages.scss b/app/assets/stylesheets/pages.scss new file mode 100644 index 0000000000..31cb8fb1ee --- /dev/null +++ b/app/assets/stylesheets/pages.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Pages 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/pages_controller.rb b/app/controllers/pages_controller.rb new file mode 100644 index 0000000000..689a0d480c --- /dev/null +++ b/app/controllers/pages_controller.rb @@ -0,0 +1,6 @@ +class PagesController < ApplicationController + def show + @media = Medium.all + render template: "pages/#{params[:page]}" + end +end diff --git a/app/helpers/pages_helper.rb b/app/helpers/pages_helper.rb new file mode 100644 index 0000000000..2c057fd054 --- /dev/null +++ b/app/helpers/pages_helper.rb @@ -0,0 +1,2 @@ +module PagesHelper +end diff --git a/app/views/media/_media_form.html.erb b/app/views/media/_media_form.html.erb new file mode 100644 index 0000000000..3ad43479cf --- /dev/null +++ b/app/views/media/_media_form.html.erb @@ -0,0 +1,13 @@ +<%= form_with model: @medium do |f| %> +<%= f.label :category %> +<%= f.select :category, ['album', 'book', 'film'] %> +<%= f.label :title %> +<%= f.text_field :title %> +<%= f.label :creator %> +<%= f.text_field :creator %> +<%= f.label :publication_year %> +<%= f.text_field :publication_year %> +<%= f.label :description %> +<%= f.text_area :description %> +<%= f.submit "slurp" %> +<% end %> diff --git a/app/views/media/_medium.html.erb b/app/views/media/_medium.html.erb new file mode 100644 index 0000000000..09a63c501d --- /dev/null +++ b/app/views/media/_medium.html.erb @@ -0,0 +1,7 @@ + + <%= medium.votes.length %> + <%= medium.title %> + <%= medium.creator %> + <%= medium.publication_year %> + <%= link_to "upvote", medium_path(medium.id) %> + diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb new file mode 100644 index 0000000000..5d744bb3a0 --- /dev/null +++ b/app/views/pages/home.html.erb @@ -0,0 +1,16 @@ +

Hey welfcome to the media site haha...ha..

+ + + + + + + + + + + + + <%= render partial: "/media/medium", collection: @media %> + +
VotesTitleCreated ByPublishedUpvote
diff --git a/config/routes.rb b/config/routes.rb index e3a7363f1f..c6d1f2fb3e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,8 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + root "pages#show", page: "home" resources :media resources :users, only: [:index] post '/media/:id/upvote', to: 'users#upvote', as: :upvote + get "/pages/:page" => "pages#show" end diff --git a/db/migrate/20181010001925_update_foreign_key.rb b/db/migrate/20181010001925_update_foreign_key.rb new file mode 100644 index 0000000000..d159acf1ac --- /dev/null +++ b/db/migrate/20181010001925_update_foreign_key.rb @@ -0,0 +1,12 @@ +class UpdateForeignKey < ActiveRecord::Migration[5.2] + def change + # remove the old foreign_key + remove_foreign_key :votes, :users + remove_foreign_key :votes, + :media + + # add the new foreign_key + add_foreign_key :votes, :users, on_delete: :cascade + add_foreign_key :votes, :media, on_delete: :cascade + end +end diff --git a/db/schema.rb b/db/schema.rb index 85a5fa09d7..f304b594fa 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_10_09_002027) do +ActiveRecord::Schema.define(version: 2018_10_10_001925) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -40,6 +40,6 @@ t.index ["user_id"], name: "index_votes_on_user_id" end - add_foreign_key "votes", "media" - add_foreign_key "votes", "users" + add_foreign_key "votes", "media", on_delete: :cascade + add_foreign_key "votes", "users", on_delete: :cascade end diff --git a/test/controllers/pages_controller_test.rb b/test/controllers/pages_controller_test.rb new file mode 100644 index 0000000000..c9a686b8f4 --- /dev/null +++ b/test/controllers/pages_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe PagesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 3144d060108bb7551e6082f497fb6ee31feb0468 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Wed, 10 Oct 2018 15:38:38 -0700 Subject: [PATCH 11/47] add spotlight self method to Medium --- app/models/medium.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/models/medium.rb b/app/models/medium.rb index 2e9752ce17..40c7097d1b 100644 --- a/app/models/medium.rb +++ b/app/models/medium.rb @@ -1,3 +1,9 @@ class Medium < ApplicationRecord has_many :votes + + def self.spotlight + self.all.max_by do |medium| + medium.votes.length + end + end end From f5d57a262126c03e73a6c2b343e6f438b118542c Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Wed, 10 Oct 2018 15:49:31 -0700 Subject: [PATCH 12/47] get media spotlight functioning on homepage --- app/controllers/pages_controller.rb | 6 +++++- app/views/pages/home.html.erb | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 689a0d480c..8a694fde33 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -1,6 +1,10 @@ class PagesController < ApplicationController def show - @media = Medium.all + if params[:page] == "home" + @media = Medium.all + @media_spotlight = Medium.spotlight + end + render template: "pages/#{params[:page]}" end end diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb index 5d744bb3a0..ca4e360c0b 100644 --- a/app/views/pages/home.html.erb +++ b/app/views/pages/home.html.erb @@ -1,5 +1,22 @@

Hey welfcome to the media site haha...ha..

+
+

+ Media Spotlight + <%= link_to @media_spotlight.title, medium_path(@media_spotlight) %> +

+

+ <%= @media_spotlight.votes.length %> + <% if @media_spotlight.votes.length == 1 %> + vote + <% else %> + votes + <% end %> + - + <%= @media_spotlight.description %> +

+
+ From 69b96e9e674a4d6d06f40e6319582c99062c4146 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Wed, 10 Oct 2018 15:53:00 -0700 Subject: [PATCH 13/47] extract media table rrows into partial --- app/views/media/index.html.erb | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/app/views/media/index.html.erb b/app/views/media/index.html.erb index 567e58c4d4..4c4ee2c1b3 100644 --- a/app/views/media/index.html.erb +++ b/app/views/media/index.html.erb @@ -11,15 +11,7 @@ - <% @media.each do |medium| %> - - - - - - - - <% end %> + <%= render partial: "/media/medium", collection: @media %>
<%= medium.votes.length %><%= medium.title %><%= medium.creator %><%= medium.publication_year %><%= link_to "upvote", medium_path(medium.id) %>
From 12d0a45fd46d34cc91942782c7cc7ccf6c4f78f4 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Wed, 10 Oct 2018 15:56:22 -0700 Subject: [PATCH 14/47] extract entire media table into its own partial --- app/views/media/_media_table.html.erb | 14 ++++++++++++++ app/views/media/index.html.erb | 15 +-------------- app/views/pages/home.html.erb | 15 +-------------- 3 files changed, 16 insertions(+), 28 deletions(-) create mode 100644 app/views/media/_media_table.html.erb diff --git a/app/views/media/_media_table.html.erb b/app/views/media/_media_table.html.erb new file mode 100644 index 0000000000..c3ff563a63 --- /dev/null +++ b/app/views/media/_media_table.html.erb @@ -0,0 +1,14 @@ + + + + + + + + + + + + <%= render partial: "media/medium", collection: @media %> + +
VotesTitleCreated ByPublishedUpvote
diff --git a/app/views/media/index.html.erb b/app/views/media/index.html.erb index 4c4ee2c1b3..84f9564128 100644 --- a/app/views/media/index.html.erb +++ b/app/views/media/index.html.erb @@ -1,17 +1,4 @@

Media

- - - - - - - - - - - - <%= render partial: "/media/medium", collection: @media %> - -
VotesTitleCreated ByPublishedUpvote
+ <%= render partial: "media_table" %>
diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb index ca4e360c0b..ccb5b6305b 100644 --- a/app/views/pages/home.html.erb +++ b/app/views/pages/home.html.erb @@ -17,17 +17,4 @@

- - - - - - - - - - - - <%= render partial: "/media/medium", collection: @media %> - -
VotesTitleCreated ByPublishedUpvote
+<%= render partial: "media/media_table" %> From 19ef152331540bd6589f82540660345dbccc844b Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Wed, 10 Oct 2018 16:09:25 -0700 Subject: [PATCH 15/47] implement media table partials on homepage and media/index and split into different tables by category --- app/controllers/media_controller.rb | 4 +++- app/controllers/pages_controller.rb | 5 ++++- app/views/media/_media_table.html.erb | 2 +- app/views/media/index.html.erb | 8 ++++++-- app/views/pages/home.html.erb | 7 ++++++- 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/app/controllers/media_controller.rb b/app/controllers/media_controller.rb index c41b22b12e..544a76b846 100644 --- a/app/controllers/media_controller.rb +++ b/app/controllers/media_controller.rb @@ -1,6 +1,8 @@ class MediaController < ApplicationController def index - @media = Medium.all + @movies = Medium.where(category: "movie") + @books = Medium.where(category: "book") + @albums = Medium.where(category: "album") end def show diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 8a694fde33..d53841ffe9 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -1,7 +1,10 @@ class PagesController < ApplicationController def show if params[:page] == "home" - @media = Medium.all + @movies = Medium.where(category: "movie") + @books = Medium.where(category: "book") + @albums = Medium.where(category: "album") + @media_spotlight = Medium.spotlight end diff --git a/app/views/media/_media_table.html.erb b/app/views/media/_media_table.html.erb index c3ff563a63..9e1faa8308 100644 --- a/app/views/media/_media_table.html.erb +++ b/app/views/media/_media_table.html.erb @@ -9,6 +9,6 @@ - <%= render partial: "media/medium", collection: @media %> + <%= render partial: "media/medium", collection: collection %> diff --git a/app/views/media/index.html.erb b/app/views/media/index.html.erb index 84f9564128..2deb8a82ac 100644 --- a/app/views/media/index.html.erb +++ b/app/views/media/index.html.erb @@ -1,4 +1,8 @@
-

Media

- <%= render partial: "media_table" %> +

Books

+ <%= render partial: "media_table", locals: {collection: @books} %> +

Movies

+ <%= render partial: "media_table", locals: {collection: @movies} %> +

Albums

+ <%= render partial: "media_table", locals: {collection: @albums} %>
diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb index ccb5b6305b..9eb7e51298 100644 --- a/app/views/pages/home.html.erb +++ b/app/views/pages/home.html.erb @@ -17,4 +17,9 @@

-<%= render partial: "media/media_table" %> +

Books

+<%= render partial: "media/media_table", locals: {collection: @books} %> +

Movies

+<%= render partial: "media/media_table", locals: {collection: @movies} %> +

Albums

+<%= render partial: "media/media_table", locals: {collection: @albums} %> From 04567217054e1de10ff460bd8f80310d1d96efbf Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Fri, 12 Oct 2018 12:12:03 -0700 Subject: [PATCH 16/47] add validations to User --- app/models/user.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/user.rb b/app/models/user.rb index db11855600..c46e64fc03 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,3 +1,4 @@ class User < ApplicationRecord has_many :votes + validates :name, presence: true end From 18202e39cabc940ce9fe2c4c7ca2272c856577ba Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Fri, 12 Oct 2018 12:14:18 -0700 Subject: [PATCH 17/47] add validations to Medium --- app/models/medium.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/models/medium.rb b/app/models/medium.rb index 40c7097d1b..81645e5195 100644 --- a/app/models/medium.rb +++ b/app/models/medium.rb @@ -1,5 +1,8 @@ class Medium < ApplicationRecord has_many :votes + validates :title, uniqueness: true, presence: true + validates :publication_year, numericality: true, presence: true + validates :category, presence: true def self.spotlight self.all.max_by do |medium| From 31cb8d288b2df9f6bede1f76c0520b6ed010d11f Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Fri, 12 Oct 2018 12:30:56 -0700 Subject: [PATCH 18/47] add creator validation to Medium --- app/models/medium.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/medium.rb b/app/models/medium.rb index 81645e5195..7285395366 100644 --- a/app/models/medium.rb +++ b/app/models/medium.rb @@ -1,6 +1,7 @@ class Medium < ApplicationRecord has_many :votes validates :title, uniqueness: true, presence: true + validates :creator, presence: true validates :publication_year, numericality: true, presence: true validates :category, presence: true From 4180858273f0a6f52a96e848debe6f29138a9073 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Fri, 12 Oct 2018 12:42:35 -0700 Subject: [PATCH 19/47] add validation tests for Medium --- test/fixtures/media.yml | 8 ++-- test/models/medium_test.rb | 75 ++++++++++++++++++++++++++++++++++++-- test/test_helper.rb | 3 +- 3 files changed, 78 insertions(+), 8 deletions(-) diff --git a/test/fixtures/media.yml b/test/fixtures/media.yml index 623553cdaf..c3a2aab459 100644 --- a/test/fixtures/media.yml +++ b/test/fixtures/media.yml @@ -3,13 +3,13 @@ one: title: MyString description: MyString - ccategory: MyString + category: MyString creator: MyString - publication_year: + publication_year: two: title: MyString description: MyString - ccategory: MyString + category: MyString creator: MyString - publication_year: + publication_year: diff --git a/test/models/medium_test.rb b/test/models/medium_test.rb index 81052cf6ef..b87ffbe70b 100644 --- a/test/models/medium_test.rb +++ b/test/models/medium_test.rb @@ -1,9 +1,78 @@ require "test_helper" describe Medium do - let(:medium) { Medium.new } - it "must be valid" do - value(medium).must_be :valid? + describe 'validations' do + before do + @medium = Medium.new( + title: 'CyberBabies on High', + description: 'cannot recommend this book in good conscience', + category: 'book', + creator: 'Jarth Dengees', + publication_year: 1999 + ) + end + + it 'is valid when title is present and unique, creator and category are present, and publication_year is both numerical and present' do + + is_valid = @medium.valid? + expect( is_valid ).must_equal true + + end + + it 'is invalid without a title' do + @medium.title = nil + + is_valid = @medium.valid? + + expect( is_valid ).must_equal false + expect( @medium.errors.messages ).must_include :title + end + + it 'is invalid with a non-unique title' do + @medium.title = Medium.first.title + + is_valid = @medium.valid? + + expect( is_valid ).must_equal false + expect( @medium.errors.messages ).must_include :title + end + + it 'is invalid without a creator' do + @medium.creator = nil + + is_valid = @medium.valid? + + expect( is_valid ).must_equal false + expect( @medium.errors.messages ).must_include :creator + end + + it 'is invalid without a category' do + @medium.category = nil + + is_valid = @medium.valid? + + expect( is_valid ).must_equal false + expect( @medium.errors.messages ).must_include :category + end + + it 'is invalid without a publication_year' do + @medium.publication_year = nil + + is_valid = @medium.valid? + + expect( is_valid ).must_equal false + expect( @medium.errors.messages ).must_include :publication_year + end + + it 'is invalid when publication_year is non-numeric' do + @medium.publication_year = "beetlejuice beetlejuice beetlejuice" + + is_valid = @medium.valid? + + expect( is_valid ).must_equal false + expect( @medium.errors.messages ).must_include :publication_year + end end + end diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b5172a7d6..fb7dd505e2 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,8 @@ ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" -require "minitest/rails"require "minitest/reporters" # for Colorized output +require "minitest/rails" +require "minitest/reporters" # for Colorized output # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, From 53a7722c12ed808e3ea39d11b705635ed584ac1d Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Fri, 12 Oct 2018 14:04:51 -0700 Subject: [PATCH 20/47] add tests for relations and custom methods for Medium --- test/fixtures/media.yml | 27 +++++++++++++-------- test/fixtures/users.yml | 7 ++++-- test/fixtures/votes.yml | 12 ++++++---- test/models/medium_test.rb | 48 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+), 16 deletions(-) diff --git a/test/fixtures/media.yml b/test/fixtures/media.yml index c3a2aab459..c560954350 100644 --- a/test/fixtures/media.yml +++ b/test/fixtures/media.yml @@ -1,15 +1,22 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - title: MyString - description: MyString - category: MyString - creator: MyString - publication_year: + title: Space Ghost Coast to Coast + description: great show about a ghost that lives in space + category: movie + creator: Adult Swim + publication_year: 2001 two: - title: MyString - description: MyString - category: MyString - creator: MyString - publication_year: + title: Platinum Breaks Vol 1 + description: compilation of Metalheadz tracks from the late-nineties techstep era + category: album + creator: Goldie + publication_year: 1999 + +three: + title: The Illuminatus! Trilogy + description: wacky books about conspiracies and magic + category: book + creator: Robert Anton Wilson + publication_year: 1975 diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 56066c68af..4b73a81784 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -1,7 +1,10 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - name: MyString + name: Gay Nighte two: - name: MyString + name: Ophelia Hiney + +three: + name: Jark Prongo diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml index ef5009d82e..8b3d4a4d33 100644 --- a/test/fixtures/votes.yml +++ b/test/fixtures/votes.yml @@ -1,9 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - user_id: - medium_id: + user_id: one + medium_id: one two: - user_id: - medium_id: + user_id: two + medium_id: one + +three: + user_id: three + medium_id: one diff --git a/test/models/medium_test.rb b/test/models/medium_test.rb index b87ffbe70b..5e8d42fbda 100644 --- a/test/models/medium_test.rb +++ b/test/models/medium_test.rb @@ -3,6 +3,7 @@ describe Medium do describe 'validations' do + before do @medium = Medium.new( title: 'CyberBabies on High', @@ -73,6 +74,53 @@ expect( is_valid ).must_equal false expect( @medium.errors.messages ).must_include :publication_year end + + end + + describe 'relations' do + + before do + @medium = media(:one) + medium_id = @medium.id + + # create 3 vote instances for @medium + Vote.create!(user_id: users(:one).id, medium_id: medium_id) + Vote.create!(user_id: users(:two).id, medium_id: medium_id) + Vote.create!(user_id: users(:three).id, medium_id: medium_id) + end + + it 'can access votes through instance method' do + votes = @medium.votes + expect( votes.length ).must_equal 3 + end + + end + + describe 'spotlight self method' do + + before do + @medium = media(:one) + medium_id = @medium.id + + @medium2 = media(:two) + medium2_id = @medium2.id + + # create 2 vote instances for @medium + Vote.create!(user_id: users(:one).id, medium_id: medium_id) + Vote.create!(user_id: users(:two).id, medium_id: medium_id) + + # create 3 vote instances for @medium2 + Vote.create!(user_id: users(:two).id, medium_id: medium2_id) + Vote.create!(user_id: users(:three).id, medium_id: medium2_id) + Vote.create!(user_id: users(:one).id, medium_id: medium2_id) + end + + it 'returns the Medium instance with the most votes' do + spotlight = Medium.spotlight + + expect( spotlight ).must_equal @medium2 + end + end end From ba0f6f671914c044f9ca83fa7cb4d3c76e1db7a3 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Fri, 12 Oct 2018 14:20:26 -0700 Subject: [PATCH 21/47] add User tests --- app/models/user.rb | 2 +- test/models/medium_test.rb | 18 ++++++------- test/models/user_test.rb | 52 +++++++++++++++++++++++++++++++++++--- 3 files changed, 58 insertions(+), 14 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index c46e64fc03..0d97f7210b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,4 +1,4 @@ class User < ApplicationRecord has_many :votes - validates :name, presence: true + validates :name, presence: true, uniqueness: true end diff --git a/test/models/medium_test.rb b/test/models/medium_test.rb index 5e8d42fbda..6a78c759e9 100644 --- a/test/models/medium_test.rb +++ b/test/models/medium_test.rb @@ -15,10 +15,8 @@ end it 'is valid when title is present and unique, creator and category are present, and publication_year is both numerical and present' do - is_valid = @medium.valid? expect( is_valid ).must_equal true - end it 'is invalid without a title' do @@ -84,9 +82,9 @@ medium_id = @medium.id # create 3 vote instances for @medium - Vote.create!(user_id: users(:one).id, medium_id: medium_id) - Vote.create!(user_id: users(:two).id, medium_id: medium_id) - Vote.create!(user_id: users(:three).id, medium_id: medium_id) + Vote.create!( user_id: users(:one).id, medium_id: medium_id ) + Vote.create!( user_id: users(:two).id, medium_id: medium_id ) + Vote.create!( user_id: users(:three).id, medium_id: medium_id ) end it 'can access votes through instance method' do @@ -106,13 +104,13 @@ medium2_id = @medium2.id # create 2 vote instances for @medium - Vote.create!(user_id: users(:one).id, medium_id: medium_id) - Vote.create!(user_id: users(:two).id, medium_id: medium_id) + Vote.create!( user_id: users(:one).id, medium_id: medium_id ) + Vote.create!( user_id: users(:two).id, medium_id: medium_id ) # create 3 vote instances for @medium2 - Vote.create!(user_id: users(:two).id, medium_id: medium2_id) - Vote.create!(user_id: users(:three).id, medium_id: medium2_id) - Vote.create!(user_id: users(:one).id, medium_id: medium2_id) + Vote.create!( user_id: users(:two).id, medium_id: medium2_id ) + Vote.create!( user_id: users(:three).id, medium_id: medium2_id ) + Vote.create!( user_id: users(:one).id, medium_id: medium2_id ) end it 'returns the Medium instance with the most votes' do diff --git a/test/models/user_test.rb b/test/models/user_test.rb index cc862ac2d9..1955f7571b 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -1,9 +1,55 @@ require "test_helper" describe User do - let(:user) { User.new } - it "must be valid" do - value(user).must_be :valid? + describe 'validations' do + + before do + @user = User.new( + name: 'A Hoe Called Alesse' + ) + end + + it 'is valid when name is present and unique' do + is_valid = @user.valid? + expect( is_valid ).must_equal true + end + + it 'is invalid without a name' do + @user.name = nil + + is_valid = @user.valid? + + expect( is_valid ).must_equal false + end + + it 'is invalid with a non-unique name' do + @user.name = users(:one).name + + is_valid = @user.valid? + + expect( is_valid ).must_equal false + end + + end + + describe 'relations' do + + before do + @user = users(:one) + user_id = @user.id + + # create 3 vote instances for @user + Vote.create!( user_id: user_id, medium_id: media(:one).id ) + Vote.create!( user_id: user_id, medium_id: media(:two).id ) + Vote.create!( user_id: user_id, medium_id: media(:three).id ) + end + + it 'can access votes through instance method' do + votes = @user.votes + expect( votes.length ).must_equal 3 + end + end + end From cc2acdc07b0516e8dd4d4167f22751804a6faf35 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Fri, 12 Oct 2018 14:47:09 -0700 Subject: [PATCH 22/47] add tests for vote model --- test/fixtures/votes.yml | 12 ------------ test/models/vote_test.rb | 38 +++++++++++++++++++++++++++++++++++--- 2 files changed, 35 insertions(+), 15 deletions(-) diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml index 8b3d4a4d33..6fac8be982 100644 --- a/test/fixtures/votes.yml +++ b/test/fixtures/votes.yml @@ -1,13 +1 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: - user_id: one - medium_id: one - -two: - user_id: two - medium_id: one - -three: - user_id: three - medium_id: one diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index fc15947bd3..9a11a40d5b 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -1,9 +1,41 @@ require "test_helper" describe Vote do - let(:vote) { Vote.new } - it "must be valid" do - value(vote).must_be :valid? + describe 'relations' do + + before do + @vote = Vote.new + end + + it 'can set the medium through "medium_id"' do + @vote.medium_id = media(:one).id + + expect( @vote.medium_id ).must_equal media(:one).id + expect( @vote.medium ).must_equal media(:one) + end + + it 'can set the medium through "medium"' do + @vote.medium = media(:one) + + expect( @vote.medium ).must_equal media(:one) + expect( @vote.medium_id ).must_equal media(:one).id + end + + it 'can set the user through "user_id"' do + @vote.user_id = users(:one).id + + expect( @vote.user_id ).must_equal users(:one).id + expect( @vote.user ).must_equal users(:one) + end + + it 'can set the user through "user"' do + @vote.user = users(:one) + + expect( @vote.user_id ).must_equal users(:one).id + expect( @vote.user ).must_equal users(:one) + end + end + end From ce975b5f1cccb82b165d7542af362ae57e3472b1 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Fri, 12 Oct 2018 15:20:58 -0700 Subject: [PATCH 23/47] add new user route and create action to UsersController --- app/controllers/users_controller.rb | 13 +++++++++++++ config/routes.rb | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 3e74dea87f..c71459289e 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,2 +1,15 @@ class UsersController < ApplicationController + def new + end + + def create + user = User.find_by(params[:id]) + + if user + session[:user_id] = user.id + else + user = User.create(name: params[:id]) + session[:user_id] = user.id + end + end end diff --git a/config/routes.rb b/config/routes.rb index c6d1f2fb3e..311d7bf085 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,7 +2,7 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html root "pages#show", page: "home" resources :media - resources :users, only: [:index] + resources :users, only: [:index, :new] post '/media/:id/upvote', to: 'users#upvote', as: :upvote get "/pages/:page" => "pages#show" end From a58e9981a3a1cc3fd1aaf85126be8eab55caa100 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Fri, 12 Oct 2018 15:48:24 -0700 Subject: [PATCH 24/47] add login functionality --- app/controllers/users_controller.rb | 7 +++++-- app/views/users/new.html.erb | 6 ++++++ config/routes.rb | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 app/views/users/new.html.erb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index c71459289e..5a7896114c 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3,13 +3,16 @@ def new end def create - user = User.find_by(params[:id]) + user = User.find_by(name: params[:name]) if user session[:user_id] = user.id + redirect_to root_path else - user = User.create(name: params[:id]) + user = User.create(name: params[:name]) + session[:user_id] = user.id + redirect_to root_path end end end diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb new file mode 100644 index 0000000000..8448f522fd --- /dev/null +++ b/app/views/users/new.html.erb @@ -0,0 +1,6 @@ +<%= form_with method: :post, url: users_path do |f| %> +<%= f.label :name %> +<%= f.text_field :name %> + +<%= f.submit "slurp" %> +<% end %> diff --git a/config/routes.rb b/config/routes.rb index 311d7bf085..058a9ce1ef 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,7 +2,7 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html root "pages#show", page: "home" resources :media - resources :users, only: [:index, :new] + resources :users, only: [:index, :new, :create] post '/media/:id/upvote', to: 'users#upvote', as: :upvote get "/pages/:page" => "pages#show" end From deb2248e8bb7728c6f654accd5abdf74b632b6f9 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Sat, 13 Oct 2018 15:16:49 -0700 Subject: [PATCH 25/47] add logout functionality --- app/controllers/users_controller.rb | 23 +++++++++++++++++++---- app/views/layouts/application.html.erb | 11 +++++++++++ config/routes.rb | 7 ++++--- 3 files changed, 34 insertions(+), 7 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 5a7896114c..ab1fbd450f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3,16 +3,31 @@ def new end def create - user = User.find_by(name: params[:name]) + name = params[:name] + user = User.find_by(name: name) if user + flash[:success] = "Ur logged tf in, #{name}! (also ur my bro)" session[:user_id] = user.id redirect_to root_path else - user = User.create(name: params[:name]) + user = User.create(name: name) - session[:user_id] = user.id - redirect_to root_path + if user.save + flash[:success] = "New account created. Welcome tf to our site, #{name} (also ur my bro now, js)" + + session[:user_id] = user.id + redirect_to root_path + else + flash.now[:error] = "uh oh bro, looks like something went wrong..." + render :new + end end end + + def logout + session[:user_id] = nil + flash[:success] = "Ur logged tf out, bro!! high five!" + redirect_to root_path + end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 9e16e967f0..d7fd4120b4 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,6 +10,17 @@ + <%= link_to "logout", logout_path, method: :post %> + +
+ <% flash.each do |key, message| %> + <% alert_class = key == "error" ? "danger" : key %> +

+ <%= message %> +

+ <% end %> +
+ <%= yield %> diff --git a/config/routes.rb b/config/routes.rb index 058a9ce1ef..417ff66886 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,8 +1,9 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - root "pages#show", page: "home" + root 'pages#show', page: 'home' resources :media resources :users, only: [:index, :new, :create] - post '/media/:id/upvote', to: 'users#upvote', as: :upvote - get "/pages/:page" => "pages#show" + post '/media/:id/upvote', to: 'users#upvote', as: 'upvote' + get '/pages/:page' => 'pages#show' + post '/users/logout', to: 'users#logout', as: 'logout' end From 0406011cc9abf8bea119dbe894f7424d4ad9b678 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Sat, 13 Oct 2018 16:00:02 -0700 Subject: [PATCH 26/47] add login/logout functionality to primary layout --- app/controllers/application_controller.rb | 9 +++++++++ app/controllers/users_controller.rb | 1 + app/views/layouts/application.html.erb | 12 +++++++++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 09705d12ab..834cf793ca 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,11 @@ class ApplicationController < ActionController::Base + + before_action :find_existing_user + + private + + def find_existing_user + @existing_user = User.find_by(id: session[:user_id]) + end + end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index ab1fbd450f..1fd5c695dc 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -30,4 +30,5 @@ def logout flash[:success] = "Ur logged tf out, bro!! high five!" redirect_to root_path end + end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index d7fd4120b4..5f8fcad497 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,7 +10,17 @@ - <%= link_to "logout", logout_path, method: :post %> +
<% flash.each do |key, message| %> From eea20bc0188ef18063f6ddf89feb2a6aab826bd5 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Sat, 13 Oct 2018 16:20:45 -0700 Subject: [PATCH 27/47] add primitive upvote functionality --- app/controllers/users_controller.rb | 12 +++++++++++- app/views/media/show.html.erb | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 1fd5c695dc..91755c9cc9 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -30,5 +30,15 @@ def logout flash[:success] = "Ur logged tf out, bro!! high five!" redirect_to root_path end - + + def upvote + if Vote.create(user_id: session[:user_id], medium_id: params[:id]) + flash[:success] = "bro nice upvote! i saw that!! high five for the positivity bro.." + redirect_to medium_path(params[:id]) + else + flash.now[:error] = "uh bro something did not work sorry :/" + render :template => "media/show(#{params[:id]})" + end + end + end diff --git a/app/views/media/show.html.erb b/app/views/media/show.html.erb index 553aa006d6..3cc4a58ef4 100644 --- a/app/views/media/show.html.erb +++ b/app/views/media/show.html.erb @@ -7,7 +7,7 @@ <%= link_to "Delete", medium_path(@medium), method: :delete, data: { confirm: "Are you 1000% sure you want to delete the book #{@medium.title}?" } %> - +<%= link_to "upvote", upvote_path(@medium), method: :post %>

<%= @medium.votes.length %> votes for this <%= @medium.category %>

From 6b025cd75bf2f2be30e2ff5c216da6ea75175501 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Sat, 13 Oct 2018 16:40:00 -0700 Subject: [PATCH 28/47] prevent users from voting more than once per medium --- app/controllers/users_controller.rb | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 91755c9cc9..d92891294f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -32,13 +32,24 @@ def logout end def upvote - if Vote.create(user_id: session[:user_id], medium_id: params[:id]) - flash[:success] = "bro nice upvote! i saw that!! high five for the positivity bro.." - redirect_to medium_path(params[:id]) + if Vote.find_by(user_id: session[:user_id], medium_id: params[:id]) + flash[:error] = "bro lol you can't vote for the same thing twice! lmao dude ur a TRIP!" + show_redirect else - flash.now[:error] = "uh bro something did not work sorry :/" - render :template => "media/show(#{params[:id]})" + if Vote.create(user_id: session[:user_id], medium_id: params[:id]) + flash[:success] = "bro nice upvote! i saw that!! high five for the positivity bro.." + show_redirect + else + flash[:error] = "uh bro something did not work sorry :/" + show_redirect + end end end + private + + def show_redirect + return redirect_to medium_path(params[:id]) + end + end From 87a0d16f38293e78df1178c5310e33871869610f Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Sat, 13 Oct 2018 17:26:24 -0700 Subject: [PATCH 29/47] move display logic from controllers into view helpers; pare down pages_controller routing --- app/controllers/media_controller.rb | 2 ++ app/controllers/pages_controller.rb | 16 +++++++--------- app/controllers/users_controller.rb | 1 + app/helpers/media_helper.rb | 4 ++++ app/helpers/pages_helper.rb | 17 +++++++++++++++++ app/views/media/index.html.erb | 6 +++--- app/views/pages/home.html.erb | 15 ++++----------- config/routes.rb | 4 ++-- 8 files changed, 40 insertions(+), 25 deletions(-) diff --git a/app/controllers/media_controller.rb b/app/controllers/media_controller.rb index 544a76b846..694fd68abd 100644 --- a/app/controllers/media_controller.rb +++ b/app/controllers/media_controller.rb @@ -1,4 +1,5 @@ class MediaController < ApplicationController + def index @movies = Medium.where(category: "movie") @books = Medium.where(category: "book") @@ -58,4 +59,5 @@ def medium_params :publication_year ) end + end diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index d53841ffe9..2f2a2839bc 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -1,13 +1,11 @@ class PagesController < ApplicationController - def show - if params[:page] == "home" - @movies = Medium.where(category: "movie") - @books = Medium.where(category: "book") - @albums = Medium.where(category: "album") - - @media_spotlight = Medium.spotlight - end + + def home + @movies = Medium.where(category: "movie") + @books = Medium.where(category: "book") + @albums = Medium.where(category: "album") - render template: "pages/#{params[:page]}" + @media_spotlight = Medium.spotlight end + end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index d92891294f..6cd0558600 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,4 +1,5 @@ class UsersController < ApplicationController + def new end diff --git a/app/helpers/media_helper.rb b/app/helpers/media_helper.rb index d08298bc71..0d384e6fae 100644 --- a/app/helpers/media_helper.rb +++ b/app/helpers/media_helper.rb @@ -1,2 +1,6 @@ module MediaHelper + def order_by_votes(collection) + sorted = collection.sort_by { |medium| medium.votes.length } + return sorted.reverse! + end end diff --git a/app/helpers/pages_helper.rb b/app/helpers/pages_helper.rb index 2c057fd054..87e0026792 100644 --- a/app/helpers/pages_helper.rb +++ b/app/helpers/pages_helper.rb @@ -1,2 +1,19 @@ module PagesHelper + def first_ten_by_votes(collection) + sorted = collection.sort_by { |medium| medium.votes.length } + sorted.reverse! + return sorted.first(10) + end + + def media_spotlight_text(medium) + text = "#{medium.votes.length} " + + if medium.votes.length == 1 + text += "vote" + else + text += "votes" + end + + return text += " - #{medium.description}" + end end diff --git a/app/views/media/index.html.erb b/app/views/media/index.html.erb index 2deb8a82ac..1025a2566b 100644 --- a/app/views/media/index.html.erb +++ b/app/views/media/index.html.erb @@ -1,8 +1,8 @@

Books

- <%= render partial: "media_table", locals: {collection: @books} %> + <%= render partial: "media_table", locals: {collection: order_by_votes(@books) } %>

Movies

- <%= render partial: "media_table", locals: {collection: @movies} %> + <%= render partial: "media_table", locals: {collection: order_by_votes(@movies) } %>

Albums

- <%= render partial: "media_table", locals: {collection: @albums} %> + <%= render partial: "media_table", locals: {collection: order_by_votes(@albums) } %>
diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb index 9eb7e51298..700b1273a6 100644 --- a/app/views/pages/home.html.erb +++ b/app/views/pages/home.html.erb @@ -6,20 +6,13 @@ <%= link_to @media_spotlight.title, medium_path(@media_spotlight) %>

- <%= @media_spotlight.votes.length %> - <% if @media_spotlight.votes.length == 1 %> - vote - <% else %> - votes - <% end %> - - - <%= @media_spotlight.description %> + <%= media_spotlight_text(@media_spotlight) %>

Books

-<%= render partial: "media/media_table", locals: {collection: @books} %> +<%= render partial: "media/media_table", locals: {collection: first_ten_by_votes(@books) } %>

Movies

-<%= render partial: "media/media_table", locals: {collection: @movies} %> +<%= render partial: "media/media_table", locals: {collection: first_ten_by_votes(@movies) } %>

Albums

-<%= render partial: "media/media_table", locals: {collection: @albums} %> +<%= render partial: "media/media_table", locals: {collection: first_ten_by_votes(@albums) } %> diff --git a/config/routes.rb b/config/routes.rb index 417ff66886..8c638fcdea 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,9 +1,9 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - root 'pages#show', page: 'home' + root 'pages#home' resources :media resources :users, only: [:index, :new, :create] post '/media/:id/upvote', to: 'users#upvote', as: 'upvote' - get '/pages/:page' => 'pages#show' + get '/pages/home', to: 'pages#home', as: 'home' post '/users/logout', to: 'users#logout', as: 'logout' end From ca958fd8c9f02282c76a795dd670c507b5535cf7 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Sat, 13 Oct 2018 18:06:12 -0700 Subject: [PATCH 30/47] slightly altered an error message and refactored one line in a view helper --- app/controllers/users_controller.rb | 4 ++-- app/helpers/pages_helper.rb | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 6cd0558600..efc9b273e7 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,5 +1,5 @@ class UsersController < ApplicationController - + def new end @@ -41,7 +41,7 @@ def upvote flash[:success] = "bro nice upvote! i saw that!! high five for the positivity bro.." show_redirect else - flash[:error] = "uh bro something did not work sorry :/" + flash[:error] = "uh bro something did not work sorry :/ (ps i'm bailing)" show_redirect end end diff --git a/app/helpers/pages_helper.rb b/app/helpers/pages_helper.rb index 87e0026792..37ff917eab 100644 --- a/app/helpers/pages_helper.rb +++ b/app/helpers/pages_helper.rb @@ -8,11 +8,7 @@ def first_ten_by_votes(collection) def media_spotlight_text(medium) text = "#{medium.votes.length} " - if medium.votes.length == 1 - text += "vote" - else - text += "votes" - end + medium.votes.length == 1 ? text += "vote" : text += "votes" return text += " - #{medium.description}" end From 18e06da7c90a07b5363d57c968a15f6e55e68642 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Sat, 13 Oct 2018 20:24:10 -0700 Subject: [PATCH 31/47] extract votes table into partial; frefactor voting logic --- app/controllers/media_controller.rb | 2 +- app/controllers/users_controller.rb | 13 ++++++++----- app/views/media/_vote.html.erb | 4 ++++ app/views/media/_vote_table.html.erb | 11 +++++++++++ app/views/media/index.html.erb | 6 +++--- app/views/media/show.html.erb | 25 +------------------------ 6 files changed, 28 insertions(+), 33 deletions(-) create mode 100644 app/views/media/_vote.html.erb create mode 100644 app/views/media/_vote_table.html.erb diff --git a/app/controllers/media_controller.rb b/app/controllers/media_controller.rb index 694fd68abd..adf8b47c33 100644 --- a/app/controllers/media_controller.rb +++ b/app/controllers/media_controller.rb @@ -1,5 +1,5 @@ class MediaController < ApplicationController - + def index @movies = Medium.where(category: "movie") @books = Medium.where(category: "book") diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index efc9b273e7..da6bc71e72 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -12,11 +12,10 @@ def create session[:user_id] = user.id redirect_to root_path else - user = User.create(name: name) + user = User.new(name: name) if user.save flash[:success] = "New account created. Welcome tf to our site, #{name} (also ur my bro now, js)" - session[:user_id] = user.id redirect_to root_path else @@ -33,11 +32,15 @@ def logout end def upvote - if Vote.find_by(user_id: session[:user_id], medium_id: params[:id]) - flash[:error] = "bro lol you can't vote for the same thing twice! lmao dude ur a TRIP!" + preexisting = Vote.find_by(user_id: session[:user_id], medium_id: params[:id]) + + if preexisting + flash[:error] = "bro lol you can't vote for the same thing twice! smh dude u r a TRIP!" show_redirect else - if Vote.create(user_id: session[:user_id], medium_id: params[:id]) + vote = Vote.new(user_id: session[:user_id], medium_id: params[:id]) + + if vote.save flash[:success] = "bro nice upvote! i saw that!! high five for the positivity bro.." show_redirect else diff --git a/app/views/media/_vote.html.erb b/app/views/media/_vote.html.erb new file mode 100644 index 0000000000..3c3e2f9842 --- /dev/null +++ b/app/views/media/_vote.html.erb @@ -0,0 +1,4 @@ + + <%= vote.user.name %> + <%= vote.created_at.to_date %> + diff --git a/app/views/media/_vote_table.html.erb b/app/views/media/_vote_table.html.erb new file mode 100644 index 0000000000..d8a1241faf --- /dev/null +++ b/app/views/media/_vote_table.html.erb @@ -0,0 +1,11 @@ + + + + + + + + + <%= render partial: "vote", collection: collection %> + +
UserDate
diff --git a/app/views/media/index.html.erb b/app/views/media/index.html.erb index 1025a2566b..2c3b07271a 100644 --- a/app/views/media/index.html.erb +++ b/app/views/media/index.html.erb @@ -1,8 +1,8 @@

Books

- <%= render partial: "media_table", locals: {collection: order_by_votes(@books) } %> + <%= render partial: "media_table", locals: { collection: order_by_votes(@books) } %>

Movies

- <%= render partial: "media_table", locals: {collection: order_by_votes(@movies) } %> + <%= render partial: "media_table", locals: { collection: order_by_votes(@movies) } %>

Albums

- <%= render partial: "media_table", locals: {collection: order_by_votes(@albums) } %> + <%= render partial: "media_table", locals: { collection: order_by_votes(@albums) } %>
diff --git a/app/views/media/show.html.erb b/app/views/media/show.html.erb index 3cc4a58ef4..4559274598 100644 --- a/app/views/media/show.html.erb +++ b/app/views/media/show.html.erb @@ -11,28 +11,5 @@

<%= @medium.votes.length %> votes for this <%= @medium.category %>

- - - - - - - - - <% @medium.votes.each do |vote| %> - - - - - <% end %> - -
- User - - Date -
- <%= vote.user.name %> - - <%= vote.created_at.to_date %> -
+ <%= render partial: "vote_table", locals: { collection: @medium.votes } %>
From 153cdb424958ee081acf7b02ca1e469a97844f9b Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Sat, 13 Oct 2018 21:02:34 -0700 Subject: [PATCH 32/47] add user show page --- app/controllers/users_controller.rb | 15 ++++++++++++++- app/views/media/_vote.html.erb | 2 +- app/views/users/show.html.erb | 28 ++++++++++++++++++++++++++++ config/routes.rb | 2 +- 4 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 app/views/users/show.html.erb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index da6bc71e72..9525e6e0ca 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,5 +1,18 @@ class UsersController < ApplicationController + def index + @users = User.all + end + + def show + @user = User.find_by(id: params[:id]) + @votes = Vote.where(user_id: @user.id) + + if @user.nil? + head :not_found + end + end + def new end @@ -33,7 +46,7 @@ def logout def upvote preexisting = Vote.find_by(user_id: session[:user_id], medium_id: params[:id]) - + if preexisting flash[:error] = "bro lol you can't vote for the same thing twice! smh dude u r a TRIP!" show_redirect diff --git a/app/views/media/_vote.html.erb b/app/views/media/_vote.html.erb index 3c3e2f9842..8047f7a701 100644 --- a/app/views/media/_vote.html.erb +++ b/app/views/media/_vote.html.erb @@ -1,4 +1,4 @@ - <%= vote.user.name %> + <%= link_to "#{vote.user.name}", user_path(vote.user) %> <%= vote.created_at.to_date %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb new file mode 100644 index 0000000000..2eefece235 --- /dev/null +++ b/app/views/users/show.html.erb @@ -0,0 +1,28 @@ +

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

+

+ Joined site <%= @user.created_at.to_date %> +

+ +

Votes

+ + + + + + + + + + + + <% @votes.each do |vote| %> + + + + + + + + <% end %> + +
Media TitleCreated ByPublishedCategoryVoted On
<%= link_to "#{vote.medium.title}", medium_path(vote.medium) %><%= vote.medium.creator %><%= vote.medium.publication_year %><%= vote.medium.category %><%= vote.created_at %>
diff --git a/config/routes.rb b/config/routes.rb index 8c638fcdea..3f95f09857 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,7 +2,7 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html root 'pages#home' resources :media - resources :users, only: [:index, :new, :create] + resources :users, except: [:edit, :update, :destroy] post '/media/:id/upvote', to: 'users#upvote', as: 'upvote' get '/pages/home', to: 'pages#home', as: 'home' post '/users/logout', to: 'users#logout', as: 'logout' From ca087dba586eccad9d020f43dc07ebbf61bf2d12 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Sat, 13 Oct 2018 21:06:38 -0700 Subject: [PATCH 33/47] add index page for users --- app/views/users/index.html.erb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 app/views/users/index.html.erb diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb new file mode 100644 index 0000000000..8b67c29f6d --- /dev/null +++ b/app/views/users/index.html.erb @@ -0,0 +1,17 @@ +

List of Bros

+ + + + + + + + <% @users.each do |user| %> + + + + + + <% end %> + +
BronameVotesJoined
<%= link_to "#{user.name}", user_path(user) %><%= user.votes.length %><%= user.created_at.to_date %>
From 35175a081d0a88d9461c9f96e1a0fc69c2fa175f Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Sun, 14 Oct 2018 18:15:55 -0700 Subject: [PATCH 34/47] html for header and home page --- app/views/layouts/application.html.erb | 63 ++++++++++++++++++-------- app/views/pages/_medium.html.erb | 7 +++ app/views/pages/home.html.erb | 55 +++++++++++++++------- 3 files changed, 89 insertions(+), 36 deletions(-) create mode 100644 app/views/pages/_medium.html.erb diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 5f8fcad497..a80a971dee 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,27 +10,50 @@ - -<%= link_to "Delete", medium_path(@medium), method: :delete, data: { confirm: "Are you 1000% sure you want to delete the book #{@medium.title}?" } %> - -<%= link_to "upvote", upvote_path(@medium), method: :post %> - -
-

<%= @medium.votes.length %> votes for this <%= @medium.category %>

+
+

<%= @medium.votes.length %> votes for this <%= @medium.category %>

<%= render partial: "vote_table", locals: { collection: @medium.votes } %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 2eefece235..2b1c275032 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,28 +1,31 @@ -

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

+

Bro Summary: <%= link_to "#{@user.name}", user_path(@user) %>

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

-

Votes

- - - - - - - - - - - - <% @votes.each do |vote| %> - - - - - - - - <% end %> - -
Media TitleCreated ByPublishedCategoryVoted On
<%= link_to "#{vote.medium.title}", medium_path(vote.medium) %><%= vote.medium.creator %><%= vote.medium.publication_year %><%= vote.medium.category %><%= vote.created_at %>
+
+

Votes

+ + + + + + + + + + + + <% @votes.each do |vote| %> + + + + + + + + <% end %> + +
Bro TitleCreated ByPublishedCategoryVoted On
<%= link_to "#{vote.medium.title}", medium_path(vote.medium) %><%= vote.medium.creator %><%= vote.medium.publication_year %><%= vote.medium.category %><%= vote.created_at %>
+<%= link_to "See all Users", users_path, class: 'btn btn-secondary' %> +<%= link_to "Back to Bro List", root_path, class: 'btn btn-primary' %> From f5a80f83b22d3ba0851b44d40441111e2f1e3963 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Sun, 14 Oct 2018 19:22:41 -0700 Subject: [PATCH 40/47] add find_by before_action to media controller --- app/controllers/media_controller.rb | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app/controllers/media_controller.rb b/app/controllers/media_controller.rb index adf8b47c33..7acd49099a 100644 --- a/app/controllers/media_controller.rb +++ b/app/controllers/media_controller.rb @@ -1,5 +1,7 @@ class MediaController < ApplicationController + before_action :find_medium, except: [:index, :new, :create] + def index @movies = Medium.where(category: "movie") @books = Medium.where(category: "book") @@ -7,7 +9,6 @@ def index end def show - @medium = Medium.find_by(id: params[:id]) if @medium.nil? head :not_found end @@ -29,22 +30,18 @@ def create end def edit - @medium = Medium.find_by(id: params[:id]) end def update - medium = Medium.find(params[:id]) - if medium.update(medium_params) - redirect_to medium_path(medium.id) + if @medium.update(medium_params) + redirect_to medium_path(@medium.id) else render :edit, status: :bad_request end end def destroy - medium = Medium.find_by(id: params[:id]) - - medium.destroy + @medium.destroy redirect_to media_path end @@ -60,4 +57,8 @@ def medium_params ) end + def find_medium + @medium = Medium.find_by(id: params[:id]) + end + end From 58443ea5ffe1295df29ca6e6fda17e050d7631c6 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Sun, 14 Oct 2018 19:47:00 -0700 Subject: [PATCH 41/47] steal css from sample site --- app/assets/stylesheets/application.scss | 164 ++++++++++++++++++++++++ app/views/layouts/application.html.erb | 3 +- app/views/media/_media_table.html.erb | 2 +- app/views/users/index.html.erb | 2 +- 4 files changed, 168 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 8b1701e581..188139730f 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -16,3 +16,167 @@ @import "bootstrap"; /* Import scss content */ @import "**/*"; + +.user-votes__container { + margin-top:2rem +} + +.user-votes__header { + color:black +} + +.works-votes__container { + margin-top:2rem +} + +.works-votes__header { + color:black +} + +body, h1, h2, h3, h4, h5 { + font-family:"Gudea", sans-serif +} + +h1, h2, h3, h4, h5 { + font-weight:bold +} + +a, h2, h3 { + color:#26A69A +} + +a:hover { + color:#00796B; + text-decoration:none +} + +.alert { + margin:0 +} + +.btn-primary { + background-color:#26A69A; + color:white; + border-color:#26A69A +} + +.btn:hover { + background-color:#00796B; + color:white +} + +.table td { + vertical-align:middle +} + +.app-header__nav { + display:flex; + flex-direction:row; + justify-content:space-between +} + +.app-header__nav_item { + margin-top:1rem +} + +.app-header__nav_item .nav-link { + color:#00796B +} + +.app-header__site-nav-container .app-header__nav_item { + margin-right:2rem +} + +.app-header__user-nav-container .nav-item { + margin-left:2rem +} + +.list-group-item { + border:none +} + +.app-header__header { + max-width:100%; + background-color:#B2DFDB; + margin-bottom:0.5rem; + padding:2rem 1rem 0.5rem 1rem +} + +.app-header__header h1 { + text-align:center; + margin:25px auto 40px auto +} + +.app-header__header h1 a { + color:#FF5722; + padding-right:25px; + margin-right:15px; + border-right:white 2px solid +} + +.app-header__header h1 small { + color:white +} + +.app-header__header p { + margin-bottom:5px +} + +.alert__container { + margin:2rem 0 1rem 0 +} + +.spotlight { + padding:0 2rem 2rem 2rem +} + +.spotlight__header { + color:#26A69A +} + +.spotlight__header--prefix { + color:#424242 +} + +.spotlight__header--prefix::after { + content:":" +} + +.spotlight__link-to { + border-bottom:2px solid +} + +.spotlight__description { + margin-bottom:0 +} + +.root__hr { + margin:0px auto 3rem auto; + color:#EEEEEE +} + +.top-ten__container { + display:grid; + grid-template-columns:1fr 1fr 1fr; + grid-column-gap:2em +} + +.top-ten__header { + color:#26A69A; + border-bottom:2px solid; + border-bottom-color:#B2DFDB +} + +.top-ten__list { + list-style-type:none; + margin-left:0; + padding-left:0 +} + +.top-ten__creator { + color:slategrey +} + +main { + padding:2rem +} diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index a80a971dee..742eb76a70 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,10 +1,11 @@ - Mediaranker + Bro Ranker <%= csrf_meta_tags %> <%= csp_meta_tag %> + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> diff --git a/app/views/media/_media_table.html.erb b/app/views/media/_media_table.html.erb index 71b47ade85..9e55d67dac 100644 --- a/app/views/media/_media_table.html.erb +++ b/app/views/media/_media_table.html.erb @@ -1,4 +1,4 @@ - +
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 3f3b684f64..b6a7b07160 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -1,4 +1,4 @@ -

List of Bros

+

List of Users (who mostly happen to also be Bros)

Votes
From 2360da28f833b14f5b716ec499e637ead73b6f17 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Sun, 14 Oct 2018 19:48:47 -0700 Subject: [PATCH 42/47] adjust upvote error message --- app/controllers/users_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 9525e6e0ca..380b93dad2 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -57,7 +57,7 @@ def upvote flash[:success] = "bro nice upvote! i saw that!! high five for the positivity bro.." show_redirect else - flash[:error] = "uh bro something did not work sorry :/ (ps i'm bailing)" + flash[:error] = "uh bro something did not work sorry :/ (ps i'm bailing) [maybe try tagging in first bro?]" show_redirect end end From dd361d78f7854afb250935b35f6378a2259acbd5 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Sun, 14 Oct 2018 22:09:39 -0700 Subject: [PATCH 43/47] fixed some typos/a flash error message --- app/controllers/media_controller.rb | 1 + app/views/layouts/application.html.erb | 4 ++-- app/views/users/new.html.erb | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/media_controller.rb b/app/controllers/media_controller.rb index 7acd49099a..77191f9520 100644 --- a/app/controllers/media_controller.rb +++ b/app/controllers/media_controller.rb @@ -25,6 +25,7 @@ def create flash[:success] = "Successfully added a new #{@medium.category} to the database!" redirect_to medium_path(@medium) else + flash.now[:error] = "Something went wrong here bro.. Try filling out all the fields yeah?" render :new, status: :bad_request end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 742eb76a70..e35db86f90 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -14,7 +14,7 @@

<%= link_to "Bro Ranker™", root_path %> - Ranking the Best Bros + Ranking Only the Best Bros...