From 9e59d7a5bdb3e69be34b30e142a20a33fd58aa14 Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Tue, 10 Oct 2017 13:58:15 -0700 Subject: [PATCH 01/36] Initial Rails Setup --- .gitignore | 19 ++ Gemfile | 66 ++++++ Gemfile.lock | 222 ++++++++++++++++++ Rakefile | 6 + app/assets/config/manifest.js | 3 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 15 ++ app/assets/javascripts/cable.js | 13 + app/assets/javascripts/channels/.keep | 0 app/assets/stylesheets/application.css | 15 ++ app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 3 + app/controllers/concerns/.keep | 0 app/helpers/application_helper.rb | 2 + app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/application.html.erb | 14 ++ app/views/layouts/mailer.html.erb | 13 + app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 38 +++ bin/spring | 17 ++ bin/update | 29 +++ bin/yarn | 11 + config.ru | 5 + config/application.rb | 25 ++ config/boot.rb | 3 + config/cable.yml | 10 + config/database.yml | 85 +++++++ config/environment.rb | 5 + config/environments/development.rb | 54 +++++ config/environments/production.rb | 91 +++++++ config/environments/test.rb | 42 ++++ .../application_controller_renderer.rb | 8 + config/initializers/assets.rb | 14 ++ config/initializers/backtrace_silencers.rb | 7 + 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 | 56 +++++ config/routes.rb | 3 + config/secrets.yml | 32 +++ config/spring.rb | 6 + db/seeds.rb | 7 + lib/assets/.keep | 0 lib/tasks/.keep | 0 log/.keep | 0 package.json | 5 + public/404.html | 67 ++++++ public/422.html | 67 ++++++ public/500.html | 66 ++++++ public/apple-touch-icon-precomposed.png | 0 public/apple-touch-icon.png | 0 public/favicon.ico | 0 public/robots.txt | 1 + test/application_system_test_case.rb | 5 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/helpers/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/system/.keep | 0 test/test_helper.rb | 26 ++ tmp/.keep | 0 vendor/.keep | 0 75 files changed, 1291 insertions(+) create mode 100644 .gitignore create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Rakefile create mode 100644 app/assets/config/manifest.js create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/javascripts/cable.js create mode 100644 app/assets/javascripts/channels/.keep create mode 100644 app/assets/stylesheets/application.css create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/helpers/application_helper.rb create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/application.html.erb create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100755 bin/yarn create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/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/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/secrets.yml create mode 100644 config/spring.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 test/application_system_test_case.rb create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/helpers/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/system/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..82701fedc8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,19 @@ +# 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 + +/node_modules +/yarn-error.log + +.byebug_history diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000000..88aee9dc96 --- /dev/null +++ b/Gemfile @@ -0,0 +1,66 @@ +source 'https://rubygems.org' + +git_source(:github) do |repo_name| + repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") + "https://github.com/#{repo_name}.git" +end + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.1.4' +# Use postgresql as the database for Active Record +gem 'pg', '~> 0.18' +# Use Puma as the app server +gem 'puma', '~> 3.7' +# 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 'therubyracer', 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', '~> 3.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +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] + # Adds support for Capybara system testing and selenium driver + gem 'capybara', '~> 2.13' + gem 'selenium-webdriver' +end + +group :development do + # Access an IRB console on exception pages or by using <%= 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 + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +gem 'jquery-turbolinks' +group :development do + gem 'better_errors' + gem 'pry-rails' + gem 'binding_of_caller' +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..69fae647c5 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,222 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.1.4) + actionpack (= 5.1.4) + nio4r (~> 2.0) + websocket-driver (~> 0.6.1) + actionmailer (5.1.4) + actionpack (= 5.1.4) + actionview (= 5.1.4) + activejob (= 5.1.4) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.1.4) + actionview (= 5.1.4) + activesupport (= 5.1.4) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.1.4) + activesupport (= 5.1.4) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.1.4) + activesupport (= 5.1.4) + globalid (>= 0.3.6) + activemodel (5.1.4) + activesupport (= 5.1.4) + activerecord (5.1.4) + activemodel (= 5.1.4) + activesupport (= 5.1.4) + arel (~> 8.0) + activesupport (5.1.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + ansi (1.5.0) + arel (8.0.0) + better_errors (2.3.0) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) + bindex (0.5.0) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) + builder (3.2.3) + byebug (9.1.0) + capybara (2.15.4) + addressable + mini_mime (>= 0.1.3) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + childprocess (0.8.0) + ffi (~> 1.0, >= 1.0.11) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crass (1.0.2) + debug_inspector (0.0.3) + erubi (1.7.0) + execjs (2.7.0) + ffi (1.9.18) + globalid (0.4.0) + activesupport (>= 4.2.0) + i18n (0.8.6) + jbuilder (2.7.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + 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.1.1) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.6.6) + mime-types (>= 1.16, < 4) + method_source (0.9.0) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_mime (0.1.4) + mini_portile2 (2.3.0) + minitest (5.10.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.1.18) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + multi_json (1.12.2) + nio4r (2.1.0) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) + pg (0.21.0) + pry (0.11.1) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + public_suffix (3.0.0) + puma (3.10.0) + rack (2.0.3) + rack-test (0.7.0) + rack (>= 1.0, < 3) + rails (5.1.4) + actioncable (= 5.1.4) + actionmailer (= 5.1.4) + actionpack (= 5.1.4) + actionview (= 5.1.4) + activejob (= 5.1.4) + activemodel (= 5.1.4) + activerecord (= 5.1.4) + activesupport (= 5.1.4) + bundler (>= 1.3.0) + railties (= 5.1.4) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (5.1.4) + actionpack (= 5.1.4) + activesupport (= 5.1.4) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.1.0) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.9.0) + ruby_dep (1.5.0) + rubyzip (1.2.1) + sass (3.5.2) + 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.6) + 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.6.0) + childprocess (~> 0.5) + rubyzip (~> 1.0) + 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.1) + 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.0.1) + turbolinks-source (~> 5) + turbolinks-source (5.0.3) + tzinfo (1.2.3) + thread_safe (~> 0.1) + uglifier (3.2.0) + execjs (>= 0.3.0, < 3) + web-console (3.5.1) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + xpath (2.1.0) + nokogiri (~> 1.3) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + byebug + capybara (~> 2.13) + jbuilder (~> 2.5) + jquery-turbolinks + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (~> 0.18) + pry-rails + puma (~> 3.7) + rails (~> 5.1.4) + 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) + +BUNDLED WITH + 1.15.4 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..46b20359fa --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,15 @@ +// 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 rails-ujs +//= require turbolinks +//= require_tree . diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js new file mode 100644 index 0000000000..739aa5f022 --- /dev/null +++ b/app/assets/javascripts/cable.js @@ -0,0 +1,13 @@ +// Action Cable provides the framework to deal with WebSockets in Rails. +// You can generate new channels where WebSocket features live using the `rails generate channel` command. +// +//= require action_cable +//= require_self +//= require_tree ./channels + +(function() { + this.App || (this.App = {}); + + App.cable = ActionCable.createConsumer(); + +}).call(this); diff --git a/app/assets/javascripts/channels/.keep b/app/assets/javascripts/channels/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css new file mode 100644 index 0000000000..d05ea0f511 --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,15 @@ +/* + * 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. + * + *= require_tree . + *= require_self + */ 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..1c07694e9d --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,3 @@ +class ApplicationController < ActionController::Base + protect_from_forgery with: :exception +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb new file mode 100644 index 0000000000..de6be7945c --- /dev/null +++ b/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 0000000000..a009ace51c --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 0000000000..286b2239d1 --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 0000000000..10a4cba84d --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 0000000000..6af511b830 --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,14 @@ + + + + MediaRanker + <%= csrf_meta_tags %> + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 0000000000..cbd34d2e9d --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 0000000000..37f0bddbd7 --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 0000000000..66e9889e8b --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +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..78c4e861dc --- /dev/null +++ b/bin/setup @@ -0,0 +1,38 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +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..a8e4462f20 --- /dev/null +++ b/bin/update @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +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') + + 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..c2bacef836 --- /dev/null +++ b/bin/yarn @@ -0,0 +1,11 @@ +#!/usr/bin/env ruby +VENDOR_PATH = File.expand_path('..', __dir__) +Dir.chdir(VENDOR_PATH) do + begin + exec "yarnpkg #{ARGV.join(" ")}" + 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..e73bab908f --- /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.1 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 0000000000..30f5120df6 --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 0000000000..3a27f13933 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 + channel_prefix: MediaRanker_production 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..5187e22186 --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +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. + 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.seconds.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # 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 + + # 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..d242dac65c --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,91 @@ +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 + + # Attempt to read encrypted secrets from `config/secrets.yml.enc`. + # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or + # `config/secrets.yml.key`. + config.read_encrypted_secrets = 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 + + # 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..8e5cbde533 --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,42 @@ +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.seconds.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 + 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/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..1e19380dcb --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,56 @@ +# 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. If you use this option +# you need to make sure to reconnect any threads in the `on_worker_boot` +# block. +# +# preload_app! + +# If you are preloading your application and using Active Record, it's +# recommended that you close any connections to the database before workers +# are forked to prevent connection leakage. +# +# before_fork do +# ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord) +# end + +# The code in the `on_worker_boot` will be called if you are using +# clustered mode by specifying a number of `workers`. After each worker +# process is booted, this block will be run. If you are using the `preload_app!` +# option, you will want to use this block to reconnect to any threads +# or connections that may have been created at application boot, as Ruby +# cannot share connections between processes. +# +# on_worker_boot do +# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) +# end +# + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 0000000000..787824f888 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 0000000000..08e7ce1c34 --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,32 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rails secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +# Shared secrets are available across all environments. + +# shared: +# api_key: a1B2c3D4e5F6 + +# Environmental secrets are only available for that specific environment. + +development: + secret_key_base: e59f7cb9fe1dc96cde247381ecce04e3aba1751e19b11cea59eb170e4f1cc5286890cffe82e6b24f3cae9be2ca6c9dc76c33e24e53b123d3cbb94bb126144b17 + +test: + secret_key_base: e8b729ac0d12a6868d279027cec8c89c81475245c1a98213f76d55ded1fd61001b4cb248090b10cd853dde3d224d9c338bdb5880d8ef713a24f01eaa96122ed7 + +# Do not keep production secrets in the unencrypted secrets file. +# Instead, either read values from the environment. +# Or, use `bin/rails secrets:setup` to configure encrypted secrets +# and move the `production:` environment over there. + +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 0000000000..c9119b40c0 --- /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/db/seeds.rb b/db/seeds.rb new file mode 100644 index 0000000000..1beea2accd --- /dev/null +++ b/db/seeds.rb @@ -0,0 +1,7 @@ +# This file should contain all the record creation needed to seed the database with its default values. +# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). +# +# Examples: +# +# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) +# Character.create(name: 'Luke', movie: movies.first) diff --git a/lib/assets/.keep b/lib/assets/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/log/.keep b/log/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/package.json b/package.json new file mode 100644 index 0000000000..625900f9d8 --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "name": "MediaRanker", + "private": true, + "dependencies": {} +} diff --git a/public/404.html b/public/404.html new file mode 100644 index 0000000000..2be3af26fc --- /dev/null +++ b/public/404.html @@ -0,0 +1,67 @@ + + + + The page you were looking for doesn't exist (404) + + + + + + +
+
+

The page you were looking for doesn't exist.

+

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

+
+

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

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

The change you wanted was rejected.

+

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

+
+

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

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

We're sorry, but something went wrong.

+
+

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

+
+ + diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 0000000000..37b576a4a0 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb new file mode 100644 index 0000000000..d19212abd5 --- /dev/null +++ b/test/application_system_test_case.rb @@ -0,0 +1,5 @@ +require "test_helper" + +class ApplicationSystemTestCase < ActionDispatch::SystemTestCase + driven_by :selenium, using: :chrome, screen_size: [1400, 1400] +end diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/helpers/.keep b/test/helpers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/system/.keep b/test/system/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 0000000000..10594a3248 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,26 @@ +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 1d8b3da76943a10692729297a8038629e202e895 Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Mon, 16 Oct 2017 20:06:13 -0700 Subject: [PATCH 02/36] create users votes works models, users sessions works ctrls --- app/assets/javascripts/sessions.js | 2 + app/assets/javascripts/users.js | 2 + app/assets/javascripts/works.js | 2 + app/assets/stylesheets/sessions.scss | 3 ++ app/assets/stylesheets/users.scss | 3 ++ app/assets/stylesheets/works.scss | 3 ++ app/controllers/sessions_controller.rb | 2 + app/controllers/users_controller.rb | 2 + app/controllers/works_controller.rb | 2 + app/helpers/sessions_helper.rb | 2 + app/helpers/users_helper.rb | 2 + app/helpers/works_helper.rb | 2 + app/models/user.rb | 2 + app/models/vote.rb | 2 + app/models/work.rb | 2 + db/migrate/20171017025431_create_users.rb | 9 ++++ db/migrate/20171017025439_create_votes.rb | 10 +++++ db/migrate/20171017025446_create_works.rb | 13 ++++++ db/schema.rb | 43 ++++++++++++++++++++ test/controllers/sessions_controller_test.rb | 7 ++++ test/controllers/users_controller_test.rb | 7 ++++ test/controllers/works_controller_test.rb | 7 ++++ test/fixtures/users.yml | 11 +++++ test/fixtures/votes.yml | 11 +++++ test/fixtures/works.yml | 11 +++++ test/models/user_test.rb | 9 ++++ test/models/vote_test.rb | 9 ++++ test/models/work_test.rb | 9 ++++ 28 files changed, 189 insertions(+) create mode 100644 app/assets/javascripts/sessions.js create mode 100644 app/assets/javascripts/users.js create mode 100644 app/assets/javascripts/works.js create mode 100644 app/assets/stylesheets/sessions.scss create mode 100644 app/assets/stylesheets/users.scss create mode 100644 app/assets/stylesheets/works.scss create mode 100644 app/controllers/sessions_controller.rb create mode 100644 app/controllers/users_controller.rb create mode 100644 app/controllers/works_controller.rb create mode 100644 app/helpers/sessions_helper.rb create mode 100644 app/helpers/users_helper.rb create mode 100644 app/helpers/works_helper.rb create mode 100644 app/models/user.rb create mode 100644 app/models/vote.rb create mode 100644 app/models/work.rb create mode 100644 db/migrate/20171017025431_create_users.rb create mode 100644 db/migrate/20171017025439_create_votes.rb create mode 100644 db/migrate/20171017025446_create_works.rb create mode 100644 db/schema.rb create mode 100644 test/controllers/sessions_controller_test.rb create mode 100644 test/controllers/users_controller_test.rb create mode 100644 test/controllers/works_controller_test.rb create mode 100644 test/fixtures/users.yml create mode 100644 test/fixtures/votes.yml create mode 100644 test/fixtures/works.yml create mode 100644 test/models/user_test.rb create mode 100644 test/models/vote_test.rb create mode 100644 test/models/work_test.rb diff --git a/app/assets/javascripts/sessions.js b/app/assets/javascripts/sessions.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/sessions.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/javascripts/users.js b/app/assets/javascripts/users.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/users.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/javascripts/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/sessions.scss b/app/assets/stylesheets/sessions.scss new file mode 100644 index 0000000000..7bef9cf826 --- /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..1efc835ccd --- /dev/null +++ b/app/assets/stylesheets/users.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the users controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/works.scss b/app/assets/stylesheets/works.scss new file mode 100644 index 0000000000..8c84be8c43 --- /dev/null +++ b/app/assets/stylesheets/works.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the works controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb new file mode 100644 index 0000000000..16d11b5710 --- /dev/null +++ b/app/controllers/sessions_controller.rb @@ -0,0 +1,2 @@ +class SessionsController < ApplicationController +end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb new file mode 100644 index 0000000000..3e74dea87f --- /dev/null +++ b/app/controllers/users_controller.rb @@ -0,0 +1,2 @@ +class UsersController < ApplicationController +end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb new file mode 100644 index 0000000000..56b02c9f2e --- /dev/null +++ b/app/controllers/works_controller.rb @@ -0,0 +1,2 @@ +class WorksController < ApplicationController +end diff --git a/app/helpers/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/works_helper.rb b/app/helpers/works_helper.rb new file mode 100644 index 0000000000..ccb78c2b73 --- /dev/null +++ b/app/helpers/works_helper.rb @@ -0,0 +1,2 @@ +module WorksHelper +end diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 0000000000..379658a509 --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,2 @@ +class User < ApplicationRecord +end diff --git a/app/models/vote.rb b/app/models/vote.rb new file mode 100644 index 0000000000..4c58e4f3d5 --- /dev/null +++ b/app/models/vote.rb @@ -0,0 +1,2 @@ +class Vote < ApplicationRecord +end diff --git a/app/models/work.rb b/app/models/work.rb new file mode 100644 index 0000000000..95322dd45e --- /dev/null +++ b/app/models/work.rb @@ -0,0 +1,2 @@ +class Work < ApplicationRecord +end diff --git a/db/migrate/20171017025431_create_users.rb b/db/migrate/20171017025431_create_users.rb new file mode 100644 index 0000000000..9195cd3e12 --- /dev/null +++ b/db/migrate/20171017025431_create_users.rb @@ -0,0 +1,9 @@ +class CreateUsers < ActiveRecord::Migration[5.1] + def change + create_table :users do |t| + t.string :user + + t.timestamps + end + end +end diff --git a/db/migrate/20171017025439_create_votes.rb b/db/migrate/20171017025439_create_votes.rb new file mode 100644 index 0000000000..e3a9840e36 --- /dev/null +++ b/db/migrate/20171017025439_create_votes.rb @@ -0,0 +1,10 @@ +class CreateVotes < ActiveRecord::Migration[5.1] + def change + create_table :votes do |t| + t.belongs_to :user, index: true + t.belongs_to :piece, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20171017025446_create_works.rb b/db/migrate/20171017025446_create_works.rb new file mode 100644 index 0000000000..995248e453 --- /dev/null +++ b/db/migrate/20171017025446_create_works.rb @@ -0,0 +1,13 @@ +class CreateWorks < ActiveRecord::Migration[5.1] + def change + create_table :works do |t| + t.string :title + t.string :creator + t.string :description + t.date :publication_date + t.string :category + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000000..861f23fe2c --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,43 @@ +# 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: 20171017025446) 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 "user" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "votes", force: :cascade do |t| + t.bigint "user_id" + t.bigint "piece_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["piece_id"], name: "index_votes_on_piece_id" + t.index ["user_id"], name: "index_votes_on_user_id" + end + + create_table "works", force: :cascade do |t| + t.string "title" + t.string "creator" + t.string "description" + t.date "publication_date" + t.string "category" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb new file mode 100644 index 0000000000..c2632a720b --- /dev/null +++ b/test/controllers/sessions_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe SessionsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb new file mode 100644 index 0000000000..89decb54e0 --- /dev/null +++ b/test/controllers/users_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe UsersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb new file mode 100644 index 0000000000..d95073c22e --- /dev/null +++ b/test/controllers/works_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe WorksController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 0000000000..dc3ee79b5d --- /dev/null +++ b/test/fixtures/users.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml new file mode 100644 index 0000000000..dc3ee79b5d --- /dev/null +++ b/test/fixtures/votes.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml new file mode 100644 index 0000000000..dc3ee79b5d --- /dev/null +++ b/test/fixtures/works.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/models/user_test.rb b/test/models/user_test.rb new file mode 100644 index 0000000000..cc862ac2d9 --- /dev/null +++ b/test/models/user_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe User do + let(:user) { User.new } + + it "must be valid" do + value(user).must_be :valid? + end +end diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb new file mode 100644 index 0000000000..fc15947bd3 --- /dev/null +++ b/test/models/vote_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Vote do + let(:vote) { Vote.new } + + it "must be valid" do + value(vote).must_be :valid? + end +end diff --git a/test/models/work_test.rb b/test/models/work_test.rb new file mode 100644 index 0000000000..f6fba7104d --- /dev/null +++ b/test/models/work_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Work do + let(:work) { Work.new } + + it "must be valid" do + value(work).must_be :valid? + end +end From d9969a7b6ce7e0fa25b6e830a93a5e1853b2efa2 Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Mon, 16 Oct 2017 20:11:46 -0700 Subject: [PATCH 03/36] add basic routes using resources: users sessions works --- config/routes.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 787824f888..0dcbd6a691 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,9 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + + root 'main#index' + + resources :users + resources :sessions + resources :works end From 11106373026fd9bf120f8647d41e4f12797b9eac Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Mon, 16 Oct 2017 20:13:19 -0700 Subject: [PATCH 04/36] #index and #show in users ctrl --- app/controllers/users_controller.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 3e74dea87f..73b42652c4 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,2 +1,10 @@ class UsersController < ApplicationController + def index + @users = User.all + end + + def show + @user = User.find_by(id: params[:id]) + render_404 unless @user + end end From 244d530195030ee3cc6e0bf8f9ac0b7b2cc6504d Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Mon, 16 Oct 2017 20:18:38 -0700 Subject: [PATCH 05/36] add empty methods in works ctrl --- app/controllers/works_controller.rb | 41 +++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 56b02c9f2e..af932b46cb 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,2 +1,43 @@ class WorksController < ApplicationController + + def root + # homepage + end + + def index + # view all works + end + + def new + @work = Work.new + end + + def create + # POST new work + end + + def show + # individual work + end + + def edit + # GET changes + end + + def update + # POST changes + end + + def destroy + # DELETE + end + + def upvote + # vote on works + end + + private + def work_params + params.require(:work).permit(:title, :category, :creator, :description, :publication_year) + end end From 51ee564c98f53d612cf5d649a47fad1b98f16619 Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Mon, 16 Oct 2017 20:46:12 -0700 Subject: [PATCH 06/36] resolved db issues --- app/controllers/sessions_controller.rb | 33 +++++++++++++++++++ ...otes.rb => 20171017032511_create_votes.rb} | 4 +-- ...orks.rb => 20171017032553_create_works.rb} | 2 +- db/schema.rb | 6 ++-- 4 files changed, 39 insertions(+), 6 deletions(-) rename db/migrate/{20171017025439_create_votes.rb => 20171017032511_create_votes.rb} (78%) rename db/migrate/{20171017025446_create_works.rb => 20171017032553_create_works.rb} (97%) diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 16d11b5710..d5442ac93b 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,2 +1,35 @@ class SessionsController < ApplicationController + def login_form + end + + def logid + + def login + @user = User.find_by(name: params[:name]) + if @user + flash[:success] = "Successfully logged in as existing user #{@user.name}" + session[:user_id] = @user.id + session[:user] = @user.name + redirect_to root_path + else + @user = User.new(name: params[:name]) + if @user.save + flash[:success] = "Successfully created new user #{@user.name} with ID #{@user.id}" + session[:user_id] = @user.id + session[:user] = @user.name + redirect_to root_path + else + @work = @user + flash[:error] = "A problem occurred: Could not log in" + render :login_form + end + end + end + + def destroy + session[:user_id] = nil + session[:user] = nil + flash[:success] = "Successfully Logged Out" + redirect_to root_path + end end diff --git a/db/migrate/20171017025439_create_votes.rb b/db/migrate/20171017032511_create_votes.rb similarity index 78% rename from db/migrate/20171017025439_create_votes.rb rename to db/migrate/20171017032511_create_votes.rb index e3a9840e36..f20881ce7b 100644 --- a/db/migrate/20171017025439_create_votes.rb +++ b/db/migrate/20171017032511_create_votes.rb @@ -2,8 +2,8 @@ class CreateVotes < ActiveRecord::Migration[5.1] def change create_table :votes do |t| t.belongs_to :user, index: true - t.belongs_to :piece, index: true - + t.belongs_to :work, index: true + t.timestamps end end diff --git a/db/migrate/20171017025446_create_works.rb b/db/migrate/20171017032553_create_works.rb similarity index 97% rename from db/migrate/20171017025446_create_works.rb rename to db/migrate/20171017032553_create_works.rb index 995248e453..2471a69ca4 100644 --- a/db/migrate/20171017025446_create_works.rb +++ b/db/migrate/20171017032553_create_works.rb @@ -6,7 +6,7 @@ def change t.string :description t.date :publication_date t.string :category - + t.timestamps end end diff --git a/db/schema.rb b/db/schema.rb index 861f23fe2c..d38fe7ca7c 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: 20171017025446) do +ActiveRecord::Schema.define(version: 20171017032553) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -23,11 +23,11 @@ create_table "votes", force: :cascade do |t| t.bigint "user_id" - t.bigint "piece_id" + t.bigint "work_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.index ["piece_id"], name: "index_votes_on_piece_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| From 3513720d3a2b274a3fc977a37fe3b04d1c48baca Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Mon, 16 Oct 2017 21:16:02 -0700 Subject: [PATCH 07/36] make some migrations and add seed data --- db/migrate/20171017040434_change_pub_date_to_year.rb | 5 +++++ db/migrate/20171017040833_change_date_to_int.rb | 5 +++++ db/schema.rb | 4 ++-- db/seeds.rb | 7 +++++++ 4 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20171017040434_change_pub_date_to_year.rb create mode 100644 db/migrate/20171017040833_change_date_to_int.rb diff --git a/db/migrate/20171017040434_change_pub_date_to_year.rb b/db/migrate/20171017040434_change_pub_date_to_year.rb new file mode 100644 index 0000000000..39ca2f3176 --- /dev/null +++ b/db/migrate/20171017040434_change_pub_date_to_year.rb @@ -0,0 +1,5 @@ +class ChangePubDateToYear < ActiveRecord::Migration[5.1] + def change + rename_column :works, :publication_date, :publication_year + end +end diff --git a/db/migrate/20171017040833_change_date_to_int.rb b/db/migrate/20171017040833_change_date_to_int.rb new file mode 100644 index 0000000000..e2fb2b27c9 --- /dev/null +++ b/db/migrate/20171017040833_change_date_to_int.rb @@ -0,0 +1,5 @@ +class ChangeDateToInt < ActiveRecord::Migration[5.1] + def change + change_column :works, :publication_year, :string, limit: 4 + end +end diff --git a/db/schema.rb b/db/schema.rb index d38fe7ca7c..6f9f75241d 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: 20171017032553) do +ActiveRecord::Schema.define(version: 20171017040833) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -34,7 +34,7 @@ t.string "title" t.string "creator" t.string "description" - t.date "publication_date" + t.string "publication_year", limit: 4 t.string "category" t.datetime "created_at", null: false t.datetime "updated_at", null: false diff --git a/db/seeds.rb b/db/seeds.rb index 1beea2accd..ed5c638fa8 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,3 +5,10 @@ # # movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) # Character.create(name: 'Luke', movie: movies.first) +Work.create([{title: 'Cool Title', creator: 'Suge', publication_year: 2017, description: 'A long desc', category: 'book'}]) + +Work.create([{title: 'Cool Title 2', creator: 'Finn', publication_year: 2019, description: 'A longer desc', category: 'movie'}]) + +Work.create([{title: 'Eating', creator: 'Girlie', publication_year: 2006, description: 'A food', category: 'album'}]) + +Work.create([{title: 'Hairballs', creator: 'Kitty', publication_year: 2006, description: 'Was a food', category: 'album'}]) From 1f68e22a0ce9970cbcb6c65b21bf07aaf8680497 Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Mon, 16 Oct 2017 21:17:16 -0700 Subject: [PATCH 08/36] make works index --- app/controllers/sessions_controller.rb | 34 ++++++-------------------- app/controllers/works_controller.rb | 1 + app/views/works/edit.html.erb | 0 app/views/works/index.html.erb | 21 ++++++++++++++++ app/views/works/main.html.erb | 0 app/views/works/new.html.erb | 0 app/views/works/show.html.erb | 0 7 files changed, 29 insertions(+), 27 deletions(-) create mode 100644 app/views/works/edit.html.erb create mode 100644 app/views/works/index.html.erb create mode 100644 app/views/works/main.html.erb create mode 100644 app/views/works/new.html.erb create mode 100644 app/views/works/show.html.erb diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index d5442ac93b..9c48f76d41 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -2,34 +2,14 @@ class SessionsController < ApplicationController def login_form end - def logid - def login - @user = User.find_by(name: params[:name]) - if @user - flash[:success] = "Successfully logged in as existing user #{@user.name}" - session[:user_id] = @user.id - session[:user] = @user.name - redirect_to root_path - else - @user = User.new(name: params[:name]) - if @user.save - flash[:success] = "Successfully created new user #{@user.name} with ID #{@user.id}" - session[:user_id] = @user.id - session[:user] = @user.name - redirect_to root_path - else - @work = @user - flash[:error] = "A problem occurred: Could not log in" - render :login_form - end - end - end - def destroy - session[:user_id] = nil - session[:user] = nil - flash[:success] = "Successfully Logged Out" - redirect_to root_path end + + # def destroy + # session[:user_id] = nil + # session[:user] = nil + # flash[:success] = "Successfully Logged Out" + # redirect_to root_path + # end end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index af932b46cb..8124be6032 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -6,6 +6,7 @@ def root def index # view all works + @works = Work.all end def new diff --git a/app/views/works/edit.html.erb b/app/views/works/edit.html.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb new file mode 100644 index 0000000000..aba0dfd157 --- /dev/null +++ b/app/views/works/index.html.erb @@ -0,0 +1,21 @@ +
    + <% @works.each do |work| %> + <%# works or @works ?? %> +
  • + <%# number of votes %> +
    • +
  • + <%= link_to work.title, work_path(work.id) %> +
    • +
  • + <%= work.creator %> +
    • +
  • + <%= work.publication_year %> +
    • +
  • + <%# link to upvote %> +
    • +
    + <% end %> +
diff --git a/app/views/works/main.html.erb b/app/views/works/main.html.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/works/new.html.erb b/app/views/works/new.html.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb new file mode 100644 index 0000000000..e69de29bb2 From c6ea079daf8612132baa35281f61edb1fdc22f79 Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Mon, 16 Oct 2017 21:49:07 -0700 Subject: [PATCH 09/36] add show and new --- app/controllers/works_controller.rb | 7 +++++++ app/views/works/_form.html.erb | 20 ++++++++++++++++++++ app/views/works/new.html.erb | 3 +++ app/views/works/show.html.erb | 7 +++++++ 4 files changed, 37 insertions(+) create mode 100644 app/views/works/_form.html.erb diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 8124be6032..8f409b00c9 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -14,10 +14,17 @@ def new end def create + @work = Work.new(work_params) + if @work.save + redirect_to work_path(@work.id) + else + render new_work_path + end # POST new work end def show + @work = Work.find(params[:id]) # individual work end diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb new file mode 100644 index 0000000000..abdd1cb073 --- /dev/null +++ b/app/views/works/_form.html.erb @@ -0,0 +1,20 @@ +<%# add new/edit works form %> + +<%= form_for @work do |f| %> + <%= f.label :category %> + <%= f.text_field :category %> + + <%= f.label :title %> + <%= f.text_field :title %> + + <%= f.label :creator %> + <%= f.text_field :creator %> + + <%= f.label :publication_year %> + <%= f.text_field :publication_year %> + + <%= f.label :description %> + <%= f.text_area :description %> + + <%= f.submit form_btn %> +<% end %> diff --git a/app/views/works/new.html.erb b/app/views/works/new.html.erb index e69de29bb2..329f5f9e87 100644 --- a/app/views/works/new.html.erb +++ b/app/views/works/new.html.erb @@ -0,0 +1,3 @@ +
+ <%= render partial: 'form', locals: {form_btn: 'Create Work'} %> +
diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index e69de29bb2..27f48856e5 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -0,0 +1,7 @@ + +

<%= @work.id %>

+

<%= @work.title %>

+

<%= @work.creator %>

+

<%= @work.category %>

+

<%= @work.publication_year %>

+

<%= @work.description %>

From b3157c7577fabd0f4851fc17c80ea2193169b723 Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Mon, 16 Oct 2017 21:55:04 -0700 Subject: [PATCH 10/36] add edit --- app/controllers/works_controller.rb | 7 +++++++ app/views/works/edit.html.erb | 3 +++ 2 files changed, 10 insertions(+) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 8f409b00c9..79d4028a53 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -29,10 +29,17 @@ def show end def edit + @work = Work.find(params[:id]) # GET changes end def update + @work = Work.find(params[:id]) + if @work.update(work_params) + return redirect_to works_path + else + return render :edit, status: :bad_request + end # POST changes end diff --git a/app/views/works/edit.html.erb b/app/views/works/edit.html.erb index e69de29bb2..0ffe98b027 100644 --- a/app/views/works/edit.html.erb +++ b/app/views/works/edit.html.erb @@ -0,0 +1,3 @@ +
+ <%= render partial: 'form', locals: {form_btn: 'Edit Work'} %> +
From e103ad4358de83bf9772cc96acd8cf3f8cef697d Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Mon, 16 Oct 2017 22:01:47 -0700 Subject: [PATCH 11/36] add destroy --- app/controllers/works_controller.rb | 3 +++ app/views/works/show.html.erb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 79d4028a53..1d2b911803 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -44,6 +44,9 @@ def update end def destroy + @work = Work.find(params[:id]) + @work.destroy + redirect_to works_path # DELETE end diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 27f48856e5..b11d778fc1 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -5,3 +5,6 @@

<%= @work.category %>

<%= @work.publication_year %>

<%= @work.description %>

+ +

<%= link_to 'Edit', edit_work_path(@work.id) %>

+

<%= link_to 'Delete', work_path(@work.id), method: :delete, data: {confirm: "Are you sure you want to delete this work?"} %>

From 30040c8219fba7b7cafa69d50d698788e473b9be Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Mon, 16 Oct 2017 22:16:27 -0700 Subject: [PATCH 12/36] separate works index into categories --- app/controllers/works_controller.rb | 6 ++++-- app/views/works/_list.html.erb | 21 +++++++++++++++++++ app/views/works/index.html.erb | 31 ++++++++++------------------- 3 files changed, 35 insertions(+), 23 deletions(-) create mode 100644 app/views/works/_list.html.erb diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 1d2b911803..dced7dd946 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -6,7 +6,9 @@ def root def index # view all works - @works = Work.all + @movies = Work.where(category: 'movie') + @books = Work.where(category: 'book') + @albums = Work.where(category: 'album') end def new @@ -45,7 +47,7 @@ def update def destroy @work = Work.find(params[:id]) - @work.destroy + @work.destroy redirect_to works_path # DELETE end diff --git a/app/views/works/_list.html.erb b/app/views/works/_list.html.erb new file mode 100644 index 0000000000..d7fa20afe9 --- /dev/null +++ b/app/views/works/_list.html.erb @@ -0,0 +1,21 @@ +
    + <% works.each do |work| %> + <%# works or @works ?? %> +
  • + <%# number of votes %> +
    • +
  • + <%= link_to work.title, work_path(work.id) %> +
    • +
  • + <%= work.creator %> +
    • +
  • + <%= work.publication_year %> +
    • +
  • + <%# link to upvote %> +
    • +
    + <% end %> +
diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index aba0dfd157..475ac558c4 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1,21 +1,10 @@ -
    - <% @works.each do |work| %> - <%# works or @works ?? %> -
  • - <%# number of votes %> -
    • -
  • - <%= link_to work.title, work_path(work.id) %> -
    • -
  • - <%= work.creator %> -
    • -
  • - <%= work.publication_year %> -
    • -
  • - <%# link to upvote %> -
    • -
    - <% end %> -
+
+

Books

+ <%= render partial: 'list', locals: {works: @books} %> + +

Movies

+ <%= render partial: 'list', locals: {works: @movies} %> + +

Albums

+ <%= render partial: 'list', locals: {works: @albums} %> +
From 9065e2583fd77cb7d5c0bd1354ab023f5663ee96 Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Mon, 16 Oct 2017 22:42:46 -0700 Subject: [PATCH 13/36] add form select for categories --- app/views/works/_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb index abdd1cb073..706ffa203d 100644 --- a/app/views/works/_form.html.erb +++ b/app/views/works/_form.html.erb @@ -2,7 +2,7 @@ <%= form_for @work do |f| %> <%= f.label :category %> - <%= f.text_field :category %> + <%= select(:work, :category, [["Book", "book"], ["Movie", "movie"], ["Album", "album"]]) %> <%= f.label :title %> <%= f.text_field :title %> From 628bb14c54431626b4e93751860eb2b8e985de36 Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Mon, 16 Oct 2017 22:54:04 -0700 Subject: [PATCH 14/36] add sessions routes --- app/models/user.rb | 1 + app/models/vote.rb | 2 ++ app/models/work.rb | 1 + config/routes.rb | 4 ++++ 4 files changed, 8 insertions(+) diff --git a/app/models/user.rb b/app/models/user.rb index 379658a509..db11855600 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,2 +1,3 @@ class User < ApplicationRecord + has_many :votes end diff --git a/app/models/vote.rb b/app/models/vote.rb index 4c58e4f3d5..aefbb5e8c7 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -1,2 +1,4 @@ class Vote < ApplicationRecord + belongs_to :user + belongs_to :work end diff --git a/app/models/work.rb b/app/models/work.rb index 95322dd45e..0ee427352c 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,2 +1,3 @@ class Work < ApplicationRecord + has_many :votes end diff --git a/config/routes.rb b/config/routes.rb index 0dcbd6a691..072cac737b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,4 +6,8 @@ resources :users resources :sessions resources :works + + get '/login', to: 'sessions#new' + post '/login', to: 'sessions#create' + delete '/logout', to: 'sessions#destroy' end From 4cde94ba6a9312aaf3362214ca0240942e5a3878 Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Tue, 17 Oct 2017 00:29:40 -0700 Subject: [PATCH 15/36] add user and non-password auth --- app/controllers/sessions_controller.rb | 39 ++++++++++++++----- app/controllers/works_controller.rb | 7 +++- app/views/sessions/login.html.erb | 7 ++++ app/views/works/main.html.erb | 23 +++++++++++ config/routes.rb | 10 ++--- .../20171017055811_change_user_to_username.rb | 5 +++ db/schema.rb | 4 +- 7 files changed, 77 insertions(+), 18 deletions(-) create mode 100644 app/views/sessions/login.html.erb create mode 100644 db/migrate/20171017055811_change_user_to_username.rb diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 9c48f76d41..8a4f1bbb21 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,15 +1,36 @@ class SessionsController < ApplicationController - def login_form - end - def login + @user = User.new + end + def create + username = params[:username] + if username && user = User.find_by(username: params[:username]) + # log em in + session[:user_id] = user.id + flash[:status] = :success + flash[:result_text] = "Successfully logged in" + else + # no user, try to save + user = User.new(username: params[:username]) + if user.save + # successful save + flash[:status] = :success + flash[:result_text] = "Successfully created new user!" + session[:user_id] = user.id + else + flash[:status] = :error + flash[:result_text] = "Something went wrong!" + render "login", status: :bad_request + end + end + redirect_to root_path end - # def destroy - # session[:user_id] = nil - # session[:user] = nil - # flash[:success] = "Successfully Logged Out" - # redirect_to root_path - # end + def logout + session[:user_id] = nil + flash[:status] = :success + flash[:result_text] = "Successfully logged out" + redirect_to root_path + end end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index dced7dd946..043ba3d2c9 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,7 +1,10 @@ class WorksController < ApplicationController - def root - # homepage + def main + user_id = session[:user_id] + if user_id + @user = User.find(user_id) + end end def index diff --git a/app/views/sessions/login.html.erb b/app/views/sessions/login.html.erb new file mode 100644 index 0000000000..55d9a50c43 --- /dev/null +++ b/app/views/sessions/login.html.erb @@ -0,0 +1,7 @@ +hi + +<%= form_tag do %> + <%= label_tag(:username, "Username") %> + <%= text_field_tag(:username) %> + <%= submit_tag("Log in", class: "button") %> +<% end %> diff --git a/app/views/works/main.html.erb b/app/views/works/main.html.erb index e69de29bb2..ca531ab7b1 100644 --- a/app/views/works/main.html.erb +++ b/app/views/works/main.html.erb @@ -0,0 +1,23 @@ +hey + +<% if flash[:result_text] or flash[:messages] %> +
+

<%= flash[:status] == :failure ? "A problem occurred: " : "" %><%= flash[:result_text] %>

+ <% if flash[:messages] %> +
    + <% flash[:messages].each do |name, problems| %> + <% problems.each do |problem| %> +
  • <%= name %>: <%= problem %>
    • + <% end %> + <% end %> +
+ <% end %> +
+<% end %> + +<% if @user %> + hey <%= @user.username %> + <%= link_to "Log out", logout_path, method: :post %> +<% else %> + <%= link_to "login already", login_path %> bozo +<% end %> diff --git a/config/routes.rb b/config/routes.rb index 072cac737b..1947b8332b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,13 +1,13 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - root 'main#index' + root 'works#main' - resources :users + resources :users, only: [:index, :show] resources :sessions resources :works - - get '/login', to: 'sessions#new' + + get '/login', to: 'sessions#login' post '/login', to: 'sessions#create' - delete '/logout', to: 'sessions#destroy' + post '/logout', to: 'sessions#logout' end diff --git a/db/migrate/20171017055811_change_user_to_username.rb b/db/migrate/20171017055811_change_user_to_username.rb new file mode 100644 index 0000000000..7bdfe32632 --- /dev/null +++ b/db/migrate/20171017055811_change_user_to_username.rb @@ -0,0 +1,5 @@ +class ChangeUserToUsername < ActiveRecord::Migration[5.1] + def change + rename_column :users, :user, :username + end +end diff --git a/db/schema.rb b/db/schema.rb index 6f9f75241d..0b97f28865 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,13 +10,13 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20171017040833) do +ActiveRecord::Schema.define(version: 20171017055811) 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 "user" + t.string "username" t.datetime "created_at", null: false t.datetime "updated_at", null: false end From e7a004e592c5cfc7324971388a70f88ae74a49c4 Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Tue, 17 Oct 2017 19:24:08 -0700 Subject: [PATCH 16/36] format _list --- app/views/works/_list.html.erb | 37 +++++++++++++++++----------------- app/views/works/index.html.erb | 6 +++--- app/views/works/main.html.erb | 2 -- 3 files changed, 21 insertions(+), 24 deletions(-) diff --git a/app/views/works/_list.html.erb b/app/views/works/_list.html.erb index d7fa20afe9..38ac26d61d 100644 --- a/app/views/works/_list.html.erb +++ b/app/views/works/_list.html.erb @@ -1,21 +1,20 @@ +

<%= work %>

    - <% works.each do |work| %> - <%# works or @works ?? %> -
  • - <%# number of votes %> -
    • -
  • - <%= link_to work.title, work_path(work.id) %> -
    • -
  • - <%= work.creator %> -
    • -
  • - <%= work.publication_year %> -
    • -
  • - <%# link to upvote %> -
    • -
    - <% end %> +
  • Votes
    • +
  • Title
    • +
  • Created By
    • +
  • Published
    • +
  • Upvote
+ +<% works.each do |work| %> +<%# works or @works ?? %> +
    +
  • <%# number of votes %>
    • +
  • <%= link_to work.title, work_path(work.id) %>
    • +
  • <%= work.creator %>
    • +
  • <%= work.publication_year %>
    • +
  • <%# link to upvote %>
    • +
    +
+<% end %> diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 475ac558c4..6b2d97194f 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1,10 +1,10 @@ +
List of works
+ <%= render partial: 'list', locals: {works: @albums} %> +

Books

<%= render partial: 'list', locals: {works: @books} %>

Movies

<%= render partial: 'list', locals: {works: @movies} %> - -

Albums

- <%= render partial: 'list', locals: {works: @albums} %>
diff --git a/app/views/works/main.html.erb b/app/views/works/main.html.erb index ca531ab7b1..0412f3ad61 100644 --- a/app/views/works/main.html.erb +++ b/app/views/works/main.html.erb @@ -1,5 +1,3 @@ -hey - <% if flash[:result_text] or flash[:messages] %>

<%= flash[:status] == :failure ? "A problem occurred: " : "" %><%= flash[:result_text] %>

From 001975b07d9ab91da320a8d6da8c48d971ef4a19 Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Tue, 17 Oct 2017 19:32:42 -0700 Subject: [PATCH 17/36] format top 10 partial --- app/views/works/_list.html.erb | 2 +- app/views/works/_top-ten.html.erb | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 app/views/works/_top-ten.html.erb diff --git a/app/views/works/_list.html.erb b/app/views/works/_list.html.erb index 38ac26d61d..208f3b5226 100644 --- a/app/views/works/_list.html.erb +++ b/app/views/works/_list.html.erb @@ -1,4 +1,4 @@ -

<%= work %>

+

<%= @work %>

  • Votes
  • Title
    • diff --git a/app/views/works/_top-ten.html.erb b/app/views/works/_top-ten.html.erb new file mode 100644 index 0000000000..f90212ea37 --- /dev/null +++ b/app/views/works/_top-ten.html.erb @@ -0,0 +1,13 @@ +<%# partial view for top 10 lists %> +
    +

    + Top <% @work %> +

    + + <% works.each do |work| %> +
      +

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

      by <%= work.creator %>

      • +
    • <%#= work.vote.count %> votes
      • +
    + <% end %> +
    From 4cc2f74fc3d6b467452e1d23233cc49e165fdd2b Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Tue, 17 Oct 2017 19:59:18 -0700 Subject: [PATCH 18/36] adjust template --- app/views/layouts/application.html.erb | 42 ++++++++++++++++++++++++-- app/views/sessions/login.html.erb | 27 +++++++++++++---- app/views/users/index.html.erb | 32 ++++++++++++++++++++ app/views/works/_list.html.erb | 12 +++++--- app/views/works/main.html.erb | 33 ++++++++------------ 5 files changed, 113 insertions(+), 33 deletions(-) create mode 100644 app/views/users/index.html.erb diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 6af511b830..2af9febe15 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -8,7 +8,45 @@ <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> - +
    +

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

    +

    Ranking the Best of Everything

    +
    + + + + + +
    <%= yield %> - +
    diff --git a/app/views/sessions/login.html.erb b/app/views/sessions/login.html.erb index 55d9a50c43..36887a10dc 100644 --- a/app/views/sessions/login.html.erb +++ b/app/views/sessions/login.html.erb @@ -1,7 +1,22 @@ -hi +
    + <%= form_tag do %> + <%= label_tag(:username, "Username") %> + <%= text_field_tag(:username) %> + <%= submit_tag("Log in", class: "button") %> + <% end %> +
    -<%= form_tag do %> - <%= label_tag(:username, "Username") %> - <%= text_field_tag(:username) %> - <%= submit_tag("Log in", class: "button") %> -<% 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/users/index.html.erb b/app/views/users/index.html.erb new file mode 100644 index 0000000000..6957532792 --- /dev/null +++ b/app/views/users/index.html.erb @@ -0,0 +1,32 @@ +<%# view all users! so many! %> +

    + List of users +

    + +
    <%# list of users %> +
      <%# title row %> + +
    • Username
      • +
    • Votes
      • +
    • Joined
      • +       +
    + +
      + <% users.each do |user| %> +
    • + <%= link_to user.username, user_path(user.id) %> +
      • +
    • + <%= user.votes.count %> +
      • +
    • + <%# joined %> +
      • + <% end %> +
    +
    + +
    + +
    diff --git a/app/views/works/_list.html.erb b/app/views/works/_list.html.erb index 208f3b5226..c61ef3d9e2 100644 --- a/app/views/works/_list.html.erb +++ b/app/views/works/_list.html.erb @@ -1,10 +1,12 @@

    <%= @work %>

      -
    • Votes
      • -
    • Title
      • -
    • Created By
      • -
    • Published
      • -
    • Upvote
      • + +
    • Votes
      • +
    • Title
      • +
    • Created By
      • +
    • Published
      • +
    • Upvote
      • +
    <% works.each do |work| %> diff --git a/app/views/works/main.html.erb b/app/views/works/main.html.erb index 0412f3ad61..6a46c24d78 100644 --- a/app/views/works/main.html.erb +++ b/app/views/works/main.html.erb @@ -1,21 +1,14 @@ -<% if flash[:result_text] or flash[:messages] %> -
    -

    <%= flash[:status] == :failure ? "A problem occurred: " : "" %><%= flash[:result_text] %>

    - <% if flash[:messages] %> -
      - <% flash[:messages].each do |name, problems| %> - <% problems.each do |problem| %> -
    • <%= name %>: <%= problem %>
      • - <% end %> - <% end %> -
    - <% end %> -
    -<% end %> +
    + <%# SPOTLIGHT %> +
    -<% if @user %> - hey <%= @user.username %> - <%= link_to "Log out", logout_path, method: :post %> -<% else %> - <%= link_to "login already", login_path %> bozo -<% end %> +
    +

    Albums

    <%# top ten albums %> + <%= render partial: 'list', locals: {works: @albums} %> + +

    Books

    <%# top ten books %> + <%= render partial: 'list', locals: {works: @books} %> + +

    Movies

    <%# top ten movies %> + <%= render partial: 'list', locals: {works: @movies} %> +
    From d089417fcf2c35a73b2e740ed089e31c0907b075 Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Tue, 17 Oct 2017 20:05:40 -0700 Subject: [PATCH 19/36] view works on main --- app/controllers/works_controller.rb | 3 +++ app/views/works/_list.html.erb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 043ba3d2c9..859af09b82 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -5,6 +5,9 @@ def main if user_id @user = User.find(user_id) end + @movies = Work.where(category: 'movie') + @books = Work.where(category: 'book') + @albums = Work.where(category: 'album') end def index diff --git a/app/views/works/_list.html.erb b/app/views/works/_list.html.erb index c61ef3d9e2..974af248b2 100644 --- a/app/views/works/_list.html.erb +++ b/app/views/works/_list.html.erb @@ -1,4 +1,4 @@ -

    <%= @work %>

    +

    <%= @works %>

    • Votes
      • From 1fe458a8bbf3ee5908e71bcf7c95914425859990 Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Tue, 17 Oct 2017 20:10:42 -0700 Subject: [PATCH 20/36] add messages to login --- app/views/layouts/application.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 2af9febe15..f270c3c691 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -25,8 +25,8 @@
    <% end %> <% end %> - From 9379e88fbf1aefd4c4a94aa17b2a7d1a3e86608c Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Tue, 17 Oct 2017 21:32:53 -0700 Subject: [PATCH 30/36] add lots of seeds --- db/seeds.rb | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index ed5c638fa8..14e1f4a236 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,10 +5,27 @@ # # movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) # Character.create(name: 'Luke', movie: movies.first) -Work.create([{title: 'Cool Title', creator: 'Suge', publication_year: 2017, description: 'A long desc', category: 'book'}]) +authors = %w(Kitty, Finn, Girlie, Suge, Sara, Jamey) -Work.create([{title: 'Cool Title 2', creator: 'Finn', publication_year: 2019, description: 'A longer desc', category: 'movie'}]) +users = %w(burger taco spaghetti padthai mayonnaise tuna sardine tofu ramen hotdog rice eggroll hotpot burrito steak) +users.each do |username| + User.create(username: username) +end -Work.create([{title: 'Eating', creator: 'Girlie', publication_year: 2006, description: 'A food', category: 'album'}]) +30.times do |n| + Work.create([{title: "Book #{n}", creator: authors.sample, publication_year: 2017, description: "Description for Book #{n}", category: 'book'}]) +end +30.times do |n| + Work.create([{title: "Movie #{n}", creator: authors.sample, publication_year: 2010, description: "Description for Movie #{n}", category: 'movie'}]) +end +30.times do |n| + Work.create([{title: "Album #{n}", creator: authors.sample, publication_year: 2001, description: "Description for Album #{n}", category: 'album'}]) +end -Work.create([{title: 'Hairballs', creator: 'Kitty', publication_year: 2006, description: 'Was a food', category: 'album'}]) +Work.all.each do |work| + User.all.each do |user| + if [true, false].sample + Vote.create(user: user, work: work) + end + end +end From d952bf66bc801df07e315f36758f562ba2099759 Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Tue, 17 Oct 2017 21:52:24 -0700 Subject: [PATCH 31/36] date and user voted on show work --- app/assets/stylesheets/application.css | 4 +++ app/views/works/show.html.erb | 50 +++++++++++++++++++------- 2 files changed, 41 insertions(+), 13 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index d05ea0f511..bfdd2ae222 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -13,3 +13,7 @@ *= require_tree . *= require_self */ + +ul { + list-style-type: none; +} diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index de26d244e9..70170ec2bd 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -1,15 +1,39 @@ +
    +
    +

    <%= @work.title %>

    +

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

    +

    Published: <%= @work.publication_year %>

    +

    <%= @work.description %>

    + +
    -

    <%= @work.id %>

    -

    <%= @work.title %>

    -

    <%= @work.creator %>

    -

    <%= @work.category %>

    -

    <%= @work.publication_year %>

    -

    <%= @work.description %>

    -

    Upvotes: <%= @work.get_upvotes.count %>

    -

    <%= link_to 'Edit', edit_work_path(@work.id) %>

    -

    <%= link_to 'Delete', work_path(@work.id), method: :delete, data: {confirm: "Are you sure you want to delete this work?"} %>

    - -<% if session[:user_id] %> - <%= link_to 'Upvote', upvote_path, method: :post %> -<% end %> +
    +

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

    +
    + + + + + + + + + <% @work.votes.each do |vote| %> + <% user = vote.user %> + + + + + <% end %> + +
    UserDate
    <%= link_to user.username, user_path(user.id) %><%= vote.created_at.strftime("%B %d, %Y") %>
    +
    +
    +
    From ab0653096409dac43355c69daf20fc0d2a6451e6 Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Tue, 17 Oct 2017 21:57:42 -0700 Subject: [PATCH 32/36] tables for user show --- app/views/users/index.html.erb | 59 ++++++++++++++++++++-------------- app/views/works/show.html.erb | 2 +- 2 files changed, 36 insertions(+), 25 deletions(-) diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 6957532792..49144c4b86 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -1,30 +1,41 @@ <%# view all users! so many! %> -

    - List of users -

    +
    +

    + List of users +

    -
    <%# list of users %> -
      <%# title row %> - -
    • Username
      • -
    • Votes
      • -
    • Joined
      • -       -
    +<%# list of users %> + + + + + + + + + + <% @users.each do |user| %> + + + + + + <% end %> + +
    + Username + + Votes + + Joined +
    + <%= link_to user.username, user_path(user.id) %> + + <%= user.votes.count %> + + <%= user.created_at.strftime("%B %d, %Y") %> +
    -
      - <% users.each do |user| %> -
    • - <%= link_to user.username, user_path(user.id) %> -
      • -
    • - <%= user.votes.count %> -
      • -
    • - <%# joined %> -
      • - <% end %> -
    diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 70170ec2bd..e4c3c50db7 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -25,7 +25,7 @@ - <% @work.votes.each do |vote| %> + <% @work.get_upvotes.each do |vote| %> <% user = vote.user %> <%= link_to user.username, user_path(user.id) %> From 1ddad477dcec8599622dd8f4adff35c9d64aa3d9 Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Tue, 17 Oct 2017 21:58:03 -0700 Subject: [PATCH 33/36] add top ten method to works and a counter cache --- app/controllers/works_controller.rb | 6 +++--- app/models/vote.rb | 2 +- app/models/work.rb | 4 ++++ db/migrate/20171018044749_add_votes_count_to_work.rb | 5 +++++ db/schema.rb | 4 +++- 5 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 db/migrate/20171018044749_add_votes_count_to_work.rb diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 0eea91c9db..5e4539c914 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -5,9 +5,9 @@ def main if user_id @user = User.find(user_id) end - @movies = Work.where(category: 'movie') - @books = Work.where(category: 'book') - @albums = Work.where(category: 'album') + @movies = Work.top_ten('movie') + @books = Work.top_ten('book') + @albums = Work.top_ten('album') puts @user end diff --git a/app/models/vote.rb b/app/models/vote.rb index aefbb5e8c7..384202c0c5 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -1,4 +1,4 @@ class Vote < ApplicationRecord belongs_to :user - belongs_to :work + belongs_to :work, counter_cache: true end diff --git a/app/models/work.rb b/app/models/work.rb index df64418680..da6c4303dd 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,6 +1,10 @@ class Work < ApplicationRecord has_many :votes + def self.top_ten(category) + return Work.where(category: category).order(votes_count: :desc).take(10) + end + def get_upvotes return Vote.where(work: self) end diff --git a/db/migrate/20171018044749_add_votes_count_to_work.rb b/db/migrate/20171018044749_add_votes_count_to_work.rb new file mode 100644 index 0000000000..9934b6c82c --- /dev/null +++ b/db/migrate/20171018044749_add_votes_count_to_work.rb @@ -0,0 +1,5 @@ +class AddVotesCountToWork < ActiveRecord::Migration[5.1] + def change + add_column :works, :votes_count, :integer, default: 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index 0b97f28865..7702799f25 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,10 +10,11 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20171017055811) do +ActiveRecord::Schema.define(version: 20171018044749) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + enable_extension "hstore" create_table "users", force: :cascade do |t| t.string "username" @@ -38,6 +39,7 @@ t.string "category" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "votes_count", default: 0 end end From f4d89b1f065d7b6df46272a80d697ee20e80f56d Mon Sep 17 00:00:00 2001 From: Sara Frandsen Date: Tue, 17 Oct 2017 22:24:38 -0700 Subject: [PATCH 34/36] spotlight --- app/controllers/works_controller.rb | 1 + app/models/vote.rb | 2 +- app/views/users/index.html.erb | 49 ++++++++++---------------- app/views/users/show.html.erb | 1 + app/views/works/_list.html.erb | 53 +++++++++++++++++------------ app/views/works/index.html.erb | 13 +++++-- app/views/works/main.html.erb | 6 ++-- 7 files changed, 67 insertions(+), 58 deletions(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 5e4539c914..47d7b53658 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -9,6 +9,7 @@ def main @books = Work.top_ten('book') @albums = Work.top_ten('album') puts @user + @spotlight = Work.all.order(votes_count: :desc).first end def index diff --git a/app/models/vote.rb b/app/models/vote.rb index 384202c0c5..bc68ecd8dd 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -1,4 +1,4 @@ class Vote < ApplicationRecord belongs_to :user - belongs_to :work, counter_cache: true + belongs_to :work, counter_cache: true # counts each vote assoc. with a work (votes_count) end diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 49144c4b86..73153ec9a9 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -5,37 +5,24 @@ <%# list of users %> - - - - - - - - - - <% @users.each do |user| %> - - - - - - <% end %> - -
    - Username - - Votes - - Joined -
    - <%= link_to user.username, user_path(user.id) %> - - <%= user.votes.count %> - - <%= user.created_at.strftime("%B %d, %Y") %> -
    - + + + + + + + + + + <% @users.each do |user| %> + + + + + + <% end %> + +
    UsernameVotesJoined
    <%= link_to user.username, user_path(user.id) %><%= user.votes.count %><%= user.created_at.strftime("%B %d, %Y") %>