From 5412fa15eedae37b71cce60e849bc3558b9939b2 Mon Sep 17 00:00:00 2001 From: Shelan Date: Wed, 10 Oct 2018 18:43:24 -0700 Subject: [PATCH 01/15] added models, controllers, routes, index page with table --- .gitignore | 27 ++ .ruby-version | 1 + Gemfile | 81 +++++ Gemfile.lock | 277 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/assets/config/manifest.js | 3 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 20 ++ app/assets/javascripts/cable.js | 13 + app/assets/javascripts/channels/.keep | 0 app/assets/javascripts/sessions.js | 2 + app/assets/javascripts/users.js | 2 + app/assets/javascripts/votes.js | 2 + app/assets/javascripts/works.js | 2 + app/assets/stylesheets/application.scss | 18 ++ app/assets/stylesheets/sessions.scss | 3 + app/assets/stylesheets/users.scss | 3 + app/assets/stylesheets/votes.scss | 3 + app/assets/stylesheets/works.scss | 3 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 7 + app/controllers/concerns/.keep | 0 app/controllers/sessions_controller.rb | 24 ++ app/controllers/users_controller.rb | 13 + app/controllers/votes_controller.rb | 19 ++ app/controllers/works_controller.rb | 72 +++++ app/helpers/application_helper.rb | 2 + app/helpers/sessions_helper.rb | 2 + app/helpers/users_helper.rb | 2 + app/helpers/votes_helper.rb | 2 + app/helpers/works_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/models/user.rb | 4 + app/models/vote.rb | 4 + app/models/work.rb | 21 ++ app/views/layouts/application.html.erb | 54 ++++ app/views/layouts/mailer.html.erb | 13 + app/views/layouts/mailer.text.erb | 1 + app/views/sessions/new.html.erb | 14 + app/views/works/_form.html.erb | 25 ++ app/views/works/homepage.html.erb | 27 ++ app/views/works/index.html.erb | 21 ++ app/views/works/show.html.erb | 9 + 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 | 30 ++ config/spring.rb | 6 + config/storage.yml | 34 +++ db/migrate/20181008235728_create_works.rb | 13 + db/migrate/20181009000256_create_users.rb | 10 + db/migrate/20181009000517_create_votes.rb | 10 + db/schema.rb | 45 +++ db/seeds.rb | 12 + 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/controllers/sessions_controller_test.rb | 7 + test/controllers/users_controller_test.rb | 7 + test/controllers/votes_controller_test.rb | 7 + test/controllers/works_controller_test.rb | 7 + test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/fixtures/users.yml | 22 ++ test/fixtures/votes.yml | 25 ++ test/fixtures/works.yml | 32 ++ test/helpers/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/models/user_test.rb | 9 + test/models/vote_test.rb | 9 + test/models/work_test.rb | 83 ++++++ test/system/.keep | 0 test/test_helper.rb | 24 ++ tmp/.keep | 0 vendor/.keep | 0 118 files changed, 2049 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/assets/config/manifest.js create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/javascripts/cable.js create mode 100644 app/assets/javascripts/channels/.keep create mode 100644 app/assets/javascripts/sessions.js create mode 100644 app/assets/javascripts/users.js create mode 100644 app/assets/javascripts/votes.js create mode 100644 app/assets/javascripts/works.js create mode 100644 app/assets/stylesheets/application.scss create mode 100644 app/assets/stylesheets/sessions.scss create mode 100644 app/assets/stylesheets/users.scss create mode 100644 app/assets/stylesheets/votes.scss create mode 100644 app/assets/stylesheets/works.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/controllers/sessions_controller.rb create mode 100644 app/controllers/users_controller.rb create mode 100644 app/controllers/votes_controller.rb create mode 100644 app/controllers/works_controller.rb create mode 100644 app/helpers/application_helper.rb create mode 100644 app/helpers/sessions_helper.rb create mode 100644 app/helpers/users_helper.rb create mode 100644 app/helpers/votes_helper.rb create mode 100644 app/helpers/works_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/models/user.rb create mode 100644 app/models/vote.rb create mode 100644 app/models/work.rb 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 100644 app/views/sessions/new.html.erb create mode 100644 app/views/works/_form.html.erb create mode 100644 app/views/works/homepage.html.erb create mode 100644 app/views/works/index.html.erb create mode 100644 app/views/works/show.html.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/migrate/20181008235728_create_works.rb create mode 100644 db/migrate/20181009000256_create_users.rb create mode 100644 db/migrate/20181009000517_create_votes.rb create mode 100644 db/schema.rb 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/controllers/sessions_controller_test.rb create mode 100644 test/controllers/users_controller_test.rb create mode 100644 test/controllers/votes_controller_test.rb create mode 100644 test/controllers/works_controller_test.rb create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/fixtures/users.yml create mode 100644 test/fixtures/votes.yml create mode 100644 test/fixtures/works.yml 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/models/user_test.rb create mode 100644 test/models/vote_test.rb create mode 100644 test/models/work_test.rb 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/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/javascripts/sessions.js b/app/assets/javascripts/sessions.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/sessions.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/javascripts/users.js b/app/assets/javascripts/users.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/users.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/javascripts/votes.js b/app/assets/javascripts/votes.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/votes.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/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/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/assets/stylesheets/sessions.scss b/app/assets/stylesheets/sessions.scss new file mode 100644 index 0000000000..ccb1ed25b2 --- /dev/null +++ b/app/assets/stylesheets/sessions.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Sessions controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/users.scss b/app/assets/stylesheets/users.scss new file mode 100644 index 0000000000..31a2eacb84 --- /dev/null +++ b/app/assets/stylesheets/users.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Users controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/votes.scss b/app/assets/stylesheets/votes.scss new file mode 100644 index 0000000000..9a6720f80e --- /dev/null +++ b/app/assets/stylesheets/votes.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Votes controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/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/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..7160a45ded --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,7 @@ +class ApplicationController < ActionController::Base + private + + def find_user #will know the current logged-in user for every view page + @current_user = User.find_by(id: session[:user_id]) + end +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb new file mode 100644 index 0000000000..de79b670cc --- /dev/null +++ b/app/controllers/sessions_controller.rb @@ -0,0 +1,24 @@ +class SessionsController < ApplicationController + def login + user = User.find_by(username: params[:user][:username]) + if user.nil? + # Create a new user + user = User.create(username: params[:user][:username], Date.today => params[:user][:join_date]) + user.join_date = Date.today + end + + session[:user_id] = user.id + flash[:success] = "#{user.name} Successfully logged in!" + redirect_to root_path + end + + def new + @user = User.new + end + + def destroy #logout method + session[:user_id] = nil + flash[:success] = 'Successfully logged out' + redirect_back fallback_location: root_path + end +end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb new file mode 100644 index 0000000000..1539b678fb --- /dev/null +++ b/app/controllers/users_controller.rb @@ -0,0 +1,13 @@ +class UsersController < ApplicationController + def index + @users = User.all(:id) + end + + def show + id = params[:id].to_i + @users = user.find(params[:id].to_i) + if id.nil? + render :notfound + end + end +end diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb new file mode 100644 index 0000000000..74491471cc --- /dev/null +++ b/app/controllers/votes_controller.rb @@ -0,0 +1,19 @@ +class VotesController < ApplicationController + def create #work's vote + @vote = Vote.new(vote_params) + if @vote.save # save returns true if the database insert succeeds + redirect_to root_path + else # save failed :( + show error message#stay at work's show page + end + end + + + + + private + + def vote_params + return params.require(:work).permit(:category, :title, :creator, :published_year, :description) + end +end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb new file mode 100644 index 0000000000..d24b99aeb7 --- /dev/null +++ b/app/controllers/works_controller.rb @@ -0,0 +1,72 @@ +class WorksController < ApplicationController + def index + @works = Work.all + end + + def show + id = params[:id].to_i + @works = vote.find(params[:id].to_i) + + if id.nil? + render :notfound + end + end + + def new + @work = Work.new + end + + def edit + id = params[:id].to_i + @work = Work.find(params[:id].to_i) + end + + def update + work = params[:id].to_i + @work = Work.find_by(id: id) + @work.update(vote_params) + + if @work.save + redirect_to votes_path + else + render :new + end + end + + def create + @work = Work.new(vote_params) + if @vote.save # save returns true if the database insert succeeds + redirect_to root_path # for now + else # save failed :( + render :new # show the new work from view again + end + end + + def upvote + id = params[:id].to_i + if @work.upvote = false + flash[:error] = "A problem occurred: Could not create #{self.category}. #{self.title}: has already been taken" + else + @work.update.save + flash[:sucess] = "Successfully created #{self.category} #{self.id}" + redirect_to work_path + end + end + + def destroy + id = params[:id].to_i + @work = Work.find_by(id: id) + if @work.destroy + redirect_to root_path + end + end + + + + + private + + def work_params + return params.require(:work).permit(:category, :title, :creator, :published_year, :description) + end +end 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/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb new file mode 100644 index 0000000000..309f8b2eb3 --- /dev/null +++ b/app/helpers/sessions_helper.rb @@ -0,0 +1,2 @@ +module SessionsHelper +end diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb new file mode 100644 index 0000000000..2310a240d7 --- /dev/null +++ b/app/helpers/users_helper.rb @@ -0,0 +1,2 @@ +module UsersHelper +end diff --git a/app/helpers/votes_helper.rb b/app/helpers/votes_helper.rb new file mode 100644 index 0000000000..5a82eed07d --- /dev/null +++ b/app/helpers/votes_helper.rb @@ -0,0 +1,2 @@ +module VotesHelper +end diff --git a/app/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/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/models/user.rb b/app/models/user.rb new file mode 100644 index 0000000000..b1f986dd41 --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,4 @@ +class User < ApplicationRecord + has_many :votes + has_many :works, through: :votes +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 new file mode 100644 index 0000000000..2679a0f026 --- /dev/null +++ b/app/models/work.rb @@ -0,0 +1,21 @@ +class Work < ApplicationRecord + has_many :votes + has_many :users, through: :votes + validates :title, presence: true + + def upvote(user) + if Vote.find_by(user_id: user.id, work_id: self.id ) + return false #vote was created + else + vote = Vote.new + vote.user = user + vote.work = self + return vote.save + end + end +end + + +# controllers + +#@work.upvote(@current_user) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 0000000000..3888ea0356 --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,54 @@ + + + + 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' %> + + + +
+
+ <% flash.each do |name, message| %> + <% if message.class == Array %> + <% message.each do |msg| %> +
+ <%= "#{name}:" %><%= " #{msg}" %>
+ <% end %> + <% else %> +
+ <%= message %> +
+ <% end %> + <% end %> + + <% if @current_user %> +

Welcome <%= @current_user.name %>

+ <% end %> +
+

Media Ranker| Ranking the Best of Everything

+ +
  • + <% if @current_user %> + <%= link_to "Log Out", logout_path, method: :delete, class: 'btn btn-primary' %> + <% else %> + <%= link_to "Login", login_path, class: 'btn btn-primary' %> + <% end %> +
    • +
    +
    + <%= 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/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb new file mode 100644 index 0000000000..86b51df41d --- /dev/null +++ b/app/views/sessions/new.html.erb @@ -0,0 +1,14 @@ +

    Please Log in

    + +<%= form_with model: @user, url: login_path, method: :post do |f| %> + <%= f.label :username, 'Username' %> + <%= f.text_field :username, placeholder: 'Username' %> + <%= f.submit 'Login' %> +<% end %> +

    +

    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. +

    diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb new file mode 100644 index 0000000000..e5f911d7e2 --- /dev/null +++ b/app/views/works/_form.html.erb @@ -0,0 +1,25 @@ +<%= form_with model: @work do |f|%> + +

    Add a new work

    + + <%= f.label :category, "Category" %> + <%= f.select :category, ["Album", "Book", "Movie"] %> + + + <%= f.label :title %> + <%= f.text_field :title %> + + <%= f.label :creator %> + <%= f.text_field :creator %> + + + <%= f.label :published_year %> + <%= f.text_field :published_year %> + + <%= f.label :description %> + <%= f.text_field :description %> + + + <%= f.submit "Create Work", class: "add_work-button" %> + + <% end %> diff --git a/app/views/works/homepage.html.erb b/app/views/works/homepage.html.erb new file mode 100644 index 0000000000..4f21b0162b --- /dev/null +++ b/app/views/works/homepage.html.erb @@ -0,0 +1,27 @@ + + + + Media Ranker + + + + + + +
    +

    "Media Spotlight" +

    + <% work_most = @works.each do { |work| work.vote.max } %> + <%=link_to work.id, work_path(work.id)%> +

    +

    + + + + + diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb new file mode 100644 index 0000000000..c939b429c4 --- /dev/null +++ b/app/views/works/index.html.erb @@ -0,0 +1,21 @@ + + + + + + + + + + + +<% @works.each do |work| %> + + + + + + + +<% end %> +
    VotesTitleCreated ByPublishedUpvote
    votes goes here<%=link_to work.title, work_path(work.id)%><%=work.creator%><%=work.published_year%>upvote button goes here
    diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb new file mode 100644 index 0000000000..64a2e39387 --- /dev/null +++ b/app/views/works/show.html.erb @@ -0,0 +1,9 @@ +

    <%= @work.title %>

    +

    <%=work.creator %>

    +

    <%=work.published_year %>

    +

    <%=work.description %>

    + +
    <%= link_to "Back to media ranks", root_path %>
    +
    <%= link_to "Edit", edit_work_path(@work.id) %>
    +
    <%= link_to "Upvote", work_path(@work.id) %>
    +
    <%= link_to "Delete", work_path(@work.id), method: :delete, data: {confirm: "Please confirm you would like to delete." } %>
    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..4f7a7930ef --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +G/Zn2Pu/gKiO4cajd3IiJNm5Crn7MC4A4yOvDH6P4ZVhCLr4QokRh1saNib4Bt70x9tsKgssrJDw3oQq5cX1RfGEvYk8hDqNY3fk1nfUNOcgWayL3yj4drL6o+O6YifMgSaDYxkD5yvwe5PPMqcHg5EGlhPMfU5HPe/H1znruIcVV6vTpZj08M18Wf5G1+1hf7Z5SxT9Lep36SGKWG3IDdGCb+67phOYo+zcFfOWLqgJGx+sDb35iGRX5aBhAfmLmAr5r7GNi2c2IjrTMlL7cOQhhuxhxaQp5tRCFdeg4pXM3hCZMpasin48NVzUlSc4w3h77VoLhWfrdumXlX6J82sZEaAW4yd0zpL2NaC4yRdLWMssFlymRegcu/s+HKTaqnoBDgD7BRvdkSNjpPZcmjO3hfrHiFWG2oMg--3uPmpToNNELIZRuD--PHtCmzlOgrtERX1qDmx1mQ== \ 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..4b7383ff77 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,30 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + post 'sessions/login', to: 'sessions#login', as: 'login' + get 'sessions/login', to: 'sessions#new' + delete 'sessions/destroy', to: 'sessions#destroy', as: 'logout' + + root "works#index" + + resources :works do + resources :votes, only: [:create] + end + + resources :users, + only: [:index, :show] + end + # get '/works', to: 'works#index', as: "works" + # + # get '/works/new', to: 'works#new', as: "new_work" + # post '/works', to: 'works#create' + # + # get '/works/:id/edit', to: 'works#edit', as: 'edit_work' + # + # get '/works/:id', to: 'works#show', as: "work" + # + # patch '/works/:id', to: 'works#update', as: "update_work" + # put '/works/:id', to: 'works#update' + # + # delete '/works/:id', to: 'works#destroy', as: "delete_work" + + # resources :votes 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/migrate/20181008235728_create_works.rb b/db/migrate/20181008235728_create_works.rb new file mode 100644 index 0000000000..f04ff1bd87 --- /dev/null +++ b/db/migrate/20181008235728_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 :published_year + t.string :description + + t.timestamps + end + end +end diff --git a/db/migrate/20181009000256_create_users.rb b/db/migrate/20181009000256_create_users.rb new file mode 100644 index 0000000000..413f7321cd --- /dev/null +++ b/db/migrate/20181009000256_create_users.rb @@ -0,0 +1,10 @@ +class CreateUsers < ActiveRecord::Migration[5.2] + def change + create_table :users do |t| + t.string :username + t.string :join_date + + t.timestamps + end + end +end diff --git a/db/migrate/20181009000517_create_votes.rb b/db/migrate/20181009000517_create_votes.rb new file mode 100644 index 0000000000..0375660b58 --- /dev/null +++ b/db/migrate/20181009000517_create_votes.rb @@ -0,0 +1,10 @@ +class CreateVotes < ActiveRecord::Migration[5.2] + def change + create_table :votes do |t| + t.string :work_id + t.string :user_id + t.string :vote_time + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000000..92e70a3b5d --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,45 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2018_10_09_000517) 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.string "join_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "votes", force: :cascade do |t| + t.string "work_id" + t.string "user_id" + t.string "vote_time" + 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 "published_year" + t.string "description" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + + +end diff --git a/db/seeds.rb b/db/seeds.rb new file mode 100644 index 0000000000..10f002a242 --- /dev/null +++ b/db/seeds.rb @@ -0,0 +1,12 @@ +# 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) + +Work.create(category: "Book", title: "September", creator: "Bob", published_year: "01-01-2015", description: "great book") +Work.create(category: "Album", title: "June", creator: "Sue", published_year: "07-01-2015", description: "good music") +Work.create(category: "Album", title: "May", creator: "Sam", published_year: "01-01-2015", description: "good music") +Work.create(category: "Movie", title: "August", creator: "John", published_year: "01-01-2016", description: "good movie") 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/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb new file mode 100644 index 0000000000..c2632a720b --- /dev/null +++ b/test/controllers/sessions_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe SessionsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb new file mode 100644 index 0000000000..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/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/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/.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/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 0000000000..bf73a6757c --- /dev/null +++ b/test/fixtures/users.yml @@ -0,0 +1,22 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +# one: {} +# column: value +# +# two: {} +# column: value +sam: + username: Sam + join_date: '2014-01-01' + +sara: + username: Sara + join_date: '2015-01-01' + +jordan: + username: Jordan + join_date: '2016-01-01' diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml new file mode 100644 index 0000000000..223e3920c2 --- /dev/null +++ b/test/fixtures/votes.yml @@ -0,0 +1,25 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +# one: {} +# column: value +# +# two: {} +# column: value +vote_1: + work_id: 21 + user_id: 31 + vote_time: '05-15-25' + + vote_2: + work_id: 11 + user_id: 11 + vote_time: '07-15-25' + +vote_3: + work_id: 01 + user_id: 12 + vote_time: '10-15-25' diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml new file mode 100644 index 0000000000..1eaa801f94 --- /dev/null +++ b/test/fixtures/works.yml @@ -0,0 +1,32 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +# one: {} +# column: value +# +# two: {} +# column: value + +book: + category: Book + title: Rings of Saturn + creator: John + published_year: 2008 + description: "The best book ever" + +song: + category: Album + title: Summer Nights + creator: The band + published_year: 1987 + description: "The best song ever" + +movie: + category: Movie + title: The Days are long + creator: Mary Johnson + published_year: 2018 + description: "The best movie ever" 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/models/user_test.rb b/test/models/user_test.rb new file mode 100644 index 0000000000..cc862ac2d9 --- /dev/null +++ b/test/models/user_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe User do + let(:user) { User.new } + + it "must be valid" do + value(user).must_be :valid? + end +end diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb new file mode 100644 index 0000000000..fc15947bd3 --- /dev/null +++ b/test/models/vote_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Vote do + let(:vote) { Vote.new } + + it "must be valid" do + value(vote).must_be :valid? + end +end diff --git a/test/models/work_test.rb b/test/models/work_test.rb new file mode 100644 index 0000000000..c1e9ac7559 --- /dev/null +++ b/test/models/work_test.rb @@ -0,0 +1,83 @@ +require "test_helper" + +describe Work do + let(:work) { Work.new } + + it "must be valid" do + value(work).must_be :valid? + end + + describe "Presence of required attributes" do + + it "has required fields" do + fields = [:category, :title, :creator, :published_year, :description] + + fields.each do |field| + expect(work).must_respond_to field + end + + end + + describe "Relationships" do #work has many votes + it "can have many votes" + #Arrange done with let + + #Act + work.votes << Vote.first + votes = work.votes + + #Assert + expect(votes).must_equal :>=, 1 + votes.each do |vote| + expect(vote).must_be_instance of Integer + end + end + + it "can have many users through votes" #work belongs to user + #Arrange done with let + + #Act + #work <== add users through votes + @work.users << User.find(user_id) + + user.works.select(vote.id)includes(:vote).each so |work| + vote = Work.vote + + user.vote_works.each do |vote_work| + vote_work.username + + + #work <== add users through votes + @work.users << User.find(user_id) + #Assert + end + + describe 'validations' do + + it "requires a unique title" do #for each category + #Arrange + new_work = Work.new title: work.title + #Act + new_work.valid? + #Assert + expect(new_work).must_equal false + expect(new_work.errors.messages).must_include :title + end + end + + describe "Custom Method" do + + it "cannot recieve multiple votes from single user" + #Arrange + #Act + user = User_id(id: 2) + work = self.id(id: 22) + @vote = Vote.id.include(user_id: 2, self.id: 22) + + #Assert + expect(@vote).must_equal false + expect(work.errors.messages).wont_include: user_id + + end + end +end 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 b1f1d2f759157af156e9086b7d7313129745ed68 Mon Sep 17 00:00:00 2001 From: Shelan Date: Wed, 10 Oct 2018 18:47:41 -0700 Subject: [PATCH 02/15] fixed show page for Works --- app/controllers/works_controller.rb | 4 ++-- app/views/works/show.html.erb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index d24b99aeb7..1f1ed5dc6b 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -5,7 +5,7 @@ def index def show id = params[:id].to_i - @works = vote.find(params[:id].to_i) + @work = Work.find(params[:id].to_i) if id.nil? render :notfound @@ -69,4 +69,4 @@ def destroy def work_params return params.require(:work).permit(:category, :title, :creator, :published_year, :description) end -end +end diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 64a2e39387..19a0d50f09 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -1,7 +1,7 @@

    <%= @work.title %>

    -

    <%=work.creator %>

    -

    <%=work.published_year %>

    -

    <%=work.description %>

    +

    <%= @work.creator %>

    +

    <%= @work.published_year %>

    +

    <%= @work.description %>

    <%= link_to "Back to media ranks", root_path %>
    <%= link_to "Edit", edit_work_path(@work.id) %>
    From f7693d5b721688fdc07ccd2350f4825880a7646c Mon Sep 17 00:00:00 2001 From: Shelan Date: Wed, 10 Oct 2018 18:58:49 -0700 Subject: [PATCH 03/15] fixed create method to create new work --- app/controllers/works_controller.rb | 4 ++-- app/views/works/{_form.html.erb => new.html.erb} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename app/views/works/{_form.html.erb => new.html.erb} (86%) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 1f1ed5dc6b..9203d62d65 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -34,8 +34,8 @@ def update end def create - @work = Work.new(vote_params) - if @vote.save # save returns true if the database insert succeeds + @work = Work.new(work_params) + if @work.save # save returns true if the database insert succeeds redirect_to root_path # for now else # save failed :( render :new # show the new work from view again diff --git a/app/views/works/_form.html.erb b/app/views/works/new.html.erb similarity index 86% rename from app/views/works/_form.html.erb rename to app/views/works/new.html.erb index e5f911d7e2..503aeab4a4 100644 --- a/app/views/works/_form.html.erb +++ b/app/views/works/new.html.erb @@ -1,4 +1,4 @@ -<%= form_with model: @work do |f|%> +<%= form_with model: @work, url: works_path, method: :post do |f|%>

    Add a new work

    From b9527cbb4ee03b26f1c4fb78ab953829a358271a Mon Sep 17 00:00:00 2001 From: Shelan Date: Sat, 13 Oct 2018 14:07:00 -0700 Subject: [PATCH 04/15] user all index is fixed --- app/controllers/users_controller.rb | 5 +- app/controllers/votes_controller.rb | 25 ++--- app/controllers/works_controller.rb | 13 +-- app/models/user.rb | 3 + app/models/vote.rb | 1 + app/models/work.rb | 9 +- app/views/users/index.html.erb | 13 +++ app/views/users/show.html.erb | 19 ++++ app/views/works/index.html.erb | 2 +- app/views/works/show.html.erb | 28 ++++-- db/migrate/20181012234341_remove.rb | 5 + ...0181012234713_remove_user_id_from_votes.rb | 5 + ...1012235042_add_workand_user_id_to_votes.rb | 6 ++ db/schema.rb | 12 ++- db/seeds.rb | 8 +- test/fixtures/votes.yml | 4 +- test/models/user_test.rb | 94 +++++++++++++++++++ test/models/vote_test.rb | 32 +++++++ test/models/work_test.rb | 84 ++++++++++++----- 19 files changed, 293 insertions(+), 75 deletions(-) create mode 100644 app/views/users/index.html.erb create mode 100644 app/views/users/show.html.erb create mode 100644 db/migrate/20181012234341_remove.rb create mode 100644 db/migrate/20181012234713_remove_user_id_from_votes.rb create mode 100644 db/migrate/20181012235042_add_workand_user_id_to_votes.rb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 1539b678fb..cc511aa0f6 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,11 +1,12 @@ class UsersController < ApplicationController def index - @users = User.all(:id) + @users = User.all.order(:username) end def show id = params[:id].to_i - @users = user.find(params[:id].to_i) + @user = User.find(params[:id].to_i) + if id.nil? render :notfound end diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index 74491471cc..b02130652b 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -1,19 +1,14 @@ class VotesController < ApplicationController - def create #work's vote - @vote = Vote.new(vote_params) - if @vote.save # save returns true if the database insert succeeds - redirect_to root_path - else # save failed :( - show error message#stay at work's show page + def create + id = params[:work_id].to_i + @work = Work.find(id) + ## Figure out how to get a user of a session. + ## user = + if @work.upvote(user) == false + flash[:error] = "A problem occurred: Could not create #{@work.category} #{@work.title}: has already been taken" + else + flash[:sucess] = "Successfully created #{@work.category} #{@work.id}" + redirect_to work_path end end - - - - - private - - def vote_params - return params.require(:work).permit(:category, :title, :creator, :published_year, :description) - end end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 9203d62d65..7bee2c0bf5 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -24,7 +24,7 @@ def edit def update work = params[:id].to_i @work = Work.find_by(id: id) - @work.update(vote_params) + @work.update(work_params) if @work.save redirect_to votes_path @@ -42,16 +42,7 @@ def create end end - def upvote - id = params[:id].to_i - if @work.upvote = false - flash[:error] = "A problem occurred: Could not create #{self.category}. #{self.title}: has already been taken" - else - @work.update.save - flash[:sucess] = "Successfully created #{self.category} #{self.id}" - redirect_to work_path - end - end + def destroy id = params[:id].to_i diff --git a/app/models/user.rb b/app/models/user.rb index b1f986dd41..d90b67fe99 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,4 +1,7 @@ class User < ApplicationRecord has_many :votes has_many :works, through: :votes + + validates :username, presence: true + # validates :username, uniqueness: true end diff --git a/app/models/vote.rb b/app/models/vote.rb index b8b6f9f0aa..39c70c8ff7 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -1,4 +1,5 @@ class Vote < ApplicationRecord belongs_to :user belongs_to :work + validates :work_id, :user_id, :vote_time, presence: true end diff --git a/app/models/work.rb b/app/models/work.rb index 2679a0f026..6e4c825735 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,15 +1,14 @@ class Work < ApplicationRecord has_many :votes has_many :users, through: :votes - validates :title, presence: true + validates :category, :title, :creator, :published_year, :description, presence: true + validates :title, uniqueness: true def upvote(user) - if Vote.find_by(user_id: user.id, work_id: self.id ) + if Vote.find_by(user_id: user.id, work_id: self.id) return false #vote was created else - vote = Vote.new - vote.user = user - vote.work = self + vote = Vote.new(user: user, work: self) return vote.save end end diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb new file mode 100644 index 0000000000..a9e705858f --- /dev/null +++ b/app/views/users/index.html.erb @@ -0,0 +1,13 @@ + + + + + +<% @users.each do |user| %> + + + +<% end %> +
    List of Users
    <%=link_to "#{user.username}", user_path(user.id)%>
    + +
    <%= link_to "Back to media ranks", root_path %>
    diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb new file mode 100644 index 0000000000..7252d41de6 --- /dev/null +++ b/app/views/users/show.html.erb @@ -0,0 +1,19 @@ +<% if @user.nil? %> +

    404 Not found

    +<% else %> + + <%= link_to "User's Summary: #{@user.username}", user_path(@user.id) %> +
    + <%= "Joined site #{Time.now.getutc}" %> + <% end %> + +

    Votes

    + + + + + + + + + diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index c939b429c4..41d9b1a4ba 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -15,7 +15,7 @@ - + <% end %>
    Media TitleCreated ByPublishedCategoryVoted On
    <%=link_to work.title, work_path(work.id)%> <%=work.creator%> <%=work.published_year%>upvote button goes here
    <%= link_to "Vote", work_votes_path(work), method: :post, class: "button" %>
    diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 19a0d50f09..377b67b10e 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -1,9 +1,25 @@

    <%= @work.title %>

    -

    <%= @work.creator %>

    -

    <%= @work.published_year %>

    +

    <%= "Created by: #{@work.creator}" %>

    +

    <%= "Published: #{@work.published_year}" %>

    <%= @work.description %>

    -
    <%= link_to "Back to media ranks", root_path %>
    -
    <%= link_to "Edit", edit_work_path(@work.id) %>
    -
    <%= link_to "Upvote", work_path(@work.id) %>
    -
    <%= link_to "Delete", work_path(@work.id), method: :delete, data: {confirm: "Please confirm you would like to delete." } %>
    +
    <%= link_to "Back to media ranks", root_path %>
    +
    <%= link_to "Edit", edit_work_path(@work.id) %>
    +
    <%= link_to "Upvote", work_path(@work.id) %>
    +
    <%= link_to "Delete", work_path(@work.id), method: :delete, data: {confirm: "Please confirm you would like to delete." } %>
    + + + + + + + + +<% @work.votes.each do |vote| %> + + + + + +<% end %> +
    UserDate
    "Total votes goes here"<%= link_to vote.user.username, user_path(vote.user) %><%= vote.vote_time %>
    diff --git a/db/migrate/20181012234341_remove.rb b/db/migrate/20181012234341_remove.rb new file mode 100644 index 0000000000..93ad547486 --- /dev/null +++ b/db/migrate/20181012234341_remove.rb @@ -0,0 +1,5 @@ +class Remove < ActiveRecord::Migration[5.2] + def change + remove_column :votes, :work_id + end +end diff --git a/db/migrate/20181012234713_remove_user_id_from_votes.rb b/db/migrate/20181012234713_remove_user_id_from_votes.rb new file mode 100644 index 0000000000..7bb27f6ad6 --- /dev/null +++ b/db/migrate/20181012234713_remove_user_id_from_votes.rb @@ -0,0 +1,5 @@ +class RemoveUserIdFromVotes < ActiveRecord::Migration[5.2] + def change + remove_column :votes, :user_id + end +end diff --git a/db/migrate/20181012235042_add_workand_user_id_to_votes.rb b/db/migrate/20181012235042_add_workand_user_id_to_votes.rb new file mode 100644 index 0000000000..7d239dde0d --- /dev/null +++ b/db/migrate/20181012235042_add_workand_user_id_to_votes.rb @@ -0,0 +1,6 @@ +class AddWorkandUserIdToVotes < ActiveRecord::Migration[5.2] + def change + add_reference :votes, :work, foreign_key: true + add_reference :votes, :user, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 92e70a3b5d..7d6a083d9d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_10_09_000517) do +ActiveRecord::Schema.define(version: 2018_10_12_235042) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -23,11 +23,13 @@ end create_table "votes", force: :cascade do |t| - t.string "work_id" - t.string "user_id" t.string "vote_time" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.bigint "work_id" + t.bigint "user_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| @@ -40,6 +42,6 @@ t.datetime "updated_at", null: false end - - + add_foreign_key "votes", "users" + add_foreign_key "votes", "works" end diff --git a/db/seeds.rb b/db/seeds.rb index 10f002a242..dc72ac3970 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -6,7 +6,7 @@ # movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) # Character.create(name: 'Luke', movie: movies.first) -Work.create(category: "Book", title: "September", creator: "Bob", published_year: "01-01-2015", description: "great book") -Work.create(category: "Album", title: "June", creator: "Sue", published_year: "07-01-2015", description: "good music") -Work.create(category: "Album", title: "May", creator: "Sam", published_year: "01-01-2015", description: "good music") -Work.create(category: "Movie", title: "August", creator: "John", published_year: "01-01-2016", description: "good movie") +Work.create(category: "Book", title: "September", creator: "Bob", published_year: "01-01-2015", description: "Art party typewriter semiotics polaroid quinoa slow-carb cardigan, pug four loko fingerstache vape keytar bushwick flexitarian.") +Work.create(category: "Album", title: "June", creator: "Sue", published_year: "07-01-2015", description: "Hoodie blog vexillologist semiotics readymade cold-pressed farm-to-table art party. Celiac live-edge keytar, 90's schlitz church-key before they sold out polaroid. Yuccie hammock quinoa slow-carb deep v.") +Work.create(category: "Album", title: "May", creator: "Sam", published_year: "01-01-2015", description: "90's narwhal microdosing dreamcatcher heirloom, you probably haven't heard of them migas small batch subway tile 8-bit. Semiotics knausgaard neutra selfies PBR&B art party bushwick vaporware umami taiyaki iceland seitan coloring book tacos poke.") +Work.create(category: "Movie", title: "August", creator: "John", published_year: "01-01-2016", description: "Post-ironic air plant semiotics cloud bread kickstarter. Skateboard meditation iPhone bitters, leggings messenger bag before they sold out tofu single-origin coffee. ") diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml index 223e3920c2..ce48cc24f8 100644 --- a/test/fixtures/votes.yml +++ b/test/fixtures/votes.yml @@ -10,8 +10,8 @@ # two: {} # column: value vote_1: - work_id: 21 - user_id: 31 + work: song + user: sam vote_time: '05-15-25' vote_2: diff --git a/test/models/user_test.rb b/test/models/user_test.rb index cc862ac2d9..713e9571ff 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -6,4 +6,98 @@ it "must be valid" do value(user).must_be :valid? end + + describe 'user_list' do + it 'should return an array' do + # Act + users = User.work_list + + # Assert + expect(users).must_be_instance_of Array + + users.each do |user_array| + current_user = User.find(user_array[1]) + user_name = user_array[0] + expect(users_name).must_equal current_user.username + end + end + + it 'should return an empty array when there are no users' do + # Act + User.all.each do |user| + user.votes.each do |vote| + vote.destroy + end + + user.destroy + end + users = User.user_list + + # Assert + expect(users).must_be_instance_of Array + expect(users.length).must_equal 0 + end + end + + describe "Presence of required attributes" do + #arrange + + it "has required fields" do #act + fields = [:username, :join_date] + + fields.each do |field| #assert + expect(work).must_respond_to field + end + end + + describe 'validations' do + + it "requires a unique username" do + #Arrange + new_user = User.new username: user.username + #Act + new_work.valid? + #Assert + expect(new_user).must_equal false + expect(user_work.errors.messages).must_include :username + end + end + + describe "Relationships" do #user has many votes + it "can have many votes" + #Arrange done with let + + #Act + users << Vote.first + votes = user.votes + + #Assert + expect(votes).must_equal :>=, 1 + votes.each do |vote| + expect(vote).must_be_instance of Vote + end + + it "can have many works through votes" + #Arrange done with let + + #Act + #user <== add work through votes + users.votes.each do |vote| + vote.each do |work_id| + work + @user.works << User.find(user_id) + + user.works.select(vote.id)includes(:vote).each do |work| + vote = Work.vote + + user.vote_works.each do |vote_work| + vote_work.username + + + #work <== add users through votes + @work.users << User.find(user_id) + #Assert + end + + end diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index fc15947bd3..c2c88fb7d8 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -6,4 +6,36 @@ it "must be valid" do value(vote).must_be :valid? end + + it 'has required fields' do + fields = [:work_id, :user_id, :vote_time] + + fields.each do |field| + expect(book).must_respond_to field + end + end + + describe 'Relationships' do + it 'belongs to a work' do + # Arrange (done with let) + + #Act + work = vote.work #a vote belonging to a work, work_id + + #assert + expect(work).must_be_instance_of Work + expect(work.id).must_equal vote.work_id + end + + + it 'belongs to a user' do + # Arrange (done with let) + + #Act + user = vote.user #a vote belonging to a user + + #Assert + expect(vote).must_be_instance_of User + expect(user.id).must_equal vote.user_id + end end diff --git a/test/models/work_test.rb b/test/models/work_test.rb index c1e9ac7559..6e3f1f35d1 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -7,49 +7,85 @@ value(work).must_be :valid? end - describe "Presence of required attributes" do + describe 'work_list' do + it 'should return an array' do + # Act + works = Work.work_list + + # Assert + expect(works).must_be_instance_of Array + + works.each do |work_array| + current_work = Work.find(work_array[1]) + work_title = work_array[0] + expect(work_title).must_equal current_work.title + end + end - it "has required fields" do - fields = [:category, :title, :creator, :published_year, :description] + it 'should return an empty array when there are no works' do + # Act + Work.all.each do |work| + work.votes.each do |vote| + vote.destroy + end - fields.each do |field| - expect(work).must_respond_to field - end + work.destroy + end + works = Work.work_list + # Assert + expect(works).must_be_instance_of Array + expect(works.length).must_equal 0 + end end + describe "Presence of required attributes" do + let(:work) { works(:book) } #arrange + + it "has required fields" do #act + fields = [:category, :title, :creator, :published_year, :description] + + fields.each do |field| #assert + expect(work).must_respond_to field + end + end + describe "Relationships" do #work has many votes it "can have many votes" #Arrange done with let #Act - work.votes << Vote.first - votes = work.votes + work.votes << Vote.first + votes = work.votes #Assert - expect(votes).must_equal :>=, 1 - votes.each do |vote| - expect(vote).must_be_instance of Integer + expect(votes).must_equal :>=, 1 + votes.each do |vote| + expect(vote).must_be_instance of Vote + end end - end - - it "can have many users through votes" #work belongs to user - #Arrange done with let - #Act - #work <== add users through votes - @work.users << User.find(user_id) - - user.works.select(vote.id)includes(:vote).each so |work| - vote = Work.vote + it "can have many users through votes" #work has many users through votes + #Arrange done with let - user.vote_works.each do |vote_work| - vote_work.username + #Act + #work <== add user through votes + # works.votes.each do |vote| + # vote.each do |user_id| + # user_id + # @work.users << User.find(user_id) + # + # user.works.select(vote.id)includes(:vote).each do |work| + # vote = Work.vote + # + # user.vote_works.each do |vote_work| + # vote_work.username #work <== add users through votes - @work.users << User.find(user_id) + # @work.users << User.find(user_id) #Assert + end end describe 'validations' do From da862267dcedf4c48383ff61efca8a5e1e20b192 Mon Sep 17 00:00:00 2001 From: Shelan Date: Sun, 14 Oct 2018 12:54:18 -0700 Subject: [PATCH 05/15] fixed login path --- app/controllers/application_controller.rb | 6 +- app/controllers/sessions_controller.rb | 14 +++-- app/controllers/users_controller.rb | 16 +++--- app/controllers/votes_controller.rb | 3 +- app/controllers/works_controller.rb | 7 ++- app/views/layouts/application.html.erb | 68 ++++++++++++++++++----- app/views/works/homepage.html.erb | 5 ++ app/views/works/index.html.erb | 2 +- config/routes.rb | 6 +- 9 files changed, 88 insertions(+), 39 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7160a45ded..2c990a7bb5 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,7 +1,7 @@ class ApplicationController < ActionController::Base private - def find_user #will know the current logged-in user for every view page - @current_user = User.find_by(id: session[:user_id]) - end + # def find_user #will know the current logged-in user for every view page + # @current_user = User.find_by(id: session[:user_id]) + # end end diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index de79b670cc..7048ad3c4c 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,24 +1,26 @@ +'require' pry class SessionsController < ApplicationController def login user = User.find_by(username: params[:user][:username]) + if user.nil? - # Create a new user - user = User.create(username: params[:user][:username], Date.today => params[:user][:join_date]) - user.join_date = Date.today + # If user does not exist, create a new user + user = User.create(username: params[:user][:username]) end session[:user_id] = user.id - flash[:success] = "#{user.name} Successfully logged in!" + flash[:success] = "#{user.username} Successfully logged in!" redirect_to root_path end - def new + def new #sends you to login form @user = User.new end def destroy #logout method session[:user_id] = nil flash[:success] = 'Successfully logged out' - redirect_back fallback_location: root_path + binding.pry + redirect_to root_path end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index cc511aa0f6..3cad67ce8a 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3,12 +3,12 @@ def index @users = User.all.order(:username) end - def show - id = params[:id].to_i - @user = User.find(params[:id].to_i) - - if id.nil? - render :notfound - end - end + # def show + # id = params[:id].to_i + # @user = User.find(params[:id].to_i) + # + # if id.nil? + # render :notfound + # end + # end end diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index b02130652b..8bdfbce2d5 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -4,7 +4,8 @@ def create @work = Work.find(id) ## Figure out how to get a user of a session. ## user = - if @work.upvote(user) == false + @current_user = User.find_by(id: session[:user_id]) + if @work.upvote(@current_user) == false flash[:error] = "A problem occurred: Could not create #{@work.category} #{@work.title}: has already been taken" else flash[:sucess] = "Successfully created #{@work.category} #{@work.id}" diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 7bee2c0bf5..b2aa4f1260 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -42,7 +42,6 @@ def create end end - def destroy id = params[:id].to_i @@ -52,7 +51,11 @@ def destroy end end - + def upvote + @work = Work.find(params[:id]) #find work's id, stores it in @work + @work.votes.create #creates new vote and saves it + redirect_to works_path + end private diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 3888ea0356..5a34807d1a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,16 +1,24 @@ - - MediaRanker - <%= csrf_meta_tags %> - <%= csp_meta_tag %> + + Media Ranker 2.0 + + - <%= 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 +

    +
    <% flash.each do |name, message| %> <% if message.class == Array %> @@ -26,12 +34,42 @@ <% end %> <% if @current_user %> -

    Welcome <%= @current_user.name %>

    +

    Welcome <%= @current_user.username %>

    <% end %>
    -

    Media Ranker| Ranking the Best of Everything

    -
    + + + <%= yield %> diff --git a/app/views/works/homepage.html.erb b/app/views/works/homepage.html.erb index 4f21b0162b..78b3c26b7d 100644 --- a/app/views/works/homepage.html.erb +++ b/app/views/works/homepage.html.erb @@ -2,6 +2,11 @@ Media Ranker + <%= csrf_meta_tags %> + <%= csp_meta_tag %> + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 41d9b1a4ba..e2b11d78d3 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -11,7 +11,7 @@ <% @works.each do |work| %> - votes goes here + total votes goes here <%=link_to work.title, work_path(work.id)%> <%=work.creator%> <%=work.published_year%> diff --git a/config/routes.rb b/config/routes.rb index 4b7383ff77..cb408d1d96 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,8 +1,8 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - post 'sessions/login', to: 'sessions#login', as: 'login' - get 'sessions/login', to: 'sessions#new' - delete 'sessions/destroy', to: 'sessions#destroy', as: 'logout' + post 'users/login', to: 'sessions#login', as: 'login' #lets users login + get 'users/login', to: 'sessions#new', as: 'new_session' #gets the login form + delete 'users/destroy', to: 'sessions#destroy', as: 'logout' #logging out root "works#index" From 20ce259d1eeaa638b8d037ce1202d23f7a8e8151 Mon Sep 17 00:00:00 2001 From: Shelan Date: Sun, 14 Oct 2018 14:15:02 -0700 Subject: [PATCH 06/15] edited layout/app --- app/controllers/sessions_controller.rb | 1 - app/views/layouts/application.html.erb | 108 ++++++++++++------------- 2 files changed, 53 insertions(+), 56 deletions(-) diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 7048ad3c4c..2125d4e2e3 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,4 +1,3 @@ -'require' pry class SessionsController < ApplicationController def login user = User.find_by(username: params[:user][:username]) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 5a34807d1a..652f5f2d0e 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -3,7 +3,7 @@ Media Ranker 2.0 - + @@ -12,62 +12,60 @@ - - -

    - Media Ranker - Ranking the Best of Everything -

    + +
    +

    + Media Ranker + Ranking the Best of Everything +

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

    Welcome <%= @current_user.username %>

    - <% end %> -
    - - -
    + <% if @current_user %> +

    Welcome <%= @current_user.username %>

    + <% end %> + +
  • + <% if session[:user_id] %> + <%= link_to "Log Out", logout_path, method: :delete, class: 'btn btn-primary' %> + <% else %> + <%= link_to "Login", login_path, class: 'btn btn-primary' %> + <% end %> +
    • + + +
    - <%= yield %> -
    - - + <%= yield %> + + + From 31bb3458a257a131ee432a557ea261468f9cce01 Mon Sep 17 00:00:00 2001 From: Shelan Date: Sun, 14 Oct 2018 23:50:25 -0700 Subject: [PATCH 07/15] edit work works --- app/assets/stylesheets/application.scss | 4 +++ app/controllers/application_controller.rb | 6 ++-- app/controllers/sessions_controller.rb | 3 +- app/controllers/users_controller.rb | 16 +++++------ app/controllers/votes_controller.rb | 18 ++++++------ app/controllers/works_controller.rb | 16 ++++++++--- app/views/layouts/application.html.erb | 35 ++++++++++++----------- app/views/users/index.html.erb | 2 +- app/views/users/show.html.erb | 25 ++++++++++++---- app/views/works/edit.html.erb | 25 ++++++++++++++++ app/views/works/homepage.html.erb | 4 +-- app/views/works/index.html.erb | 4 +-- app/views/works/new.html.erb | 2 +- app/views/works/show.html.erb | 2 +- 14 files changed, 107 insertions(+), 55 deletions(-) create mode 100644 app/views/works/edit.html.erb diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 8b1701e581..c7b96d2eb8 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -16,3 +16,7 @@ @import "bootstrap"; /* Import scss content */ @import "**/*"; + + .alert-warning { + background-color: red + } diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 2c990a7bb5..7160a45ded 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,7 +1,7 @@ class ApplicationController < ActionController::Base private - # def find_user #will know the current logged-in user for every view page - # @current_user = User.find_by(id: session[:user_id]) - # end + def find_user #will know the current logged-in user for every view page + @current_user = User.find_by(id: session[:user_id]) + end end diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 2125d4e2e3..6feff90f80 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -18,8 +18,7 @@ def new #sends you to login form def destroy #logout method session[:user_id] = nil - flash[:success] = 'Successfully logged out' - binding.pry + flash[:success] = "Successfully logged out!" redirect_to root_path end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 3cad67ce8a..cc511aa0f6 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3,12 +3,12 @@ def index @users = User.all.order(:username) end - # def show - # id = params[:id].to_i - # @user = User.find(params[:id].to_i) - # - # if id.nil? - # render :notfound - # end - # end + def show + id = params[:id].to_i + @user = User.find(params[:id].to_i) + + if id.nil? + render :notfound + end + end end diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index 8bdfbce2d5..7146f629d0 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -1,15 +1,15 @@ class VotesController < ApplicationController def create - id = params[:work_id].to_i - @work = Work.find(id) - ## Figure out how to get a user of a session. - ## user = - @current_user = User.find_by(id: session[:user_id]) - if @work.upvote(@current_user) == false - flash[:error] = "A problem occurred: Could not create #{@work.category} #{@work.title}: has already been taken" - else - flash[:sucess] = "Successfully created #{@work.category} #{@work.id}" + if @current_user + work = Work.find_by(id: params[:work_id]) + @vote = Vote.new(work_id: work.id, user_id: @current_user.id) + return @vote.save + flash[:success] = "Successfully upvoted!" redirect_to work_path + else + flash[:error] = "Can't vote twice" end end end + + # if @work.upvote(@current_user) == false diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index b2aa4f1260..0010ee46c2 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -22,22 +22,29 @@ def edit end def update - work = params[:id].to_i + id = params[:id].to_i @work = Work.find_by(id: id) @work.update(work_params) if @work.save - redirect_to votes_path + redirect_to works_path else - render :new + render :edit end end def create @work = Work.new(work_params) if @work.save # save returns true if the database insert succeeds + flash[:success] = "#{@work.category} is created!" + redirect_to root_path # for now else # save failed :( + flash.now[:error] = "Not created!" + @work.errors.messages.each do |field, messages| + flash.now[field] = messages + end + render :new # show the new work from view again end end @@ -47,6 +54,7 @@ def destroy id = params[:id].to_i @work = Work.find_by(id: id) if @work.destroy + flash[:success] = "#{@work.title} is deleted" redirect_to root_path end end @@ -55,7 +63,7 @@ def upvote @work = Work.find(params[:id]) #find work's id, stores it in @work @work.votes.create #creates new vote and saves it redirect_to works_path - end + end private diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 652f5f2d0e..d063a99f4a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -2,14 +2,14 @@ Media Ranker 2.0 - - + <%= csrf_meta_tags %> + <%= csp_meta_tag %> + +<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + - - - - - @@ -35,12 +35,22 @@
      +
    • + <% if session[:user_id] %> + <%# link_to "Logged in as" "#{@user.id}", user_path(@user.id) %> + <%= link_to "Log Out", logout_path, method: :delete, class: 'btn btn-primary' %> + <% else %> + <%= link_to "Login", login_path, class: 'btn btn-primary' %> + <% end %> +
    - + +
    <% flash.each do |name, message| %> <% if message.class == Array %> +
    <% message.each do |msg| %>
    <%= "#{name}:" %><%= " #{msg}" %>
    @@ -55,14 +65,7 @@ <% if @current_user %>

    Welcome <%= @current_user.username %>

    <% end %> -
    -
  • - <% if session[:user_id] %> - <%= link_to "Log Out", logout_path, method: :delete, class: 'btn btn-primary' %> - <% else %> - <%= link_to "Login", login_path, class: 'btn btn-primary' %> - <% end %> -
    • +
    diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index a9e705858f..b9915f8697 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -5,7 +5,7 @@ <% @users.each do |user| %> - <%=link_to "#{user.username}", user_path(user.id)%> + <%= link_to "#{user.username}", user_path(user.id) %> <% end %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 7252d41de6..50343e1353 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,13 +1,14 @@ <% if @user.nil? %>

    404 Not found

    <% else %> +

    User's summary: <%= link_to "#{@user.username}", user_path(@user.id) %> +
    + <%= "Joined site #{Time.now.getutc}" %> +
    +
    +<% end %> - <%= link_to "User's Summary: #{@user.username}", user_path(@user.id) %> -
    - <%= "Joined site #{Time.now.getutc}" %> - <% end %> - -

    Votes

    +

    Votes

    <%#user's voting history%> @@ -17,3 +18,15 @@ +<% @user.votes.work.each do |work| %> + + + + + + +<% end %> +
    Category Voted On
    <%= link_to work.title, user_path(vote.user) %><%= link_to work.creator, work_path(vote.user) %><%= link_to work.published_year, work_path(vote.user) %><%= link_to work.category, work_path(vote.user) %><%# work's vote timestamp %>
    + +
    <%= link_to "See all Users", users_path %>
    +
    <%= link_to "Back to media ranks", root_path %>
    diff --git a/app/views/works/edit.html.erb b/app/views/works/edit.html.erb new file mode 100644 index 0000000000..84cac315a8 --- /dev/null +++ b/app/views/works/edit.html.erb @@ -0,0 +1,25 @@ +<%= form_with model: @work do |f|%> + +

    Edit Work

    + + <%= f.label :category, "Category" %> + <%= f.select :category, ["Album", "Book", "Movie"] %> + + + <%= f.label :title %> + <%= f.text_field :title %> + + <%= f.label :creator %> + <%= f.text_field :creator %> + + + <%= f.label :published_year %> + <%= f.text_field :published_year %> + + <%= f.label :description %> + <%= f.text_field :description %> + + + <%= f.submit "Update Work", class: "add_work-button btn btn-primary" %> + +<% end %> diff --git a/app/views/works/homepage.html.erb b/app/views/works/homepage.html.erb index 78b3c26b7d..8c652bd296 100644 --- a/app/views/works/homepage.html.erb +++ b/app/views/works/homepage.html.erb @@ -11,12 +11,12 @@ -