From 0ccd2c9331650b6e772ddaee9d009e3832e4454c Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Mon, 8 Oct 2018 15:31:32 -0700 Subject: [PATCH 01/54] rails new --- .gitignore | 27 ++ .ruby-version | 1 + Gemfile | 81 +++++ Gemfile.lock | 277 ++++++++++++++++++ Guardfile | 9 + README.md | 122 +------- 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 81 files changed, 1419 insertions(+), 109 deletions(-) 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..3e4d19fd03 --- /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.4 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/README.md b/README.md index 24ee1d9971..7db80e4ca1 100644 --- a/README.md +++ b/README.md @@ -1,120 +1,24 @@ -# Media Ranker +# README -## Introduction +This README would normally document whatever steps are necessary to get the +application up and running. -In this project, you will build a webapp where users can vote for their favorite pieces of media. +Things you may want to cover: -In contrast to previous projects, instead of implementing a pre-defined spec you will be imitating an existing site: http://media-ranker-2-0.herokuapp.com. Your job is to match the functionality and styling of this site as closely as possible. +* Ruby version -This is an individual, [stage 2](https://github.com/Ada-Developers-Academy/pedagogy/blob/master/rule-of-three.md) project. +* System dependencies -This project is due **Monday October 15th**. +* Configuration -## Learning Goals +* Database creation -The purpose of this assignment is to reinforce the following concepts: +* Database initialization -- Previous Rails learning, including MVC, RESTful routing, and the request cycle -- Testing Rails applications -- Building complex model logic -- Using `session` and `flash` to track data between requests -- DRYing up Rails code +* How to run the test suite -## Before You Begin +* Services (job queues, cache servers, search engines, etc.) -### Provided Files +* Deployment instructions -- `db/media_seeds.csv`: Some starter media to work with -- `app/assets/images/owl.jpg`: The owl picture from the site - -### Regarding the Word "Media" - -The Rails inflector considers "media" to be the plural of "medium", which is not really what we mean here. You may want to choose a different word to represent "a book, movie or album" internally. The instructor-proved example site uses the word "work". - -## Project Requirements - -### Core Requirements - -Regardless of how you choose to implement this project or how much of it gets done, you should exhibit - -- Squeaky-clean **git hygiene**, including - - A fresh branch for each new feature - - Regular commits - - Descriptive commit messages -- Fanatical devotion to **test-driven development** - - Pseudocode first, then write the tests, then write code to make them pass -- Steadfast adherence to **agile development practices** - - User stories should be listed and prioritized using a Trello board - - The finished application should be deployed to Heroku (deploy early, deploy often) -- Unrelenting use of **semantic HTML** - -### Baseline - -We will begin with some in-class work, exploring the site and pondering implementation details. Before you start writing _any_ code, you should: - -- Explore the existing Media Ranker site to become familiar with the necessary functionality -- Create a Trello board to manage user stories -- Create an ERD for the models - -Then, once you have a solid plan for how to structure your project: - -- Fork and clone the repo -- Use `rails new .` to generate a new Rails project in the cloned directory - - Verify that the changes we've made to Rails' defaults (postgres as the DB, spec-style testing) have been applied -- `git add .` and `git commit -m "Initial Rails setup"` - -### Wave 1 - -In this wave, you should build some functionality, and then build the tests for that functionality. We recommend doing the read and create operations first, then writing tests, then completing the update and delete operations. - -Mimic the site's basic functionality around Media, without worrying (yet) about Users or Votes: -- Build a main page, with a list of the media for each category, as well as a spotlight section for the top media overall (don't worry about the top 10 part right now) -- Build an index page with a list of all works for each category -- Allow users to add new works -- Build a details page for each piece of media -- Allow users to edit and delete works - -#### Testing -**Before** moving on to Wave 2 you need to have model tests for: -- Presence of required attributes -- Uniqueness of attributes -- Valid values for specific attributes - -### Wave 2 - -Mimic the site's functionality around Users and Voting: -- Allow users to "log in" to the site, and use the `session` to keep track of which user is currently logged in for a given browser -- Allow users to vote for media, and sort media by vote count whenever a list of media is displayed -- Don't allow a user to vote for the same media more than once -- Allow the users to see the top 10 for each media type on the main page - -#### Testing -**Before** moving on to Wave 3 you need to have: -- Tests from Wave 1 passing -- Presence and uniqueness validation tests for any new models -- Relationship tests - -Focus on testing voting logic since this is the most complex part of Wave 2. - -#### A note on logging in - -Passwords and security are tricky! We'll talk about that sort of thing a little in the coming weeks, but for now you don't need to provide any sort of security. The user gives you a username, and your site should just trust them. - -### Wave 3 -- Add a list of voting users to the details page for each media -- Add a page for each user, as well as a page showing a summary of all users - -### Optional Enhancement Ideas - -Use Bootstrap and CSS to style the site to match the example. The layout as well as the look and feel should match as close as possible. - -Once your test coverage is comprehensive, your HTML is semantic, your user stories have all been moved to the `Done` column and your application has been deployed to Heroku, you may consider the following enhancements. - -1. DRY up your code as much as you can! Techniques worth investigating: - - Helper methods - - Controller filters -1. Build category-specific pages for `index` and `new` (e.g. `/books` or `/movies/new`). These should be as DRY as possible. You might be interested in investigating _polymorphic routes_. -1. Add a [recommendation system](https://www.toptal.com/algorithms/predicting-likes-inside-a-simple-recommendation-engine) that suggests media to a user based on what they have previously voted for. - -## What we're looking for -You can find what instructors will be looking for in the [feedback](feedback.md) markdown document. +* ... diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000000..e85f913914 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 0000000000..b16e53d6d5 --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css diff --git a/app/assets/images/.keep b/app/assets/images/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js new file mode 100644 index 0000000000..4f73c21a7d --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,20 @@ +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's +// vendor/assets/javascripts directory can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// compiled file. JavaScript code in this file should be added after the last require_* statement. +// +// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details +// about supported directives. + //= require jquery3 + //= require popper + //= require bootstrap-sprockets + +// +//= require rails-ujs +//= require activestorage +//= require turbolinks +//= require_tree . diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js new file mode 100644 index 0000000000..739aa5f022 --- /dev/null +++ b/app/assets/javascripts/cable.js @@ -0,0 +1,13 @@ +// Action Cable provides the framework to deal with WebSockets in Rails. +// You can generate new channels where WebSocket features live using the `rails generate channel` command. +// +//= require action_cable +//= require_self +//= require_tree ./channels + +(function() { + this.App || (this.App = {}); + + App.cable = ActionCable.createConsumer(); + +}).call(this); diff --git a/app/assets/javascripts/channels/.keep b/app/assets/javascripts/channels/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss new file mode 100644 index 0000000000..8b1701e581 --- /dev/null +++ b/app/assets/stylesheets/application.scss @@ -0,0 +1,18 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's + * vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS + * files in this directory. Styles in this file should be added after the last require_* statement. + * It is generally better to create a new file per style scope. + * + */ + +/* Custom bootstrap variables must be set or imported *before* bootstrap. */ +@import "bootstrap"; +/* Import scss content */ +@import "**/*"; diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 0000000000..d672697283 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 0000000000..0ff5442f47 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 0000000000..09705d12ab --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::Base +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb new file mode 100644 index 0000000000..de6be7945c --- /dev/null +++ b/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 0000000000..a009ace51c --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 0000000000..286b2239d1 --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 0000000000..10a4cba84d --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 0000000000..f32268a271 --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,15 @@ + + + + MediaRanker + <%= csrf_meta_tags %> + <%= csp_meta_tag %> + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 0000000000..cbd34d2e9d --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 0000000000..37f0bddbd7 --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 0000000000..f19acf5b5c --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 0000000000..5badb2fde0 --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 0000000000..d87d5f5781 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 0000000000..94fd4d7977 --- /dev/null +++ b/bin/setup @@ -0,0 +1,36 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 0000000000..fb2ec2ebb4 --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 0000000000..58bfaed518 --- /dev/null +++ b/bin/update @@ -0,0 +1,31 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/yarn b/bin/yarn new file mode 100755 index 0000000000..460dd565b4 --- /dev/null +++ b/bin/yarn @@ -0,0 +1,11 @@ +#!/usr/bin/env ruby +APP_ROOT = File.expand_path('..', __dir__) +Dir.chdir(APP_ROOT) do + begin + exec "yarnpkg", *ARGV + rescue Errno::ENOENT + $stderr.puts "Yarn executable was not detected in the system." + $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install" + exit 1 + end +end diff --git a/config.ru b/config.ru new file mode 100644 index 0000000000..f7ba0b527b --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 0000000000..08db79cb25 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,25 @@ +require_relative 'boot' + +require 'rails/all' + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module MediaRanker + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 0000000000..b9e460cef3 --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 0000000000..0b286f676e --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: MediaRanker_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 0000000000..596cdf62cb --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +ku4a5jBIbFcBFvPLaKPPTlfNepm7vy6svO1ODverXhybMSw09A/ld0HC7jomOjA/a9ro4ETiyAbzNDAulgLWB5UB8jAFjq662X+28Igr0skYdw6rpoBpqy0Dnim7ntQX8ly+Al5CFBj3Qg6MOVD6Ih2g93xkzWN07fQTfbM/PYU3TO7MrzSt0cCkwAIhFXTn2zPWHxjDLc6/jeXdGdXrjLGoI0rNUS7mNrj/sSKbYPS9uMPu/79eAqnDXXatwrftPUJep7cpa6jMXmI5f6tIZ2RzEEIIZ1Uq2mZ+iKfQx2ZkvoJy4qloiV1bRqU747LIHo6r8wVAv/FNfqk5LE64ozOTYaL1Io3vRqxr7rL3LQp8c3A9WX0bQDLDtjz2ZJQfPWC8r5U9TPR3i9ppiEg681jZ5gWJHemuXLR/--UPU9SrXSIEKj3c6I--6JnwE3OOnDm8JGGgtrA/iA== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 0000000000..0bd2511123 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: MediaRanker_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: MediaRanker + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: MediaRanker_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: MediaRanker_production + username: MediaRanker + password: <%= ENV['MEDIARANKER_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 0000000000..426333bb46 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 0000000000..1311e3e4ef --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,61 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + # Debug mode disables concatenation and preprocessing of assets. + # This option may cause significant delays in view rendering with a large + # number of complex assets. + config.assets.debug = true + + # Suppress logger output for asset requests. + config.assets.quiet = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 0000000000..bd39d9d752 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,94 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "MediaRanker_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 0000000000..0a38fd3ce9 --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 0000000000..89d2efab2b --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb new file mode 100644 index 0000000000..4b828e80cb --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# Version of your assets, change this if you want to expire all your assets. +Rails.application.config.assets.version = '1.0' + +# Add additional assets to the asset load path. +# Rails.application.config.assets.paths << Emoji.images_path +# Add Yarn node_modules folder to the asset load path. +Rails.application.config.assets.paths << Rails.root.join('node_modules') + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in the app/assets +# folder are already added. +# Rails.application.config.assets.precompile += %w( admin.js admin.css ) diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 0000000000..59385cdf37 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb new file mode 100644 index 0000000000..d3bcaa5ec8 --- /dev/null +++ b/config/initializers/content_security_policy.rb @@ -0,0 +1,25 @@ +# Be sure to restart your server when you modify this file. + +# Define an application-wide content security policy +# For further information see the following documentation +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy + +# Rails.application.config.content_security_policy do |policy| +# policy.default_src :self, :https +# policy.font_src :self, :https, :data +# policy.img_src :self, :https, :data +# policy.object_src :none +# policy.script_src :self, :https +# policy.style_src :self, :https + +# # Specify URI for violation reports +# # policy.report_uri "/csp-violation-report-endpoint" +# end + +# If you are using UJS then enable automatic nonce generation +# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) } + +# Report CSP violations to a specified URI +# For further information see the following documentation: +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only +# Rails.application.config.content_security_policy_report_only = true diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb new file mode 100644 index 0000000000..5a6a32d371 --- /dev/null +++ b/config/initializers/cookies_serializer.rb @@ -0,0 +1,5 @@ +# Be sure to restart your server when you modify this file. + +# Specify a serializer for the signed and encrypted cookie jars. +# Valid options are :json, :marshal, and :hybrid. +Rails.application.config.action_dispatch.cookies_serializer = :json diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 0000000000..4a994e1e7b --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 0000000000..ac033bf9dc --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 0000000000..dc1899682b --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 0000000000..bbfc3961bf --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 0000000000..decc5a8573 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 0000000000..a5eccf816b --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 0000000000..787824f888 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 0000000000..9fa7863f99 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 0000000000..d32f76e8fb --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/db/seeds.rb b/db/seeds.rb new file mode 100644 index 0000000000..1beea2accd --- /dev/null +++ b/db/seeds.rb @@ -0,0 +1,7 @@ +# This file should contain all the record creation needed to seed the database with its default values. +# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). +# +# Examples: +# +# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) +# Character.create(name: 'Luke', movie: movies.first) diff --git a/lib/assets/.keep b/lib/assets/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/log/.keep b/log/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/package.json b/package.json new file mode 100644 index 0000000000..625900f9d8 --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "name": "MediaRanker", + "private": true, + "dependencies": {} +} diff --git a/public/404.html b/public/404.html new file mode 100644 index 0000000000..2be3af26fc --- /dev/null +++ b/public/404.html @@ -0,0 +1,67 @@ + + + + The page you were looking for doesn't exist (404) + + + + + + +
+
+

The page you were looking for doesn't exist.

+

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

+
+

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

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

The change you wanted was rejected.

+

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

+
+

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

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

We're sorry, but something went wrong.

+
+

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

+
+ + diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 0000000000..37b576a4a0 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb new file mode 100644 index 0000000000..d19212abd5 --- /dev/null +++ b/test/application_system_test_case.rb @@ -0,0 +1,5 @@ +require "test_helper" + +class ApplicationSystemTestCase < ActionDispatch::SystemTestCase + driven_by :selenium, using: :chrome, screen_size: [1400, 1400] +end diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/helpers/.keep b/test/helpers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/system/.keep b/test/system/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 0000000000..2b5172a7d6 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,24 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails"require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 0000000000..e69de29bb2 From c27e7f2b67aa7ddf35adde1a51091edd4b770183 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Mon, 8 Oct 2018 15:34:58 -0700 Subject: [PATCH 02/54] initial changes to readme --- README.md | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/README.md b/README.md index 7db80e4ca1..60569b38b9 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,3 @@ # README -This README would normally document whatever steps are necessary to get the -application up and running. - -Things you may want to cover: - -* Ruby version - -* System dependencies - -* Configuration - -* Database creation - -* Database initialization - -* How to run the test suite - -* Services (job queues, cache servers, search engines, etc.) - -* Deployment instructions - -* ... +Media Ranker is a project in the Ada curriculum: https://github.com/Ada-C10/MediaRanker From c40f710a6420219e42dc4d5ede978ccd6f89cd2a Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Mon, 8 Oct 2018 15:54:03 -0700 Subject: [PATCH 03/54] create controller and models for users and works --- app/assets/javascripts/users.js | 2 ++ app/assets/javascripts/works.js | 2 ++ app/assets/stylesheets/users.scss | 3 ++ app/assets/stylesheets/works.scss | 3 ++ app/controllers/users_controller.rb | 2 ++ app/controllers/works_controller.rb | 2 ++ app/helpers/users_helper.rb | 2 ++ app/helpers/works_helper.rb | 2 ++ app/models/user.rb | 2 ++ app/models/work.rb | 2 ++ db/migrate/20181008224029_create_works.rb | 13 +++++++ db/migrate/20181008224326_create_users.rb | 9 +++++ ...609_change_year_type_from_string_to_int.rb | 6 ++++ db/schema.rb | 34 +++++++++++++++++++ test/controllers/users_controller_test.rb | 7 ++++ test/controllers/works_controller_test.rb | 7 ++++ test/fixtures/users.yml | 7 ++++ test/fixtures/works.yml | 15 ++++++++ test/models/user_test.rb | 9 +++++ test/models/work_test.rb | 9 +++++ 20 files changed, 138 insertions(+) create mode 100644 app/assets/javascripts/users.js create mode 100644 app/assets/javascripts/works.js create mode 100644 app/assets/stylesheets/users.scss create mode 100644 app/assets/stylesheets/works.scss create mode 100644 app/controllers/users_controller.rb create mode 100644 app/controllers/works_controller.rb create mode 100644 app/helpers/users_helper.rb create mode 100644 app/helpers/works_helper.rb create mode 100644 app/models/user.rb create mode 100644 app/models/work.rb create mode 100644 db/migrate/20181008224029_create_works.rb create mode 100644 db/migrate/20181008224326_create_users.rb create mode 100644 db/migrate/20181008224609_change_year_type_from_string_to_int.rb create mode 100644 db/schema.rb create mode 100644 test/controllers/users_controller_test.rb create mode 100644 test/controllers/works_controller_test.rb create mode 100644 test/fixtures/users.yml create mode 100644 test/fixtures/works.yml create mode 100644 test/models/user_test.rb create mode 100644 test/models/work_test.rb diff --git a/app/assets/javascripts/users.js b/app/assets/javascripts/users.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/users.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/javascripts/works.js b/app/assets/javascripts/works.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/works.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/users.scss b/app/assets/stylesheets/users.scss new file mode 100644 index 0000000000..31a2eacb84 --- /dev/null +++ b/app/assets/stylesheets/users.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Users controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/works.scss b/app/assets/stylesheets/works.scss new file mode 100644 index 0000000000..5618452f3e --- /dev/null +++ b/app/assets/stylesheets/works.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Works controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb new file mode 100644 index 0000000000..3e74dea87f --- /dev/null +++ b/app/controllers/users_controller.rb @@ -0,0 +1,2 @@ +class UsersController < ApplicationController +end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb new file mode 100644 index 0000000000..56b02c9f2e --- /dev/null +++ b/app/controllers/works_controller.rb @@ -0,0 +1,2 @@ +class WorksController < ApplicationController +end diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb new file mode 100644 index 0000000000..2310a240d7 --- /dev/null +++ b/app/helpers/users_helper.rb @@ -0,0 +1,2 @@ +module UsersHelper +end diff --git a/app/helpers/works_helper.rb b/app/helpers/works_helper.rb new file mode 100644 index 0000000000..ccb78c2b73 --- /dev/null +++ b/app/helpers/works_helper.rb @@ -0,0 +1,2 @@ +module WorksHelper +end diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 0000000000..379658a509 --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,2 @@ +class User < ApplicationRecord +end diff --git a/app/models/work.rb b/app/models/work.rb new file mode 100644 index 0000000000..95322dd45e --- /dev/null +++ b/app/models/work.rb @@ -0,0 +1,2 @@ +class Work < ApplicationRecord +end diff --git a/db/migrate/20181008224029_create_works.rb b/db/migrate/20181008224029_create_works.rb new file mode 100644 index 0000000000..d0d807d601 --- /dev/null +++ b/db/migrate/20181008224029_create_works.rb @@ -0,0 +1,13 @@ +class CreateWorks < ActiveRecord::Migration[5.2] + def change + create_table :works do |t| + t.string :category + t.string :title + t.string :creator + t.string :pub_year + t.string :description + + t.timestamps + end + end +end diff --git a/db/migrate/20181008224326_create_users.rb b/db/migrate/20181008224326_create_users.rb new file mode 100644 index 0000000000..9c711e759b --- /dev/null +++ b/db/migrate/20181008224326_create_users.rb @@ -0,0 +1,9 @@ +class CreateUsers < ActiveRecord::Migration[5.2] + def change + create_table :users do |t| + t.string :username + + t.timestamps + end + end +end diff --git a/db/migrate/20181008224609_change_year_type_from_string_to_int.rb b/db/migrate/20181008224609_change_year_type_from_string_to_int.rb new file mode 100644 index 0000000000..e634d58945 --- /dev/null +++ b/db/migrate/20181008224609_change_year_type_from_string_to_int.rb @@ -0,0 +1,6 @@ +class ChangeYearTypeFromStringToInt < ActiveRecord::Migration[5.2] + def change + remove_column :works, :pub_year, :string + add_column :works, :pub_year, :int + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000000..cc333c0f92 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,34 @@ +# 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_224609) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "users", force: :cascade do |t| + t.string "username" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "works", force: :cascade do |t| + t.string "category" + t.string "title" + t.string "creator" + t.string "description" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "pub_year" + end + +end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb new file mode 100644 index 0000000000..89decb54e0 --- /dev/null +++ b/test/controllers/users_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe UsersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb new file mode 100644 index 0000000000..d95073c22e --- /dev/null +++ b/test/controllers/works_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe WorksController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 0000000000..952febd97d --- /dev/null +++ b/test/fixtures/users.yml @@ -0,0 +1,7 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + username: MyString + +two: + username: MyString diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml new file mode 100644 index 0000000000..ae518af16d --- /dev/null +++ b/test/fixtures/works.yml @@ -0,0 +1,15 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + category: MyString + title: MyString + creator: MyString + pub_year: MyString + description: MyString + +two: + category: MyString + title: MyString + creator: MyString + pub_year: MyString + description: MyString diff --git a/test/models/user_test.rb b/test/models/user_test.rb new file mode 100644 index 0000000000..cc862ac2d9 --- /dev/null +++ b/test/models/user_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe User do + let(:user) { User.new } + + it "must be valid" do + value(user).must_be :valid? + end +end diff --git a/test/models/work_test.rb b/test/models/work_test.rb new file mode 100644 index 0000000000..f6fba7104d --- /dev/null +++ b/test/models/work_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Work do + let(:work) { Work.new } + + it "must be valid" do + value(work).must_be :valid? + end +end From de92513b0985c55fb37c24270dd65340207776af Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Mon, 8 Oct 2018 16:15:56 -0700 Subject: [PATCH 04/54] add root to home, resources for users and works --- config/routes.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 787824f888..7987c4d7e6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,9 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + + root 'homes#index' + get '/homes', to: 'homes#index' + resources :users, except: [:update] + resources :works + end From 607c02a62161b0ebc2fd67027ff72bce80d39541 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Mon, 8 Oct 2018 16:17:06 -0700 Subject: [PATCH 05/54] add index to work and user controller --- app/controllers/users_controller.rb | 4 ++++ app/controllers/works_controller.rb | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 3e74dea87f..95ad62f1ad 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,2 +1,6 @@ class UsersController < ApplicationController + + def index + @users = User.all + end end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 56b02c9f2e..ff8ec96dde 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,2 +1,7 @@ class WorksController < ApplicationController + + def index + @works = Work.all + end + end From 6736785707a6eb87343bbcdc77cfad981e83a479 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Mon, 8 Oct 2018 16:17:36 -0700 Subject: [PATCH 06/54] add view files for works and user and home index --- app/assets/javascripts/homes.js | 2 ++ app/assets/stylesheets/homes.scss | 3 +++ app/controllers/homes_controller.rb | 5 +++++ app/helpers/homes_helper.rb | 2 ++ app/views/homes/index.html.erb | 3 +++ app/views/layouts/application.html.erb | 2 -- app/views/users/index.html.erb | 0 app/views/users/new.html.erb | 0 app/views/users/show.html.erb | 0 app/views/works/_form.html.erb | 0 app/views/works/edit.html.erb | 0 app/views/works/index.html.erb | 2 ++ app/views/works/new.html.erb | 0 app/views/works/show.html.erb | 2 ++ test/controllers/homes_controller_test.rb | 7 +++++++ 15 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 app/assets/javascripts/homes.js create mode 100644 app/assets/stylesheets/homes.scss create mode 100644 app/controllers/homes_controller.rb create mode 100644 app/helpers/homes_helper.rb create mode 100644 app/views/homes/index.html.erb create mode 100644 app/views/users/index.html.erb create mode 100644 app/views/users/new.html.erb create mode 100644 app/views/users/show.html.erb create mode 100644 app/views/works/_form.html.erb create mode 100644 app/views/works/edit.html.erb create mode 100644 app/views/works/index.html.erb create mode 100644 app/views/works/new.html.erb create mode 100644 app/views/works/show.html.erb create mode 100644 test/controllers/homes_controller_test.rb diff --git a/app/assets/javascripts/homes.js b/app/assets/javascripts/homes.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/homes.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/homes.scss b/app/assets/stylesheets/homes.scss new file mode 100644 index 0000000000..06b5a4714a --- /dev/null +++ b/app/assets/stylesheets/homes.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Homes 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/homes_controller.rb b/app/controllers/homes_controller.rb new file mode 100644 index 0000000000..16f79c47e9 --- /dev/null +++ b/app/controllers/homes_controller.rb @@ -0,0 +1,5 @@ +class HomesController < ApplicationController + + def index + end +end diff --git a/app/helpers/homes_helper.rb b/app/helpers/homes_helper.rb new file mode 100644 index 0000000000..2a8ce49d58 --- /dev/null +++ b/app/helpers/homes_helper.rb @@ -0,0 +1,2 @@ +module HomesHelper +end diff --git a/app/views/homes/index.html.erb b/app/views/homes/index.html.erb new file mode 100644 index 0000000000..0a1acdabf1 --- /dev/null +++ b/app/views/homes/index.html.erb @@ -0,0 +1,3 @@ +

+home page +

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f32268a271..120d2976d6 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -5,8 +5,6 @@ <%= 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/users/index.html.erb b/app/views/users/index.html.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/works/edit.html.erb b/app/views/works/edit.html.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb new file mode 100644 index 0000000000..34c41b5f0b --- /dev/null +++ b/app/views/works/index.html.erb @@ -0,0 +1,2 @@ + +

All Works

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

Detail of Work

diff --git a/test/controllers/homes_controller_test.rb b/test/controllers/homes_controller_test.rb new file mode 100644 index 0000000000..2af87d7c86 --- /dev/null +++ b/test/controllers/homes_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe HomesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 6b8408566aae33ac978ec6ff2b8e96fb54237055 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Tue, 9 Oct 2018 14:52:20 -0700 Subject: [PATCH 07/54] add forms_with fix --- config/initializers/action_view.rb | 1 + 1 file changed, 1 insertion(+) create mode 100644 config/initializers/action_view.rb 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 From 1dd5971254262b349923a37cd1a4f52a5f7bbb55 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Tue, 9 Oct 2018 14:52:52 -0700 Subject: [PATCH 08/54] fix autoprefixer error --- Gemfile | 4 ++++ Gemfile.lock | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 6219256bd8..d8829b58ba 100644 --- a/Gemfile +++ b/Gemfile @@ -5,6 +5,10 @@ ruby '2.5.1' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.2.1' + +# autoprefixer throws a JS/ES6 error, so we're going to downgrade it: https://stackoverflow.com/questions/51379326/current-execjs-runtime-doest-support-es6/51383529 +gem 'autoprefixer-rails', '8.6.5' + # Use postgresql as the database for Active Record gem 'pg', '>= 0.18', '< 2.0' # Use Puma as the app server diff --git a/Gemfile.lock b/Gemfile.lock index 3e4d19fd03..0e231b8c38 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,7 +48,7 @@ GEM archive-zip (0.11.0) io-like (~> 0.3.0) arel (9.0.0) - autoprefixer-rails (9.1.4) + autoprefixer-rails (8.6.5) execjs better_errors (2.5.0) coderay (>= 1.0.0) @@ -242,6 +242,7 @@ PLATFORMS ruby DEPENDENCIES + autoprefixer-rails (= 8.6.5) better_errors binding_of_caller bootsnap (>= 1.1.0) From 0282d62074dd23a411f3bfa5c8ea54a45b852c46 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Tue, 9 Oct 2018 15:02:25 -0700 Subject: [PATCH 09/54] add h1 to homes index, add back stylesheet and javascript tags in head of application layout --- app/views/layouts/application.html.erb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 120d2976d6..8b9da62802 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -5,6 +5,9 @@ <%= csrf_meta_tags %> <%= csp_meta_tag %> + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + From d05fe931a515bb6c12cc7bd0fbf4f058875f7e5e Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Tue, 9 Oct 2018 15:02:50 -0700 Subject: [PATCH 10/54] bootstrap works --- app/assets/stylesheets/application.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 8b1701e581..927d7ac119 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -16,3 +16,7 @@ @import "bootstrap"; /* Import scss content */ @import "**/*"; + +body{ + background-color: peachpuff; +} From 25a20bdef2e79b7d36197a4763f66658be755ff1 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Tue, 9 Oct 2018 15:13:33 -0700 Subject: [PATCH 11/54] add CRUD to controllers --- app/controllers/users_controller.rb | 54 +++++++++++++++++++++++++++++ app/controllers/works_controller.rb | 52 +++++++++++++++++++++++++++ 2 files changed, 106 insertions(+) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 95ad62f1ad..53d8307c26 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3,4 +3,58 @@ class UsersController < ApplicationController def index @users = User.all end + + + def show + @user = User.find_by(id: params[:id]) + + if @user.nil? + head :not_found + end + end + + + def new + @user = User.new + end + + + def create + @user = User.new(user_params) + + if @user.save + redirect_to users_path + else + render :new , status: :bad_request + end + end + + + def edit + @user = User.find_by(id: params[:id]) + end + + + def update + @user = User.find_by(id: params[:id]) + + if @user.update(user_params) + redirect_to user_path + else + render :edit , status: :bad_request + end + end + + + def destroy + user = User.find_by(id: params[:id]) + user.destroy + redirect_to users_path + end + + + def user_params + return params.require(:user).permit(:username) + end + end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index ff8ec96dde..54a6f4273e 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -4,4 +4,56 @@ def index @works = Work.all end + def show + @work = Work.find_by(id: params[:id]) + + if @work.nil? + head :not_found + end + end + + + def new + @work = Work.new + end + + + def create + @work = Work.new(work_params) + + if @work.save + redirect_to works_path + else + render :new , status: :bad_request + end + end + + + def edit + @work = Work.find_by(id: params[:id]) + end + + + def update + @work = Work.find_by(id: params[:id]) + + if @work.update(user_params) + redirect_to work_path + else + render :edit , status: :bad_request + end + end + + + def destroy + work = Work.find_by(id: params[:id]) + work.destroy + redirect_to works_path + end + + + def work_params + return params.require(:work).permit(:category, :title, :creator, :pub_year, :description) + end + end From 5851d0baa2a36e3922a6b5edffd3d62bc84c68f1 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Tue, 9 Oct 2018 15:13:57 -0700 Subject: [PATCH 12/54] add h1 to index views --- app/views/users/index.html.erb | 1 + app/views/works/index.html.erb | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index e69de29bb2..ee75839e09 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -0,0 +1 @@ +

Index of all users

diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 34c41b5f0b..1ab6bda916 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1,2 +1 @@ - -

All Works

+

Index of all works

From 451ba8c8fc1de0d28e1899d1512f61576be86060 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Tue, 9 Oct 2018 17:31:13 -0700 Subject: [PATCH 13/54] seeded database --- db/generate_seeds.rb | 8 +++---- db/media_seeds.csv | 51 ++++++++++++++++++++++---------------------- db/seeds.rb | 21 ++++++++++++------ 3 files changed, 44 insertions(+), 36 deletions(-) diff --git a/db/generate_seeds.rb b/db/generate_seeds.rb index 6c056c4719..bf53a0a66e 100644 --- a/db/generate_seeds.rb +++ b/db/generate_seeds.rb @@ -10,16 +10,16 @@ # $ rails db:reset # doesn't currently check for if titles are unique against each other -CSV.open('db/media_seeds.csv', "w", :write_headers=> true, - :headers => ["category", "title", "creator", "publication_year", "description"]) do |csv| +CSV.open('media_seeds.csv', "w", :write_headers=> true, + :headers => ["category", "title", "creator", "pub_year", "description"]) do |csv| 25.times do category = %w(album book).sample title = Faker::Coffee.blend_name creator = Faker::Name.name - publication_year = rand(Date.today.year-100..Date.today.year) + pub_year = rand(Date.today.year-100..Date.today.year) description = Faker::Lorem.sentence - csv << [category, title, creator, publication_year, description] + csv << [category, title, creator, pub_year, description] end end diff --git a/db/media_seeds.csv b/db/media_seeds.csv index 5f5b252a25..a98513ea89 100644 --- a/db/media_seeds.csv +++ b/db/media_seeds.csv @@ -1,25 +1,26 @@ -category,title,creator,publication_year,description -album,Blue Breaker,Dr. Sarai Langosh,1949,Et et expedita non aut quo. -book,Joe Treat,Blaise Lesch,1968,Voluptatem adipisci qui velit. -album,Kreb-Full-o Been,Ms. Trevion Buckridge,2016,Vero consectetur delectus consequatur id aut accusantium unde excepturi. -album,Wake-up Pie,Timmy Streich I,1919,Voluptatem consequatur qui consectetur nisi officiis culpa. -album,Major Cup,Jayde Bartoletti,1944,Quis recusandae cum est facere consequatur minima magni et. -book,Summer Select,Ms. Gwendolyn Ortiz,1946,Et molestiae eos nam odit aut sed. -album,Holiday Choice,Alexandria Lehner,1940,Excepturi voluptas ut voluptatum. -book,Postmodern Blend,Meredith Brekke,1970,Dolorem fugit accusantium qui. -book,Green Forrester,Raquel Hirthe,1933,Omnis qui quia odio. -album,Winter Mug,Tia Weissnat II,1990,Laboriosam autem iusto quae sed voluptate et. -book,Red Pie,Davon Kub,1961,Id dolorem qui laborum quia. -album,Major Equinox,Queen Satterfield,1997,Fugit perferendis est quam sunt porro vel rerum. -book,Melty Breaker,Montana Dickinson Sr.,1991,Perferendis harum fuga corporis. -book,Winter Pie,Mr. Syble Kuhn,1970,Incidunt molestias deserunt laudantium. -album,Goodbye Utopia,Orion Spencer,1962,Praesentium enim pariatur voluptatem sed quod dolorum. -album,Green Select,Berneice Jenkins,1957,Hic repudiandae molestiae id nulla aliquid maiores necessitatibus. -book,Blacktop Enlightenment,Seamus D'Amore,1928,Ea id cumque et pariatur magni nemo dolorem. -album,Express Extract,Dorothy Jast I,1969,Dolores dolorum aut ea aperiam et voluptatem. -album,Winter Been,Mackenzie Wilkinson,1932,Culpa repudiandae et at sint et amet fugiat et. -book,Heart Mug,Orpha Douglas,2009,Qui voluptas alias quia. -album,Blue Treat,Eliseo Gorczany,1979,Sit est quis veniam saepe. -book,Hello Town,Laury Walter,2005,Est sed ut asperiores sed fugiat. -album,Blacktop Choice,Casey Feil,2008,Temporibus ex maxime labore quam et natus quia ipsum. -book,Huggy Star,Nigel Lesch DVM,1962,Voluptatem ea aspernatur nesciunt ipsa quis error corporis placeat. +category,title,creator,pub_year,description +book,Major Select,Monty Larkin MD,1930,Dolore dolor voluptas non. +album,Joe ,Kristle Armstrong,1932,Voluptatem ipsum magnam tempora. +album,Winter Delight,Miss Wyatt Lebsack,1997,Quidem ut illo consectetur. +album,Express Cowboy,Shelton Adams,1952,Quia ex dignissimos vel. +album,The Captain's Solstice,Zane Terry,2010,Praesentium odio eius sit. +book,Blacktop Light,Tobias Mraz,1993,Quasi aut accusantium quia. +book,American Cake,Lorine Reynolds,1968,Perferendis quas enim temporibus. +book,KrebStar Bean,Sergio Harber,1977,Repudiandae et autem qui. +book,Chocolate Volcano,Wonda Abernathy,1928,Corporis omnis qui necessitatibus. +album,Captain's Breaker,Silvana Jacobs Sr.,1987,Et facere ad nihil. +book,Huggy Enlightenment,Elane O'Keefe PhD,1919,Maiores nihil et aliquid. +album,Morning Symphony,Theresia Ledner DDS,1991,Est omnis debitis officiis. +album,Seattle Equinox,Noelle Barton MD,2009,Voluptas nihil aliquam quidem. +album,Blue Bean,Tyson DuBuque,1932,Et quasi sunt reprehenderit. +book,Spilt Cowboy,Buddy Kautzer Jr.,1942,Vitae ipsam repellendus expedita. +book,Veranda Volcano,Kris Baumbach,1961,Mollitia molestias blanditiis ut. +book,Huggy Utopia,Miss Lupe Runolfsdottir,1939,Necessitatibus ullam nam quos. +book,Winter Star,Breanne Ritchie Sr.,1997,Labore vel esse temporibus. +book,Wake-up Cowboy,Jewel Kemmer,1969,Fugiat natus fuga laudantium. +album,Blue ,Birdie Bernhard,2002,Veritatis sint ex fugit. +album,Melty Delight,Emely Johnson,1925,Ut voluptatem nostrum illum. +book,Winter Enlightenment,Efren Cronin,1953,Sunt tenetur et dolorem. +book,Red Delight,Aron Turner,1969,Fugit ipsa dicta cumque. +album,Major Forrester,Agustin Willms II,1957,At occaecati porro facilis. +book,Bluebery Java,Agueda Wiza V,1947,Minima omnis nam culpa. diff --git a/db/seeds.rb b/db/seeds.rb index 1beea2accd..60fbf1d9fd 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,7 +1,14 @@ -# This file should contain all the record creation needed to seed the database with its default values. -# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). -# -# Examples: -# -# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) -# Character.create(name: 'Luke', movie: movies.first) +require 'csv' + +CSV.foreach(Rails.root.join('db', 'media_seeds.csv'), headers: true) do |row| + w = Work.new + w.category = row['category'] + w.title = row['title'] + w.creator = row['creator'] + w.pub_year = row['pub_year'] + w.description = row['description'] + w.save + puts "#{w.title} by #{w.creator} saved" +end + +puts "There are now #{Work.count} rows in the works table" From 78ca0fc3e2d1abab50aa58b3dc273b5e8d03c1c9 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Tue, 9 Oct 2018 17:31:38 -0700 Subject: [PATCH 14/54] add works to index page --- app/views/works/index.html.erb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 1ab6bda916..a316a3e471 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1 +1,17 @@

Index of all works

+ +
    + <% @works.sort.each do |work| %> +
  • #<%=work.id %>: <%=work.title %>
    • + type: <%=work.category %> +
    + description: <%=work.description %> +
    + publication year: <%=work.pub_year %> +
    + <%=link_to "View Details", work_path(work.id) %> | + + <%= link_to "Edit work", edit_work_path(work) %> | <%= link_to "Delete work", work_path(work), method: :delete, data: { confirm: "Are you sure you want to delete this work?" } %> +

    + <% end %> +
From d9835085bdaa40923df6ecbf0259c2f2fd77ec09 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Tue, 9 Oct 2018 17:49:36 -0700 Subject: [PATCH 15/54] add validations --- app/models/work.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/models/work.rb b/app/models/work.rb index 95322dd45e..ce63be255c 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,2 +1,9 @@ class Work < ApplicationRecord + has_many :votes, dependent: :nullify + + validates :title uniqueness: true + validates :creator, presence: true + validates :category, presence: true + validates :pub_year, numericality: {only_integer: true, less_than_or_equal_to: 2018} + validates end From 2324430023a9c8854db1017dc45eefb1128db022 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Tue, 9 Oct 2018 18:15:55 -0700 Subject: [PATCH 16/54] add fixtures --- test/fixtures/works.yml | 57 +++++++++++++++++++++++++++++----------- test/models/work_test.rb | 4 --- 2 files changed, 42 insertions(+), 19 deletions(-) diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index ae518af16d..9a6d8287bc 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -1,15 +1,42 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: - category: MyString - title: MyString - creator: MyString - pub_year: MyString - description: MyString - -two: - category: MyString - title: MyString - creator: MyString - pub_year: MyString - description: MyString +nemo: + category: Movie + title: Finding Nemo + creator: Pixar + pub_year: 2001 + description: daddy issues +sunshine: + category: Movie + title: Secret Sunshine + creator: Lee Chang-dong + pub_year: 2007 + description: korean culture and cinema at its most depressing +marie: + category: Movie + title: Marie Antoinette + creator: Sofia Coppola + pub_year: 2006 + description: Kristen Dunst pre-beheading +heartburn: + category: Book + title: Heartburn + creator: Nora Ephron + pub_year: 1983 + description: don't marry men +headless: + category: Book + title: Headless Pumpkin Monster + creator: Headless Nick + pub_year: 1000 + description: boo +beyonce: + category: Album + title: Beyonce + creator: Beyonce + pub_year: 2016 + description: self-titled album +prince: + category: Album + title: Purple Rain + creator: Prince + pub_year: 1980 + description: purple raaaaaain diff --git a/test/models/work_test.rb b/test/models/work_test.rb index f6fba7104d..96bc5b1925 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -1,9 +1,5 @@ require "test_helper" describe Work do - let(:work) { Work.new } - it "must be valid" do - value(work).must_be :valid? - end end From 51c686c09d707817b9caf4e89c1b7d8d317500e0 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Wed, 10 Oct 2018 15:41:45 -0700 Subject: [PATCH 17/54] refactor works and user controller using controller filter for find_work --- app/controllers/users_controller.rb | 17 +++++++++-------- app/controllers/works_controller.rb | 15 ++++++++------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 53d8307c26..420cf44891 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,4 +1,5 @@ class UsersController < ApplicationController + before_action :find_user, only: [:show, :edit, :update, :destory] def index @users = User.all @@ -6,8 +7,6 @@ def index def show - @user = User.find_by(id: params[:id]) - if @user.nil? head :not_found end @@ -31,13 +30,10 @@ def create def edit - @user = User.find_by(id: params[:id]) end def update - @user = User.find_by(id: params[:id]) - if @user.update(user_params) redirect_to user_path else @@ -47,14 +43,19 @@ def update def destroy - user = User.find_by(id: params[:id]) - user.destroy + @user.destroy redirect_to users_path end + private + def user_params return params.require(:user).permit(:username) end - + + def find_user + @user = User.find_by(id: params[:id]) + end + end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 54a6f4273e..7744daeaa4 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,12 +1,11 @@ class WorksController < ApplicationController + before_action :find_work, only: [:show, :edit, :update, :destory] def index @works = Work.all end def show - @work = Work.find_by(id: params[:id]) - if @work.nil? head :not_found end @@ -30,13 +29,10 @@ def create def edit - @work = Work.find_by(id: params[:id]) end def update - @work = Work.find_by(id: params[:id]) - if @work.update(user_params) redirect_to work_path else @@ -46,14 +42,19 @@ def update def destroy - work = Work.find_by(id: params[:id]) - work.destroy + @work.destroy redirect_to works_path end + private + def work_params return params.require(:work).permit(:category, :title, :creator, :pub_year, :description) end + def find_work + @work = Work.find_by(id: params[:id]) + end + end From 598430595688ef0e15d415bc09433123d44d60a1 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Wed, 10 Oct 2018 22:47:01 -0700 Subject: [PATCH 18/54] forgot comma --- app/models/work.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/work.rb b/app/models/work.rb index ce63be255c..931e2e96de 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,7 +1,7 @@ class Work < ApplicationRecord has_many :votes, dependent: :nullify - validates :title uniqueness: true + validates :title, uniqueness: true validates :creator, presence: true validates :category, presence: true validates :pub_year, numericality: {only_integer: true, less_than_or_equal_to: 2018} From 9e43a0f8cb0d9926fce16ca62c080192f442d98c Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Wed, 10 Oct 2018 22:47:41 -0700 Subject: [PATCH 19/54] typo --- app/models/work.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models/work.rb b/app/models/work.rb index 931e2e96de..c9b668caad 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -5,5 +5,4 @@ class Work < ApplicationRecord validates :creator, presence: true validates :category, presence: true validates :pub_year, numericality: {only_integer: true, less_than_or_equal_to: 2018} - validates end From 3412c465227f99f74b1173daa57cc9d232804287 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Fri, 12 Oct 2018 13:17:34 -0700 Subject: [PATCH 20/54] delete empty test --- test/models/user_test.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/models/user_test.rb b/test/models/user_test.rb index cc862ac2d9..7e81e26c94 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -1,9 +1,5 @@ require "test_helper" describe User do - let(:user) { User.new } - it "must be valid" do - value(user).must_be :valid? - end end From fa840f3db27e1b9b5f6a6bc1bb64eb98e6c29e46 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Fri, 12 Oct 2018 13:17:51 -0700 Subject: [PATCH 21/54] test validations on work model --- test/models/work_test.rb | 105 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/test/models/work_test.rb b/test/models/work_test.rb index 96bc5b1925..1a9aac6283 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -1,5 +1,110 @@ require "test_helper" +require 'pry' describe Work do + describe 'relations' do + # it "has votes" do + # w = Work.first + # creator = w.creator + # + # expect(creator).must_be_instance_of + # end + end + describe 'validations' do + describe 'title' do + it 'is valid when title is present' do + is_valid = works(:nemo).valid? + expect( is_valid ).must_equal true + end + + it 'is invalid without a title' do + w = works(:nemo) + w.title = nil + is_valid = w.valid? + + expect( is_valid ).must_equal false + expect( w.errors.messages ).must_include :title + end + + it 'is invalid with a non-unique title' do + repeat = Work.new( + category: 'Movie', + title: 'Finding Nemo', + creator: 'Pixar', + pub_year: 2001, + description: 'daddy issues', + ) + + is_valid = repeat.valid? + expect( is_valid ).must_equal false + expect( repeat.errors.messages ).must_include :title + end + end + + describe 'creator' do + it 'is valid when creator is present' do + is_valid = works(:sunshine).valid? + expect( is_valid ).must_equal true + end + + it 'is invalid without a creator' do + w = works(:sunshine) + w.creator = nil + is_valid = w.valid? + + expect( is_valid ).must_equal false + expect( w.errors.messages ).must_include :creator + end + end + + describe 'category' do + it 'is valid when category is present' do + is_valid = works(:marie).valid? + expect( is_valid ).must_equal true + end + + it 'is invalid without a category' do + w = works(:marie) + w.category = nil + is_valid = w.valid? + + expect( is_valid ).must_equal false + expect( w.errors.messages ).must_include :category + end + end + + describe 'publication year' do + it 'is valid when publication year is present' do + is_valid = works(:heartburn).valid? + expect( is_valid ).must_equal true + end + + it 'is invalid without a publication year' do + w = works(:heartburn) + w.pub_year = nil + is_valid = w.valid? + + expect( is_valid ).must_equal false + expect( w.errors.messages ).must_include :pub_year + end + + it 'is invalid if publication date is not an integer' do + w = works(:heartburn) + w.pub_year = '2018z' + is_valid = w.valid? + expect( is_valid ).must_equal false + expect( w.errors.messages ).must_include :pub_year + end + + it 'is invalid if publication date is greater than 2018' do + w = works(:heartburn) + w.pub_year = 2020 + is_valid = w.valid? + + expect( is_valid ).must_equal false + expect( w.errors.messages ).must_include :pub_year + end + end + end end From fef0690e4c9bc25d75e01ddeebaa2f13371d4d81 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Fri, 12 Oct 2018 13:18:10 -0700 Subject: [PATCH 22/54] spacing error --- test/test_helper.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 f7a98e5672c4332ec26220069011688c424cc0d5 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Fri, 12 Oct 2018 13:19:04 -0700 Subject: [PATCH 23/54] delete unnecessary validation --- app/models/work.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/work.rb b/app/models/work.rb index c9b668caad..a88ea0de90 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,7 +1,7 @@ class Work < ApplicationRecord has_many :votes, dependent: :nullify - validates :title, uniqueness: true + validates :title, presence: true, uniqueness: true validates :creator, presence: true validates :category, presence: true validates :pub_year, numericality: {only_integer: true, less_than_or_equal_to: 2018} From 0cd01a428a2cc68eede0dc51cd53f5516092e8e5 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Fri, 12 Oct 2018 13:47:01 -0700 Subject: [PATCH 24/54] added validations for User model --- app/models/user.rb | 2 ++ test/fixtures/users.yml | 7 ++++-- test/models/user_test.rb | 47 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 379658a509..e19845fb26 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,2 +1,4 @@ class User < ApplicationRecord + + validates :username, presence: true, uniqueness: true, format: {with: /\A[-_a-z0-9]+\Z/}, length: {maximum: 15} end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 952febd97d..f2e9adf9c6 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: - username: MyString + username: test_name two: - username: MyString + username: potato32 + +three: + username: _h-a_h-a diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 7e81e26c94..5f9a1b7232 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -2,4 +2,51 @@ describe User do + describe 'validations' do + it 'is valid when username is present' do + is_valid = users(:one).valid? + expect( is_valid ).must_equal true + + is_valid = users(:three).valid? + expect( is_valid ).must_equal true + end + + it 'is invalid without a username' do + w = users(:one) + w.username = nil + is_valid = w.valid? + + expect( is_valid ).must_equal false + expect( w.errors.messages ).must_include :username + end + + it 'is invalid with a non-unique username' do + repeat = User.new(username: 'potato32') + + is_valid = repeat.valid? + expect( is_valid ).must_equal false + expect( repeat.errors.messages ).must_include :username + end + + it 'is invalid with characters != a-z, 0-9, dash, and underscore' do + x = User.new(username: '*abc') + y = User.new(username: 'ABC') + z = User.new(username: 'w h o o') + tests = [x, y, z] + + tests.each do |test| + is_valid = test.valid? + expect( is_valid ).must_equal false + expect( test.errors.messages ).must_include :username + end + end + + it 'is invalid with a username longer than 15 characters' do + w = User.new(username: '123456789_foobar') + + is_valid = w.valid? + expect( is_valid ).must_equal false + expect( w.errors.messages ).must_include :username + end + end end From fc35f4a0103f316d1db6328fec666f8a2f7fe4ab Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Fri, 12 Oct 2018 15:31:10 -0700 Subject: [PATCH 25/54] initial html and css for navbar --- app/assets/stylesheets/application.scss | 68 +++++++++++++++++++------ app/views/layouts/application.html.erb | 33 +++++++++++- 2 files changed, 84 insertions(+), 17 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 927d7ac119..899074524b 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,22 +1,58 @@ -/* - * 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 "**/*"; body{ - background-color: peachpuff; + font-family: 'Muli', sans-serif; +} + + +// NAVIGATION BAR + +header{ + background-color: rgba(203, 160, 139, 0.74); +} + +header h1{ + text-align: center; + padding-top: 100px; + padding-bottom: 50px; + text-decoration: none; + font-size: 3em; +} + +header h1 small{ + padding-left: 10px; +} + +header a{ + color: rgb(168, 82, 11); +} + +header a:hover{ + color: rgb(140, 68, 8); + text-decoration: none; +} + +header small{ + color: white; +} + +header .btn-primary{ + background-color: rgb(168, 82, 11); + border-color: rgb(168, 82, 11); +} + +header .btn-primary:hover{ + background-color: rgb(140, 68, 8); + border-color: rgb(140, 68, 8); +} + +.btn{ + position: absolute; + right: 20px; +} + +.nav{ + margin: 20px; } diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 8b9da62802..8dbe1692a5 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,16 +1,47 @@ - MediaRanker + GP 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' %> + + +
+

+ Media Ranker + Ranking the Best of Everything +

+ + +
+ + <%= yield %> From 7b1dd7ed619d46f94425c8e26a77684f8ed7d18e Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Fri, 12 Oct 2018 16:45:21 -0700 Subject: [PATCH 26/54] add styling to home page --- app/assets/stylesheets/application.scss | 29 +++++++---- app/assets/stylesheets/homes.scss | 24 ++++++++-- app/views/homes/index.html.erb | 64 +++++++++++++++++++++++-- app/views/layouts/application.html.erb | 33 +++++++------ 4 files changed, 119 insertions(+), 31 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 899074524b..ce9b6363c3 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -2,8 +2,20 @@ /* Import scss content */ @import "**/*"; + +// APPLICATION WIDE STYLING body{ - font-family: 'Muli', sans-serif; + font-family: 'Montserrat', sans-serif; +} + +a{ + color: rgb(168, 82, 11); +} + +a:hover{ + color: rgb(140, 68, 8); + text-decoration: none; + font-weight: bold; } @@ -11,12 +23,13 @@ body{ header{ background-color: rgba(203, 160, 139, 0.74); + font-family: 'Muli', sans-serif; } header h1{ text-align: center; + padding: 50px; padding-top: 100px; - padding-bottom: 50px; text-decoration: none; font-size: 3em; } @@ -25,14 +38,6 @@ header h1 small{ padding-left: 10px; } -header a{ - color: rgb(168, 82, 11); -} - -header a:hover{ - color: rgb(140, 68, 8); - text-decoration: none; -} header small{ color: white; @@ -56,3 +61,7 @@ header .btn-primary:hover{ .nav{ margin: 20px; } + +footer{ + padding-top: 200px; +} diff --git a/app/assets/stylesheets/homes.scss b/app/assets/stylesheets/homes.scss index 06b5a4714a..45c724e508 100644 --- a/app/assets/stylesheets/homes.scss +++ b/app/assets/stylesheets/homes.scss @@ -1,3 +1,21 @@ -// Place all the styles related to the Homes controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ +.spotlight{ + padding: 75px; +} + +.media-spotlight{ + font-weight: bolder; +} + + +.top-media-columns{ + display: grid; + grid-column: 1fr 1fr 1fr; +} + +.books-container{ +grid-column: 2 / 3; +} + +.albums-container{ +grid-column: 3 / 4; +} diff --git a/app/views/homes/index.html.erb b/app/views/homes/index.html.erb index 0a1acdabf1..1c1495bb4f 100644 --- a/app/views/homes/index.html.erb +++ b/app/views/homes/index.html.erb @@ -1,3 +1,61 @@ -

-home page -

+
+
+

+ 🔦 Media Spotlight: + The Hipster and the Beast by Hipper T +

+

+ description +

+
+ +
+
+

+ 🎬 Top Movies +

+
    +
  • +

    + Winter Been + by Mackenzie Wilkinson +

    +

    6 votes

    +
    • +
+
+ +
+

+ 📖 Top Books +

+
    +
  • +

    + Winter Been + by Mackenzie Wilkinson +

    +

    6 votes

    +
    • +
+
+ +
+

+ 🎙 Top Albums +

+
    +
  • +

    + Winter Been + by Mackenzie Wilkinson +

    +

    6 votes

    +
    • +
+
+ +
+ + +
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 8dbe1692a5..858c133d7c 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,19 +1,18 @@ - - GP MediaRanker - <%= csrf_meta_tags %> - <%= csp_meta_tag %> + + GP 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' %> + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> - + + - - - -
+ +

Media Ranker Ranking the Best of Everything @@ -35,13 +34,17 @@
  • Log In -
    • + -

    - <%= yield %> - + <%= yield %> + +
    + don't steal me, k thnx +
    + + From 273dc4ac8166385ef113c553d22e52167c7965ff Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Sat, 13 Oct 2018 14:01:45 -0700 Subject: [PATCH 27/54] can show, edit, and delete works --- app/assets/stylesheets/application.scss | 12 +-- app/assets/stylesheets/homes.scss | 5 ++ app/assets/stylesheets/works.scss | 21 +++++- app/controllers/works_controller.rb | 7 +- app/models/work.rb | 4 +- app/views/homes/index.html.erb | 2 +- app/views/layouts/_form_errors.html.erb | 15 ++++ app/views/works/_form.html.erb | 45 ++++++++++++ app/views/works/edit.html.erb | 9 +++ app/views/works/index.html.erb | 98 +++++++++++++++++++++---- app/views/works/show.html.erb | 24 +++++- 11 files changed, 210 insertions(+), 32 deletions(-) create mode 100644 app/views/layouts/_form_errors.html.erb diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index ce9b6363c3..8d5f2acc35 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -43,20 +43,20 @@ header small{ color: white; } -header .btn-primary{ +.btn-primary{ background-color: rgb(168, 82, 11); border-color: rgb(168, 82, 11); } -header .btn-primary:hover{ +.btn-primary:hover{ background-color: rgb(140, 68, 8); border-color: rgb(140, 68, 8); } -.btn{ - position: absolute; - right: 20px; -} +// .btn{ +// position: absolute; +// right: 20px; +// } .nav{ margin: 20px; diff --git a/app/assets/stylesheets/homes.scss b/app/assets/stylesheets/homes.scss index 45c724e508..84e9d58e2d 100644 --- a/app/assets/stylesheets/homes.scss +++ b/app/assets/stylesheets/homes.scss @@ -10,6 +10,7 @@ .top-media-columns{ display: grid; grid-column: 1fr 1fr 1fr; + padding: 20px; } .books-container{ @@ -19,3 +20,7 @@ grid-column: 2 / 3; .albums-container{ grid-column: 3 / 4; } + +.top-ten-header{ + padding-left: 10px; +} diff --git a/app/assets/stylesheets/works.scss b/app/assets/stylesheets/works.scss index 5618452f3e..6f8a98801e 100644 --- a/app/assets/stylesheets/works.scss +++ b/app/assets/stylesheets/works.scss @@ -1,3 +1,18 @@ -// Place all the styles related to the Works controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ +table{ + margin-right: 50px; +} + +section{ + margin-left: 50px; +} + + +h2{ + font-weight: bold; + color: rgb(168, 82, 11); +} + + +h3{ + font-weight: bold; +} diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 7744daeaa4..9e07c6cf87 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,5 +1,5 @@ class WorksController < ApplicationController - before_action :find_work, only: [:show, :edit, :update, :destory] + before_action :find_work, only: [:show, :edit, :update, :destroy] def index @works = Work.all @@ -33,7 +33,7 @@ def edit def update - if @work.update(user_params) + if @work.update(work_params) redirect_to work_path else render :edit , status: :bad_request @@ -43,7 +43,7 @@ def update def destroy @work.destroy - redirect_to works_path + redirect_to homes_path end @@ -56,5 +56,4 @@ def work_params def find_work @work = Work.find_by(id: params[:id]) end - end diff --git a/app/models/work.rb b/app/models/work.rb index a88ea0de90..d2a663aba5 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,7 +1,7 @@ class Work < ApplicationRecord - has_many :votes, dependent: :nullify + # has_many :votes, dependent: :nullify - validates :title, presence: true, uniqueness: true + validates :title, presence: true, uniqueness: true, on: :create validates :creator, presence: true validates :category, presence: true validates :pub_year, numericality: {only_integer: true, less_than_or_equal_to: 2018} diff --git a/app/views/homes/index.html.erb b/app/views/homes/index.html.erb index 1c1495bb4f..48142d03b0 100644 --- a/app/views/homes/index.html.erb +++ b/app/views/homes/index.html.erb @@ -2,7 +2,7 @@

    🔦 Media Spotlight: - The Hipster and the Beast by Hipper T + TITLE by AUTHOR

    description diff --git a/app/views/layouts/_form_errors.html.erb b/app/views/layouts/_form_errors.html.erb new file mode 100644 index 0000000000..d3e974cbcf --- /dev/null +++ b/app/views/layouts/_form_errors.html.erb @@ -0,0 +1,15 @@ +<% if model.errors.messages.any? %> +

    +

    There were some problems. Please fix them.

    +
      + <% model.errors.messages.each do |field, problem_list| %> + <% problem_list.each do |problem| %> +
    • + <%= field %> + <%= problem %> +
      • + <% end %> + <% end %> +
    +
    +<% end %> diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb index e69de29bb2..cf9a470146 100644 --- a/app/views/works/_form.html.erb +++ b/app/views/works/_form.html.erb @@ -0,0 +1,45 @@ +<%= form_with model: @work do |f| %> + +
    + <%= f.label :title%> +
    + <%= f.text_field :title, class: "form-control"%> +
    +
    + +
    + +
    + +
    +
    + +
    + <%= f.label :creator%> +
    + <%= f.text_field :creator, class: "form-control"%> +
    +
    + +
    + <%= f.label :pub_year%> +
    + <%= f.text_field :pub_year, class: "form-control"%> +
    +
    + +
    + <%= f.label :description%> +
    + <%= f.text_area :description, class: "form-control"%> +
    +
    +
    + + + +<% end %> diff --git a/app/views/works/edit.html.erb b/app/views/works/edit.html.erb index e69de29bb2..1f4bffd6f8 100644 --- a/app/views/works/edit.html.erb +++ b/app/views/works/edit.html.erb @@ -0,0 +1,9 @@ +
    +

    Edit media

    + + <%= render partial: 'layouts/form_errors', + locals: {model: @work} %> + + <%= render partial: "form", locals: {directions: "Complete this form to edit media:", action_button: "Edit Media"} %> + +
    diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index a316a3e471..8a88ff493c 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1,17 +1,85 @@ -

    Index of all works

    +
    +

    List of all works

    +

    Albums

    + + + + + + + + + + + + <% @works.sort.each do |work| %> + <% if work.category == "album" %> + + + + + + + + <% end %> + <% end %> + +
    IDTitleCreated ByPublishedUpvote
    <%=work.id %> <%=link_to work.title, work_path(work.id) %> <%=work.creator %> <%=work.pub_year %> (button here)
    +
    -
      - <% @works.sort.each do |work| %> -
    • #<%=work.id %>: <%=work.title %>
      • - type: <%=work.category %> -
      - description: <%=work.description %> -
      - publication year: <%=work.pub_year %> -
      - <%=link_to "View Details", work_path(work.id) %> | +

      Books

      +
      + + + + + + + + + + + + <% @works.sort.each do |work| %> + <% if work.category == "book" %> + + + + + + + + <% end %> + <% end %> + +
      IDTitleCreated ByPublishedUpvote
      <%=work.id %> <%=link_to work.title, work_path(work.id) %> <%=work.creator %> <%=work.pub_year %> (button here)
      +
      - <%= link_to "Edit work", edit_work_path(work) %> | <%= link_to "Delete work", work_path(work), method: :delete, data: { confirm: "Are you sure you want to delete this work?" } %> -

      - <% end %> -
    +

    Movies

    +
    + + + + + + + + + + + + <% @works.sort.each do |work| %> + <% if work.category == "movie" %> + + + + + + + + <% end %> + <% end %> + +
    IDTitleCreated ByPublishedUpvote
    <%=work.id %> <%=link_to work.title, work_path(work.id) %> <%=work.creator %> <%=work.pub_year %> (button here)
    + +
    diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 91559db713..d05c0ee6e5 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -1,2 +1,24 @@ +
    -

    Detail of Work

    +

    <% if @work.category == "album"%> + 🎙 + <% elsif @work.category == "movie"%> + 🎬 + <% else @work.category == "book"%> + 📖 + <% end %> +
    + <%= @work.title %> +

    + +

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

    +

    Published: <%=@work.pub_year %>

    +

    Description: <%=@work.description %>

    + + Back to media ranks + >Edit + + + <%= link_to "Delete", work_path(@work), method: :delete, data: { confirm: "Are you sure you want to delete #{@work.title}?" }, class: "btn btn-outline-danger" %> + +
    From 914fc0b5c073ad81eb708539e0bdea99b346220b Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Sat, 13 Oct 2018 15:02:47 -0700 Subject: [PATCH 28/54] adjust test for title to only validate on create --- test/fixtures/works.yml | 14 +++++++------- test/models/work_test.rb | 10 ++++++++-- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index 9a6d8287bc..5d4e6bc9e3 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -1,41 +1,41 @@ nemo: - category: Movie + category: movie title: Finding Nemo creator: Pixar pub_year: 2001 description: daddy issues sunshine: - category: Movie + category: movie title: Secret Sunshine creator: Lee Chang-dong pub_year: 2007 description: korean culture and cinema at its most depressing marie: - category: Movie + category: movie title: Marie Antoinette creator: Sofia Coppola pub_year: 2006 description: Kristen Dunst pre-beheading heartburn: - category: Book + category: book title: Heartburn creator: Nora Ephron pub_year: 1983 description: don't marry men headless: - category: Book + category: book title: Headless Pumpkin Monster creator: Headless Nick pub_year: 1000 description: boo beyonce: - category: Album + category: album title: Beyonce creator: Beyonce pub_year: 2016 description: self-titled album prince: - category: Album + category: album title: Purple Rain creator: Prince pub_year: 1980 diff --git a/test/models/work_test.rb b/test/models/work_test.rb index 1a9aac6283..b891a2f6fb 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -19,7 +19,13 @@ end it 'is invalid without a title' do - w = works(:nemo) + w = Work.new( + category: 'movie', + title: nil, + creator: 'Pixar', + pub_year: 2001, + description: 'daddy issues', + ) w.title = nil is_valid = w.valid? @@ -29,7 +35,7 @@ it 'is invalid with a non-unique title' do repeat = Work.new( - category: 'Movie', + category: 'movie', title: 'Finding Nemo', creator: 'Pixar', pub_year: 2001, From 529dcfabaa6620deea477433df55fc2722d54c9c Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Sat, 13 Oct 2018 15:03:00 -0700 Subject: [PATCH 29/54] can create new works --- app/views/works/_form.html.erb | 13 +++++-------- app/views/works/new.html.erb | 9 +++++++++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb index cf9a470146..afdac17a93 100644 --- a/app/views/works/_form.html.erb +++ b/app/views/works/_form.html.erb @@ -2,19 +2,16 @@
    <%= f.label :title%> -
    +
    <%= f.text_field :title, class: "form-control"%>
    - + <%= f.label :category %>
    - + <%= f.select(:category, options_for_select([['Movie', 'movie'], ['Album', 'album'], ['Book', 'book']]))%> +
    @@ -26,7 +23,7 @@
    - <%= f.label :pub_year%> + <%= f.label "Publication year"%>
    <%= f.text_field :pub_year, class: "form-control"%>
    diff --git a/app/views/works/new.html.erb b/app/views/works/new.html.erb index e69de29bb2..9c8055178e 100644 --- a/app/views/works/new.html.erb +++ b/app/views/works/new.html.erb @@ -0,0 +1,9 @@ +
    +

    Create new media

    + + <%= render partial: 'layouts/form_errors', + locals: {model: @work} %> + + <%= render partial: "form", locals: {directions: "Complete this form to create a new media:", action_button: "Create Media"} %> + +
    From 1f13fd4200e99e630e0455fcace2c7e33a61f324 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Sat, 13 Oct 2018 16:36:56 -0700 Subject: [PATCH 30/54] create home pagewith media for each category --- app/assets/stylesheets/homes.scss | 8 ++- app/controllers/homes_controller.rb | 1 + app/views/homes/index.html.erb | 106 ++++++++++++++++------------ 3 files changed, 70 insertions(+), 45 deletions(-) diff --git a/app/assets/stylesheets/homes.scss b/app/assets/stylesheets/homes.scss index 84e9d58e2d..f295b5a97d 100644 --- a/app/assets/stylesheets/homes.scss +++ b/app/assets/stylesheets/homes.scss @@ -1,5 +1,5 @@ .spotlight{ - padding: 75px; + padding: 100px; } .media-spotlight{ @@ -23,4 +23,10 @@ grid-column: 3 / 4; .top-ten-header{ padding-left: 10px; + padding-bottom: 20px; +} + + +.list-group-item{ + border: none; } diff --git a/app/controllers/homes_controller.rb b/app/controllers/homes_controller.rb index 16f79c47e9..9504a04305 100644 --- a/app/controllers/homes_controller.rb +++ b/app/controllers/homes_controller.rb @@ -1,5 +1,6 @@ class HomesController < ApplicationController def index + @works = Work.all end end diff --git a/app/views/homes/index.html.erb b/app/views/homes/index.html.erb index 48142d03b0..53ee7a6c07 100644 --- a/app/views/homes/index.html.erb +++ b/app/views/homes/index.html.erb @@ -9,53 +9,71 @@

    -
    -
    -

    - 🎬 Top Movies -

    -
      -
    • -

      - Winter Been - by Mackenzie Wilkinson -

      -

      6 votes

      -
      • -
    -
    +
    -
    -

    - 📖 Top Books -

    -
      -
    • -

      - Winter Been - by Mackenzie Wilkinson -

      -

      6 votes

      -
      • -
    -
    +
    +

    + 🎬 Top Movies +

    -
    -

    - 🎙 Top Albums -

    -
      -
    • -

      - Winter Been - by Mackenzie Wilkinson -

      -

      6 votes

      -
      • -
    -
    +
      + <% i = 0 %> + <% @works.each do |work| %> + <% if work.category == 'movie' && i < 10 %> +
    • +

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

      +

      # votes

      +
      • + <% i += 1 %> + <% end %> + <% end %> +
    +
    -
    +
    +

    + 📖 Top Books +

    +
      + <% i = 0 %> + <% @works.each do |work| %> + <% if work.category == 'book' && i < 10 %> +
    • +

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

      +

      # votes

      +
      • + <% i += 1 %> + <% end %> + <% end %> +
    +
    +
    +

    + 🎙 Top Albums +

    +
      + <% i = 0 %> + <% @works.each do |work| %> + <% if work.category == 'album' && i < 10 %> +
    • +

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

      +

      # votes

      +
      • + <% i += 1 %> + <% end %> + <% end %> +
    +
    +
    From 3c6f4a79593288fe8c410265b1ba1da1e6ce6d49 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Sat, 13 Oct 2018 16:45:42 -0700 Subject: [PATCH 31/54] tried to seed data --- db/generate_seeds.rb | 6 ++++-- media_seeds.csv | 0 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 media_seeds.csv diff --git a/db/generate_seeds.rb b/db/generate_seeds.rb index bf53a0a66e..b03b7ff7fb 100644 --- a/db/generate_seeds.rb +++ b/db/generate_seeds.rb @@ -1,6 +1,7 @@ require 'faker' require 'date' require 'csv' +require 'pry' # we already provide a filled out media_seeds.csv file, but feel free to # run this script in order to replace it and generate a new one @@ -13,8 +14,8 @@ CSV.open('media_seeds.csv', "w", :write_headers=> true, :headers => ["category", "title", "creator", "pub_year", "description"]) do |csv| - 25.times do - category = %w(album book).sample + 50.times do + category = %w(album book movie).sample title = Faker::Coffee.blend_name creator = Faker::Name.name pub_year = rand(Date.today.year-100..Date.today.year) @@ -22,4 +23,5 @@ csv << [category, title, creator, pub_year, description] end + end diff --git a/media_seeds.csv b/media_seeds.csv new file mode 100644 index 0000000000..e69de29bb2 From 06c084056d065f2048431c681efa8d8bd0438186 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Sat, 13 Oct 2018 18:50:41 -0700 Subject: [PATCH 32/54] add sessions and flash mechanisms, flash works --- app/assets/javascripts/sessions.js | 2 ++ app/assets/stylesheets/application.scss | 4 ++- app/assets/stylesheets/sessions.scss | 3 ++ app/controllers/sessions_controller.rb | 30 ++++++++++++++++++++ app/controllers/works_controller.rb | 2 ++ app/helpers/sessions_helper.rb | 2 ++ app/views/layouts/application.html.erb | 12 ++++++-- app/views/sessions/new.html.erb | 14 +++++++++ config/routes.rb | 5 ++++ test/controllers/sessions_controller_test.rb | 7 +++++ 10 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 app/assets/javascripts/sessions.js create mode 100644 app/assets/stylesheets/sessions.scss create mode 100644 app/controllers/sessions_controller.rb create mode 100644 app/helpers/sessions_helper.rb create mode 100644 app/views/sessions/new.html.erb create mode 100644 test/controllers/sessions_controller_test.rb diff --git a/app/assets/javascripts/sessions.js b/app/assets/javascripts/sessions.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/sessions.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 8d5f2acc35..399ebb58b2 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -18,7 +18,9 @@ a:hover{ font-weight: bold; } - +.flash-message{ + margin-right: 50px; +} // NAVIGATION BAR header{ diff --git a/app/assets/stylesheets/sessions.scss b/app/assets/stylesheets/sessions.scss new file mode 100644 index 0000000000..ccb1ed25b2 --- /dev/null +++ b/app/assets/stylesheets/sessions.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Sessions controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb new file mode 100644 index 0000000000..51ce18faf6 --- /dev/null +++ b/app/controllers/sessions_controller.rb @@ -0,0 +1,30 @@ +class SessionsController < ApplicationController + + def new + end + + def create + name = params[:username] + user = User.find_by(username: name) + + if user + + redirect_to root_path + flash[:success] = "Successfully logged in as #{name}" + session[:user_id] = user.id + + else + @user = User.new(username: name) + if @user.save + flash.now[:success] = "Successfully created new user \"#{name}\" with ID #{User.find_by(username: name).id}" + redirect_to root_path + else + render :new + end + end + end + + def logout + end + +end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 9e07c6cf87..d57a16847c 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -21,8 +21,10 @@ def create @work = Work.new(work_params) if @work.save + flash[:success] = "Successfully created new work: #{@work.title}" redirect_to works_path else + flash.now[:error] = "Invalid data, please try again" render :new , status: :bad_request end end diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb new file mode 100644 index 0000000000..309f8b2eb3 --- /dev/null +++ b/app/helpers/sessions_helper.rb @@ -0,0 +1,2 @@ +module SessionsHelper +end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 858c133d7c..8bd95dac3f 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,7 +1,7 @@ - GP MediaRanker + MediaRanker <%= csrf_meta_tags %> <%= csp_meta_tag %> @@ -33,12 +33,20 @@ View all users
  • - Log In + Log In
    • +
    + <% flash.each do |key, message| %> +

    +

    +

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

    Log In

    + + <%= form_with method: :post, url: sessions_path do |f| %> +
    + <%= f.label :username%> +
    + <%= f.text_field :username, class: "form-control"%> +
    +
    + + <% end %> + +
    diff --git a/config/routes.rb b/config/routes.rb index 7987c4d7e6..19d554fc9e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,7 +3,12 @@ root 'homes#index' get '/homes', to: 'homes#index' + resources :users, except: [:update] resources :works + resources :sessions, only: [:new, :create] + post '/sessions/logout', to: 'sessions#logout', as: 'logout' + + end diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb new file mode 100644 index 0000000000..c2632a720b --- /dev/null +++ b/test/controllers/sessions_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe SessionsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From d3979b094ded0113d0ca9715e4b8adc9d0c44e93 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Sat, 13 Oct 2018 19:02:56 -0700 Subject: [PATCH 33/54] can log in as a user --- app/controllers/sessions_controller.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 51ce18faf6..c82e417524 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -8,15 +8,13 @@ def create user = User.find_by(username: name) if user - - redirect_to root_path flash[:success] = "Successfully logged in as #{name}" session[:user_id] = user.id - + redirect_to root_path else @user = User.new(username: name) if @user.save - flash.now[:success] = "Successfully created new user \"#{name}\" with ID #{User.find_by(username: name).id}" + flash[:success] = "Successfully logged in as new user \"#{name}\" " redirect_to root_path else render :new From 81767db696fa5d222cfa92a246b12db0b2c532c1 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Sun, 14 Oct 2018 09:15:50 -0700 Subject: [PATCH 34/54] initial login setup --- app/assets/stylesheets/application.scss | 5 +++++ app/controllers/application_controller.rb | 5 +++++ app/views/layouts/application.html.erb | 23 ++++++++++++++++------- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 399ebb58b2..ee3a507234 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -21,6 +21,11 @@ a:hover{ .flash-message{ margin-right: 50px; } + +.login{ + position: absolute; + right: 20px; +} // NAVIGATION BAR header{ diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 09705d12ab..7b27c7d774 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,7 @@ class ApplicationController < ActionController::Base + before_action :find_logged_in_user + + def find_logged_in_user + @logged_in_user = User.find_by(id: session[:user_id]) + end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 8bd95dac3f..233a239e18 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -32,19 +32,28 @@
  • View all users
    • -
  • - Log In +
    • - <% flash.each do |key, message| %> -

    -

    -

    - <% end %> + <% flash.each do |key, message| %> +

    +

    +

    + <% end %>
    From e65e62640f3267034d6297a502cc1455df9fcb9c Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Sun, 14 Oct 2018 09:24:59 -0700 Subject: [PATCH 35/54] created index view for users --- app/views/users/index.html.erb | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index ee75839e09..3470dcaf92 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -1 +1,22 @@ -

    Index of all users

    +
    +

    List of all users

    + + + + + + + + + + + <% @users.sort.each do |user| %> + + + + + + <% end %> + +
    IDUsernameJoinedVotes
    <%=user.id %> <%=user.username %> <%=user.created_at.strftime("%-m/%e/%Y") %>
    +
    From f153ff3cce3298d60a0fcd4730716ae2198903f5 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Sun, 14 Oct 2018 09:50:25 -0700 Subject: [PATCH 36/54] user can log out from website --- app/assets/stylesheets/application.scss | 1 + app/controllers/sessions_controller.rb | 3 +++ app/views/layouts/application.html.erb | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index ee3a507234..c236f37428 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -60,6 +60,7 @@ header small{ border-color: rgb(140, 68, 8); } + // .btn{ // position: absolute; // right: 20px; diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index c82e417524..2ca415f5de 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -23,6 +23,9 @@ def create end def logout + session[:user_id] = nil + flash[:success] = "Successfully logged out" + redirect_to root_path end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 233a239e18..cac6f7132a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -37,7 +37,7 @@ <% if @logged_in_user %> Logged in as: <%= @logged_in_user.username %> - Log Out + <% else %> Log In From 80d4407873d89b9acd2e31079ccb48a59a601372 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Sun, 14 Oct 2018 15:27:14 -0700 Subject: [PATCH 37/54] add session when creating new user logged in --- app/controllers/sessions_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 2ca415f5de..062f8a8925 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -15,6 +15,7 @@ def create @user = User.new(username: name) if @user.save flash[:success] = "Successfully logged in as new user \"#{name}\" " + session[:user_id] = user.id redirect_to root_path else render :new From 3d471f263ca2d35725a7b38a233e5dc507c28ed2 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Sun, 14 Oct 2018 15:27:14 -0700 Subject: [PATCH 38/54] add session when creating new user logged in --- app/controllers/sessions_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 2ca415f5de..cebaa21c91 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -15,6 +15,7 @@ def create @user = User.new(username: name) if @user.save flash[:success] = "Successfully logged in as new user \"#{name}\" " + session[:user_id] = @user.id redirect_to root_path else render :new From 39ae2d3900e26f497bc237eefcd947348175a6ab Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Sun, 14 Oct 2018 15:30:12 -0700 Subject: [PATCH 39/54] spacing --- app/controllers/sessions_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index cebaa21c91..49a8b97b5f 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -6,7 +6,6 @@ def new def create name = params[:username] user = User.find_by(username: name) - if user flash[:success] = "Successfully logged in as #{name}" session[:user_id] = user.id From 4409af76e76d9312c66b472d2255e56451a05d48 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Sun, 14 Oct 2018 15:53:56 -0700 Subject: [PATCH 40/54] create Vote model and controller, define relationships in models --- app/assets/javascripts/votes.js | 2 ++ app/assets/stylesheets/votes.scss | 3 +++ app/controllers/votes_controller.rb | 2 ++ app/helpers/votes_helper.rb | 2 ++ app/models/user.rb | 5 +++-- app/models/vote.rb | 4 ++++ app/models/work.rb | 2 +- db/migrate/20181014224809_create_votes.rb | 10 ++++++++++ test/controllers/votes_controller_test.rb | 7 +++++++ test/fixtures/votes.yml | 9 +++++++++ test/models/vote_test.rb | 9 +++++++++ 11 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 app/assets/javascripts/votes.js create mode 100644 app/assets/stylesheets/votes.scss create mode 100644 app/controllers/votes_controller.rb create mode 100644 app/helpers/votes_helper.rb create mode 100644 app/models/vote.rb create mode 100644 db/migrate/20181014224809_create_votes.rb create mode 100644 test/controllers/votes_controller_test.rb create mode 100644 test/fixtures/votes.yml create mode 100644 test/models/vote_test.rb diff --git a/app/assets/javascripts/votes.js b/app/assets/javascripts/votes.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/votes.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/votes.scss b/app/assets/stylesheets/votes.scss new file mode 100644 index 0000000000..9a6720f80e --- /dev/null +++ b/app/assets/stylesheets/votes.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Votes controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb new file mode 100644 index 0000000000..ffdb2760e0 --- /dev/null +++ b/app/controllers/votes_controller.rb @@ -0,0 +1,2 @@ +class VotesController < ApplicationController +end diff --git a/app/helpers/votes_helper.rb b/app/helpers/votes_helper.rb new file mode 100644 index 0000000000..5a82eed07d --- /dev/null +++ b/app/helpers/votes_helper.rb @@ -0,0 +1,2 @@ +module VotesHelper +end diff --git a/app/models/user.rb b/app/models/user.rb index e19845fb26..54b6719088 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,4 +1,5 @@ class User < ApplicationRecord - - validates :username, presence: true, uniqueness: true, format: {with: /\A[-_a-z0-9]+\Z/}, length: {maximum: 15} + has_many :votes, dependent: :nullify + + validates :username, presence: true, uniqueness: true, format: {with: /\A[-_a-z0-9]+\Z/}, length: {maximum: 15} end diff --git a/app/models/vote.rb b/app/models/vote.rb new file mode 100644 index 0000000000..b8b6f9f0aa --- /dev/null +++ b/app/models/vote.rb @@ -0,0 +1,4 @@ +class Vote < ApplicationRecord + belongs_to :user + belongs_to :work +end diff --git a/app/models/work.rb b/app/models/work.rb index d2a663aba5..cda30fa7f8 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,5 +1,5 @@ class Work < ApplicationRecord - # has_many :votes, dependent: :nullify + has_many :votes, dependent: :nullify validates :title, presence: true, uniqueness: true, on: :create validates :creator, presence: true diff --git a/db/migrate/20181014224809_create_votes.rb b/db/migrate/20181014224809_create_votes.rb new file mode 100644 index 0000000000..7ee86107b2 --- /dev/null +++ b/db/migrate/20181014224809_create_votes.rb @@ -0,0 +1,10 @@ +class CreateVotes < ActiveRecord::Migration[5.2] + def change + create_table :votes do |t| + t.integer :user_id + t.integer :work_id + + t.timestamps + end + end +end diff --git a/test/controllers/votes_controller_test.rb b/test/controllers/votes_controller_test.rb new file mode 100644 index 0000000000..cf4d03935f --- /dev/null +++ b/test/controllers/votes_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe VotesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml new file mode 100644 index 0000000000..eb63afacaa --- /dev/null +++ b/test/fixtures/votes.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + user_id: 1 + work_id: 1 + +two: + user_id: 1 + work_id: 1 diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb new file mode 100644 index 0000000000..fc15947bd3 --- /dev/null +++ b/test/models/vote_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Vote do + let(:vote) { Vote.new } + + it "must be valid" do + value(vote).must_be :valid? + end +end From 4f7f6f525a0dbc6a370acf795ddd65f4db14ba47 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Sun, 14 Oct 2018 16:11:33 -0700 Subject: [PATCH 41/54] create foreign keys to user and work in votes db --- .../20181014230414_delete_accidental_columns.rb | 6 ++++++ ...81014230819_add_work_and_user_id_foreign_keys.rb | 6 ++++++ db/schema.rb | 13 ++++++++++++- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20181014230414_delete_accidental_columns.rb create mode 100644 db/migrate/20181014230819_add_work_and_user_id_foreign_keys.rb diff --git a/db/migrate/20181014230414_delete_accidental_columns.rb b/db/migrate/20181014230414_delete_accidental_columns.rb new file mode 100644 index 0000000000..12b45443e6 --- /dev/null +++ b/db/migrate/20181014230414_delete_accidental_columns.rb @@ -0,0 +1,6 @@ +class DeleteAccidentalColumns < ActiveRecord::Migration[5.2] + def change + remove_column :votes, :user_id, :integer + remove_column :votes, :work_id, :integer + end +end diff --git a/db/migrate/20181014230819_add_work_and_user_id_foreign_keys.rb b/db/migrate/20181014230819_add_work_and_user_id_foreign_keys.rb new file mode 100644 index 0000000000..d1651d9fcb --- /dev/null +++ b/db/migrate/20181014230819_add_work_and_user_id_foreign_keys.rb @@ -0,0 +1,6 @@ +class AddWorkAndUserIdForeignKeys < ActiveRecord::Migration[5.2] + def change + add_reference :votes, :user, foreign_key: true + add_reference :votes, :work, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index cc333c0f92..d5ee55245c 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_224609) do +ActiveRecord::Schema.define(version: 2018_10_14_230819) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -21,6 +21,15 @@ t.datetime "updated_at", null: false end + create_table "votes", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "user_id" + t.bigint "work_id" + t.index ["user_id"], name: "index_votes_on_user_id" + t.index ["work_id"], name: "index_votes_on_work_id" + end + create_table "works", force: :cascade do |t| t.string "category" t.string "title" @@ -31,4 +40,6 @@ t.integer "pub_year" end + add_foreign_key "votes", "users" + add_foreign_key "votes", "works" end From e46e9b1996e92e1f9d86589ad63673b1b19b2b0b Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Sun, 14 Oct 2018 16:18:58 -0700 Subject: [PATCH 42/54] create routes for index, new, and create for votes --- config/routes.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 19d554fc9e..9b8c053426 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,8 +4,9 @@ root 'homes#index' get '/homes', to: 'homes#index' - resources :users, except: [:update] resources :works + resources :users, except: [:update] + resources :votes, only: [:index, :new, :create] resources :sessions, only: [:new, :create] post '/sessions/logout', to: 'sessions#logout', as: 'logout' From 477c2cf8b4084bcbd823cfb5f8859e9fe35fcbf9 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Sun, 14 Oct 2018 17:17:19 -0700 Subject: [PATCH 43/54] add relations testing in votes --- test/fixtures/users.yml | 4 ---- test/fixtures/votes.yml | 17 ++++++++++------- test/models/vote_test.rb | 25 ++++++++++++++++++++++--- 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index f2e9adf9c6..6cb52f285c 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -1,10 +1,6 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - one: username: test_name - two: username: potato32 - three: username: _h-a_h-a diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml index eb63afacaa..6dded33f91 100644 --- a/test/fixtures/votes.yml +++ b/test/fixtures/votes.yml @@ -1,9 +1,12 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - one: - user_id: 1 - work_id: 1 - + user: one + work: nemo two: - user_id: 1 - work_id: 1 + user: two + work: nemo +three: + user: three + work: nemo +four: + user: one + work: sunshine diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index fc15947bd3..04f8faa87f 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -1,9 +1,28 @@ require "test_helper" describe Vote do - let(:vote) { Vote.new } + describe 'relations' do + it 'has a user' do + vote = votes(:one) + vote.user.must_equal users(:one) + end - it "must be valid" do - value(vote).must_be :valid? + it 'can set the user' do + vote = Vote.new(user: nil, work: nil) + vote.user = users(:two) + vote.user_id.must_equal users(:two).id + end + + it 'has a work' do + vote = votes(:three) + vote.work.must_equal works(:nemo) + end + + it 'can set the work' do + vote = Vote.new(user: nil, work: nil) + vote.work = works(:nemo) + vote.work_id.must_equal works(:nemo).id + end end + end From 690d7b187e239d798de6fde9c619a3652e37c479 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Sun, 14 Oct 2018 17:34:02 -0700 Subject: [PATCH 44/54] add relational testing in user --- test/models/user_test.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 5f9a1b7232..b3245125fc 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -2,6 +2,15 @@ describe User do + describe 'relations' do + it 'has many votes' do + user = users(:one) + + user.votes.length.must_equal 2 + user.votes[0].must_equal votes(:one) + end + end + describe 'validations' do it 'is valid when username is present' do is_valid = users(:one).valid? From 8f0e5f1360377460ad3687539ac17aaaa743f53c Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Sun, 14 Oct 2018 17:35:50 -0700 Subject: [PATCH 45/54] add relational testing for works model --- test/models/work_test.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/models/work_test.rb b/test/models/work_test.rb index b891a2f6fb..3c0e1ac746 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -3,12 +3,12 @@ describe Work do describe 'relations' do - # it "has votes" do - # w = Work.first - # creator = w.creator - # - # expect(creator).must_be_instance_of - # end + it 'has many votes' do + work = works(:nemo) + + work.votes.length.must_equal 3 + work.votes[0].must_equal votes(:one) + end end describe 'validations' do From f47bbc893469ef31ecbfe48d2daf86ad11750bb2 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Sun, 14 Oct 2018 17:38:02 -0700 Subject: [PATCH 46/54] refactor work_test --- test/models/work_test.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/test/models/work_test.rb b/test/models/work_test.rb index 3c0e1ac746..93b871cded 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -26,7 +26,6 @@ pub_year: 2001, description: 'daddy issues', ) - w.title = nil is_valid = w.valid? expect( is_valid ).must_equal false From 1be9735fd2c6c9023c8c360c8c23caa76ecc0818 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Sun, 14 Oct 2018 20:16:21 -0700 Subject: [PATCH 47/54] prelim upvote functionality --- app/assets/stylesheets/application.scss | 14 ++++++++---- app/controllers/votes_controller.rb | 30 +++++++++++++++++++++++++ app/controllers/works_controller.rb | 18 +++++++++++++++ app/views/homes/index.html.erb | 6 ++--- app/views/users/index.html.erb | 5 ++--- app/views/users/new.html.erb | 0 app/views/works/index.html.erb | 12 +++++----- app/views/works/show.html.erb | 13 +++++++---- config/routes.rb | 7 +++--- 9 files changed, 82 insertions(+), 23 deletions(-) delete mode 100644 app/views/users/new.html.erb diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index c236f37428..8f1908a10d 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -26,6 +26,11 @@ a:hover{ position: absolute; right: 20px; } + +.button-block{ + display: inline-flex; +} + // NAVIGATION BAR header{ @@ -53,18 +58,19 @@ header small{ .btn-primary{ background-color: rgb(168, 82, 11); border-color: rgb(168, 82, 11); + margin: 5px; } +.btn-outline-danger{ + margin: 5px; +} .btn-primary:hover{ background-color: rgb(140, 68, 8); border-color: rgb(140, 68, 8); } -// .btn{ -// position: absolute; -// right: 20px; -// } + .nav{ margin: 20px; diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index ffdb2760e0..9e3a9cda9b 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -1,2 +1,32 @@ class VotesController < ApplicationController + + def new + @vote = Vote.new + end + + def create + + work = Work.find_by(id: params[:work_id]) + user = User.find_by(id: session[:user_id]) + + if user + @vote = Vote.new(work_id: work.id, user_id: user.id) + + if @vote.save + flash[:success] = "Successfully upvoted!" + redirect_to works_path + else + flash[:error] = "You can't vote!" + redirect_to works_path + end + else + redirect_to root_path + end + end + + private + def vote_params + return params.require(:vote).permit(:user_id, :work_id) + end + end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index d57a16847c..cb94525fab 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -6,6 +6,7 @@ def index end def show + @vote = Vote.new if @work.nil? head :not_found end @@ -49,6 +50,23 @@ def destroy end + def upvote + user = User.find_by(id: session[:user_id]) + work = Work.find_by(id: params[:id]) + @vote = Vote.new(user: user, work: work) + + if @vote.save + flash[:success] = "Successfully upvoted!" + redirect_to works_path + else + flash[:error] = "You can't vote!" + redirect_to works_path + end + + + end + + private def work_params diff --git a/app/views/homes/index.html.erb b/app/views/homes/index.html.erb index 53ee7a6c07..b0d95cafef 100644 --- a/app/views/homes/index.html.erb +++ b/app/views/homes/index.html.erb @@ -25,7 +25,7 @@ <%=link_to work.title, work_path(work.id) %> by <%= work.creator %> -

    # votes

    +

    <%= work.votes.length %> votes

    <% i += 1 %> <% end %> @@ -46,7 +46,7 @@ <%=link_to work.title, work_path(work.id) %> by <%= work.creator %> -

    # votes

    +

    <%= work.votes.length %> votes

    <% i += 1 %> <% end %> @@ -67,7 +67,7 @@ <%=link_to work.title, work_path(work.id) %> by <%= work.creator %> -

    # votes

    +

    <%= work.votes.length %> votes

    <% i += 1 %> <% end %> diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 3470dcaf92..f4398c0f04 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -3,7 +3,6 @@ - @@ -12,9 +11,9 @@ <% @users.sort.each do |user| %> - - + + <% end %> diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 8a88ff493c..cf16a6bc1a 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -4,7 +4,7 @@
    ID Username Joined Votes
    <%=user.id %> <%=user.username %> <%=user.username %> <%=user.created_at.strftime("%-m/%e/%Y") %> <%=user.votes.length %>
    - + @@ -15,7 +15,7 @@ <% @works.sort.each do |work| %> <% if work.category == "album" %> - + @@ -32,7 +32,7 @@
    IDVotes Title Created By Published
    <%=work.id %> <%=work.votes.length %> <%=link_to work.title, work_path(work.id) %> <%=work.creator %> <%=work.pub_year %>
    - + @@ -43,7 +43,7 @@ <% @works.sort.each do |work| %> <% if work.category == "book" %> - + @@ -60,7 +60,7 @@
    IDVotes Title Created By Published
    <%=work.id %> <%=work.votes.length %> <%=link_to work.title, work_path(work.id) %> <%=work.creator %> <%=work.pub_year %>
    - + @@ -71,7 +71,7 @@ <% @works.sort.each do |work| %> <% if work.category == "movie" %> - + diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index d05c0ee6e5..80351d7d71 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -14,11 +14,16 @@

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

    Published: <%=@work.pub_year %>

    Description: <%=@work.description %>

    +

    Votes: <%=@work.votes.length %>

    - Back to media ranks - >Edit - +
    + Back to media ranks - <%= link_to "Delete", work_path(@work), method: :delete, data: { confirm: "Are you sure you want to delete #{@work.title}?" }, class: "btn btn-outline-danger" %> + >Edit + <%= form_for @vote, url: work_votes_path(@work) do |f| %> + <%= f.submit "Upvote", class: "btn btn-primary" %> + <% end %> + <%= link_to "Delete", work_path(@work), method: :delete, data: { confirm: "Are you sure you want to delete #{@work.title}?" }, class: "btn btn-outline-danger" %> +
    diff --git a/config/routes.rb b/config/routes.rb index 9b8c053426..6151b689a4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,9 +4,10 @@ root 'homes#index' get '/homes', to: 'homes#index' - resources :works - resources :users, except: [:update] - resources :votes, only: [:index, :new, :create] + resources :works do + resources :votes, only: [:new, :create] + end + resources :users, except: :update resources :sessions, only: [:new, :create] post '/sessions/logout', to: 'sessions#logout', as: 'logout' From 37da31d50d5e7663d85f9118f33e044db9fc0309 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Sun, 14 Oct 2018 20:33:16 -0700 Subject: [PATCH 48/54] user can only vote for media once --- app/controllers/votes_controller.rb | 31 ++++++++++++++------------ app/views/layouts/application.html.erb | 2 +- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index 9e3a9cda9b..7da674e70f 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -1,32 +1,35 @@ class VotesController < ApplicationController def new - @vote = Vote.new end def create - work = Work.find_by(id: params[:work_id]) user = User.find_by(id: session[:user_id]) if user - @vote = Vote.new(work_id: work.id, user_id: user.id) + had_voted = false + + user.votes.each do |vote| + if vote.work_id == work.id + had_voted = true + end + end - if @vote.save + @vote = Vote.new(work_id: work.id, user_id: user.id) + if had_voted + flash[:error] = "You have already voted for this media." + redirect_to work_path(work.id) + elsif @vote.save flash[:success] = "Successfully upvoted!" - redirect_to works_path + redirect_to work_path(work.id) else - flash[:error] = "You can't vote!" - redirect_to works_path + flash[:error] = "There was an error." + redirect_to work_path(work.id) end else - redirect_to root_path + flash[:error] = "You must be logged in to vote!" + redirect_to work_path(work.id) end end - - private - def vote_params - return params.require(:vote).permit(:user_id, :work_id) - end - end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index cac6f7132a..794f123f50 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -51,7 +51,7 @@
    <% flash.each do |key, message| %>

    -

    +

    <% end %>
    From f2efa11cc4f550bd74fe384f136a7ec6e4d9b417 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Sun, 14 Oct 2018 21:00:02 -0700 Subject: [PATCH 49/54] add login validations and login disclaimer for user --- app/views/sessions/new.html.erb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index f98237b013..fd12aad2eb 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -1,6 +1,15 @@

    Log In

    +

    + Username must be less than 15 characters and only contain: +

      +
    • lowercase letters (a-z)
      • +
    • numbers (0-9)
      • +
    • dashes (-)
      • +
    • underscores (_)
      • +
    +

    <%= form_with method: :post, url: sessions_path do |f| %>
    <%= f.label :username%> @@ -11,4 +20,14 @@ <% end %> +
    +

    A note about logging in

    +

    + There is no password field. In fact, there is no indication whatsoever that you are who you say you are. There's nothing special about users - username is just another piece of data that the user entered and we have to keep track of. +

    + +

    + We'll learn more about security and authentication in the next couple weeks. For now, don't worry about it beyond what you can see here. +

    +
    From 79a674ec877488f15ffa50b106934bb5c35a4c52 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Sun, 14 Oct 2018 21:00:32 -0700 Subject: [PATCH 50/54] refactor --- app/controllers/homes_controller.rb | 1 - app/controllers/sessions_controller.rb | 1 + app/controllers/users_controller.rb | 16 ---------------- config/routes.rb | 3 ++- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/app/controllers/homes_controller.rb b/app/controllers/homes_controller.rb index 9504a04305..bb9d67950c 100644 --- a/app/controllers/homes_controller.rb +++ b/app/controllers/homes_controller.rb @@ -1,5 +1,4 @@ class HomesController < ApplicationController - def index @works = Work.all end diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 49a8b97b5f..f372f48fd5 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -17,6 +17,7 @@ def create session[:user_id] = @user.id redirect_to root_path else + flash[:error] = "Please provide a valid input. " render :new end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 420cf44891..d29a757769 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -13,22 +13,6 @@ def show end - def new - @user = User.new - end - - - def create - @user = User.new(user_params) - - if @user.save - redirect_to users_path - else - render :new , status: :bad_request - end - end - - def edit end diff --git a/config/routes.rb b/config/routes.rb index 6151b689a4..24e94df08a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,7 +7,8 @@ resources :works do resources :votes, only: [:new, :create] end - resources :users, except: :update + + resources :users, except: [:new, :create, :update] resources :sessions, only: [:new, :create] post '/sessions/logout', to: 'sessions#logout', as: 'logout' From aa830184d8bc4b5610d5559e3ab6f5dd227e475c Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Sun, 14 Oct 2018 21:13:10 -0700 Subject: [PATCH 51/54] spacing --- app/controllers/votes_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index 7da674e70f..36fb863961 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -32,4 +32,5 @@ def create redirect_to work_path(work.id) end end + end From 4bea00e37b1e4038c34b07bdceaec7dd1a418137 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Sun, 14 Oct 2018 22:04:59 -0700 Subject: [PATCH 52/54] logic for spotlight media in works model --- app/controllers/application_controller.rb | 1 - app/controllers/works_controller.rb | 21 ++------------------- app/models/application_record.rb | 1 + app/models/work.rb | 11 +++++++++++ app/views/homes/index.html.erb | 5 +++-- 5 files changed, 17 insertions(+), 22 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7b27c7d774..c50d63a94a 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,5 +1,4 @@ class ApplicationController < ActionController::Base - before_action :find_logged_in_user def find_logged_in_user @logged_in_user = User.find_by(id: session[:user_id]) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index cb94525fab..8961cddb31 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -48,25 +48,7 @@ def destroy @work.destroy redirect_to homes_path end - - - def upvote - user = User.find_by(id: session[:user_id]) - work = Work.find_by(id: params[:id]) - @vote = Vote.new(user: user, work: work) - - if @vote.save - flash[:success] = "Successfully upvoted!" - redirect_to works_path - else - flash[:error] = "You can't vote!" - redirect_to works_path - end - - - end - - + private def work_params @@ -76,4 +58,5 @@ def work_params def find_work @work = Work.find_by(id: params[:id]) end + end diff --git a/app/models/application_record.rb b/app/models/application_record.rb index 10a4cba84d..0e0f662d41 100644 --- a/app/models/application_record.rb +++ b/app/models/application_record.rb @@ -1,3 +1,4 @@ class ApplicationRecord < ActiveRecord::Base self.abstract_class = true + end diff --git a/app/models/work.rb b/app/models/work.rb index cda30fa7f8..3667018696 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -5,4 +5,15 @@ class Work < ApplicationRecord validates :creator, presence: true validates :category, presence: true validates :pub_year, numericality: {only_integer: true, less_than_or_equal_to: 2018} + + def self.spotlight + most_voted = Work.first + Work.all.each do |work| + if work.votes.length > most_voted.votes.length + most_voted = work + end + end + return most_voted + end + end diff --git a/app/views/homes/index.html.erb b/app/views/homes/index.html.erb index b0d95cafef..7c6acd6ec2 100644 --- a/app/views/homes/index.html.erb +++ b/app/views/homes/index.html.erb @@ -2,10 +2,11 @@

    🔦 Media Spotlight: - TITLE by AUTHOR + <%= @works.spotlight.title %> by <%= @works.spotlight.creator %>

    - description + <%= @works.spotlight.votes.length %> votes - + <%= @works.spotlight.description %>

    From c2fbc0db21f8347df9f2253b78328a22c21a73ec Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Sun, 14 Oct 2018 23:59:50 -0700 Subject: [PATCH 53/54] can see spotlight and top 10 works....honestly not my fave solution? look up active record querying --- app/controllers/application_controller.rb | 2 ++ app/models/work.rb | 13 ++++++------- app/views/homes/index.html.erb | 6 +++--- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index c50d63a94a..33eaba5a38 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,4 +1,6 @@ class ApplicationController < ActionController::Base + before_action :find_logged_in_user + def find_logged_in_user @logged_in_user = User.find_by(id: session[:user_id]) diff --git a/app/models/work.rb b/app/models/work.rb index 3667018696..19321b46d2 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -7,13 +7,12 @@ class Work < ApplicationRecord validates :pub_year, numericality: {only_integer: true, less_than_or_equal_to: 2018} def self.spotlight - most_voted = Work.first - Work.all.each do |work| - if work.votes.length > most_voted.votes.length - most_voted = work - end - end - return most_voted + w = Work.all.sort_by {|work| work.votes.length } + return w.reverse!.first end + def self.sorted + w = Work.all.sort_by {|work| work.votes.length } + return w.reverse! + end end diff --git a/app/views/homes/index.html.erb b/app/views/homes/index.html.erb index 7c6acd6ec2..a36b37317d 100644 --- a/app/views/homes/index.html.erb +++ b/app/views/homes/index.html.erb @@ -19,7 +19,7 @@
      <% i = 0 %> - <% @works.each do |work| %> + <% @works.sorted.each do |work| %> <% if work.category == 'movie' && i < 10 %>

    • @@ -40,7 +40,7 @@

        <% i = 0 %> - <% @works.each do |work| %> + <% @works.sorted.each do |work| %> <% if work.category == 'book' && i < 10 %>

      • @@ -61,7 +61,7 @@

          <% i = 0 %> - <% @works.each do |work| %> + <% @works.sorted.each do |work| %> <% if work.category == 'album' && i < 10 %>

        • From d4c317db24d49476c05b87dc631dd98dca6af968 Mon Sep 17 00:00:00 2001 From: Goeun Park Date: Mon, 15 Oct 2018 13:15:46 -0700 Subject: [PATCH 54/54] add upvote button to work index --- app/controllers/works_controller.rb | 3 ++- app/views/works/index.html.erb | 18 +++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 8961cddb31..8ee79eade9 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -2,6 +2,7 @@ class WorksController < ApplicationController before_action :find_work, only: [:show, :edit, :update, :destroy] def index + @vote = Vote.new @works = Work.all end @@ -48,7 +49,7 @@ def destroy @work.destroy redirect_to homes_path end - + private def work_params diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index cf16a6bc1a..09165983a6 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -19,7 +19,11 @@

    - + <% end %> <% end %> @@ -47,7 +51,11 @@ - + <% end %> <% end %> @@ -75,7 +83,11 @@ - + <% end %> <% end %>
    IDVotes Title Created By Published
    <%=work.id %> <%= work.votes.length %> <%=link_to work.title, work_path(work.id) %> <%=work.creator %> <%=work.pub_year %> <%=link_to work.title, work_path(work.id) %> <%=work.creator %> <%=work.pub_year %> (button here) + <%= form_for @vote, url: work_votes_path(work) do |f| %> + <%= f.submit "Upvote", class: "btn btn-primary" %> + <% end %> +
    <%=link_to work.title, work_path(work.id) %> <%=work.creator %> <%=work.pub_year %> (button here) + <%= form_for @vote, url: work_votes_path(work) do |f| %> + <%= f.submit "Upvote", class: "btn btn-primary" %> + <% end %> +
    <%=link_to work.title, work_path(work.id) %> <%=work.creator %> <%=work.pub_year %> (button here) + <%= form_for @vote, url: work_votes_path(work) do |f| %> + <%= f.submit "Upvote", class: "btn btn-primary" %> + <% end %> +