From 60b6cec6e15df81a5430f2321d2b34cb98e8bd1c Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Sat, 12 May 2018 23:04:31 -0400
Subject: [PATCH 001/148] initial commit

---
 .gitignore                                    |  30 +++
 .ruby-version                                 |   1 +
 Gemfile                                       |  68 +++++
 Gemfile.lock                                  | 239 ++++++++++++++++++
 README.md                                     |  12 +-
 Rakefile                                      |   6 +
 app/assets/config/manifest.js                 |   3 +
 app/assets/images/.keep                       |   0
 app/assets/javascripts/application.js         |  16 ++
 app/assets/javascripts/cable.js               |  13 +
 app/assets/javascripts/channels/.keep         |   0
 app/assets/javascripts/quotes.coffee          |   3 +
 app/assets/stylesheets/application.css        |  16 ++
 app/assets/stylesheets/quotes.scss            |   3 +
 app/assets/stylesheets/scaffolds.scss         |  84 ++++++
 app/channels/application_cable/channel.rb     |   4 +
 app/channels/application_cable/connection.rb  |   4 +
 app/controllers/application_controller.rb     |   2 +
 app/controllers/concerns/.keep                |   0
 app/controllers/quotes_controller.rb          |  74 ++++++
 app/helpers/application_helper.rb             |   2 +
 app/helpers/quotes_helper.rb                  |   2 +
 app/jobs/application_job.rb                   |   2 +
 app/mailers/application_mailer.rb             |   4 +
 app/models/application_record.rb              |   3 +
 app/models/concerns/.keep                     |   0
 app/models/quote.rb                           |   2 +
 app/views/layouts/application.html.erb        |  29 +++
 app/views/layouts/mailer.html.erb             |  13 +
 app/views/layouts/mailer.text.erb             |   1 +
 app/views/quotes/_form.html.erb               |  22 ++
 app/views/quotes/_quote.json.jbuilder         |   2 +
 app/views/quotes/index.html.erb               |  13 +
 app/views/quotes/index.json.jbuilder          |   1 +
 app/views/quotes/new.html.erb                 |   5 +
 app/views/quotes/random.html.erb              |  12 +
 app/views/quotes/show.html.erb                |  11 +
 app/views/quotes/show.json.jbuilder           |   1 +
 bin/bundle                                    |   3 +
 bin/rails                                     |   9 +
 bin/rake                                      |   9 +
 bin/setup                                     |  36 +++
 bin/spring                                    |  17 ++
 bin/update                                    |  31 +++
 bin/yarn                                      |  11 +
 config.ru                                     |   5 +
 config/application.rb                         |  19 ++
 config/boot.rb                                |   4 +
 config/cable.yml                              |  10 +
 config/credentials.yml.enc                    |   1 +
 config/database.yml                           |  25 ++
 config/environment.rb                         |   5 +
 config/environments/development.rb            |  61 +++++
 config/environments/production.rb             |  94 +++++++
 config/environments/test.rb                   |  46 ++++
 .../application_controller_renderer.rb        |   8 +
 config/initializers/assets.rb                 |  14 +
 config/initializers/backtrace_silencers.rb    |   7 +
 .../initializers/content_security_policy.rb   |  25 ++
 config/initializers/cookies_serializer.rb     |   5 +
 .../initializers/filter_parameter_logging.rb  |   4 +
 config/initializers/inflections.rb            |  16 ++
 config/initializers/kaminari_config.rb        |  12 +
 config/initializers/mime_types.rb             |   4 +
 config/initializers/wrap_parameters.rb        |  14 +
 config/locales/en.yml                         |  33 +++
 config/puma.rb                                |  34 +++
 config/routes.rb                              |   7 +
 config/spring.rb                              |   6 +
 config/storage.yml                            |  34 +++
 db/migrate/20180512222706_create_quotes.rb    |  11 +
 db/schema.rb                                  |  23 ++
 db/seeds.rb                                   |  26 ++
 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/controllers/quotes_controller_test.rb    |  48 ++++
 test/fixtures/.keep                           |   0
 test/fixtures/files/.keep                     |   0
 test/fixtures/quotes.yml                      |   9 +
 test/helpers/.keep                            |   0
 test/integration/.keep                        |   0
 test/mailers/.keep                            |   0
 test/models/.keep                             |   0
 test/models/quote_test.rb                     |   7 +
 test/system/.keep                             |   0
 test/system/quotes_test.rb                    |  45 ++++
 test/test_helper.rb                           |  10 +
 tmp/.keep                                     |   0
 vendor/.keep                                  |   0
 100 files changed, 1700 insertions(+), 2 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 .ruby-version
 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/javascripts/quotes.coffee
 create mode 100644 app/assets/stylesheets/application.css
 create mode 100644 app/assets/stylesheets/quotes.scss
 create mode 100644 app/assets/stylesheets/scaffolds.scss
 create mode 100644 app/channels/application_cable/channel.rb
 create mode 100644 app/channels/application_cable/connection.rb
 create mode 100644 app/controllers/application_controller.rb
 create mode 100644 app/controllers/concerns/.keep
 create mode 100644 app/controllers/quotes_controller.rb
 create mode 100644 app/helpers/application_helper.rb
 create mode 100644 app/helpers/quotes_helper.rb
 create mode 100644 app/jobs/application_job.rb
 create mode 100644 app/mailers/application_mailer.rb
 create mode 100644 app/models/application_record.rb
 create mode 100644 app/models/concerns/.keep
 create mode 100644 app/models/quote.rb
 create mode 100644 app/views/layouts/application.html.erb
 create mode 100644 app/views/layouts/mailer.html.erb
 create mode 100644 app/views/layouts/mailer.text.erb
 create mode 100644 app/views/quotes/_form.html.erb
 create mode 100644 app/views/quotes/_quote.json.jbuilder
 create mode 100644 app/views/quotes/index.html.erb
 create mode 100644 app/views/quotes/index.json.jbuilder
 create mode 100644 app/views/quotes/new.html.erb
 create mode 100644 app/views/quotes/random.html.erb
 create mode 100644 app/views/quotes/show.html.erb
 create mode 100644 app/views/quotes/show.json.jbuilder
 create mode 100755 bin/bundle
 create mode 100755 bin/rails
 create mode 100755 bin/rake
 create mode 100755 bin/setup
 create mode 100755 bin/spring
 create mode 100755 bin/update
 create mode 100755 bin/yarn
 create mode 100644 config.ru
 create mode 100644 config/application.rb
 create mode 100644 config/boot.rb
 create mode 100644 config/cable.yml
 create mode 100644 config/credentials.yml.enc
 create mode 100644 config/database.yml
 create mode 100644 config/environment.rb
 create mode 100644 config/environments/development.rb
 create mode 100644 config/environments/production.rb
 create mode 100644 config/environments/test.rb
 create mode 100644 config/initializers/application_controller_renderer.rb
 create mode 100644 config/initializers/assets.rb
 create mode 100644 config/initializers/backtrace_silencers.rb
 create mode 100644 config/initializers/content_security_policy.rb
 create mode 100644 config/initializers/cookies_serializer.rb
 create mode 100644 config/initializers/filter_parameter_logging.rb
 create mode 100644 config/initializers/inflections.rb
 create mode 100644 config/initializers/kaminari_config.rb
 create mode 100644 config/initializers/mime_types.rb
 create mode 100644 config/initializers/wrap_parameters.rb
 create mode 100644 config/locales/en.yml
 create mode 100644 config/puma.rb
 create mode 100644 config/routes.rb
 create mode 100644 config/spring.rb
 create mode 100644 config/storage.yml
 create mode 100644 db/migrate/20180512222706_create_quotes.rb
 create mode 100644 db/schema.rb
 create mode 100644 db/seeds.rb
 create mode 100644 lib/assets/.keep
 create mode 100644 lib/tasks/.keep
 create mode 100644 log/.keep
 create mode 100644 package.json
 create mode 100644 public/404.html
 create mode 100644 public/422.html
 create mode 100644 public/500.html
 create mode 100644 public/apple-touch-icon-precomposed.png
 create mode 100644 public/apple-touch-icon.png
 create mode 100644 public/favicon.ico
 create mode 100644 public/robots.txt
 create mode 100644 test/application_system_test_case.rb
 create mode 100644 test/controllers/.keep
 create mode 100644 test/controllers/quotes_controller_test.rb
 create mode 100644 test/fixtures/.keep
 create mode 100644 test/fixtures/files/.keep
 create mode 100644 test/fixtures/quotes.yml
 create mode 100644 test/helpers/.keep
 create mode 100644 test/integration/.keep
 create mode 100644 test/mailers/.keep
 create mode 100644 test/models/.keep
 create mode 100644 test/models/quote_test.rb
 create mode 100644 test/system/.keep
 create mode 100644 test/system/quotes_test.rb
 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 0000000..ec0b196
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,30 @@
+# 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 the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
+# Ignore all logfiles and tempfiles.
+/log/*
+/tmp/*
+!/log/.keep
+!/tmp/.keep
+
+# Ignore uploaded files in development
+/storage/*
+
+/node_modules
+/yarn-error.log
+
+/public/assets
+.byebug_history
+
+# Ignore master key for decrypting credentials and more.
+/config/master.key
diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 0000000..4fd0fe3
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+2.5.1
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..2cef8b3
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,68 @@
+source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+ruby '2.5.1'
+
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '~> 5.2.0'
+# Use sqlite3 as the database for Active Record
+gem 'sqlite3'
+# Use Puma as the app server
+gem 'puma', '~> 3.11'
+# Use SCSS for stylesheets
+gem 'sass-rails', '~> 5.0'
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier', '>= 1.3.0'
+# See https://github.com/rails/execjs#readme for more supported runtimes
+# gem 'mini_racer', platforms: :ruby
+
+# Use CoffeeScript for .coffee assets and views
+gem 'coffee-rails', '~> 4.2'
+# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
+gem 'turbolinks', '~> 5'
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+gem 'jbuilder', '~> 2.5'
+# Use Redis adapter to run Action Cable in production
+# gem 'redis', '~> 4.0'
+# Use ActiveModel has_secure_password
+# gem 'bcrypt', '~> 3.1.7'
+
+# Use ActiveStorage variant
+# gem 'mini_magick', '~> 4.8'
+
+# Use Capistrano for deployment
+# gem 'capistrano-rails', group: :development
+
+# Reduces boot times through caching; required in config/boot.rb
+gem 'bootsnap', '>= 1.1.0', require: false
+
+group :development, :test do
+  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
+end
+
+group :development do
+  # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
+  gem 'web-console', '>= 3.3.0'
+  gem 'listen', '>= 3.0.5', '< 3.2'
+  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+  gem 'spring'
+  gem 'spring-watcher-listen', '~> 2.0.0'
+end
+
+group :test do
+  # Adds support for Capybara system testing and selenium driver
+  gem 'capybara', '>= 2.15', '< 4.0'
+  gem 'selenium-webdriver'
+  # Easy installation and use of chromedriver to run system tests with Chrome
+  gem 'chromedriver-helper'
+end
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+# Use bootstrap gem for HTML/CSS/JS
+gem 'bootstrap'
+
+# Use kaminari gem for pagination
+gem 'kaminari'
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 0000000..f3d73d3
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,239 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.2.0)
+      actionpack (= 5.2.0)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.0)
+      actionview (= 5.2.0)
+      activesupport (= 5.2.0)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.0)
+      activesupport (= 5.2.0)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.0)
+      activesupport (= 5.2.0)
+      globalid (>= 0.3.6)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activestorage (5.2.0)
+      actionpack (= 5.2.0)
+      activerecord (= 5.2.0)
+      marcel (~> 0.3.1)
+    activesupport (5.2.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    archive-zip (0.11.0)
+      io-like (~> 0.3.0)
+    arel (9.0.0)
+    autoprefixer-rails (8.4.1)
+      execjs
+    bindex (0.5.0)
+    bootsnap (1.3.0)
+      msgpack (~> 1.0)
+    bootstrap (4.1.1)
+      autoprefixer-rails (>= 6.0.3)
+      popper_js (>= 1.12.9, < 2)
+      sass (>= 3.5.2)
+    builder (3.2.3)
+    byebug (10.0.2)
+    capybara (3.1.0)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      xpath (~> 3.0)
+    childprocess (0.9.0)
+      ffi (~> 1.0, >= 1.0.11)
+    chromedriver-helper (1.2.0)
+      archive-zip (~> 0.10)
+      nokogiri (~> 1.8)
+    coffee-rails (4.2.2)
+      coffee-script (>= 2.2.0)
+      railties (>= 4.0.0)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.12.2)
+    concurrent-ruby (1.0.5)
+    crass (1.0.4)
+    erubi (1.7.1)
+    execjs (2.7.0)
+    ffi (1.9.23)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
+    io-like (0.3.0)
+    jbuilder (2.7.0)
+      activesupport (>= 4.2.0)
+      multi_json (>= 1.2)
+    kaminari (1.1.1)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.1.1)
+      kaminari-activerecord (= 1.1.1)
+      kaminari-core (= 1.1.1)
+    kaminari-actionview (1.1.1)
+      actionview
+      kaminari-core (= 1.1.1)
+    kaminari-activerecord (1.1.1)
+      activerecord
+      kaminari-core (= 1.1.1)
+    kaminari-core (1.1.1)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.2)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.0)
+    mimemagic (0.3.2)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    msgpack (1.2.4)
+    multi_json (1.13.1)
+    nio4r (2.3.1)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
+    popper_js (1.12.9)
+    public_suffix (3.0.2)
+    puma (3.11.4)
+    rack (2.0.5)
+    rack-test (1.0.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.0)
+      actioncable (= 5.2.0)
+      actionmailer (= 5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      activemodel (= 5.2.0)
+      activerecord (= 5.2.0)
+      activestorage (= 5.2.0)
+      activesupport (= 5.2.0)
+      bundler (>= 1.3.0)
+      railties (= 5.2.0)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.0)
+      actionpack (= 5.2.0)
+      activesupport (= 5.2.0)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.3.1)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    ruby_dep (1.5.0)
+    rubyzip (1.2.1)
+    sass (3.5.6)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sass-rails (5.0.7)
+      railties (>= 4.0.0, < 6)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
+    selenium-webdriver (3.12.0)
+      childprocess (~> 0.5)
+      rubyzip (~> 1.2)
+    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)
+    sqlite3 (1.3.13)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tilt (2.0.8)
+    turbolinks (5.1.1)
+      turbolinks-source (~> 5.1)
+    turbolinks-source (5.1.0)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    uglifier (4.1.10)
+      execjs (>= 0.3.0, < 3)
+    web-console (3.6.2)
+      actionview (>= 5.0)
+      activemodel (>= 5.0)
+      bindex (>= 0.4.0)
+      railties (>= 5.0)
+    websocket-driver (0.7.0)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+    xpath (3.0.0)
+      nokogiri (~> 1.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bootsnap (>= 1.1.0)
+  bootstrap
+  byebug
+  capybara (>= 2.15, < 4.0)
+  chromedriver-helper
+  coffee-rails (~> 4.2)
+  jbuilder (~> 2.5)
+  kaminari
+  listen (>= 3.0.5, < 3.2)
+  puma (~> 3.11)
+  rails (~> 5.2.0)
+  sass-rails (~> 5.0)
+  selenium-webdriver
+  spring
+  spring-watcher-listen (~> 2.0.0)
+  sqlite3
+  turbolinks (~> 5)
+  tzinfo-data
+  uglifier (>= 1.3.0)
+  web-console (>= 3.3.0)
+
+RUBY VERSION
+   ruby 2.5.1p57
+
+BUNDLED WITH
+   1.16.1
diff --git a/README.md b/README.md
index 4bf363d..359e951 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,10 @@
-# rqdb
-Rash/Rails Quote Database
+# README
+
+Setup:
+* RVM
+* Ruby 2.5.1
+* bundle install
+* bundle exec rake db:migrate
+* bundle exec rails server
+
+Browse to http://localhost:3000
\ No newline at end of file
diff --git a/Rakefile b/Rakefile
new file mode 100644
index 0000000..e85f913
--- /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 0000000..b16e53d
--- /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 0000000..e69de29
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
new file mode 100644
index 0000000..82e6f0f
--- /dev/null
+++ b/app/assets/javascripts/application.js
@@ -0,0 +1,16 @@
+// 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 activestorage
+//= require turbolinks
+//= require_tree .
diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js
new file mode 100644
index 0000000..739aa5f
--- /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 0000000..e69de29
diff --git a/app/assets/javascripts/quotes.coffee b/app/assets/javascripts/quotes.coffee
new file mode 100644
index 0000000..24f83d1
--- /dev/null
+++ b/app/assets/javascripts/quotes.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
new file mode 100644
index 0000000..f1784e0
--- /dev/null
+++ b/app/assets/stylesheets/application.css
@@ -0,0 +1,16 @@
+/*
+ * 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
+ */
+@import "bootstrap";
\ No newline at end of file
diff --git a/app/assets/stylesheets/quotes.scss b/app/assets/stylesheets/quotes.scss
new file mode 100644
index 0000000..93953b9
--- /dev/null
+++ b/app/assets/stylesheets/quotes.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the Quotes 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/scaffolds.scss b/app/assets/stylesheets/scaffolds.scss
new file mode 100644
index 0000000..6045188
--- /dev/null
+++ b/app/assets/stylesheets/scaffolds.scss
@@ -0,0 +1,84 @@
+body {
+  background-color: #fff;
+  color: #333;
+  margin: 33px;
+  font-family: verdana, arial, helvetica, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
+}
+
+p, ol, ul, td {
+  font-family: verdana, arial, helvetica, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
+}
+
+pre {
+  background-color: #eee;
+  padding: 10px;
+  font-size: 11px;
+}
+
+a {
+  color: #000;
+
+  &:visited {
+    color: #666;
+  }
+
+  &:hover {
+    color: #fff;
+    background-color: #000;
+  }
+}
+
+th {
+  padding-bottom: 5px;
+}
+
+td {
+  padding: 0 5px 7px;
+}
+
+div {
+  &.field, &.actions {
+    margin-bottom: 10px;
+  }
+}
+
+#notice {
+  color: green;
+}
+
+.field_with_errors {
+  padding: 2px;
+  background-color: red;
+  display: table;
+}
+
+#error_explanation {
+  width: 450px;
+  border: 2px solid red;
+  padding: 7px 7px 0;
+  margin-bottom: 20px;
+  background-color: #f0f0f0;
+
+  h2 {
+    text-align: left;
+    font-weight: bold;
+    padding: 5px 5px 5px 15px;
+    font-size: 12px;
+    margin: -7px -7px 0;
+    background-color: #c00;
+    color: #fff;
+  }
+
+  ul li {
+    font-size: 12px;
+    list-style: square;
+  }
+}
+
+label {
+  display: block;
+}
diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb
new file mode 100644
index 0000000..d672697
--- /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 0000000..0ff5442
--- /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 0000000..09705d1
--- /dev/null
+++ b/app/controllers/application_controller.rb
@@ -0,0 +1,2 @@
+class ApplicationController < ActionController::Base
+end
diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
new file mode 100644
index 0000000..9fa41b2
--- /dev/null
+++ b/app/controllers/quotes_controller.rb
@@ -0,0 +1,74 @@
+class QuotesController < ApplicationController
+  before_action :set_quote, only: [:show, :edit, :update, :destroy]
+
+  # GET /quotes
+  # GET /quotes.json
+  def index
+    @quotes = Quote.page params[:page]
+  end
+
+  # GET /quotes/1
+  # GET /quotes/1.json
+  def show
+  end
+
+  # GET /quotes/new
+  def new
+    @quote = Quote.new
+  end
+
+  # GET /browse
+  # GET /browse.json
+  def browse
+    @quotes = Quote.all
+  end
+
+  # GET /random
+  # GET /random.json
+  def random
+    quote_ids = 25.times.map{ rand(1..Quote.count) }
+    @quotes = quote_ids.map{|id| Quote.exists?(id) && Quote.find(id) }.select{|quote| quote unless quote.nil?}
+  end
+
+  # POST /quotes
+  # POST /quotes.json
+  def create
+    @quote = Quote.new(quote_params)
+
+    respond_to do |format|
+      if @quote.score != 0 or @quote.approved
+        format.html { render :new }
+        format.json { render json: @quote.errors, status: :unprocessable_entity }
+      end
+
+      if @quote.save
+        format.html { redirect_to @quote, notice: 'Quote was successfully created.' }
+        format.json { render :show, status: :created, location: @quote }
+      else
+        format.html { render :new }
+        format.json { render json: @quote.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /quotes/1
+  # DELETE /quotes/1.json
+  def destroy
+    @quote.destroy
+    respond_to do |format|
+      format.html { redirect_to quotes_url, notice: 'Quote was successfully destroyed.' }
+      format.json { head :no_content }
+    end
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_quote
+      @quote = Quote.find(params[:id])
+    end
+
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def quote_params
+      params.require(:quote).permit(:text, :score)
+    end
+end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
new file mode 100644
index 0000000..de6be79
--- /dev/null
+++ b/app/helpers/application_helper.rb
@@ -0,0 +1,2 @@
+module ApplicationHelper
+end
diff --git a/app/helpers/quotes_helper.rb b/app/helpers/quotes_helper.rb
new file mode 100644
index 0000000..32b09df
--- /dev/null
+++ b/app/helpers/quotes_helper.rb
@@ -0,0 +1,2 @@
+module QuotesHelper
+end
diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb
new file mode 100644
index 0000000..a009ace
--- /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 0000000..286b223
--- /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 0000000..10a4cba
--- /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 0000000..e69de29
diff --git a/app/models/quote.rb b/app/models/quote.rb
new file mode 100644
index 0000000..bfa5513
--- /dev/null
+++ b/app/models/quote.rb
@@ -0,0 +1,2 @@
+class Quote < ApplicationRecord
+end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
new file mode 100644
index 0000000..e495ffd
--- /dev/null
+++ b/app/views/layouts/application.html.erb
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>QDB</title>
+    <%= csrf_meta_tags %>
+    <%= csp_meta_tag %>
+
+    <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
+    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
+  </head>
+
+  <body>
+    <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+    <div class="container">
+      <div class="navbar-header">
+        <h1>QDB</h1>
+      </div>
+      <div id="navbar navbar-nav">
+        <a href="/">Home</a> / 
+        <a href="/latest">Latest</a> /
+        <a href="/quotes">Browse</a> / 
+        <%= link_to "Random", "/random" %> <a href="/random1">&gt;0</a> / 
+        <%= link_to "Top", "/top", :class => "navbar-brand" %> / 
+        <a href="/quotes/new">Add Quote</a> /
+        Search /
+        # 
+    <%= yield %>
+  </body>
+</html>
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
new file mode 100644
index 0000000..cbd34d2
--- /dev/null
+++ b/app/views/layouts/mailer.html.erb
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style>
+      /* Email styles need to be inline */
+    </style>
+  </head>
+
+  <body>
+    <%= yield %>
+  </body>
+</html>
diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb
new file mode 100644
index 0000000..37f0bdd
--- /dev/null
+++ b/app/views/layouts/mailer.text.erb
@@ -0,0 +1 @@
+<%= yield %>
diff --git a/app/views/quotes/_form.html.erb b/app/views/quotes/_form.html.erb
new file mode 100644
index 0000000..11e0210
--- /dev/null
+++ b/app/views/quotes/_form.html.erb
@@ -0,0 +1,22 @@
+<%= form_with(model: quote, local: true) do |form| %>
+  <% if quote.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(quote.errors.count, "error") %> prohibited this quote from being saved:</h2>
+
+      <ul>
+      <% quote.errors.full_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= form.label :text %>
+    <%= form.text_area :text %>
+  </div>
+
+  <div class="actions">
+    <%= form.submit %>
+  </div>
+<% end %>
diff --git a/app/views/quotes/_quote.json.jbuilder b/app/views/quotes/_quote.json.jbuilder
new file mode 100644
index 0000000..d963cbf
--- /dev/null
+++ b/app/views/quotes/_quote.json.jbuilder
@@ -0,0 +1,2 @@
+json.extract! quote, :id, :text, :score, :created_at, :updated_at
+json.url quote_url(quote, format: :json)
diff --git a/app/views/quotes/index.html.erb b/app/views/quotes/index.html.erb
new file mode 100644
index 0000000..b6214f0
--- /dev/null
+++ b/app/views/quotes/index.html.erb
@@ -0,0 +1,13 @@
+<p id="notice"><%= notice %></p>
+<%= paginate(@quotes) %>
+<% @quotes.each do |quote| %>
+  <p>
+    <strong><%= link_to "##{quote.id}", quote %></strong>
+    +(<%= quote.score %>)-
+    [X]
+    <%= link_to 'Delete', quote, method: :delete, data: { confirm: 'Are you sure?' } %>
+  </p>
+  <p>
+    <pre><%= quote.text %></pre>
+  </p>
+<% end %>
diff --git a/app/views/quotes/index.json.jbuilder b/app/views/quotes/index.json.jbuilder
new file mode 100644
index 0000000..15841aa
--- /dev/null
+++ b/app/views/quotes/index.json.jbuilder
@@ -0,0 +1 @@
+json.array! @quotes, partial: 'quotes/quote', as: :quote
diff --git a/app/views/quotes/new.html.erb b/app/views/quotes/new.html.erb
new file mode 100644
index 0000000..b7a2679
--- /dev/null
+++ b/app/views/quotes/new.html.erb
@@ -0,0 +1,5 @@
+<h1>New Quote</h1>
+
+<%= render 'form', quote: @quote %>
+
+<%= link_to 'Back', quotes_path %>
diff --git a/app/views/quotes/random.html.erb b/app/views/quotes/random.html.erb
new file mode 100644
index 0000000..80c5122
--- /dev/null
+++ b/app/views/quotes/random.html.erb
@@ -0,0 +1,12 @@
+<p id="notice"><%= notice %></p>
+<% @quotes.each do |quote| %>
+  <p>
+    <strong><%= link_to "##{quote.id}", quote %></strong>
+    +(<%= quote.score %>)-
+    [X]
+    <%= link_to 'Delete', quote, method: :delete, data: { confirm: 'Are you sure?' } %>
+  </p>
+  <p>
+    <pre><%= quote.text %></pre>
+  </p>
+<% end %>
diff --git a/app/views/quotes/show.html.erb b/app/views/quotes/show.html.erb
new file mode 100644
index 0000000..fd66609
--- /dev/null
+++ b/app/views/quotes/show.html.erb
@@ -0,0 +1,11 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong><%= link_to "##{@quote.id}", @quote %></strong>
+  +(<%= @quote.score %>)-
+  [X]
+  <%= link_to 'Delete', @quote, method: :delete, data: { confirm: 'Are you sure?' } %>
+</p>
+<p>
+  <pre><%= @quote.text %></pre>
+</p>
diff --git a/app/views/quotes/show.json.jbuilder b/app/views/quotes/show.json.jbuilder
new file mode 100644
index 0000000..2e771cc
--- /dev/null
+++ b/app/views/quotes/show.json.jbuilder
@@ -0,0 +1 @@
+json.partial! "quotes/quote", quote: @quote
diff --git a/bin/bundle b/bin/bundle
new file mode 100755
index 0000000..f19acf5
--- /dev/null
+++ b/bin/bundle
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+load Gem.bin_path('bundler', 'bundle')
diff --git a/bin/rails b/bin/rails
new file mode 100755
index 0000000..5badb2f
--- /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 0000000..d87d5f5
--- /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 0000000..94fd4d7
--- /dev/null
+++ b/bin/setup
@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = File.expand_path('..', __dir__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?('config/database.yml')
+  #   cp 'config/database.yml.sample', 'config/database.yml'
+  # end
+
+  puts "\n== Preparing database =="
+  system! 'bin/rails db:setup'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end
diff --git a/bin/spring b/bin/spring
new file mode 100755
index 0000000..fb2ec2e
--- /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 0000000..58bfaed
--- /dev/null
+++ b/bin/update
@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = File.expand_path('..', __dir__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a way to update your development environment automatically.
+  # Add necessary update steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
+
+  puts "\n== Updating database =="
+  system! 'bin/rails db:migrate'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end
diff --git a/bin/yarn b/bin/yarn
new file mode 100755
index 0000000..460dd56
--- /dev/null
+++ b/bin/yarn
@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.expand_path('..', __dir__)
+Dir.chdir(APP_ROOT) do
+  begin
+    exec "yarnpkg", *ARGV
+  rescue Errno::ENOENT
+    $stderr.puts "Yarn executable was not detected in the system."
+    $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
+    exit 1
+  end
+end
diff --git a/config.ru b/config.ru
new file mode 100644
index 0000000..f7ba0b5
--- /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 0000000..9c0b08c
--- /dev/null
+++ b/config/application.rb
@@ -0,0 +1,19 @@
+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 RashOnRails
+  class Application < Rails::Application
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 5.2
+
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration can go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded after loading
+    # the framework and any gems in your application.
+  end
+end
diff --git a/config/boot.rb b/config/boot.rb
new file mode 100644
index 0000000..b9e460c
--- /dev/null
+++ b/config/boot.rb
@@ -0,0 +1,4 @@
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+
+require 'bundler/setup' # Set up gems listed in the Gemfile.
+require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
diff --git a/config/cable.yml b/config/cable.yml
new file mode 100644
index 0000000..6b1eb1b
--- /dev/null
+++ b/config/cable.yml
@@ -0,0 +1,10 @@
+development:
+  adapter: async
+
+test:
+  adapter: async
+
+production:
+  adapter: redis
+  url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
+  channel_prefix: rash_on_rails_production
diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc
new file mode 100644
index 0000000..9721587
--- /dev/null
+++ b/config/credentials.yml.enc
@@ -0,0 +1 @@
+y4QSX1cvFmO0CImSXXtjKDWBycXizBjHIYTZGd1HPdCWvXgd8WJvINFaAF3nvfTkM05nDGtx2YLEsqSGuOdSyb58yiyt5qXDLzXsLeo3GBc3bWj8t9+o3D82Z/YBmBBQEcf3cgIoYR8xRkrMJfBuQ1gL3M7WKZqVdfAhDhRYG6225zl4DxrBcJNj6Zi25GS4S+/bT90YpJLr0kuLNaMtynzb/hnCtBrArEbwYtSz0GQoQiD/7RibS+h9DXwpxKbo3IfBVMVaIZxG8Xy6mN0qJ0M+0tpznUlN9tZ5RUQ6xGRW42hhg0CKiKNHh3w0Bey4KhMwDoyMUj2pfjFKtlg3dKWQHj0bfEKoTKSVz+LJzCNVd8K1GtRrOrmxXE7+HLX5Sf8u5TB8G55WdT4E68ItSmB4TlPd0TT7nf2o--t0jTJ/thhXsXHAJP--680zojXXOY7gSzoM/LxTnA==
\ No newline at end of file
diff --git a/config/database.yml b/config/database.yml
new file mode 100644
index 0000000..0d02f24
--- /dev/null
+++ b/config/database.yml
@@ -0,0 +1,25 @@
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+#
+default: &default
+  adapter: sqlite3
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+  timeout: 5000
+
+development:
+  <<: *default
+  database: db/development.sqlite3
+
+# 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: db/test.sqlite3
+
+production:
+  <<: *default
+  database: db/production.sqlite3
diff --git a/config/environment.rb b/config/environment.rb
new file mode 100644
index 0000000..426333b
--- /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 0000000..1311e3e
--- /dev/null
+++ b/config/environments/development.rb
@@ -0,0 +1,61 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # In the development environment your application's code is reloaded on
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
+  config.cache_classes = false
+
+  # Do not eager load code on boot.
+  config.eager_load = false
+
+  # Show full error reports.
+  config.consider_all_requests_local = true
+
+  # Enable/disable caching. By default caching is disabled.
+  # Run rails dev:cache to toggle caching.
+  if Rails.root.join('tmp', 'caching-dev.txt').exist?
+    config.action_controller.perform_caching = true
+
+    config.cache_store = :memory_store
+    config.public_file_server.headers = {
+      'Cache-Control' => "public, max-age=#{2.days.to_i}"
+    }
+  else
+    config.action_controller.perform_caching = false
+
+    config.cache_store = :null_store
+  end
+
+  # Store uploaded files on the local file system (see config/storage.yml for options)
+  config.active_storage.service = :local
+
+  # Don't care if the mailer can't send.
+  config.action_mailer.raise_delivery_errors = false
+
+  config.action_mailer.perform_caching = false
+
+  # Print deprecation notices to the Rails logger.
+  config.active_support.deprecation = :log
+
+  # Raise an error on page load if there are pending migrations.
+  config.active_record.migration_error = :page_load
+
+  # Highlight code that triggered database queries in logs.
+  config.active_record.verbose_query_logs = true
+
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
+
+  # Suppress logger output for asset requests.
+  config.assets.quiet = true
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+
+  # Use an evented file watcher to asynchronously detect changes in source code,
+  # routes, locales, etc. This feature depends on the listen gem.
+  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+end
diff --git a/config/environments/production.rb b/config/environments/production.rb
new file mode 100644
index 0000000..da4fafd
--- /dev/null
+++ b/config/environments/production.rb
@@ -0,0 +1,94 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # Code is not reloaded between requests.
+  config.cache_classes = true
+
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
+  # or in config/master.key. This key is used to decrypt credentials (and other encrypted files).
+  # config.require_master_key = true
+
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
+  config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
+
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  # config.assets.css_compressor = :sass
+
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
+  config.assets.compile = false
+
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
+
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = 'http://assets.example.com'
+
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
+
+  # Store uploaded files on the local file system (see config/storage.yml for options)
+  config.active_storage.service = :local
+
+  # Mount Action Cable outside main process or domain
+  # config.action_cable.mount_path = nil
+  # config.action_cable.url = 'wss://example.com/cable'
+  # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
+
+  # Use the lowest log level to ensure availability of diagnostic information
+  # when problems arise.
+  config.log_level = :debug
+
+  # Prepend all log lines with the following tags.
+  config.log_tags = [ :request_id ]
+
+  # Use a different cache store in production.
+  # config.cache_store = :mem_cache_store
+
+  # Use a real queuing backend for Active Job (and separate queues per environment)
+  # config.active_job.queue_adapter     = :resque
+  # config.active_job.queue_name_prefix = "rash_on_rails_#{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 0000000..0a38fd3
--- /dev/null
+++ b/config/environments/test.rb
@@ -0,0 +1,46 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # The test environment is used exclusively to run your application's
+  # test suite. You never need to work with it otherwise. Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs. Don't rely on the data there!
+  config.cache_classes = true
+
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
+
+  # Configure public file server for tests with Cache-Control for performance.
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = {
+    'Cache-Control' => "public, max-age=#{1.hour.to_i}"
+  }
+
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates.
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
+
+  # Store uploaded files on the local file system in a temporary directory
+  config.active_storage.service = :test
+
+  config.action_mailer.perform_caching = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Print deprecation notices to the stderr.
+  config.active_support.deprecation = :stderr
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+end
diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb
new file mode 100644
index 0000000..89d2efa
--- /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 0000000..4b828e8
--- /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 0000000..59385cd
--- /dev/null
+++ b/config/initializers/backtrace_silencers.rb
@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
+# Rails.backtrace_cleaner.remove_silencers!
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
new file mode 100644
index 0000000..d3bcaa5
--- /dev/null
+++ b/config/initializers/content_security_policy.rb
@@ -0,0 +1,25 @@
+# Be sure to restart your server when you modify this file.
+
+# Define an application-wide content security policy
+# For further information see the following documentation
+# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
+
+# Rails.application.config.content_security_policy do |policy|
+#   policy.default_src :self, :https
+#   policy.font_src    :self, :https, :data
+#   policy.img_src     :self, :https, :data
+#   policy.object_src  :none
+#   policy.script_src  :self, :https
+#   policy.style_src   :self, :https
+
+#   # Specify URI for violation reports
+#   # policy.report_uri "/csp-violation-report-endpoint"
+# end
+
+# If you are using UJS then enable automatic nonce generation
+# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
+
+# Report CSP violations to a specified URI
+# For further information see the following documentation:
+# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
+# Rails.application.config.content_security_policy_report_only = true
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
new file mode 100644
index 0000000..5a6a32d
--- /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 0000000..4a994e1
--- /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 0000000..ac033bf
--- /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/kaminari_config.rb b/config/initializers/kaminari_config.rb
new file mode 100644
index 0000000..c808667
--- /dev/null
+++ b/config/initializers/kaminari_config.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+Kaminari.configure do |config|
+  # config.default_per_page = 25
+  # config.max_per_page = nil
+  # config.window = 4
+  # config.outer_window = 0
+  # config.left = 0
+  # config.right = 0
+  # config.page_method_name = :page
+  # config.param_name = :page
+  # config.params_on_first_page = false
+end
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
new file mode 100644
index 0000000..dc18996
--- /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 0000000..bbfc396
--- /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 0000000..decc5a8
--- /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 0000000..a5eccf8
--- /dev/null
+++ b/config/puma.rb
@@ -0,0 +1,34 @@
+# Puma can serve each request in a thread from an internal thread pool.
+# The `threads` method setting takes two numbers: a minimum and maximum.
+# Any libraries that use thread pools should be configured to match
+# the maximum value specified for Puma. Default is set to 5 threads for minimum
+# and maximum; this matches the default thread size of Active Record.
+#
+threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
+threads threads_count, threads_count
+
+# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
+#
+port        ENV.fetch("PORT") { 3000 }
+
+# Specifies the `environment` that Puma will run in.
+#
+environment ENV.fetch("RAILS_ENV") { "development" }
+
+# Specifies the number of `workers` to boot in clustered mode.
+# Workers are forked webserver processes. If using threads and workers together
+# the concurrency of the application would be max `threads` * `workers`.
+# Workers do not work on JRuby or Windows (both of which do not support
+# processes).
+#
+# workers ENV.fetch("WEB_CONCURRENCY") { 2 }
+
+# Use the `preload_app!` method when specifying a `workers` number.
+# This directive tells Puma to first boot the application and load code
+# before forking the application. This takes advantage of Copy On Write
+# process behavior so workers use less memory.
+#
+# preload_app!
+
+# Allow puma to be restarted by `rails restart` command.
+plugin :tmp_restart
diff --git a/config/routes.rb b/config/routes.rb
new file mode 100644
index 0000000..e9fdd73
--- /dev/null
+++ b/config/routes.rb
@@ -0,0 +1,7 @@
+Rails.application.routes.draw do
+  resources :quotes
+  # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
+
+  get 'random', to: :random, controller: 'quotes'
+
+end
\ No newline at end of file
diff --git a/config/spring.rb b/config/spring.rb
new file mode 100644
index 0000000..9fa7863
--- /dev/null
+++ b/config/spring.rb
@@ -0,0 +1,6 @@
+%w[
+  .ruby-version
+  .rbenv-vars
+  tmp/restart.txt
+  tmp/caching-dev.txt
+].each { |path| Spring.watch(path) }
diff --git a/config/storage.yml b/config/storage.yml
new file mode 100644
index 0000000..d32f76e
--- /dev/null
+++ b/config/storage.yml
@@ -0,0 +1,34 @@
+test:
+  service: Disk
+  root: <%= Rails.root.join("tmp/storage") %>
+
+local:
+  service: Disk
+  root: <%= Rails.root.join("storage") %>
+
+# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key)
+# amazon:
+#   service: S3
+#   access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %>
+#   secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %>
+#   region: us-east-1
+#   bucket: your_own_bucket
+
+# Remember not to checkin your GCS keyfile to a repository
+# google:
+#   service: GCS
+#   project: your_project
+#   credentials: <%= Rails.root.join("path/to/gcs.keyfile") %>
+#   bucket: your_own_bucket
+
+# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key)
+# microsoft:
+#   service: AzureStorage
+#   storage_account_name: your_account_name
+#   storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %>
+#   container: your_container_name
+
+# mirror:
+#   service: Mirror
+#   primary: local
+#   mirrors: [ amazon, google, microsoft ]
diff --git a/db/migrate/20180512222706_create_quotes.rb b/db/migrate/20180512222706_create_quotes.rb
new file mode 100644
index 0000000..88b57c4
--- /dev/null
+++ b/db/migrate/20180512222706_create_quotes.rb
@@ -0,0 +1,11 @@
+class CreateQuotes < ActiveRecord::Migration[5.2]
+  def change
+    create_table :quotes do |t|
+      t.string :text, null: false
+      t.integer :score, default: 0, null: false
+      t.boolean :approved, default: false, null: false
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
new file mode 100644
index 0000000..589bc63
--- /dev/null
+++ b/db/schema.rb
@@ -0,0 +1,23 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 2018_05_12_222706) do
+
+  create_table "quotes", force: :cascade do |t|
+    t.string "text", null: false
+    t.integer "score", default: 0, null: false
+    t.boolean "approved", default: false, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+end
diff --git a/db/seeds.rb b/db/seeds.rb
new file mode 100644
index 0000000..aae8976
--- /dev/null
+++ b/db/seeds.rb
@@ -0,0 +1,26 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup).
+#
+# Examples:
+#
+#   movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
+#   Character.create(name: 'Luke', movie: movies.first)
+
+Quote.create(approved:true, score:10, text:
+'<Cthon98> hey, if you type in your pw, it will show as stars
+<Cthon98> ********* see!
+<AzureDiamond> hunter2
+<AzureDiamond> doesnt look like stars to me
+<Cthon98> <AzureDiamond> *******
+<Cthon98> thats what I see
+<AzureDiamond> oh, really?
+<Cthon98> Absolutely
+<AzureDiamond> you can go hunter2 my hunter2-ing hunter2
+<AzureDiamond> haha, does that look funny to you?
+<Cthon98> lol, yes. See, when YOU type hunter2, it shows to us as *******
+<AzureDiamond> thats neat, I didnt know IRC did that
+<Cthon98> yep, no matter how many times you type hunter2, it will show to us as *******
+<AzureDiamond> awesome!
+<AzureDiamond> wait, how do you know my pw?
+<Cthon98> er, I just copy pasted YOUR ******\'s and it appears to YOU as hunter2 cause its your pw
+<AzureDiamond> oh, ok.')
\ No newline at end of file
diff --git a/lib/assets/.keep b/lib/assets/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/lib/tasks/.keep b/lib/tasks/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/log/.keep b/log/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..8cf55e5
--- /dev/null
+++ b/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "rash_on_rails",
+  "private": true,
+  "dependencies": {}
+}
diff --git a/public/404.html b/public/404.html
new file mode 100644
index 0000000..2be3af2
--- /dev/null
+++ b/public/404.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>The page you were looking for doesn't exist (404)</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style>
+  .rails-default-error-page {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+    margin: 0;
+  }
+
+  .rails-default-error-page div.dialog {
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+
+  .rails-default-error-page div.dialog > div {
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+
+  .rails-default-error-page h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  .rails-default-error-page div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  </style>
+</head>
+
+<body class="rails-default-error-page">
+  <!-- This file lives in public/404.html -->
+  <div class="dialog">
+    <div>
+      <h1>The page you were looking for doesn't exist.</h1>
+      <p>You may have mistyped the address or the page may have moved.</p>
+    </div>
+    <p>If you are the application owner check the logs for more information.</p>
+  </div>
+</body>
+</html>
diff --git a/public/422.html b/public/422.html
new file mode 100644
index 0000000..c08eac0
--- /dev/null
+++ b/public/422.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>The change you wanted was rejected (422)</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style>
+  .rails-default-error-page {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+    margin: 0;
+  }
+
+  .rails-default-error-page div.dialog {
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+
+  .rails-default-error-page div.dialog > div {
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+
+  .rails-default-error-page h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  .rails-default-error-page div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  </style>
+</head>
+
+<body class="rails-default-error-page">
+  <!-- This file lives in public/422.html -->
+  <div class="dialog">
+    <div>
+      <h1>The change you wanted was rejected.</h1>
+      <p>Maybe you tried to change something you didn't have access to.</p>
+    </div>
+    <p>If you are the application owner check the logs for more information.</p>
+  </div>
+</body>
+</html>
diff --git a/public/500.html b/public/500.html
new file mode 100644
index 0000000..78a030a
--- /dev/null
+++ b/public/500.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>We're sorry, but something went wrong (500)</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style>
+  .rails-default-error-page {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+    margin: 0;
+  }
+
+  .rails-default-error-page div.dialog {
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+
+  .rails-default-error-page div.dialog > div {
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+
+  .rails-default-error-page h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  .rails-default-error-page div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  </style>
+</head>
+
+<body class="rails-default-error-page">
+  <!-- This file lives in public/500.html -->
+  <div class="dialog">
+    <div>
+      <h1>We're sorry, but something went wrong.</h1>
+    </div>
+    <p>If you are the application owner check the logs for more information.</p>
+  </div>
+</body>
+</html>
diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png
new file mode 100644
index 0000000..e69de29
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
new file mode 100644
index 0000000..e69de29
diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 0000000..e69de29
diff --git a/public/robots.txt b/public/robots.txt
new file mode 100644
index 0000000..37b576a
--- /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 0000000..d19212a
--- /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 0000000..e69de29
diff --git a/test/controllers/quotes_controller_test.rb b/test/controllers/quotes_controller_test.rb
new file mode 100644
index 0000000..5ad1b34
--- /dev/null
+++ b/test/controllers/quotes_controller_test.rb
@@ -0,0 +1,48 @@
+require 'test_helper'
+
+class QuotesControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @quote = quotes(:one)
+  end
+
+  test "should get index" do
+    get quotes_url
+    assert_response :success
+  end
+
+  test "should get new" do
+    get new_quote_url
+    assert_response :success
+  end
+
+  test "should create quote" do
+    assert_difference('Quote.count') do
+      post quotes_url, params: { quote: { score: @quote.score, text: @quote.text } }
+    end
+
+    assert_redirected_to quote_url(Quote.last)
+  end
+
+  test "should show quote" do
+    get quote_url(@quote)
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get edit_quote_url(@quote)
+    assert_response :success
+  end
+
+  test "should update quote" do
+    patch quote_url(@quote), params: { quote: { score: @quote.score, text: @quote.text } }
+    assert_redirected_to quote_url(@quote)
+  end
+
+  test "should destroy quote" do
+    assert_difference('Quote.count', -1) do
+      delete quote_url(@quote)
+    end
+
+    assert_redirected_to quotes_url
+  end
+end
diff --git a/test/fixtures/.keep b/test/fixtures/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/test/fixtures/quotes.yml b/test/fixtures/quotes.yml
new file mode 100644
index 0000000..e02d924
--- /dev/null
+++ b/test/fixtures/quotes.yml
@@ -0,0 +1,9 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  text: MyString
+  score: 1
+
+two:
+  text: MyString
+  score: 1
diff --git a/test/helpers/.keep b/test/helpers/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/test/integration/.keep b/test/integration/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/test/mailers/.keep b/test/mailers/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/test/models/.keep b/test/models/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/test/models/quote_test.rb b/test/models/quote_test.rb
new file mode 100644
index 0000000..1662c08
--- /dev/null
+++ b/test/models/quote_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class QuoteTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/system/.keep b/test/system/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/test/system/quotes_test.rb b/test/system/quotes_test.rb
new file mode 100644
index 0000000..e2861a8
--- /dev/null
+++ b/test/system/quotes_test.rb
@@ -0,0 +1,45 @@
+require "application_system_test_case"
+
+class QuotesTest < ApplicationSystemTestCase
+  setup do
+    @quote = quotes(:one)
+  end
+
+  test "visiting the index" do
+    visit quotes_url
+    assert_selector "h1", text: "Quotes"
+  end
+
+  test "creating a Quote" do
+    visit quotes_url
+    click_on "New Quote"
+
+    fill_in "Score", with: @quote.score
+    fill_in "Text", with: @quote.text
+    click_on "Create Quote"
+
+    assert_text "Quote was successfully created"
+    click_on "Back"
+  end
+
+  test "updating a Quote" do
+    visit quotes_url
+    click_on "Edit", match: :first
+
+    fill_in "Score", with: @quote.score
+    fill_in "Text", with: @quote.text
+    click_on "Update Quote"
+
+    assert_text "Quote was successfully updated"
+    click_on "Back"
+  end
+
+  test "destroying a Quote" do
+    visit quotes_url
+    page.accept_confirm do
+      click_on "Destroy", match: :first
+    end
+
+    assert_text "Quote was successfully destroyed"
+  end
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
new file mode 100644
index 0000000..3ab84e3
--- /dev/null
+++ b/test/test_helper.rb
@@ -0,0 +1,10 @@
+ENV['RAILS_ENV'] ||= 'test'
+require_relative '../config/environment'
+require 'rails/test_help'
+
+class ActiveSupport::TestCase
+  # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
+  fixtures :all
+
+  # Add more helper methods to be used by all tests here...
+end
diff --git a/tmp/.keep b/tmp/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/vendor/.keep b/vendor/.keep
new file mode 100644
index 0000000..e69de29

From 4a0bbd986f21dc7bf73c26f7571df988a9dffc7d Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Sat, 12 May 2018 23:27:03 -0400
Subject: [PATCH 002/148] more

---
 app/controllers/quotes_controller.rb   |  8 +++++++-
 app/views/layouts/application.html.erb | 14 +++++++-------
 config/routes.rb                       |  3 +++
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 9fa41b2..4dc6fb2 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -20,7 +20,13 @@ def new
   # GET /browse
   # GET /browse.json
   def browse
-    @quotes = Quote.all
+    @quotes = Quote.where(approved: true)
+  end
+
+  # GET /latest
+  # GET /latest.json
+  def latest
+    @quotes = Quote.where(approved: true)
   end
 
   # GET /random
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index e495ffd..85a56de 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>QDB</title>
+    <title>RQDB</title>
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
 
@@ -16,13 +16,13 @@
         <h1>QDB</h1>
       </div>
       <div id="navbar navbar-nav">
-        <a href="/">Home</a> / 
-        <a href="/latest">Latest</a> /
-        <a href="/quotes">Browse</a> / 
-        <%= link_to "Random", "/random" %> <a href="/random1">&gt;0</a> / 
+        <%= link_to "Home", "/quotes" %> /
+        <%= link_to "Latest", "/latest" %> /
+        <%= link_to "Quotes", "/quotes" %> /
+        <%= link_to "Random", "/random" %> <%= link_to ">0", "/random" %> / 
         <%= link_to "Top", "/top", :class => "navbar-brand" %> / 
-        <a href="/quotes/new">Add Quote</a> /
-        Search /
+        <%= link_to "Add Quote", "/quotes/new" %> /
+        <%= link_to "Search", "/search" %>
         # 
     <%= yield %>
   </body>
diff --git a/config/routes.rb b/config/routes.rb
index e9fdd73..b6d8070 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,6 +2,9 @@
   resources :quotes
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 
+  get '/', to: :index, controller: 'quotes'
+  get 'browse', to: :index, controller: 'quotes'
+  get 'latest', to: :latest, controller: 'quotes'
   get 'random', to: :random, controller: 'quotes'
 
 end
\ No newline at end of file

From 256eb5ac9e0ae438b2ac3361ae2faad0a005eb07 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Sat, 12 May 2018 23:27:56 -0400
Subject: [PATCH 003/148] fix routes

---
 config/routes.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index b6d8070..819070f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,8 +2,8 @@
   resources :quotes
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 
-  get '/', to: :index, controller: 'quotes'
-  get 'browse', to: :index, controller: 'quotes'
+  #get '/', to: :index, controller: 'quotes'
+  #get 'browse', to: :index, controller: 'quotes'
   get 'latest', to: :latest, controller: 'quotes'
   get 'random', to: :random, controller: 'quotes'
 

From 4a0b8c18c25b112a5907e84fca03d2738f0caaa2 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Sat, 12 May 2018 23:34:28 -0400
Subject: [PATCH 004/148] routes

---
 config/routes.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index 819070f..0aa90de 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,9 +1,10 @@
 Rails.application.routes.draw do
   resources :quotes
+  root 'quotes#index'
+
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 
-  #get '/', to: :index, controller: 'quotes'
-  #get 'browse', to: :index, controller: 'quotes'
+  get 'browse', to: 'quotes#index'
   get 'latest', to: :latest, controller: 'quotes'
   get 'random', to: :random, controller: 'quotes'
 

From 42f9fd9e8e0f9584e19542f484e74c0b7bae819c Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Sat, 12 May 2018 23:35:44 -0400
Subject: [PATCH 005/148] links

---
 app/views/layouts/application.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 85a56de..7af922b 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -16,9 +16,9 @@
         <h1>QDB</h1>
       </div>
       <div id="navbar navbar-nav">
-        <%= link_to "Home", "/quotes" %> /
+        <%= link_to "Home", "/" %> /
         <%= link_to "Latest", "/latest" %> /
-        <%= link_to "Quotes", "/quotes" %> /
+        <%= link_to "Browse", "/browse" %> /
         <%= link_to "Random", "/random" %> <%= link_to ">0", "/random" %> / 
         <%= link_to "Top", "/top", :class => "navbar-brand" %> / 
         <%= link_to "Add Quote", "/quotes/new" %> /

From f391d44108e16cdb415daeb5d5abc603ee16972d Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Sat, 12 May 2018 23:37:04 -0400
Subject: [PATCH 006/148] comments

---
 app/controllers/quotes_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 4dc6fb2..8f73885 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -32,7 +32,9 @@ def latest
   # GET /random
   # GET /random.json
   def random
+    # Generate 25 random IDs
     quote_ids = 25.times.map{ rand(1..Quote.count) }
+    # Select any valid quotes from the above IDs
     @quotes = quote_ids.map{|id| Quote.exists?(id) && Quote.find(id) }.select{|quote| quote unless quote.nil?}
   end
 

From 8a87060bb585a0cb8e549a89a6695daf24a7b886 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Sat, 12 May 2018 23:37:27 -0400
Subject: [PATCH 007/148] extraneous check

---
 app/controllers/quotes_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 8f73885..4a99ec2 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -35,7 +35,7 @@ def random
     # Generate 25 random IDs
     quote_ids = 25.times.map{ rand(1..Quote.count) }
     # Select any valid quotes from the above IDs
-    @quotes = quote_ids.map{|id| Quote.exists?(id) && Quote.find(id) }.select{|quote| quote unless quote.nil?}
+    @quotes = quote_ids.map{|id| Quote.exists?(id) && Quote.find(id) }
   end
 
   # POST /quotes

From 7a2672840f44dfa7c9dbac42670c574640b1993d Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Sat, 12 May 2018 23:37:41 -0400
Subject: [PATCH 008/148] Revert "extraneous check"

This reverts commit 8a87060bb585a0cb8e549a89a6695daf24a7b886.
---
 app/controllers/quotes_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 4a99ec2..8f73885 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -35,7 +35,7 @@ def random
     # Generate 25 random IDs
     quote_ids = 25.times.map{ rand(1..Quote.count) }
     # Select any valid quotes from the above IDs
-    @quotes = quote_ids.map{|id| Quote.exists?(id) && Quote.find(id) }
+    @quotes = quote_ids.map{|id| Quote.exists?(id) && Quote.find(id) }.select{|quote| quote unless quote.nil?}
   end
 
   # POST /quotes

From 03f83de03dbff3093fa4533ac33c49c0feeca28e Mon Sep 17 00:00:00 2001
From: tom cuchta <tomcuchta@gmail.com>
Date: Sat, 12 May 2018 23:40:13 -0400
Subject: [PATCH 009/148] unique random quotes

---
 app/controllers/quotes_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 8f73885..f288b29 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -33,7 +33,7 @@ def latest
   # GET /random.json
   def random
     # Generate 25 random IDs
-    quote_ids = 25.times.map{ rand(1..Quote.count) }
+    quote_ids = 25.times.map{ rand(1..Quote.count) }.uniq
     # Select any valid quotes from the above IDs
     @quotes = quote_ids.map{|id| Quote.exists?(id) && Quote.find(id) }.select{|quote| quote unless quote.nil?}
   end

From 7e3e376728aea78247d86f58f8fd20951d529ecb Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Sun, 13 May 2018 00:01:25 -0400
Subject: [PATCH 010/148] refactor views to use shared show layout

---
 app/controllers/quotes_controller.rb |  1 +
 app/views/quotes/_show.html.erb      | 12 ++++++++++++
 app/views/quotes/index.html.erb      | 10 +---------
 app/views/quotes/show.html.erb       | 13 ++-----------
 4 files changed, 16 insertions(+), 20 deletions(-)
 create mode 100644 app/views/quotes/_show.html.erb

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index f288b29..c926e1b 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -10,6 +10,7 @@ def index
   # GET /quotes/1
   # GET /quotes/1.json
   def show
+    @quotes = [Quote.find(params[:id])]
   end
 
   # GET /quotes/new
diff --git a/app/views/quotes/_show.html.erb b/app/views/quotes/_show.html.erb
new file mode 100644
index 0000000..f569926
--- /dev/null
+++ b/app/views/quotes/_show.html.erb
@@ -0,0 +1,12 @@
+<p id="notice"><%= notice %></p>
+<% @quotes.each do |quote| %>
+	<p>
+	  <strong><%= link_to "##{quote.id}", quote %></strong>
+	  +(<%= quote.score %>)-
+	  [X]
+	  <%= link_to 'Delete', @quote, method: :delete, data: { confirm: 'Are you sure?' } %>
+	</p>
+	<p>
+	  <pre><%= quote.text %></pre>
+	</p>
+<% end %>
\ No newline at end of file
diff --git a/app/views/quotes/index.html.erb b/app/views/quotes/index.html.erb
index b6214f0..9caf38c 100644
--- a/app/views/quotes/index.html.erb
+++ b/app/views/quotes/index.html.erb
@@ -1,13 +1,5 @@
 <p id="notice"><%= notice %></p>
 <%= paginate(@quotes) %>
 <% @quotes.each do |quote| %>
-  <p>
-    <strong><%= link_to "##{quote.id}", quote %></strong>
-    +(<%= quote.score %>)-
-    [X]
-    <%= link_to 'Delete', quote, method: :delete, data: { confirm: 'Are you sure?' } %>
-  </p>
-  <p>
-    <pre><%= quote.text %></pre>
-  </p>
+<%= render 'quotes/show' %>
 <% end %>
diff --git a/app/views/quotes/show.html.erb b/app/views/quotes/show.html.erb
index fd66609..59d002a 100644
--- a/app/views/quotes/show.html.erb
+++ b/app/views/quotes/show.html.erb
@@ -1,11 +1,2 @@
-<p id="notice"><%= notice %></p>
-
-<p>
-  <strong><%= link_to "##{@quote.id}", @quote %></strong>
-  +(<%= @quote.score %>)-
-  [X]
-  <%= link_to 'Delete', @quote, method: :delete, data: { confirm: 'Are you sure?' } %>
-</p>
-<p>
-  <pre><%= @quote.text %></pre>
-</p>
+<% quote = @quote %>
+<%= render 'quotes/show' %>
\ No newline at end of file

From 34e21ff127f23f6dbd7b6ddf949ee73e35fddfa6 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Sun, 13 May 2018 00:08:10 -0400
Subject: [PATCH 011/148] fix delete

---
 app/views/quotes/_show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/quotes/_show.html.erb b/app/views/quotes/_show.html.erb
index f569926..d894a66 100644
--- a/app/views/quotes/_show.html.erb
+++ b/app/views/quotes/_show.html.erb
@@ -4,7 +4,7 @@
 	  <strong><%= link_to "##{quote.id}", quote %></strong>
 	  +(<%= quote.score %>)-
 	  [X]
-	  <%= link_to 'Delete', @quote, method: :delete, data: { confirm: 'Are you sure?' } %>
+	  <%= link_to 'Delete', quote, method: :delete, data: { confirm: 'Are you sure?' } %>
 	</p>
 	<p>
 	  <pre><%= quote.text %></pre>

From d2bd8c05212c754d160e7028fa8a80d34b684589 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Sun, 13 May 2018 00:20:07 -0400
Subject: [PATCH 012/148] fix pagination

---
 app/controllers/quotes_controller.rb | 10 ++--------
 app/models/application_record.rb     |  1 +
 config/routes.rb                     |  2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index c926e1b..f6f7420 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -4,7 +4,7 @@ class QuotesController < ApplicationController
   # GET /quotes
   # GET /quotes.json
   def index
-    @quotes = Quote.page params[:page]
+    @quotes = Quote.where(approved: true).order(created_at: :desc).page(params[:page]).per(3)
   end
 
   # GET /quotes/1
@@ -18,16 +18,10 @@ def new
     @quote = Quote.new
   end
 
-  # GET /browse
-  # GET /browse.json
-  def browse
-    @quotes = Quote.where(approved: true)
-  end
-
   # GET /latest
   # GET /latest.json
   def latest
-    @quotes = Quote.where(approved: true)
+    @quotes = Quote.where(approved: true).order(created_at: :desc).page(params[:page]).per(3)
   end
 
   # GET /random
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index 10a4cba..2e0ba98 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -1,3 +1,4 @@
 class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
+  paginates_per 10
 end
diff --git a/config/routes.rb b/config/routes.rb
index 0aa90de..1fe320a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -5,7 +5,7 @@
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 
   get 'browse', to: 'quotes#index'
-  get 'latest', to: :latest, controller: 'quotes'
+  get 'latest', to: 'quotes#index'
   get 'random', to: :random, controller: 'quotes'
 
 end
\ No newline at end of file

From 435627015fdb9e3b5b143e43c1ca657fd147f1c1 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Sun, 13 May 2018 00:20:25 -0400
Subject: [PATCH 013/148] remove crap

---
 app/controllers/quotes_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index f6f7420..7c4ea5c 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -4,7 +4,7 @@ class QuotesController < ApplicationController
   # GET /quotes
   # GET /quotes.json
   def index
-    @quotes = Quote.where(approved: true).order(created_at: :desc).page(params[:page]).per(3)
+    @quotes = Quote.where(approved: true).order(created_at: :desc).page(params[:page])
   end
 
   # GET /quotes/1
@@ -21,7 +21,7 @@ def new
   # GET /latest
   # GET /latest.json
   def latest
-    @quotes = Quote.where(approved: true).order(created_at: :desc).page(params[:page]).per(3)
+    @quotes = Quote.where(approved: true).order(created_at: :desc).page(params[:page])
   end
 
   # GET /random

From b2de58b475f5696ef5c250d15dc61e9a9565fc5a Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Sun, 13 May 2018 00:22:23 -0400
Subject: [PATCH 014/148] fix latest page

---
 app/controllers/quotes_controller.rb | 2 +-
 app/views/quotes/latest.html.erb     | 1 +
 config/routes.rb                     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 app/views/quotes/latest.html.erb

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 7c4ea5c..9052b83 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -4,7 +4,7 @@ class QuotesController < ApplicationController
   # GET /quotes
   # GET /quotes.json
   def index
-    @quotes = Quote.where(approved: true).order(created_at: :desc).page(params[:page])
+    @quotes = Quote.where(approved: true).order(created_at: :asc).page(params[:page])
   end
 
   # GET /quotes/1
diff --git a/app/views/quotes/latest.html.erb b/app/views/quotes/latest.html.erb
new file mode 100644
index 0000000..8179946
--- /dev/null
+++ b/app/views/quotes/latest.html.erb
@@ -0,0 +1 @@
+<%= render 'quotes/show' %>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 1fe320a..ae30172 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -5,7 +5,7 @@
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 
   get 'browse', to: 'quotes#index'
-  get 'latest', to: 'quotes#index'
+  get 'latest', to: 'quotes#latest'
   get 'random', to: :random, controller: 'quotes'
 
 end
\ No newline at end of file

From d0a1305db913e3503214ec175dd6acf134a6175b Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Sun, 13 May 2018 00:24:02 -0400
Subject: [PATCH 015/148] routes

---
 config/routes.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index ae30172..c27048a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -4,8 +4,11 @@
 
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 
-  get 'browse', to: 'quotes#index'
-  get 'latest', to: 'quotes#latest'
-  get 'random', to: :random, controller: 'quotes'
+  get 'browse',   to: 'quotes#index'
+  get 'latest',   to: 'quotes#latest'
+  get 'random',   to: 'quotes#random'
+  get 'random1',  to: 'quotes#random1'
+  get 'search',   to: 'quotes#search'
+  get 'top',      to: 'quotes#top'
 
 end
\ No newline at end of file

From e52cf0df3775a30c2992cf07af7f7714550fc656 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Sun, 13 May 2018 00:49:22 -0400
Subject: [PATCH 016/148] add upvote/downvote

---
 app/controllers/quotes_controller.rb | 46 ++++++++++++++++++++++++++++
 app/views/quotes/_show.html.erb      | 10 +++---
 config/routes.rb                     |  9 ++++++
 3 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 9052b83..c421651 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -13,6 +13,38 @@ def show
     @quotes = [Quote.find(params[:id])]
   end
 
+  # GET /quotes/1/downvote
+  # POST /quotes/1/downvote
+  def downvote
+    @quote = Quote.find(params[:id])
+    @quote.update(score: @quote.score - 1)
+    respond_to do |format|
+      if @quote.save
+        format.html { redirect_to @quote, notice: 'Quote was successfully downvoted.' }
+        format.json { render :show, status: :ok, location: @quote }
+      else
+        format.html { render :edit }
+        format.json { render json: @quote.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # GET /quotes/1/upvote
+  # POST /quotes/1/upvote
+  def upvote
+    @quote = Quote.find(params[:id])
+    @quote.update(score: @quote.score + 1)
+    respond_to do |format|
+      if @quote.save
+        format.html { redirect_to @quote, notice: 'Quote was successfully upvoted.' }
+        format.json { render :show, status: :ok, location: @quote }
+      else
+        format.html { render :edit }
+        format.json { render json: @quote.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
   # GET /quotes/new
   def new
     @quote = Quote.new
@@ -54,6 +86,20 @@ def create
     end
   end
 
+  # PATCH/PUT /quotes/1
+  # PATCH/PUT /quotes/1.json
+  def update
+    respond_to do |format|
+      if @quote.update(quote_params)
+        format.html { redirect_to @quote, notice: 'Quote was successfully updated.' }
+        format.json { render :show, status: :ok, location: @quote }
+      else
+        format.html { render :edit }
+        format.json { render json: @quote.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
   # DELETE /quotes/1
   # DELETE /quotes/1.json
   def destroy
diff --git a/app/views/quotes/_show.html.erb b/app/views/quotes/_show.html.erb
index d894a66..2c32df2 100644
--- a/app/views/quotes/_show.html.erb
+++ b/app/views/quotes/_show.html.erb
@@ -1,12 +1,12 @@
 <p id="notice"><%= notice %></p>
 <% @quotes.each do |quote| %>
 	<p>
-	  <strong><%= link_to "##{quote.id}", quote %></strong>
-	  +(<%= quote.score %>)-
-	  [X]
-	  <%= link_to 'Delete', quote, method: :delete, data: { confirm: 'Are you sure?' } %>
+		<strong><%= link_to "##{quote.id}", quote %></strong>
+		<a href="/quotes/<%= quote.id %>/upvote">+</a>(<%= quote.score %>)<a href="/quotes/<%= quote.id %>/downvote">-</a>
+		[X]
+		<%= link_to 'Delete', quote, method: :delete, data: { confirm: 'Are you sure?' } %>
 	</p>
 	<p>
-	  <pre><%= quote.text %></pre>
+		<pre><%= quote.text %></pre>
 	</p>
 <% end %>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index c27048a..0ff2de3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -11,4 +11,13 @@
   get 'search',   to: 'quotes#search'
   get 'top',      to: 'quotes#top'
 
+  resources :quotes do
+    member do
+      get :downvote
+      post :downvote
+      get :upvote
+      post :upvote
+    end
+  end
+
 end
\ No newline at end of file

From 063225d41843823b0240bd7d7ccb904da5075a49 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Sun, 13 May 2018 00:50:10 -0400
Subject: [PATCH 017/148] fix dupe message

---
 app/views/quotes/_show.html.erb | 1 -
 app/views/quotes/show.html.erb  | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/quotes/_show.html.erb b/app/views/quotes/_show.html.erb
index 2c32df2..5904350 100644
--- a/app/views/quotes/_show.html.erb
+++ b/app/views/quotes/_show.html.erb
@@ -1,4 +1,3 @@
-<p id="notice"><%= notice %></p>
 <% @quotes.each do |quote| %>
 	<p>
 		<strong><%= link_to "##{quote.id}", quote %></strong>
diff --git a/app/views/quotes/show.html.erb b/app/views/quotes/show.html.erb
index 59d002a..caa8e59 100644
--- a/app/views/quotes/show.html.erb
+++ b/app/views/quotes/show.html.erb
@@ -1,2 +1,3 @@
 <% quote = @quote %>
+<p id="notice"><%= notice %></p>
 <%= render 'quotes/show' %>
\ No newline at end of file

From a2604063cd53935056173f28517b36766a56b01b Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Sun, 13 May 2018 00:52:14 -0400
Subject: [PATCH 018/148] fix random

---
 app/views/quotes/random.html.erb | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/app/views/quotes/random.html.erb b/app/views/quotes/random.html.erb
index 80c5122..6796834 100644
--- a/app/views/quotes/random.html.erb
+++ b/app/views/quotes/random.html.erb
@@ -1,12 +1,2 @@
 <p id="notice"><%= notice %></p>
-<% @quotes.each do |quote| %>
-  <p>
-    <strong><%= link_to "##{quote.id}", quote %></strong>
-    +(<%= quote.score %>)-
-    [X]
-    <%= link_to 'Delete', quote, method: :delete, data: { confirm: 'Are you sure?' } %>
-  </p>
-  <p>
-    <pre><%= quote.text %></pre>
-  </p>
-<% end %>
+<%= render 'quotes/index' %>
\ No newline at end of file

From 38858393c84c74a9b4c86d201981b3fb1a54fca4 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Sun, 13 May 2018 00:53:10 -0400
Subject: [PATCH 019/148] fix upvote/downvote on random page

---
 app/controllers/quotes_controller.rb | 9 +++++++++
 app/views/quotes/random.html.erb     | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index c421651..2ef8e4e 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -65,6 +65,15 @@ def random
     @quotes = quote_ids.map{|id| Quote.exists?(id) && Quote.find(id) }.select{|quote| quote unless quote.nil?}
   end
 
+  # GET /random1
+  # GET /random1.json
+  def random1
+    # Generate 25 random IDs
+    quote_ids = 25.times.map{ rand(1..Quote.count) }.uniq
+    # Select any valid quotes from the above IDs with positive vote counts
+    @quotes = quote_ids.map{|id| Quote.exists?(id) && Quote.find(id) }.select{|quote| quote unless quote.nil?}
+  end
+
   # POST /quotes
   # POST /quotes.json
   def create
diff --git a/app/views/quotes/random.html.erb b/app/views/quotes/random.html.erb
index 6796834..330e7cc 100644
--- a/app/views/quotes/random.html.erb
+++ b/app/views/quotes/random.html.erb
@@ -1,2 +1,4 @@
 <p id="notice"><%= notice %></p>
-<%= render 'quotes/index' %>
\ No newline at end of file
+<% @quotes.each do |quote| %>
+<%= render 'quotes/show' %>
+<% end %>

From 7e2fb1997ded8d0e3e4d152811007192043c3b4f Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Sun, 13 May 2018 01:27:24 -0400
Subject: [PATCH 020/148] add top

---
 app/controllers/quotes_controller.rb | 30 ++++++++++++++++------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 2ef8e4e..8e8826d 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -56,22 +56,26 @@ def latest
     @quotes = Quote.where(approved: true).order(created_at: :desc).page(params[:page])
   end
 
+  # GET /top
+  # GET /top.json
+  def top
+    @quotes = Quote.where(approved: true).order(score: :desc).page(params[:page])
+  end
+
   # GET /random
   # GET /random.json
   def random
-    # Generate 25 random IDs
-    quote_ids = 25.times.map{ rand(1..Quote.count) }.uniq
-    # Select any valid quotes from the above IDs
-    @quotes = quote_ids.map{|id| Quote.exists?(id) && Quote.find(id) }.select{|quote| quote unless quote.nil?}
-  end
-
-  # GET /random1
-  # GET /random1.json
-  def random1
-    # Generate 25 random IDs
-    quote_ids = 25.times.map{ rand(1..Quote.count) }.uniq
-    # Select any valid quotes from the above IDs with positive vote counts
-    @quotes = quote_ids.map{|id| Quote.exists?(id) && Quote.find(id) }.select{|quote| quote unless quote.nil?}
+    all_quotes = Quote.where(approved: true)
+    @quotes = []
+    if all_quotes.count <= 10
+      @quotes = Quote.where(approved: true)
+    else
+      while @quotes.count < 10 and @quotes.count < all_quotes.count
+        max_index = all_quotes.count - 1
+        i = rand(0..max_index)
+        @quotes.push(all_quotes[i]) unless @quotes.include?(all_quotes[i])
+      end
+    end
   end
 
   # POST /quotes

From e1a4f0b4c79054d2cef48514ab2477240a57d03f Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Sun, 13 May 2018 01:39:00 -0400
Subject: [PATCH 021/148] checkin

---
 app/controllers/quotes_controller.rb | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 8e8826d..c9d3634 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -67,14 +67,10 @@ def top
   def random
     all_quotes = Quote.where(approved: true)
     @quotes = []
-    if all_quotes.count <= 10
-      @quotes = Quote.where(approved: true)
-    else
-      while @quotes.count < 10 and @quotes.count < all_quotes.count
-        max_index = all_quotes.count - 1
-        i = rand(0..max_index)
-        @quotes.push(all_quotes[i]) unless @quotes.include?(all_quotes[i])
-      end
+    max_index = all_quotes.count - 1
+    1.upto(10).each do
+      random_index = rand(0..max_index)
+      @quotes.push all_quotes[random_index] unless @quotes.include?(all_quotes[random_index])
     end
   end
 

From b1a1bc3367001596a21dccc40a9195595df3ec34 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Sun, 13 May 2018 01:51:18 -0400
Subject: [PATCH 022/148] more on random

---
 app/controllers/quotes_controller.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index c9d3634..c551acf 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -66,11 +66,13 @@ def top
   # GET /random.json
   def random
     all_quotes = Quote.where(approved: true)
+    all_quote_ids = all_quotes.collect {|quote| quote.id}
     @quotes = []
     max_index = all_quotes.count - 1
     1.upto(10).each do
       random_index = rand(0..max_index)
-      @quotes.push all_quotes[random_index] unless @quotes.include?(all_quotes[random_index])
+      quote = all_quotes.find(all_quote_ids[random_index])
+      @quotes << quote unless @quotes.include?(quote)
     end
   end
 

From 16cab0f7f807c7b0b627f5c1bca0f0813dd61530 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Sun, 13 May 2018 01:54:47 -0400
Subject: [PATCH 023/148] moar random

---
 app/controllers/quotes_controller.rb | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index c551acf..2314047 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -69,11 +69,19 @@ def random
     all_quote_ids = all_quotes.collect {|quote| quote.id}
     @quotes = []
     max_index = all_quotes.count - 1
-    1.upto(10).each do
-      random_index = rand(0..max_index)
-      quote = all_quotes.find(all_quote_ids[random_index])
-      @quotes << quote unless @quotes.include?(quote)
+
+    if all_quotes.count <= 10
+      @quotes = all_quotes
+    else
+      random_count = 10
+      1.upto(random_count).each do
+        random_index = rand(0..max_index)
+        quote = all_quotes.find(all_quote_ids[random_index])
+        @quotes << quote unless @quotes.include?(quote)
+      end
     end
+
+
   end
 
   # POST /quotes

From 9be920054e243478c8fff9926a41db0112a501f6 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-Air.netgear.com>
Date: Sun, 13 May 2018 09:46:23 -0400
Subject: [PATCH 024/148] fix random

---
 app/controllers/quotes_controller.rb | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 2314047..3b88329 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -65,23 +65,15 @@ def top
   # GET /random
   # GET /random.json
   def random
-    all_quotes = Quote.where(approved: true)
-    all_quote_ids = all_quotes.collect {|quote| quote.id}
+    max_id = Quote.where(approved: true).last(1).first.id
     @quotes = []
-    max_index = all_quotes.count - 1
-
-    if all_quotes.count <= 10
-      @quotes = all_quotes
-    else
-      random_count = 10
-      1.upto(random_count).each do
-        random_index = rand(0..max_index)
-        quote = all_quotes.find(all_quote_ids[random_index])
+    while @quotes.count < 10 and @quotes.count < Quote.where(approved: true).count
+      i = rand(1..max_id)
+      if Quote.exists?(i)
+        quote = Quote.find(i)
         @quotes << quote unless @quotes.include?(quote)
       end
     end
-
-
   end
 
   # POST /quotes

From c77062ad21e3ad41aa965d13cd3c87640153b631 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-Air.netgear.com>
Date: Sun, 13 May 2018 09:50:49 -0400
Subject: [PATCH 025/148] use sample() method

---
 app/controllers/quotes_controller.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 3b88329..d6fda83 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -65,12 +65,10 @@ def top
   # GET /random
   # GET /random.json
   def random
-    max_id = Quote.where(approved: true).last(1).first.id
     @quotes = []
     while @quotes.count < 10 and @quotes.count < Quote.where(approved: true).count
-      i = rand(1..max_id)
       if Quote.exists?(i)
-        quote = Quote.find(i)
+        quote = Quote.where(approved: true).sample
         @quotes << quote unless @quotes.include?(quote)
       end
     end

From 195c767834b90cff62c81c39f2a7eaa7bdd91f9d Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-Air.netgear.com>
Date: Sun, 13 May 2018 09:54:09 -0400
Subject: [PATCH 026/148] simpler

---
 app/controllers/quotes_controller.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index d6fda83..aa5ef43 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -68,8 +68,7 @@ def random
     @quotes = []
     while @quotes.count < 10 and @quotes.count < Quote.where(approved: true).count
       if Quote.exists?(i)
-        quote = Quote.where(approved: true).sample
-        @quotes << quote unless @quotes.include?(quote)
+        @quotes << Quote.where(approved: true).sample unless @quotes.count > 1
       end
     end
   end

From 35aa3e86e6b0fee157e1fd7141e9e97811b2d918 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-Air.netgear.com>
Date: Sun, 13 May 2018 09:55:36 -0400
Subject: [PATCH 027/148] fix conditional

---
 app/controllers/quotes_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index aa5ef43..c1f37ed 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -68,7 +68,7 @@ def random
     @quotes = []
     while @quotes.count < 10 and @quotes.count < Quote.where(approved: true).count
       if Quote.exists?(i)
-        @quotes << Quote.where(approved: true).sample unless @quotes.count > 1
+        @quotes << Quote.where(approved: true).sample unless @quotes.include?(quote)
       end
     end
   end

From e49f68d4f5c3e3132427d9156bb023d7b30a4757 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-Air.netgear.com>
Date: Sun, 13 May 2018 09:59:13 -0400
Subject: [PATCH 028/148] remove old crap

---
 app/controllers/quotes_controller.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index c1f37ed..54065cd 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -67,9 +67,7 @@ def top
   def random
     @quotes = []
     while @quotes.count < 10 and @quotes.count < Quote.where(approved: true).count
-      if Quote.exists?(i)
-        @quotes << Quote.where(approved: true).sample unless @quotes.include?(quote)
-      end
+      @quotes << Quote.where(approved: true).sample unless @quotes.include?(quote)
     end
   end
 

From db68ff0391f3a199ad6196131de130c180da3182 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-Air.netgear.com>
Date: Sun, 13 May 2018 10:34:41 -0400
Subject: [PATCH 029/148] add top

---
 app/views/quotes/top.html.erb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 app/views/quotes/top.html.erb

diff --git a/app/views/quotes/top.html.erb b/app/views/quotes/top.html.erb
new file mode 100644
index 0000000..9caf38c
--- /dev/null
+++ b/app/views/quotes/top.html.erb
@@ -0,0 +1,5 @@
+<p id="notice"><%= notice %></p>
+<%= paginate(@quotes) %>
+<% @quotes.each do |quote| %>
+<%= render 'quotes/show' %>
+<% end %>

From 9c05dcfe45262edb2d6894baad4389917911f166 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-Air.netgear.com>
Date: Sun, 13 May 2018 10:34:53 -0400
Subject: [PATCH 030/148] simplify the still broken random def

---
 app/controllers/quotes_controller.rb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 54065cd..e6adff4 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -65,10 +65,7 @@ def top
   # GET /random
   # GET /random.json
   def random
-    @quotes = []
-    while @quotes.count < 10 and @quotes.count < Quote.where(approved: true).count
-      @quotes << Quote.where(approved: true).sample unless @quotes.include?(quote)
-    end
+    @quotes = Quote.where(approved: true).order("RANDOM()").last(10).uniq
   end
 
   # POST /quotes

From 480ba518c7932f4ef076895ee692b244b548d2ff Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-Air.netgear.com>
Date: Sun, 13 May 2018 10:44:52 -0400
Subject: [PATCH 031/148] fuck this

---
 app/controllers/quotes_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index e6adff4..b135471 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -65,7 +65,7 @@ def top
   # GET /random
   # GET /random.json
   def random
-    @quotes = Quote.where(approved: true).order("RANDOM()").last(10).uniq
+    @quotes = Quote.where(approved: true).distinct.order("RANDOM()").limit(10)
   end
 
   # POST /quotes

From 18ee98b6864bd0c987feffa4c8092f0e23fb4fe3 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-Air.netgear.com>
Date: Sun, 13 May 2018 12:27:44 -0400
Subject: [PATCH 032/148] fix random

---
 app/controllers/quotes_controller.rb | 13 ++++++++++++-
 app/views/quotes/random.html.erb     |  2 --
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index b135471..1919857 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -65,7 +65,18 @@ def top
   # GET /random
   # GET /random.json
   def random
-    @quotes = Quote.where(approved: true).distinct.order("RANDOM()").limit(10)
+    max_id = Quote.where(approved: true).last(1).first.id
+    @quote_ids = []
+    while (@quote_ids.count < 10) and (@quote_ids.count < Quote.where(approved: true).count)
+      i = rand(1..max_id)
+      if Quote.exists?(id: i)
+        unless @quote_ids.include?(i)
+          @quote_ids << i 
+        end
+      end
+    end
+
+    @quotes = @quote_ids.map{|id| Quote.find(id) if Quote.exists?(id: id)}
   end
 
   # POST /quotes
diff --git a/app/views/quotes/random.html.erb b/app/views/quotes/random.html.erb
index 330e7cc..d2dc89c 100644
--- a/app/views/quotes/random.html.erb
+++ b/app/views/quotes/random.html.erb
@@ -1,4 +1,2 @@
 <p id="notice"><%= notice %></p>
-<% @quotes.each do |quote| %>
 <%= render 'quotes/show' %>
-<% end %>

From e261572e9d6a081a1234d6eb3f43bf06ffed1d8d Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Sun, 13 May 2018 13:31:31 -0400
Subject: [PATCH 033/148] random1

---
 app/controllers/quotes_controller.rb   | 36 +++++++++++++++++++++-----
 app/views/layouts/application.html.erb |  2 +-
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 1919857..182f63e 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -65,20 +65,42 @@ def top
   # GET /random
   # GET /random.json
   def random
-    max_id = Quote.where(approved: true).last(1).first.id
-    @quote_ids = []
-    while (@quote_ids.count < 10) and (@quote_ids.count < Quote.where(approved: true).count)
+    all_quotes = Quote.where(approved: true)
+    max_id     = all_quotes.last(1).first.id
+    quote_ids  = []
+    while (quote_ids.count < 10) and (quote_ids.count < all_quotes.count)
       i = rand(1..max_id)
-      if Quote.exists?(id: i)
-        unless @quote_ids.include?(i)
-          @quote_ids << i 
+      if Quote.exists?(id: i) and Quote.approved == true
+        unless quote_ids.include?(i)
+          quote_ids << i 
         end
       end
     end
 
-    @quotes = @quote_ids.map{|id| Quote.find(id) if Quote.exists?(id: id)}
+    @quotes = quote_ids.map{|id| Quote.find(id) if Quote.exists?(id: id)}
   end
 
+  # GET /random1
+  # GET /random1.json
+  def random1
+    all_quotes = Quote.where(approved: true)
+    max_id     = all_quotes.last(1).first.id
+    quote_ids  = []
+    while (quote_ids.count < 10) and (quote_ids.count < all_quotes.count)
+      i = rand(1..max_id)
+      if Quote.exists?(id: i)
+      and Quote.approved == true
+      and Quote.score > 0
+        unless quote_ids.include?(i)
+          quote_ids << i 
+        end  
+      end
+    end
+
+    @quotes = quote_ids.map{|id| Quote.find(id) if Quote.exists?(id: id)}
+  end
+
+
   # POST /quotes
   # POST /quotes.json
   def create
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 7af922b..dcbec34 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -19,7 +19,7 @@
         <%= link_to "Home", "/" %> /
         <%= link_to "Latest", "/latest" %> /
         <%= link_to "Browse", "/browse" %> /
-        <%= link_to "Random", "/random" %> <%= link_to ">0", "/random" %> / 
+        <%= link_to "Random", "/random" %> <%= link_to ">0", "/random1" %> / 
         <%= link_to "Top", "/top", :class => "navbar-brand" %> / 
         <%= link_to "Add Quote", "/quotes/new" %> /
         <%= link_to "Search", "/search" %>

From bfe27846c22ca89def7f80d879c496296c7f4c1b Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Sun, 13 May 2018 13:31:58 -0400
Subject: [PATCH 034/148] random1

---
 app/controllers/quotes_controller.rb | 4 +---
 app/views/quotes/random1.html.erb    | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 app/views/quotes/random1.html.erb

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 182f63e..2433f41 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -88,9 +88,7 @@ def random1
     quote_ids  = []
     while (quote_ids.count < 10) and (quote_ids.count < all_quotes.count)
       i = rand(1..max_id)
-      if Quote.exists?(id: i)
-      and Quote.approved == true
-      and Quote.score > 0
+      if Quote.exists?(id: i) and Quote.approved == true and Quote.score > 0
         unless quote_ids.include?(i)
           quote_ids << i 
         end  
diff --git a/app/views/quotes/random1.html.erb b/app/views/quotes/random1.html.erb
new file mode 100644
index 0000000..d2dc89c
--- /dev/null
+++ b/app/views/quotes/random1.html.erb
@@ -0,0 +1,2 @@
+<p id="notice"><%= notice %></p>
+<%= render 'quotes/show' %>

From 22da66bb4f05392436fe0d71e6802700d6b78b9b Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-Air.netgear.com>
Date: Sun, 13 May 2018 22:44:12 -0400
Subject: [PATCH 035/148] fix randoms

---
 app/controllers/quotes_controller.rb | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 2433f41..53dee6b 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -68,34 +68,30 @@ def random
     all_quotes = Quote.where(approved: true)
     max_id     = all_quotes.last(1).first.id
     quote_ids  = []
+    @quotes    = []
     while (quote_ids.count < 10) and (quote_ids.count < all_quotes.count)
-      i = rand(1..max_id)
-      if Quote.exists?(id: i) and Quote.approved == true
-        unless quote_ids.include?(i)
-          quote_ids << i 
-        end
+      quote = all_quotes.sample(1).first
+      unless quote_ids.include?(quote.id) or quote.approved != true
+        quote_ids << quote.id
+        @quotes << quote
       end
     end
-
-    @quotes = quote_ids.map{|id| Quote.find(id) if Quote.exists?(id: id)}
   end
 
   # GET /random1
   # GET /random1.json
   def random1
-    all_quotes = Quote.where(approved: true)
+    all_quotes = Quote.where(approved: true).where('"quotes"."score" > 0')
     max_id     = all_quotes.last(1).first.id
     quote_ids  = []
+    @quotes    = []
     while (quote_ids.count < 10) and (quote_ids.count < all_quotes.count)
-      i = rand(1..max_id)
-      if Quote.exists?(id: i) and Quote.approved == true and Quote.score > 0
-        unless quote_ids.include?(i)
-          quote_ids << i 
-        end  
+      quote = all_quotes.sample(1).first
+      unless quote_ids.include?(quote.id) or quote.approved != true# or quote.score <= 0
+        quote_ids << quote.id
+        @quotes << quote
       end
     end
-
-    @quotes = quote_ids.map{|id| Quote.find(id) if Quote.exists?(id: id)}
   end
 
 

From 93abf17ca68a5d4c9b43a943ef9df1ab0c856bc5 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-Air.netgear.com>
Date: Sun, 13 May 2018 22:52:45 -0400
Subject: [PATCH 036/148] add flagged column to db

---
 db/schema.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/db/schema.rb b/db/schema.rb
index 589bc63..9649ca1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2018_05_12_222706) do
+ActiveRecord::Schema.define(version: 2018_05_14_024535) do
 
   create_table "quotes", force: :cascade do |t|
     t.string "text", null: false
@@ -18,6 +18,7 @@
     t.boolean "approved", default: false, null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.boolean "flagged"
   end
 
 end

From 9301acf685eb5f8792704801cec4622a30d2cfa3 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-Air.netgear.com>
Date: Sun, 13 May 2018 22:52:59 -0400
Subject: [PATCH 037/148] bootstrap dependencies

---
 Gemfile                                |  1 +
 Gemfile.lock                           |  5 ++
 app/assets/javascripts/application.js  |  3 +
 app/assets/stylesheets/application.css | 16 -----
 app/assets/stylesheets/scaffolds.scss  | 84 --------------------------
 5 files changed, 9 insertions(+), 100 deletions(-)
 delete mode 100644 app/assets/stylesheets/application.css
 delete mode 100644 app/assets/stylesheets/scaffolds.scss

diff --git a/Gemfile b/Gemfile
index 2cef8b3..a7bbf1d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -63,6 +63,7 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 # Use bootstrap gem for HTML/CSS/JS
 gem 'bootstrap'
+gem 'jquery-rails'
 
 # Use kaminari gem for pagination
 gem 'kaminari'
diff --git a/Gemfile.lock b/Gemfile.lock
index f3d73d3..8c0b4f0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -90,6 +90,10 @@ GEM
     jbuilder (2.7.0)
       activesupport (>= 4.2.0)
       multi_json (>= 1.2)
+    jquery-rails (4.3.3)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
     kaminari (1.1.1)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.1.1)
@@ -218,6 +222,7 @@ DEPENDENCIES
   chromedriver-helper
   coffee-rails (~> 4.2)
   jbuilder (~> 2.5)
+  jquery-rails
   kaminari
   listen (>= 3.0.5, < 3.2)
   puma (~> 3.11)
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 82e6f0f..7edec1e 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -14,3 +14,6 @@
 //= require activestorage
 //= require turbolinks
 //= require_tree .
+//= require jquery3
+//= require popper
+//= require bootstrap-sprockets
\ No newline at end of file
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
deleted file mode 100644
index f1784e0..0000000
--- a/app/assets/stylesheets/application.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * 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
- */
-@import "bootstrap";
\ No newline at end of file
diff --git a/app/assets/stylesheets/scaffolds.scss b/app/assets/stylesheets/scaffolds.scss
deleted file mode 100644
index 6045188..0000000
--- a/app/assets/stylesheets/scaffolds.scss
+++ /dev/null
@@ -1,84 +0,0 @@
-body {
-  background-color: #fff;
-  color: #333;
-  margin: 33px;
-  font-family: verdana, arial, helvetica, sans-serif;
-  font-size: 13px;
-  line-height: 18px;
-}
-
-p, ol, ul, td {
-  font-family: verdana, arial, helvetica, sans-serif;
-  font-size: 13px;
-  line-height: 18px;
-}
-
-pre {
-  background-color: #eee;
-  padding: 10px;
-  font-size: 11px;
-}
-
-a {
-  color: #000;
-
-  &:visited {
-    color: #666;
-  }
-
-  &:hover {
-    color: #fff;
-    background-color: #000;
-  }
-}
-
-th {
-  padding-bottom: 5px;
-}
-
-td {
-  padding: 0 5px 7px;
-}
-
-div {
-  &.field, &.actions {
-    margin-bottom: 10px;
-  }
-}
-
-#notice {
-  color: green;
-}
-
-.field_with_errors {
-  padding: 2px;
-  background-color: red;
-  display: table;
-}
-
-#error_explanation {
-  width: 450px;
-  border: 2px solid red;
-  padding: 7px 7px 0;
-  margin-bottom: 20px;
-  background-color: #f0f0f0;
-
-  h2 {
-    text-align: left;
-    font-weight: bold;
-    padding: 5px 5px 5px 15px;
-    font-size: 12px;
-    margin: -7px -7px 0;
-    background-color: #c00;
-    color: #fff;
-  }
-
-  ul li {
-    font-size: 12px;
-    list-style: square;
-  }
-}
-
-label {
-  display: block;
-}

From d21b58ce342c7d50c40980e906ede76a4d3251da Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-Air.netgear.com>
Date: Sun, 13 May 2018 22:53:13 -0400
Subject: [PATCH 038/148] add flagged column to db

---
 db/migrate/20180514024535_add_column_to_quotes.rb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 db/migrate/20180514024535_add_column_to_quotes.rb

diff --git a/db/migrate/20180514024535_add_column_to_quotes.rb b/db/migrate/20180514024535_add_column_to_quotes.rb
new file mode 100644
index 0000000..34dc7f5
--- /dev/null
+++ b/db/migrate/20180514024535_add_column_to_quotes.rb
@@ -0,0 +1,5 @@
+class AddColumnToQuotes < ActiveRecord::Migration[5.2]
+  def change
+    add_column :quotes, :flagged, :boolean
+  end
+end

From 2ff56e2600bea80c37b3168e77644ef2bca504b7 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-Air.netgear.com>
Date: Sun, 13 May 2018 22:53:21 -0400
Subject: [PATCH 039/148] bootstrap dependencies

---
 app/assets/stylesheets/application.scss | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 app/assets/stylesheets/application.scss

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
new file mode 100644
index 0000000..f1784e0
--- /dev/null
+++ b/app/assets/stylesheets/application.scss
@@ -0,0 +1,16 @@
+/*
+ * 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
+ */
+@import "bootstrap";
\ No newline at end of file

From 51207525c0ee28f83f8d4525071dbdec4393bdc2 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-Air.netgear.com>
Date: Mon, 14 May 2018 10:41:12 -0400
Subject: [PATCH 040/148] layout

---
 app/assets/stylesheets/application.scss | 12 ++++-
 app/views/layouts/application.html.erb  | 64 +++++++++++++++++++------
 2 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index f1784e0..bf9c490 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -13,4 +13,14 @@
  *= require_tree .
  *= require_self
  */
-@import "bootstrap";
\ No newline at end of file
+@import "bootstrap";
+
+.inner {
+	width: 80%;
+}
+
+.navbar-custom {
+    color: #FFFFFF;
+    background-color: #336699;
+    width: 80%;
+}
\ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index dcbec34..02ad801 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -10,20 +10,54 @@
   </head>
 
   <body>
-    <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
-    <div class="container">
-      <div class="navbar-header">
-        <h1>QDB</h1>
-      </div>
-      <div id="navbar navbar-nav">
-        <%= link_to "Home", "/" %> /
-        <%= link_to "Latest", "/latest" %> /
-        <%= link_to "Browse", "/browse" %> /
-        <%= link_to "Random", "/random" %> <%= link_to ">0", "/random1" %> / 
-        <%= link_to "Top", "/top", :class => "navbar-brand" %> / 
-        <%= link_to "Add Quote", "/quotes/new" %> /
-        <%= link_to "Search", "/search" %>
-        # 
-    <%= yield %>
+    <header>
+      <nav class="navbar navbar-expand-md navbar-dark navbar-custom" role="navigation">
+        <div class="row">
+          <div class="navbar-brand col-4">
+            <a class="navbar-brand" href="#">RQDB</a>
+          </div>
+          <div class="navbar-brand col-8">&nbsp;</div>
+        </div>
+        <div class="row">
+          <div class="col-4">&nbsp;</div>          
+          <div class="navbar col-8">
+            <ul class="navbar-nav">
+              <li class="nav-item active">
+                <%= link_to "Home", "/" , class: 'nav-link' %> <span class="sr-only">(current)</span>
+              </li>
+              <li class="nav-item">
+                <%= link_to "Latest", "/latest", class: 'nav-link' %>
+              </li>
+              <li class="nav-item">
+                <%= link_to "Browse", "/browse", class: 'nav-link' %>     
+              </li>
+              <li class="nav-item">
+                <%= link_to "Random", "/random", class: 'nav-link' %> <%= link_to ">0", "/random1", class: 'nav-link' %>           
+              </li>
+              <li class="nav-item">
+                <%= link_to "Top", "/top", class: 'nav-link'  %>          
+              </li>
+              <li class="nav-item">
+                <%= link_to "Add Quote", "/quotes/new", class: 'nav-link' %>
+              </li>
+              <li class="nav-item">
+                <%= link_to "Search", "/search", class: 'nav-link' %>            
+              </li>
+              <li class="nav-item">
+                #
+              </li>
+            </ul>
+          </div>
+        </nav>
+      </header>
+      <main role="main" class="inner">
+        <div class="col-3">&nbsp; test</div>
+        <div class="col-6 inner">        
+          <%= yield %>
+        </div>
+        <div class="col-3">&nbsp;</div>
+      </main>
+    </div>    
+>>>>>>> Stashed changes
   </body>
 </html>

From a946568e446d7813b4914aea01700dbd6a589cbf Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-Air.netgear.com>
Date: Mon, 14 May 2018 10:54:40 -0400
Subject: [PATCH 041/148] layout

---
 app/assets/stylesheets/application.scss | 35 ++++++++++++++++++++++++-
 app/views/layouts/application.html.erb  | 14 +++++-----
 app/views/quotes/_show.html.erb         |  2 +-
 3 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index bf9c490..7622380 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -15,12 +15,45 @@
  */
 @import "bootstrap";
 
+body {
+	font-size: 10pt;
+	font-family: Veranda, sans-serif;
+	color: #000000;
+}
+
+a, a#admin_link, a:link, a:visited{
+	color: #336699;
+}
+a#admin_link:hover, a:hover, a:visited:hover{
+	color: #c08000;
+}
+
 .inner {
 	width: 80%;
 }
 
-.navbar-custom {
+.navbar-blue {
     color: #FFFFFF;
     background-color: #336699;
     width: 80%;
+}
+
+pre.quote_output{
+	font-family: "Courier New", Courier, monospace;
+	padding-bottom: 13pt;
+}
+
+.navbar-grey {
+	background-color: #f0f0f0;
+	text-align: right;
+	font-size: 10pt;
+	font-family: Veranda, sans-serif;
+	color: #000000;
+}
+
+a, a#admin_link, a:link, a:visited{
+	color: #336699;
+}
+a#admin_link:hover, a:hover, a:visited:hover{
+	color: #c08000;
 }
\ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 02ad801..309a031 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -11,14 +11,13 @@
 
   <body>
     <header>
-      <nav class="navbar navbar-expand-md navbar-dark navbar-custom" role="navigation">
-        <div class="row">
-          <div class="navbar-brand col-4">
-            <a class="navbar-brand" href="#">RQDB</a>
-          </div>
+      <div class="row navbar-blue container">
+        <h1><a href="#">RQDB</a></h1>
+      </div>
+      <nav class="navbar navbar-expand-md navbar-dark" role="navigation">
           <div class="navbar-brand col-8">&nbsp;</div>
         </div>
-        <div class="row">
+        <div class="row navbar-grey container">
           <div class="col-4">&nbsp;</div>          
           <div class="navbar col-8">
             <ul class="navbar-nav">
@@ -51,13 +50,12 @@
         </nav>
       </header>
       <main role="main" class="inner">
-        <div class="col-3">&nbsp; test</div>
+        <div class="col-3">&nbsp;</div>
         <div class="col-6 inner">        
           <%= yield %>
         </div>
         <div class="col-3">&nbsp;</div>
       </main>
     </div>    
->>>>>>> Stashed changes
   </body>
 </html>
diff --git a/app/views/quotes/_show.html.erb b/app/views/quotes/_show.html.erb
index 5904350..dbe7eae 100644
--- a/app/views/quotes/_show.html.erb
+++ b/app/views/quotes/_show.html.erb
@@ -6,6 +6,6 @@
 		<%= link_to 'Delete', quote, method: :delete, data: { confirm: 'Are you sure?' } %>
 	</p>
 	<p>
-		<pre><%= quote.text %></pre>
+		<pre class="quote_output"><%= quote.text %></pre>
 	</p>
 <% end %>
\ No newline at end of file

From 1b5d4b92409b5d4f09305dc8950bead115673e9b Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Mon, 14 May 2018 13:20:42 -0400
Subject: [PATCH 042/148] layout

---
 app/assets/stylesheets/application.scss |  21 +++--
 app/views/layouts/application.html.erb  | 109 ++++++++++++------------
 2 files changed, 63 insertions(+), 67 deletions(-)

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 7622380..f1a6421 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -28,14 +28,10 @@ a#admin_link:hover, a:hover, a:visited:hover{
 	color: #c08000;
 }
 
-.inner {
-	width: 80%;
-}
-
-.navbar-blue {
+div#title {
     color: #FFFFFF;
     background-color: #336699;
-    width: 80%;
+    width: 80%;    
 }
 
 pre.quote_output{
@@ -43,7 +39,7 @@ pre.quote_output{
 	padding-bottom: 13pt;
 }
 
-.navbar-grey {
+#navbar {
 	background-color: #f0f0f0;
 	text-align: right;
 	font-size: 10pt;
@@ -51,9 +47,12 @@ pre.quote_output{
 	color: #000000;
 }
 
-a, a#admin_link, a:link, a:visited{
-	color: #336699;
+h1 {
+	color: #fff;
+	font-size: 15pt;
+	font-style: italic;	
 }
-a#admin_link:hover, a:hover, a:visited:hover{
-	color: #c08000;
+
+.quotes {
+	text-align: left;
 }
\ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 309a031..3f2258d 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,61 +1,58 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <title>RQDB</title>
-    <%= csrf_meta_tags %>
-    <%= csp_meta_tag %>
+	<head>
+		<title>RQDB</title>
+		<%= csrf_meta_tags %>
+		<%= csp_meta_tag %>
 
-    <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
-    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
-  </head>
+		<%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
+		<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
+	</head>
 
-  <body>
-    <header>
-      <div class="row navbar-blue container">
-        <h1><a href="#">RQDB</a></h1>
-      </div>
-      <nav class="navbar navbar-expand-md navbar-dark" role="navigation">
-          <div class="navbar-brand col-8">&nbsp;</div>
-        </div>
-        <div class="row navbar-grey container">
-          <div class="col-4">&nbsp;</div>          
-          <div class="navbar col-8">
-            <ul class="navbar-nav">
-              <li class="nav-item active">
-                <%= link_to "Home", "/" , class: 'nav-link' %> <span class="sr-only">(current)</span>
-              </li>
-              <li class="nav-item">
-                <%= link_to "Latest", "/latest", class: 'nav-link' %>
-              </li>
-              <li class="nav-item">
-                <%= link_to "Browse", "/browse", class: 'nav-link' %>     
-              </li>
-              <li class="nav-item">
-                <%= link_to "Random", "/random", class: 'nav-link' %> <%= link_to ">0", "/random1", class: 'nav-link' %>           
-              </li>
-              <li class="nav-item">
-                <%= link_to "Top", "/top", class: 'nav-link'  %>          
-              </li>
-              <li class="nav-item">
-                <%= link_to "Add Quote", "/quotes/new", class: 'nav-link' %>
-              </li>
-              <li class="nav-item">
-                <%= link_to "Search", "/search", class: 'nav-link' %>            
-              </li>
-              <li class="nav-item">
-                #
-              </li>
-            </ul>
-          </div>
-        </nav>
-      </header>
-      <main role="main" class="inner">
-        <div class="col-3">&nbsp;</div>
-        <div class="col-6 inner">        
-          <%= yield %>
-        </div>
-        <div class="col-3">&nbsp;</div>
-      </main>
-    </div>    
-  </body>
+	<body>
+		<div class="container">
+			<div class="row col-md-8" id="title">
+				<h1>RQDB</h1>
+			</div>
+			<div class="row col-md-8 navbar-right" id="navbar">
+				<nav class="navbar navbar-expand-md navbar-right" role="navigation">
+					<ul class="navbar-nav navbar-right">
+						<li class="nav-item">
+							<%= link_to "Home", "/" , class: 'nav-link' %> <!--<span class="sr-only">(current)</span>-->
+						</li>
+						<li class="nav-item">
+							<%= link_to "Latest", "/latest", class: 'nav-link' %>
+						</li>
+						<li class="nav-item">
+							<%= link_to "Browse", "/browse", class: 'nav-link' %>
+						</li>
+						<li class="nav-item">
+							<div class="nav-link"
+								<%= link_to "Random", "/random" %> <%= link_to ">0", "/random1" %>
+							</div>
+						</li>
+						<li class="nav-item">
+							<%= link_to "Top", "/top", class: 'nav-link'  %>
+						</li>
+						<li class="nav-item">
+							<%= link_to "Add Quote", "/quotes/new", class: 'nav-link' %>
+						</li>
+						<li class="nav-item">
+							<%= link_to "Search", "/search", class: 'nav-link' %>
+						</li>
+						<li class="nav-item">
+							#
+						</li>
+					</ul>
+				</nav>
+			</div>
+			<div class="container">
+				<div class="col-6 quotes">
+					<br />
+					<%= yield %>
+				</div>
+				<div class="col-3">&nbsp;</div>
+			</div>
+		</div>    
+	</body>
 </html>

From 5d31124a51e8207386f8f3500abcc41c4b64db29 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Mon, 14 May 2018 13:42:51 -0400
Subject: [PATCH 043/148] layout

---
 app/assets/stylesheets/application.scss |  7 ++--
 app/views/layouts/application.html.erb  | 45 ++++---------------------
 2 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index f1a6421..eb0f3ed 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -28,10 +28,13 @@ a#admin_link:hover, a:hover, a:visited:hover{
 	color: #c08000;
 }
 
-div#title {
+#title, #versionbar {
     color: #FFFFFF;
     background-color: #336699;
-    width: 80%;    
+}
+
+#versionbar {
+	text-align: right;
 }
 
 pre.quote_output{
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 3f2258d..67af692 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -14,45 +14,14 @@
 			<div class="row col-md-8" id="title">
 				<h1>RQDB</h1>
 			</div>
-			<div class="row col-md-8 navbar-right" id="navbar">
-				<nav class="navbar navbar-expand-md navbar-right" role="navigation">
-					<ul class="navbar-nav navbar-right">
-						<li class="nav-item">
-							<%= link_to "Home", "/" , class: 'nav-link' %> <!--<span class="sr-only">(current)</span>-->
-						</li>
-						<li class="nav-item">
-							<%= link_to "Latest", "/latest", class: 'nav-link' %>
-						</li>
-						<li class="nav-item">
-							<%= link_to "Browse", "/browse", class: 'nav-link' %>
-						</li>
-						<li class="nav-item">
-							<div class="nav-link"
-								<%= link_to "Random", "/random" %> <%= link_to ">0", "/random1" %>
-							</div>
-						</li>
-						<li class="nav-item">
-							<%= link_to "Top", "/top", class: 'nav-link'  %>
-						</li>
-						<li class="nav-item">
-							<%= link_to "Add Quote", "/quotes/new", class: 'nav-link' %>
-						</li>
-						<li class="nav-item">
-							<%= link_to "Search", "/search", class: 'nav-link' %>
-						</li>
-						<li class="nav-item">
-							#
-						</li>
-					</ul>
-				</nav>
+			<%= render 'quotes/navbar' %>
+			<div class="col-md-8 quotes">
+				<%= yield %>
 			</div>
-			<div class="container">
-				<div class="col-6 quotes">
-					<br />
-					<%= yield %>
-				</div>
-				<div class="col-3">&nbsp;</div>
+			<%= render 'quotes/navbar' %>
+			<div class="row col-md-8" id="versionbar">
+				RQDB Version: pre-alpha
 			</div>
-		</div>    
+		</div>
 	</body>
 </html>

From d819fdb290000c3a2f5eb3b4d9062a5e0f4e103a Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Tue, 15 May 2018 11:48:09 -0400
Subject: [PATCH 044/148] layout/pagination

---
 app/assets/stylesheets/application.scss |  1 +
 app/views/layouts/application.html.erb  | 16 ++++++++++-
 app/views/quotes/_navbar.html.erb       | 37 +++++++++++++++++++++++++
 app/views/quotes/_show.html.erb         | 17 ++++--------
 app/views/quotes/index.html.erb         |  6 ++--
 app/views/quotes/latest.html.erb        |  6 +++-
 app/views/quotes/top.html.erb           |  6 ++--
 config/initializers/kaminari_config.rb  |  2 +-
 8 files changed, 71 insertions(+), 20 deletions(-)
 create mode 100644 app/views/quotes/_navbar.html.erb

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index eb0f3ed..e08573c 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -19,6 +19,7 @@ body {
 	font-size: 10pt;
 	font-family: Veranda, sans-serif;
 	color: #000000;
+	align: center;
 }
 
 a, a#admin_link, a:link, a:visited{
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 67af692..025ca64 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -10,18 +10,32 @@
 	</head>
 
 	<body>
-		<div class="container">
+		<div class="row container">
+			<div class="col-md-2"></div>
 			<div class="row col-md-8" id="title">
 				<h1>RQDB</h1>
 			</div>
+			<div class="col-md-2"></div>			
+		</div>
+		<div class="row container">
 			<%= render 'quotes/navbar' %>
+		</div>
+		<div class="row container">
+			<div class="col-md-2"></div>			
 			<div class="col-md-8 quotes">
 				<%= yield %>
 			</div>
+			<div class="col-md-2"></div>			
+		</div>
+		<div class="row container">
 			<%= render 'quotes/navbar' %>
+		</div>
+		<div class="row container">
+			<div class="col-md-2"></div>						
 			<div class="row col-md-8" id="versionbar">
 				RQDB Version: pre-alpha
 			</div>
+			<div class="col-md-2"></div>
 		</div>
 	</body>
 </html>
diff --git a/app/views/quotes/_navbar.html.erb b/app/views/quotes/_navbar.html.erb
new file mode 100644
index 0000000..f25dc48
--- /dev/null
+++ b/app/views/quotes/_navbar.html.erb
@@ -0,0 +1,37 @@
+<div class="col-md-2"></div>			
+<div class="row col-md-8" id="navbar">
+	<div class="col-3">&nbsp;</div>
+	<div class="col-9">
+		<nav class="navbar navbar-expand-md navbar-right" role="navigation">
+			<ul class="navbar-nav">
+				<li class="nav-item">
+					<%= link_to "Home", "/" , class: 'nav-link' %> <!--<span class="sr-only">(current)</span>-->
+				</li>
+				<li class="nav-item">
+					<%= link_to "Latest", "/latest", class: 'nav-link' %>
+				</li>
+				<li class="nav-item">
+					<%= link_to "Browse", "/browse", class: 'nav-link' %>
+				</li>
+				<li class="nav-item">
+					<div class="nav-link"
+						<%= link_to "Random", "/random" %> <%= link_to ">0", "/random1" %>
+					</div>
+				</li>
+				<li class="nav-item">
+					<%= link_to "Top", "/top", class: 'nav-link'  %>
+				</li>
+				<li class="nav-item">
+					<%= link_to "Add Quote", "/quotes/new", class: 'nav-link' %>
+				</li>
+				<li class="nav-item">
+					<%= link_to "Search", "/search", class: 'nav-link' %>
+				</li>
+				<li class="nav-item">
+					#
+				</li>
+			</ul>
+		</nav>
+	</div>
+</div>
+<div class="col-md-2"></div>
\ No newline at end of file
diff --git a/app/views/quotes/_show.html.erb b/app/views/quotes/_show.html.erb
index dbe7eae..d4385f0 100644
--- a/app/views/quotes/_show.html.erb
+++ b/app/views/quotes/_show.html.erb
@@ -1,11 +1,6 @@
-<% @quotes.each do |quote| %>
-	<p>
-		<strong><%= link_to "##{quote.id}", quote %></strong>
-		<a href="/quotes/<%= quote.id %>/upvote">+</a>(<%= quote.score %>)<a href="/quotes/<%= quote.id %>/downvote">-</a>
-		[X]
-		<%= link_to 'Delete', quote, method: :delete, data: { confirm: 'Are you sure?' } %>
-	</p>
-	<p>
-		<pre class="quote_output"><%= quote.text %></pre>
-	</p>
-<% end %>
\ No newline at end of file
+<strong><%= link_to "##{quote.id}", quote %></strong>
+<a href="/quotes/<%= quote.id %>/upvote">+</a>(<%= quote.score %>)<a href="/quotes/<%= quote.id %>/downvote">-</a>
+[X]
+<%= link_to 'Delete', quote, method: :delete, data: { confirm: 'Are you sure?' } %>
+<br />
+<pre class="quote_output"><%= quote.text %></pre>
diff --git a/app/views/quotes/index.html.erb b/app/views/quotes/index.html.erb
index 9caf38c..3095a0f 100644
--- a/app/views/quotes/index.html.erb
+++ b/app/views/quotes/index.html.erb
@@ -1,5 +1,5 @@
 <p id="notice"><%= notice %></p>
 <%= paginate(@quotes) %>
-<% @quotes.each do |quote| %>
-<%= render 'quotes/show' %>
-<% end %>
+<% @quotes.each do |quote| -%>
+<%= render 'quotes/show', :quote => quote %>
+<% end -%>
\ No newline at end of file
diff --git a/app/views/quotes/latest.html.erb b/app/views/quotes/latest.html.erb
index 8179946..3095a0f 100644
--- a/app/views/quotes/latest.html.erb
+++ b/app/views/quotes/latest.html.erb
@@ -1 +1,5 @@
-<%= render 'quotes/show' %>
\ No newline at end of file
+<p id="notice"><%= notice %></p>
+<%= paginate(@quotes) %>
+<% @quotes.each do |quote| -%>
+<%= render 'quotes/show', :quote => quote %>
+<% end -%>
\ No newline at end of file
diff --git a/app/views/quotes/top.html.erb b/app/views/quotes/top.html.erb
index 9caf38c..3095a0f 100644
--- a/app/views/quotes/top.html.erb
+++ b/app/views/quotes/top.html.erb
@@ -1,5 +1,5 @@
 <p id="notice"><%= notice %></p>
 <%= paginate(@quotes) %>
-<% @quotes.each do |quote| %>
-<%= render 'quotes/show' %>
-<% end %>
+<% @quotes.each do |quote| -%>
+<%= render 'quotes/show', :quote => quote %>
+<% end -%>
\ No newline at end of file
diff --git a/config/initializers/kaminari_config.rb b/config/initializers/kaminari_config.rb
index c808667..f97fc45 100644
--- a/config/initializers/kaminari_config.rb
+++ b/config/initializers/kaminari_config.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 Kaminari.configure do |config|
-  # config.default_per_page = 25
+  config.default_per_page = 15
   # config.max_per_page = nil
   # config.window = 4
   # config.outer_window = 0

From eceb0304d535bc92a3e069893f7db0a071ec3041 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Tue, 15 May 2018 11:51:25 -0400
Subject: [PATCH 045/148] pretty bootstrap pagination

---
 app/views/kaminari/_first_page.html.erb |  3 +++
 app/views/kaminari/_gap.html.erb        |  3 +++
 app/views/kaminari/_last_page.html.erb  |  3 +++
 app/views/kaminari/_next_page.html.erb  |  3 +++
 app/views/kaminari/_page.html.erb       |  9 +++++++++
 app/views/kaminari/_paginator.html.erb  | 17 +++++++++++++++++
 app/views/kaminari/_prev_page.html.erb  |  3 +++
 7 files changed, 41 insertions(+)
 create mode 100644 app/views/kaminari/_first_page.html.erb
 create mode 100644 app/views/kaminari/_gap.html.erb
 create mode 100644 app/views/kaminari/_last_page.html.erb
 create mode 100644 app/views/kaminari/_next_page.html.erb
 create mode 100644 app/views/kaminari/_page.html.erb
 create mode 100644 app/views/kaminari/_paginator.html.erb
 create mode 100644 app/views/kaminari/_prev_page.html.erb

diff --git a/app/views/kaminari/_first_page.html.erb b/app/views/kaminari/_first_page.html.erb
new file mode 100644
index 0000000..cc107ec
--- /dev/null
+++ b/app/views/kaminari/_first_page.html.erb
@@ -0,0 +1,3 @@
+<li class="page-item">
+  <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, remote: remote, class: 'page-link' %>
+</li>
diff --git a/app/views/kaminari/_gap.html.erb b/app/views/kaminari/_gap.html.erb
new file mode 100644
index 0000000..d241fc4
--- /dev/null
+++ b/app/views/kaminari/_gap.html.erb
@@ -0,0 +1,3 @@
+<li class='page-item disabled'>
+  <%= link_to raw(t 'views.pagination.truncate'), '#', class: 'page-link' %>
+</li>
diff --git a/app/views/kaminari/_last_page.html.erb b/app/views/kaminari/_last_page.html.erb
new file mode 100644
index 0000000..9a7584e
--- /dev/null
+++ b/app/views/kaminari/_last_page.html.erb
@@ -0,0 +1,3 @@
+<li class="page-item">
+  <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, remote: remote, class: 'page-link' %>
+</li>
diff --git a/app/views/kaminari/_next_page.html.erb b/app/views/kaminari/_next_page.html.erb
new file mode 100644
index 0000000..7ca72a8
--- /dev/null
+++ b/app/views/kaminari/_next_page.html.erb
@@ -0,0 +1,3 @@
+<li class="page-item">
+  <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, rel: 'next', remote: remote, class: 'page-link' %>
+</li>
diff --git a/app/views/kaminari/_page.html.erb b/app/views/kaminari/_page.html.erb
new file mode 100644
index 0000000..c8f03f2
--- /dev/null
+++ b/app/views/kaminari/_page.html.erb
@@ -0,0 +1,9 @@
+<% if page.current? %>
+  <li class="page-item active">
+    <%= content_tag :a, page, data: { remote: remote }, rel: (page.next? ? 'next' : (page.prev? ? 'prev' : nil)), class: 'page-link' %>
+  </li>
+<% else %>
+  <li class="page-item">
+    <%= link_to page, url, remote: remote, rel: (page.next? ? 'next' : (page.prev? ? 'prev' : nil)), class: 'page-link' %>
+  </li>
+<% end %>
diff --git a/app/views/kaminari/_paginator.html.erb b/app/views/kaminari/_paginator.html.erb
new file mode 100644
index 0000000..bb5ed0f
--- /dev/null
+++ b/app/views/kaminari/_paginator.html.erb
@@ -0,0 +1,17 @@
+<%= paginator.render do %>
+  <nav>
+    <ul class="pagination">
+      <%= first_page_tag unless current_page.first? %>
+      <%= prev_page_tag unless current_page.first? %>
+      <% each_page do |page| %>
+        <% if page.left_outer? || page.right_outer? || page.inside_window? %>
+          <%= page_tag page %>
+        <% elsif !page.was_truncated? -%>
+          <%= gap_tag %>
+        <% end %>
+      <% end %>
+      <%= next_page_tag unless current_page.last? %>
+      <%= last_page_tag unless current_page.last? %>
+    </ul>
+  </nav>
+<% end %>
diff --git a/app/views/kaminari/_prev_page.html.erb b/app/views/kaminari/_prev_page.html.erb
new file mode 100644
index 0000000..c7803fa
--- /dev/null
+++ b/app/views/kaminari/_prev_page.html.erb
@@ -0,0 +1,3 @@
+<li class="page-item">
+  <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, rel: 'prev', remote: remote, class: 'page-link' %>
+</li>

From d08ef5783da2c65db5a837ce639542e1e708fc1a Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Tue, 15 May 2018 12:07:42 -0400
Subject: [PATCH 046/148] links

---
 app/controllers/quotes_controller.rb | 16 ++++++++++++++++
 app/views/quotes/_show.html.erb      |  6 +++---
 app/views/quotes/show.html.erb       |  5 +++--
 config/routes.rb                     |  2 ++
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 53dee6b..d62dacc 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -45,6 +45,22 @@ def upvote
     end
   end
 
+  # GET /quotes/1/flag
+  # POST /quotes/1/flag
+  def flag
+    @quote = Quote.find(params[:id])
+    @quote.update(flagged: true)
+    respond_to do |format|
+      if @quote.save
+        format.html { redirect_to @quote, notice: 'Quote was successfully flagged.' }
+        format.json { render :show, status: :ok, location: @quote }
+      else
+        format.html { render :edit }
+        format.json { render json: @quote.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
   # GET /quotes/new
   def new
     @quote = Quote.new
diff --git a/app/views/quotes/_show.html.erb b/app/views/quotes/_show.html.erb
index d4385f0..769d48b 100644
--- a/app/views/quotes/_show.html.erb
+++ b/app/views/quotes/_show.html.erb
@@ -1,6 +1,6 @@
 <strong><%= link_to "##{quote.id}", quote %></strong>
-<a href="/quotes/<%= quote.id %>/upvote">+</a>(<%= quote.score %>)<a href="/quotes/<%= quote.id %>/downvote">-</a>
-[X]
-<%= link_to 'Delete', quote, method: :delete, data: { confirm: 'Are you sure?' } %>
+<%= link_to '+', "/quotes/#{quote.id}/upvote", method: :get, data: { confirm: 'Are you sure you want to upvote?' } %>(<%= quote.score %>)<%= link_to '-', "/quotes/#{quote.id}/downvote", method: :get, data: { confirm: 'Are you sure you want to downvote?' } %>
+<%= link_to '[X]', "/quotes/#{quote.id}/flag", method: :get, data: { confirm: 'Are you sure you want to flag this quote for review?' } %>
+<%= link_to 'Delete', quote, method: :delete, data: { confirm: 'Are you sure you want to delete this quote?' } %>
 <br />
 <pre class="quote_output"><%= quote.text %></pre>
diff --git a/app/views/quotes/show.html.erb b/app/views/quotes/show.html.erb
index caa8e59..09be518 100644
--- a/app/views/quotes/show.html.erb
+++ b/app/views/quotes/show.html.erb
@@ -1,3 +1,4 @@
-<% quote = @quote %>
 <p id="notice"><%= notice %></p>
-<%= render 'quotes/show' %>
\ No newline at end of file
+<% @quotes.each do |quote| -%>
+<%= render 'quotes/show', :quote => quote %>
+<% end -%>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 0ff2de3..54e7dca 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -17,6 +17,8 @@
       post :downvote
       get :upvote
       post :upvote
+      get :flag
+      post :flag
     end
   end
 

From 72e7827a901190d5e94b3442054b165b1468859b Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Tue, 15 May 2018 12:09:28 -0400
Subject: [PATCH 047/148] fix randoms

---
 app/views/quotes/random.html.erb  | 4 +++-
 app/views/quotes/random1.html.erb | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/views/quotes/random.html.erb b/app/views/quotes/random.html.erb
index d2dc89c..09be518 100644
--- a/app/views/quotes/random.html.erb
+++ b/app/views/quotes/random.html.erb
@@ -1,2 +1,4 @@
 <p id="notice"><%= notice %></p>
-<%= render 'quotes/show' %>
+<% @quotes.each do |quote| -%>
+<%= render 'quotes/show', :quote => quote %>
+<% end -%>
\ No newline at end of file
diff --git a/app/views/quotes/random1.html.erb b/app/views/quotes/random1.html.erb
index d2dc89c..09be518 100644
--- a/app/views/quotes/random1.html.erb
+++ b/app/views/quotes/random1.html.erb
@@ -1,2 +1,4 @@
 <p id="notice"><%= notice %></p>
-<%= render 'quotes/show' %>
+<% @quotes.each do |quote| -%>
+<%= render 'quotes/show', :quote => quote %>
+<% end -%>
\ No newline at end of file

From 5975a453a9cb77fe0008916897cabc416a747388 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-Air.frontierlocal.net>
Date: Tue, 15 May 2018 12:29:39 -0400
Subject: [PATCH 048/148] layout

---
 app/assets/stylesheets/application.scss |  3 +-
 app/views/layouts/application.html.erb  | 49 +++++++++---------
 app/views/quotes/_navbar.html.erb       | 69 ++++++++++++-------------
 3 files changed, 60 insertions(+), 61 deletions(-)

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index e08573c..bb935af 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -43,12 +43,13 @@ pre.quote_output{
 	padding-bottom: 13pt;
 }
 
-#navbar {
+.navbar, #navbar {
 	background-color: #f0f0f0;
 	text-align: right;
 	font-size: 10pt;
 	font-family: Veranda, sans-serif;
 	color: #000000;
+	float: right;
 }
 
 h1 {
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 025ca64..0b40c14 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -10,32 +10,33 @@
 	</head>
 
 	<body>
-		<div class="row container">
-			<div class="col-md-2"></div>
-			<div class="row col-md-8" id="title">
-				<h1>RQDB</h1>
+		<div class="container">
+			<div class="row">
+				<div class="col-md-1"></div>
+				<div class="col-md-10" id="title">
+					<h1>RQDB</h1>
+				</div>
+				<div class="col-md-1"></div>			
 			</div>
-			<div class="col-md-2"></div>			
-		</div>
-		<div class="row container">
-			<%= render 'quotes/navbar' %>
-		</div>
-		<div class="row container">
-			<div class="col-md-2"></div>			
-			<div class="col-md-8 quotes">
-				<%= yield %>
+			<div class="row">
+				<%= render 'quotes/navbar' %>
 			</div>
-			<div class="col-md-2"></div>			
-		</div>
-		<div class="row container">
-			<%= render 'quotes/navbar' %>
-		</div>
-		<div class="row container">
-			<div class="col-md-2"></div>						
-			<div class="row col-md-8" id="versionbar">
-				RQDB Version: pre-alpha
+			<div class="row">
+				<div class="col-md-1"></div>			
+				<div class="col-md-10 quotes">
+					<%= yield %>
+				</div>
+				<div class="col-md-1"></div>			
+			</div>
+			<div class="row">
+				<%= render 'quotes/navbar' %>
+			</div>
+			<div class="row">
+				<div class="col-md-1"></div>						
+				<div class="col-md-10" id="versionbar">
+					RQDB Version: pre-alpha
+				</div>
+				<div class="col-md-1"></div>
 			</div>
-			<div class="col-md-2"></div>
-		</div>
 	</body>
 </html>
diff --git a/app/views/quotes/_navbar.html.erb b/app/views/quotes/_navbar.html.erb
index f25dc48..dea1194 100644
--- a/app/views/quotes/_navbar.html.erb
+++ b/app/views/quotes/_navbar.html.erb
@@ -1,37 +1,34 @@
-<div class="col-md-2"></div>			
-<div class="row col-md-8" id="navbar">
-	<div class="col-3">&nbsp;</div>
-	<div class="col-9">
-		<nav class="navbar navbar-expand-md navbar-right" role="navigation">
-			<ul class="navbar-nav">
-				<li class="nav-item">
-					<%= link_to "Home", "/" , class: 'nav-link' %> <!--<span class="sr-only">(current)</span>-->
-				</li>
-				<li class="nav-item">
-					<%= link_to "Latest", "/latest", class: 'nav-link' %>
-				</li>
-				<li class="nav-item">
-					<%= link_to "Browse", "/browse", class: 'nav-link' %>
-				</li>
-				<li class="nav-item">
-					<div class="nav-link"
-						<%= link_to "Random", "/random" %> <%= link_to ">0", "/random1" %>
-					</div>
-				</li>
-				<li class="nav-item">
-					<%= link_to "Top", "/top", class: 'nav-link'  %>
-				</li>
-				<li class="nav-item">
-					<%= link_to "Add Quote", "/quotes/new", class: 'nav-link' %>
-				</li>
-				<li class="nav-item">
-					<%= link_to "Search", "/search", class: 'nav-link' %>
-				</li>
-				<li class="nav-item">
-					#
-				</li>
-			</ul>
-		</nav>
-	</div>
+<div class="col-md-1"></div>			
+<div class="col-md-10" id="navbar">
+	<nav class="navbar navbar-expand-md navbar-right" role="navigation">
+		<ul class="navbar-nav">
+			<li class="nav-item">
+				<%= link_to "Home", "/" , class: 'nav-link' %> <!--<span class="sr-only">(current)</span>-->
+			</li>
+			<li class="nav-item">
+				<%= link_to "Latest", "/latest", class: 'nav-link' %>
+			</li>
+			<li class="nav-item">
+				<%= link_to "Browse", "/browse", class: 'nav-link' %>
+			</li>
+			<li class="nav-item">
+				<div class="nav-link"
+					<%= link_to "Random", "/random" %> <%= link_to ">0", "/random1" %>
+				</div>
+			</li>
+			<li class="nav-item">
+				<%= link_to "Top", "/top", class: 'nav-link'  %>
+			</li>
+			<li class="nav-item">
+				<%= link_to "Add Quote", "/quotes/new", class: 'nav-link' %>
+			</li>
+			<li class="nav-item">
+				<%= link_to "Search", "/search", class: 'nav-link' %>
+			</li>
+			<li class="nav-item">
+				#
+			</li>
+		</ul>
+	</nav>
 </div>
-<div class="col-md-2"></div>
\ No newline at end of file
+<div class="col-md-1"></div>
\ No newline at end of file

From 1ba0fdb12ad7a3ea29ccfb6c0fd69d0ff742b939 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-Air.frontierlocal.net>
Date: Tue, 15 May 2018 12:30:42 -0400
Subject: [PATCH 049/148] layout

---
 app/views/quotes/_navbar.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/quotes/_navbar.html.erb b/app/views/quotes/_navbar.html.erb
index dea1194..2df3072 100644
--- a/app/views/quotes/_navbar.html.erb
+++ b/app/views/quotes/_navbar.html.erb
@@ -25,7 +25,7 @@
 			<li class="nav-item">
 				<%= link_to "Search", "/search", class: 'nav-link' %>
 			</li>
-			<li class="nav-item">
+			<li class="nav-item navbar-text">
 				#
 			</li>
 		</ul>

From 09e435a745bdc842f8970e0b65a63932cd6b9996 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-Air.frontierlocal.net>
Date: Tue, 15 May 2018 12:58:44 -0400
Subject: [PATCH 050/148] search

---
 app/assets/stylesheets/application.scss | 18 +++++++++++++++++-
 app/controllers/quotes_controller.rb    |  5 +++++
 app/views/quotes/_navbar.html.erb       |  6 ++++--
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index bb935af..d1746ce 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -50,8 +50,12 @@ pre.quote_output{
 	font-family: Veranda, sans-serif;
 	color: #000000;
 	float: right;
+	padding-bottom: 1px;	
+	padding-top: 1px;
+	max-height: 15pt;
 }
 
+
 h1 {
 	color: #fff;
 	font-size: 15pt;
@@ -60,4 +64,16 @@ h1 {
 
 .quotes {
 	text-align: left;
-}
\ No newline at end of file
+}
+
+.pagination > li > a:active,
+.pagination > li > a:focus,
+.pagination > li > a:hover,
+.pagination > li > span:active,
+.pagination > li > span:focus,
+.pagination > li > span:hover {
+    z-index: 3;
+    color: #23527c;
+    background-color: #336699;
+    border-color: #ddd;
+}
diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index d62dacc..e33decf 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -110,6 +110,11 @@ def random1
     end
   end
 
+  # GET /search
+  # GET /search.json
+  def search
+    @quote = Quote.find(params[:quote_id])
+  end
 
   # POST /quotes
   # POST /quotes.json
diff --git a/app/views/quotes/_navbar.html.erb b/app/views/quotes/_navbar.html.erb
index 2df3072..04e77a3 100644
--- a/app/views/quotes/_navbar.html.erb
+++ b/app/views/quotes/_navbar.html.erb
@@ -12,7 +12,7 @@
 				<%= link_to "Browse", "/browse", class: 'nav-link' %>
 			</li>
 			<li class="nav-item">
-				<div class="nav-link"
+				<div class="nav-link">
 					<%= link_to "Random", "/random" %> <%= link_to ">0", "/random1" %>
 				</div>
 			</li>
@@ -26,7 +26,9 @@
 				<%= link_to "Search", "/search", class: 'nav-link' %>
 			</li>
 			<li class="nav-item navbar-text">
-				#
+				<%= form_tag("/search", method: "get") do %>
+					<%= text_field_tag(:quote_id) %>
+				<% end %>
 			</li>
 		</ul>
 	</nav>

From acf764571678531bf8955b67fd067138a5742b09 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@Bens-MacBook-Air.local>
Date: Tue, 15 May 2018 14:52:40 -0400
Subject: [PATCH 051/148] search

---
 app/assets/stylesheets/application.scss | 3 ++-
 app/views/quotes/_navbar.html.erb       | 8 ++++----
 app/views/quotes/search.html.erb        | 2 ++
 3 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 app/views/quotes/search.html.erb

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index d1746ce..a98debd 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -52,7 +52,7 @@ pre.quote_output{
 	float: right;
 	padding-bottom: 1px;	
 	padding-top: 1px;
-	max-height: 15pt;
+	max-height: 19pt;
 }
 
 
@@ -77,3 +77,4 @@ h1 {
     background-color: #336699;
     border-color: #ddd;
 }
+
diff --git a/app/views/quotes/_navbar.html.erb b/app/views/quotes/_navbar.html.erb
index 04e77a3..5d8ea08 100644
--- a/app/views/quotes/_navbar.html.erb
+++ b/app/views/quotes/_navbar.html.erb
@@ -25,10 +25,10 @@
 			<li class="nav-item">
 				<%= link_to "Search", "/search", class: 'nav-link' %>
 			</li>
-			<li class="nav-item navbar-text">
-				<%= form_tag("/search", method: "get") do %>
-					<%= text_field_tag(:quote_id) %>
-				<% end %>
+			<li class="nav-item">
+			  <div class="form-group">
+					#<%= form_tag("/search", method: "get") do %><%= text_field_tag(:quote_id, nil, size: 1, class: "form-control input-sm") %><% end %>
+				</div>
 			</li>
 		</ul>
 	</nav>
diff --git a/app/views/quotes/search.html.erb b/app/views/quotes/search.html.erb
new file mode 100644
index 0000000..3c2b4d9
--- /dev/null
+++ b/app/views/quotes/search.html.erb
@@ -0,0 +1,2 @@
+<p id="notice"><%= notice %></p>
+<%= render 'quotes/show', :quote => @quote %>
\ No newline at end of file

From 2321b6f1ee3b218d021d1123b6087bb0be78cdfb Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Wed, 16 May 2018 18:00:49 -0400
Subject: [PATCH 052/148] devise

---
 .gitignore                                    |  30 ++
 .ruby-version                                 |   1 +
 Gemfile                                       |  72 +++++
 Gemfile.lock                                  | 258 ++++++++++++++++
 README.md                                     |  12 +-
 Rakefile                                      |   6 +
 app/assets/config/manifest.js                 |   3 +
 app/assets/images/.keep                       |   0
 app/assets/javascripts/application.js         |  19 ++
 app/assets/javascripts/cable.js               |  13 +
 app/assets/javascripts/channels/.keep         |   0
 app/assets/javascripts/quotes.coffee          |   3 +
 app/assets/stylesheets/application.scss       |  84 ++++++
 app/assets/stylesheets/quotes.scss            |   3 +
 app/channels/application_cable/channel.rb     |   4 +
 app/channels/application_cable/connection.rb  |   4 +
 app/controllers/admin_controller.rb           |  29 ++
 app/controllers/application_controller.rb     |   2 +
 app/controllers/concerns/.keep                |   0
 app/controllers/quotes_controller.rb          | 193 ++++++++++++
 .../users/confirmations_controller.rb         |  30 ++
 .../users/omniauth_callbacks_controller.rb    |  30 ++
 app/controllers/users/passwords_controller.rb |  34 +++
 .../users/registrations_controller.rb         |  62 ++++
 app/controllers/users/sessions_controller.rb  |  27 ++
 app/controllers/users/unlocks_controller.rb   |  30 ++
 app/helpers/application_helper.rb             |   2 +
 app/helpers/quotes_helper.rb                  |   2 +
 app/jobs/application_job.rb                   |   2 +
 app/mailers/application_mailer.rb             |   4 +
 app/models/application_record.rb              |   4 +
 app/models/concerns/.keep                     |   0
 app/models/quote.rb                           |   2 +
 app/models/user.rb                            |   6 +
 app/views/admin/_navbar.html.erb              |  19 ++
 app/views/admin/flagged.html.erb              |   4 +
 app/views/admin/index.html.erb                |   4 +
 app/views/admin/submitted.html.erb            |   4 +
 app/views/kaminari/_first_page.html.erb       |   3 +
 app/views/kaminari/_gap.html.erb              |   3 +
 app/views/kaminari/_last_page.html.erb        |   3 +
 app/views/kaminari/_next_page.html.erb        |   3 +
 app/views/kaminari/_page.html.erb             |   9 +
 app/views/kaminari/_paginator.html.erb        |  17 ++
 app/views/kaminari/_prev_page.html.erb        |   3 +
 app/views/layouts/_navbar.html.erb            |  35 +++
 app/views/layouts/application.html.erb        |  48 +++
 app/views/layouts/mailer.html.erb             |  13 +
 app/views/layouts/mailer.text.erb             |   1 +
 app/views/quotes/_form.html.erb               |  22 ++
 app/views/quotes/_quote.json.jbuilder         |   2 +
 app/views/quotes/_show.html.erb               |  15 +
 app/views/quotes/index.html.erb               |   4 +
 app/views/quotes/index.json.jbuilder          |   1 +
 app/views/quotes/latest.html.erb              |   4 +
 app/views/quotes/new.html.erb                 |   5 +
 app/views/quotes/random.html.erb              |   3 +
 app/views/quotes/random1.html.erb             |   3 +
 app/views/quotes/search.html.erb              |   1 +
 app/views/quotes/show.html.erb                |   3 +
 app/views/quotes/show.json.jbuilder           |   1 +
 app/views/quotes/top.html.erb                 |   4 +
 app/views/users/confirmations/new.html.erb    |  16 +
 .../mailer/confirmation_instructions.html.erb |   5 +
 app/views/users/mailer/email_changed.html.erb |   7 +
 .../users/mailer/password_change.html.erb     |   3 +
 .../reset_password_instructions.html.erb      |   8 +
 .../users/mailer/unlock_instructions.html.erb |   7 +
 app/views/users/passwords/edit.html.erb       |  25 ++
 app/views/users/passwords/new.html.erb        |  16 +
 app/views/users/registrations/edit.html.erb   |  43 +++
 app/views/users/registrations/new.html.erb    |  29 ++
 app/views/users/sessions/new.html.erb         |  26 ++
 app/views/users/shared/_links.html.erb        |  25 ++
 app/views/users/unlocks/new.html.erb          |  16 +
 bin/bundle                                    |   3 +
 bin/rails                                     |   9 +
 bin/rake                                      |   9 +
 bin/setup                                     |  36 +++
 bin/spring                                    |  17 ++
 bin/update                                    |  31 ++
 bin/yarn                                      |  11 +
 config.ru                                     |   5 +
 config/application.rb                         |  19 ++
 config/boot.rb                                |   4 +
 config/cable.yml                              |  10 +
 config/credentials.yml.enc                    |   1 +
 config/database.yml                           |  25 ++
 config/environment.rb                         |   5 +
 config/environments/development.rb            |  64 ++++
 config/environments/production.rb             |  97 ++++++
 config/environments/test.rb                   |  46 +++
 .../application_controller_renderer.rb        |   8 +
 config/initializers/assets.rb                 |  14 +
 config/initializers/backtrace_silencers.rb    |   7 +
 .../initializers/content_security_policy.rb   |  25 ++
 config/initializers/cookies_serializer.rb     |   5 +
 config/initializers/devise.rb                 | 284 ++++++++++++++++++
 .../initializers/filter_parameter_logging.rb  |   4 +
 config/initializers/inflections.rb            |  16 +
 config/initializers/kaminari_config.rb        |  12 +
 config/initializers/mime_types.rb             |   4 +
 config/initializers/wrap_parameters.rb        |  14 +
 config/locales/devise.en.yml                  |  64 ++++
 config/locales/en.yml                         |  33 ++
 config/puma.rb                                |  34 +++
 config/routes.rb                              |  35 +++
 config/spring.rb                              |   6 +
 config/storage.yml                            |  34 +++
 db/migrate/20180512222706_create_quotes.rb    |  11 +
 .../20180514024535_add_column_to_quotes.rb    |   5 +
 .../20180515193424_devise_create_users.rb     |  44 +++
 db/schema.rb                                  |  41 +++
 db/seeds.rb                                   |  74 +++++
 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/controllers/quotes_controller_test.rb    |  48 +++
 test/fixtures/.keep                           |   0
 test/fixtures/files/.keep                     |   0
 test/fixtures/quotes.yml                      |   9 +
 test/fixtures/users.yml                       |  11 +
 test/helpers/.keep                            |   0
 test/integration/.keep                        |   0
 test/mailers/.keep                            |   0
 test/models/.keep                             |   0
 test/models/quote_test.rb                     |   7 +
 test/models/user_test.rb                      |   7 +
 test/system/.keep                             |   0
 test/system/quotes_test.rb                    |  45 +++
 test/test_helper.rb                           |  10 +
 tmp/.keep                                     |   0
 vendor/.keep                                  |   0
 143 files changed, 2946 insertions(+), 2 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 .ruby-version
 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/javascripts/quotes.coffee
 create mode 100644 app/assets/stylesheets/application.scss
 create mode 100644 app/assets/stylesheets/quotes.scss
 create mode 100644 app/channels/application_cable/channel.rb
 create mode 100644 app/channels/application_cable/connection.rb
 create mode 100644 app/controllers/admin_controller.rb
 create mode 100644 app/controllers/application_controller.rb
 create mode 100644 app/controllers/concerns/.keep
 create mode 100644 app/controllers/quotes_controller.rb
 create mode 100644 app/controllers/users/confirmations_controller.rb
 create mode 100644 app/controllers/users/omniauth_callbacks_controller.rb
 create mode 100644 app/controllers/users/passwords_controller.rb
 create mode 100644 app/controllers/users/registrations_controller.rb
 create mode 100644 app/controllers/users/sessions_controller.rb
 create mode 100644 app/controllers/users/unlocks_controller.rb
 create mode 100644 app/helpers/application_helper.rb
 create mode 100644 app/helpers/quotes_helper.rb
 create mode 100644 app/jobs/application_job.rb
 create mode 100644 app/mailers/application_mailer.rb
 create mode 100644 app/models/application_record.rb
 create mode 100644 app/models/concerns/.keep
 create mode 100644 app/models/quote.rb
 create mode 100644 app/models/user.rb
 create mode 100644 app/views/admin/_navbar.html.erb
 create mode 100644 app/views/admin/flagged.html.erb
 create mode 100644 app/views/admin/index.html.erb
 create mode 100644 app/views/admin/submitted.html.erb
 create mode 100644 app/views/kaminari/_first_page.html.erb
 create mode 100644 app/views/kaminari/_gap.html.erb
 create mode 100644 app/views/kaminari/_last_page.html.erb
 create mode 100644 app/views/kaminari/_next_page.html.erb
 create mode 100644 app/views/kaminari/_page.html.erb
 create mode 100644 app/views/kaminari/_paginator.html.erb
 create mode 100644 app/views/kaminari/_prev_page.html.erb
 create mode 100644 app/views/layouts/_navbar.html.erb
 create mode 100644 app/views/layouts/application.html.erb
 create mode 100644 app/views/layouts/mailer.html.erb
 create mode 100644 app/views/layouts/mailer.text.erb
 create mode 100644 app/views/quotes/_form.html.erb
 create mode 100644 app/views/quotes/_quote.json.jbuilder
 create mode 100644 app/views/quotes/_show.html.erb
 create mode 100644 app/views/quotes/index.html.erb
 create mode 100644 app/views/quotes/index.json.jbuilder
 create mode 100644 app/views/quotes/latest.html.erb
 create mode 100644 app/views/quotes/new.html.erb
 create mode 100644 app/views/quotes/random.html.erb
 create mode 100644 app/views/quotes/random1.html.erb
 create mode 100644 app/views/quotes/search.html.erb
 create mode 100644 app/views/quotes/show.html.erb
 create mode 100644 app/views/quotes/show.json.jbuilder
 create mode 100644 app/views/quotes/top.html.erb
 create mode 100644 app/views/users/confirmations/new.html.erb
 create mode 100644 app/views/users/mailer/confirmation_instructions.html.erb
 create mode 100644 app/views/users/mailer/email_changed.html.erb
 create mode 100644 app/views/users/mailer/password_change.html.erb
 create mode 100644 app/views/users/mailer/reset_password_instructions.html.erb
 create mode 100644 app/views/users/mailer/unlock_instructions.html.erb
 create mode 100644 app/views/users/passwords/edit.html.erb
 create mode 100644 app/views/users/passwords/new.html.erb
 create mode 100644 app/views/users/registrations/edit.html.erb
 create mode 100644 app/views/users/registrations/new.html.erb
 create mode 100644 app/views/users/sessions/new.html.erb
 create mode 100644 app/views/users/shared/_links.html.erb
 create mode 100644 app/views/users/unlocks/new.html.erb
 create mode 100755 bin/bundle
 create mode 100755 bin/rails
 create mode 100755 bin/rake
 create mode 100755 bin/setup
 create mode 100755 bin/spring
 create mode 100755 bin/update
 create mode 100755 bin/yarn
 create mode 100644 config.ru
 create mode 100644 config/application.rb
 create mode 100644 config/boot.rb
 create mode 100644 config/cable.yml
 create mode 100644 config/credentials.yml.enc
 create mode 100644 config/database.yml
 create mode 100644 config/environment.rb
 create mode 100644 config/environments/development.rb
 create mode 100644 config/environments/production.rb
 create mode 100644 config/environments/test.rb
 create mode 100644 config/initializers/application_controller_renderer.rb
 create mode 100644 config/initializers/assets.rb
 create mode 100644 config/initializers/backtrace_silencers.rb
 create mode 100644 config/initializers/content_security_policy.rb
 create mode 100644 config/initializers/cookies_serializer.rb
 create mode 100644 config/initializers/devise.rb
 create mode 100644 config/initializers/filter_parameter_logging.rb
 create mode 100644 config/initializers/inflections.rb
 create mode 100644 config/initializers/kaminari_config.rb
 create mode 100644 config/initializers/mime_types.rb
 create mode 100644 config/initializers/wrap_parameters.rb
 create mode 100644 config/locales/devise.en.yml
 create mode 100644 config/locales/en.yml
 create mode 100644 config/puma.rb
 create mode 100644 config/routes.rb
 create mode 100644 config/spring.rb
 create mode 100644 config/storage.yml
 create mode 100644 db/migrate/20180512222706_create_quotes.rb
 create mode 100644 db/migrate/20180514024535_add_column_to_quotes.rb
 create mode 100644 db/migrate/20180515193424_devise_create_users.rb
 create mode 100644 db/schema.rb
 create mode 100644 db/seeds.rb
 create mode 100644 lib/assets/.keep
 create mode 100644 lib/tasks/.keep
 create mode 100644 log/.keep
 create mode 100644 package.json
 create mode 100644 public/404.html
 create mode 100644 public/422.html
 create mode 100644 public/500.html
 create mode 100644 public/apple-touch-icon-precomposed.png
 create mode 100644 public/apple-touch-icon.png
 create mode 100644 public/favicon.ico
 create mode 100644 public/robots.txt
 create mode 100644 test/application_system_test_case.rb
 create mode 100644 test/controllers/.keep
 create mode 100644 test/controllers/quotes_controller_test.rb
 create mode 100644 test/fixtures/.keep
 create mode 100644 test/fixtures/files/.keep
 create mode 100644 test/fixtures/quotes.yml
 create mode 100644 test/fixtures/users.yml
 create mode 100644 test/helpers/.keep
 create mode 100644 test/integration/.keep
 create mode 100644 test/mailers/.keep
 create mode 100644 test/models/.keep
 create mode 100644 test/models/quote_test.rb
 create mode 100644 test/models/user_test.rb
 create mode 100644 test/system/.keep
 create mode 100644 test/system/quotes_test.rb
 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 0000000..ec0b196
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,30 @@
+# 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 the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
+# Ignore all logfiles and tempfiles.
+/log/*
+/tmp/*
+!/log/.keep
+!/tmp/.keep
+
+# Ignore uploaded files in development
+/storage/*
+
+/node_modules
+/yarn-error.log
+
+/public/assets
+.byebug_history
+
+# Ignore master key for decrypting credentials and more.
+/config/master.key
diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 0000000..4fd0fe3
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+2.5.1
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..31e9d6a
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,72 @@
+source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+ruby '2.5.1'
+
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '~> 5.2.0'
+# Use sqlite3 as the database for Active Record
+gem 'sqlite3'
+# Use Puma as the app server
+gem 'puma', '~> 3.11'
+# Use SCSS for stylesheets
+gem 'sass-rails', '~> 5.0'
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier', '>= 1.3.0'
+# See https://github.com/rails/execjs#readme for more supported runtimes
+# gem 'mini_racer', platforms: :ruby
+
+# Use CoffeeScript for .coffee assets and views
+gem 'coffee-rails', '~> 4.2'
+# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
+gem 'turbolinks', '~> 5'
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+gem 'jbuilder', '~> 2.5'
+# Use Redis adapter to run Action Cable in production
+# gem 'redis', '~> 4.0'
+# Use ActiveModel has_secure_password
+# gem 'bcrypt', '~> 3.1.7'
+
+# Use ActiveStorage variant
+# gem 'mini_magick', '~> 4.8'
+
+# Use Capistrano for deployment
+# gem 'capistrano-rails', group: :development
+
+# Reduces boot times through caching; required in config/boot.rb
+gem 'bootsnap', '>= 1.1.0', require: false
+
+group :development, :test do
+  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
+end
+
+group :development do
+  # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
+  gem 'web-console', '>= 3.3.0'
+  gem 'listen', '>= 3.0.5', '< 3.2'
+  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+  gem 'spring'
+  gem 'spring-watcher-listen', '~> 2.0.0'
+end
+
+group :test do
+  # Adds support for Capybara system testing and selenium driver
+  gem 'capybara', '>= 2.15', '< 4.0'
+  gem 'selenium-webdriver'
+  # Easy installation and use of chromedriver to run system tests with Chrome
+  gem 'chromedriver-helper'
+end
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+# Use bootstrap gem for HTML/CSS/JS
+gem 'bootstrap'
+gem 'jquery-rails'
+
+# Use kaminari gem for pagination
+gem 'kaminari'
+
+# Use devise gem for authentication
+gem 'devise'
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 0000000..4f870f8
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,258 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.2.0)
+      actionpack (= 5.2.0)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.0)
+      actionview (= 5.2.0)
+      activesupport (= 5.2.0)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.0)
+      activesupport (= 5.2.0)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.0)
+      activesupport (= 5.2.0)
+      globalid (>= 0.3.6)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activestorage (5.2.0)
+      actionpack (= 5.2.0)
+      activerecord (= 5.2.0)
+      marcel (~> 0.3.1)
+    activesupport (5.2.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    archive-zip (0.11.0)
+      io-like (~> 0.3.0)
+    arel (9.0.0)
+    autoprefixer-rails (8.5.0)
+      execjs
+    bcrypt (3.1.11)
+    bindex (0.5.0)
+    bootsnap (1.3.0)
+      msgpack (~> 1.0)
+    bootstrap (4.1.1)
+      autoprefixer-rails (>= 6.0.3)
+      popper_js (>= 1.12.9, < 2)
+      sass (>= 3.5.2)
+    builder (3.2.3)
+    byebug (10.0.2)
+    capybara (3.1.0)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      xpath (~> 3.0)
+    childprocess (0.9.0)
+      ffi (~> 1.0, >= 1.0.11)
+    chromedriver-helper (1.2.0)
+      archive-zip (~> 0.10)
+      nokogiri (~> 1.8)
+    coffee-rails (4.2.2)
+      coffee-script (>= 2.2.0)
+      railties (>= 4.0.0)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.12.2)
+    concurrent-ruby (1.0.5)
+    crass (1.0.4)
+    devise (4.4.3)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0, < 6.0)
+      responders
+      warden (~> 1.2.3)
+    erubi (1.7.1)
+    execjs (2.7.0)
+    ffi (1.9.23)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
+    io-like (0.3.0)
+    jbuilder (2.7.0)
+      activesupport (>= 4.2.0)
+      multi_json (>= 1.2)
+    jquery-rails (4.3.3)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
+    kaminari (1.1.1)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.1.1)
+      kaminari-activerecord (= 1.1.1)
+      kaminari-core (= 1.1.1)
+    kaminari-actionview (1.1.1)
+      actionview
+      kaminari-core (= 1.1.1)
+    kaminari-activerecord (1.1.1)
+      activerecord
+      kaminari-core (= 1.1.1)
+    kaminari-core (1.1.1)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.2)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.0)
+    mimemagic (0.3.2)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    msgpack (1.2.4)
+    multi_json (1.13.1)
+    nio4r (2.3.1)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
+    orm_adapter (0.5.0)
+    popper_js (1.12.9)
+    public_suffix (3.0.2)
+    puma (3.11.4)
+    rack (2.0.5)
+    rack-test (1.0.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.0)
+      actioncable (= 5.2.0)
+      actionmailer (= 5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      activemodel (= 5.2.0)
+      activerecord (= 5.2.0)
+      activestorage (= 5.2.0)
+      activesupport (= 5.2.0)
+      bundler (>= 1.3.0)
+      railties (= 5.2.0)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.0)
+      actionpack (= 5.2.0)
+      activesupport (= 5.2.0)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.3.1)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    responders (2.4.0)
+      actionpack (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 5.3)
+    ruby_dep (1.5.0)
+    rubyzip (1.2.1)
+    sass (3.5.6)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sass-rails (5.0.7)
+      railties (>= 4.0.0, < 6)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
+    selenium-webdriver (3.12.0)
+      childprocess (~> 0.5)
+      rubyzip (~> 1.2)
+    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)
+    sqlite3 (1.3.13)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tilt (2.0.8)
+    turbolinks (5.1.1)
+      turbolinks-source (~> 5.1)
+    turbolinks-source (5.1.0)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    uglifier (4.1.10)
+      execjs (>= 0.3.0, < 3)
+    warden (1.2.7)
+      rack (>= 1.0)
+    web-console (3.6.2)
+      actionview (>= 5.0)
+      activemodel (>= 5.0)
+      bindex (>= 0.4.0)
+      railties (>= 5.0)
+    websocket-driver (0.7.0)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+    xpath (3.0.0)
+      nokogiri (~> 1.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bootsnap (>= 1.1.0)
+  bootstrap
+  byebug
+  capybara (>= 2.15, < 4.0)
+  chromedriver-helper
+  coffee-rails (~> 4.2)
+  devise
+  jbuilder (~> 2.5)
+  jquery-rails
+  kaminari
+  listen (>= 3.0.5, < 3.2)
+  puma (~> 3.11)
+  rails (~> 5.2.0)
+  sass-rails (~> 5.0)
+  selenium-webdriver
+  spring
+  spring-watcher-listen (~> 2.0.0)
+  sqlite3
+  turbolinks (~> 5)
+  tzinfo-data
+  uglifier (>= 1.3.0)
+  web-console (>= 3.3.0)
+
+RUBY VERSION
+   ruby 2.5.1p57
+
+BUNDLED WITH
+   1.16.1
diff --git a/README.md b/README.md
index 4bf363d..359e951 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,10 @@
-# rqdb
-Rash/Rails Quote Database
+# README
+
+Setup:
+* RVM
+* Ruby 2.5.1
+* bundle install
+* bundle exec rake db:migrate
+* bundle exec rails server
+
+Browse to http://localhost:3000
\ No newline at end of file
diff --git a/Rakefile b/Rakefile
new file mode 100644
index 0000000..e85f913
--- /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 0000000..b16e53d
--- /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 0000000..e69de29
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
new file mode 100644
index 0000000..7edec1e
--- /dev/null
+++ b/app/assets/javascripts/application.js
@@ -0,0 +1,19 @@
+// 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 activestorage
+//= require turbolinks
+//= require_tree .
+//= require jquery3
+//= require popper
+//= require bootstrap-sprockets
\ No newline at end of file
diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js
new file mode 100644
index 0000000..739aa5f
--- /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 0000000..e69de29
diff --git a/app/assets/javascripts/quotes.coffee b/app/assets/javascripts/quotes.coffee
new file mode 100644
index 0000000..24f83d1
--- /dev/null
+++ b/app/assets/javascripts/quotes.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
new file mode 100644
index 0000000..e616aff
--- /dev/null
+++ b/app/assets/stylesheets/application.scss
@@ -0,0 +1,84 @@
+/*
+ * 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
+ */
+@import "bootstrap";
+
+body {
+	font-size: 10pt;
+	font-family: Veranda, sans-serif;
+	color: #000000;
+	align: center;
+}
+
+a, a#admin_link, a:link, a:visited{
+	color: #336699;
+}
+a#admin_link:hover, a:hover, a:visited:hover{
+	color: #c08000;
+}
+
+#title, #versionbar {
+    color: #FFFFFF;
+    background-color: #336699;
+}
+
+#versionbar {
+	text-align: right;
+}
+
+pre.quote_output{
+	font-family: "Courier New", Courier, monospace;
+	padding-bottom: 13pt;
+}
+
+.navbar, #navbar {
+	background-color: #f0f0f0;
+	text-align: right;
+	font-size: 10pt;
+	font-family: Veranda, sans-serif;
+	color: #000000;
+	float: right;
+	padding-bottom: 1px;	
+	padding-top: 2px;
+	max-height: 30pt;
+}
+
+.quotes {
+	text-align: left;
+}
+
+.pagination > li > a:active,
+.pagination > li > a:focus,
+.pagination > li > a:hover,
+.pagination > li > span:active,
+.pagination > li > span:focus,
+.pagination > li > span:hover {
+    z-index: 3;
+    color: #23527c;
+    background-color: #336699;
+    border-color: #ddd;
+}
+
+#title {
+	color: #fff;
+	font-size: 15pt;
+	font-style: italic;	
+}
+
+.adminlink {
+	color: #f0f0f0;
+	font-size: 10pt;
+}
+
diff --git a/app/assets/stylesheets/quotes.scss b/app/assets/stylesheets/quotes.scss
new file mode 100644
index 0000000..93953b9
--- /dev/null
+++ b/app/assets/stylesheets/quotes.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the Quotes controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb
new file mode 100644
index 0000000..d672697
--- /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 0000000..0ff5442
--- /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/admin_controller.rb b/app/controllers/admin_controller.rb
new file mode 100644
index 0000000..f708889
--- /dev/null
+++ b/app/controllers/admin_controller.rb
@@ -0,0 +1,29 @@
+class AdminController < ApplicationController
+  before_action :authenticate_user!
+
+  # GET /admin
+  def index
+  	@flagged_quotes = Quote.where(flagged: true)
+  	@submitted_quotes = Quote.where(approved: false)
+
+  	# if user_signed_in? 
+  	# show admin navigation in main section
+  	# links to:
+  	# submitted quote review
+  	# flagged quote review
+  	# user management
+  	#
+  	# otherwise send to login page
+  end
+
+  # GET /admin/flagged
+  def flagged
+    @quotes = Quote.where(flagged: true).order(created_at: :asc).page(params[:page])
+  end
+
+  # GET /admin/submitted
+  def submitted
+    @quotes = Quote.where(approved: false).order(created_at: :asc).page(params[:page])    
+  end
+
+end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
new file mode 100644
index 0000000..09705d1
--- /dev/null
+++ b/app/controllers/application_controller.rb
@@ -0,0 +1,2 @@
+class ApplicationController < ActionController::Base
+end
diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
new file mode 100644
index 0000000..14d5798
--- /dev/null
+++ b/app/controllers/quotes_controller.rb
@@ -0,0 +1,193 @@
+class QuotesController < ApplicationController
+  before_action :set_quote, only: [:show, :edit, :update, :destroy]
+
+  # GET /quotes
+  # GET /quotes.json
+  def index
+    @quotes = Quote.where(approved: true).order(created_at: :asc).page(params[:page])
+  end
+
+  # GET /quotes/1
+  # GET /quotes/1.json
+  def show
+    @quotes = [Quote.find(params[:id])]
+  end
+
+  # GET /quotes/1/downvote
+  # POST /quotes/1/downvote
+  def downvote
+    @quote = Quote.find(params[:id])
+    @quote.update(score: @quote.score - 1)
+    respond_to do |format|
+      if @quote.save
+        format.html { redirect_to @quote, notice: 'Quote was successfully downvoted.' }
+        format.json { render :show, status: :ok, location: @quote }
+      else
+        format.html { render :edit }
+        format.json { render json: @quote.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # GET /quotes/1/upvote
+  # POST /quotes/1/upvote
+  def upvote
+    @quote = Quote.find(params[:id])
+    @quote.update(score: @quote.score + 1)
+    respond_to do |format|
+      if @quote.save
+        format.html { redirect_to @quote, notice: 'Quote was successfully upvoted.' }
+        format.json { render :show, status: :ok, location: @quote }
+      else
+        format.html { render :edit }
+        format.json { render json: @quote.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # GET /quotes/1/flag
+  # POST /quotes/1/flag
+  def flag
+    @quote = Quote.find(params[:id])
+    @quote.update(flagged: true)
+    respond_to do |format|
+      if @quote.save
+        format.html { redirect_to @quote, notice: 'Quote was successfully flagged.' }
+        format.json { render :show, status: :ok, location: @quote }
+      else
+        format.html { render :edit }
+        format.json { render json: @quote.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # GET /quotes/1/unflag
+  # POST /quotes/1/unflag
+  def unflag
+    authenticate_user!
+    @quote = Quote.find(params[:id])
+    @quote.update(flagged: false)
+    respond_to do |format|
+      if @quote.save
+        format.html { redirect_to @quote, notice: 'Quote was successfully unflagged.' }
+        format.json { render :show, status: :ok, location: @quote }
+      else
+        format.html { render :edit }
+        format.json { render json: @quote.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # GET /latest
+  # GET /latest.json
+  def latest
+    @quotes = Quote.where(approved: true).order(created_at: :desc).page(params[:page])
+  end
+
+  # GET /quotes/flagged
+  # GET /quotes/flagged.json
+  def submitted
+    @quotes = Quote.where(approved: false).order(created_at: :asc).page(params[:page])
+  end  
+
+  # GET /top
+  # GET /top.json
+  def top
+    @quotes = Quote.where(approved: true).order(score: :desc).page(params[:page])
+  end
+
+  # GET /random
+  # GET /random.json
+  def random
+    all_quotes = Quote.where(approved: true)
+    max_id     = all_quotes.last(1).first.id
+    quote_ids  = []
+    @quotes    = []
+    while (quote_ids.count < 10) and (quote_ids.count < all_quotes.count)
+      quote = all_quotes.sample(1).first
+      unless quote_ids.include?(quote.id) or quote.approved != true
+        quote_ids << quote.id
+        @quotes << quote
+      end
+    end
+  end
+
+  # GET /random1
+  # GET /random1.json
+  def random1
+    all_quotes = Quote.where(approved: true).where('"quotes"."score" > 0')
+    max_id     = all_quotes.last(1).first.id
+    quote_ids  = []
+    @quotes    = []
+    while (quote_ids.count < 10) and (quote_ids.count < all_quotes.count)
+      quote = all_quotes.sample(1).first
+      unless quote_ids.include?(quote.id) or quote.approved != true# or quote.score <= 0
+        quote_ids << quote.id
+        @quotes << quote
+      end
+    end
+  end
+
+  # GET /search
+  # GET /search.json
+  def search
+    @quote = Quote.find(params[:quote_id])
+  end
+
+  # POST /quotes
+  # POST /quotes.json
+  def create
+    @quote = Quote.new(quote_params)
+
+    respond_to do |format|
+      if @quote.score != 0 or @quote.approved
+        format.html { render :new }
+        format.json { render json: @quote.errors, status: :unprocessable_entity }
+      end
+
+      if @quote.save
+        format.html { redirect_to @quote, notice: 'Quote was successfully created.' }
+        format.json { render :show, status: :created, location: @quote }
+      else
+        format.html { render :new }
+        format.json { render json: @quote.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PATCH/PUT /quotes/1
+  # PATCH/PUT /quotes/1.json
+  def update
+    respond_to do |format|
+      if @quote.update(quote_params)
+        format.html { redirect_to @quote, notice: 'Quote was successfully updated.' }
+        format.json { render :show, status: :ok, location: @quote }
+      else
+        format.html { render :edit }
+        format.json { render json: @quote.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /quotes/1
+  # DELETE /quotes/1.json
+  def destroy
+    authenticate_user!
+    @quote.destroy
+    respond_to do |format|
+      format.html { redirect_to quotes_url, notice: 'Quote was successfully destroyed.' }
+      format.json { head :no_content }
+    end
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_quote
+      @quote = Quote.find(params[:id])
+    end
+
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def quote_params
+      params.require(:quote).permit(:text, :score)
+    end
+end
diff --git a/app/controllers/users/confirmations_controller.rb b/app/controllers/users/confirmations_controller.rb
new file mode 100644
index 0000000..fa535c0
--- /dev/null
+++ b/app/controllers/users/confirmations_controller.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class Users::ConfirmationsController < Devise::ConfirmationsController
+  # GET /resource/confirmation/new
+  # def new
+  #   super
+  # end
+
+  # POST /resource/confirmation
+  # def create
+  #   super
+  # end
+
+  # GET /resource/confirmation?confirmation_token=abcdef
+  # def show
+  #   super
+  # end
+
+  # protected
+
+  # The path used after resending confirmation instructions.
+  # def after_resending_confirmation_instructions_path_for(resource_name)
+  #   super(resource_name)
+  # end
+
+  # The path used after confirmation.
+  # def after_confirmation_path_for(resource_name, resource)
+  #   super(resource_name, resource)
+  # end
+end
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
new file mode 100644
index 0000000..565c6ed
--- /dev/null
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
+  # You should configure your model like this:
+  # devise :omniauthable, omniauth_providers: [:twitter]
+
+  # You should also create an action method in this controller like this:
+  # def twitter
+  # end
+
+  # More info at:
+  # https://github.com/plataformatec/devise#omniauth
+
+  # GET|POST /resource/auth/twitter
+  # def passthru
+  #   super
+  # end
+
+  # GET|POST /users/auth/twitter/callback
+  # def failure
+  #   super
+  # end
+
+  # protected
+
+  # The path used when OmniAuth fails
+  # def after_omniauth_failure_path_for(scope)
+  #   super(scope)
+  # end
+end
diff --git a/app/controllers/users/passwords_controller.rb b/app/controllers/users/passwords_controller.rb
new file mode 100644
index 0000000..259dbb0
--- /dev/null
+++ b/app/controllers/users/passwords_controller.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class Users::PasswordsController < Devise::PasswordsController
+  # GET /resource/password/new
+  # def new
+  #   super
+  # end
+
+  # POST /resource/password
+  # def create
+  #   super
+  # end
+
+  # GET /resource/password/edit?reset_password_token=abcdef
+  # def edit
+  #   super
+  # end
+
+  # PUT /resource/password
+  # def update
+  #   super
+  # end
+
+  # protected
+
+  # def after_resetting_password_path_for(resource)
+  #   super(resource)
+  # end
+
+  # The path used after sending reset password instructions
+  # def after_sending_reset_password_instructions_path_for(resource_name)
+  #   super(resource_name)
+  # end
+end
diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb
new file mode 100644
index 0000000..b9e664f
--- /dev/null
+++ b/app/controllers/users/registrations_controller.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+class Users::RegistrationsController < Devise::RegistrationsController
+  # before_action :configure_sign_up_params, only: [:create]
+  # before_action :configure_account_update_params, only: [:update]
+
+  # GET /resource/sign_up
+  # def new
+  #   super
+  # end
+
+  # POST /resource
+  # def create
+  #   super
+  # end
+
+  # GET /resource/edit
+  # def edit
+  #   super
+  # end
+
+  # PUT /resource
+  # def update
+  #   super
+  # end
+
+  # DELETE /resource
+  # def destroy
+  #   super
+  # end
+
+  # GET /resource/cancel
+  # Forces the session data which is usually expired after sign
+  # in to be expired now. This is useful if the user wants to
+  # cancel oauth signing in/up in the middle of the process,
+  # removing all OAuth session data.
+  # def cancel
+  #   super
+  # end
+
+  # protected
+
+  # If you have extra params to permit, append them to the sanitizer.
+  # def configure_sign_up_params
+  #   devise_parameter_sanitizer.permit(:sign_up, keys: [:attribute])
+  # end
+
+  # If you have extra params to permit, append them to the sanitizer.
+  # def configure_account_update_params
+  #   devise_parameter_sanitizer.permit(:account_update, keys: [:attribute])
+  # end
+
+  # The path used after sign up.
+  # def after_sign_up_path_for(resource)
+  #   super(resource)
+  # end
+
+  # The path used after sign up for inactive accounts.
+  # def after_inactive_sign_up_path_for(resource)
+  #   super(resource)
+  # end
+end
diff --git a/app/controllers/users/sessions_controller.rb b/app/controllers/users/sessions_controller.rb
new file mode 100644
index 0000000..a0f9b48
--- /dev/null
+++ b/app/controllers/users/sessions_controller.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class Users::SessionsController < Devise::SessionsController
+  # before_action :configure_sign_in_params, only: [:create]
+
+  # GET /resource/sign_in
+  # def new
+  #   super
+  # end
+
+  # POST /resource/sign_in
+  # def create
+  #   super
+  # end
+
+  # DELETE /resource/sign_out
+  # def destroy
+  #   super
+  # end
+
+  # protected
+
+  # If you have extra params to permit, append them to the sanitizer.
+  # def configure_sign_in_params
+  #   devise_parameter_sanitizer.permit(:sign_in, keys: [:attribute])
+  # end
+end
diff --git a/app/controllers/users/unlocks_controller.rb b/app/controllers/users/unlocks_controller.rb
new file mode 100644
index 0000000..2c410dc
--- /dev/null
+++ b/app/controllers/users/unlocks_controller.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class Users::UnlocksController < Devise::UnlocksController
+  # GET /resource/unlock/new
+  # def new
+  #   super
+  # end
+
+  # POST /resource/unlock
+  # def create
+  #   super
+  # end
+
+  # GET /resource/unlock?unlock_token=abcdef
+  # def show
+  #   super
+  # end
+
+  # protected
+
+  # The path used after sending unlock password instructions
+  # def after_sending_unlock_instructions_path_for(resource)
+  #   super(resource)
+  # end
+
+  # The path used after unlocking the resource
+  # def after_unlock_path_for(resource)
+  #   super(resource)
+  # end
+end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
new file mode 100644
index 0000000..de6be79
--- /dev/null
+++ b/app/helpers/application_helper.rb
@@ -0,0 +1,2 @@
+module ApplicationHelper
+end
diff --git a/app/helpers/quotes_helper.rb b/app/helpers/quotes_helper.rb
new file mode 100644
index 0000000..32b09df
--- /dev/null
+++ b/app/helpers/quotes_helper.rb
@@ -0,0 +1,2 @@
+module QuotesHelper
+end
diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb
new file mode 100644
index 0000000..a009ace
--- /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 0000000..286b223
--- /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 0000000..2e0ba98
--- /dev/null
+++ b/app/models/application_record.rb
@@ -0,0 +1,4 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+  paginates_per 10
+end
diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/app/models/quote.rb b/app/models/quote.rb
new file mode 100644
index 0000000..bfa5513
--- /dev/null
+++ b/app/models/quote.rb
@@ -0,0 +1,2 @@
+class Quote < ApplicationRecord
+end
diff --git a/app/models/user.rb b/app/models/user.rb
new file mode 100644
index 0000000..b8bdae1
--- /dev/null
+++ b/app/models/user.rb
@@ -0,0 +1,6 @@
+class User < ApplicationRecord
+  # Include default devise modules. Others available are:
+  # :confirmable, :lockable, :timeoutable and :omniauthable
+  devise :database_authenticatable,
+         :recoverable, :rememberable, :trackable, :validatable
+end
diff --git a/app/views/admin/_navbar.html.erb b/app/views/admin/_navbar.html.erb
new file mode 100644
index 0000000..64ee198
--- /dev/null
+++ b/app/views/admin/_navbar.html.erb
@@ -0,0 +1,19 @@
+<div class="col-md-1"></div>			
+<div class="col-md-10" id="navbar">
+	<nav class="navbar navbar-expand-md navbar-right" role="navigation">
+		<ul class="navbar-nav">
+			<li class="nav-item">				
+				<%= link_to "Flagged Quotes", '/flagged', class: 'nav-link' %>
+			</li>			
+			<li class="nav-item">
+				<%= link_to "Submitted Quotes", '/submitted', class: 'nav-link' %>
+			</li>
+			<li class="nav-item">				
+				<%= link_to "Users", '/users', class: 'nav-link' %>
+			</li>
+			<li class="nav-item">
+				<%= link_to "Logout", destroy_user_session_path, :method => :delete, class: 'nav-link' %>
+			</li>
+	</nav>
+</div>
+<div class="col-md-1"></div>
\ No newline at end of file
diff --git a/app/views/admin/flagged.html.erb b/app/views/admin/flagged.html.erb
new file mode 100644
index 0000000..44f8d0d
--- /dev/null
+++ b/app/views/admin/flagged.html.erb
@@ -0,0 +1,4 @@
+<%= paginate(@quotes) %>
+<% @quotes.each do |quote| -%>
+<%= render 'quotes/show', :quote => quote %>
+<% end -%>
\ No newline at end of file
diff --git a/app/views/admin/index.html.erb b/app/views/admin/index.html.erb
new file mode 100644
index 0000000..b5c1c63
--- /dev/null
+++ b/app/views/admin/index.html.erb
@@ -0,0 +1,4 @@
+Hello, admin.
+<br />
+<p>You have <%= @flagged_quotes.count %> flagged quotes pending review.</p>
+<p> You have <%= @submitted_quotes.count %> submitted quotes pending review.</p>
\ No newline at end of file
diff --git a/app/views/admin/submitted.html.erb b/app/views/admin/submitted.html.erb
new file mode 100644
index 0000000..44f8d0d
--- /dev/null
+++ b/app/views/admin/submitted.html.erb
@@ -0,0 +1,4 @@
+<%= paginate(@quotes) %>
+<% @quotes.each do |quote| -%>
+<%= render 'quotes/show', :quote => quote %>
+<% end -%>
\ No newline at end of file
diff --git a/app/views/kaminari/_first_page.html.erb b/app/views/kaminari/_first_page.html.erb
new file mode 100644
index 0000000..cc107ec
--- /dev/null
+++ b/app/views/kaminari/_first_page.html.erb
@@ -0,0 +1,3 @@
+<li class="page-item">
+  <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, remote: remote, class: 'page-link' %>
+</li>
diff --git a/app/views/kaminari/_gap.html.erb b/app/views/kaminari/_gap.html.erb
new file mode 100644
index 0000000..d241fc4
--- /dev/null
+++ b/app/views/kaminari/_gap.html.erb
@@ -0,0 +1,3 @@
+<li class='page-item disabled'>
+  <%= link_to raw(t 'views.pagination.truncate'), '#', class: 'page-link' %>
+</li>
diff --git a/app/views/kaminari/_last_page.html.erb b/app/views/kaminari/_last_page.html.erb
new file mode 100644
index 0000000..9a7584e
--- /dev/null
+++ b/app/views/kaminari/_last_page.html.erb
@@ -0,0 +1,3 @@
+<li class="page-item">
+  <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, remote: remote, class: 'page-link' %>
+</li>
diff --git a/app/views/kaminari/_next_page.html.erb b/app/views/kaminari/_next_page.html.erb
new file mode 100644
index 0000000..7ca72a8
--- /dev/null
+++ b/app/views/kaminari/_next_page.html.erb
@@ -0,0 +1,3 @@
+<li class="page-item">
+  <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, rel: 'next', remote: remote, class: 'page-link' %>
+</li>
diff --git a/app/views/kaminari/_page.html.erb b/app/views/kaminari/_page.html.erb
new file mode 100644
index 0000000..c8f03f2
--- /dev/null
+++ b/app/views/kaminari/_page.html.erb
@@ -0,0 +1,9 @@
+<% if page.current? %>
+  <li class="page-item active">
+    <%= content_tag :a, page, data: { remote: remote }, rel: (page.next? ? 'next' : (page.prev? ? 'prev' : nil)), class: 'page-link' %>
+  </li>
+<% else %>
+  <li class="page-item">
+    <%= link_to page, url, remote: remote, rel: (page.next? ? 'next' : (page.prev? ? 'prev' : nil)), class: 'page-link' %>
+  </li>
+<% end %>
diff --git a/app/views/kaminari/_paginator.html.erb b/app/views/kaminari/_paginator.html.erb
new file mode 100644
index 0000000..bb5ed0f
--- /dev/null
+++ b/app/views/kaminari/_paginator.html.erb
@@ -0,0 +1,17 @@
+<%= paginator.render do %>
+  <nav>
+    <ul class="pagination">
+      <%= first_page_tag unless current_page.first? %>
+      <%= prev_page_tag unless current_page.first? %>
+      <% each_page do |page| %>
+        <% if page.left_outer? || page.right_outer? || page.inside_window? %>
+          <%= page_tag page %>
+        <% elsif !page.was_truncated? -%>
+          <%= gap_tag %>
+        <% end %>
+      <% end %>
+      <%= next_page_tag unless current_page.last? %>
+      <%= last_page_tag unless current_page.last? %>
+    </ul>
+  </nav>
+<% end %>
diff --git a/app/views/kaminari/_prev_page.html.erb b/app/views/kaminari/_prev_page.html.erb
new file mode 100644
index 0000000..c7803fa
--- /dev/null
+++ b/app/views/kaminari/_prev_page.html.erb
@@ -0,0 +1,3 @@
+<li class="page-item">
+  <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, rel: 'prev', remote: remote, class: 'page-link' %>
+</li>
diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb
new file mode 100644
index 0000000..9d0bd00
--- /dev/null
+++ b/app/views/layouts/_navbar.html.erb
@@ -0,0 +1,35 @@
+<div class="col-md-1"></div>			
+<div class="col-md-10" id="navbar">
+	<nav class="navbar navbar-expand-md navbar-right" role="navigation">
+		<ul class="navbar-nav">
+			<li class="nav-item">
+				<%= link_to "Home", "/" , class: 'nav-link' %> <!--<span class="sr-only">(current)</span>-->
+			</li>
+			<li class="nav-item">
+				<%= link_to "Latest", "/latest", class: 'nav-link' %>
+			</li>
+			<li class="nav-item">
+				<%= link_to "Browse", "/browse", class: 'nav-link' %>
+			</li>
+			<li class="nav-item">
+				<div class="nav-link">
+					<%= link_to "Random", "/random" %> <%= link_to ">0", "/random1" %>
+				</div>
+			</li>
+			<li class="nav-item">
+				<%= link_to "Top", "/top", class: 'nav-link' %>
+			</li>
+			<li class="nav-item">
+				<strong><%= link_to "Add Quote", "/quotes/new", class: 'nav-link' %></strong>
+			</li>
+			<li class="nav-item">
+				<%= link_to "Search", "/search", class: 'nav-link' %>
+			</li>
+			<li class="nav-item">
+			  <div class="form-inline">
+					#<%= form_tag("/search", method: "get") do %><%= text_field_tag(:quote_id, nil, size: 1, class: "form-control form-control-sm input-sm") %><% end %>
+				</div>
+			</li>
+	</nav>
+</div>
+<div class="col-md-1"></div>
\ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
new file mode 100644
index 0000000..9cc561f
--- /dev/null
+++ b/app/views/layouts/application.html.erb
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>RQDB</title>
+		<%= csrf_meta_tags %>
+		<%= csp_meta_tag %>
+
+		<%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
+		<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
+	</head>
+
+	<body>
+		<div class="container">
+			<div class="row">
+				<div class="col-md-1"></div>
+				<div class="col-md-10" id="title">
+					RQDB <%= link_to 'Admin', '/users/sign_in', class: 'adminlink' %>
+				</div>
+				<div class="col-md-1"></div>			
+			</div>
+			<div class="row">
+				<%= render 'layouts/navbar' %>
+			</div>
+			<% if user_signed_in? -%>
+				<div class="row">
+					<%= render 'admin/navbar' %>
+				</div>
+			<% end -%>
+			<div class="row">
+				<div class="col-md-1"></div>			
+				<div class="col-md-10 quotes">
+							<p class="notice"><%= notice %></p><p class="alert"><%= alert %></p>	
+					<%= yield %>
+				</div>
+				<div class="col-md-1"></div>			
+			</div>
+			<div class="row">
+				<%= render 'layouts/navbar' %>
+			</div>
+			<div class="row">
+				<div class="col-md-1"></div>						
+				<div class="col-md-10" id="versionbar">
+					RQDB Version: pre-alpha
+				</div>
+				<div class="col-md-1"></div>
+			</div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
new file mode 100644
index 0000000..cbd34d2
--- /dev/null
+++ b/app/views/layouts/mailer.html.erb
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style>
+      /* Email styles need to be inline */
+    </style>
+  </head>
+
+  <body>
+    <%= yield %>
+  </body>
+</html>
diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb
new file mode 100644
index 0000000..37f0bdd
--- /dev/null
+++ b/app/views/layouts/mailer.text.erb
@@ -0,0 +1 @@
+<%= yield %>
diff --git a/app/views/quotes/_form.html.erb b/app/views/quotes/_form.html.erb
new file mode 100644
index 0000000..11e0210
--- /dev/null
+++ b/app/views/quotes/_form.html.erb
@@ -0,0 +1,22 @@
+<%= form_with(model: quote, local: true) do |form| %>
+  <% if quote.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(quote.errors.count, "error") %> prohibited this quote from being saved:</h2>
+
+      <ul>
+      <% quote.errors.full_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= form.label :text %>
+    <%= form.text_area :text %>
+  </div>
+
+  <div class="actions">
+    <%= form.submit %>
+  </div>
+<% end %>
diff --git a/app/views/quotes/_quote.json.jbuilder b/app/views/quotes/_quote.json.jbuilder
new file mode 100644
index 0000000..d963cbf
--- /dev/null
+++ b/app/views/quotes/_quote.json.jbuilder
@@ -0,0 +1,2 @@
+json.extract! quote, :id, :text, :score, :created_at, :updated_at
+json.url quote_url(quote, format: :json)
diff --git a/app/views/quotes/_show.html.erb b/app/views/quotes/_show.html.erb
new file mode 100644
index 0000000..3387c9f
--- /dev/null
+++ b/app/views/quotes/_show.html.erb
@@ -0,0 +1,15 @@
+<strong><%= link_to "##{quote.id}", quote %></strong>
+<%= link_to '+', "/quotes/#{quote.id}/upvote", method: :get, data: { confirm: 'Are you sure you want to upvote?' } %>(<%= quote.score %>)<%= link_to '-', "/quotes/#{quote.id}/downvote", method: :get, data: { confirm: 'Are you sure you want to downvote?' } %>
+<% if user_signed_in? -%>
+	<%= link_to 'Delete', quote, method: :delete, data: { confirm: 'Are you sure you want to delete this quote?' } %>
+	<% if quote.flagged == true -%>
+	  <%= link_to 'Unflag', quote, method: :unflag, data: { confirm: 'Are you sure you want to unflag this quote?' } %>
+  <% end %>
+	<% if quote.approved == false -%>
+	  <%= link_to 'Approve', quote, method: :approve, data: { confirm: 'Are you sure you want to approve this quote?' } %>
+	<% end %>
+<% else -%>
+	<%= link_to '[X]', "/quotes/#{quote.id}/flag", method: :get, data: { confirm: 'Are you sure you want to flag this quote for review?' } %>
+<% end -%>
+<br />
+<pre class="quote_output"><%= quote.text %></pre>
\ No newline at end of file
diff --git a/app/views/quotes/index.html.erb b/app/views/quotes/index.html.erb
new file mode 100644
index 0000000..44f8d0d
--- /dev/null
+++ b/app/views/quotes/index.html.erb
@@ -0,0 +1,4 @@
+<%= paginate(@quotes) %>
+<% @quotes.each do |quote| -%>
+<%= render 'quotes/show', :quote => quote %>
+<% end -%>
\ No newline at end of file
diff --git a/app/views/quotes/index.json.jbuilder b/app/views/quotes/index.json.jbuilder
new file mode 100644
index 0000000..15841aa
--- /dev/null
+++ b/app/views/quotes/index.json.jbuilder
@@ -0,0 +1 @@
+json.array! @quotes, partial: 'quotes/quote', as: :quote
diff --git a/app/views/quotes/latest.html.erb b/app/views/quotes/latest.html.erb
new file mode 100644
index 0000000..44f8d0d
--- /dev/null
+++ b/app/views/quotes/latest.html.erb
@@ -0,0 +1,4 @@
+<%= paginate(@quotes) %>
+<% @quotes.each do |quote| -%>
+<%= render 'quotes/show', :quote => quote %>
+<% end -%>
\ No newline at end of file
diff --git a/app/views/quotes/new.html.erb b/app/views/quotes/new.html.erb
new file mode 100644
index 0000000..b7a2679
--- /dev/null
+++ b/app/views/quotes/new.html.erb
@@ -0,0 +1,5 @@
+<h1>New Quote</h1>
+
+<%= render 'form', quote: @quote %>
+
+<%= link_to 'Back', quotes_path %>
diff --git a/app/views/quotes/random.html.erb b/app/views/quotes/random.html.erb
new file mode 100644
index 0000000..baed1de
--- /dev/null
+++ b/app/views/quotes/random.html.erb
@@ -0,0 +1,3 @@
+<% @quotes.each do |quote| -%>
+<%= render 'quotes/show', :quote => quote %>
+<% end -%>
\ No newline at end of file
diff --git a/app/views/quotes/random1.html.erb b/app/views/quotes/random1.html.erb
new file mode 100644
index 0000000..baed1de
--- /dev/null
+++ b/app/views/quotes/random1.html.erb
@@ -0,0 +1,3 @@
+<% @quotes.each do |quote| -%>
+<%= render 'quotes/show', :quote => quote %>
+<% end -%>
\ No newline at end of file
diff --git a/app/views/quotes/search.html.erb b/app/views/quotes/search.html.erb
new file mode 100644
index 0000000..3608188
--- /dev/null
+++ b/app/views/quotes/search.html.erb
@@ -0,0 +1 @@
+<%= render 'quotes/show', :quote => @quote %>
\ No newline at end of file
diff --git a/app/views/quotes/show.html.erb b/app/views/quotes/show.html.erb
new file mode 100644
index 0000000..baed1de
--- /dev/null
+++ b/app/views/quotes/show.html.erb
@@ -0,0 +1,3 @@
+<% @quotes.each do |quote| -%>
+<%= render 'quotes/show', :quote => quote %>
+<% end -%>
\ No newline at end of file
diff --git a/app/views/quotes/show.json.jbuilder b/app/views/quotes/show.json.jbuilder
new file mode 100644
index 0000000..2e771cc
--- /dev/null
+++ b/app/views/quotes/show.json.jbuilder
@@ -0,0 +1 @@
+json.partial! "quotes/quote", quote: @quote
diff --git a/app/views/quotes/top.html.erb b/app/views/quotes/top.html.erb
new file mode 100644
index 0000000..44f8d0d
--- /dev/null
+++ b/app/views/quotes/top.html.erb
@@ -0,0 +1,4 @@
+<%= paginate(@quotes) %>
+<% @quotes.each do |quote| -%>
+<%= render 'quotes/show', :quote => quote %>
+<% end -%>
\ No newline at end of file
diff --git a/app/views/users/confirmations/new.html.erb b/app/views/users/confirmations/new.html.erb
new file mode 100644
index 0000000..f8c75d5
--- /dev/null
+++ b/app/views/users/confirmations/new.html.erb
@@ -0,0 +1,16 @@
+<h2>Resend confirmation instructions</h2>
+
+<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
+  <%= devise_error_messages! %>
+
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autofocus: true, autocomplete: "email", value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit "Resend confirmation instructions" %>
+  </div>
+<% end %>
+
+<%= render "users/shared/links" %>
diff --git a/app/views/users/mailer/confirmation_instructions.html.erb b/app/views/users/mailer/confirmation_instructions.html.erb
new file mode 100644
index 0000000..dc55f64
--- /dev/null
+++ b/app/views/users/mailer/confirmation_instructions.html.erb
@@ -0,0 +1,5 @@
+<p>Welcome <%= @email %>!</p>
+
+<p>You can confirm your account email through the link below:</p>
+
+<p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %></p>
diff --git a/app/views/users/mailer/email_changed.html.erb b/app/views/users/mailer/email_changed.html.erb
new file mode 100644
index 0000000..32f4ba8
--- /dev/null
+++ b/app/views/users/mailer/email_changed.html.erb
@@ -0,0 +1,7 @@
+<p>Hello <%= @email %>!</p>
+
+<% if @resource.try(:unconfirmed_email?) %>
+  <p>We're contacting you to notify you that your email is being changed to <%= @resource.unconfirmed_email %>.</p>
+<% else %>
+  <p>We're contacting you to notify you that your email has been changed to <%= @resource.email %>.</p>
+<% end %>
diff --git a/app/views/users/mailer/password_change.html.erb b/app/views/users/mailer/password_change.html.erb
new file mode 100644
index 0000000..b41daf4
--- /dev/null
+++ b/app/views/users/mailer/password_change.html.erb
@@ -0,0 +1,3 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>We're contacting you to notify you that your password has been changed.</p>
diff --git a/app/views/users/mailer/reset_password_instructions.html.erb b/app/views/users/mailer/reset_password_instructions.html.erb
new file mode 100644
index 0000000..f667dc1
--- /dev/null
+++ b/app/views/users/mailer/reset_password_instructions.html.erb
@@ -0,0 +1,8 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Someone has requested a link to change your password. You can do this through the link below.</p>
+
+<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p>
+
+<p>If you didn't request this, please ignore this email.</p>
+<p>Your password won't change until you access the link above and create a new one.</p>
diff --git a/app/views/users/mailer/unlock_instructions.html.erb b/app/views/users/mailer/unlock_instructions.html.erb
new file mode 100644
index 0000000..41e148b
--- /dev/null
+++ b/app/views/users/mailer/unlock_instructions.html.erb
@@ -0,0 +1,7 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
+
+<p>Click the link below to unlock your account:</p>
+
+<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %></p>
diff --git a/app/views/users/passwords/edit.html.erb b/app/views/users/passwords/edit.html.erb
new file mode 100644
index 0000000..c9f1513
--- /dev/null
+++ b/app/views/users/passwords/edit.html.erb
@@ -0,0 +1,25 @@
+<h2>Change your password</h2>
+
+<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
+  <%= devise_error_messages! %>
+  <%= f.hidden_field :reset_password_token %>
+
+  <div class="field">
+    <%= f.label :password, "New password" %><br />
+    <% if @minimum_password_length %>
+      <em>(<%= @minimum_password_length %> characters minimum)</em><br />
+    <% end %>
+    <%= f.password_field :password, autofocus: true, autocomplete: "off" %>
+  </div>
+
+  <div class="field">
+    <%= f.label :password_confirmation, "Confirm new password" %><br />
+    <%= f.password_field :password_confirmation, autocomplete: "off" %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit "Change my password" %>
+  </div>
+<% end %>
+
+<%= render "users/shared/links" %>
diff --git a/app/views/users/passwords/new.html.erb b/app/views/users/passwords/new.html.erb
new file mode 100644
index 0000000..837bbc8
--- /dev/null
+++ b/app/views/users/passwords/new.html.erb
@@ -0,0 +1,16 @@
+<h2>Forgot your password?</h2>
+
+<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
+  <%= devise_error_messages! %>
+
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit "Send me reset password instructions" %>
+  </div>
+<% end %>
+
+<%= render "users/shared/links" %>
diff --git a/app/views/users/registrations/edit.html.erb b/app/views/users/registrations/edit.html.erb
new file mode 100644
index 0000000..10ed32a
--- /dev/null
+++ b/app/views/users/registrations/edit.html.erb
@@ -0,0 +1,43 @@
+<h2>Edit <%= resource_name.to_s.humanize %></h2>
+
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
+  <%= devise_error_messages! %>
+
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+  </div>
+
+  <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
+    <div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
+    <%= f.password_field :password, autocomplete: "off" %>
+    <% if @minimum_password_length %>
+      <br />
+      <em><%= @minimum_password_length %> characters minimum</em>
+    <% end %>
+  </div>
+
+  <div class="field">
+    <%= f.label :password_confirmation %><br />
+    <%= f.password_field :password_confirmation, autocomplete: "off" %>
+  </div>
+
+  <div class="field">
+    <%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
+    <%= f.password_field :current_password, autocomplete: "off" %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit "Update" %>
+  </div>
+<% end %>
+
+<h3>Cancel my account</h3>
+
+<p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %></p>
+
+<%= link_to "Back", :back %>
diff --git a/app/views/users/registrations/new.html.erb b/app/views/users/registrations/new.html.erb
new file mode 100644
index 0000000..5a1cd1d
--- /dev/null
+++ b/app/views/users/registrations/new.html.erb
@@ -0,0 +1,29 @@
+<h2>Sign up</h2>
+
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
+  <%= devise_error_messages! %>
+
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+  </div>
+
+  <div class="field">
+    <%= f.label :password %>
+    <% if @minimum_password_length %>
+    <em>(<%= @minimum_password_length %> characters minimum)</em>
+    <% end %><br />
+    <%= f.password_field :password, autocomplete: "off" %>
+  </div>
+
+  <div class="field">
+    <%= f.label :password_confirmation %><br />
+    <%= f.password_field :password_confirmation, autocomplete: "off" %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit "Sign up" %>
+  </div>
+<% end %>
+
+<%= render "users/shared/links" %>
diff --git a/app/views/users/sessions/new.html.erb b/app/views/users/sessions/new.html.erb
new file mode 100644
index 0000000..35f174d
--- /dev/null
+++ b/app/views/users/sessions/new.html.erb
@@ -0,0 +1,26 @@
+<h2>Log in</h2>
+<div class="form-inline">
+  <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
+    <div class="field form-control form-control-sm input-sm">
+      <%= f.label :email %><br />
+      <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+    </div>
+
+    <div class="field form-control form-control-sm input-sm">
+      <%= f.label :password %><br />
+      <%= f.password_field :password, autocomplete: "off" %>
+    </div>
+
+    <% if devise_mapping.rememberable? -%>
+      <div class="field form-control form-control-sm input-sm">
+        <%= f.check_box :remember_me %>
+        <%= f.label :remember_me %>
+      </div>
+    <% end -%>
+
+    <div class="actions form-control form-control-sm input-sm">
+      <%= f.submit "Log in" %>
+    </div>
+  <% end %>
+</div>
+<%= render "users/shared/links" %>
diff --git a/app/views/users/shared/_links.html.erb b/app/views/users/shared/_links.html.erb
new file mode 100644
index 0000000..e6a3e41
--- /dev/null
+++ b/app/views/users/shared/_links.html.erb
@@ -0,0 +1,25 @@
+<%- if controller_name != 'sessions' %>
+  <%= link_to "Log in", new_session_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+  <%= link_to "Sign up", new_registration_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
+  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
+  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.omniauthable? %>
+  <%- resource_class.omniauth_providers.each do |provider| %>
+    <%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider) %><br />
+  <% end -%>
+<% end -%>
diff --git a/app/views/users/unlocks/new.html.erb b/app/views/users/unlocks/new.html.erb
new file mode 100644
index 0000000..2ee26bb
--- /dev/null
+++ b/app/views/users/unlocks/new.html.erb
@@ -0,0 +1,16 @@
+<h2>Resend unlock instructions</h2>
+
+<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
+  <%= devise_error_messages! %>
+
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit "Resend unlock instructions" %>
+  </div>
+<% end %>
+
+<%= render "users/shared/links" %>
diff --git a/bin/bundle b/bin/bundle
new file mode 100755
index 0000000..f19acf5
--- /dev/null
+++ b/bin/bundle
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+load Gem.bin_path('bundler', 'bundle')
diff --git a/bin/rails b/bin/rails
new file mode 100755
index 0000000..5badb2f
--- /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 0000000..d87d5f5
--- /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 0000000..94fd4d7
--- /dev/null
+++ b/bin/setup
@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = File.expand_path('..', __dir__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?('config/database.yml')
+  #   cp 'config/database.yml.sample', 'config/database.yml'
+  # end
+
+  puts "\n== Preparing database =="
+  system! 'bin/rails db:setup'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end
diff --git a/bin/spring b/bin/spring
new file mode 100755
index 0000000..fb2ec2e
--- /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 0000000..58bfaed
--- /dev/null
+++ b/bin/update
@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = File.expand_path('..', __dir__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a way to update your development environment automatically.
+  # Add necessary update steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
+
+  puts "\n== Updating database =="
+  system! 'bin/rails db:migrate'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end
diff --git a/bin/yarn b/bin/yarn
new file mode 100755
index 0000000..460dd56
--- /dev/null
+++ b/bin/yarn
@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.expand_path('..', __dir__)
+Dir.chdir(APP_ROOT) do
+  begin
+    exec "yarnpkg", *ARGV
+  rescue Errno::ENOENT
+    $stderr.puts "Yarn executable was not detected in the system."
+    $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
+    exit 1
+  end
+end
diff --git a/config.ru b/config.ru
new file mode 100644
index 0000000..f7ba0b5
--- /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 0000000..9c0b08c
--- /dev/null
+++ b/config/application.rb
@@ -0,0 +1,19 @@
+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 RashOnRails
+  class Application < Rails::Application
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 5.2
+
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration can go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded after loading
+    # the framework and any gems in your application.
+  end
+end
diff --git a/config/boot.rb b/config/boot.rb
new file mode 100644
index 0000000..b9e460c
--- /dev/null
+++ b/config/boot.rb
@@ -0,0 +1,4 @@
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+
+require 'bundler/setup' # Set up gems listed in the Gemfile.
+require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
diff --git a/config/cable.yml b/config/cable.yml
new file mode 100644
index 0000000..6b1eb1b
--- /dev/null
+++ b/config/cable.yml
@@ -0,0 +1,10 @@
+development:
+  adapter: async
+
+test:
+  adapter: async
+
+production:
+  adapter: redis
+  url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
+  channel_prefix: rash_on_rails_production
diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc
new file mode 100644
index 0000000..9721587
--- /dev/null
+++ b/config/credentials.yml.enc
@@ -0,0 +1 @@
+y4QSX1cvFmO0CImSXXtjKDWBycXizBjHIYTZGd1HPdCWvXgd8WJvINFaAF3nvfTkM05nDGtx2YLEsqSGuOdSyb58yiyt5qXDLzXsLeo3GBc3bWj8t9+o3D82Z/YBmBBQEcf3cgIoYR8xRkrMJfBuQ1gL3M7WKZqVdfAhDhRYG6225zl4DxrBcJNj6Zi25GS4S+/bT90YpJLr0kuLNaMtynzb/hnCtBrArEbwYtSz0GQoQiD/7RibS+h9DXwpxKbo3IfBVMVaIZxG8Xy6mN0qJ0M+0tpznUlN9tZ5RUQ6xGRW42hhg0CKiKNHh3w0Bey4KhMwDoyMUj2pfjFKtlg3dKWQHj0bfEKoTKSVz+LJzCNVd8K1GtRrOrmxXE7+HLX5Sf8u5TB8G55WdT4E68ItSmB4TlPd0TT7nf2o--t0jTJ/thhXsXHAJP--680zojXXOY7gSzoM/LxTnA==
\ No newline at end of file
diff --git a/config/database.yml b/config/database.yml
new file mode 100644
index 0000000..0d02f24
--- /dev/null
+++ b/config/database.yml
@@ -0,0 +1,25 @@
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+#
+default: &default
+  adapter: sqlite3
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+  timeout: 5000
+
+development:
+  <<: *default
+  database: db/development.sqlite3
+
+# 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: db/test.sqlite3
+
+production:
+  <<: *default
+  database: db/production.sqlite3
diff --git a/config/environment.rb b/config/environment.rb
new file mode 100644
index 0000000..426333b
--- /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 0000000..eb7b4e3
--- /dev/null
+++ b/config/environments/development.rb
@@ -0,0 +1,64 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # In the development environment your application's code is reloaded on
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
+  config.cache_classes = false
+
+  # Do not eager load code on boot.
+  config.eager_load = false
+
+  # Show full error reports.
+  config.consider_all_requests_local = true
+
+  # Enable/disable caching. By default caching is disabled.
+  # Run rails dev:cache to toggle caching.
+  if Rails.root.join('tmp', 'caching-dev.txt').exist?
+    config.action_controller.perform_caching = true
+
+    config.cache_store = :memory_store
+    config.public_file_server.headers = {
+      'Cache-Control' => "public, max-age=#{2.days.to_i}"
+    }
+  else
+    config.action_controller.perform_caching = false
+
+    config.cache_store = :null_store
+  end
+
+  # Store uploaded files on the local file system (see config/storage.yml for options)
+  config.active_storage.service = :local
+
+  # Don't care if the mailer can't send.
+  config.action_mailer.raise_delivery_errors = false
+
+  config.action_mailer.perform_caching = false
+
+  # Print deprecation notices to the Rails logger.
+  config.active_support.deprecation = :log
+
+  # Raise an error on page load if there are pending migrations.
+  config.active_record.migration_error = :page_load
+
+  # Highlight code that triggered database queries in logs.
+  config.active_record.verbose_query_logs = true
+
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
+
+  # Suppress logger output for asset requests.
+  config.assets.quiet = true
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+
+  # Use an evented file watcher to asynchronously detect changes in source code,
+  # routes, locales, etc. This feature depends on the listen gem.
+  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+
+  # Set default url_options for devise
+  config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
+end
diff --git a/config/environments/production.rb b/config/environments/production.rb
new file mode 100644
index 0000000..5afc6d0
--- /dev/null
+++ b/config/environments/production.rb
@@ -0,0 +1,97 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # Code is not reloaded between requests.
+  config.cache_classes = true
+
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
+  # or in config/master.key. This key is used to decrypt credentials (and other encrypted files).
+  # config.require_master_key = true
+
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
+  config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
+
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  # config.assets.css_compressor = :sass
+
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
+  config.assets.compile = false
+
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
+
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = 'http://assets.example.com'
+
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
+
+  # Store uploaded files on the local file system (see config/storage.yml for options)
+  config.active_storage.service = :local
+
+  # Mount Action Cable outside main process or domain
+  # config.action_cable.mount_path = nil
+  # config.action_cable.url = 'wss://example.com/cable'
+  # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
+
+  # Use the lowest log level to ensure availability of diagnostic information
+  # when problems arise.
+  config.log_level = :debug
+
+  # Prepend all log lines with the following tags.
+  config.log_tags = [ :request_id ]
+
+  # Use a different cache store in production.
+  # config.cache_store = :mem_cache_store
+
+  # Use a real queuing backend for Active Job (and separate queues per environment)
+  # config.active_job.queue_adapter     = :resque
+  # config.active_job.queue_name_prefix = "rash_on_rails_#{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
+
+  # Set default url_options for devise
+  config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
+end
diff --git a/config/environments/test.rb b/config/environments/test.rb
new file mode 100644
index 0000000..0a38fd3
--- /dev/null
+++ b/config/environments/test.rb
@@ -0,0 +1,46 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # The test environment is used exclusively to run your application's
+  # test suite. You never need to work with it otherwise. Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs. Don't rely on the data there!
+  config.cache_classes = true
+
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
+
+  # Configure public file server for tests with Cache-Control for performance.
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = {
+    'Cache-Control' => "public, max-age=#{1.hour.to_i}"
+  }
+
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates.
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
+
+  # Store uploaded files on the local file system in a temporary directory
+  config.active_storage.service = :test
+
+  config.action_mailer.perform_caching = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Print deprecation notices to the stderr.
+  config.active_support.deprecation = :stderr
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+end
diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb
new file mode 100644
index 0000000..89d2efa
--- /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 0000000..4b828e8
--- /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 0000000..59385cd
--- /dev/null
+++ b/config/initializers/backtrace_silencers.rb
@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
+# Rails.backtrace_cleaner.remove_silencers!
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
new file mode 100644
index 0000000..d3bcaa5
--- /dev/null
+++ b/config/initializers/content_security_policy.rb
@@ -0,0 +1,25 @@
+# Be sure to restart your server when you modify this file.
+
+# Define an application-wide content security policy
+# For further information see the following documentation
+# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
+
+# Rails.application.config.content_security_policy do |policy|
+#   policy.default_src :self, :https
+#   policy.font_src    :self, :https, :data
+#   policy.img_src     :self, :https, :data
+#   policy.object_src  :none
+#   policy.script_src  :self, :https
+#   policy.style_src   :self, :https
+
+#   # Specify URI for violation reports
+#   # policy.report_uri "/csp-violation-report-endpoint"
+# end
+
+# If you are using UJS then enable automatic nonce generation
+# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
+
+# Report CSP violations to a specified URI
+# For further information see the following documentation:
+# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
+# Rails.application.config.content_security_policy_report_only = true
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
new file mode 100644
index 0000000..5a6a32d
--- /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/devise.rb b/config/initializers/devise.rb
new file mode 100644
index 0000000..d3bc36f
--- /dev/null
+++ b/config/initializers/devise.rb
@@ -0,0 +1,284 @@
+# frozen_string_literal: true
+
+# Use this hook to configure devise mailer, warden hooks and so forth.
+# Many of these configuration options can be set straight in your model.
+Devise.setup do |config|
+  # The secret key used by Devise. Devise uses this key to generate
+  # random tokens. Changing this key will render invalid all existing
+  # confirmation, reset password and unlock tokens in the database.
+  # Devise will use the `secret_key_base` as its `secret_key`
+  # by default. You can change it below and use your own secret key.
+  # config.secret_key = 'e0ae9c129293cfebc7acc6e777e67a66d30cac325ac0e8e7e993ecbbf16cadaa5a355a41af172fbe90daf9f3341ba10100b14afcd0fd8541624d80cd21e5e391'
+  config.secret_key = `bundle exec rake secret`
+  
+  # ==> Controller configuration
+  # Configure the parent class to the devise controllers.
+  # config.parent_controller = 'DeviseController'
+
+  # ==> Mailer Configuration
+  # Configure the e-mail address which will be shown in Devise::Mailer,
+  # note that it will be overwritten if you use your own mailer class
+  # with default "from" parameter.
+  config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
+
+  # Configure the class responsible to send e-mails.
+  # config.mailer = 'Devise::Mailer'
+
+  # Configure the parent class responsible to send e-mails.
+  # config.parent_mailer = 'ActionMailer::Base'
+
+  # ==> ORM configuration
+  # Load and configure the ORM. Supports :active_record (default) and
+  # :mongoid (bson_ext recommended) by default. Other ORMs may be
+  # available as additional gems.
+  require 'devise/orm/active_record'
+
+  # ==> Configuration for any authentication mechanism
+  # Configure which keys are used when authenticating a user. The default is
+  # just :email. You can configure it to use [:username, :subdomain], so for
+  # authenticating a user, both parameters are required. Remember that those
+  # parameters are used only when authenticating and not when retrieving from
+  # session. If you need permissions, you should implement that in a before filter.
+  # You can also supply a hash where the value is a boolean determining whether
+  # or not authentication should be aborted when the value is not present.
+  # config.authentication_keys = [:email]
+
+  # Configure parameters from the request object used for authentication. Each entry
+  # given should be a request method and it will automatically be passed to the
+  # find_for_authentication method and considered in your model lookup. For instance,
+  # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
+  # The same considerations mentioned for authentication_keys also apply to request_keys.
+  # config.request_keys = []
+
+  # Configure which authentication keys should be case-insensitive.
+  # These keys will be downcased upon creating or modifying a user and when used
+  # to authenticate or find a user. Default is :email.
+  config.case_insensitive_keys = [:email]
+
+  # Configure which authentication keys should have whitespace stripped.
+  # These keys will have whitespace before and after removed upon creating or
+  # modifying a user and when used to authenticate or find a user. Default is :email.
+  config.strip_whitespace_keys = [:email]
+
+  # Tell if authentication through request.params is enabled. True by default.
+  # It can be set to an array that will enable params authentication only for the
+  # given strategies, for example, `config.params_authenticatable = [:database]` will
+  # enable it only for database (email + password) authentication.
+  # config.params_authenticatable = true
+
+  # Tell if authentication through HTTP Auth is enabled. False by default.
+  # It can be set to an array that will enable http authentication only for the
+  # given strategies, for example, `config.http_authenticatable = [:database]` will
+  # enable it only for database authentication. The supported strategies are:
+  # :database      = Support basic authentication with authentication key + password
+  # config.http_authenticatable = false
+
+  # If 401 status code should be returned for AJAX requests. True by default.
+  # config.http_authenticatable_on_xhr = true
+
+  # The realm used in Http Basic Authentication. 'Application' by default.
+  # config.http_authentication_realm = 'Application'
+
+  # It will change confirmation, password recovery and other workflows
+  # to behave the same regardless if the e-mail provided was right or wrong.
+  # Does not affect registerable.
+  # config.paranoid = true
+
+  # By default Devise will store the user in session. You can skip storage for
+  # particular strategies by setting this option.
+  # Notice that if you are skipping storage for all authentication paths, you
+  # may want to disable generating routes to Devise's sessions controller by
+  # passing skip: :sessions to `devise_for` in your config/routes.rb
+  config.skip_session_storage = [:http_auth]
+
+  # By default, Devise cleans up the CSRF token on authentication to
+  # avoid CSRF token fixation attacks. This means that, when using AJAX
+  # requests for sign in and sign up, you need to get a new CSRF token
+  # from the server. You can disable this option at your own risk.
+  # config.clean_up_csrf_token_on_authentication = true
+
+  # When false, Devise will not attempt to reload routes on eager load.
+  # This can reduce the time taken to boot the app but if your application
+  # requires the Devise mappings to be loaded during boot time the application
+  # won't boot properly.
+  # config.reload_routes = true
+
+  # ==> Configuration for :database_authenticatable
+  # For bcrypt, this is the cost for hashing the password and defaults to 11. If
+  # using other algorithms, it sets how many times you want the password to be hashed.
+  #
+  # Limiting the stretches to just one in testing will increase the performance of
+  # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
+  # a value less than 10 in other environments. Note that, for bcrypt (the default
+  # algorithm), the cost increases exponentially with the number of stretches (e.g.
+  # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
+  config.stretches = Rails.env.test? ? 1 : 11
+
+  # Set up a pepper to generate the hashed password.
+  # config.pepper = '8418e7b6737501cb164523f27cb693b465ef54c2d83fc9678d0cee5342a231af7a2ca594090d32da094e1270bf7570599bf7f948b420bd2da8f677863e9d11e2'
+
+  # Send a notification to the original email when the user's email is changed.
+  # config.send_email_changed_notification = false
+
+  # Send a notification email when the user's password is changed.
+  # config.send_password_change_notification = false
+
+  # ==> Configuration for :confirmable
+  # A period that the user is allowed to access the website even without
+  # confirming their account. For instance, if set to 2.days, the user will be
+  # able to access the website for two days without confirming their account,
+  # access will be blocked just in the third day. Default is 0.days, meaning
+  # the user cannot access the website without confirming their account.
+  # config.allow_unconfirmed_access_for = 2.days
+
+  # A period that the user is allowed to confirm their account before their
+  # token becomes invalid. For example, if set to 3.days, the user can confirm
+  # their account within 3 days after the mail was sent, but on the fourth day
+  # their account can't be confirmed with the token any more.
+  # Default is nil, meaning there is no restriction on how long a user can take
+  # before confirming their account.
+  # config.confirm_within = 3.days
+
+  # If true, requires any email changes to be confirmed (exactly the same way as
+  # initial account confirmation) to be applied. Requires additional unconfirmed_email
+  # db field (see migrations). Until confirmed, new email is stored in
+  # unconfirmed_email column, and copied to email column on successful confirmation.
+  config.reconfirmable = true
+
+  # Defines which key will be used when confirming an account
+  # config.confirmation_keys = [:email]
+
+  # ==> Configuration for :rememberable
+  # The time the user will be remembered without asking for credentials again.
+  # config.remember_for = 2.weeks
+
+  # Invalidates all the remember me tokens when the user signs out.
+  config.expire_all_remember_me_on_sign_out = true
+
+  # If true, extends the user's remember period when remembered via cookie.
+  # config.extend_remember_period = false
+
+  # Options to be passed to the created cookie. For instance, you can set
+  # secure: true in order to force SSL only cookies.
+  # config.rememberable_options = {}
+
+  # ==> Configuration for :validatable
+  # Range for password length.
+  config.password_length = 6..128
+
+  # Email regex used to validate email formats. It simply asserts that
+  # one (and only one) @ exists in the given string. This is mainly
+  # to give user feedback and not to assert the e-mail validity.
+  config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
+
+  # ==> Configuration for :timeoutable
+  # The time you want to timeout the user session without activity. After this
+  # time the user will be asked for credentials again. Default is 30 minutes.
+  # config.timeout_in = 30.minutes
+
+  # ==> Configuration for :lockable
+  # Defines which strategy will be used to lock an account.
+  # :failed_attempts = Locks an account after a number of failed attempts to sign in.
+  # :none            = No lock strategy. You should handle locking by yourself.
+  # config.lock_strategy = :failed_attempts
+
+  # Defines which key will be used when locking and unlocking an account
+  # config.unlock_keys = [:email]
+
+  # Defines which strategy will be used to unlock an account.
+  # :email = Sends an unlock link to the user email
+  # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
+  # :both  = Enables both strategies
+  # :none  = No unlock strategy. You should handle unlocking by yourself.
+  # config.unlock_strategy = :both
+
+  # Number of authentication tries before locking an account if lock_strategy
+  # is failed attempts.
+  # config.maximum_attempts = 20
+
+  # Time interval to unlock the account if :time is enabled as unlock_strategy.
+  # config.unlock_in = 1.hour
+
+  # Warn on the last attempt before the account is locked.
+  # config.last_attempt_warning = true
+
+  # ==> Configuration for :recoverable
+  #
+  # Defines which key will be used when recovering the password for an account
+  # config.reset_password_keys = [:email]
+
+  # Time interval you can reset your password with a reset password key.
+  # Don't put a too small interval or your users won't have the time to
+  # change their passwords.
+  config.reset_password_within = 6.hours
+
+  # When set to false, does not sign a user in automatically after their password is
+  # reset. Defaults to true, so a user is signed in automatically after a reset.
+  # config.sign_in_after_reset_password = true
+
+  # ==> Configuration for :encryptable
+  # Allow you to use another hashing or encryption algorithm besides bcrypt (default).
+  # You can use :sha1, :sha512 or algorithms from others authentication tools as
+  # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20
+  # for default behavior) and :restful_authentication_sha1 (then you should set
+  # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
+  #
+  # Require the `devise-encryptable` gem when using anything other than bcrypt
+  # config.encryptor = :sha512
+
+  # ==> Scopes configuration
+  # Turn scoped views on. Before rendering "sessions/new", it will first check for
+  # "users/sessions/new". It's turned off by default because it's slower if you
+  # are using only default views.
+  # config.scoped_views = false
+
+  # Configure the default scope given to Warden. By default it's the first
+  # devise role declared in your routes (usually :user).
+  # config.default_scope = :user
+
+  # Set this configuration to false if you want /users/sign_out to sign out
+  # only the current scope. By default, Devise signs out all scopes.
+  # config.sign_out_all_scopes = true
+
+  # ==> Navigation configuration
+  # Lists the formats that should be treated as navigational. Formats like
+  # :html, should redirect to the sign in page when the user does not have
+  # access, but formats like :xml or :json, should return 401.
+  #
+  # If you have any extra navigational formats, like :iphone or :mobile, you
+  # should add them to the navigational formats lists.
+  #
+  # The "*/*" below is required to match Internet Explorer requests.
+  # config.navigational_formats = ['*/*', :html]
+
+  # The default HTTP method used to sign out a resource. Default is :delete.
+  config.sign_out_via = :delete
+
+  # ==> OmniAuth
+  # Add a new OmniAuth provider. Check the wiki for more information on setting
+  # up on your models and hooks.
+  # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
+
+  # ==> Warden configuration
+  # If you want to use other strategies, that are not supported by Devise, or
+  # change the failure app, you can configure them inside the config.warden block.
+  #
+  # config.warden do |manager|
+  #   manager.intercept_401 = false
+  #   manager.default_strategies(scope: :user).unshift :some_external_strategy
+  # end
+
+  # ==> Mountable engine configurations
+  # When using Devise inside an engine, let's call it `MyEngine`, and this engine
+  # is mountable, there are some extra configurations to be taken into account.
+  # The following options are available, assuming the engine is mounted as:
+  #
+  #     mount MyEngine, at: '/my_engine'
+  #
+  # The router that invoked `devise_for`, in the example above, would be:
+  # config.router_name = :my_engine
+  #
+  # When using OmniAuth, Devise cannot automatically set OmniAuth path,
+  # so you need to do it manually. For the users scope, it would be:
+  # config.omniauth_path_prefix = '/my_engine/users/auth'
+end
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
new file mode 100644
index 0000000..4a994e1
--- /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 0000000..ac033bf
--- /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/kaminari_config.rb b/config/initializers/kaminari_config.rb
new file mode 100644
index 0000000..f97fc45
--- /dev/null
+++ b/config/initializers/kaminari_config.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+Kaminari.configure do |config|
+  config.default_per_page = 15
+  # config.max_per_page = nil
+  # config.window = 4
+  # config.outer_window = 0
+  # config.left = 0
+  # config.right = 0
+  # config.page_method_name = :page
+  # config.param_name = :page
+  # config.params_on_first_page = false
+end
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
new file mode 100644
index 0000000..dc18996
--- /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 0000000..bbfc396
--- /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/devise.en.yml b/config/locales/devise.en.yml
new file mode 100644
index 0000000..0b8f130
--- /dev/null
+++ b/config/locales/devise.en.yml
@@ -0,0 +1,64 @@
+# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+
+en:
+  devise:
+    confirmations:
+      confirmed: "Your email address has been successfully confirmed."
+      send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
+    failure:
+      already_authenticated: "You are already signed in."
+      inactive: "Your account is not activated yet."
+      invalid: "Invalid %{authentication_keys} or password."
+      locked: "Your account is locked."
+      last_attempt: "You have one more attempt before your account is locked."
+      not_found_in_database: "Invalid %{authentication_keys} or password."
+      timeout: "Your session expired. Please sign in again to continue."
+      unauthenticated: "You need to sign in or sign up before continuing."
+      unconfirmed: "You have to confirm your email address before continuing."
+    mailer:
+      confirmation_instructions:
+        subject: "Confirmation instructions"
+      reset_password_instructions:
+        subject: "Reset password instructions"
+      unlock_instructions:
+        subject: "Unlock instructions"
+      email_changed:
+        subject: "Email Changed"
+      password_change:
+        subject: "Password Changed"
+    omniauth_callbacks:
+      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
+      success: "Successfully authenticated from %{kind} account."
+    passwords:
+      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+      send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+      updated: "Your password has been changed successfully. You are now signed in."
+      updated_not_active: "Your password has been changed successfully."
+    registrations:
+      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
+      signed_up: "Welcome! You have signed up successfully."
+      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
+      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
+      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
+      updated: "Your account has been updated successfully."
+    sessions:
+      signed_in: "Signed in successfully."
+      signed_out: "Signed out successfully."
+      already_signed_out: "Signed out successfully."
+    unlocks:
+      send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
+      send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
+      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
+  errors:
+    messages:
+      already_confirmed: "was already confirmed, please try signing in"
+      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
+      expired: "has expired, please request a new one"
+      not_found: "not found"
+      not_locked: "was not locked"
+      not_saved:
+        one: "1 error prohibited this %{resource} from being saved:"
+        other: "%{count} errors prohibited this %{resource} from being saved:"
diff --git a/config/locales/en.yml b/config/locales/en.yml
new file mode 100644
index 0000000..decc5a8
--- /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 0000000..a5eccf8
--- /dev/null
+++ b/config/puma.rb
@@ -0,0 +1,34 @@
+# Puma can serve each request in a thread from an internal thread pool.
+# The `threads` method setting takes two numbers: a minimum and maximum.
+# Any libraries that use thread pools should be configured to match
+# the maximum value specified for Puma. Default is set to 5 threads for minimum
+# and maximum; this matches the default thread size of Active Record.
+#
+threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
+threads threads_count, threads_count
+
+# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
+#
+port        ENV.fetch("PORT") { 3000 }
+
+# Specifies the `environment` that Puma will run in.
+#
+environment ENV.fetch("RAILS_ENV") { "development" }
+
+# Specifies the number of `workers` to boot in clustered mode.
+# Workers are forked webserver processes. If using threads and workers together
+# the concurrency of the application would be max `threads` * `workers`.
+# Workers do not work on JRuby or Windows (both of which do not support
+# processes).
+#
+# workers ENV.fetch("WEB_CONCURRENCY") { 2 }
+
+# Use the `preload_app!` method when specifying a `workers` number.
+# This directive tells Puma to first boot the application and load code
+# before forking the application. This takes advantage of Copy On Write
+# process behavior so workers use less memory.
+#
+# preload_app!
+
+# Allow puma to be restarted by `rails restart` command.
+plugin :tmp_restart
diff --git a/config/routes.rb b/config/routes.rb
new file mode 100644
index 0000000..fb2f295
--- /dev/null
+++ b/config/routes.rb
@@ -0,0 +1,35 @@
+Rails.application.routes.draw do
+  devise_for :users
+  resources :users
+
+  resources :quotes
+  root to: 'quotes#index'
+
+  # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
+
+  get 'admin',     to: 'admin#index'
+  get 'browse',    to: 'quotes#index'
+  get 'flagged',   to: 'admin#flagged'
+  get 'latest',    to: 'quotes#latest'
+  get 'random',    to: 'quotes#random'
+  get 'random1',   to: 'quotes#random1'
+  get 'search',    to: 'quotes#search'
+  get 'submitted', to: 'admin#submitted'
+  get 'top',       to: 'quotes#top'
+
+  resources :quotes do
+    member do
+      get :downvote
+      post :downvote
+      get :upvote
+      post :upvote
+      get :flag
+      post :flag
+      get :unflag
+      post :unflag
+      get :approve
+      post :approve
+    end
+  end
+
+end
diff --git a/config/spring.rb b/config/spring.rb
new file mode 100644
index 0000000..9fa7863
--- /dev/null
+++ b/config/spring.rb
@@ -0,0 +1,6 @@
+%w[
+  .ruby-version
+  .rbenv-vars
+  tmp/restart.txt
+  tmp/caching-dev.txt
+].each { |path| Spring.watch(path) }
diff --git a/config/storage.yml b/config/storage.yml
new file mode 100644
index 0000000..d32f76e
--- /dev/null
+++ b/config/storage.yml
@@ -0,0 +1,34 @@
+test:
+  service: Disk
+  root: <%= Rails.root.join("tmp/storage") %>
+
+local:
+  service: Disk
+  root: <%= Rails.root.join("storage") %>
+
+# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key)
+# amazon:
+#   service: S3
+#   access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %>
+#   secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %>
+#   region: us-east-1
+#   bucket: your_own_bucket
+
+# Remember not to checkin your GCS keyfile to a repository
+# google:
+#   service: GCS
+#   project: your_project
+#   credentials: <%= Rails.root.join("path/to/gcs.keyfile") %>
+#   bucket: your_own_bucket
+
+# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key)
+# microsoft:
+#   service: AzureStorage
+#   storage_account_name: your_account_name
+#   storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %>
+#   container: your_container_name
+
+# mirror:
+#   service: Mirror
+#   primary: local
+#   mirrors: [ amazon, google, microsoft ]
diff --git a/db/migrate/20180512222706_create_quotes.rb b/db/migrate/20180512222706_create_quotes.rb
new file mode 100644
index 0000000..88b57c4
--- /dev/null
+++ b/db/migrate/20180512222706_create_quotes.rb
@@ -0,0 +1,11 @@
+class CreateQuotes < ActiveRecord::Migration[5.2]
+  def change
+    create_table :quotes do |t|
+      t.string :text, null: false
+      t.integer :score, default: 0, null: false
+      t.boolean :approved, default: false, null: false
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20180514024535_add_column_to_quotes.rb b/db/migrate/20180514024535_add_column_to_quotes.rb
new file mode 100644
index 0000000..34dc7f5
--- /dev/null
+++ b/db/migrate/20180514024535_add_column_to_quotes.rb
@@ -0,0 +1,5 @@
+class AddColumnToQuotes < ActiveRecord::Migration[5.2]
+  def change
+    add_column :quotes, :flagged, :boolean
+  end
+end
diff --git a/db/migrate/20180515193424_devise_create_users.rb b/db/migrate/20180515193424_devise_create_users.rb
new file mode 100644
index 0000000..492c558
--- /dev/null
+++ b/db/migrate/20180515193424_devise_create_users.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+class DeviseCreateUsers < ActiveRecord::Migration[5.2]
+  def change
+    create_table :users do |t|
+      ## Database authenticatable
+      t.string :email,              null: false, default: ""
+      t.string :encrypted_password, null: false, default: ""
+
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+
+      ## Rememberable
+      t.datetime :remember_created_at
+
+      ## Trackable
+      t.integer  :sign_in_count, default: 0, null: false
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string   :current_sign_in_ip
+      t.string   :last_sign_in_ip
+
+      ## Confirmable
+      # t.string   :confirmation_token
+      # t.datetime :confirmed_at
+      # t.datetime :confirmation_sent_at
+      # t.string   :unconfirmed_email # Only if using reconfirmable
+
+      ## Lockable
+      # t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
+      # t.string   :unlock_token # Only if unlock strategy is :email or :both
+      # t.datetime :locked_at
+
+
+      t.timestamps null: false
+    end
+
+    add_index :users, :email,                unique: true
+    add_index :users, :reset_password_token, unique: true
+    # add_index :users, :confirmation_token,   unique: true
+    # add_index :users, :unlock_token,         unique: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
new file mode 100644
index 0000000..a1c6006
--- /dev/null
+++ b/db/schema.rb
@@ -0,0 +1,41 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 2018_05_15_193424) do
+
+  create_table "quotes", force: :cascade do |t|
+    t.string "text", null: false
+    t.integer "score", default: 0, null: false
+    t.boolean "approved", default: false, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.boolean "flagged"
+  end
+
+  create_table "users", force: :cascade do |t|
+    t.string "email", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "reset_password_token"
+    t.datetime "reset_password_sent_at"
+    t.datetime "remember_created_at"
+    t.integer "sign_in_count", default: 0, null: false
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.string "current_sign_in_ip"
+    t.string "last_sign_in_ip"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["email"], name: "index_users_on_email", unique: true
+    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
+  end
+
+end
diff --git a/db/seeds.rb b/db/seeds.rb
new file mode 100644
index 0000000..abf85a5
--- /dev/null
+++ b/db/seeds.rb
@@ -0,0 +1,74 @@
+# 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)
+
+User.create!([
+  {email: 'admin@admin.admin', password: 'password'}
+])
+
+Quote.create(approved:true, score:10, text:
+'<Cthon98> hey, if you type in your pw, it will show as stars
+<Cthon98> ********* see!
+<AzureDiamond> hunter2
+<AzureDiamond> doesnt look like stars to me
+<Cthon98> <AzureDiamond> *******
+<Cthon98> thats what I see
+<AzureDiamond> oh, really?
+<Cthon98> Absolutely
+<AzureDiamond> you can go hunter2 my hunter2-ing hunter2
+<AzureDiamond> haha, does that look funny to you?
+<Cthon98> lol, yes. See, when YOU type hunter2, it shows to us as *******
+<AzureDiamond> thats neat, I didnt know IRC did that
+<Cthon98> yep, no matter how many times you type hunter2, it will show to us as *******
+<AzureDiamond> awesome!
+<AzureDiamond> wait, how do you know my pw?
+<Cthon98> er, I just copy pasted YOUR ******\'s and it appears to YOU as hunter2 cause its your pw
+<AzureDiamond> oh, ok.')
+
+Quote.create(approved: false, text: '<erno> hm. I\'ve lost a machine.. literally _lost_. it responds to ping, it works completely, I just can\'t figure out where in my apartment it is.')
+
+Quote.create(approved: true, flagged: true, score: 1, text: '<jeebus> the "bishop" came to our church today
+<jeebus> he was a fucken impostor
+<jeebus> never once moved diagonally')
+
+Quote.create(approved: true, score: 1, text: '< nutbar> [root@linux!/usr/src/bind] grep "{" named.conf.newer | wc -l
+< nutbar>   19314
+< nutbar> [root@linux!/usr/src/bind] grep "}" named.conf.newer | wc -l
+< nutbar>   19313
+< nutbar> [root@linux!/usr/src/bind]
+< nutbar> great
+* nutbar fumes
+< nutbar> one fucking missing }')
+
+Quote.create(approved: true, score: 1, text: '<GaRlic> how you like my new name?
+<drunkers> it stinks')
+Quote.create(approved: true, score: 1, text: '<danie2> do you have a gf?
+<ieatrocks> hahahahahah
+<ieatrocks> wow, thanks for even asking.')
+Quote.create(approved: true, score: 1, text: '<VolteFace`> don\'t you hate it when you shit on the floor, and you can hear it fall but you have no idea where it actually landed, and spend like 5 minutes looking for it
+<peng> ...
+<peng> what?
+<VolteFace`> oh shit
+<VolteFace`> don\'t you hate it when you DROP shit')
+Quote.create(approved: true, score: 1, text: '<fppe> The worst thing about a prostate exam is when he finds out you\'re not a real doctor.')
+Quote.create(approved: true, score: 1, text: '<ednos> technically, I\'m not pedantic')
+Quote.create(approved: true, score: 1, text: '<tttb> Why did the programmer quit his job?
+<tttb> because he didn\'t get arrays')
+Quote.create(approved: true, score: 1, text: '<@apexthief> Okay we have taco tuesday I need other food day of the week ideas
+<@AltRhombu> taco wednesday
+<@AltRhombu> taco thursday')
+Quote.create(approved: true, score: 1, text: '<Papa_Wa> Anyone else struggling to login?
+<Udungoof> i\'m struggling most of the time
+<Udungoof> not necessarily with loginservers though
+<Udongoof> life mostly')
+Quote.create(approved: true, score: 1, text: '')
+Quote.create(approved: true, score: 1, text: '')
+Quote.create(approved: true, score: 1, text: '')
+Quote.create(approved: true, score: 1, text: '')
+Quote.create(approved: true, score: 1, text: '')
+Quote.create(approved: true, score: 1, text: '')
+Quote.create(approved: true, score: 1, text: '')
diff --git a/lib/assets/.keep b/lib/assets/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/lib/tasks/.keep b/lib/tasks/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/log/.keep b/log/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..8cf55e5
--- /dev/null
+++ b/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "rash_on_rails",
+  "private": true,
+  "dependencies": {}
+}
diff --git a/public/404.html b/public/404.html
new file mode 100644
index 0000000..2be3af2
--- /dev/null
+++ b/public/404.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>The page you were looking for doesn't exist (404)</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style>
+  .rails-default-error-page {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+    margin: 0;
+  }
+
+  .rails-default-error-page div.dialog {
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+
+  .rails-default-error-page div.dialog > div {
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+
+  .rails-default-error-page h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  .rails-default-error-page div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  </style>
+</head>
+
+<body class="rails-default-error-page">
+  <!-- This file lives in public/404.html -->
+  <div class="dialog">
+    <div>
+      <h1>The page you were looking for doesn't exist.</h1>
+      <p>You may have mistyped the address or the page may have moved.</p>
+    </div>
+    <p>If you are the application owner check the logs for more information.</p>
+  </div>
+</body>
+</html>
diff --git a/public/422.html b/public/422.html
new file mode 100644
index 0000000..c08eac0
--- /dev/null
+++ b/public/422.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>The change you wanted was rejected (422)</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style>
+  .rails-default-error-page {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+    margin: 0;
+  }
+
+  .rails-default-error-page div.dialog {
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+
+  .rails-default-error-page div.dialog > div {
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+
+  .rails-default-error-page h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  .rails-default-error-page div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  </style>
+</head>
+
+<body class="rails-default-error-page">
+  <!-- This file lives in public/422.html -->
+  <div class="dialog">
+    <div>
+      <h1>The change you wanted was rejected.</h1>
+      <p>Maybe you tried to change something you didn't have access to.</p>
+    </div>
+    <p>If you are the application owner check the logs for more information.</p>
+  </div>
+</body>
+</html>
diff --git a/public/500.html b/public/500.html
new file mode 100644
index 0000000..78a030a
--- /dev/null
+++ b/public/500.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>We're sorry, but something went wrong (500)</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style>
+  .rails-default-error-page {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+    margin: 0;
+  }
+
+  .rails-default-error-page div.dialog {
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+
+  .rails-default-error-page div.dialog > div {
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+
+  .rails-default-error-page h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  .rails-default-error-page div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  </style>
+</head>
+
+<body class="rails-default-error-page">
+  <!-- This file lives in public/500.html -->
+  <div class="dialog">
+    <div>
+      <h1>We're sorry, but something went wrong.</h1>
+    </div>
+    <p>If you are the application owner check the logs for more information.</p>
+  </div>
+</body>
+</html>
diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png
new file mode 100644
index 0000000..e69de29
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
new file mode 100644
index 0000000..e69de29
diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 0000000..e69de29
diff --git a/public/robots.txt b/public/robots.txt
new file mode 100644
index 0000000..37b576a
--- /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 0000000..d19212a
--- /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 0000000..e69de29
diff --git a/test/controllers/quotes_controller_test.rb b/test/controllers/quotes_controller_test.rb
new file mode 100644
index 0000000..5ad1b34
--- /dev/null
+++ b/test/controllers/quotes_controller_test.rb
@@ -0,0 +1,48 @@
+require 'test_helper'
+
+class QuotesControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @quote = quotes(:one)
+  end
+
+  test "should get index" do
+    get quotes_url
+    assert_response :success
+  end
+
+  test "should get new" do
+    get new_quote_url
+    assert_response :success
+  end
+
+  test "should create quote" do
+    assert_difference('Quote.count') do
+      post quotes_url, params: { quote: { score: @quote.score, text: @quote.text } }
+    end
+
+    assert_redirected_to quote_url(Quote.last)
+  end
+
+  test "should show quote" do
+    get quote_url(@quote)
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get edit_quote_url(@quote)
+    assert_response :success
+  end
+
+  test "should update quote" do
+    patch quote_url(@quote), params: { quote: { score: @quote.score, text: @quote.text } }
+    assert_redirected_to quote_url(@quote)
+  end
+
+  test "should destroy quote" do
+    assert_difference('Quote.count', -1) do
+      delete quote_url(@quote)
+    end
+
+    assert_redirected_to quotes_url
+  end
+end
diff --git a/test/fixtures/.keep b/test/fixtures/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/test/fixtures/quotes.yml b/test/fixtures/quotes.yml
new file mode 100644
index 0000000..e02d924
--- /dev/null
+++ b/test/fixtures/quotes.yml
@@ -0,0 +1,9 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  text: MyString
+  score: 1
+
+two:
+  text: MyString
+  score: 1
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
new file mode 100644
index 0000000..80aed36
--- /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/helpers/.keep b/test/helpers/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/test/integration/.keep b/test/integration/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/test/mailers/.keep b/test/mailers/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/test/models/.keep b/test/models/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/test/models/quote_test.rb b/test/models/quote_test.rb
new file mode 100644
index 0000000..1662c08
--- /dev/null
+++ b/test/models/quote_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class QuoteTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
new file mode 100644
index 0000000..82f61e0
--- /dev/null
+++ b/test/models/user_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class UserTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/system/.keep b/test/system/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/test/system/quotes_test.rb b/test/system/quotes_test.rb
new file mode 100644
index 0000000..e2861a8
--- /dev/null
+++ b/test/system/quotes_test.rb
@@ -0,0 +1,45 @@
+require "application_system_test_case"
+
+class QuotesTest < ApplicationSystemTestCase
+  setup do
+    @quote = quotes(:one)
+  end
+
+  test "visiting the index" do
+    visit quotes_url
+    assert_selector "h1", text: "Quotes"
+  end
+
+  test "creating a Quote" do
+    visit quotes_url
+    click_on "New Quote"
+
+    fill_in "Score", with: @quote.score
+    fill_in "Text", with: @quote.text
+    click_on "Create Quote"
+
+    assert_text "Quote was successfully created"
+    click_on "Back"
+  end
+
+  test "updating a Quote" do
+    visit quotes_url
+    click_on "Edit", match: :first
+
+    fill_in "Score", with: @quote.score
+    fill_in "Text", with: @quote.text
+    click_on "Update Quote"
+
+    assert_text "Quote was successfully updated"
+    click_on "Back"
+  end
+
+  test "destroying a Quote" do
+    visit quotes_url
+    page.accept_confirm do
+      click_on "Destroy", match: :first
+    end
+
+    assert_text "Quote was successfully destroyed"
+  end
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
new file mode 100644
index 0000000..3ab84e3
--- /dev/null
+++ b/test/test_helper.rb
@@ -0,0 +1,10 @@
+ENV['RAILS_ENV'] ||= 'test'
+require_relative '../config/environment'
+require 'rails/test_help'
+
+class ActiveSupport::TestCase
+  # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
+  fixtures :all
+
+  # Add more helper methods to be used by all tests here...
+end
diff --git a/tmp/.keep b/tmp/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/vendor/.keep b/vendor/.keep
new file mode 100644
index 0000000..e69de29

From 1c21e8d4624da08ccaaf71a5f2f713959aa02cc0 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Wed, 16 May 2018 19:23:27 -0400
Subject: [PATCH 053/148] add approve method

---
 app/controllers/quotes_controller.rb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 14d5798..1a2b761 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -45,6 +45,24 @@ def upvote
     end
   end
 
+  # GET /quotes/1/approve
+  # POST /quotes/1/approve
+  def approve
+    authenticate_user!
+    @quote = Quote.find(params[:id])
+    @quote.update(approved: true)
+    respond_to do |format|
+      if @quote.save
+        format.html { redirect_to @quote, notice: 'Quote was successfully approved.' }
+        format.json { render :show, status: :ok, location: @quote }
+      else
+        format.html { render :edit }
+        format.json { render json: @quote.errors, status: :unprocessable_entity }
+      end
+    end
+
+  end
+
   # GET /quotes/1/flag
   # POST /quotes/1/flag
   def flag

From e966149c30369326115c0ecf83b8b37044410dc6 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Wed, 16 May 2018 19:23:40 -0400
Subject: [PATCH 054/148] cleanup views

---
 app/views/admin/_navbar.html.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/admin/_navbar.html.erb b/app/views/admin/_navbar.html.erb
index 64ee198..06e7191 100644
--- a/app/views/admin/_navbar.html.erb
+++ b/app/views/admin/_navbar.html.erb
@@ -3,16 +3,16 @@
 	<nav class="navbar navbar-expand-md navbar-right" role="navigation">
 		<ul class="navbar-nav">
 			<li class="nav-item">				
-				<%= link_to "Flagged Quotes", '/flagged', class: 'nav-link' %>
+				<%= link_to 'Flagged Quotes', '/flagged', class: 'nav-link' %>
 			</li>			
 			<li class="nav-item">
-				<%= link_to "Submitted Quotes", '/submitted', class: 'nav-link' %>
+				<%= link_to 'Submitted Quotes', '/submitted', class: 'nav-link' %>
 			</li>
-			<li class="nav-item">				
-				<%= link_to "Users", '/users', class: 'nav-link' %>
+			<li class="nav-item">
+				<%= link_to 'Users', '/users', class: 'nav-link' %>
 			</li>
 			<li class="nav-item">
-				<%= link_to "Logout", destroy_user_session_path, :method => :delete, class: 'nav-link' %>
+				<%= link_to 'Logout', destroy_user_session_path, :method => :delete, class: 'nav-link' %>
 			</li>
 	</nav>
 </div>

From 0c68181f3779e5d5c7be363536cb4c732fb5c229 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Wed, 16 May 2018 19:23:49 -0400
Subject: [PATCH 055/148] grammar logic in admin home

---
 app/views/admin/index.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/index.html.erb b/app/views/admin/index.html.erb
index b5c1c63..2da49ce 100644
--- a/app/views/admin/index.html.erb
+++ b/app/views/admin/index.html.erb
@@ -1,4 +1,4 @@
 Hello, admin.
 <br />
-<p>You have <%= @flagged_quotes.count %> flagged quotes pending review.</p>
-<p> You have <%= @submitted_quotes.count %> submitted quotes pending review.</p>
\ No newline at end of file
+<p>You have <%= @flagged_quotes.count %> flagged quote<%= 's' if @flagged_quotes.count > 1 %> pending review.</p>
+<p> You have <%= @submitted_quotes.count %> submitted quote<%= 's' if @submitted_quotes.count > 1 %> pending review.</p>
\ No newline at end of file

From 5a2839503f3e711795b3a16c396f1bbaaca0d7d5 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Wed, 16 May 2018 19:36:54 -0400
Subject: [PATCH 056/148] add fields to json

---
 app/views/quotes/_quote.json.jbuilder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/quotes/_quote.json.jbuilder b/app/views/quotes/_quote.json.jbuilder
index d963cbf..70b97b0 100644
--- a/app/views/quotes/_quote.json.jbuilder
+++ b/app/views/quotes/_quote.json.jbuilder
@@ -1,2 +1,2 @@
-json.extract! quote, :id, :text, :score, :created_at, :updated_at
+json.extract! quote, :id, :text, :score, :created_at, :updated_at, :approved, :flagged
 json.url quote_url(quote, format: :json)

From 2ce87871f8fd3287f2dbdd2ab54e3461129d938b Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Wed, 16 May 2018 21:14:07 -0400
Subject: [PATCH 057/148] fix unflag/approve

---
 app/controllers/quotes_controller.rb | 7 ++++++-
 app/views/quotes/_show.html.erb      | 4 ++--
 app/views/quotes/new.html.erb        | 6 +-----
 config/routes.rb                     | 1 -
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 1a2b761..3199dd0 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -13,6 +13,11 @@ def show
     @quotes = [Quote.find(params[:id])]
   end
 
+  # GET /quotes/new
+  def new
+    @quote = Quote.new
+  end
+
   # GET /quotes/1/downvote
   # POST /quotes/1/downvote
   def downvote
@@ -82,7 +87,7 @@ def flag
   # GET /quotes/1/unflag
   # POST /quotes/1/unflag
   def unflag
-    authenticate_user!
+    authenticate_user! unless user_signed_in?
     @quote = Quote.find(params[:id])
     @quote.update(flagged: false)
     respond_to do |format|
diff --git a/app/views/quotes/_show.html.erb b/app/views/quotes/_show.html.erb
index 3387c9f..5501734 100644
--- a/app/views/quotes/_show.html.erb
+++ b/app/views/quotes/_show.html.erb
@@ -3,10 +3,10 @@
 <% if user_signed_in? -%>
 	<%= link_to 'Delete', quote, method: :delete, data: { confirm: 'Are you sure you want to delete this quote?' } %>
 	<% if quote.flagged == true -%>
-	  <%= link_to 'Unflag', quote, method: :unflag, data: { confirm: 'Are you sure you want to unflag this quote?' } %>
+	  <%= link_to 'Unflag', "/quotes/#{quote.id}/unflag", method: :get, data: { confirm: 'Are you sure you want to unflag this quote?' } %>
   <% end %>
 	<% if quote.approved == false -%>
-	  <%= link_to 'Approve', quote, method: :approve, data: { confirm: 'Are you sure you want to approve this quote?' } %>
+	  <%= link_to 'Approve', "/quotes/#{quote.id}/approve", method: :get, data: { confirm: 'Are you sure you want to approve this quote?' } %>
 	<% end %>
 <% else -%>
 	<%= link_to '[X]', "/quotes/#{quote.id}/flag", method: :get, data: { confirm: 'Are you sure you want to flag this quote for review?' } %>
diff --git a/app/views/quotes/new.html.erb b/app/views/quotes/new.html.erb
index b7a2679..176da83 100644
--- a/app/views/quotes/new.html.erb
+++ b/app/views/quotes/new.html.erb
@@ -1,5 +1 @@
-<h1>New Quote</h1>
-
-<%= render 'form', quote: @quote %>
-
-<%= link_to 'Back', quotes_path %>
+<%= render 'form', quote: @quote %>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index fb2f295..00290b3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,7 +2,6 @@
   devise_for :users
   resources :users
 
-  resources :quotes
   root to: 'quotes#index'
 
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html

From a42f6fb1fab26d007529f9827ba7402878235bf8 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Wed, 16 May 2018 23:29:20 -0400
Subject: [PATCH 058/148] cleanup

---
 app/controllers/admin_controller.rb | 30 ++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index f708889..de69387 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -5,15 +5,6 @@ class AdminController < ApplicationController
   def index
   	@flagged_quotes = Quote.where(flagged: true)
   	@submitted_quotes = Quote.where(approved: false)
-
-  	# if user_signed_in? 
-  	# show admin navigation in main section
-  	# links to:
-  	# submitted quote review
-  	# flagged quote review
-  	# user management
-  	#
-  	# otherwise send to login page
   end
 
   # GET /admin/flagged
@@ -26,4 +17,25 @@ def submitted
     @quotes = Quote.where(approved: false).order(created_at: :asc).page(params[:page])    
   end
 
+  # GET /admin/users
+  def users
+    @users = User.all
+    @newuser = User.new
+  end
+
+  # POST /admin/users
+  def create_user
+    @user = User.new(user_params)
+
+    respond_to do |format|
+      if @user.save
+        format.html { redirect_to @user, notice: 'User was successfully created.' }
+        format.json { render :show, status: :created, location: @user }
+      else
+        format.html { render :new }
+        format.json { render json: @user.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
 end

From 963f294935469a88ad32b0bb2e7cb8c4e78074b9 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Thu, 17 May 2018 22:37:58 -0400
Subject: [PATCH 059/148] h6 in session view

---
 app/views/users/sessions/new.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/sessions/new.html.erb b/app/views/users/sessions/new.html.erb
index 35f174d..70a8f03 100644
--- a/app/views/users/sessions/new.html.erb
+++ b/app/views/users/sessions/new.html.erb
@@ -1,4 +1,4 @@
-<h2>Log in</h2>
+<h6>Log in</h6>
 <div class="form-inline">
   <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
     <div class="field form-control form-control-sm input-sm">

From 4d95b56d1f67b3881dc27726f9b5e9286879344f Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Thu, 17 May 2018 22:38:17 -0400
Subject: [PATCH 060/148] remove confirmations view

---
 app/views/users/confirmations/new.html.erb | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 app/views/users/confirmations/new.html.erb

diff --git a/app/views/users/confirmations/new.html.erb b/app/views/users/confirmations/new.html.erb
deleted file mode 100644
index f8c75d5..0000000
--- a/app/views/users/confirmations/new.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<h2>Resend confirmation instructions</h2>
-
-<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
-  <%= devise_error_messages! %>
-
-  <div class="field">
-    <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true, autocomplete: "email", value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %>
-  </div>
-
-  <div class="actions">
-    <%= f.submit "Resend confirmation instructions" %>
-  </div>
-<% end %>
-
-<%= render "users/shared/links" %>

From 520d5cb0e39f3c1a553b2e44d30adcf5f5a52d8d Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Thu, 17 May 2018 22:38:35 -0400
Subject: [PATCH 061/148] remove confirmation view

---
 app/views/users/mailer/confirmation_instructions.html.erb | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 app/views/users/mailer/confirmation_instructions.html.erb

diff --git a/app/views/users/mailer/confirmation_instructions.html.erb b/app/views/users/mailer/confirmation_instructions.html.erb
deleted file mode 100644
index dc55f64..0000000
--- a/app/views/users/mailer/confirmation_instructions.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<p>Welcome <%= @email %>!</p>
-
-<p>You can confirm your account email through the link below:</p>
-
-<p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %></p>

From 3abbdaf91e49ed554cfa1b96416a42d27f345b9f Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Thu, 17 May 2018 22:38:48 -0400
Subject: [PATCH 062/148] remove registration views

---
 app/views/users/registrations/edit.html.erb | 43 ---------------------
 app/views/users/registrations/new.html.erb  | 29 --------------
 2 files changed, 72 deletions(-)
 delete mode 100644 app/views/users/registrations/edit.html.erb
 delete mode 100644 app/views/users/registrations/new.html.erb

diff --git a/app/views/users/registrations/edit.html.erb b/app/views/users/registrations/edit.html.erb
deleted file mode 100644
index 10ed32a..0000000
--- a/app/views/users/registrations/edit.html.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-<h2>Edit <%= resource_name.to_s.humanize %></h2>
-
-<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
-  <%= devise_error_messages! %>
-
-  <div class="field">
-    <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
-  </div>
-
-  <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
-    <div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div>
-  <% end %>
-
-  <div class="field">
-    <%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
-    <%= f.password_field :password, autocomplete: "off" %>
-    <% if @minimum_password_length %>
-      <br />
-      <em><%= @minimum_password_length %> characters minimum</em>
-    <% end %>
-  </div>
-
-  <div class="field">
-    <%= f.label :password_confirmation %><br />
-    <%= f.password_field :password_confirmation, autocomplete: "off" %>
-  </div>
-
-  <div class="field">
-    <%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
-    <%= f.password_field :current_password, autocomplete: "off" %>
-  </div>
-
-  <div class="actions">
-    <%= f.submit "Update" %>
-  </div>
-<% end %>
-
-<h3>Cancel my account</h3>
-
-<p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %></p>
-
-<%= link_to "Back", :back %>
diff --git a/app/views/users/registrations/new.html.erb b/app/views/users/registrations/new.html.erb
deleted file mode 100644
index 5a1cd1d..0000000
--- a/app/views/users/registrations/new.html.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-<h2>Sign up</h2>
-
-<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
-  <%= devise_error_messages! %>
-
-  <div class="field">
-    <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
-  </div>
-
-  <div class="field">
-    <%= f.label :password %>
-    <% if @minimum_password_length %>
-    <em>(<%= @minimum_password_length %> characters minimum)</em>
-    <% end %><br />
-    <%= f.password_field :password, autocomplete: "off" %>
-  </div>
-
-  <div class="field">
-    <%= f.label :password_confirmation %><br />
-    <%= f.password_field :password_confirmation, autocomplete: "off" %>
-  </div>
-
-  <div class="actions">
-    <%= f.submit "Sign up" %>
-  </div>
-<% end %>
-
-<%= render "users/shared/links" %>

From dd38898da95808f7670bc2e018679a176bec4e97 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Thu, 17 May 2018 22:39:05 -0400
Subject: [PATCH 063/148] verbiage

---
 app/controllers/quotes_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 3199dd0..deb6349 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -198,7 +198,7 @@ def destroy
     authenticate_user!
     @quote.destroy
     respond_to do |format|
-      format.html { redirect_to quotes_url, notice: 'Quote was successfully destroyed.' }
+      format.html { redirect_to quotes_url, notice: 'Quote was successfully deleted.' }
       format.json { head :no_content }
     end
   end

From 9096edc416f2eba87ec41e34d1a916d278709e0e Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Thu, 17 May 2018 22:39:28 -0400
Subject: [PATCH 064/148] remove omniauth stuff

---
 .../users/omniauth_callbacks_controller.rb    | 30 -------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 app/controllers/users/omniauth_callbacks_controller.rb

diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
deleted file mode 100644
index 565c6ed..0000000
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
-  # You should configure your model like this:
-  # devise :omniauthable, omniauth_providers: [:twitter]
-
-  # You should also create an action method in this controller like this:
-  # def twitter
-  # end
-
-  # More info at:
-  # https://github.com/plataformatec/devise#omniauth
-
-  # GET|POST /resource/auth/twitter
-  # def passthru
-  #   super
-  # end
-
-  # GET|POST /users/auth/twitter/callback
-  # def failure
-  #   super
-  # end
-
-  # protected
-
-  # The path used when OmniAuth fails
-  # def after_omniauth_failure_path_for(scope)
-  #   super(scope)
-  # end
-end

From 788579bf90ffd33e41d68284932e49977a3838b9 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Thu, 17 May 2018 22:42:15 -0400
Subject: [PATCH 065/148] users views

---
 app/views/admin/users.html.erb  |  1 +
 app/views/users/_form.html.erb  | 28 ++++++++++++++++++++++++
 app/views/users/_index.html.erb | 38 +++++++++++++++++++++++++++++++++
 app/views/users/index.html.erb  |  1 +
 4 files changed, 68 insertions(+)
 create mode 100644 app/views/admin/users.html.erb
 create mode 100644 app/views/users/_form.html.erb
 create mode 100644 app/views/users/_index.html.erb
 create mode 100644 app/views/users/index.html.erb

diff --git a/app/views/admin/users.html.erb b/app/views/admin/users.html.erb
new file mode 100644
index 0000000..2c53762
--- /dev/null
+++ b/app/views/admin/users.html.erb
@@ -0,0 +1 @@
+<%= render 'users/index', :users => @users %>
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
new file mode 100644
index 0000000..7c33d8e
--- /dev/null
+++ b/app/views/users/_form.html.erb
@@ -0,0 +1,28 @@
+<%= form_with(model: user, local: true) do |f| %>
+
+  <%= devise_error_messages! %>
+
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+  </div>
+
+  <div class="field">
+    <%= f.label :password %>
+    <% if @minimum_password_length %>
+    <em>(<%= @minimum_password_length %> characters minimum)</em>
+    <% end %><br />
+    <%= f.password_field :password, autocomplete: "off" %>
+  </div>
+
+  <div class="field">
+    <%= f.label :password_confirmation %><br />
+    <%= f.password_field :password_confirmation, autocomplete: "off" %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit "Sign up" %>
+  </div>
+<% end %>
+
+<%= render "users/shared/links" %>
\ No newline at end of file
diff --git a/app/views/users/_index.html.erb b/app/views/users/_index.html.erb
new file mode 100644
index 0000000..1efffb6
--- /dev/null
+++ b/app/views/users/_index.html.erb
@@ -0,0 +1,38 @@
+<h6>Users</h6>
+
+<table>
+  <thead>
+    <tr>
+      <th>Email</th>
+      <th>Sign In Count</th>
+      <th>Current Sign In Time</th>
+      <th>Last Sign In</th>
+      <th>Current IP Address</th>
+      <th>Previous IP Address</th>
+      <th>Creation Date</th>
+      <th>Update Date</th>
+      <th colspan="1"></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @users.each do |user| %>
+      <tr>
+        <td><%= user.email %></td>
+        <td><%= user.sign_in_count %></td>
+        <td><%= user.current_sign_in_at %></td>
+        <td><%= user.last_sign_in_at %></td>
+        <td><%= user.current_sign_in_ip %></td>
+        <td><%= user.last_sign_in_ip %></td>
+        <td><%= user.created_at %></td>
+        <td><%= user.updated_at %></td>
+        <td><%= link_to 'Delete', user, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<br />
+
+<h6>New User</h6>
+<%= render 'users/form', user: @newuser %>
\ No newline at end of file
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
new file mode 100644
index 0000000..7d47b5b
--- /dev/null
+++ b/app/views/users/index.html.erb
@@ -0,0 +1 @@
+<%= render 'users/index', :users => @users %>
\ No newline at end of file

From 04da08e0f5ee24691e041911f2077bac6a9edf9d Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Thu, 17 May 2018 22:43:01 -0400
Subject: [PATCH 066/148] users controller

---
 app/controllers/users_controller.rb | 35 +++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 app/controllers/users_controller.rb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
new file mode 100644
index 0000000..5902c3d
--- /dev/null
+++ b/app/controllers/users_controller.rb
@@ -0,0 +1,35 @@
+class UsersController < ApplicationController
+  before_action :authenticate_user!, except: :change_password
+  before_action :set_user, only: [:show, :edit, :update, :destroy]
+
+  def index
+  	@users = User.all
+  	@newuser = User.new
+  end
+
+  # POST /users
+  def create
+    @user = User.new(user_params)
+
+    respond_to do |format|
+      if @user.save
+        format.html { redirect_to '/users', notice: 'User was successfully created.' }
+        format.json { render :show, status: :created, location: @user }
+      else
+        format.html { redirect_to '/users' }
+        format.json { render json: @user.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_user
+      @quote = User.find(params[:id])
+    end
+
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def user_params
+      params.require(:user).permit(:email, :password)
+    end
+end
\ No newline at end of file

From 6ff788fe8641eec03033d6276082897c60f27890 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Thu, 17 May 2018 22:43:37 -0400
Subject: [PATCH 067/148] bunch of weird devise stuff

---
 .../users/registrations_controller.rb         |  9 ++++++---
 app/helpers/users_helper.rb                   | 13 ++++++++++++
 config/routes.rb                              | 20 ++++++++++---------
 3 files changed, 30 insertions(+), 12 deletions(-)
 create mode 100644 app/helpers/users_helper.rb

diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb
index b9e664f..46dbe3f 100644
--- a/app/controllers/users/registrations_controller.rb
+++ b/app/controllers/users/registrations_controller.rb
@@ -4,10 +4,13 @@ class Users::RegistrationsController < Devise::RegistrationsController
   # before_action :configure_sign_up_params, only: [:create]
   # before_action :configure_account_update_params, only: [:update]
 
+  skip_before_filter :require_no_authentication, only: [:new]
+
+
   # GET /resource/sign_up
-  # def new
-  #   super
-  # end
+  def new
+    super
+  end
 
   # POST /resource
   # def create
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
new file mode 100644
index 0000000..0323d33
--- /dev/null
+++ b/app/helpers/users_helper.rb
@@ -0,0 +1,13 @@
+module UsersHelper
+  def resource_name
+    :user
+  end
+
+  def resource
+    @resource ||= User.new
+  end
+
+  def devise_mapping
+    @devise_mapping ||= Devise.mappings[:user]
+  end
+end
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 00290b3..a6f8ed5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,15 +6,17 @@
 
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 
-  get 'admin',     to: 'admin#index'
-  get 'browse',    to: 'quotes#index'
-  get 'flagged',   to: 'admin#flagged'
-  get 'latest',    to: 'quotes#latest'
-  get 'random',    to: 'quotes#random'
-  get 'random1',   to: 'quotes#random1'
-  get 'search',    to: 'quotes#search'
-  get 'submitted', to: 'admin#submitted'
-  get 'top',       to: 'quotes#top'
+  get 'admin',        to: 'admin#index'
+  get 'admin/users',  to: 'admin#users'
+  post 'admin/users', to: 'admin#create_user'
+  get 'browse',       to: 'quotes#index'
+  get 'flagged',      to: 'admin#flagged'
+  get 'latest',       to: 'quotes#latest'
+  get 'random',       to: 'quotes#random'
+  get 'random1',      to: 'quotes#random1'
+  get 'search',       to: 'quotes#search'
+  get 'submitted',    to: 'admin#submitted'
+  get 'top',          to: 'quotes#top'
 
   resources :quotes do
     member do

From 1365cc296d019d5e72fb5bdb5cb88690eabc7f1a Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Thu, 17 May 2018 22:43:42 -0400
Subject: [PATCH 068/148] Revert "bunch of weird devise stuff"

This reverts commit 6ff788fe8641eec03033d6276082897c60f27890.
---
 .../users/registrations_controller.rb         |  9 +++------
 app/helpers/users_helper.rb                   | 13 ------------
 config/routes.rb                              | 20 +++++++++----------
 3 files changed, 12 insertions(+), 30 deletions(-)
 delete mode 100644 app/helpers/users_helper.rb

diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb
index 46dbe3f..b9e664f 100644
--- a/app/controllers/users/registrations_controller.rb
+++ b/app/controllers/users/registrations_controller.rb
@@ -4,13 +4,10 @@ class Users::RegistrationsController < Devise::RegistrationsController
   # before_action :configure_sign_up_params, only: [:create]
   # before_action :configure_account_update_params, only: [:update]
 
-  skip_before_filter :require_no_authentication, only: [:new]
-
-
   # GET /resource/sign_up
-  def new
-    super
-  end
+  # def new
+  #   super
+  # end
 
   # POST /resource
   # def create
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
deleted file mode 100644
index 0323d33..0000000
--- a/app/helpers/users_helper.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module UsersHelper
-  def resource_name
-    :user
-  end
-
-  def resource
-    @resource ||= User.new
-  end
-
-  def devise_mapping
-    @devise_mapping ||= Devise.mappings[:user]
-  end
-end
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index a6f8ed5..00290b3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,17 +6,15 @@
 
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 
-  get 'admin',        to: 'admin#index'
-  get 'admin/users',  to: 'admin#users'
-  post 'admin/users', to: 'admin#create_user'
-  get 'browse',       to: 'quotes#index'
-  get 'flagged',      to: 'admin#flagged'
-  get 'latest',       to: 'quotes#latest'
-  get 'random',       to: 'quotes#random'
-  get 'random1',      to: 'quotes#random1'
-  get 'search',       to: 'quotes#search'
-  get 'submitted',    to: 'admin#submitted'
-  get 'top',          to: 'quotes#top'
+  get 'admin',     to: 'admin#index'
+  get 'browse',    to: 'quotes#index'
+  get 'flagged',   to: 'admin#flagged'
+  get 'latest',    to: 'quotes#latest'
+  get 'random',    to: 'quotes#random'
+  get 'random1',   to: 'quotes#random1'
+  get 'search',    to: 'quotes#search'
+  get 'submitted', to: 'admin#submitted'
+  get 'top',       to: 'quotes#top'
 
   resources :quotes do
     member do

From b6ff496488697b648fd42234737f2cca496487aa Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Thu, 17 May 2018 22:43:37 -0400
Subject: [PATCH 069/148] bunch of weird devise stuff

---
 .../users/registrations_controller.rb         |  9 ++++++---
 app/helpers/users_helper.rb                   | 13 ++++++++++++
 config/routes.rb                              | 20 ++++++++++---------
 3 files changed, 30 insertions(+), 12 deletions(-)
 create mode 100644 app/helpers/users_helper.rb

diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb
index b9e664f..46dbe3f 100644
--- a/app/controllers/users/registrations_controller.rb
+++ b/app/controllers/users/registrations_controller.rb
@@ -4,10 +4,13 @@ class Users::RegistrationsController < Devise::RegistrationsController
   # before_action :configure_sign_up_params, only: [:create]
   # before_action :configure_account_update_params, only: [:update]
 
+  skip_before_filter :require_no_authentication, only: [:new]
+
+
   # GET /resource/sign_up
-  # def new
-  #   super
-  # end
+  def new
+    super
+  end
 
   # POST /resource
   # def create
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
new file mode 100644
index 0000000..0323d33
--- /dev/null
+++ b/app/helpers/users_helper.rb
@@ -0,0 +1,13 @@
+module UsersHelper
+  def resource_name
+    :user
+  end
+
+  def resource
+    @resource ||= User.new
+  end
+
+  def devise_mapping
+    @devise_mapping ||= Devise.mappings[:user]
+  end
+end
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 00290b3..a6f8ed5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,15 +6,17 @@
 
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 
-  get 'admin',     to: 'admin#index'
-  get 'browse',    to: 'quotes#index'
-  get 'flagged',   to: 'admin#flagged'
-  get 'latest',    to: 'quotes#latest'
-  get 'random',    to: 'quotes#random'
-  get 'random1',   to: 'quotes#random1'
-  get 'search',    to: 'quotes#search'
-  get 'submitted', to: 'admin#submitted'
-  get 'top',       to: 'quotes#top'
+  get 'admin',        to: 'admin#index'
+  get 'admin/users',  to: 'admin#users'
+  post 'admin/users', to: 'admin#create_user'
+  get 'browse',       to: 'quotes#index'
+  get 'flagged',      to: 'admin#flagged'
+  get 'latest',       to: 'quotes#latest'
+  get 'random',       to: 'quotes#random'
+  get 'random1',      to: 'quotes#random1'
+  get 'search',       to: 'quotes#search'
+  get 'submitted',    to: 'admin#submitted'
+  get 'top',          to: 'quotes#top'
 
   resources :quotes do
     member do

From f299adf81daae534c601ee3d3f9c47bda891443d Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Sat, 19 May 2018 22:22:17 -0400
Subject: [PATCH 070/148] finish admin panel

---
 Gemfile.lock                                  |  2 +-
 app/controllers/admin_controller.rb           | 22 ----------
 .../users/registrations_controller.rb         |  9 ++--
 app/controllers/users_controller.rb           | 41 ++++++++++++++-----
 app/views/admin/_navbar.html.erb              |  2 +-
 app/views/admin/users.html.erb                |  1 -
 app/views/layouts/application.html.erb        |  3 +-
 app/views/quotes/show.json.jbuilder           |  2 +-
 app/views/users/_form.html.erb                | 33 ++++++++++-----
 app/views/users/_index.html.erb               | 38 -----------------
 app/views/users/index.html.erb                | 39 +++++++++++++++++-
 app/views/users/show.html.erb                 | 29 +++++++++++++
 config/routes.rb                              |  6 +--
 13 files changed, 130 insertions(+), 97 deletions(-)
 delete mode 100644 app/views/admin/users.html.erb
 delete mode 100644 app/views/users/_index.html.erb
 create mode 100644 app/views/users/show.html.erb

diff --git a/Gemfile.lock b/Gemfile.lock
index 4f870f8..b3335cd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -49,7 +49,7 @@ GEM
     arel (9.0.0)
     autoprefixer-rails (8.5.0)
       execjs
-    bcrypt (3.1.11)
+    bcrypt (3.1.12)
     bindex (0.5.0)
     bootsnap (1.3.0)
       msgpack (~> 1.0)
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index de69387..ae531c6 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -16,26 +16,4 @@ def flagged
   def submitted
     @quotes = Quote.where(approved: false).order(created_at: :asc).page(params[:page])    
   end
-
-  # GET /admin/users
-  def users
-    @users = User.all
-    @newuser = User.new
-  end
-
-  # POST /admin/users
-  def create_user
-    @user = User.new(user_params)
-
-    respond_to do |format|
-      if @user.save
-        format.html { redirect_to @user, notice: 'User was successfully created.' }
-        format.json { render :show, status: :created, location: @user }
-      else
-        format.html { render :new }
-        format.json { render json: @user.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
 end
diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb
index 46dbe3f..b9e664f 100644
--- a/app/controllers/users/registrations_controller.rb
+++ b/app/controllers/users/registrations_controller.rb
@@ -4,13 +4,10 @@ class Users::RegistrationsController < Devise::RegistrationsController
   # before_action :configure_sign_up_params, only: [:create]
   # before_action :configure_account_update_params, only: [:update]
 
-  skip_before_filter :require_no_authentication, only: [:new]
-
-
   # GET /resource/sign_up
-  def new
-    super
-  end
+  # def new
+  #   super
+  # end
 
   # POST /resource
   # def create
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 5902c3d..f028bc1 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2,34 +2,53 @@ class UsersController < ApplicationController
   before_action :authenticate_user!, except: :change_password
   before_action :set_user, only: [:show, :edit, :update, :destroy]
 
-  def index
-  	@users = User.all
-  	@newuser = User.new
-  end
-
-  # POST /users
+  # POST /admin/users
   def create
     @user = User.new(user_params)
 
     respond_to do |format|
       if @user.save
-        format.html { redirect_to '/users', notice: 'User was successfully created.' }
-        format.json { render :show, status: :created, location: @user }
+        format.html { redirect_to users_url, notice: 'User was successfully created.' }
+        format.json { render :show, status: :created, location: "/admin/users/#{@user.id}" }
       else
-        format.html { redirect_to '/users' }
+        format.html { redirect_to "/admin/users/#{@user.id}", notice: "User failed to create: #{@user.errors.keys.first.to_s} #{@user.errors.values.first.to_s}" }
         format.json { render json: @user.errors, status: :unprocessable_entity }
       end
     end
   end
 
+
+  # GET /admin/users
+  def index
+    @users = User.all
+    @user = User.new
+  end
+
+  # GET /admin/users/id
+  def show
+    @user = User.find(params[:id])
+  end
+
+  # DELETE /users/1
+  # DELETE /users/1.json
+  def destroy
+    @user.destroy
+    respond_to do |format|
+      format.html { redirect_to users_url, notice: 'User was successfully deleted.' }
+      format.json { head :no_content }
+    end
+  end
+
+
+
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_user
-      @quote = User.find(params[:id])
+      @user = User.find(params[:id])
     end
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def user_params
-      params.require(:user).permit(:email, :password)
+      params.require(:user).permit(:email, :password, :password_confirmation)
     end
 end
\ No newline at end of file
diff --git a/app/views/admin/_navbar.html.erb b/app/views/admin/_navbar.html.erb
index 06e7191..13d6b29 100644
--- a/app/views/admin/_navbar.html.erb
+++ b/app/views/admin/_navbar.html.erb
@@ -9,7 +9,7 @@
 				<%= link_to 'Submitted Quotes', '/submitted', class: 'nav-link' %>
 			</li>
 			<li class="nav-item">
-				<%= link_to 'Users', '/users', class: 'nav-link' %>
+				<%= link_to 'Users', '/admin/users', class: 'nav-link' %>
 			</li>
 			<li class="nav-item">
 				<%= link_to 'Logout', destroy_user_session_path, :method => :delete, class: 'nav-link' %>
diff --git a/app/views/admin/users.html.erb b/app/views/admin/users.html.erb
deleted file mode 100644
index 2c53762..0000000
--- a/app/views/admin/users.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render 'users/index', :users => @users %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 9cc561f..1d45b73 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -29,7 +29,8 @@
 			<div class="row">
 				<div class="col-md-1"></div>			
 				<div class="col-md-10 quotes">
-							<p class="notice"><%= notice %></p><p class="alert"><%= alert %></p>	
+							<% if notice %><p class="notice"><%= notice %></p><% end %>
+							<% if alert %><p class="alert"><%= alert %></p><% end %>
 					<%= yield %>
 				</div>
 				<div class="col-md-1"></div>			
diff --git a/app/views/quotes/show.json.jbuilder b/app/views/quotes/show.json.jbuilder
index 2e771cc..84f88a1 100644
--- a/app/views/quotes/show.json.jbuilder
+++ b/app/views/quotes/show.json.jbuilder
@@ -1 +1 @@
-json.partial! "quotes/quote", quote: @quote
+json.partial! "quotes/show", quote: @quote
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index 7c33d8e..813217f 100644
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -1,28 +1,39 @@
-<%= form_with(model: user, local: true) do |f| %>
+
+<%= form_with model: @user, local: true do |form| %>
+
+  <% if user.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(user.errors.count, "error") %> prohibited this user from being saved:</h2>
+
+      <ul>
+      <% user.errors.full_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
 
   <%= devise_error_messages! %>
 
   <div class="field">
-    <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+    <%= form.label :email %><br />
+    <%= form.email_field :email, autofocus: true, autocomplete: "email" %>
   </div>
 
   <div class="field">
-    <%= f.label :password %>
+    <%= form.label :password %>
     <% if @minimum_password_length %>
     <em>(<%= @minimum_password_length %> characters minimum)</em>
     <% end %><br />
-    <%= f.password_field :password, autocomplete: "off" %>
+    <%= form.password_field :password, autocomplete: "off" %>
   </div>
 
   <div class="field">
-    <%= f.label :password_confirmation %><br />
-    <%= f.password_field :password_confirmation, autocomplete: "off" %>
+    <%= form.label :password_confirmation %><br />
+    <%= form.password_field :password_confirmation, autocomplete: "off" %>
   </div>
 
   <div class="actions">
-    <%= f.submit "Sign up" %>
+    <%= form.submit "Sign up" %>
   </div>
-<% end %>
-
-<%= render "users/shared/links" %>
\ No newline at end of file
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/_index.html.erb b/app/views/users/_index.html.erb
deleted file mode 100644
index 1efffb6..0000000
--- a/app/views/users/_index.html.erb
+++ /dev/null
@@ -1,38 +0,0 @@
-<h6>Users</h6>
-
-<table>
-  <thead>
-    <tr>
-      <th>Email</th>
-      <th>Sign In Count</th>
-      <th>Current Sign In Time</th>
-      <th>Last Sign In</th>
-      <th>Current IP Address</th>
-      <th>Previous IP Address</th>
-      <th>Creation Date</th>
-      <th>Update Date</th>
-      <th colspan="1"></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @users.each do |user| %>
-      <tr>
-        <td><%= user.email %></td>
-        <td><%= user.sign_in_count %></td>
-        <td><%= user.current_sign_in_at %></td>
-        <td><%= user.last_sign_in_at %></td>
-        <td><%= user.current_sign_in_ip %></td>
-        <td><%= user.last_sign_in_ip %></td>
-        <td><%= user.created_at %></td>
-        <td><%= user.updated_at %></td>
-        <td><%= link_to 'Delete', user, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<br />
-
-<h6>New User</h6>
-<%= render 'users/form', user: @newuser %>
\ No newline at end of file
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 7d47b5b..0437d69 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -1 +1,38 @@
-<%= render 'users/index', :users => @users %>
\ No newline at end of file
+<h6>Users</h6>
+
+<table>
+  <thead>
+    <tr>
+      <th>Email</th>
+      <th>Sign In Count</th>
+      <th>Current Sign In Time</th>
+      <th>Last Sign In</th>
+      <th>Current IP Address</th>
+      <th>Previous IP Address</th>
+      <th>Creation Date</th>
+      <th>Update Date</th>
+      <th colspan="1"></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @users.each do |user| %>
+      <tr>
+        <td><%= user.email %></td>
+        <td><%= user.sign_in_count %></td>
+        <td><%= user.current_sign_in_at %></td>
+        <td><%= user.last_sign_in_at %></td>
+        <td><%= user.current_sign_in_ip %></td>
+        <td><%= user.last_sign_in_ip %></td>
+        <td><%= user.created_at %></td>
+        <td><%= user.updated_at %></td>
+        <td><%= link_to 'Delete', user, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<br />
+
+<h6>New User</h6>
+<%= render 'form', user: @user %>
\ No newline at end of file
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
new file mode 100644
index 0000000..a5bf2cd
--- /dev/null
+++ b/app/views/users/show.html.erb
@@ -0,0 +1,29 @@
+<table>
+  <thead>
+    <tr>
+      <th>Email</th>
+      <th>Sign In Count</th>
+      <th>Current Sign In Time</th>
+      <th>Last Sign In</th>
+      <th>Current IP Address</th>
+      <th>Previous IP Address</th>
+      <th>Creation Date</th>
+      <th>Update Date</th>
+      <th colspan="1"></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <tr>
+      <td><%= @user.email %></td>
+      <td><%= @user.sign_in_count %></td>
+      <td><%= @user.current_sign_in_at %></td>
+      <td><%= @user.last_sign_in_at %></td>
+      <td><%= @user.current_sign_in_ip %></td>
+      <td><%= @user.last_sign_in_ip %></td>
+      <td><%= @user.created_at %></td>
+      <td><%= @user.updated_at %></td>
+      <td><%= link_to 'Delete', @user, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+    </tr>
+  </tbody>
+</table>
diff --git a/config/routes.rb b/config/routes.rb
index a6f8ed5..7963545 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,14 +1,14 @@
 Rails.application.routes.draw do
-  devise_for :users
+devise_for :users, controllers: { registrations: 'users/registrations' }
+scope "/admin" do
   resources :users
+end
 
   root to: 'quotes#index'
 
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 
   get 'admin',        to: 'admin#index'
-  get 'admin/users',  to: 'admin#users'
-  post 'admin/users', to: 'admin#create_user'
   get 'browse',       to: 'quotes#index'
   get 'flagged',      to: 'admin#flagged'
   get 'latest',       to: 'quotes#latest'

From b31acb35e2df1377486e4749e61d091464ce6534 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Sat, 19 May 2018 22:25:14 -0400
Subject: [PATCH 071/148] Revert "Merge branch 'admin' into development"

This reverts commit 8dcbcbbceb2a81c7bfc5981142f8889de905dd1b, reversing
changes made to acf764571678531bf8955b67fd067138a5742b09.
---
 Gemfile                                       |   6 -
 Gemfile.lock                                  |  34 ---
 app/assets/stylesheets/application.scss       |  19 --
 app/controllers/admin_controller.rb           |  19 --
 app/controllers/quotes_controller.rb          |  63 ----
 .../users/confirmations_controller.rb         |  30 --
 app/controllers/users/passwords_controller.rb |  34 ---
 .../users/registrations_controller.rb         |  62 ----
 app/controllers/users/sessions_controller.rb  |  27 --
 app/controllers/users/unlocks_controller.rb   |  30 --
 app/controllers/users_controller.rb           |  54 ----
 app/helpers/users_helper.rb                   |  13 -
 app/models/user.rb                            |   6 -
 app/views/admin/_navbar.html.erb              |  19 --
 app/views/admin/flagged.html.erb              |   4 -
 app/views/admin/index.html.erb                |   4 -
 app/views/admin/submitted.html.erb            |   4 -
 app/views/layouts/_navbar.html.erb            |  35 ---
 app/views/layouts/application.html.erb        |  27 --
 app/views/quotes/_quote.json.jbuilder         |   4 -
 app/views/quotes/_show.html.erb               |  16 -
 app/views/quotes/index.html.erb               |   3 -
 app/views/quotes/latest.html.erb              |   3 -
 app/views/quotes/new.html.erb                 |   4 -
 app/views/quotes/random.html.erb              |   3 -
 app/views/quotes/random1.html.erb             |   3 -
 app/views/quotes/search.html.erb              |   3 -
 app/views/quotes/show.html.erb                |   3 -
 app/views/quotes/show.json.jbuilder           |   4 -
 app/views/quotes/top.html.erb                 |   3 -
 app/views/users/_form.html.erb                |  39 ---
 app/views/users/index.html.erb                |  38 ---
 app/views/users/mailer/email_changed.html.erb |   7 -
 .../users/mailer/password_change.html.erb     |   3 -
 .../reset_password_instructions.html.erb      |   8 -
 .../users/mailer/unlock_instructions.html.erb |   7 -
 app/views/users/passwords/edit.html.erb       |  25 --
 app/views/users/passwords/new.html.erb        |  16 -
 app/views/users/sessions/new.html.erb         |  26 --
 app/views/users/shared/_links.html.erb        |  25 --
 app/views/users/show.html.erb                 |  29 --
 app/views/users/unlocks/new.html.erb          |  16 -
 config/environments/development.rb            |   6 -
 config/environments/production.rb             |   6 -
 config/initializers/devise.rb                 | 284 ------------------
 config/locales/devise.en.yml                  |  64 ----
 config/routes.rb                              |  34 +--
 .../20180515193424_devise_create_users.rb     |  44 ---
 db/schema.rb                                  |  24 --
 db/seeds.rb                                   |  57 +---
 test/fixtures/users.yml                       |  11 -
 test/models/user_test.rb                      |   7 -
 52 files changed, 2 insertions(+), 1313 deletions(-)
 delete mode 100644 app/controllers/admin_controller.rb
 delete mode 100644 app/controllers/users/confirmations_controller.rb
 delete mode 100644 app/controllers/users/passwords_controller.rb
 delete mode 100644 app/controllers/users/registrations_controller.rb
 delete mode 100644 app/controllers/users/sessions_controller.rb
 delete mode 100644 app/controllers/users/unlocks_controller.rb
 delete mode 100644 app/controllers/users_controller.rb
 delete mode 100644 app/helpers/users_helper.rb
 delete mode 100644 app/models/user.rb
 delete mode 100644 app/views/admin/_navbar.html.erb
 delete mode 100644 app/views/admin/flagged.html.erb
 delete mode 100644 app/views/admin/index.html.erb
 delete mode 100644 app/views/admin/submitted.html.erb
 delete mode 100644 app/views/layouts/_navbar.html.erb
 delete mode 100644 app/views/users/_form.html.erb
 delete mode 100644 app/views/users/index.html.erb
 delete mode 100644 app/views/users/mailer/email_changed.html.erb
 delete mode 100644 app/views/users/mailer/password_change.html.erb
 delete mode 100644 app/views/users/mailer/reset_password_instructions.html.erb
 delete mode 100644 app/views/users/mailer/unlock_instructions.html.erb
 delete mode 100644 app/views/users/passwords/edit.html.erb
 delete mode 100644 app/views/users/passwords/new.html.erb
 delete mode 100644 app/views/users/sessions/new.html.erb
 delete mode 100644 app/views/users/shared/_links.html.erb
 delete mode 100644 app/views/users/show.html.erb
 delete mode 100644 app/views/users/unlocks/new.html.erb
 delete mode 100644 config/initializers/devise.rb
 delete mode 100644 config/locales/devise.en.yml
 delete mode 100644 db/migrate/20180515193424_devise_create_users.rb
 delete mode 100644 test/fixtures/users.yml
 delete mode 100644 test/models/user_test.rb

diff --git a/Gemfile b/Gemfile
index 3c35914..a7bbf1d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -67,9 +67,3 @@ gem 'jquery-rails'
 
 # Use kaminari gem for pagination
 gem 'kaminari'
-<<<<<<< HEAD
-=======
-
-# Use devise gem for authentication
-gem 'devise'
->>>>>>> admin
diff --git a/Gemfile.lock b/Gemfile.lock
index b018bd9..8c0b4f0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -47,14 +47,8 @@ GEM
     archive-zip (0.11.0)
       io-like (~> 0.3.0)
     arel (9.0.0)
-<<<<<<< HEAD
     autoprefixer-rails (8.4.1)
       execjs
-=======
-    autoprefixer-rails (8.5.0)
-      execjs
-    bcrypt (3.1.12)
->>>>>>> admin
     bindex (0.5.0)
     bootsnap (1.3.0)
       msgpack (~> 1.0)
@@ -85,15 +79,6 @@ GEM
     coffee-script-source (1.12.2)
     concurrent-ruby (1.0.5)
     crass (1.0.4)
-<<<<<<< HEAD
-=======
-    devise (4.4.3)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 6.0)
-      responders
-      warden (~> 1.2.3)
->>>>>>> admin
     erubi (1.7.1)
     execjs (2.7.0)
     ffi (1.9.23)
@@ -142,10 +127,6 @@ GEM
     nio4r (2.3.1)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
-<<<<<<< HEAD
-=======
-    orm_adapter (0.5.0)
->>>>>>> admin
     popper_js (1.12.9)
     public_suffix (3.0.2)
     puma (3.11.4)
@@ -180,12 +161,6 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-<<<<<<< HEAD
-=======
-    responders (2.4.0)
-      actionpack (>= 4.2.0, < 5.3)
-      railties (>= 4.2.0, < 5.3)
->>>>>>> admin
     ruby_dep (1.5.0)
     rubyzip (1.2.1)
     sass (3.5.6)
@@ -225,11 +200,6 @@ GEM
       thread_safe (~> 0.1)
     uglifier (4.1.10)
       execjs (>= 0.3.0, < 3)
-<<<<<<< HEAD
-=======
-    warden (1.2.7)
-      rack (>= 1.0)
->>>>>>> admin
     web-console (3.6.2)
       actionview (>= 5.0)
       activemodel (>= 5.0)
@@ -251,10 +221,6 @@ DEPENDENCIES
   capybara (>= 2.15, < 4.0)
   chromedriver-helper
   coffee-rails (~> 4.2)
-<<<<<<< HEAD
-=======
-  devise
->>>>>>> admin
   jbuilder (~> 2.5)
   jquery-rails
   kaminari
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 4249680..a98debd 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -51,7 +51,6 @@ pre.quote_output{
 	color: #000000;
 	float: right;
 	padding-bottom: 1px;	
-<<<<<<< HEAD
 	padding-top: 1px;
 	max-height: 19pt;
 }
@@ -61,10 +60,6 @@ h1 {
 	color: #fff;
 	font-size: 15pt;
 	font-style: italic;	
-=======
-	padding-top: 2px;
-	max-height: 30pt;
->>>>>>> admin
 }
 
 .quotes {
@@ -83,17 +78,3 @@ h1 {
     border-color: #ddd;
 }
 
-<<<<<<< HEAD
-=======
-#title {
-	color: #fff;
-	font-size: 15pt;
-	font-style: italic;	
-}
-
-.adminlink {
-	color: #f0f0f0;
-	font-size: 10pt;
-}
-
->>>>>>> admin
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
deleted file mode 100644
index ae531c6..0000000
--- a/app/controllers/admin_controller.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-class AdminController < ApplicationController
-  before_action :authenticate_user!
-
-  # GET /admin
-  def index
-  	@flagged_quotes = Quote.where(flagged: true)
-  	@submitted_quotes = Quote.where(approved: false)
-  end
-
-  # GET /admin/flagged
-  def flagged
-    @quotes = Quote.where(flagged: true).order(created_at: :asc).page(params[:page])
-  end
-
-  # GET /admin/submitted
-  def submitted
-    @quotes = Quote.where(approved: false).order(created_at: :asc).page(params[:page])    
-  end
-end
diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 8f03bc5..e33decf 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -13,14 +13,6 @@ def show
     @quotes = [Quote.find(params[:id])]
   end
 
-<<<<<<< HEAD
-=======
-  # GET /quotes/new
-  def new
-    @quote = Quote.new
-  end
-
->>>>>>> admin
   # GET /quotes/1/downvote
   # POST /quotes/1/downvote
   def downvote
@@ -53,27 +45,6 @@ def upvote
     end
   end
 
-<<<<<<< HEAD
-=======
-  # GET /quotes/1/approve
-  # POST /quotes/1/approve
-  def approve
-    authenticate_user!
-    @quote = Quote.find(params[:id])
-    @quote.update(approved: true)
-    respond_to do |format|
-      if @quote.save
-        format.html { redirect_to @quote, notice: 'Quote was successfully approved.' }
-        format.json { render :show, status: :ok, location: @quote }
-      else
-        format.html { render :edit }
-        format.json { render json: @quote.errors, status: :unprocessable_entity }
-      end
-    end
-
-  end
-
->>>>>>> admin
   # GET /quotes/1/flag
   # POST /quotes/1/flag
   def flag
@@ -90,27 +61,9 @@ def flag
     end
   end
 
-<<<<<<< HEAD
   # GET /quotes/new
   def new
     @quote = Quote.new
-=======
-  # GET /quotes/1/unflag
-  # POST /quotes/1/unflag
-  def unflag
-    authenticate_user! unless user_signed_in?
-    @quote = Quote.find(params[:id])
-    @quote.update(flagged: false)
-    respond_to do |format|
-      if @quote.save
-        format.html { redirect_to @quote, notice: 'Quote was successfully unflagged.' }
-        format.json { render :show, status: :ok, location: @quote }
-      else
-        format.html { render :edit }
-        format.json { render json: @quote.errors, status: :unprocessable_entity }
-      end
-    end
->>>>>>> admin
   end
 
   # GET /latest
@@ -119,15 +72,6 @@ def latest
     @quotes = Quote.where(approved: true).order(created_at: :desc).page(params[:page])
   end
 
-<<<<<<< HEAD
-=======
-  # GET /quotes/flagged
-  # GET /quotes/flagged.json
-  def submitted
-    @quotes = Quote.where(approved: false).order(created_at: :asc).page(params[:page])
-  end  
-
->>>>>>> admin
   # GET /top
   # GET /top.json
   def top
@@ -210,16 +154,9 @@ def update
   # DELETE /quotes/1
   # DELETE /quotes/1.json
   def destroy
-<<<<<<< HEAD
     @quote.destroy
     respond_to do |format|
       format.html { redirect_to quotes_url, notice: 'Quote was successfully destroyed.' }
-=======
-    authenticate_user!
-    @quote.destroy
-    respond_to do |format|
-      format.html { redirect_to quotes_url, notice: 'Quote was successfully deleted.' }
->>>>>>> admin
       format.json { head :no_content }
     end
   end
diff --git a/app/controllers/users/confirmations_controller.rb b/app/controllers/users/confirmations_controller.rb
deleted file mode 100644
index fa535c0..0000000
--- a/app/controllers/users/confirmations_controller.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-class Users::ConfirmationsController < Devise::ConfirmationsController
-  # GET /resource/confirmation/new
-  # def new
-  #   super
-  # end
-
-  # POST /resource/confirmation
-  # def create
-  #   super
-  # end
-
-  # GET /resource/confirmation?confirmation_token=abcdef
-  # def show
-  #   super
-  # end
-
-  # protected
-
-  # The path used after resending confirmation instructions.
-  # def after_resending_confirmation_instructions_path_for(resource_name)
-  #   super(resource_name)
-  # end
-
-  # The path used after confirmation.
-  # def after_confirmation_path_for(resource_name, resource)
-  #   super(resource_name, resource)
-  # end
-end
diff --git a/app/controllers/users/passwords_controller.rb b/app/controllers/users/passwords_controller.rb
deleted file mode 100644
index 259dbb0..0000000
--- a/app/controllers/users/passwords_controller.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-class Users::PasswordsController < Devise::PasswordsController
-  # GET /resource/password/new
-  # def new
-  #   super
-  # end
-
-  # POST /resource/password
-  # def create
-  #   super
-  # end
-
-  # GET /resource/password/edit?reset_password_token=abcdef
-  # def edit
-  #   super
-  # end
-
-  # PUT /resource/password
-  # def update
-  #   super
-  # end
-
-  # protected
-
-  # def after_resetting_password_path_for(resource)
-  #   super(resource)
-  # end
-
-  # The path used after sending reset password instructions
-  # def after_sending_reset_password_instructions_path_for(resource_name)
-  #   super(resource_name)
-  # end
-end
diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb
deleted file mode 100644
index b9e664f..0000000
--- a/app/controllers/users/registrations_controller.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-class Users::RegistrationsController < Devise::RegistrationsController
-  # before_action :configure_sign_up_params, only: [:create]
-  # before_action :configure_account_update_params, only: [:update]
-
-  # GET /resource/sign_up
-  # def new
-  #   super
-  # end
-
-  # POST /resource
-  # def create
-  #   super
-  # end
-
-  # GET /resource/edit
-  # def edit
-  #   super
-  # end
-
-  # PUT /resource
-  # def update
-  #   super
-  # end
-
-  # DELETE /resource
-  # def destroy
-  #   super
-  # end
-
-  # GET /resource/cancel
-  # Forces the session data which is usually expired after sign
-  # in to be expired now. This is useful if the user wants to
-  # cancel oauth signing in/up in the middle of the process,
-  # removing all OAuth session data.
-  # def cancel
-  #   super
-  # end
-
-  # protected
-
-  # If you have extra params to permit, append them to the sanitizer.
-  # def configure_sign_up_params
-  #   devise_parameter_sanitizer.permit(:sign_up, keys: [:attribute])
-  # end
-
-  # If you have extra params to permit, append them to the sanitizer.
-  # def configure_account_update_params
-  #   devise_parameter_sanitizer.permit(:account_update, keys: [:attribute])
-  # end
-
-  # The path used after sign up.
-  # def after_sign_up_path_for(resource)
-  #   super(resource)
-  # end
-
-  # The path used after sign up for inactive accounts.
-  # def after_inactive_sign_up_path_for(resource)
-  #   super(resource)
-  # end
-end
diff --git a/app/controllers/users/sessions_controller.rb b/app/controllers/users/sessions_controller.rb
deleted file mode 100644
index a0f9b48..0000000
--- a/app/controllers/users/sessions_controller.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-class Users::SessionsController < Devise::SessionsController
-  # before_action :configure_sign_in_params, only: [:create]
-
-  # GET /resource/sign_in
-  # def new
-  #   super
-  # end
-
-  # POST /resource/sign_in
-  # def create
-  #   super
-  # end
-
-  # DELETE /resource/sign_out
-  # def destroy
-  #   super
-  # end
-
-  # protected
-
-  # If you have extra params to permit, append them to the sanitizer.
-  # def configure_sign_in_params
-  #   devise_parameter_sanitizer.permit(:sign_in, keys: [:attribute])
-  # end
-end
diff --git a/app/controllers/users/unlocks_controller.rb b/app/controllers/users/unlocks_controller.rb
deleted file mode 100644
index 2c410dc..0000000
--- a/app/controllers/users/unlocks_controller.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-class Users::UnlocksController < Devise::UnlocksController
-  # GET /resource/unlock/new
-  # def new
-  #   super
-  # end
-
-  # POST /resource/unlock
-  # def create
-  #   super
-  # end
-
-  # GET /resource/unlock?unlock_token=abcdef
-  # def show
-  #   super
-  # end
-
-  # protected
-
-  # The path used after sending unlock password instructions
-  # def after_sending_unlock_instructions_path_for(resource)
-  #   super(resource)
-  # end
-
-  # The path used after unlocking the resource
-  # def after_unlock_path_for(resource)
-  #   super(resource)
-  # end
-end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
deleted file mode 100644
index f028bc1..0000000
--- a/app/controllers/users_controller.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-class UsersController < ApplicationController
-  before_action :authenticate_user!, except: :change_password
-  before_action :set_user, only: [:show, :edit, :update, :destroy]
-
-  # POST /admin/users
-  def create
-    @user = User.new(user_params)
-
-    respond_to do |format|
-      if @user.save
-        format.html { redirect_to users_url, notice: 'User was successfully created.' }
-        format.json { render :show, status: :created, location: "/admin/users/#{@user.id}" }
-      else
-        format.html { redirect_to "/admin/users/#{@user.id}", notice: "User failed to create: #{@user.errors.keys.first.to_s} #{@user.errors.values.first.to_s}" }
-        format.json { render json: @user.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-
-  # GET /admin/users
-  def index
-    @users = User.all
-    @user = User.new
-  end
-
-  # GET /admin/users/id
-  def show
-    @user = User.find(params[:id])
-  end
-
-  # DELETE /users/1
-  # DELETE /users/1.json
-  def destroy
-    @user.destroy
-    respond_to do |format|
-      format.html { redirect_to users_url, notice: 'User was successfully deleted.' }
-      format.json { head :no_content }
-    end
-  end
-
-
-
-  private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_user
-      @user = User.find(params[:id])
-    end
-
-    # Never trust parameters from the scary internet, only allow the white list through.
-    def user_params
-      params.require(:user).permit(:email, :password, :password_confirmation)
-    end
-end
\ No newline at end of file
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
deleted file mode 100644
index 0323d33..0000000
--- a/app/helpers/users_helper.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module UsersHelper
-  def resource_name
-    :user
-  end
-
-  def resource
-    @resource ||= User.new
-  end
-
-  def devise_mapping
-    @devise_mapping ||= Devise.mappings[:user]
-  end
-end
\ No newline at end of file
diff --git a/app/models/user.rb b/app/models/user.rb
deleted file mode 100644
index b8bdae1..0000000
--- a/app/models/user.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class User < ApplicationRecord
-  # Include default devise modules. Others available are:
-  # :confirmable, :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable,
-         :recoverable, :rememberable, :trackable, :validatable
-end
diff --git a/app/views/admin/_navbar.html.erb b/app/views/admin/_navbar.html.erb
deleted file mode 100644
index 13d6b29..0000000
--- a/app/views/admin/_navbar.html.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="col-md-1"></div>			
-<div class="col-md-10" id="navbar">
-	<nav class="navbar navbar-expand-md navbar-right" role="navigation">
-		<ul class="navbar-nav">
-			<li class="nav-item">				
-				<%= link_to 'Flagged Quotes', '/flagged', class: 'nav-link' %>
-			</li>			
-			<li class="nav-item">
-				<%= link_to 'Submitted Quotes', '/submitted', class: 'nav-link' %>
-			</li>
-			<li class="nav-item">
-				<%= link_to 'Users', '/admin/users', class: 'nav-link' %>
-			</li>
-			<li class="nav-item">
-				<%= link_to 'Logout', destroy_user_session_path, :method => :delete, class: 'nav-link' %>
-			</li>
-	</nav>
-</div>
-<div class="col-md-1"></div>
\ No newline at end of file
diff --git a/app/views/admin/flagged.html.erb b/app/views/admin/flagged.html.erb
deleted file mode 100644
index 44f8d0d..0000000
--- a/app/views/admin/flagged.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<%= paginate(@quotes) %>
-<% @quotes.each do |quote| -%>
-<%= render 'quotes/show', :quote => quote %>
-<% end -%>
\ No newline at end of file
diff --git a/app/views/admin/index.html.erb b/app/views/admin/index.html.erb
deleted file mode 100644
index 2da49ce..0000000
--- a/app/views/admin/index.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-Hello, admin.
-<br />
-<p>You have <%= @flagged_quotes.count %> flagged quote<%= 's' if @flagged_quotes.count > 1 %> pending review.</p>
-<p> You have <%= @submitted_quotes.count %> submitted quote<%= 's' if @submitted_quotes.count > 1 %> pending review.</p>
\ No newline at end of file
diff --git a/app/views/admin/submitted.html.erb b/app/views/admin/submitted.html.erb
deleted file mode 100644
index 44f8d0d..0000000
--- a/app/views/admin/submitted.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<%= paginate(@quotes) %>
-<% @quotes.each do |quote| -%>
-<%= render 'quotes/show', :quote => quote %>
-<% end -%>
\ No newline at end of file
diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb
deleted file mode 100644
index 9d0bd00..0000000
--- a/app/views/layouts/_navbar.html.erb
+++ /dev/null
@@ -1,35 +0,0 @@
-<div class="col-md-1"></div>			
-<div class="col-md-10" id="navbar">
-	<nav class="navbar navbar-expand-md navbar-right" role="navigation">
-		<ul class="navbar-nav">
-			<li class="nav-item">
-				<%= link_to "Home", "/" , class: 'nav-link' %> <!--<span class="sr-only">(current)</span>-->
-			</li>
-			<li class="nav-item">
-				<%= link_to "Latest", "/latest", class: 'nav-link' %>
-			</li>
-			<li class="nav-item">
-				<%= link_to "Browse", "/browse", class: 'nav-link' %>
-			</li>
-			<li class="nav-item">
-				<div class="nav-link">
-					<%= link_to "Random", "/random" %> <%= link_to ">0", "/random1" %>
-				</div>
-			</li>
-			<li class="nav-item">
-				<%= link_to "Top", "/top", class: 'nav-link' %>
-			</li>
-			<li class="nav-item">
-				<strong><%= link_to "Add Quote", "/quotes/new", class: 'nav-link' %></strong>
-			</li>
-			<li class="nav-item">
-				<%= link_to "Search", "/search", class: 'nav-link' %>
-			</li>
-			<li class="nav-item">
-			  <div class="form-inline">
-					#<%= form_tag("/search", method: "get") do %><%= text_field_tag(:quote_id, nil, size: 1, class: "form-control form-control-sm input-sm") %><% end %>
-				</div>
-			</li>
-	</nav>
-</div>
-<div class="col-md-1"></div>
\ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index fed51d6..0b40c14 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -14,45 +14,22 @@
 			<div class="row">
 				<div class="col-md-1"></div>
 				<div class="col-md-10" id="title">
-<<<<<<< HEAD
 					<h1>RQDB</h1>
-=======
-					RQDB <%= link_to 'Admin', '/users/sign_in', class: 'adminlink' %>
->>>>>>> admin
 				</div>
 				<div class="col-md-1"></div>			
 			</div>
 			<div class="row">
-<<<<<<< HEAD
 				<%= render 'quotes/navbar' %>
 			</div>
 			<div class="row">
 				<div class="col-md-1"></div>			
 				<div class="col-md-10 quotes">
-=======
-				<%= render 'layouts/navbar' %>
-			</div>
-			<% if user_signed_in? -%>
-				<div class="row">
-					<%= render 'admin/navbar' %>
-				</div>
-			<% end -%>
-			<div class="row">
-				<div class="col-md-1"></div>			
-				<div class="col-md-10 quotes">
-							<% if notice %><p class="notice"><%= notice %></p><% end %>
-							<% if alert %><p class="alert"><%= alert %></p><% end %>
->>>>>>> admin
 					<%= yield %>
 				</div>
 				<div class="col-md-1"></div>			
 			</div>
 			<div class="row">
-<<<<<<< HEAD
 				<%= render 'quotes/navbar' %>
-=======
-				<%= render 'layouts/navbar' %>
->>>>>>> admin
 			</div>
 			<div class="row">
 				<div class="col-md-1"></div>						
@@ -62,8 +39,4 @@
 				<div class="col-md-1"></div>
 			</div>
 	</body>
-<<<<<<< HEAD
-</html>
-=======
 </html>
->>>>>>> admin
diff --git a/app/views/quotes/_quote.json.jbuilder b/app/views/quotes/_quote.json.jbuilder
index a83e811..d963cbf 100644
--- a/app/views/quotes/_quote.json.jbuilder
+++ b/app/views/quotes/_quote.json.jbuilder
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
 json.extract! quote, :id, :text, :score, :created_at, :updated_at
-=======
-json.extract! quote, :id, :text, :score, :created_at, :updated_at, :approved, :flagged
->>>>>>> admin
 json.url quote_url(quote, format: :json)
diff --git a/app/views/quotes/_show.html.erb b/app/views/quotes/_show.html.erb
index bd7f1d3..769d48b 100644
--- a/app/views/quotes/_show.html.erb
+++ b/app/views/quotes/_show.html.erb
@@ -1,22 +1,6 @@
 <strong><%= link_to "##{quote.id}", quote %></strong>
 <%= link_to '+', "/quotes/#{quote.id}/upvote", method: :get, data: { confirm: 'Are you sure you want to upvote?' } %>(<%= quote.score %>)<%= link_to '-', "/quotes/#{quote.id}/downvote", method: :get, data: { confirm: 'Are you sure you want to downvote?' } %>
-<<<<<<< HEAD
 <%= link_to '[X]', "/quotes/#{quote.id}/flag", method: :get, data: { confirm: 'Are you sure you want to flag this quote for review?' } %>
 <%= link_to 'Delete', quote, method: :delete, data: { confirm: 'Are you sure you want to delete this quote?' } %>
 <br />
 <pre class="quote_output"><%= quote.text %></pre>
-=======
-<% if user_signed_in? -%>
-	<%= link_to 'Delete', quote, method: :delete, data: { confirm: 'Are you sure you want to delete this quote?' } %>
-	<% if quote.flagged == true -%>
-	  <%= link_to 'Unflag', "/quotes/#{quote.id}/unflag", method: :get, data: { confirm: 'Are you sure you want to unflag this quote?' } %>
-  <% end %>
-	<% if quote.approved == false -%>
-	  <%= link_to 'Approve', "/quotes/#{quote.id}/approve", method: :get, data: { confirm: 'Are you sure you want to approve this quote?' } %>
-	<% end %>
-<% else -%>
-	<%= link_to '[X]', "/quotes/#{quote.id}/flag", method: :get, data: { confirm: 'Are you sure you want to flag this quote for review?' } %>
-<% end -%>
-<br />
-<pre class="quote_output"><%= quote.text %></pre>
->>>>>>> admin
diff --git a/app/views/quotes/index.html.erb b/app/views/quotes/index.html.erb
index ad05aa4..3095a0f 100644
--- a/app/views/quotes/index.html.erb
+++ b/app/views/quotes/index.html.erb
@@ -1,7 +1,4 @@
-<<<<<<< HEAD
 <p id="notice"><%= notice %></p>
-=======
->>>>>>> admin
 <%= paginate(@quotes) %>
 <% @quotes.each do |quote| -%>
 <%= render 'quotes/show', :quote => quote %>
diff --git a/app/views/quotes/latest.html.erb b/app/views/quotes/latest.html.erb
index ad05aa4..3095a0f 100644
--- a/app/views/quotes/latest.html.erb
+++ b/app/views/quotes/latest.html.erb
@@ -1,7 +1,4 @@
-<<<<<<< HEAD
 <p id="notice"><%= notice %></p>
-=======
->>>>>>> admin
 <%= paginate(@quotes) %>
 <% @quotes.each do |quote| -%>
 <%= render 'quotes/show', :quote => quote %>
diff --git a/app/views/quotes/new.html.erb b/app/views/quotes/new.html.erb
index a08e77e..b7a2679 100644
--- a/app/views/quotes/new.html.erb
+++ b/app/views/quotes/new.html.erb
@@ -1,9 +1,5 @@
-<<<<<<< HEAD
 <h1>New Quote</h1>
 
 <%= render 'form', quote: @quote %>
 
 <%= link_to 'Back', quotes_path %>
-=======
-<%= render 'form', quote: @quote %>
->>>>>>> admin
diff --git a/app/views/quotes/random.html.erb b/app/views/quotes/random.html.erb
index 7cbee35..09be518 100644
--- a/app/views/quotes/random.html.erb
+++ b/app/views/quotes/random.html.erb
@@ -1,7 +1,4 @@
-<<<<<<< HEAD
 <p id="notice"><%= notice %></p>
-=======
->>>>>>> admin
 <% @quotes.each do |quote| -%>
 <%= render 'quotes/show', :quote => quote %>
 <% end -%>
\ No newline at end of file
diff --git a/app/views/quotes/random1.html.erb b/app/views/quotes/random1.html.erb
index 7cbee35..09be518 100644
--- a/app/views/quotes/random1.html.erb
+++ b/app/views/quotes/random1.html.erb
@@ -1,7 +1,4 @@
-<<<<<<< HEAD
 <p id="notice"><%= notice %></p>
-=======
->>>>>>> admin
 <% @quotes.each do |quote| -%>
 <%= render 'quotes/show', :quote => quote %>
 <% end -%>
\ No newline at end of file
diff --git a/app/views/quotes/search.html.erb b/app/views/quotes/search.html.erb
index 245c9c6..3c2b4d9 100644
--- a/app/views/quotes/search.html.erb
+++ b/app/views/quotes/search.html.erb
@@ -1,5 +1,2 @@
-<<<<<<< HEAD
 <p id="notice"><%= notice %></p>
-=======
->>>>>>> admin
 <%= render 'quotes/show', :quote => @quote %>
\ No newline at end of file
diff --git a/app/views/quotes/show.html.erb b/app/views/quotes/show.html.erb
index 7cbee35..09be518 100644
--- a/app/views/quotes/show.html.erb
+++ b/app/views/quotes/show.html.erb
@@ -1,7 +1,4 @@
-<<<<<<< HEAD
 <p id="notice"><%= notice %></p>
-=======
->>>>>>> admin
 <% @quotes.each do |quote| -%>
 <%= render 'quotes/show', :quote => quote %>
 <% end -%>
\ No newline at end of file
diff --git a/app/views/quotes/show.json.jbuilder b/app/views/quotes/show.json.jbuilder
index 2076705..2e771cc 100644
--- a/app/views/quotes/show.json.jbuilder
+++ b/app/views/quotes/show.json.jbuilder
@@ -1,5 +1 @@
-<<<<<<< HEAD
 json.partial! "quotes/quote", quote: @quote
-=======
-json.partial! "quotes/show", quote: @quote
->>>>>>> admin
diff --git a/app/views/quotes/top.html.erb b/app/views/quotes/top.html.erb
index ad05aa4..3095a0f 100644
--- a/app/views/quotes/top.html.erb
+++ b/app/views/quotes/top.html.erb
@@ -1,7 +1,4 @@
-<<<<<<< HEAD
 <p id="notice"><%= notice %></p>
-=======
->>>>>>> admin
 <%= paginate(@quotes) %>
 <% @quotes.each do |quote| -%>
 <%= render 'quotes/show', :quote => quote %>
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
deleted file mode 100644
index 813217f..0000000
--- a/app/views/users/_form.html.erb
+++ /dev/null
@@ -1,39 +0,0 @@
-
-<%= form_with model: @user, local: true do |form| %>
-
-  <% if user.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize(user.errors.count, "error") %> prohibited this user from being saved:</h2>
-
-      <ul>
-      <% user.errors.full_messages.each do |message| %>
-        <li><%= message %></li>
-      <% end %>
-      </ul>
-    </div>
-  <% end %>
-
-  <%= devise_error_messages! %>
-
-  <div class="field">
-    <%= form.label :email %><br />
-    <%= form.email_field :email, autofocus: true, autocomplete: "email" %>
-  </div>
-
-  <div class="field">
-    <%= form.label :password %>
-    <% if @minimum_password_length %>
-    <em>(<%= @minimum_password_length %> characters minimum)</em>
-    <% end %><br />
-    <%= form.password_field :password, autocomplete: "off" %>
-  </div>
-
-  <div class="field">
-    <%= form.label :password_confirmation %><br />
-    <%= form.password_field :password_confirmation, autocomplete: "off" %>
-  </div>
-
-  <div class="actions">
-    <%= form.submit "Sign up" %>
-  </div>
-<% end %>
\ No newline at end of file
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
deleted file mode 100644
index 0437d69..0000000
--- a/app/views/users/index.html.erb
+++ /dev/null
@@ -1,38 +0,0 @@
-<h6>Users</h6>
-
-<table>
-  <thead>
-    <tr>
-      <th>Email</th>
-      <th>Sign In Count</th>
-      <th>Current Sign In Time</th>
-      <th>Last Sign In</th>
-      <th>Current IP Address</th>
-      <th>Previous IP Address</th>
-      <th>Creation Date</th>
-      <th>Update Date</th>
-      <th colspan="1"></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @users.each do |user| %>
-      <tr>
-        <td><%= user.email %></td>
-        <td><%= user.sign_in_count %></td>
-        <td><%= user.current_sign_in_at %></td>
-        <td><%= user.last_sign_in_at %></td>
-        <td><%= user.current_sign_in_ip %></td>
-        <td><%= user.last_sign_in_ip %></td>
-        <td><%= user.created_at %></td>
-        <td><%= user.updated_at %></td>
-        <td><%= link_to 'Delete', user, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<br />
-
-<h6>New User</h6>
-<%= render 'form', user: @user %>
\ No newline at end of file
diff --git a/app/views/users/mailer/email_changed.html.erb b/app/views/users/mailer/email_changed.html.erb
deleted file mode 100644
index 32f4ba8..0000000
--- a/app/views/users/mailer/email_changed.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<p>Hello <%= @email %>!</p>
-
-<% if @resource.try(:unconfirmed_email?) %>
-  <p>We're contacting you to notify you that your email is being changed to <%= @resource.unconfirmed_email %>.</p>
-<% else %>
-  <p>We're contacting you to notify you that your email has been changed to <%= @resource.email %>.</p>
-<% end %>
diff --git a/app/views/users/mailer/password_change.html.erb b/app/views/users/mailer/password_change.html.erb
deleted file mode 100644
index b41daf4..0000000
--- a/app/views/users/mailer/password_change.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<p>Hello <%= @resource.email %>!</p>
-
-<p>We're contacting you to notify you that your password has been changed.</p>
diff --git a/app/views/users/mailer/reset_password_instructions.html.erb b/app/views/users/mailer/reset_password_instructions.html.erb
deleted file mode 100644
index f667dc1..0000000
--- a/app/views/users/mailer/reset_password_instructions.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<p>Hello <%= @resource.email %>!</p>
-
-<p>Someone has requested a link to change your password. You can do this through the link below.</p>
-
-<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p>
-
-<p>If you didn't request this, please ignore this email.</p>
-<p>Your password won't change until you access the link above and create a new one.</p>
diff --git a/app/views/users/mailer/unlock_instructions.html.erb b/app/views/users/mailer/unlock_instructions.html.erb
deleted file mode 100644
index 41e148b..0000000
--- a/app/views/users/mailer/unlock_instructions.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<p>Hello <%= @resource.email %>!</p>
-
-<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
-
-<p>Click the link below to unlock your account:</p>
-
-<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %></p>
diff --git a/app/views/users/passwords/edit.html.erb b/app/views/users/passwords/edit.html.erb
deleted file mode 100644
index c9f1513..0000000
--- a/app/views/users/passwords/edit.html.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<h2>Change your password</h2>
-
-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
-  <%= devise_error_messages! %>
-  <%= f.hidden_field :reset_password_token %>
-
-  <div class="field">
-    <%= f.label :password, "New password" %><br />
-    <% if @minimum_password_length %>
-      <em>(<%= @minimum_password_length %> characters minimum)</em><br />
-    <% end %>
-    <%= f.password_field :password, autofocus: true, autocomplete: "off" %>
-  </div>
-
-  <div class="field">
-    <%= f.label :password_confirmation, "Confirm new password" %><br />
-    <%= f.password_field :password_confirmation, autocomplete: "off" %>
-  </div>
-
-  <div class="actions">
-    <%= f.submit "Change my password" %>
-  </div>
-<% end %>
-
-<%= render "users/shared/links" %>
diff --git a/app/views/users/passwords/new.html.erb b/app/views/users/passwords/new.html.erb
deleted file mode 100644
index 837bbc8..0000000
--- a/app/views/users/passwords/new.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<h2>Forgot your password?</h2>
-
-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
-  <%= devise_error_messages! %>
-
-  <div class="field">
-    <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
-  </div>
-
-  <div class="actions">
-    <%= f.submit "Send me reset password instructions" %>
-  </div>
-<% end %>
-
-<%= render "users/shared/links" %>
diff --git a/app/views/users/sessions/new.html.erb b/app/views/users/sessions/new.html.erb
deleted file mode 100644
index 70a8f03..0000000
--- a/app/views/users/sessions/new.html.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-<h6>Log in</h6>
-<div class="form-inline">
-  <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
-    <div class="field form-control form-control-sm input-sm">
-      <%= f.label :email %><br />
-      <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
-    </div>
-
-    <div class="field form-control form-control-sm input-sm">
-      <%= f.label :password %><br />
-      <%= f.password_field :password, autocomplete: "off" %>
-    </div>
-
-    <% if devise_mapping.rememberable? -%>
-      <div class="field form-control form-control-sm input-sm">
-        <%= f.check_box :remember_me %>
-        <%= f.label :remember_me %>
-      </div>
-    <% end -%>
-
-    <div class="actions form-control form-control-sm input-sm">
-      <%= f.submit "Log in" %>
-    </div>
-  <% end %>
-</div>
-<%= render "users/shared/links" %>
diff --git a/app/views/users/shared/_links.html.erb b/app/views/users/shared/_links.html.erb
deleted file mode 100644
index e6a3e41..0000000
--- a/app/views/users/shared/_links.html.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<%- if controller_name != 'sessions' %>
-  <%= link_to "Log in", new_session_path(resource_name) %><br />
-<% end -%>
-
-<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
-  <%= link_to "Sign up", new_registration_path(resource_name) %><br />
-<% end -%>
-
-<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
-  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
-<% end -%>
-
-<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
-<% end -%>
-
-<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
-  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
-<% end -%>
-
-<%- if devise_mapping.omniauthable? %>
-  <%- resource_class.omniauth_providers.each do |provider| %>
-    <%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider) %><br />
-  <% end -%>
-<% end -%>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
deleted file mode 100644
index a5bf2cd..0000000
--- a/app/views/users/show.html.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-<table>
-  <thead>
-    <tr>
-      <th>Email</th>
-      <th>Sign In Count</th>
-      <th>Current Sign In Time</th>
-      <th>Last Sign In</th>
-      <th>Current IP Address</th>
-      <th>Previous IP Address</th>
-      <th>Creation Date</th>
-      <th>Update Date</th>
-      <th colspan="1"></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <tr>
-      <td><%= @user.email %></td>
-      <td><%= @user.sign_in_count %></td>
-      <td><%= @user.current_sign_in_at %></td>
-      <td><%= @user.last_sign_in_at %></td>
-      <td><%= @user.current_sign_in_ip %></td>
-      <td><%= @user.last_sign_in_ip %></td>
-      <td><%= @user.created_at %></td>
-      <td><%= @user.updated_at %></td>
-      <td><%= link_to 'Delete', @user, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-    </tr>
-  </tbody>
-</table>
diff --git a/app/views/users/unlocks/new.html.erb b/app/views/users/unlocks/new.html.erb
deleted file mode 100644
index 2ee26bb..0000000
--- a/app/views/users/unlocks/new.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<h2>Resend unlock instructions</h2>
-
-<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
-  <%= devise_error_messages! %>
-
-  <div class="field">
-    <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
-  </div>
-
-  <div class="actions">
-    <%= f.submit "Resend unlock instructions" %>
-  </div>
-<% end %>
-
-<%= render "users/shared/links" %>
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 6cfaf01..1311e3e 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -58,10 +58,4 @@
   # 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
-<<<<<<< HEAD
-=======
-
-  # Set default url_options for devise
-  config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
->>>>>>> admin
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 6270563..da4fafd 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -91,10 +91,4 @@
 
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
-<<<<<<< HEAD
-=======
-
-  # Set default url_options for devise
-  config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
->>>>>>> admin
 end
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
deleted file mode 100644
index d3bc36f..0000000
--- a/config/initializers/devise.rb
+++ /dev/null
@@ -1,284 +0,0 @@
-# frozen_string_literal: true
-
-# Use this hook to configure devise mailer, warden hooks and so forth.
-# Many of these configuration options can be set straight in your model.
-Devise.setup do |config|
-  # The secret key used by Devise. Devise uses this key to generate
-  # random tokens. Changing this key will render invalid all existing
-  # confirmation, reset password and unlock tokens in the database.
-  # Devise will use the `secret_key_base` as its `secret_key`
-  # by default. You can change it below and use your own secret key.
-  # config.secret_key = 'e0ae9c129293cfebc7acc6e777e67a66d30cac325ac0e8e7e993ecbbf16cadaa5a355a41af172fbe90daf9f3341ba10100b14afcd0fd8541624d80cd21e5e391'
-  config.secret_key = `bundle exec rake secret`
-  
-  # ==> Controller configuration
-  # Configure the parent class to the devise controllers.
-  # config.parent_controller = 'DeviseController'
-
-  # ==> Mailer Configuration
-  # Configure the e-mail address which will be shown in Devise::Mailer,
-  # note that it will be overwritten if you use your own mailer class
-  # with default "from" parameter.
-  config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
-
-  # Configure the class responsible to send e-mails.
-  # config.mailer = 'Devise::Mailer'
-
-  # Configure the parent class responsible to send e-mails.
-  # config.parent_mailer = 'ActionMailer::Base'
-
-  # ==> ORM configuration
-  # Load and configure the ORM. Supports :active_record (default) and
-  # :mongoid (bson_ext recommended) by default. Other ORMs may be
-  # available as additional gems.
-  require 'devise/orm/active_record'
-
-  # ==> Configuration for any authentication mechanism
-  # Configure which keys are used when authenticating a user. The default is
-  # just :email. You can configure it to use [:username, :subdomain], so for
-  # authenticating a user, both parameters are required. Remember that those
-  # parameters are used only when authenticating and not when retrieving from
-  # session. If you need permissions, you should implement that in a before filter.
-  # You can also supply a hash where the value is a boolean determining whether
-  # or not authentication should be aborted when the value is not present.
-  # config.authentication_keys = [:email]
-
-  # Configure parameters from the request object used for authentication. Each entry
-  # given should be a request method and it will automatically be passed to the
-  # find_for_authentication method and considered in your model lookup. For instance,
-  # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
-  # The same considerations mentioned for authentication_keys also apply to request_keys.
-  # config.request_keys = []
-
-  # Configure which authentication keys should be case-insensitive.
-  # These keys will be downcased upon creating or modifying a user and when used
-  # to authenticate or find a user. Default is :email.
-  config.case_insensitive_keys = [:email]
-
-  # Configure which authentication keys should have whitespace stripped.
-  # These keys will have whitespace before and after removed upon creating or
-  # modifying a user and when used to authenticate or find a user. Default is :email.
-  config.strip_whitespace_keys = [:email]
-
-  # Tell if authentication through request.params is enabled. True by default.
-  # It can be set to an array that will enable params authentication only for the
-  # given strategies, for example, `config.params_authenticatable = [:database]` will
-  # enable it only for database (email + password) authentication.
-  # config.params_authenticatable = true
-
-  # Tell if authentication through HTTP Auth is enabled. False by default.
-  # It can be set to an array that will enable http authentication only for the
-  # given strategies, for example, `config.http_authenticatable = [:database]` will
-  # enable it only for database authentication. The supported strategies are:
-  # :database      = Support basic authentication with authentication key + password
-  # config.http_authenticatable = false
-
-  # If 401 status code should be returned for AJAX requests. True by default.
-  # config.http_authenticatable_on_xhr = true
-
-  # The realm used in Http Basic Authentication. 'Application' by default.
-  # config.http_authentication_realm = 'Application'
-
-  # It will change confirmation, password recovery and other workflows
-  # to behave the same regardless if the e-mail provided was right or wrong.
-  # Does not affect registerable.
-  # config.paranoid = true
-
-  # By default Devise will store the user in session. You can skip storage for
-  # particular strategies by setting this option.
-  # Notice that if you are skipping storage for all authentication paths, you
-  # may want to disable generating routes to Devise's sessions controller by
-  # passing skip: :sessions to `devise_for` in your config/routes.rb
-  config.skip_session_storage = [:http_auth]
-
-  # By default, Devise cleans up the CSRF token on authentication to
-  # avoid CSRF token fixation attacks. This means that, when using AJAX
-  # requests for sign in and sign up, you need to get a new CSRF token
-  # from the server. You can disable this option at your own risk.
-  # config.clean_up_csrf_token_on_authentication = true
-
-  # When false, Devise will not attempt to reload routes on eager load.
-  # This can reduce the time taken to boot the app but if your application
-  # requires the Devise mappings to be loaded during boot time the application
-  # won't boot properly.
-  # config.reload_routes = true
-
-  # ==> Configuration for :database_authenticatable
-  # For bcrypt, this is the cost for hashing the password and defaults to 11. If
-  # using other algorithms, it sets how many times you want the password to be hashed.
-  #
-  # Limiting the stretches to just one in testing will increase the performance of
-  # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
-  # a value less than 10 in other environments. Note that, for bcrypt (the default
-  # algorithm), the cost increases exponentially with the number of stretches (e.g.
-  # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
-  config.stretches = Rails.env.test? ? 1 : 11
-
-  # Set up a pepper to generate the hashed password.
-  # config.pepper = '8418e7b6737501cb164523f27cb693b465ef54c2d83fc9678d0cee5342a231af7a2ca594090d32da094e1270bf7570599bf7f948b420bd2da8f677863e9d11e2'
-
-  # Send a notification to the original email when the user's email is changed.
-  # config.send_email_changed_notification = false
-
-  # Send a notification email when the user's password is changed.
-  # config.send_password_change_notification = false
-
-  # ==> Configuration for :confirmable
-  # A period that the user is allowed to access the website even without
-  # confirming their account. For instance, if set to 2.days, the user will be
-  # able to access the website for two days without confirming their account,
-  # access will be blocked just in the third day. Default is 0.days, meaning
-  # the user cannot access the website without confirming their account.
-  # config.allow_unconfirmed_access_for = 2.days
-
-  # A period that the user is allowed to confirm their account before their
-  # token becomes invalid. For example, if set to 3.days, the user can confirm
-  # their account within 3 days after the mail was sent, but on the fourth day
-  # their account can't be confirmed with the token any more.
-  # Default is nil, meaning there is no restriction on how long a user can take
-  # before confirming their account.
-  # config.confirm_within = 3.days
-
-  # If true, requires any email changes to be confirmed (exactly the same way as
-  # initial account confirmation) to be applied. Requires additional unconfirmed_email
-  # db field (see migrations). Until confirmed, new email is stored in
-  # unconfirmed_email column, and copied to email column on successful confirmation.
-  config.reconfirmable = true
-
-  # Defines which key will be used when confirming an account
-  # config.confirmation_keys = [:email]
-
-  # ==> Configuration for :rememberable
-  # The time the user will be remembered without asking for credentials again.
-  # config.remember_for = 2.weeks
-
-  # Invalidates all the remember me tokens when the user signs out.
-  config.expire_all_remember_me_on_sign_out = true
-
-  # If true, extends the user's remember period when remembered via cookie.
-  # config.extend_remember_period = false
-
-  # Options to be passed to the created cookie. For instance, you can set
-  # secure: true in order to force SSL only cookies.
-  # config.rememberable_options = {}
-
-  # ==> Configuration for :validatable
-  # Range for password length.
-  config.password_length = 6..128
-
-  # Email regex used to validate email formats. It simply asserts that
-  # one (and only one) @ exists in the given string. This is mainly
-  # to give user feedback and not to assert the e-mail validity.
-  config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
-
-  # ==> Configuration for :timeoutable
-  # The time you want to timeout the user session without activity. After this
-  # time the user will be asked for credentials again. Default is 30 minutes.
-  # config.timeout_in = 30.minutes
-
-  # ==> Configuration for :lockable
-  # Defines which strategy will be used to lock an account.
-  # :failed_attempts = Locks an account after a number of failed attempts to sign in.
-  # :none            = No lock strategy. You should handle locking by yourself.
-  # config.lock_strategy = :failed_attempts
-
-  # Defines which key will be used when locking and unlocking an account
-  # config.unlock_keys = [:email]
-
-  # Defines which strategy will be used to unlock an account.
-  # :email = Sends an unlock link to the user email
-  # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
-  # :both  = Enables both strategies
-  # :none  = No unlock strategy. You should handle unlocking by yourself.
-  # config.unlock_strategy = :both
-
-  # Number of authentication tries before locking an account if lock_strategy
-  # is failed attempts.
-  # config.maximum_attempts = 20
-
-  # Time interval to unlock the account if :time is enabled as unlock_strategy.
-  # config.unlock_in = 1.hour
-
-  # Warn on the last attempt before the account is locked.
-  # config.last_attempt_warning = true
-
-  # ==> Configuration for :recoverable
-  #
-  # Defines which key will be used when recovering the password for an account
-  # config.reset_password_keys = [:email]
-
-  # Time interval you can reset your password with a reset password key.
-  # Don't put a too small interval or your users won't have the time to
-  # change their passwords.
-  config.reset_password_within = 6.hours
-
-  # When set to false, does not sign a user in automatically after their password is
-  # reset. Defaults to true, so a user is signed in automatically after a reset.
-  # config.sign_in_after_reset_password = true
-
-  # ==> Configuration for :encryptable
-  # Allow you to use another hashing or encryption algorithm besides bcrypt (default).
-  # You can use :sha1, :sha512 or algorithms from others authentication tools as
-  # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20
-  # for default behavior) and :restful_authentication_sha1 (then you should set
-  # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
-  #
-  # Require the `devise-encryptable` gem when using anything other than bcrypt
-  # config.encryptor = :sha512
-
-  # ==> Scopes configuration
-  # Turn scoped views on. Before rendering "sessions/new", it will first check for
-  # "users/sessions/new". It's turned off by default because it's slower if you
-  # are using only default views.
-  # config.scoped_views = false
-
-  # Configure the default scope given to Warden. By default it's the first
-  # devise role declared in your routes (usually :user).
-  # config.default_scope = :user
-
-  # Set this configuration to false if you want /users/sign_out to sign out
-  # only the current scope. By default, Devise signs out all scopes.
-  # config.sign_out_all_scopes = true
-
-  # ==> Navigation configuration
-  # Lists the formats that should be treated as navigational. Formats like
-  # :html, should redirect to the sign in page when the user does not have
-  # access, but formats like :xml or :json, should return 401.
-  #
-  # If you have any extra navigational formats, like :iphone or :mobile, you
-  # should add them to the navigational formats lists.
-  #
-  # The "*/*" below is required to match Internet Explorer requests.
-  # config.navigational_formats = ['*/*', :html]
-
-  # The default HTTP method used to sign out a resource. Default is :delete.
-  config.sign_out_via = :delete
-
-  # ==> OmniAuth
-  # Add a new OmniAuth provider. Check the wiki for more information on setting
-  # up on your models and hooks.
-  # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
-
-  # ==> Warden configuration
-  # If you want to use other strategies, that are not supported by Devise, or
-  # change the failure app, you can configure them inside the config.warden block.
-  #
-  # config.warden do |manager|
-  #   manager.intercept_401 = false
-  #   manager.default_strategies(scope: :user).unshift :some_external_strategy
-  # end
-
-  # ==> Mountable engine configurations
-  # When using Devise inside an engine, let's call it `MyEngine`, and this engine
-  # is mountable, there are some extra configurations to be taken into account.
-  # The following options are available, assuming the engine is mounted as:
-  #
-  #     mount MyEngine, at: '/my_engine'
-  #
-  # The router that invoked `devise_for`, in the example above, would be:
-  # config.router_name = :my_engine
-  #
-  # When using OmniAuth, Devise cannot automatically set OmniAuth path,
-  # so you need to do it manually. For the users scope, it would be:
-  # config.omniauth_path_prefix = '/my_engine/users/auth'
-end
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
deleted file mode 100644
index 0b8f130..0000000
--- a/config/locales/devise.en.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
-
-en:
-  devise:
-    confirmations:
-      confirmed: "Your email address has been successfully confirmed."
-      send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
-      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
-    failure:
-      already_authenticated: "You are already signed in."
-      inactive: "Your account is not activated yet."
-      invalid: "Invalid %{authentication_keys} or password."
-      locked: "Your account is locked."
-      last_attempt: "You have one more attempt before your account is locked."
-      not_found_in_database: "Invalid %{authentication_keys} or password."
-      timeout: "Your session expired. Please sign in again to continue."
-      unauthenticated: "You need to sign in or sign up before continuing."
-      unconfirmed: "You have to confirm your email address before continuing."
-    mailer:
-      confirmation_instructions:
-        subject: "Confirmation instructions"
-      reset_password_instructions:
-        subject: "Reset password instructions"
-      unlock_instructions:
-        subject: "Unlock instructions"
-      email_changed:
-        subject: "Email Changed"
-      password_change:
-        subject: "Password Changed"
-    omniauth_callbacks:
-      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
-      success: "Successfully authenticated from %{kind} account."
-    passwords:
-      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
-      send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
-      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
-      updated: "Your password has been changed successfully. You are now signed in."
-      updated_not_active: "Your password has been changed successfully."
-    registrations:
-      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
-      signed_up: "Welcome! You have signed up successfully."
-      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
-      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
-      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
-      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
-      updated: "Your account has been updated successfully."
-    sessions:
-      signed_in: "Signed in successfully."
-      signed_out: "Signed out successfully."
-      already_signed_out: "Signed out successfully."
-    unlocks:
-      send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
-      send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
-      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
-  errors:
-    messages:
-      already_confirmed: "was already confirmed, please try signing in"
-      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
-      expired: "has expired, please request a new one"
-      not_found: "not found"
-      not_locked: "was not locked"
-      not_saved:
-        one: "1 error prohibited this %{resource} from being saved:"
-        other: "%{count} errors prohibited this %{resource} from being saved:"
diff --git a/config/routes.rb b/config/routes.rb
index b23eda2..54e7dca 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,4 @@
 Rails.application.routes.draw do
-<<<<<<< HEAD
   resources :quotes
   root 'quotes#index'
 
@@ -11,26 +10,6 @@
   get 'random1',  to: 'quotes#random1'
   get 'search',   to: 'quotes#search'
   get 'top',      to: 'quotes#top'
-=======
-devise_for :users, controllers: { registrations: 'users/registrations' }
-scope "/admin" do
-  resources :users
-end
-
-  root to: 'quotes#index'
-
-  # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
-
-  get 'admin',        to: 'admin#index'
-  get 'browse',       to: 'quotes#index'
-  get 'flagged',      to: 'admin#flagged'
-  get 'latest',       to: 'quotes#latest'
-  get 'random',       to: 'quotes#random'
-  get 'random1',      to: 'quotes#random1'
-  get 'search',       to: 'quotes#search'
-  get 'submitted',    to: 'admin#submitted'
-  get 'top',          to: 'quotes#top'
->>>>>>> admin
 
   resources :quotes do
     member do
@@ -40,18 +19,7 @@
       post :upvote
       get :flag
       post :flag
-<<<<<<< HEAD
-    end
-  end
-
-end
-=======
-      get :unflag
-      post :unflag
-      get :approve
-      post :approve
     end
   end
 
-end
->>>>>>> admin
+end
\ No newline at end of file
diff --git a/db/migrate/20180515193424_devise_create_users.rb b/db/migrate/20180515193424_devise_create_users.rb
deleted file mode 100644
index 492c558..0000000
--- a/db/migrate/20180515193424_devise_create_users.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-class DeviseCreateUsers < ActiveRecord::Migration[5.2]
-  def change
-    create_table :users do |t|
-      ## Database authenticatable
-      t.string :email,              null: false, default: ""
-      t.string :encrypted_password, null: false, default: ""
-
-      ## Recoverable
-      t.string   :reset_password_token
-      t.datetime :reset_password_sent_at
-
-      ## Rememberable
-      t.datetime :remember_created_at
-
-      ## Trackable
-      t.integer  :sign_in_count, default: 0, null: false
-      t.datetime :current_sign_in_at
-      t.datetime :last_sign_in_at
-      t.string   :current_sign_in_ip
-      t.string   :last_sign_in_ip
-
-      ## Confirmable
-      # t.string   :confirmation_token
-      # t.datetime :confirmed_at
-      # t.datetime :confirmation_sent_at
-      # t.string   :unconfirmed_email # Only if using reconfirmable
-
-      ## Lockable
-      # t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
-      # t.string   :unlock_token # Only if unlock strategy is :email or :both
-      # t.datetime :locked_at
-
-
-      t.timestamps null: false
-    end
-
-    add_index :users, :email,                unique: true
-    add_index :users, :reset_password_token, unique: true
-    # add_index :users, :confirmation_token,   unique: true
-    # add_index :users, :unlock_token,         unique: true
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index 2f32866..9649ca1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,11 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-<<<<<<< HEAD
 ActiveRecord::Schema.define(version: 2018_05_14_024535) do
-=======
-ActiveRecord::Schema.define(version: 2018_05_15_193424) do
->>>>>>> admin
 
   create_table "quotes", force: :cascade do |t|
     t.string "text", null: false
@@ -25,24 +21,4 @@
     t.boolean "flagged"
   end
 
-<<<<<<< HEAD
-=======
-  create_table "users", force: :cascade do |t|
-    t.string "email", default: "", null: false
-    t.string "encrypted_password", default: "", null: false
-    t.string "reset_password_token"
-    t.datetime "reset_password_sent_at"
-    t.datetime "remember_created_at"
-    t.integer "sign_in_count", default: 0, null: false
-    t.datetime "current_sign_in_at"
-    t.datetime "last_sign_in_at"
-    t.string "current_sign_in_ip"
-    t.string "last_sign_in_ip"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["email"], name: "index_users_on_email", unique: true
-    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
-  end
-
->>>>>>> admin
 end
diff --git a/db/seeds.rb b/db/seeds.rb
index f23e3be..aae8976 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -6,13 +6,6 @@
 #   movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
 #   Character.create(name: 'Luke', movie: movies.first)
 
-<<<<<<< HEAD
-=======
-User.create!([
-  {email: 'admin@admin.admin', password: 'password'}
-])
-
->>>>>>> admin
 Quote.create(approved:true, score:10, text:
 '<Cthon98> hey, if you type in your pw, it will show as stars
 <Cthon98> ********* see!
@@ -30,52 +23,4 @@
 <AzureDiamond> awesome!
 <AzureDiamond> wait, how do you know my pw?
 <Cthon98> er, I just copy pasted YOUR ******\'s and it appears to YOU as hunter2 cause its your pw
-<<<<<<< HEAD
-<AzureDiamond> oh, ok.')
-=======
-<AzureDiamond> oh, ok.')
-
-Quote.create(approved: false, text: '<erno> hm. I\'ve lost a machine.. literally _lost_. it responds to ping, it works completely, I just can\'t figure out where in my apartment it is.')
-
-Quote.create(approved: true, flagged: true, score: 1, text: '<jeebus> the "bishop" came to our church today
-<jeebus> he was a fucken impostor
-<jeebus> never once moved diagonally')
-
-Quote.create(approved: true, score: 1, text: '< nutbar> [root@linux!/usr/src/bind] grep "{" named.conf.newer | wc -l
-< nutbar>   19314
-< nutbar> [root@linux!/usr/src/bind] grep "}" named.conf.newer | wc -l
-< nutbar>   19313
-< nutbar> [root@linux!/usr/src/bind]
-< nutbar> great
-* nutbar fumes
-< nutbar> one fucking missing }')
-
-Quote.create(approved: true, score: 1, text: '<GaRlic> how you like my new name?
-<drunkers> it stinks')
-Quote.create(approved: true, score: 1, text: '<danie2> do you have a gf?
-<ieatrocks> hahahahahah
-<ieatrocks> wow, thanks for even asking.')
-Quote.create(approved: true, score: 1, text: '<VolteFace`> don\'t you hate it when you shit on the floor, and you can hear it fall but you have no idea where it actually landed, and spend like 5 minutes looking for it
-<peng> ...
-<peng> what?
-<VolteFace`> oh shit
-<VolteFace`> don\'t you hate it when you DROP shit')
-Quote.create(approved: true, score: 1, text: '<fppe> The worst thing about a prostate exam is when he finds out you\'re not a real doctor.')
-Quote.create(approved: true, score: 1, text: '<ednos> technically, I\'m not pedantic')
-Quote.create(approved: true, score: 1, text: '<tttb> Why did the programmer quit his job?
-<tttb> because he didn\'t get arrays')
-Quote.create(approved: true, score: 1, text: '<@apexthief> Okay we have taco tuesday I need other food day of the week ideas
-<@AltRhombu> taco wednesday
-<@AltRhombu> taco thursday')
-Quote.create(approved: true, score: 1, text: '<Papa_Wa> Anyone else struggling to login?
-<Udungoof> i\'m struggling most of the time
-<Udungoof> not necessarily with loginservers though
-<Udongoof> life mostly')
-Quote.create(approved: true, score: 1, text: '')
-Quote.create(approved: true, score: 1, text: '')
-Quote.create(approved: true, score: 1, text: '')
-Quote.create(approved: true, score: 1, text: '')
-Quote.create(approved: true, score: 1, text: '')
-Quote.create(approved: true, score: 1, text: '')
-Quote.create(approved: true, score: 1, text: '')
->>>>>>> admin
+<AzureDiamond> oh, ok.')
\ No newline at end of file
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
deleted file mode 100644
index 80aed36..0000000
--- a/test/fixtures/users.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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
deleted file mode 100644
index 82f61e0..0000000
--- a/test/models/user_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class UserTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end

From 49e74381a0b55daa24571ba87aa9191b089c2411 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Sat, 19 May 2018 22:25:57 -0400
Subject: [PATCH 072/148] add administration features

---
 Gemfile                                       |   3 +
 Gemfile.lock                                  |  16 +-
 app/assets/stylesheets/application.scss       |  22 +-
 app/controllers/admin_controller.rb           |  19 ++
 app/controllers/quotes_controller.rb          |  50 ++-
 .../users/confirmations_controller.rb         |  30 ++
 app/controllers/users/passwords_controller.rb |  34 +++
 .../users/registrations_controller.rb         |  62 ++++
 app/controllers/users/sessions_controller.rb  |  27 ++
 app/controllers/users/unlocks_controller.rb   |  30 ++
 app/controllers/users_controller.rb           |  54 ++++
 app/helpers/users_helper.rb                   |  13 +
 app/models/user.rb                            |   6 +
 app/views/admin/_navbar.html.erb              |  19 ++
 app/views/admin/flagged.html.erb              |   4 +
 app/views/admin/index.html.erb                |   4 +
 app/views/admin/submitted.html.erb            |   4 +
 app/views/layouts/_navbar.html.erb            |  35 +++
 app/views/layouts/application.html.erb        |  15 +-
 app/views/quotes/_quote.json.jbuilder         |   2 +-
 app/views/quotes/_show.html.erb               |  15 +-
 app/views/quotes/index.html.erb               |   1 -
 app/views/quotes/latest.html.erb              |   1 -
 app/views/quotes/new.html.erb                 |   6 +-
 app/views/quotes/random.html.erb              |   1 -
 app/views/quotes/random1.html.erb             |   1 -
 app/views/quotes/search.html.erb              |   1 -
 app/views/quotes/show.html.erb                |   1 -
 app/views/quotes/show.json.jbuilder           |   2 +-
 app/views/quotes/top.html.erb                 |   1 -
 app/views/users/_form.html.erb                |  39 +++
 app/views/users/index.html.erb                |  38 +++
 app/views/users/mailer/email_changed.html.erb |   7 +
 .../users/mailer/password_change.html.erb     |   3 +
 .../reset_password_instructions.html.erb      |   8 +
 .../users/mailer/unlock_instructions.html.erb |   7 +
 app/views/users/passwords/edit.html.erb       |  25 ++
 app/views/users/passwords/new.html.erb        |  16 +
 app/views/users/sessions/new.html.erb         |  26 ++
 app/views/users/shared/_links.html.erb        |  25 ++
 app/views/users/show.html.erb                 |  29 ++
 app/views/users/unlocks/new.html.erb          |  16 +
 config/environments/development.rb            |   3 +
 config/environments/production.rb             |   3 +
 config/initializers/devise.rb                 | 284 ++++++++++++++++++
 config/locales/devise.en.yml                  |  64 ++++
 config/routes.rb                              |  29 +-
 .../20180515193424_devise_create_users.rb     |  44 +++
 db/schema.rb                                  |  19 +-
 db/seeds.rb                                   |  50 ++-
 test/fixtures/users.yml                       |  11 +
 test/models/user_test.rb                      |   7 +
 52 files changed, 1186 insertions(+), 46 deletions(-)
 create mode 100644 app/controllers/admin_controller.rb
 create mode 100644 app/controllers/users/confirmations_controller.rb
 create mode 100644 app/controllers/users/passwords_controller.rb
 create mode 100644 app/controllers/users/registrations_controller.rb
 create mode 100644 app/controllers/users/sessions_controller.rb
 create mode 100644 app/controllers/users/unlocks_controller.rb
 create mode 100644 app/controllers/users_controller.rb
 create mode 100644 app/helpers/users_helper.rb
 create mode 100644 app/models/user.rb
 create mode 100644 app/views/admin/_navbar.html.erb
 create mode 100644 app/views/admin/flagged.html.erb
 create mode 100644 app/views/admin/index.html.erb
 create mode 100644 app/views/admin/submitted.html.erb
 create mode 100644 app/views/layouts/_navbar.html.erb
 create mode 100644 app/views/users/_form.html.erb
 create mode 100644 app/views/users/index.html.erb
 create mode 100644 app/views/users/mailer/email_changed.html.erb
 create mode 100644 app/views/users/mailer/password_change.html.erb
 create mode 100644 app/views/users/mailer/reset_password_instructions.html.erb
 create mode 100644 app/views/users/mailer/unlock_instructions.html.erb
 create mode 100644 app/views/users/passwords/edit.html.erb
 create mode 100644 app/views/users/passwords/new.html.erb
 create mode 100644 app/views/users/sessions/new.html.erb
 create mode 100644 app/views/users/shared/_links.html.erb
 create mode 100644 app/views/users/show.html.erb
 create mode 100644 app/views/users/unlocks/new.html.erb
 create mode 100644 config/initializers/devise.rb
 create mode 100644 config/locales/devise.en.yml
 create mode 100644 db/migrate/20180515193424_devise_create_users.rb
 create mode 100644 test/fixtures/users.yml
 create mode 100644 test/models/user_test.rb

diff --git a/Gemfile b/Gemfile
index a7bbf1d..31e9d6a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -67,3 +67,6 @@ gem 'jquery-rails'
 
 # Use kaminari gem for pagination
 gem 'kaminari'
+
+# Use devise gem for authentication
+gem 'devise'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8c0b4f0..b3335cd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -47,8 +47,9 @@ GEM
     archive-zip (0.11.0)
       io-like (~> 0.3.0)
     arel (9.0.0)
-    autoprefixer-rails (8.4.1)
+    autoprefixer-rails (8.5.0)
       execjs
+    bcrypt (3.1.12)
     bindex (0.5.0)
     bootsnap (1.3.0)
       msgpack (~> 1.0)
@@ -79,6 +80,12 @@ GEM
     coffee-script-source (1.12.2)
     concurrent-ruby (1.0.5)
     crass (1.0.4)
+    devise (4.4.3)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0, < 6.0)
+      responders
+      warden (~> 1.2.3)
     erubi (1.7.1)
     execjs (2.7.0)
     ffi (1.9.23)
@@ -127,6 +134,7 @@ GEM
     nio4r (2.3.1)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
+    orm_adapter (0.5.0)
     popper_js (1.12.9)
     public_suffix (3.0.2)
     puma (3.11.4)
@@ -161,6 +169,9 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
+    responders (2.4.0)
+      actionpack (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 5.3)
     ruby_dep (1.5.0)
     rubyzip (1.2.1)
     sass (3.5.6)
@@ -200,6 +211,8 @@ GEM
       thread_safe (~> 0.1)
     uglifier (4.1.10)
       execjs (>= 0.3.0, < 3)
+    warden (1.2.7)
+      rack (>= 1.0)
     web-console (3.6.2)
       actionview (>= 5.0)
       activemodel (>= 5.0)
@@ -221,6 +234,7 @@ DEPENDENCIES
   capybara (>= 2.15, < 4.0)
   chromedriver-helper
   coffee-rails (~> 4.2)
+  devise
   jbuilder (~> 2.5)
   jquery-rails
   kaminari
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index a98debd..e616aff 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -51,15 +51,8 @@ pre.quote_output{
 	color: #000000;
 	float: right;
 	padding-bottom: 1px;	
-	padding-top: 1px;
-	max-height: 19pt;
-}
-
-
-h1 {
-	color: #fff;
-	font-size: 15pt;
-	font-style: italic;	
+	padding-top: 2px;
+	max-height: 30pt;
 }
 
 .quotes {
@@ -78,3 +71,14 @@ h1 {
     border-color: #ddd;
 }
 
+#title {
+	color: #fff;
+	font-size: 15pt;
+	font-style: italic;	
+}
+
+.adminlink {
+	color: #f0f0f0;
+	font-size: 10pt;
+}
+
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
new file mode 100644
index 0000000..ae531c6
--- /dev/null
+++ b/app/controllers/admin_controller.rb
@@ -0,0 +1,19 @@
+class AdminController < ApplicationController
+  before_action :authenticate_user!
+
+  # GET /admin
+  def index
+  	@flagged_quotes = Quote.where(flagged: true)
+  	@submitted_quotes = Quote.where(approved: false)
+  end
+
+  # GET /admin/flagged
+  def flagged
+    @quotes = Quote.where(flagged: true).order(created_at: :asc).page(params[:page])
+  end
+
+  # GET /admin/submitted
+  def submitted
+    @quotes = Quote.where(approved: false).order(created_at: :asc).page(params[:page])    
+  end
+end
diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index e33decf..deb6349 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -13,6 +13,11 @@ def show
     @quotes = [Quote.find(params[:id])]
   end
 
+  # GET /quotes/new
+  def new
+    @quote = Quote.new
+  end
+
   # GET /quotes/1/downvote
   # POST /quotes/1/downvote
   def downvote
@@ -45,6 +50,24 @@ def upvote
     end
   end
 
+  # GET /quotes/1/approve
+  # POST /quotes/1/approve
+  def approve
+    authenticate_user!
+    @quote = Quote.find(params[:id])
+    @quote.update(approved: true)
+    respond_to do |format|
+      if @quote.save
+        format.html { redirect_to @quote, notice: 'Quote was successfully approved.' }
+        format.json { render :show, status: :ok, location: @quote }
+      else
+        format.html { render :edit }
+        format.json { render json: @quote.errors, status: :unprocessable_entity }
+      end
+    end
+
+  end
+
   # GET /quotes/1/flag
   # POST /quotes/1/flag
   def flag
@@ -61,9 +84,21 @@ def flag
     end
   end
 
-  # GET /quotes/new
-  def new
-    @quote = Quote.new
+  # GET /quotes/1/unflag
+  # POST /quotes/1/unflag
+  def unflag
+    authenticate_user! unless user_signed_in?
+    @quote = Quote.find(params[:id])
+    @quote.update(flagged: false)
+    respond_to do |format|
+      if @quote.save
+        format.html { redirect_to @quote, notice: 'Quote was successfully unflagged.' }
+        format.json { render :show, status: :ok, location: @quote }
+      else
+        format.html { render :edit }
+        format.json { render json: @quote.errors, status: :unprocessable_entity }
+      end
+    end
   end
 
   # GET /latest
@@ -72,6 +107,12 @@ def latest
     @quotes = Quote.where(approved: true).order(created_at: :desc).page(params[:page])
   end
 
+  # GET /quotes/flagged
+  # GET /quotes/flagged.json
+  def submitted
+    @quotes = Quote.where(approved: false).order(created_at: :asc).page(params[:page])
+  end  
+
   # GET /top
   # GET /top.json
   def top
@@ -154,9 +195,10 @@ def update
   # DELETE /quotes/1
   # DELETE /quotes/1.json
   def destroy
+    authenticate_user!
     @quote.destroy
     respond_to do |format|
-      format.html { redirect_to quotes_url, notice: 'Quote was successfully destroyed.' }
+      format.html { redirect_to quotes_url, notice: 'Quote was successfully deleted.' }
       format.json { head :no_content }
     end
   end
diff --git a/app/controllers/users/confirmations_controller.rb b/app/controllers/users/confirmations_controller.rb
new file mode 100644
index 0000000..fa535c0
--- /dev/null
+++ b/app/controllers/users/confirmations_controller.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class Users::ConfirmationsController < Devise::ConfirmationsController
+  # GET /resource/confirmation/new
+  # def new
+  #   super
+  # end
+
+  # POST /resource/confirmation
+  # def create
+  #   super
+  # end
+
+  # GET /resource/confirmation?confirmation_token=abcdef
+  # def show
+  #   super
+  # end
+
+  # protected
+
+  # The path used after resending confirmation instructions.
+  # def after_resending_confirmation_instructions_path_for(resource_name)
+  #   super(resource_name)
+  # end
+
+  # The path used after confirmation.
+  # def after_confirmation_path_for(resource_name, resource)
+  #   super(resource_name, resource)
+  # end
+end
diff --git a/app/controllers/users/passwords_controller.rb b/app/controllers/users/passwords_controller.rb
new file mode 100644
index 0000000..259dbb0
--- /dev/null
+++ b/app/controllers/users/passwords_controller.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class Users::PasswordsController < Devise::PasswordsController
+  # GET /resource/password/new
+  # def new
+  #   super
+  # end
+
+  # POST /resource/password
+  # def create
+  #   super
+  # end
+
+  # GET /resource/password/edit?reset_password_token=abcdef
+  # def edit
+  #   super
+  # end
+
+  # PUT /resource/password
+  # def update
+  #   super
+  # end
+
+  # protected
+
+  # def after_resetting_password_path_for(resource)
+  #   super(resource)
+  # end
+
+  # The path used after sending reset password instructions
+  # def after_sending_reset_password_instructions_path_for(resource_name)
+  #   super(resource_name)
+  # end
+end
diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb
new file mode 100644
index 0000000..b9e664f
--- /dev/null
+++ b/app/controllers/users/registrations_controller.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+class Users::RegistrationsController < Devise::RegistrationsController
+  # before_action :configure_sign_up_params, only: [:create]
+  # before_action :configure_account_update_params, only: [:update]
+
+  # GET /resource/sign_up
+  # def new
+  #   super
+  # end
+
+  # POST /resource
+  # def create
+  #   super
+  # end
+
+  # GET /resource/edit
+  # def edit
+  #   super
+  # end
+
+  # PUT /resource
+  # def update
+  #   super
+  # end
+
+  # DELETE /resource
+  # def destroy
+  #   super
+  # end
+
+  # GET /resource/cancel
+  # Forces the session data which is usually expired after sign
+  # in to be expired now. This is useful if the user wants to
+  # cancel oauth signing in/up in the middle of the process,
+  # removing all OAuth session data.
+  # def cancel
+  #   super
+  # end
+
+  # protected
+
+  # If you have extra params to permit, append them to the sanitizer.
+  # def configure_sign_up_params
+  #   devise_parameter_sanitizer.permit(:sign_up, keys: [:attribute])
+  # end
+
+  # If you have extra params to permit, append them to the sanitizer.
+  # def configure_account_update_params
+  #   devise_parameter_sanitizer.permit(:account_update, keys: [:attribute])
+  # end
+
+  # The path used after sign up.
+  # def after_sign_up_path_for(resource)
+  #   super(resource)
+  # end
+
+  # The path used after sign up for inactive accounts.
+  # def after_inactive_sign_up_path_for(resource)
+  #   super(resource)
+  # end
+end
diff --git a/app/controllers/users/sessions_controller.rb b/app/controllers/users/sessions_controller.rb
new file mode 100644
index 0000000..a0f9b48
--- /dev/null
+++ b/app/controllers/users/sessions_controller.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class Users::SessionsController < Devise::SessionsController
+  # before_action :configure_sign_in_params, only: [:create]
+
+  # GET /resource/sign_in
+  # def new
+  #   super
+  # end
+
+  # POST /resource/sign_in
+  # def create
+  #   super
+  # end
+
+  # DELETE /resource/sign_out
+  # def destroy
+  #   super
+  # end
+
+  # protected
+
+  # If you have extra params to permit, append them to the sanitizer.
+  # def configure_sign_in_params
+  #   devise_parameter_sanitizer.permit(:sign_in, keys: [:attribute])
+  # end
+end
diff --git a/app/controllers/users/unlocks_controller.rb b/app/controllers/users/unlocks_controller.rb
new file mode 100644
index 0000000..2c410dc
--- /dev/null
+++ b/app/controllers/users/unlocks_controller.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class Users::UnlocksController < Devise::UnlocksController
+  # GET /resource/unlock/new
+  # def new
+  #   super
+  # end
+
+  # POST /resource/unlock
+  # def create
+  #   super
+  # end
+
+  # GET /resource/unlock?unlock_token=abcdef
+  # def show
+  #   super
+  # end
+
+  # protected
+
+  # The path used after sending unlock password instructions
+  # def after_sending_unlock_instructions_path_for(resource)
+  #   super(resource)
+  # end
+
+  # The path used after unlocking the resource
+  # def after_unlock_path_for(resource)
+  #   super(resource)
+  # end
+end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
new file mode 100644
index 0000000..f028bc1
--- /dev/null
+++ b/app/controllers/users_controller.rb
@@ -0,0 +1,54 @@
+class UsersController < ApplicationController
+  before_action :authenticate_user!, except: :change_password
+  before_action :set_user, only: [:show, :edit, :update, :destroy]
+
+  # POST /admin/users
+  def create
+    @user = User.new(user_params)
+
+    respond_to do |format|
+      if @user.save
+        format.html { redirect_to users_url, notice: 'User was successfully created.' }
+        format.json { render :show, status: :created, location: "/admin/users/#{@user.id}" }
+      else
+        format.html { redirect_to "/admin/users/#{@user.id}", notice: "User failed to create: #{@user.errors.keys.first.to_s} #{@user.errors.values.first.to_s}" }
+        format.json { render json: @user.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+
+  # GET /admin/users
+  def index
+    @users = User.all
+    @user = User.new
+  end
+
+  # GET /admin/users/id
+  def show
+    @user = User.find(params[:id])
+  end
+
+  # DELETE /users/1
+  # DELETE /users/1.json
+  def destroy
+    @user.destroy
+    respond_to do |format|
+      format.html { redirect_to users_url, notice: 'User was successfully deleted.' }
+      format.json { head :no_content }
+    end
+  end
+
+
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_user
+      @user = User.find(params[:id])
+    end
+
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def user_params
+      params.require(:user).permit(:email, :password, :password_confirmation)
+    end
+end
\ No newline at end of file
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
new file mode 100644
index 0000000..0323d33
--- /dev/null
+++ b/app/helpers/users_helper.rb
@@ -0,0 +1,13 @@
+module UsersHelper
+  def resource_name
+    :user
+  end
+
+  def resource
+    @resource ||= User.new
+  end
+
+  def devise_mapping
+    @devise_mapping ||= Devise.mappings[:user]
+  end
+end
\ No newline at end of file
diff --git a/app/models/user.rb b/app/models/user.rb
new file mode 100644
index 0000000..b8bdae1
--- /dev/null
+++ b/app/models/user.rb
@@ -0,0 +1,6 @@
+class User < ApplicationRecord
+  # Include default devise modules. Others available are:
+  # :confirmable, :lockable, :timeoutable and :omniauthable
+  devise :database_authenticatable,
+         :recoverable, :rememberable, :trackable, :validatable
+end
diff --git a/app/views/admin/_navbar.html.erb b/app/views/admin/_navbar.html.erb
new file mode 100644
index 0000000..13d6b29
--- /dev/null
+++ b/app/views/admin/_navbar.html.erb
@@ -0,0 +1,19 @@
+<div class="col-md-1"></div>			
+<div class="col-md-10" id="navbar">
+	<nav class="navbar navbar-expand-md navbar-right" role="navigation">
+		<ul class="navbar-nav">
+			<li class="nav-item">				
+				<%= link_to 'Flagged Quotes', '/flagged', class: 'nav-link' %>
+			</li>			
+			<li class="nav-item">
+				<%= link_to 'Submitted Quotes', '/submitted', class: 'nav-link' %>
+			</li>
+			<li class="nav-item">
+				<%= link_to 'Users', '/admin/users', class: 'nav-link' %>
+			</li>
+			<li class="nav-item">
+				<%= link_to 'Logout', destroy_user_session_path, :method => :delete, class: 'nav-link' %>
+			</li>
+	</nav>
+</div>
+<div class="col-md-1"></div>
\ No newline at end of file
diff --git a/app/views/admin/flagged.html.erb b/app/views/admin/flagged.html.erb
new file mode 100644
index 0000000..44f8d0d
--- /dev/null
+++ b/app/views/admin/flagged.html.erb
@@ -0,0 +1,4 @@
+<%= paginate(@quotes) %>
+<% @quotes.each do |quote| -%>
+<%= render 'quotes/show', :quote => quote %>
+<% end -%>
\ No newline at end of file
diff --git a/app/views/admin/index.html.erb b/app/views/admin/index.html.erb
new file mode 100644
index 0000000..2da49ce
--- /dev/null
+++ b/app/views/admin/index.html.erb
@@ -0,0 +1,4 @@
+Hello, admin.
+<br />
+<p>You have <%= @flagged_quotes.count %> flagged quote<%= 's' if @flagged_quotes.count > 1 %> pending review.</p>
+<p> You have <%= @submitted_quotes.count %> submitted quote<%= 's' if @submitted_quotes.count > 1 %> pending review.</p>
\ No newline at end of file
diff --git a/app/views/admin/submitted.html.erb b/app/views/admin/submitted.html.erb
new file mode 100644
index 0000000..44f8d0d
--- /dev/null
+++ b/app/views/admin/submitted.html.erb
@@ -0,0 +1,4 @@
+<%= paginate(@quotes) %>
+<% @quotes.each do |quote| -%>
+<%= render 'quotes/show', :quote => quote %>
+<% end -%>
\ No newline at end of file
diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb
new file mode 100644
index 0000000..9d0bd00
--- /dev/null
+++ b/app/views/layouts/_navbar.html.erb
@@ -0,0 +1,35 @@
+<div class="col-md-1"></div>			
+<div class="col-md-10" id="navbar">
+	<nav class="navbar navbar-expand-md navbar-right" role="navigation">
+		<ul class="navbar-nav">
+			<li class="nav-item">
+				<%= link_to "Home", "/" , class: 'nav-link' %> <!--<span class="sr-only">(current)</span>-->
+			</li>
+			<li class="nav-item">
+				<%= link_to "Latest", "/latest", class: 'nav-link' %>
+			</li>
+			<li class="nav-item">
+				<%= link_to "Browse", "/browse", class: 'nav-link' %>
+			</li>
+			<li class="nav-item">
+				<div class="nav-link">
+					<%= link_to "Random", "/random" %> <%= link_to ">0", "/random1" %>
+				</div>
+			</li>
+			<li class="nav-item">
+				<%= link_to "Top", "/top", class: 'nav-link' %>
+			</li>
+			<li class="nav-item">
+				<strong><%= link_to "Add Quote", "/quotes/new", class: 'nav-link' %></strong>
+			</li>
+			<li class="nav-item">
+				<%= link_to "Search", "/search", class: 'nav-link' %>
+			</li>
+			<li class="nav-item">
+			  <div class="form-inline">
+					#<%= form_tag("/search", method: "get") do %><%= text_field_tag(:quote_id, nil, size: 1, class: "form-control form-control-sm input-sm") %><% end %>
+				</div>
+			</li>
+	</nav>
+</div>
+<div class="col-md-1"></div>
\ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 0b40c14..1d45b73 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -14,22 +14,29 @@
 			<div class="row">
 				<div class="col-md-1"></div>
 				<div class="col-md-10" id="title">
-					<h1>RQDB</h1>
+					RQDB <%= link_to 'Admin', '/users/sign_in', class: 'adminlink' %>
 				</div>
 				<div class="col-md-1"></div>			
 			</div>
 			<div class="row">
-				<%= render 'quotes/navbar' %>
+				<%= render 'layouts/navbar' %>
 			</div>
+			<% if user_signed_in? -%>
+				<div class="row">
+					<%= render 'admin/navbar' %>
+				</div>
+			<% end -%>
 			<div class="row">
 				<div class="col-md-1"></div>			
 				<div class="col-md-10 quotes">
+							<% if notice %><p class="notice"><%= notice %></p><% end %>
+							<% if alert %><p class="alert"><%= alert %></p><% end %>
 					<%= yield %>
 				</div>
 				<div class="col-md-1"></div>			
 			</div>
 			<div class="row">
-				<%= render 'quotes/navbar' %>
+				<%= render 'layouts/navbar' %>
 			</div>
 			<div class="row">
 				<div class="col-md-1"></div>						
@@ -39,4 +46,4 @@
 				<div class="col-md-1"></div>
 			</div>
 	</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/app/views/quotes/_quote.json.jbuilder b/app/views/quotes/_quote.json.jbuilder
index d963cbf..70b97b0 100644
--- a/app/views/quotes/_quote.json.jbuilder
+++ b/app/views/quotes/_quote.json.jbuilder
@@ -1,2 +1,2 @@
-json.extract! quote, :id, :text, :score, :created_at, :updated_at
+json.extract! quote, :id, :text, :score, :created_at, :updated_at, :approved, :flagged
 json.url quote_url(quote, format: :json)
diff --git a/app/views/quotes/_show.html.erb b/app/views/quotes/_show.html.erb
index 769d48b..5501734 100644
--- a/app/views/quotes/_show.html.erb
+++ b/app/views/quotes/_show.html.erb
@@ -1,6 +1,15 @@
 <strong><%= link_to "##{quote.id}", quote %></strong>
 <%= link_to '+', "/quotes/#{quote.id}/upvote", method: :get, data: { confirm: 'Are you sure you want to upvote?' } %>(<%= quote.score %>)<%= link_to '-', "/quotes/#{quote.id}/downvote", method: :get, data: { confirm: 'Are you sure you want to downvote?' } %>
-<%= link_to '[X]', "/quotes/#{quote.id}/flag", method: :get, data: { confirm: 'Are you sure you want to flag this quote for review?' } %>
-<%= link_to 'Delete', quote, method: :delete, data: { confirm: 'Are you sure you want to delete this quote?' } %>
+<% if user_signed_in? -%>
+	<%= link_to 'Delete', quote, method: :delete, data: { confirm: 'Are you sure you want to delete this quote?' } %>
+	<% if quote.flagged == true -%>
+	  <%= link_to 'Unflag', "/quotes/#{quote.id}/unflag", method: :get, data: { confirm: 'Are you sure you want to unflag this quote?' } %>
+  <% end %>
+	<% if quote.approved == false -%>
+	  <%= link_to 'Approve', "/quotes/#{quote.id}/approve", method: :get, data: { confirm: 'Are you sure you want to approve this quote?' } %>
+	<% end %>
+<% else -%>
+	<%= link_to '[X]', "/quotes/#{quote.id}/flag", method: :get, data: { confirm: 'Are you sure you want to flag this quote for review?' } %>
+<% end -%>
 <br />
-<pre class="quote_output"><%= quote.text %></pre>
+<pre class="quote_output"><%= quote.text %></pre>
\ No newline at end of file
diff --git a/app/views/quotes/index.html.erb b/app/views/quotes/index.html.erb
index 3095a0f..44f8d0d 100644
--- a/app/views/quotes/index.html.erb
+++ b/app/views/quotes/index.html.erb
@@ -1,4 +1,3 @@
-<p id="notice"><%= notice %></p>
 <%= paginate(@quotes) %>
 <% @quotes.each do |quote| -%>
 <%= render 'quotes/show', :quote => quote %>
diff --git a/app/views/quotes/latest.html.erb b/app/views/quotes/latest.html.erb
index 3095a0f..44f8d0d 100644
--- a/app/views/quotes/latest.html.erb
+++ b/app/views/quotes/latest.html.erb
@@ -1,4 +1,3 @@
-<p id="notice"><%= notice %></p>
 <%= paginate(@quotes) %>
 <% @quotes.each do |quote| -%>
 <%= render 'quotes/show', :quote => quote %>
diff --git a/app/views/quotes/new.html.erb b/app/views/quotes/new.html.erb
index b7a2679..176da83 100644
--- a/app/views/quotes/new.html.erb
+++ b/app/views/quotes/new.html.erb
@@ -1,5 +1 @@
-<h1>New Quote</h1>
-
-<%= render 'form', quote: @quote %>
-
-<%= link_to 'Back', quotes_path %>
+<%= render 'form', quote: @quote %>
\ No newline at end of file
diff --git a/app/views/quotes/random.html.erb b/app/views/quotes/random.html.erb
index 09be518..baed1de 100644
--- a/app/views/quotes/random.html.erb
+++ b/app/views/quotes/random.html.erb
@@ -1,4 +1,3 @@
-<p id="notice"><%= notice %></p>
 <% @quotes.each do |quote| -%>
 <%= render 'quotes/show', :quote => quote %>
 <% end -%>
\ No newline at end of file
diff --git a/app/views/quotes/random1.html.erb b/app/views/quotes/random1.html.erb
index 09be518..baed1de 100644
--- a/app/views/quotes/random1.html.erb
+++ b/app/views/quotes/random1.html.erb
@@ -1,4 +1,3 @@
-<p id="notice"><%= notice %></p>
 <% @quotes.each do |quote| -%>
 <%= render 'quotes/show', :quote => quote %>
 <% end -%>
\ No newline at end of file
diff --git a/app/views/quotes/search.html.erb b/app/views/quotes/search.html.erb
index 3c2b4d9..3608188 100644
--- a/app/views/quotes/search.html.erb
+++ b/app/views/quotes/search.html.erb
@@ -1,2 +1 @@
-<p id="notice"><%= notice %></p>
 <%= render 'quotes/show', :quote => @quote %>
\ No newline at end of file
diff --git a/app/views/quotes/show.html.erb b/app/views/quotes/show.html.erb
index 09be518..baed1de 100644
--- a/app/views/quotes/show.html.erb
+++ b/app/views/quotes/show.html.erb
@@ -1,4 +1,3 @@
-<p id="notice"><%= notice %></p>
 <% @quotes.each do |quote| -%>
 <%= render 'quotes/show', :quote => quote %>
 <% end -%>
\ No newline at end of file
diff --git a/app/views/quotes/show.json.jbuilder b/app/views/quotes/show.json.jbuilder
index 2e771cc..84f88a1 100644
--- a/app/views/quotes/show.json.jbuilder
+++ b/app/views/quotes/show.json.jbuilder
@@ -1 +1 @@
-json.partial! "quotes/quote", quote: @quote
+json.partial! "quotes/show", quote: @quote
diff --git a/app/views/quotes/top.html.erb b/app/views/quotes/top.html.erb
index 3095a0f..44f8d0d 100644
--- a/app/views/quotes/top.html.erb
+++ b/app/views/quotes/top.html.erb
@@ -1,4 +1,3 @@
-<p id="notice"><%= notice %></p>
 <%= paginate(@quotes) %>
 <% @quotes.each do |quote| -%>
 <%= render 'quotes/show', :quote => quote %>
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
new file mode 100644
index 0000000..813217f
--- /dev/null
+++ b/app/views/users/_form.html.erb
@@ -0,0 +1,39 @@
+
+<%= form_with model: @user, local: true do |form| %>
+
+  <% if user.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(user.errors.count, "error") %> prohibited this user from being saved:</h2>
+
+      <ul>
+      <% user.errors.full_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <%= devise_error_messages! %>
+
+  <div class="field">
+    <%= form.label :email %><br />
+    <%= form.email_field :email, autofocus: true, autocomplete: "email" %>
+  </div>
+
+  <div class="field">
+    <%= form.label :password %>
+    <% if @minimum_password_length %>
+    <em>(<%= @minimum_password_length %> characters minimum)</em>
+    <% end %><br />
+    <%= form.password_field :password, autocomplete: "off" %>
+  </div>
+
+  <div class="field">
+    <%= form.label :password_confirmation %><br />
+    <%= form.password_field :password_confirmation, autocomplete: "off" %>
+  </div>
+
+  <div class="actions">
+    <%= form.submit "Sign up" %>
+  </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
new file mode 100644
index 0000000..0437d69
--- /dev/null
+++ b/app/views/users/index.html.erb
@@ -0,0 +1,38 @@
+<h6>Users</h6>
+
+<table>
+  <thead>
+    <tr>
+      <th>Email</th>
+      <th>Sign In Count</th>
+      <th>Current Sign In Time</th>
+      <th>Last Sign In</th>
+      <th>Current IP Address</th>
+      <th>Previous IP Address</th>
+      <th>Creation Date</th>
+      <th>Update Date</th>
+      <th colspan="1"></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @users.each do |user| %>
+      <tr>
+        <td><%= user.email %></td>
+        <td><%= user.sign_in_count %></td>
+        <td><%= user.current_sign_in_at %></td>
+        <td><%= user.last_sign_in_at %></td>
+        <td><%= user.current_sign_in_ip %></td>
+        <td><%= user.last_sign_in_ip %></td>
+        <td><%= user.created_at %></td>
+        <td><%= user.updated_at %></td>
+        <td><%= link_to 'Delete', user, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<br />
+
+<h6>New User</h6>
+<%= render 'form', user: @user %>
\ No newline at end of file
diff --git a/app/views/users/mailer/email_changed.html.erb b/app/views/users/mailer/email_changed.html.erb
new file mode 100644
index 0000000..32f4ba8
--- /dev/null
+++ b/app/views/users/mailer/email_changed.html.erb
@@ -0,0 +1,7 @@
+<p>Hello <%= @email %>!</p>
+
+<% if @resource.try(:unconfirmed_email?) %>
+  <p>We're contacting you to notify you that your email is being changed to <%= @resource.unconfirmed_email %>.</p>
+<% else %>
+  <p>We're contacting you to notify you that your email has been changed to <%= @resource.email %>.</p>
+<% end %>
diff --git a/app/views/users/mailer/password_change.html.erb b/app/views/users/mailer/password_change.html.erb
new file mode 100644
index 0000000..b41daf4
--- /dev/null
+++ b/app/views/users/mailer/password_change.html.erb
@@ -0,0 +1,3 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>We're contacting you to notify you that your password has been changed.</p>
diff --git a/app/views/users/mailer/reset_password_instructions.html.erb b/app/views/users/mailer/reset_password_instructions.html.erb
new file mode 100644
index 0000000..f667dc1
--- /dev/null
+++ b/app/views/users/mailer/reset_password_instructions.html.erb
@@ -0,0 +1,8 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Someone has requested a link to change your password. You can do this through the link below.</p>
+
+<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p>
+
+<p>If you didn't request this, please ignore this email.</p>
+<p>Your password won't change until you access the link above and create a new one.</p>
diff --git a/app/views/users/mailer/unlock_instructions.html.erb b/app/views/users/mailer/unlock_instructions.html.erb
new file mode 100644
index 0000000..41e148b
--- /dev/null
+++ b/app/views/users/mailer/unlock_instructions.html.erb
@@ -0,0 +1,7 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
+
+<p>Click the link below to unlock your account:</p>
+
+<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %></p>
diff --git a/app/views/users/passwords/edit.html.erb b/app/views/users/passwords/edit.html.erb
new file mode 100644
index 0000000..c9f1513
--- /dev/null
+++ b/app/views/users/passwords/edit.html.erb
@@ -0,0 +1,25 @@
+<h2>Change your password</h2>
+
+<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
+  <%= devise_error_messages! %>
+  <%= f.hidden_field :reset_password_token %>
+
+  <div class="field">
+    <%= f.label :password, "New password" %><br />
+    <% if @minimum_password_length %>
+      <em>(<%= @minimum_password_length %> characters minimum)</em><br />
+    <% end %>
+    <%= f.password_field :password, autofocus: true, autocomplete: "off" %>
+  </div>
+
+  <div class="field">
+    <%= f.label :password_confirmation, "Confirm new password" %><br />
+    <%= f.password_field :password_confirmation, autocomplete: "off" %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit "Change my password" %>
+  </div>
+<% end %>
+
+<%= render "users/shared/links" %>
diff --git a/app/views/users/passwords/new.html.erb b/app/views/users/passwords/new.html.erb
new file mode 100644
index 0000000..837bbc8
--- /dev/null
+++ b/app/views/users/passwords/new.html.erb
@@ -0,0 +1,16 @@
+<h2>Forgot your password?</h2>
+
+<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
+  <%= devise_error_messages! %>
+
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit "Send me reset password instructions" %>
+  </div>
+<% end %>
+
+<%= render "users/shared/links" %>
diff --git a/app/views/users/sessions/new.html.erb b/app/views/users/sessions/new.html.erb
new file mode 100644
index 0000000..70a8f03
--- /dev/null
+++ b/app/views/users/sessions/new.html.erb
@@ -0,0 +1,26 @@
+<h6>Log in</h6>
+<div class="form-inline">
+  <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
+    <div class="field form-control form-control-sm input-sm">
+      <%= f.label :email %><br />
+      <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+    </div>
+
+    <div class="field form-control form-control-sm input-sm">
+      <%= f.label :password %><br />
+      <%= f.password_field :password, autocomplete: "off" %>
+    </div>
+
+    <% if devise_mapping.rememberable? -%>
+      <div class="field form-control form-control-sm input-sm">
+        <%= f.check_box :remember_me %>
+        <%= f.label :remember_me %>
+      </div>
+    <% end -%>
+
+    <div class="actions form-control form-control-sm input-sm">
+      <%= f.submit "Log in" %>
+    </div>
+  <% end %>
+</div>
+<%= render "users/shared/links" %>
diff --git a/app/views/users/shared/_links.html.erb b/app/views/users/shared/_links.html.erb
new file mode 100644
index 0000000..e6a3e41
--- /dev/null
+++ b/app/views/users/shared/_links.html.erb
@@ -0,0 +1,25 @@
+<%- if controller_name != 'sessions' %>
+  <%= link_to "Log in", new_session_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+  <%= link_to "Sign up", new_registration_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
+  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
+  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.omniauthable? %>
+  <%- resource_class.omniauth_providers.each do |provider| %>
+    <%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider) %><br />
+  <% end -%>
+<% end -%>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
new file mode 100644
index 0000000..a5bf2cd
--- /dev/null
+++ b/app/views/users/show.html.erb
@@ -0,0 +1,29 @@
+<table>
+  <thead>
+    <tr>
+      <th>Email</th>
+      <th>Sign In Count</th>
+      <th>Current Sign In Time</th>
+      <th>Last Sign In</th>
+      <th>Current IP Address</th>
+      <th>Previous IP Address</th>
+      <th>Creation Date</th>
+      <th>Update Date</th>
+      <th colspan="1"></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <tr>
+      <td><%= @user.email %></td>
+      <td><%= @user.sign_in_count %></td>
+      <td><%= @user.current_sign_in_at %></td>
+      <td><%= @user.last_sign_in_at %></td>
+      <td><%= @user.current_sign_in_ip %></td>
+      <td><%= @user.last_sign_in_ip %></td>
+      <td><%= @user.created_at %></td>
+      <td><%= @user.updated_at %></td>
+      <td><%= link_to 'Delete', @user, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+    </tr>
+  </tbody>
+</table>
diff --git a/app/views/users/unlocks/new.html.erb b/app/views/users/unlocks/new.html.erb
new file mode 100644
index 0000000..2ee26bb
--- /dev/null
+++ b/app/views/users/unlocks/new.html.erb
@@ -0,0 +1,16 @@
+<h2>Resend unlock instructions</h2>
+
+<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
+  <%= devise_error_messages! %>
+
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit "Resend unlock instructions" %>
+  </div>
+<% end %>
+
+<%= render "users/shared/links" %>
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 1311e3e..eb7b4e3 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -58,4 +58,7 @@
   # 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
+
+  # Set default url_options for devise
+  config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index da4fafd..5afc6d0 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -91,4 +91,7 @@
 
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
+
+  # Set default url_options for devise
+  config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
 end
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
new file mode 100644
index 0000000..d3bc36f
--- /dev/null
+++ b/config/initializers/devise.rb
@@ -0,0 +1,284 @@
+# frozen_string_literal: true
+
+# Use this hook to configure devise mailer, warden hooks and so forth.
+# Many of these configuration options can be set straight in your model.
+Devise.setup do |config|
+  # The secret key used by Devise. Devise uses this key to generate
+  # random tokens. Changing this key will render invalid all existing
+  # confirmation, reset password and unlock tokens in the database.
+  # Devise will use the `secret_key_base` as its `secret_key`
+  # by default. You can change it below and use your own secret key.
+  # config.secret_key = 'e0ae9c129293cfebc7acc6e777e67a66d30cac325ac0e8e7e993ecbbf16cadaa5a355a41af172fbe90daf9f3341ba10100b14afcd0fd8541624d80cd21e5e391'
+  config.secret_key = `bundle exec rake secret`
+  
+  # ==> Controller configuration
+  # Configure the parent class to the devise controllers.
+  # config.parent_controller = 'DeviseController'
+
+  # ==> Mailer Configuration
+  # Configure the e-mail address which will be shown in Devise::Mailer,
+  # note that it will be overwritten if you use your own mailer class
+  # with default "from" parameter.
+  config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
+
+  # Configure the class responsible to send e-mails.
+  # config.mailer = 'Devise::Mailer'
+
+  # Configure the parent class responsible to send e-mails.
+  # config.parent_mailer = 'ActionMailer::Base'
+
+  # ==> ORM configuration
+  # Load and configure the ORM. Supports :active_record (default) and
+  # :mongoid (bson_ext recommended) by default. Other ORMs may be
+  # available as additional gems.
+  require 'devise/orm/active_record'
+
+  # ==> Configuration for any authentication mechanism
+  # Configure which keys are used when authenticating a user. The default is
+  # just :email. You can configure it to use [:username, :subdomain], so for
+  # authenticating a user, both parameters are required. Remember that those
+  # parameters are used only when authenticating and not when retrieving from
+  # session. If you need permissions, you should implement that in a before filter.
+  # You can also supply a hash where the value is a boolean determining whether
+  # or not authentication should be aborted when the value is not present.
+  # config.authentication_keys = [:email]
+
+  # Configure parameters from the request object used for authentication. Each entry
+  # given should be a request method and it will automatically be passed to the
+  # find_for_authentication method and considered in your model lookup. For instance,
+  # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
+  # The same considerations mentioned for authentication_keys also apply to request_keys.
+  # config.request_keys = []
+
+  # Configure which authentication keys should be case-insensitive.
+  # These keys will be downcased upon creating or modifying a user and when used
+  # to authenticate or find a user. Default is :email.
+  config.case_insensitive_keys = [:email]
+
+  # Configure which authentication keys should have whitespace stripped.
+  # These keys will have whitespace before and after removed upon creating or
+  # modifying a user and when used to authenticate or find a user. Default is :email.
+  config.strip_whitespace_keys = [:email]
+
+  # Tell if authentication through request.params is enabled. True by default.
+  # It can be set to an array that will enable params authentication only for the
+  # given strategies, for example, `config.params_authenticatable = [:database]` will
+  # enable it only for database (email + password) authentication.
+  # config.params_authenticatable = true
+
+  # Tell if authentication through HTTP Auth is enabled. False by default.
+  # It can be set to an array that will enable http authentication only for the
+  # given strategies, for example, `config.http_authenticatable = [:database]` will
+  # enable it only for database authentication. The supported strategies are:
+  # :database      = Support basic authentication with authentication key + password
+  # config.http_authenticatable = false
+
+  # If 401 status code should be returned for AJAX requests. True by default.
+  # config.http_authenticatable_on_xhr = true
+
+  # The realm used in Http Basic Authentication. 'Application' by default.
+  # config.http_authentication_realm = 'Application'
+
+  # It will change confirmation, password recovery and other workflows
+  # to behave the same regardless if the e-mail provided was right or wrong.
+  # Does not affect registerable.
+  # config.paranoid = true
+
+  # By default Devise will store the user in session. You can skip storage for
+  # particular strategies by setting this option.
+  # Notice that if you are skipping storage for all authentication paths, you
+  # may want to disable generating routes to Devise's sessions controller by
+  # passing skip: :sessions to `devise_for` in your config/routes.rb
+  config.skip_session_storage = [:http_auth]
+
+  # By default, Devise cleans up the CSRF token on authentication to
+  # avoid CSRF token fixation attacks. This means that, when using AJAX
+  # requests for sign in and sign up, you need to get a new CSRF token
+  # from the server. You can disable this option at your own risk.
+  # config.clean_up_csrf_token_on_authentication = true
+
+  # When false, Devise will not attempt to reload routes on eager load.
+  # This can reduce the time taken to boot the app but if your application
+  # requires the Devise mappings to be loaded during boot time the application
+  # won't boot properly.
+  # config.reload_routes = true
+
+  # ==> Configuration for :database_authenticatable
+  # For bcrypt, this is the cost for hashing the password and defaults to 11. If
+  # using other algorithms, it sets how many times you want the password to be hashed.
+  #
+  # Limiting the stretches to just one in testing will increase the performance of
+  # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
+  # a value less than 10 in other environments. Note that, for bcrypt (the default
+  # algorithm), the cost increases exponentially with the number of stretches (e.g.
+  # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
+  config.stretches = Rails.env.test? ? 1 : 11
+
+  # Set up a pepper to generate the hashed password.
+  # config.pepper = '8418e7b6737501cb164523f27cb693b465ef54c2d83fc9678d0cee5342a231af7a2ca594090d32da094e1270bf7570599bf7f948b420bd2da8f677863e9d11e2'
+
+  # Send a notification to the original email when the user's email is changed.
+  # config.send_email_changed_notification = false
+
+  # Send a notification email when the user's password is changed.
+  # config.send_password_change_notification = false
+
+  # ==> Configuration for :confirmable
+  # A period that the user is allowed to access the website even without
+  # confirming their account. For instance, if set to 2.days, the user will be
+  # able to access the website for two days without confirming their account,
+  # access will be blocked just in the third day. Default is 0.days, meaning
+  # the user cannot access the website without confirming their account.
+  # config.allow_unconfirmed_access_for = 2.days
+
+  # A period that the user is allowed to confirm their account before their
+  # token becomes invalid. For example, if set to 3.days, the user can confirm
+  # their account within 3 days after the mail was sent, but on the fourth day
+  # their account can't be confirmed with the token any more.
+  # Default is nil, meaning there is no restriction on how long a user can take
+  # before confirming their account.
+  # config.confirm_within = 3.days
+
+  # If true, requires any email changes to be confirmed (exactly the same way as
+  # initial account confirmation) to be applied. Requires additional unconfirmed_email
+  # db field (see migrations). Until confirmed, new email is stored in
+  # unconfirmed_email column, and copied to email column on successful confirmation.
+  config.reconfirmable = true
+
+  # Defines which key will be used when confirming an account
+  # config.confirmation_keys = [:email]
+
+  # ==> Configuration for :rememberable
+  # The time the user will be remembered without asking for credentials again.
+  # config.remember_for = 2.weeks
+
+  # Invalidates all the remember me tokens when the user signs out.
+  config.expire_all_remember_me_on_sign_out = true
+
+  # If true, extends the user's remember period when remembered via cookie.
+  # config.extend_remember_period = false
+
+  # Options to be passed to the created cookie. For instance, you can set
+  # secure: true in order to force SSL only cookies.
+  # config.rememberable_options = {}
+
+  # ==> Configuration for :validatable
+  # Range for password length.
+  config.password_length = 6..128
+
+  # Email regex used to validate email formats. It simply asserts that
+  # one (and only one) @ exists in the given string. This is mainly
+  # to give user feedback and not to assert the e-mail validity.
+  config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
+
+  # ==> Configuration for :timeoutable
+  # The time you want to timeout the user session without activity. After this
+  # time the user will be asked for credentials again. Default is 30 minutes.
+  # config.timeout_in = 30.minutes
+
+  # ==> Configuration for :lockable
+  # Defines which strategy will be used to lock an account.
+  # :failed_attempts = Locks an account after a number of failed attempts to sign in.
+  # :none            = No lock strategy. You should handle locking by yourself.
+  # config.lock_strategy = :failed_attempts
+
+  # Defines which key will be used when locking and unlocking an account
+  # config.unlock_keys = [:email]
+
+  # Defines which strategy will be used to unlock an account.
+  # :email = Sends an unlock link to the user email
+  # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
+  # :both  = Enables both strategies
+  # :none  = No unlock strategy. You should handle unlocking by yourself.
+  # config.unlock_strategy = :both
+
+  # Number of authentication tries before locking an account if lock_strategy
+  # is failed attempts.
+  # config.maximum_attempts = 20
+
+  # Time interval to unlock the account if :time is enabled as unlock_strategy.
+  # config.unlock_in = 1.hour
+
+  # Warn on the last attempt before the account is locked.
+  # config.last_attempt_warning = true
+
+  # ==> Configuration for :recoverable
+  #
+  # Defines which key will be used when recovering the password for an account
+  # config.reset_password_keys = [:email]
+
+  # Time interval you can reset your password with a reset password key.
+  # Don't put a too small interval or your users won't have the time to
+  # change their passwords.
+  config.reset_password_within = 6.hours
+
+  # When set to false, does not sign a user in automatically after their password is
+  # reset. Defaults to true, so a user is signed in automatically after a reset.
+  # config.sign_in_after_reset_password = true
+
+  # ==> Configuration for :encryptable
+  # Allow you to use another hashing or encryption algorithm besides bcrypt (default).
+  # You can use :sha1, :sha512 or algorithms from others authentication tools as
+  # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20
+  # for default behavior) and :restful_authentication_sha1 (then you should set
+  # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
+  #
+  # Require the `devise-encryptable` gem when using anything other than bcrypt
+  # config.encryptor = :sha512
+
+  # ==> Scopes configuration
+  # Turn scoped views on. Before rendering "sessions/new", it will first check for
+  # "users/sessions/new". It's turned off by default because it's slower if you
+  # are using only default views.
+  # config.scoped_views = false
+
+  # Configure the default scope given to Warden. By default it's the first
+  # devise role declared in your routes (usually :user).
+  # config.default_scope = :user
+
+  # Set this configuration to false if you want /users/sign_out to sign out
+  # only the current scope. By default, Devise signs out all scopes.
+  # config.sign_out_all_scopes = true
+
+  # ==> Navigation configuration
+  # Lists the formats that should be treated as navigational. Formats like
+  # :html, should redirect to the sign in page when the user does not have
+  # access, but formats like :xml or :json, should return 401.
+  #
+  # If you have any extra navigational formats, like :iphone or :mobile, you
+  # should add them to the navigational formats lists.
+  #
+  # The "*/*" below is required to match Internet Explorer requests.
+  # config.navigational_formats = ['*/*', :html]
+
+  # The default HTTP method used to sign out a resource. Default is :delete.
+  config.sign_out_via = :delete
+
+  # ==> OmniAuth
+  # Add a new OmniAuth provider. Check the wiki for more information on setting
+  # up on your models and hooks.
+  # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
+
+  # ==> Warden configuration
+  # If you want to use other strategies, that are not supported by Devise, or
+  # change the failure app, you can configure them inside the config.warden block.
+  #
+  # config.warden do |manager|
+  #   manager.intercept_401 = false
+  #   manager.default_strategies(scope: :user).unshift :some_external_strategy
+  # end
+
+  # ==> Mountable engine configurations
+  # When using Devise inside an engine, let's call it `MyEngine`, and this engine
+  # is mountable, there are some extra configurations to be taken into account.
+  # The following options are available, assuming the engine is mounted as:
+  #
+  #     mount MyEngine, at: '/my_engine'
+  #
+  # The router that invoked `devise_for`, in the example above, would be:
+  # config.router_name = :my_engine
+  #
+  # When using OmniAuth, Devise cannot automatically set OmniAuth path,
+  # so you need to do it manually. For the users scope, it would be:
+  # config.omniauth_path_prefix = '/my_engine/users/auth'
+end
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
new file mode 100644
index 0000000..0b8f130
--- /dev/null
+++ b/config/locales/devise.en.yml
@@ -0,0 +1,64 @@
+# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+
+en:
+  devise:
+    confirmations:
+      confirmed: "Your email address has been successfully confirmed."
+      send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
+    failure:
+      already_authenticated: "You are already signed in."
+      inactive: "Your account is not activated yet."
+      invalid: "Invalid %{authentication_keys} or password."
+      locked: "Your account is locked."
+      last_attempt: "You have one more attempt before your account is locked."
+      not_found_in_database: "Invalid %{authentication_keys} or password."
+      timeout: "Your session expired. Please sign in again to continue."
+      unauthenticated: "You need to sign in or sign up before continuing."
+      unconfirmed: "You have to confirm your email address before continuing."
+    mailer:
+      confirmation_instructions:
+        subject: "Confirmation instructions"
+      reset_password_instructions:
+        subject: "Reset password instructions"
+      unlock_instructions:
+        subject: "Unlock instructions"
+      email_changed:
+        subject: "Email Changed"
+      password_change:
+        subject: "Password Changed"
+    omniauth_callbacks:
+      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
+      success: "Successfully authenticated from %{kind} account."
+    passwords:
+      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+      send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+      updated: "Your password has been changed successfully. You are now signed in."
+      updated_not_active: "Your password has been changed successfully."
+    registrations:
+      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
+      signed_up: "Welcome! You have signed up successfully."
+      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
+      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
+      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
+      updated: "Your account has been updated successfully."
+    sessions:
+      signed_in: "Signed in successfully."
+      signed_out: "Signed out successfully."
+      already_signed_out: "Signed out successfully."
+    unlocks:
+      send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
+      send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
+      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
+  errors:
+    messages:
+      already_confirmed: "was already confirmed, please try signing in"
+      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
+      expired: "has expired, please request a new one"
+      not_found: "not found"
+      not_locked: "was not locked"
+      not_saved:
+        one: "1 error prohibited this %{resource} from being saved:"
+        other: "%{count} errors prohibited this %{resource} from being saved:"
diff --git a/config/routes.rb b/config/routes.rb
index 54e7dca..7963545 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,15 +1,22 @@
 Rails.application.routes.draw do
-  resources :quotes
-  root 'quotes#index'
+devise_for :users, controllers: { registrations: 'users/registrations' }
+scope "/admin" do
+  resources :users
+end
+
+  root to: 'quotes#index'
 
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 
-  get 'browse',   to: 'quotes#index'
-  get 'latest',   to: 'quotes#latest'
-  get 'random',   to: 'quotes#random'
-  get 'random1',  to: 'quotes#random1'
-  get 'search',   to: 'quotes#search'
-  get 'top',      to: 'quotes#top'
+  get 'admin',        to: 'admin#index'
+  get 'browse',       to: 'quotes#index'
+  get 'flagged',      to: 'admin#flagged'
+  get 'latest',       to: 'quotes#latest'
+  get 'random',       to: 'quotes#random'
+  get 'random1',      to: 'quotes#random1'
+  get 'search',       to: 'quotes#search'
+  get 'submitted',    to: 'admin#submitted'
+  get 'top',          to: 'quotes#top'
 
   resources :quotes do
     member do
@@ -19,7 +26,11 @@
       post :upvote
       get :flag
       post :flag
+      get :unflag
+      post :unflag
+      get :approve
+      post :approve
     end
   end
 
-end
\ No newline at end of file
+end
diff --git a/db/migrate/20180515193424_devise_create_users.rb b/db/migrate/20180515193424_devise_create_users.rb
new file mode 100644
index 0000000..492c558
--- /dev/null
+++ b/db/migrate/20180515193424_devise_create_users.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+class DeviseCreateUsers < ActiveRecord::Migration[5.2]
+  def change
+    create_table :users do |t|
+      ## Database authenticatable
+      t.string :email,              null: false, default: ""
+      t.string :encrypted_password, null: false, default: ""
+
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+
+      ## Rememberable
+      t.datetime :remember_created_at
+
+      ## Trackable
+      t.integer  :sign_in_count, default: 0, null: false
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string   :current_sign_in_ip
+      t.string   :last_sign_in_ip
+
+      ## Confirmable
+      # t.string   :confirmation_token
+      # t.datetime :confirmed_at
+      # t.datetime :confirmation_sent_at
+      # t.string   :unconfirmed_email # Only if using reconfirmable
+
+      ## Lockable
+      # t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
+      # t.string   :unlock_token # Only if unlock strategy is :email or :both
+      # t.datetime :locked_at
+
+
+      t.timestamps null: false
+    end
+
+    add_index :users, :email,                unique: true
+    add_index :users, :reset_password_token, unique: true
+    # add_index :users, :confirmation_token,   unique: true
+    # add_index :users, :unlock_token,         unique: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 9649ca1..a1c6006 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2018_05_14_024535) do
+ActiveRecord::Schema.define(version: 2018_05_15_193424) do
 
   create_table "quotes", force: :cascade do |t|
     t.string "text", null: false
@@ -21,4 +21,21 @@
     t.boolean "flagged"
   end
 
+  create_table "users", force: :cascade do |t|
+    t.string "email", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "reset_password_token"
+    t.datetime "reset_password_sent_at"
+    t.datetime "remember_created_at"
+    t.integer "sign_in_count", default: 0, null: false
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.string "current_sign_in_ip"
+    t.string "last_sign_in_ip"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["email"], name: "index_users_on_email", unique: true
+    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
+  end
+
 end
diff --git a/db/seeds.rb b/db/seeds.rb
index aae8976..abf85a5 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -6,6 +6,10 @@
 #   movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
 #   Character.create(name: 'Luke', movie: movies.first)
 
+User.create!([
+  {email: 'admin@admin.admin', password: 'password'}
+])
+
 Quote.create(approved:true, score:10, text:
 '<Cthon98> hey, if you type in your pw, it will show as stars
 <Cthon98> ********* see!
@@ -23,4 +27,48 @@
 <AzureDiamond> awesome!
 <AzureDiamond> wait, how do you know my pw?
 <Cthon98> er, I just copy pasted YOUR ******\'s and it appears to YOU as hunter2 cause its your pw
-<AzureDiamond> oh, ok.')
\ No newline at end of file
+<AzureDiamond> oh, ok.')
+
+Quote.create(approved: false, text: '<erno> hm. I\'ve lost a machine.. literally _lost_. it responds to ping, it works completely, I just can\'t figure out where in my apartment it is.')
+
+Quote.create(approved: true, flagged: true, score: 1, text: '<jeebus> the "bishop" came to our church today
+<jeebus> he was a fucken impostor
+<jeebus> never once moved diagonally')
+
+Quote.create(approved: true, score: 1, text: '< nutbar> [root@linux!/usr/src/bind] grep "{" named.conf.newer | wc -l
+< nutbar>   19314
+< nutbar> [root@linux!/usr/src/bind] grep "}" named.conf.newer | wc -l
+< nutbar>   19313
+< nutbar> [root@linux!/usr/src/bind]
+< nutbar> great
+* nutbar fumes
+< nutbar> one fucking missing }')
+
+Quote.create(approved: true, score: 1, text: '<GaRlic> how you like my new name?
+<drunkers> it stinks')
+Quote.create(approved: true, score: 1, text: '<danie2> do you have a gf?
+<ieatrocks> hahahahahah
+<ieatrocks> wow, thanks for even asking.')
+Quote.create(approved: true, score: 1, text: '<VolteFace`> don\'t you hate it when you shit on the floor, and you can hear it fall but you have no idea where it actually landed, and spend like 5 minutes looking for it
+<peng> ...
+<peng> what?
+<VolteFace`> oh shit
+<VolteFace`> don\'t you hate it when you DROP shit')
+Quote.create(approved: true, score: 1, text: '<fppe> The worst thing about a prostate exam is when he finds out you\'re not a real doctor.')
+Quote.create(approved: true, score: 1, text: '<ednos> technically, I\'m not pedantic')
+Quote.create(approved: true, score: 1, text: '<tttb> Why did the programmer quit his job?
+<tttb> because he didn\'t get arrays')
+Quote.create(approved: true, score: 1, text: '<@apexthief> Okay we have taco tuesday I need other food day of the week ideas
+<@AltRhombu> taco wednesday
+<@AltRhombu> taco thursday')
+Quote.create(approved: true, score: 1, text: '<Papa_Wa> Anyone else struggling to login?
+<Udungoof> i\'m struggling most of the time
+<Udungoof> not necessarily with loginservers though
+<Udongoof> life mostly')
+Quote.create(approved: true, score: 1, text: '')
+Quote.create(approved: true, score: 1, text: '')
+Quote.create(approved: true, score: 1, text: '')
+Quote.create(approved: true, score: 1, text: '')
+Quote.create(approved: true, score: 1, text: '')
+Quote.create(approved: true, score: 1, text: '')
+Quote.create(approved: true, score: 1, text: '')
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
new file mode 100644
index 0000000..80aed36
--- /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/models/user_test.rb b/test/models/user_test.rb
new file mode 100644
index 0000000..82f61e0
--- /dev/null
+++ b/test/models/user_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class UserTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

From aaba40cd402ba327350249c5ad42e8eff8763703 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Sun, 20 May 2018 18:27:07 -0400
Subject: [PATCH 073/148] get tests passing

---
 test/controllers/quotes_controller_test.rb |  9 +--------
 test/fixtures/quotes.yml                   |  6 +++---
 test/fixtures/users.yml                    | 12 +++++++-----
 test/test_helper.rb                        |  5 +++++
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/test/controllers/quotes_controller_test.rb b/test/controllers/quotes_controller_test.rb
index 5ad1b34..fdf9ca7 100644
--- a/test/controllers/quotes_controller_test.rb
+++ b/test/controllers/quotes_controller_test.rb
@@ -19,8 +19,6 @@ class QuotesControllerTest < ActionDispatch::IntegrationTest
     assert_difference('Quote.count') do
       post quotes_url, params: { quote: { score: @quote.score, text: @quote.text } }
     end
-
-    assert_redirected_to quote_url(Quote.last)
   end
 
   test "should show quote" do
@@ -28,21 +26,16 @@ class QuotesControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
   end
 
-  test "should get edit" do
-    get edit_quote_url(@quote)
-    assert_response :success
-  end
-
   test "should update quote" do
     patch quote_url(@quote), params: { quote: { score: @quote.score, text: @quote.text } }
     assert_redirected_to quote_url(@quote)
   end
 
   test "should destroy quote" do
+    sign_in users(:one)
     assert_difference('Quote.count', -1) do
       delete quote_url(@quote)
     end
 
-    assert_redirected_to quotes_url
   end
 end
diff --git a/test/fixtures/quotes.yml b/test/fixtures/quotes.yml
index e02d924..bfe17f0 100644
--- a/test/fixtures/quotes.yml
+++ b/test/fixtures/quotes.yml
@@ -1,9 +1,9 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
 one:
-  text: MyString
+  text: MyString1
   score: 1
 
 two:
-  text: MyString
-  score: 1
+  text: MyString2
+  score: 3
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index 80aed36..0c6d6ea 100644
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -4,8 +4,10 @@
 # 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
+one: {
+  email: admin@admin
+}
+
+two: {
+  email: anothertest@admin
+}
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 3ab84e3..ce4cb63 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -8,3 +8,8 @@ class ActiveSupport::TestCase
 
   # Add more helper methods to be used by all tests here...
 end
+
+
+class ActionDispatch::IntegrationTest
+	include Devise::Test::IntegrationHelpers	
+end
\ No newline at end of file

From e56ea11e9e99d2b4f5e64e6f5ebf40613bf01aaf Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Sun, 20 May 2018 18:29:41 -0400
Subject: [PATCH 074/148] add travis.yml

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..5d91551
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,4 @@
+install:
+  - bundle install --path vendor/bundle
+script:
+  - bundle exec rake
\ No newline at end of file

From db9ac907950eb8fba55e9f34a62f88a8f07c5f2e Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Sun, 20 May 2018 18:33:38 -0400
Subject: [PATCH 075/148] add test to verify unauthenticated users cannot
 delete quotes

---
 test/controllers/quotes_controller_test.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/controllers/quotes_controller_test.rb b/test/controllers/quotes_controller_test.rb
index fdf9ca7..04aec2a 100644
--- a/test/controllers/quotes_controller_test.rb
+++ b/test/controllers/quotes_controller_test.rb
@@ -31,11 +31,16 @@ class QuotesControllerTest < ActionDispatch::IntegrationTest
     assert_redirected_to quote_url(@quote)
   end
 
-  test "should destroy quote" do
+  test "authenticated user should destroy quote" do
     sign_in users(:one)
     assert_difference('Quote.count', -1) do
       delete quote_url(@quote)
     end
+  end
 
+  test "unauthenticated user should not destroy quote" do
+    assert_no_difference('Quote.count') do
+      delete quote_url(@quote)      
+    end
   end
 end

From e50bf5d8f356d08d5db8a3c3f262c3854d79cb31 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Sun, 20 May 2018 19:15:59 -0400
Subject: [PATCH 076/148] add tests

---
 test/controllers/quotes_controller_test.rb | 19 ++++++-
 test/controllers/users_controller_test.rb  | 65 ++++++++++++++++++++++
 test/fixtures/quotes.yml                   |  1 +
 3 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 test/controllers/users_controller_test.rb

diff --git a/test/controllers/quotes_controller_test.rb b/test/controllers/quotes_controller_test.rb
index 04aec2a..efe31ac 100644
--- a/test/controllers/quotes_controller_test.rb
+++ b/test/controllers/quotes_controller_test.rb
@@ -3,6 +3,7 @@
 class QuotesControllerTest < ActionDispatch::IntegrationTest
   setup do
     @quote = quotes(:one)
+    @flagged_quote = quotes(:two)
   end
 
   test "should get index" do
@@ -40,7 +41,23 @@ class QuotesControllerTest < ActionDispatch::IntegrationTest
 
   test "unauthenticated user should not destroy quote" do
     assert_no_difference('Quote.count') do
-      delete quote_url(@quote)      
+      delete quote_url(@quote)
+    end
+    assert_redirected_to '/users/sign_in'    
+  end
+
+  test "unauthenticated user should not unflag quote" do
+    assert_no_changes('Quote.find(@flagged_quote.id).flagged') do
+      get "/quotes/#{@flagged_quote.id}/unflag"
     end
+    assert_redirected_to '/users/sign_in'
   end
+  
+  test "authenticated user should unflag quote" do
+    sign_in users(:one)
+    assert_changes('Quote.find(@flagged_quote.id).flagged') do
+      get "/quotes/#{@flagged_quote.id}/unflag"
+    end
+  end
+
 end
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
new file mode 100644
index 0000000..6d77ca0
--- /dev/null
+++ b/test/controllers/users_controller_test.rb
@@ -0,0 +1,65 @@
+require 'test_helper'
+
+class UsersControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @active_user = users(:one)
+    @other_user = users(:two)
+
+    @user = @active_user
+  end
+
+  ['index','show'].each do |method|
+    test "unauthenticated user should not #{method} user" do
+      get users_url
+      assert_redirected_to '/users/sign_in'
+    end
+
+    test "authenticated user should #{method} user" do
+      sign_in users(:one)
+      get users_url
+      assert_response :success
+    end
+  end
+
+  test "unauthenticated user should not create user" do
+    assert_no_difference('User.count') do
+      post users_url, params: { user: { email: 'another@email', password: 'password' } }
+    end
+    assert_redirected_to '/users/sign_in'
+  end
+
+  test "authenticated user should create user" do
+    sign_in users(:one)
+    assert_difference('User.count', +1) do
+      post users_url, params: { user: { email: 'another@email', password: 'password' } }
+    end
+    assert_redirected_to users_url
+  end
+
+
+  test "unauthenticated user should not destroy user" do
+    assert_no_difference('User.count') do
+      post users_url, params: { user: { email: 'another@email', password: 'password' } }
+    end
+    assert_redirected_to '/users/sign_in'
+  end
+
+  test "authenticated user should not destroy self" do
+    sign_in users(:one)
+    sign_in users(:one)
+    assert_no_difference('User.count') do
+      delete "/admin/users/#{@active_user.id}"
+    end
+    assert_redirected_to users_url
+
+  end
+
+  test "authenticated user should destroy other user" do
+    sign_in users(:one)
+    assert_difference('User.count', -1) do
+      delete "/admin/users/#{@other_user.id}"
+    end
+    assert_redirected_to users_url
+  end
+
+end
\ No newline at end of file
diff --git a/test/fixtures/quotes.yml b/test/fixtures/quotes.yml
index bfe17f0..206900b 100644
--- a/test/fixtures/quotes.yml
+++ b/test/fixtures/quotes.yml
@@ -7,3 +7,4 @@ one:
 two:
   text: MyString2
   score: 3
+  flagged: true

From 979d046d2af00f004de4910e13bde93381ec9982 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Sun, 20 May 2018 19:19:46 -0400
Subject: [PATCH 077/148] add travis caching

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 5d91551..79d1e71 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,6 @@
+language: ruby
+cache: bundler
+
 install:
   - bundle install --path vendor/bundle
 script:

From 2435c2868ee491a812eb16ebba4e171838125e0a Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Sun, 20 May 2018 19:22:38 -0400
Subject: [PATCH 078/148] update users controller to disallow deletion of
 current logged in user

---
 app/controllers/users_controller.rb | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f028bc1..e32d123 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -32,10 +32,17 @@ def show
   # DELETE /users/1
   # DELETE /users/1.json
   def destroy
-    @user.destroy
-    respond_to do |format|
-      format.html { redirect_to users_url, notice: 'User was successfully deleted.' }
-      format.json { head :no_content }
+    unless @user == current_user
+      @user.destroy
+      respond_to do |format|
+        format.html { redirect_to users_url, notice: 'User was successfully deleted.' }
+        format.json { head :no_content }
+      end
+    else
+      respond_to do |format|
+        format.html { redirect_to users_url, notice: 'User failed to delete delete: you cannot delete yourself.' }
+        format.json { head :no_content }
+      end
     end
   end
 

From 5ed780e034187d8328ec376e7c4fbb57b0760875 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Sun, 20 May 2018 19:23:34 -0400
Subject: [PATCH 079/148] add rvm to travis cache

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 79d1e71..7052451 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 language: ruby
-cache: bundler
+ cache:
+    directories:
+     - /home/travis/.rvm/
 
 install:
   - bundle install --path vendor/bundle

From 8269320eaa0685b19c655b166189872ea433c2c9 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Sun, 20 May 2018 19:24:10 -0400
Subject: [PATCH 080/148] add bundler back to travis cache

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7052451..3f8765a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,8 @@
 language: ruby
  cache:
-    directories:
-     - /home/travis/.rvm/
+  bundler: true  
+  directories:
+    - /home/travis/.rvm/
 
 install:
   - bundle install --path vendor/bundle

From 4f0c6a8e0e9711dcdce93d7b0027e59ed2b2b52c Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Sun, 20 May 2018 19:27:47 -0400
Subject: [PATCH 081/148] add travis status to README

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 359e951..b7a50d4 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
-# README
+# RQDB: Rash Quote Database
+[![Build Status](https://travis-ci.org/bplunkert/rqdb.svg?branch=master)](https://travis-ci.org/bplunkert/rqdb)
 
 Setup:
 * RVM
@@ -7,4 +8,4 @@ Setup:
 * bundle exec rake db:migrate
 * bundle exec rails server
 
-Browse to http://localhost:3000
\ No newline at end of file
+Browse to http://localhost:3000	
\ No newline at end of file

From 5d3e54d13e229b9169f8aa5cec9e878021850d90 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Sun, 20 May 2018 19:41:43 -0400
Subject: [PATCH 082/148] add test for search

---
 test/controllers/quotes_controller_test.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/controllers/quotes_controller_test.rb b/test/controllers/quotes_controller_test.rb
index efe31ac..4cb665f 100644
--- a/test/controllers/quotes_controller_test.rb
+++ b/test/controllers/quotes_controller_test.rb
@@ -27,6 +27,11 @@ class QuotesControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
   end
 
+  test "search should return matching quotes" do
+    results = Quote.search('MyString1')
+    assert results.count == 1
+  end
+
   test "should update quote" do
     patch quote_url(@quote), params: { quote: { score: @quote.score, text: @quote.text } }
     assert_redirected_to quote_url(@quote)

From 1650e430e06d431e4dd0f3300e7bea772f0b8315 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Sun, 20 May 2018 21:30:20 -0400
Subject: [PATCH 083/148] fix .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3f8765a..f527e36 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: ruby
- cache:
+cache:
   bundler: true  
   directories:
     - /home/travis/.rvm/

From 4459d0889e875d5aa9b9c0503c5662db575a64be Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Mon, 21 May 2018 09:05:42 -0400
Subject: [PATCH 084/148] search feature initial commit

---
 app/controllers/quotes_controller.rb         | 14 ++++++------
 app/controllers/search_controller.rb         | 23 ++++++++++++++++++++
 app/models/search.rb                         |  2 ++
 app/views/quotes/_search.html.erb            | 22 +++++++++++++++++++
 app/views/quotes/search.html.erb             | 10 ++++++++-
 app/views/search/index.html.erb              |  4 ++++
 config/routes.rb                             | 15 ++++++++-----
 db/migrate/20180521013950_create_searches.rb |  8 +++++++
 db/schema.rb                                 |  8 ++++++-
 test/controllers/quotes_controller_test.rb   |  8 +++++--
 test/fixtures/searches.yml                   | 13 +++++++++++
 test/models/search_test.rb                   |  7 ++++++
 12 files changed, 117 insertions(+), 17 deletions(-)
 create mode 100644 app/controllers/search_controller.rb
 create mode 100644 app/models/search.rb
 create mode 100644 app/views/quotes/_search.html.erb
 create mode 100644 app/views/search/index.html.erb
 create mode 100644 db/migrate/20180521013950_create_searches.rb
 create mode 100644 test/fixtures/searches.yml
 create mode 100644 test/models/search_test.rb

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index deb6349..7e7c39b 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -18,6 +18,12 @@ def new
     @quote = Quote.new
   end
 
+  # GET /quotes/search
+  # POST /quotes/search
+  def search
+    @search = Search.new
+  end
+
   # GET /quotes/1/downvote
   # POST /quotes/1/downvote
   def downvote
@@ -151,12 +157,6 @@ def random1
     end
   end
 
-  # GET /search
-  # GET /search.json
-  def search
-    @quote = Quote.find(params[:quote_id])
-  end
-
   # POST /quotes
   # POST /quotes.json
   def create
@@ -211,6 +211,6 @@ def set_quote
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def quote_params
-      params.require(:quote).permit(:text, :score)
+      params.require(:quote).permit(:text, :score, :search_pattern)
     end
 end
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
new file mode 100644
index 0000000..19fc48f
--- /dev/null
+++ b/app/controllers/search_controller.rb
@@ -0,0 +1,23 @@
+class SearchController < ApplicationController
+
+  # POST /search
+  def index
+  	@search = Search.new
+    @quotes = Quote.where('text LIKE ?', "%#{params[:search_pattern]}%").page(params[:page])
+  end
+
+  def new
+  	@search = Search.new
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_search
+      @search = Search.find(params[:id])
+    end
+
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def search_params
+      params.require(:search).permit(:search_pattern)
+    end
+end
diff --git a/app/models/search.rb b/app/models/search.rb
new file mode 100644
index 0000000..344d9bf
--- /dev/null
+++ b/app/models/search.rb
@@ -0,0 +1,2 @@
+class Search < ApplicationRecord
+end
diff --git a/app/views/quotes/_search.html.erb b/app/views/quotes/_search.html.erb
new file mode 100644
index 0000000..d282b05
--- /dev/null
+++ b/app/views/quotes/_search.html.erb
@@ -0,0 +1,22 @@
+<%= form_with(model: @quote, local: true) do |form| %>
+  <% if @quotes.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@quotes.errors.count, "error") %> prohibited this quote from being saved:</h2>
+
+      <ul>
+      <% @quotes.errors.full_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= form.label 'Search' %>
+    <%= form.text_area :search_pattern %>
+  </div>
+
+  <div class="actions">
+    <%= form.submit %>
+  </div>
+<% end %>
diff --git a/app/views/quotes/search.html.erb b/app/views/quotes/search.html.erb
index 3608188..24eeab4 100644
--- a/app/views/quotes/search.html.erb
+++ b/app/views/quotes/search.html.erb
@@ -1 +1,9 @@
-<%= render 'quotes/show', :quote => @quote %>
\ No newline at end of file
+<%= form_with(url: '/search', local: true) do |form| %>
+  <div class="field">
+    <%= form.text_area :search_pattern %>
+  </div>
+
+  <div class="actions">
+    <%= form.submit 'Search' %>
+  </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
new file mode 100644
index 0000000..44f8d0d
--- /dev/null
+++ b/app/views/search/index.html.erb
@@ -0,0 +1,4 @@
+<%= paginate(@quotes) %>
+<% @quotes.each do |quote| -%>
+<%= render 'quotes/show', :quote => quote %>
+<% end -%>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 7963545..7ff0dde 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,13 +1,13 @@
+# For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
+
 Rails.application.routes.draw do
-devise_for :users, controllers: { registrations: 'users/registrations' }
-scope "/admin" do
-  resources :users
-end
+  devise_for :users, controllers: { registrations: 'users/registrations' }
+  scope "/admin" do
+    resources :users
+  end
 
   root to: 'quotes#index'
 
-  # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
-
   get 'admin',        to: 'admin#index'
   get 'browse',       to: 'quotes#index'
   get 'flagged',      to: 'admin#flagged'
@@ -15,6 +15,7 @@
   get 'random',       to: 'quotes#random'
   get 'random1',      to: 'quotes#random1'
   get 'search',       to: 'quotes#search'
+  post '/search',     to: 'search#index'  
   get 'submitted',    to: 'admin#submitted'
   get 'top',          to: 'quotes#top'
 
@@ -30,6 +31,8 @@
       post :unflag
       get :approve
       post :approve
+      get :search
+      post :search
     end
   end
 
diff --git a/db/migrate/20180521013950_create_searches.rb b/db/migrate/20180521013950_create_searches.rb
new file mode 100644
index 0000000..055819a
--- /dev/null
+++ b/db/migrate/20180521013950_create_searches.rb
@@ -0,0 +1,8 @@
+class CreateSearches < ActiveRecord::Migration[5.2]
+  def change
+    create_table :searches do |t|
+      t.timestamps
+      t.string :search_pattern
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a1c6006..a70dccc 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2018_05_15_193424) do
+ActiveRecord::Schema.define(version: 2018_05_21_013950) do
 
   create_table "quotes", force: :cascade do |t|
     t.string "text", null: false
@@ -21,6 +21,12 @@
     t.boolean "flagged"
   end
 
+  create_table "searches", force: :cascade do |t|
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "search_pattern"
+  end
+
   create_table "users", force: :cascade do |t|
     t.string "email", default: "", null: false
     t.string "encrypted_password", default: "", null: false
diff --git a/test/controllers/quotes_controller_test.rb b/test/controllers/quotes_controller_test.rb
index 4cb665f..ad1542e 100644
--- a/test/controllers/quotes_controller_test.rb
+++ b/test/controllers/quotes_controller_test.rb
@@ -28,8 +28,12 @@ class QuotesControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "search should return matching quotes" do
-    results = Quote.search('MyString1')
-    assert results.count == 1
+    post '/search', params: { search_pattern: "MyString1" }
+    assert_response :success
+
+    #assert_select 
+    #assert_select "p", "Title:\n  can create"
+
   end
 
   test "should update quote" do
diff --git a/test/fixtures/searches.yml b/test/fixtures/searches.yml
new file mode 100644
index 0000000..794ed0f
--- /dev/null
+++ b/test/fixtures/searches.yml
@@ -0,0 +1,13 @@
+# 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: {
+  search_pattern: 'MyString1'
+}
+
+two: {
+  search_pattern: 'MyString2'
+}
diff --git a/test/models/search_test.rb b/test/models/search_test.rb
new file mode 100644
index 0000000..843f92a
--- /dev/null
+++ b/test/models/search_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class SearchTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

From 75ac22a985363e3415205983bd758374d3b8272f Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Mon, 21 May 2018 09:25:58 -0400
Subject: [PATCH 085/148] fix search

---
 app/controllers/search_controller.rb         | 4 ++--
 app/views/quotes/search.html.erb             | 2 +-
 db/migrate/20180521013950_create_searches.rb | 2 +-
 db/schema.rb                                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 19fc48f..e0d3fff 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -3,7 +3,7 @@ class SearchController < ApplicationController
   # POST /search
   def index
   	@search = Search.new
-    @quotes = Quote.where('text LIKE ?', "%#{params[:search_pattern]}%").page(params[:page])
+    @quotes = Quote.where('text LIKE ?', "%#{params[:pattern]}%").page(params[:page])
   end
 
   def new
@@ -18,6 +18,6 @@ def set_search
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def search_params
-      params.require(:search).permit(:search_pattern)
+      params.require(:search).permit(:pattern)
     end
 end
diff --git a/app/views/quotes/search.html.erb b/app/views/quotes/search.html.erb
index 24eeab4..df1e2e4 100644
--- a/app/views/quotes/search.html.erb
+++ b/app/views/quotes/search.html.erb
@@ -1,6 +1,6 @@
 <%= form_with(url: '/search', local: true) do |form| %>
   <div class="field">
-    <%= form.text_area :search_pattern %>
+    <%= form.text_area :pattern %>
   </div>
 
   <div class="actions">
diff --git a/db/migrate/20180521013950_create_searches.rb b/db/migrate/20180521013950_create_searches.rb
index 055819a..92ff916 100644
--- a/db/migrate/20180521013950_create_searches.rb
+++ b/db/migrate/20180521013950_create_searches.rb
@@ -2,7 +2,7 @@ class CreateSearches < ActiveRecord::Migration[5.2]
   def change
     create_table :searches do |t|
       t.timestamps
-      t.string :search_pattern
+      t.string :pattern
     end
   end
 end
diff --git a/db/schema.rb b/db/schema.rb
index a70dccc..5ba278c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -24,7 +24,7 @@
   create_table "searches", force: :cascade do |t|
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.string "search_pattern"
+    t.string "pattern"
   end
 
   create_table "users", force: :cascade do |t|

From 5c9cb3fec37eeb52d4f6c70314410edc758e6b6d Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Mon, 21 May 2018 09:26:02 -0400
Subject: [PATCH 086/148] fix tests

---
 test/controllers/quotes_controller_test.rb   |  9 ---------
 test/controllers/searches_controller_test.rb | 15 +++++++++++++++
 test/fixtures/quotes.yml                     |  2 ++
 test/fixtures/searches.yml                   | 13 ++-----------
 test/test_helper.rb                          |  2 +-
 5 files changed, 20 insertions(+), 21 deletions(-)
 create mode 100644 test/controllers/searches_controller_test.rb

diff --git a/test/controllers/quotes_controller_test.rb b/test/controllers/quotes_controller_test.rb
index ad1542e..efe31ac 100644
--- a/test/controllers/quotes_controller_test.rb
+++ b/test/controllers/quotes_controller_test.rb
@@ -27,15 +27,6 @@ class QuotesControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
   end
 
-  test "search should return matching quotes" do
-    post '/search', params: { search_pattern: "MyString1" }
-    assert_response :success
-
-    #assert_select 
-    #assert_select "p", "Title:\n  can create"
-
-  end
-
   test "should update quote" do
     patch quote_url(@quote), params: { quote: { score: @quote.score, text: @quote.text } }
     assert_redirected_to quote_url(@quote)
diff --git a/test/controllers/searches_controller_test.rb b/test/controllers/searches_controller_test.rb
new file mode 100644
index 0000000..f14b16c
--- /dev/null
+++ b/test/controllers/searches_controller_test.rb
@@ -0,0 +1,15 @@
+require 'test_helper'
+
+class SearchesControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @search = searches(:one)
+  end
+
+  test "search should return matching quotes" do
+    post '/search', params: { search: { search_pattern: 'MyString1' } }
+    assert_response :success
+
+  assert_select "a", {:count=>1, :text=>"#1"}, "Did not find matching quote in search results"
+
+  end
+end
\ No newline at end of file
diff --git a/test/fixtures/quotes.yml b/test/fixtures/quotes.yml
index 206900b..57aebbc 100644
--- a/test/fixtures/quotes.yml
+++ b/test/fixtures/quotes.yml
@@ -1,10 +1,12 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
 one:
+  id: 1
   text: MyString1
   score: 1
 
 two:
+  id: 2
   text: MyString2
   score: 3
   flagged: true
diff --git a/test/fixtures/searches.yml b/test/fixtures/searches.yml
index 794ed0f..89355eb 100644
--- a/test/fixtures/searches.yml
+++ b/test/fixtures/searches.yml
@@ -1,13 +1,4 @@
 # 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: {
-  search_pattern: 'MyString1'
-}
-
-two: {
-  search_pattern: 'MyString2'
-}
+one: {}
+two: {}
\ No newline at end of file
diff --git a/test/test_helper.rb b/test/test_helper.rb
index ce4cb63..1b68626 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -11,5 +11,5 @@ class ActiveSupport::TestCase
 
 
 class ActionDispatch::IntegrationTest
-	include Devise::Test::IntegrationHelpers	
+  include Devise::Test::IntegrationHelpers  
 end
\ No newline at end of file

From 2f2f19e87575180a9546bafab97324174daeac18 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Mon, 21 May 2018 09:38:20 -0400
Subject: [PATCH 087/148] add id to link in views

---
 app/views/quotes/_show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/quotes/_show.html.erb b/app/views/quotes/_show.html.erb
index 5501734..9e1013d 100644
--- a/app/views/quotes/_show.html.erb
+++ b/app/views/quotes/_show.html.erb
@@ -1,4 +1,4 @@
-<strong><%= link_to "##{quote.id}", quote %></strong>
+<strong><%= link_to "##{quote.id}", quote, id: quote.id %></strong>
 <%= link_to '+', "/quotes/#{quote.id}/upvote", method: :get, data: { confirm: 'Are you sure you want to upvote?' } %>(<%= quote.score %>)<%= link_to '-', "/quotes/#{quote.id}/downvote", method: :get, data: { confirm: 'Are you sure you want to downvote?' } %>
 <% if user_signed_in? -%>
 	<%= link_to 'Delete', quote, method: :delete, data: { confirm: 'Are you sure you want to delete this quote?' } %>

From 6bfc1f5025083bf2f458ce65e8ab089c6cc0de51 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Mon, 21 May 2018 09:38:26 -0400
Subject: [PATCH 088/148] add test coverage

---
 test/controllers/searches_controller_test.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/controllers/searches_controller_test.rb b/test/controllers/searches_controller_test.rb
index f14b16c..d3d74f5 100644
--- a/test/controllers/searches_controller_test.rb
+++ b/test/controllers/searches_controller_test.rb
@@ -8,8 +8,13 @@ class SearchesControllerTest < ActionDispatch::IntegrationTest
   test "search should return matching quotes" do
     post '/search', params: { search: { search_pattern: 'MyString1' } }
     assert_response :success
+    assert_select "pre", {:class => "quote_output", :count=>1}
 
-  assert_select "a", {:count=>1, :text=>"#1"}, "Did not find matching quote in search results"
+  end
 
+  test "search should not return nonmatching quotes" do
+    post '/search', params: { search: { search_pattern: 'BogusStringWithNoMatchingQuotes' } }
+    assert_response :success
+    assert_select "pre", {:class => "quote_output", :count=>0}
   end
 end
\ No newline at end of file

From 276735f41751c56204742d1c20d64eb36e54a103 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Mon, 21 May 2018 09:40:55 -0400
Subject: [PATCH 089/148] add test case

---
 test/controllers/searches_controller_test.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/controllers/searches_controller_test.rb b/test/controllers/searches_controller_test.rb
index d3d74f5..52c689a 100644
--- a/test/controllers/searches_controller_test.rb
+++ b/test/controllers/searches_controller_test.rb
@@ -17,4 +17,10 @@ class SearchesControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_select "pre", {:class => "quote_output", :count=>0}
   end
+
+  test "empty search pattern should not return quotes" do
+    post '/search', params: { search: { search_pattern: '' } }
+    assert_response :success
+    assert_select "pre", {:class => "quote_output", :count=>0}
+  end
 end
\ No newline at end of file

From 130f3350dd516194fd800d869cf001a4e66d7e18 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Mon, 21 May 2018 09:46:23 -0400
Subject: [PATCH 090/148] do not search for empty strings or nil patterns

---
 app/controllers/search_controller.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index e0d3fff..d5a8fe8 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -4,6 +4,12 @@ class SearchController < ApplicationController
   def index
   	@search = Search.new
     @quotes = Quote.where('text LIKE ?', "%#{params[:pattern]}%").page(params[:page])
+
+    unless params[:pattern].nil? or params[:pattern] == ''
+      @quotes = Quote.where('text LIKE ?', "%#{params[:pattern]}%").page(params[:page])
+    else
+      @quotes = Quote.where(id: nil).page(params[:page])
+    end
   end
 
   def new

From a9736ced34f13db40c3ed397e92387acc474d545 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Mon, 21 May 2018 09:46:28 -0400
Subject: [PATCH 091/148] fix test

---
 test/controllers/searches_controller_test.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/controllers/searches_controller_test.rb b/test/controllers/searches_controller_test.rb
index 52c689a..36e462d 100644
--- a/test/controllers/searches_controller_test.rb
+++ b/test/controllers/searches_controller_test.rb
@@ -6,20 +6,20 @@ class SearchesControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "search should return matching quotes" do
-    post '/search', params: { search: { search_pattern: 'MyString1' } }
+    post '/search', params: { pattern: 'MyString1' }
     assert_response :success
     assert_select "pre", {:class => "quote_output", :count=>1}
 
   end
 
   test "search should not return nonmatching quotes" do
-    post '/search', params: { search: { search_pattern: 'BogusStringWithNoMatchingQuotes' } }
+    post '/search', params: { pattern: 'BogusStringWithNoMatchingQuotes' }
     assert_response :success
     assert_select "pre", {:class => "quote_output", :count=>0}
   end
 
   test "empty search pattern should not return quotes" do
-    post '/search', params: { search: { search_pattern: '' } }
+    post '/search', params: { pattern: '' }
     assert_response :success
     assert_select "pre", {:class => "quote_output", :count=>0}
   end

From 57594870969278f457bb1cc6234a5a203343682b Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Mon, 21 May 2018 09:48:41 -0400
Subject: [PATCH 092/148] spacing

---
 test/controllers/searches_controller_test.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/controllers/searches_controller_test.rb b/test/controllers/searches_controller_test.rb
index 36e462d..5243cbc 100644
--- a/test/controllers/searches_controller_test.rb
+++ b/test/controllers/searches_controller_test.rb
@@ -9,7 +9,6 @@ class SearchesControllerTest < ActionDispatch::IntegrationTest
     post '/search', params: { pattern: 'MyString1' }
     assert_response :success
     assert_select "pre", {:class => "quote_output", :count=>1}
-
   end
 
   test "search should not return nonmatching quotes" do

From 68a7ffc162e4458df7768a910657989b01c2a87d Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Mon, 21 May 2018 09:49:24 -0400
Subject: [PATCH 093/148] set branch name for travis badge

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b7a50d4..bda55d0 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # RQDB: Rash Quote Database
-[![Build Status](https://travis-ci.org/bplunkert/rqdb.svg?branch=master)](https://travis-ci.org/bplunkert/rqdb)
+[![Build Status](https://travis-ci.org/bplunkert/rqdb.svg?branch=development)](https://travis-ci.org/bplunkert/rqdb)
 
 Setup:
 * RVM

From cb379edcc52fb2e5f139f94affd5557a5a6fa272 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Mon, 21 May 2018 14:55:54 -0400
Subject: [PATCH 094/148] flesh out documentation

---
 README.md | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index bda55d0..cab2228 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,21 @@
 # RQDB: Rash Quote Database
 [![Build Status](https://travis-ci.org/bplunkert/rqdb.svg?branch=development)](https://travis-ci.org/bplunkert/rqdb)
 
-Setup:
-* RVM
-* Ruby 2.5.1
-* bundle install
-* bundle exec rake db:migrate
-* bundle exec rails server
-
-Browse to http://localhost:3000	
\ No newline at end of file
+Rash/Rails Quote Database is a simple web application for publishing, sharing, and ranking quotes. It's a ground-up rebuild of the [Rash Quote Management System (RQMS)](http://rqms.sourceforge.net), originally written in PHP by Tom Cuchta. RQDB is written in Ruby on Rails instead of PHP and does not share any common code with the original version.
+
+Installing depedendencies:
+* Install [RVM](https://rvm.io) and Ruby 2.5.1:
+```
+curl -sSL https://rvm.io/mpapis.asc | gpg --import -
+curl -sSL https://get.rvm.io | bash -s stable --ruby=2.5.1
+```
+* Install gem dependencies:
+```bundle install```
+
+Installation:
+* ```bundle exec rake db:migrate```
+* ```bundle exec rake db:seed```
+
+Start the service:
+* ```bundle exec rails server```
+* Browse to http://localhost:3000	
\ No newline at end of file

From 4a823bd6faf8395aae6afdd6a9c53fed3311dae1 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Mon, 21 May 2018 14:58:57 -0400
Subject: [PATCH 095/148] flesh out documentation

---
 README.md | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index cab2228..cc9775e 100644
--- a/README.md
+++ b/README.md
@@ -3,14 +3,13 @@
 
 Rash/Rails Quote Database is a simple web application for publishing, sharing, and ranking quotes. It's a ground-up rebuild of the [Rash Quote Management System (RQMS)](http://rqms.sourceforge.net), originally written in PHP by Tom Cuchta. RQDB is written in Ruby on Rails instead of PHP and does not share any common code with the original version.
 
-Installing depedendencies:
-* Install [RVM](https://rvm.io) and Ruby 2.5.1:
-```
-curl -sSL https://rvm.io/mpapis.asc | gpg --import -
-curl -sSL https://get.rvm.io | bash -s stable --ruby=2.5.1
-```
-* Install gem dependencies:
-```bundle install```
+Depedendencies:
+Install [RVM](https://rvm.io) and Ruby 2.5.1:
+* * ```curl -sSL https://rvm.io/mpapis.asc | gpg --import -```
+* * ```curl -sSL https://get.rvm.io | bash -s stable --ruby=2.5.1```
+
+Install gem dependencies:
+* ```bundle install```
 
 Installation:
 * ```bundle exec rake db:migrate```
@@ -18,4 +17,8 @@ Installation:
 
 Start the service:
 * ```bundle exec rails server```
-* Browse to http://localhost:3000	
\ No newline at end of file
+
+Login:
+* Browse to http://localhost:3000
+* Default username: admin@admin.admin
+* Default password: password
\ No newline at end of file

From 36ba619aa57b56617717846b0522d5553f007c73 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Mon, 21 May 2018 14:59:20 -0400
Subject: [PATCH 096/148] update readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cc9775e..155d80e 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Install [RVM](https://rvm.io) and Ruby 2.5.1:
 * * ```curl -sSL https://rvm.io/mpapis.asc | gpg --import -```
 * * ```curl -sSL https://get.rvm.io | bash -s stable --ruby=2.5.1```
 
-Install gem dependencies:
+Install bundled ruby gems:
 * ```bundle install```
 
 Installation:

From d8eafc0fb029e8629bce5917afd8665ac58ee651 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Mon, 21 May 2018 15:12:09 -0400
Subject: [PATCH 097/148] add pg to production in Gemfile

---
 Gemfile      | 10 ++++++++--
 Gemfile.lock |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 31e9d6a..896970a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,8 +5,6 @@ ruby '2.5.1'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.2.0'
-# Use sqlite3 as the database for Active Record
-gem 'sqlite3'
 # Use Puma as the app server
 gem 'puma', '~> 3.11'
 # Use SCSS for stylesheets
@@ -36,6 +34,11 @@ gem 'jbuilder', '~> 2.5'
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', '>= 1.1.0', require: false
 
+group 'production' do
+  # Use pg as the database for Active Record in production
+  gem 'pg'
+end
+
 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]
@@ -48,6 +51,9 @@ group :development do
   # 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'
+
+  # Use sqlite3 as the database for Active Record in development
+  gem 'sqlite3'
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index b3335cd..c828d53 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -135,6 +135,7 @@ GEM
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     orm_adapter (0.5.0)
+    pg (1.0.0)
     popper_js (1.12.9)
     public_suffix (3.0.2)
     puma (3.11.4)
@@ -239,6 +240,7 @@ DEPENDENCIES
   jquery-rails
   kaminari
   listen (>= 3.0.5, < 3.2)
+  pg
   puma (~> 3.11)
   rails (~> 5.2.0)
   sass-rails (~> 5.0)

From 41dde937100d9132e41c5d9142f19bc80c05a44b Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Mon, 21 May 2018 15:13:25 -0400
Subject: [PATCH 098/148] use postgres database in production env

---
 config/database.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/config/database.yml b/config/database.yml
index 0d02f24..de20e65 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -21,5 +21,7 @@ test:
   database: db/test.sqlite3
 
 production:
-  <<: *default
-  database: db/production.sqlite3
+  adapter: postgresql
+  database: rqdb
+  pool: 5
+  timeout: 5000

From 4d25897f76e4877bde55c9fe52c785a9c3226ee1 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Mon, 21 May 2018 15:33:19 -0400
Subject: [PATCH 099/148] reorder db config

---
 config/database.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/config/database.yml b/config/database.yml
index de20e65..4dd9cc0 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -13,15 +13,16 @@ development:
   <<: *default
   database: db/development.sqlite3
 
-# 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: db/test.sqlite3
-
 production:
   adapter: postgresql
   database: rqdb
   pool: 5
   timeout: 5000
+
+
+# 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: db/test.sqlite3
\ No newline at end of file

From 65958a37eda8a7165441328ad420380ee95448c6 Mon Sep 17 00:00:00 2001
From: tom cuchta <tomcuchta@gmail.com>
Date: Mon, 21 May 2018 23:32:32 -0400
Subject: [PATCH 100/148] added a button for the bottom quotes

---
 app/controllers/quotes_controller.rb | 6 ++++++
 app/views/layouts/_navbar.html.erb   | 5 ++++-
 config/routes.rb                     | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 7e7c39b..0a16aad 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -125,6 +125,12 @@ def top
     @quotes = Quote.where(approved: true).order(score: :desc).page(params[:page])
   end
 
+  # GET /bottom
+  # GET /bottom.json
+  def bottom
+    @quotes = Quote.where(approved: true).order(score: :asc).page(params[:page])
+  end
+
   # GET /random
   # GET /random.json
   def random
diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb
index 9d0bd00..ae3b664 100644
--- a/app/views/layouts/_navbar.html.erb
+++ b/app/views/layouts/_navbar.html.erb
@@ -19,6 +19,9 @@
 			<li class="nav-item">
 				<%= link_to "Top", "/top", class: 'nav-link' %>
 			</li>
+			<li>
+				<%= link_to "Bottom", "/bottom", class: 'nav-link' %>
+			</li>
 			<li class="nav-item">
 				<strong><%= link_to "Add Quote", "/quotes/new", class: 'nav-link' %></strong>
 			</li>
@@ -32,4 +35,4 @@
 			</li>
 	</nav>
 </div>
-<div class="col-md-1"></div>
\ No newline at end of file
+<div class="col-md-1"></div>
diff --git a/config/routes.rb b/config/routes.rb
index 7ff0dde..8f8a56e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -18,6 +18,7 @@
   post '/search',     to: 'search#index'  
   get 'submitted',    to: 'admin#submitted'
   get 'top',          to: 'quotes#top'
+  get 'bottom',       to: 'quotes#bottom'
 
   resources :quotes do
     member do

From a02af42ee2ffe52b33f8741ed36d4fcfd25917f6 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Mon, 21 May 2018 23:53:04 -0400
Subject: [PATCH 101/148] add test for /random when quotes are not present

---
 test/controllers/quotes_controller_test.rb | 30 +++++++++++++++-------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/test/controllers/quotes_controller_test.rb b/test/controllers/quotes_controller_test.rb
index efe31ac..e32952e 100644
--- a/test/controllers/quotes_controller_test.rb
+++ b/test/controllers/quotes_controller_test.rb
@@ -2,62 +2,74 @@
 
 class QuotesControllerTest < ActionDispatch::IntegrationTest
   setup do
+    @quotes = quotes
     @quote = quotes(:one)
     @flagged_quote = quotes(:two)
   end
 
-  test "should get index" do
+  test 'should get index' do
     get quotes_url
     assert_response :success
   end
 
-  test "should get new" do
+  test 'should get new' do
     get new_quote_url
     assert_response :success
   end
 
-  test "should create quote" do
+  test 'should create quote' do
     assert_difference('Quote.count') do
       post quotes_url, params: { quote: { score: @quote.score, text: @quote.text } }
     end
   end
 
-  test "should show quote" do
+  test 'should show quote' do
     get quote_url(@quote)
     assert_response :success
   end
 
-  test "should update quote" do
+  test 'should update quote' do
     patch quote_url(@quote), params: { quote: { score: @quote.score, text: @quote.text } }
     assert_redirected_to quote_url(@quote)
   end
 
-  test "authenticated user should destroy quote" do
+  test 'authenticated user should destroy quote' do
     sign_in users(:one)
     assert_difference('Quote.count', -1) do
       delete quote_url(@quote)
     end
   end
 
-  test "unauthenticated user should not destroy quote" do
+  test 'unauthenticated user should not destroy quote' do
     assert_no_difference('Quote.count') do
       delete quote_url(@quote)
     end
     assert_redirected_to '/users/sign_in'    
   end
 
-  test "unauthenticated user should not unflag quote" do
+  test 'unauthenticated user should not unflag quote' do
     assert_no_changes('Quote.find(@flagged_quote.id).flagged') do
       get "/quotes/#{@flagged_quote.id}/unflag"
     end
     assert_redirected_to '/users/sign_in'
   end
   
-  test "authenticated user should unflag quote" do
+  test 'authenticated user should unflag quote' do
     sign_in users(:one)
     assert_changes('Quote.find(@flagged_quote.id).flagged') do
       get "/quotes/#{@flagged_quote.id}/unflag"
     end
   end
 
+  test 'random should return empty page when there are no quotes' do
+    sign_in users(:one)
+    @quotes.each do |quote|
+      delete quote_url(quote)
+    end
+
+    get '/random'
+    assert_select "pre", {:class => "quote_output", :count=>0}
+    assert_response :success    
+  end
+
 end

From 2d68ddac4f33e63555ab7707586c47f0d852bc18 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 00:21:16 -0400
Subject: [PATCH 102/148] update test for /random

---
 app/controllers/quotes_controller.rb | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 0a16aad..fef4010 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -135,14 +135,21 @@ def bottom
   # GET /random.json
   def random
     all_quotes = Quote.where(approved: true)
-    max_id     = all_quotes.last(1).first.id
-    quote_ids  = []
     @quotes    = []
-    while (quote_ids.count < 10) and (quote_ids.count < all_quotes.count)
-      quote = all_quotes.sample(1).first
-      unless quote_ids.include?(quote.id) or quote.approved != true
-        quote_ids << quote.id
-        @quotes << quote
+    if all_quotes.count == 0
+      response do
+        format.html { render :random, notice: 'There are no quotes in the database.' }
+        format.json { render :random, errors: 'There are no quotes in the database.' }
+      end
+    else
+      max_id     = all_quotes.last(1).first.id
+      quote_ids  = []
+      while (quote_ids.count < 10) and (quote_ids.count < all_quotes.count)
+        quote = all_quotes.sample(1).first
+        unless quote_ids.include?(quote.id) or quote.approved != true
+          quote_ids << quote.id
+          @quotes << quote
+        end
       end
     end
   end

From 06ffa87cfe1cc02ed371e9c8b9d6b61822458266 Mon Sep 17 00:00:00 2001
From: tom cuchta <tomcuchta@gmail.com>
Date: Tue, 22 May 2018 01:09:14 -0400
Subject: [PATCH 103/148] added announcements; no mechanism to add one yet

---
 app/assets/javascripts/announcements.coffee   |  3 +++
 app/assets/stylesheets/announcements.scss     |  3 +++
 app/controllers/announcements_controller.rb   |  8 ++++++++
 app/helpers/announcements_helper.rb           |  2 ++
 app/models/announcement.rb                    |  2 ++
 app/views/announcements/_show.html.erb        |  6 ++++++
 app/views/announcements/_show.html.erb.old    | 13 ++++++++++++
 app/views/announcements/index.html.erb        | 20 +++++++++++++++++++
 app/views/announcements/index.json.jbuilder   |  1 +
 config/routes.rb                              |  2 +-
 .../20180522041222_create_announcements.rb    |  9 +++++++++
 db/schema.rb                                  |  8 +++++++-
 db/seeds.rb                                   |  3 +++
 .../announcements_controller_test.rb          |  7 +++++++
 test/fixtures/announcements.yml               |  7 +++++++
 test/models/announcement_test.rb              |  7 +++++++
 16 files changed, 99 insertions(+), 2 deletions(-)
 create mode 100644 app/assets/javascripts/announcements.coffee
 create mode 100644 app/assets/stylesheets/announcements.scss
 create mode 100644 app/controllers/announcements_controller.rb
 create mode 100644 app/helpers/announcements_helper.rb
 create mode 100644 app/models/announcement.rb
 create mode 100644 app/views/announcements/_show.html.erb
 create mode 100644 app/views/announcements/_show.html.erb.old
 create mode 100644 app/views/announcements/index.html.erb
 create mode 100644 app/views/announcements/index.json.jbuilder
 create mode 100644 db/migrate/20180522041222_create_announcements.rb
 create mode 100644 test/controllers/announcements_controller_test.rb
 create mode 100644 test/fixtures/announcements.yml
 create mode 100644 test/models/announcement_test.rb

diff --git a/app/assets/javascripts/announcements.coffee b/app/assets/javascripts/announcements.coffee
new file mode 100644
index 0000000..24f83d1
--- /dev/null
+++ b/app/assets/javascripts/announcements.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/announcements.scss b/app/assets/stylesheets/announcements.scss
new file mode 100644
index 0000000..f200971
--- /dev/null
+++ b/app/assets/stylesheets/announcements.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the Announcements 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/announcements_controller.rb b/app/controllers/announcements_controller.rb
new file mode 100644
index 0000000..09a039f
--- /dev/null
+++ b/app/controllers/announcements_controller.rb
@@ -0,0 +1,8 @@
+class AnnouncementsController < ApplicationController
+  # GET /quotes
+  # GET /quotes.json
+  def index
+    @announcements = Announcement.order(created_at: :asc).page(params[:page])
+  end
+
+end
diff --git a/app/helpers/announcements_helper.rb b/app/helpers/announcements_helper.rb
new file mode 100644
index 0000000..beb2d03
--- /dev/null
+++ b/app/helpers/announcements_helper.rb
@@ -0,0 +1,2 @@
+module AnnouncementsHelper
+end
diff --git a/app/models/announcement.rb b/app/models/announcement.rb
new file mode 100644
index 0000000..aa98a0e
--- /dev/null
+++ b/app/models/announcement.rb
@@ -0,0 +1,2 @@
+class Announcement < ApplicationRecord
+end
diff --git a/app/views/announcements/_show.html.erb b/app/views/announcements/_show.html.erb
new file mode 100644
index 0000000..f5ae7c1
--- /dev/null
+++ b/app/views/announcements/_show.html.erb
@@ -0,0 +1,6 @@
+ <tr>
+  <td>
+   <pre><b><%= announcement.created_at.strftime("%Y.%m.%d %H:%M:%S %Z") %></b>
+   <%= announcement.text %></pre>
+  </td>
+ </tr>
diff --git a/app/views/announcements/_show.html.erb.old b/app/views/announcements/_show.html.erb.old
new file mode 100644
index 0000000..baead3b
--- /dev/null
+++ b/app/views/announcements/_show.html.erb.old
@@ -0,0 +1,13 @@
+Announcements <br />
+
+<table>
+<pre class="announcement_output">
+<% @announcements.each do |announcement| %>
+ <tr>
+  <td><%= announcement.text %></td>
+  <td><%= announcement.created_at %></td>
+ </tr>
+<% end %>
+</pre>
+
+</table>
diff --git a/app/views/announcements/index.html.erb b/app/views/announcements/index.html.erb
new file mode 100644
index 0000000..4c49a37
--- /dev/null
+++ b/app/views/announcements/index.html.erb
@@ -0,0 +1,20 @@
+<table>
+ <tr>
+  <td valign="top" width="50%"> Lorem ipsum dolor sit amet, sit eu eligendi scriptorem liberavisse, no pro civibus consetetur appellantur, feugiat bonorum vis at. Ea prima habemus senserit nec, feugiat torquatos contentiones ea has. Meis commodo ullamcorper no eam, sit eu modo menandri laboramus, eum id tation discere dolores. Elit inermis ocurreret at per.<br /><br />
+
+In detraxit percipitur qui. Nam ferri inermis id, movet pertinax adipiscing nam in. Idque facilisi efficiantur pro id. Lorem nonumes ad pri, suas noster pertinax at quo, duo facilisis neglegentur ad.<br /><br />
+
+No per simul munere putent, cu principes conceptam qui. Cum purto tempor aeterno ne, legere theophrastus in eum. Choro cetero legimus no ius. Exerci vivendo liberavisse ei usu, quo at legendos argumentum. Eos an aliquid perpetua, ex eum dolores oporteat suavitate. Cum ei affert adipisci.<br/><br />
+
+Graeci commodo praesent vix ad, esse reprimique cu vim, commune accusata tractatos his ei. Et aperiam accumsan vel, ei cum ferri constituam definitiones. Duo cu putent veritus referrentur. Mei in wisi utinam insolens, in mea stet illum pertinax.<br /><br />
+
+Vel dicta vidisse percipitur ex, qui purto possim no, quo id partiendo periculis reprehendunt. Iisque verterem consulatu cu sit, accusata petentium ea nam. Aeterno complectitur qui cu, in est interesset necessitatibus. Mei te zril urbanitas pertinacia. Mel ea reformidans ullamcorper, atqui putant aperiam vix in, an pri clita omnes fabellas. At putent sapientem mel.</td>
+  <td valign="top", width="50%">
+   <table>
+    <%= paginate(@announcements) %>
+    <% @announcements.each do |announcement| -%>
+    <%= render 'announcements/show', :announcement => announcement %>
+    <% end %>
+   </table>
+  </tr>
+</table>
diff --git a/app/views/announcements/index.json.jbuilder b/app/views/announcements/index.json.jbuilder
new file mode 100644
index 0000000..c50d431
--- /dev/null
+++ b/app/views/announcements/index.json.jbuilder
@@ -0,0 +1 @@
+json.array! @announcements, partial: 'announcements/announcement', as: :announcement
diff --git a/config/routes.rb b/config/routes.rb
index 8f8a56e..50be9ea 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,7 +6,7 @@
     resources :users
   end
 
-  root to: 'quotes#index'
+  root to: 'announcements#index'
 
   get 'admin',        to: 'admin#index'
   get 'browse',       to: 'quotes#index'
diff --git a/db/migrate/20180522041222_create_announcements.rb b/db/migrate/20180522041222_create_announcements.rb
new file mode 100644
index 0000000..14cc95c
--- /dev/null
+++ b/db/migrate/20180522041222_create_announcements.rb
@@ -0,0 +1,9 @@
+class CreateAnnouncements < ActiveRecord::Migration[5.2]
+  def change
+    create_table :announcements do |t|
+      t.string :text
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5ba278c..77d516d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,13 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2018_05_21_013950) do
+ActiveRecord::Schema.define(version: 2018_05_22_041222) do
+
+  create_table "announcements", force: :cascade do |t|
+    t.string "text"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
 
   create_table "quotes", force: :cascade do |t|
     t.string "text", null: false
diff --git a/db/seeds.rb b/db/seeds.rb
index abf85a5..2c1be2e 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -6,6 +6,9 @@
 #   movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
 #   Character.create(name: 'Luke', movie: movies.first)
 
+Announcement.create(text: 'Hello!!!!! second announcement!!')
+Announcement.create(text: 'Hello!!!!!!! First announcement!!!')
+
 User.create!([
   {email: 'admin@admin.admin', password: 'password'}
 ])
diff --git a/test/controllers/announcements_controller_test.rb b/test/controllers/announcements_controller_test.rb
new file mode 100644
index 0000000..175d708
--- /dev/null
+++ b/test/controllers/announcements_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class AnnouncementsControllerTest < ActionDispatch::IntegrationTest
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/fixtures/announcements.yml b/test/fixtures/announcements.yml
new file mode 100644
index 0000000..861ee7d
--- /dev/null
+++ b/test/fixtures/announcements.yml
@@ -0,0 +1,7 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  text: MyString
+
+two:
+  text: MyString
diff --git a/test/models/announcement_test.rb b/test/models/announcement_test.rb
new file mode 100644
index 0000000..ed6980b
--- /dev/null
+++ b/test/models/announcement_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class AnnouncementTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

From 7a673dbd6678ea55438ac5e2f27f805622068132 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 08:42:51 -0400
Subject: [PATCH 104/148] add test for announcement view

---
 test/system/announcements_test.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 test/system/announcements_test.rb

diff --git a/test/system/announcements_test.rb b/test/system/announcements_test.rb
new file mode 100644
index 0000000..0a5fd23
--- /dev/null
+++ b/test/system/announcements_test.rb
@@ -0,0 +1,12 @@
+require "application_system_test_case"
+
+class AnnouncementsTest < ApplicationSystemTestCase
+  setup do
+    @quote = quotes(:one)
+  end
+
+  test 'visiting the index' do
+    visit '/'
+    assert_select "pre", {:class => "announcement", :count=>1}
+  end
+end
\ No newline at end of file

From c6a7e04a4930f5ca623930e828ca9e38f51e43dc Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 08:43:28 -0400
Subject: [PATCH 105/148] add class to pre tag in announcement view

---
 app/views/announcements/_show.html.erb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/views/announcements/_show.html.erb b/app/views/announcements/_show.html.erb
index f5ae7c1..5819cb3 100644
--- a/app/views/announcements/_show.html.erb
+++ b/app/views/announcements/_show.html.erb
@@ -1,6 +1,8 @@
- <tr>
-  <td>
-   <pre><b><%= announcement.created_at.strftime("%Y.%m.%d %H:%M:%S %Z") %></b>
-   <%= announcement.text %></pre>
-  </td>
- </tr>
+<tr>
+	<td>
+		<strong><%= announcement.created_at.strftime("%Y.%m.%d %H:%M:%S %Z") %></strong>
+		<pre class="announcement">
+			<%= announcement.text %>
+		</pre>
+	</td>
+</tr>

From f47922285ff32633d32862ac59c8472c33ada58a Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 08:45:08 -0400
Subject: [PATCH 106/148] update test to remove outdated references to quotes

---
 test/system/announcements_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/system/announcements_test.rb b/test/system/announcements_test.rb
index 0a5fd23..7f9c329 100644
--- a/test/system/announcements_test.rb
+++ b/test/system/announcements_test.rb
@@ -2,7 +2,7 @@
 
 class AnnouncementsTest < ApplicationSystemTestCase
   setup do
-    @quote = quotes(:one)
+    @announcement = announcements(:one)
   end
 
   test 'visiting the index' do

From ddd56256731d962ace2afe6e1a73ec80b3d88ae4 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 08:50:33 -0400
Subject: [PATCH 107/148] add AnnouncementsController test for index

---
 test/controllers/announcements_controller_test.rb | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/controllers/announcements_controller_test.rb b/test/controllers/announcements_controller_test.rb
index 175d708..ec0be64 100644
--- a/test/controllers/announcements_controller_test.rb
+++ b/test/controllers/announcements_controller_test.rb
@@ -1,7 +1,13 @@
 require 'test_helper'
 
 class AnnouncementsControllerTest < ActionDispatch::IntegrationTest
-  # test "the truth" do
-  #   assert true
-  # end
-end
+  setup do
+    @announcements = announcements
+    @announcement  = announcements(:one)
+  end
+
+  test 'should get index' do
+    get '/'
+    assert_response :success
+  end
+end
\ No newline at end of file

From 71819a4ea9224a661864f3b0a74667a08e4697df Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 09:22:47 -0400
Subject: [PATCH 108/148] use divs instead of tables for announcements

---
 app/views/announcements/_show.html.erb        |  8 +++---
 app/views/announcements/index.html.erb        | 25 +++++++++----------
 .../announcements_controller_test.rb          | 16 ++++++++++++
 test/controllers/quotes_controller_test.rb    | 13 ++++++++--
 test/controllers/searches_controller_test.rb  | 12 ++++-----
 test/controllers/users_controller_test.rb     | 10 ++++----
 test/system/announcements_test.rb             |  6 ++---
 7 files changed, 56 insertions(+), 34 deletions(-)

diff --git a/app/views/announcements/_show.html.erb b/app/views/announcements/_show.html.erb
index 5819cb3..542bf1c 100644
--- a/app/views/announcements/_show.html.erb
+++ b/app/views/announcements/_show.html.erb
@@ -1,8 +1,6 @@
-<tr>
-	<td>
+<div class="announcement row">
 		<strong><%= announcement.created_at.strftime("%Y.%m.%d %H:%M:%S %Z") %></strong>
-		<pre class="announcement">
+		<pre>
 			<%= announcement.text %>
 		</pre>
-	</td>
-</tr>
+</div>
\ No newline at end of file
diff --git a/app/views/announcements/index.html.erb b/app/views/announcements/index.html.erb
index 4c49a37..c09f971 100644
--- a/app/views/announcements/index.html.erb
+++ b/app/views/announcements/index.html.erb
@@ -1,20 +1,19 @@
-<table>
- <tr>
-  <td valign="top" width="50%"> Lorem ipsum dolor sit amet, sit eu eligendi scriptorem liberavisse, no pro civibus consetetur appellantur, feugiat bonorum vis at. Ea prima habemus senserit nec, feugiat torquatos contentiones ea has. Meis commodo ullamcorper no eam, sit eu modo menandri laboramus, eum id tation discere dolores. Elit inermis ocurreret at per.<br /><br />
+<div class="row">
+  <div class="col-sm-6">
+   Lorem ipsum dolor sit amet, sit eu eligendi scriptorem liberavisse, no pro civibus consetetur appellantur, feugiat bonorum vis at. Ea prima habemus senserit nec, feugiat torquatos contentiones ea has. Meis commodo ullamcorper no eam, sit eu modo menandri laboramus, eum id tation discere dolores. Elit inermis ocurreret at per.<br /><br />
 
-In detraxit percipitur qui. Nam ferri inermis id, movet pertinax adipiscing nam in. Idque facilisi efficiantur pro id. Lorem nonumes ad pri, suas noster pertinax at quo, duo facilisis neglegentur ad.<br /><br />
+  In detraxit percipitur qui. Nam ferri inermis id, movet pertinax adipiscing nam in. Idque facilisi efficiantur pro id. Lorem nonumes ad pri, suas noster pertinax at quo, duo facilisis neglegentur ad.<br /><br />
 
-No per simul munere putent, cu principes conceptam qui. Cum purto tempor aeterno ne, legere theophrastus in eum. Choro cetero legimus no ius. Exerci vivendo liberavisse ei usu, quo at legendos argumentum. Eos an aliquid perpetua, ex eum dolores oporteat suavitate. Cum ei affert adipisci.<br/><br />
+  No per simul munere putent, cu principes conceptam qui. Cum purto tempor aeterno ne, legere theophrastus in eum. Choro cetero legimus no ius. Exerci vivendo liberavisse ei usu, quo at legendos argumentum. Eos an aliquid perpetua, ex eum dolores oporteat suavitate. Cum ei affert adipisci.<br/><br />
 
-Graeci commodo praesent vix ad, esse reprimique cu vim, commune accusata tractatos his ei. Et aperiam accumsan vel, ei cum ferri constituam definitiones. Duo cu putent veritus referrentur. Mei in wisi utinam insolens, in mea stet illum pertinax.<br /><br />
+  Graeci commodo praesent vix ad, esse reprimique cu vim, commune accusata tractatos his ei. Et aperiam accumsan vel, ei cum ferri constituam definitiones. Duo cu putent veritus referrentur. Mei in wisi utinam insolens, in mea stet illum pertinax.<br /><br />
 
-Vel dicta vidisse percipitur ex, qui purto possim no, quo id partiendo periculis reprehendunt. Iisque verterem consulatu cu sit, accusata petentium ea nam. Aeterno complectitur qui cu, in est interesset necessitatibus. Mei te zril urbanitas pertinacia. Mel ea reformidans ullamcorper, atqui putant aperiam vix in, an pri clita omnes fabellas. At putent sapientem mel.</td>
-  <td valign="top", width="50%">
-   <table>
+  Vel dicta vidisse percipitur ex, qui purto possim no, quo id partiendo periculis reprehendunt. Iisque verterem consulatu cu sit, accusata petentium ea nam. Aeterno complectitur qui cu, in est interesset necessitatibus. Mei te zril urbanitas pertinacia. Mel ea reformidans ullamcorper, atqui putant aperiam vix in, an pri clita omnes fabellas. At putent sapientem mel.
+  </div>
+  <div class="announcements col-sm-6">
     <%= paginate(@announcements) %>
     <% @announcements.each do |announcement| -%>
-    <%= render 'announcements/show', :announcement => announcement %>
+      <%= render 'announcements/show', :announcement => announcement %>
     <% end %>
-   </table>
-  </tr>
-</table>
+  </div>
+</div>
\ No newline at end of file
diff --git a/test/controllers/announcements_controller_test.rb b/test/controllers/announcements_controller_test.rb
index ec0be64..68ff56f 100644
--- a/test/controllers/announcements_controller_test.rb
+++ b/test/controllers/announcements_controller_test.rb
@@ -9,5 +9,21 @@ class AnnouncementsControllerTest < ActionDispatch::IntegrationTest
   test 'should get index' do
     get '/'
     assert_response :success
+    assert_select 'div.announcements', {:count=>1}
+    assert_select 'div.announcement', {:count=>2}
+  end
+
+  test 'unauthenticated user should not add announcement' do
+    assert_no_changes('Announcement.count') do
+      false
+    end
+    assert_redirected_to '/users/sign_in'
+  end
+
+  test 'authenticated user should add announcement' do
+    sign_in users(:one)
+    assert_no_changes('Announcement.count') do
+      false
+    end
   end
 end
\ No newline at end of file
diff --git a/test/controllers/quotes_controller_test.rb b/test/controllers/quotes_controller_test.rb
index e32952e..080f9de 100644
--- a/test/controllers/quotes_controller_test.rb
+++ b/test/controllers/quotes_controller_test.rb
@@ -19,10 +19,19 @@ class QuotesControllerTest < ActionDispatch::IntegrationTest
 
   test 'should create quote' do
     assert_difference('Quote.count') do
-      post quotes_url, params: { quote: { score: @quote.score, text: @quote.text } }
+      post quotes_url, params: { quote: { text: @quote.text } }
     end
   end
 
+  test 'should fail to create approved quote' do
+    post quotes_url, params: { quote: { text: 'this quote is not approved', approved: true  } }
+    assert_equal false, Quote.where(text: 'this quote is not approved').first.approved
+  end
+
+  test 'should fail to set score on created quote' do
+
+  end
+
   test 'should show quote' do
     get quote_url(@quote)
     assert_response :success
@@ -68,7 +77,7 @@ class QuotesControllerTest < ActionDispatch::IntegrationTest
     end
 
     get '/random'
-    assert_select "pre", {:class => "quote_output", :count=>0}
+    assert_select "pre.quote_output", {:count=>0}
     assert_response :success    
   end
 
diff --git a/test/controllers/searches_controller_test.rb b/test/controllers/searches_controller_test.rb
index 5243cbc..e0e5e48 100644
--- a/test/controllers/searches_controller_test.rb
+++ b/test/controllers/searches_controller_test.rb
@@ -5,21 +5,21 @@ class SearchesControllerTest < ActionDispatch::IntegrationTest
     @search = searches(:one)
   end
 
-  test "search should return matching quotes" do
+  test 'search should return matching quotes' do
     post '/search', params: { pattern: 'MyString1' }
     assert_response :success
-    assert_select "pre", {:class => "quote_output", :count=>1}
+    assert_select 'pre.quote_output', {:count=>1}
   end
 
-  test "search should not return nonmatching quotes" do
+  test 'search should not return nonmatching quotes' do
     post '/search', params: { pattern: 'BogusStringWithNoMatchingQuotes' }
     assert_response :success
-    assert_select "pre", {:class => "quote_output", :count=>0}
+    assert_select 'pre.quote_output', {:count=>0}
   end
 
-  test "empty search pattern should not return quotes" do
+  test 'empty search pattern should not return quotes' do
     post '/search', params: { pattern: '' }
     assert_response :success
-    assert_select "pre", {:class => "quote_output", :count=>0}
+    assert_select 'pre.quote_output', {:count=>0}
   end
 end
\ No newline at end of file
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 6d77ca0..0f2057b 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -21,14 +21,14 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     end
   end
 
-  test "unauthenticated user should not create user" do
+  test 'unauthenticated user should not create user' do
     assert_no_difference('User.count') do
       post users_url, params: { user: { email: 'another@email', password: 'password' } }
     end
     assert_redirected_to '/users/sign_in'
   end
 
-  test "authenticated user should create user" do
+  test 'authenticated user should create user' do
     sign_in users(:one)
     assert_difference('User.count', +1) do
       post users_url, params: { user: { email: 'another@email', password: 'password' } }
@@ -37,14 +37,14 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
   end
 
 
-  test "unauthenticated user should not destroy user" do
+  test 'unauthenticated user should not destroy user' do
     assert_no_difference('User.count') do
       post users_url, params: { user: { email: 'another@email', password: 'password' } }
     end
     assert_redirected_to '/users/sign_in'
   end
 
-  test "authenticated user should not destroy self" do
+  test 'authenticated user should not destroy self' do
     sign_in users(:one)
     sign_in users(:one)
     assert_no_difference('User.count') do
@@ -54,7 +54,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
 
   end
 
-  test "authenticated user should destroy other user" do
+  test 'authenticated user should destroy other user' do
     sign_in users(:one)
     assert_difference('User.count', -1) do
       delete "/admin/users/#{@other_user.id}"
diff --git a/test/system/announcements_test.rb b/test/system/announcements_test.rb
index 7f9c329..8825018 100644
--- a/test/system/announcements_test.rb
+++ b/test/system/announcements_test.rb
@@ -5,8 +5,8 @@ class AnnouncementsTest < ApplicationSystemTestCase
     @announcement = announcements(:one)
   end
 
-  test 'visiting the index' do
-    visit '/'
-    assert_select "pre", {:class => "announcement", :count=>1}
+  test "visiting the index" do
+    visit quotes_url
+    assert_selector "table", class: "announcements"
   end
 end
\ No newline at end of file

From d7046c9223db791e63a79fed7043037cecddc294 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 09:53:31 -0400
Subject: [PATCH 109/148] add test scenarios for announcements controller

---
 .../announcements_controller_test.rb          | 48 +++++++++++++++++--
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/test/controllers/announcements_controller_test.rb b/test/controllers/announcements_controller_test.rb
index 68ff56f..c35c64e 100644
--- a/test/controllers/announcements_controller_test.rb
+++ b/test/controllers/announcements_controller_test.rb
@@ -13,17 +13,57 @@ class AnnouncementsControllerTest < ActionDispatch::IntegrationTest
     assert_select 'div.announcement', {:count=>2}
   end
 
-  test 'unauthenticated user should not add announcement' do
+
+  test 'should not create blank announcement' do
+    sign_in users(:one)
     assert_no_changes('Announcement.count') do
-      false
+      post announcements_url, params: { announcement: { text: '' } }
+    end
+  end
+
+  test 'unauthenticated user should not add announcement' do
+    assert_no_difference('Announcement.count') do
+      post announcements_url, params: { announcement: { text: 'My new announcement' } }
     end
     assert_redirected_to '/users/sign_in'
   end
 
   test 'authenticated user should add announcement' do
     sign_in users(:one)
-    assert_no_changes('Announcement.count') do
-      false
+    assert_difference('Announcement.count', +1) do
+      post announcements_url, params: { announcement: { text: 'My new announcement' } }
+    end
+  end
+
+  test 'unauthenticated user should not destroy announcement' do
+    assert_no_difference('Announcement.count') do
+      delete announcement_url(@announcement)
+    end
+    assert_redirected_to '/users/sign_in'
+  end
+
+  test 'authenticated user should destroy announcement' do
+    sign_in users(:one)
+    assert_difference('Announcement.count', +1) do
+      delete announcement_url(@announcement)
+    end
+  end
+
+  test 'unauthenticated user should not update announcement' do
+    assert_no_changes('@announcement.text') do
+      @modified_announcement = @announcement
+      @modified_announcement.text = 'Modified text'
+      put announcement_url, params: { announcement: @modified_announcement }
+    end
+    assert_redirected_to '/users/sign_in'
+  end
+
+  test 'authenticated user should update announcement' do
+    sign_in users(:one)    
+    assert_changes('@announcement.text') do
+      @modified_announcement = @announcement
+      @modified_announcement.text = 'Modified text'
+      put announcement_url, params: { announcement: @modified_announcement }
     end
   end
 end
\ No newline at end of file

From cc9fc1a98885f0575a2e827b69fa98f43fe91d35 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 10:04:32 -0400
Subject: [PATCH 110/148] remove stale template

---
 app/views/announcements/_show.html.erb.old | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 app/views/announcements/_show.html.erb.old

diff --git a/app/views/announcements/_show.html.erb.old b/app/views/announcements/_show.html.erb.old
deleted file mode 100644
index baead3b..0000000
--- a/app/views/announcements/_show.html.erb.old
+++ /dev/null
@@ -1,13 +0,0 @@
-Announcements <br />
-
-<table>
-<pre class="announcement_output">
-<% @announcements.each do |announcement| %>
- <tr>
-  <td><%= announcement.text %></td>
-  <td><%= announcement.created_at %></td>
- </tr>
-<% end %>
-</pre>
-
-</table>

From 4390c3b188b54d2afd130b1e3c935c19da890002 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 10:04:40 -0400
Subject: [PATCH 111/148] move divs to index in views

---
 app/views/announcements/_show.html.erb | 10 ++++------
 app/views/announcements/index.html.erb |  4 +++-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/announcements/_show.html.erb b/app/views/announcements/_show.html.erb
index 542bf1c..67d353d 100644
--- a/app/views/announcements/_show.html.erb
+++ b/app/views/announcements/_show.html.erb
@@ -1,6 +1,4 @@
-<div class="announcement row">
-		<strong><%= announcement.created_at.strftime("%Y.%m.%d %H:%M:%S %Z") %></strong>
-		<pre>
-			<%= announcement.text %>
-		</pre>
-</div>
\ No newline at end of file
+<strong><%= announcement.created_at.strftime("%Y.%m.%d %H:%M:%S %Z") %></strong>
+<pre>
+	<%= announcement.text %>
+</pre>
\ No newline at end of file
diff --git a/app/views/announcements/index.html.erb b/app/views/announcements/index.html.erb
index c09f971..08a6e08 100644
--- a/app/views/announcements/index.html.erb
+++ b/app/views/announcements/index.html.erb
@@ -13,7 +13,9 @@
   <div class="announcements col-sm-6">
     <%= paginate(@announcements) %>
     <% @announcements.each do |announcement| -%>
-      <%= render 'announcements/show', :announcement => announcement %>
+      <div class="announcement row">
+        <%= render 'announcements/show', :announcement => announcement %>
+      </div>
     <% end %>
   </div>
 </div>
\ No newline at end of file

From 1787b95570d9158f1965544efe178cfd3244e9cd Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 10:04:49 -0400
Subject: [PATCH 112/148] add announcement routes

---
 config/routes.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/routes.rb b/config/routes.rb
index 50be9ea..f78f965 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -20,6 +20,8 @@
   get 'top',          to: 'quotes#top'
   get 'bottom',       to: 'quotes#bottom'
 
+  resources :announcements
+
   resources :quotes do
     member do
       get :downvote

From 438240179a08e4858b85124d7d7988ee0aff5acc Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 10:05:22 -0400
Subject: [PATCH 113/148] update announcement tests

---
 .../announcements_controller_test.rb          | 21 +++++++++----------
 test/controllers/quotes_controller_test.rb    | 18 ++++++++++++++--
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/test/controllers/announcements_controller_test.rb b/test/controllers/announcements_controller_test.rb
index c35c64e..07a5a5f 100644
--- a/test/controllers/announcements_controller_test.rb
+++ b/test/controllers/announcements_controller_test.rb
@@ -13,28 +13,27 @@ class AnnouncementsControllerTest < ActionDispatch::IntegrationTest
     assert_select 'div.announcement', {:count=>2}
   end
 
-
-  test 'should not create blank announcement' do
-    sign_in users(:one)
-    assert_no_changes('Announcement.count') do
-      post announcements_url, params: { announcement: { text: '' } }
-    end
-  end
-
-  test 'unauthenticated user should not add announcement' do
+  test 'unauthenticated user should not create announcement' do
     assert_no_difference('Announcement.count') do
       post announcements_url, params: { announcement: { text: 'My new announcement' } }
     end
     assert_redirected_to '/users/sign_in'
   end
 
-  test 'authenticated user should add announcement' do
+  test 'authenticated user should create announcement' do
     sign_in users(:one)
     assert_difference('Announcement.count', +1) do
       post announcements_url, params: { announcement: { text: 'My new announcement' } }
     end
   end
 
+  test 'authenticated user should not create blank announcement' do
+    sign_in users(:one)
+    assert_no_changes('Announcement.count') do
+      post announcements_url, params: { announcement: { text: '' } }
+    end
+  end
+
   test 'unauthenticated user should not destroy announcement' do
     assert_no_difference('Announcement.count') do
       delete announcement_url(@announcement)
@@ -44,7 +43,7 @@ class AnnouncementsControllerTest < ActionDispatch::IntegrationTest
 
   test 'authenticated user should destroy announcement' do
     sign_in users(:one)
-    assert_difference('Announcement.count', +1) do
+    assert_difference('Announcement.count', -1) do
       delete announcement_url(@announcement)
     end
   end
diff --git a/test/controllers/quotes_controller_test.rb b/test/controllers/quotes_controller_test.rb
index 080f9de..2c8d1ea 100644
--- a/test/controllers/quotes_controller_test.rb
+++ b/test/controllers/quotes_controller_test.rb
@@ -29,7 +29,7 @@ class QuotesControllerTest < ActionDispatch::IntegrationTest
   end
 
   test 'should fail to set score on created quote' do
-
+    assert false
   end
 
   test 'should show quote' do
@@ -77,8 +77,22 @@ class QuotesControllerTest < ActionDispatch::IntegrationTest
     end
 
     get '/random'
-    assert_select "pre.quote_output", {:count=>0}
+    assert_select 'pre.quote_output', {:count=>0}
     assert_response :success    
   end
 
+  test 'unauthenticated user should not update quote' do
+    assert_no_changes('Quote.find(@flagged_quote.id).flagged') do
+      get "/quotes/#{@flagged_quote.id}/unflag"
+    end
+    assert_redirected_to '/users/sign_in'
+  end
+  
+  test 'authenticated user should update quote' do
+    sign_in users(:one)
+    assert_changes('Quote.find(@flagged_quote.id).flagged') do
+      get "/quotes/#{@flagged_quote.id}/unflag"
+    end
+  end
+
 end

From f51982cad365491407e79f2f32f4f6618bc704be Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 10:10:52 -0400
Subject: [PATCH 114/148] fix urls in tests

---
 test/controllers/announcements_controller_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/controllers/announcements_controller_test.rb b/test/controllers/announcements_controller_test.rb
index 07a5a5f..fac413a 100644
--- a/test/controllers/announcements_controller_test.rb
+++ b/test/controllers/announcements_controller_test.rb
@@ -52,7 +52,7 @@ class AnnouncementsControllerTest < ActionDispatch::IntegrationTest
     assert_no_changes('@announcement.text') do
       @modified_announcement = @announcement
       @modified_announcement.text = 'Modified text'
-      put announcement_url, params: { announcement: @modified_announcement }
+      put announcement_url(@announcement), params: { announcement: @modified_announcement }
     end
     assert_redirected_to '/users/sign_in'
   end
@@ -62,7 +62,7 @@ class AnnouncementsControllerTest < ActionDispatch::IntegrationTest
     assert_changes('@announcement.text') do
       @modified_announcement = @announcement
       @modified_announcement.text = 'Modified text'
-      put announcement_url, params: { announcement: @modified_announcement }
+      put announcement_url(@announcement), params: { announcement: @modified_announcement }
     end
   end
 end
\ No newline at end of file

From aac382c5049b413074e556b2aed9e68b1a7378f2 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 10:11:00 -0400
Subject: [PATCH 115/148] add methods to announcements controller

---
 app/controllers/announcements_controller.rb | 64 ++++++++++++++++++++-
 1 file changed, 62 insertions(+), 2 deletions(-)

diff --git a/app/controllers/announcements_controller.rb b/app/controllers/announcements_controller.rb
index 09a039f..4440707 100644
--- a/app/controllers/announcements_controller.rb
+++ b/app/controllers/announcements_controller.rb
@@ -1,8 +1,68 @@
 class AnnouncementsController < ApplicationController
-  # GET /quotes
-  # GET /quotes.json
+  before_action :set_announcement, only: [:show, :edit, :update, :destroy]
+
+  # GET /announcements
+  # GET /announcements
   def index
     @announcements = Announcement.order(created_at: :asc).page(params[:page])
   end
 
+  # GET /announcement/1
+  # GET /announcement/1.json
+  def show
+    @announcements = [Announcement.find(params[:id])]
+  end
+
+  # POST /announcements
+  # POST /announcements.json
+  def create
+    authenticate_user!
+    @announcement = Announcement.new(announcement_params)
+    respond_to do |format|
+      if @announcement.save
+        format.html { redirect_to announcements_url, notice: 'Announcement was successfully created.' }
+        format.json { render :show, status: :created, location: announcements_url }
+      else
+        format.html { render :new }
+        format.json { render json: @announcement.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PATCH/PUT /announcements/1
+  # PATCH/PUT /announcements/1.json
+  def update
+    authenticate_user!
+    respond_to do |format|
+      if @announcement.update(announcement_params)
+        format.html { redirect_to announcements_url, notice: 'Announcement was successfully updated.' }
+        format.json { render :show, status: :ok, location: announcements_url }
+      else
+        format.html { render :edit }
+        format.json { render json: @announcement.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /announcements/1
+  # DELETE /announcements/1.json
+  def destroy
+    authenticate_user!
+    @announcement.destroy
+    respond_to do |format|
+      format.html { redirect_to announcements_url, notice: 'Announcement was successfully deleted.' }
+      format.json { head :no_content }
+    end
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_announcement
+      @announcement = Announcement.find(params[:id])
+    end
+
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def announcement_params
+      params.require(:announcement).permit(:text)
+    end
 end

From 498da5b5b0d24be729eac029e12f1cd53d66e2a8 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 10:21:42 -0400
Subject: [PATCH 116/148] set announcement text column to not null

---
 db/migrate/20180522142058_set_announcement_text_not_null.rb | 5 +++++
 db/schema.rb                                                | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20180522142058_set_announcement_text_not_null.rb

diff --git a/db/migrate/20180522142058_set_announcement_text_not_null.rb b/db/migrate/20180522142058_set_announcement_text_not_null.rb
new file mode 100644
index 0000000..8746c73
--- /dev/null
+++ b/db/migrate/20180522142058_set_announcement_text_not_null.rb
@@ -0,0 +1,5 @@
+class SetAnnouncementTextNotNull < ActiveRecord::Migration[5.2]
+ def change
+   change_column_null :announcements, :text, false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 77d516d..e335b48 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,10 +10,10 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2018_05_22_041222) do
+ActiveRecord::Schema.define(version: 2018_05_22_142058) do
 
   create_table "announcements", force: :cascade do |t|
-    t.string "text"
+    t.string "text", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end

From 19bd1d3ae21dc459b98ba013f9e4b63f4e302630 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 10:23:28 -0400
Subject: [PATCH 117/148] add presence validator for announcement.text

---
 app/models/announcement.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/announcement.rb b/app/models/announcement.rb
index aa98a0e..b44cd77 100644
--- a/app/models/announcement.rb
+++ b/app/models/announcement.rb
@@ -1,2 +1,3 @@
 class Announcement < ApplicationRecord
+  validates :text, presence: true
 end

From 5e3a07d462c686b884a6675a0f12686ab5812bda Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 10:29:36 -0400
Subject: [PATCH 118/148] centralize auth methods in announcement controller

---
 app/controllers/announcements_controller.rb | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/controllers/announcements_controller.rb b/app/controllers/announcements_controller.rb
index 4440707..f113a37 100644
--- a/app/controllers/announcements_controller.rb
+++ b/app/controllers/announcements_controller.rb
@@ -1,4 +1,5 @@
 class AnnouncementsController < ApplicationController
+  before_action :authenticate_user!, except: [:index, :show]
   before_action :set_announcement, only: [:show, :edit, :update, :destroy]
 
   # GET /announcements
@@ -7,16 +8,9 @@ def index
     @announcements = Announcement.order(created_at: :asc).page(params[:page])
   end
 
-  # GET /announcement/1
-  # GET /announcement/1.json
-  def show
-    @announcements = [Announcement.find(params[:id])]
-  end
-
   # POST /announcements
   # POST /announcements.json
   def create
-    authenticate_user!
     @announcement = Announcement.new(announcement_params)
     respond_to do |format|
       if @announcement.save
@@ -32,7 +26,6 @@ def create
   # PATCH/PUT /announcements/1
   # PATCH/PUT /announcements/1.json
   def update
-    authenticate_user!
     respond_to do |format|
       if @announcement.update(announcement_params)
         format.html { redirect_to announcements_url, notice: 'Announcement was successfully updated.' }
@@ -47,7 +40,6 @@ def update
   # DELETE /announcements/1
   # DELETE /announcements/1.json
   def destroy
-    authenticate_user!
     @announcement.destroy
     respond_to do |format|
       format.html { redirect_to announcements_url, notice: 'Announcement was successfully deleted.' }

From 776f91945ec0bae89e3d937259591178e7e9b144 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 10:29:46 -0400
Subject: [PATCH 119/148] set id for announcement fixtures

---
 test/fixtures/announcements.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/fixtures/announcements.yml b/test/fixtures/announcements.yml
index 861ee7d..75ea926 100644
--- a/test/fixtures/announcements.yml
+++ b/test/fixtures/announcements.yml
@@ -1,7 +1,9 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
 one:
+  id: 1
   text: MyString
 
 two:
+  id: 2
   text: MyString

From e915da901daa4e313e604ca4d5a6dd574dc6daaf Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 10:30:30 -0400
Subject: [PATCH 120/148] revert quotes changes

---
 test/controllers/quotes_controller_test.rb | 27 ++--------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/test/controllers/quotes_controller_test.rb b/test/controllers/quotes_controller_test.rb
index 2c8d1ea..e32952e 100644
--- a/test/controllers/quotes_controller_test.rb
+++ b/test/controllers/quotes_controller_test.rb
@@ -19,19 +19,10 @@ class QuotesControllerTest < ActionDispatch::IntegrationTest
 
   test 'should create quote' do
     assert_difference('Quote.count') do
-      post quotes_url, params: { quote: { text: @quote.text } }
+      post quotes_url, params: { quote: { score: @quote.score, text: @quote.text } }
     end
   end
 
-  test 'should fail to create approved quote' do
-    post quotes_url, params: { quote: { text: 'this quote is not approved', approved: true  } }
-    assert_equal false, Quote.where(text: 'this quote is not approved').first.approved
-  end
-
-  test 'should fail to set score on created quote' do
-    assert false
-  end
-
   test 'should show quote' do
     get quote_url(@quote)
     assert_response :success
@@ -77,22 +68,8 @@ class QuotesControllerTest < ActionDispatch::IntegrationTest
     end
 
     get '/random'
-    assert_select 'pre.quote_output', {:count=>0}
+    assert_select "pre", {:class => "quote_output", :count=>0}
     assert_response :success    
   end
 
-  test 'unauthenticated user should not update quote' do
-    assert_no_changes('Quote.find(@flagged_quote.id).flagged') do
-      get "/quotes/#{@flagged_quote.id}/unflag"
-    end
-    assert_redirected_to '/users/sign_in'
-  end
-  
-  test 'authenticated user should update quote' do
-    sign_in users(:one)
-    assert_changes('Quote.find(@flagged_quote.id).flagged') do
-      get "/quotes/#{@flagged_quote.id}/unflag"
-    end
-  end
-
 end

From c1ba7df18ffdbbb5f90e04ed677d4f654ac1c2f9 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 10:31:05 -0400
Subject: [PATCH 121/148] add failing test stubs

---
 test/controllers/quotes_controller_test.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/test/controllers/quotes_controller_test.rb b/test/controllers/quotes_controller_test.rb
index e32952e..966d37c 100644
--- a/test/controllers/quotes_controller_test.rb
+++ b/test/controllers/quotes_controller_test.rb
@@ -72,4 +72,14 @@ class QuotesControllerTest < ActionDispatch::IntegrationTest
     assert_response :success    
   end
 
+  test 'unauthenticated user should not update quote' do
+    assert false
+    assert_redirected_to '/users/sign_in'
+  end
+  
+  test 'authenticated user should update quote' do
+    sign_in users(:one)
+    assert false
+  end
+
 end

From 78a31f9f223bb546425ec2b801efcb3a79ce0e7b Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 10:42:40 -0400
Subject: [PATCH 122/148] fix tests

---
 test/controllers/announcements_controller_test.rb | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/test/controllers/announcements_controller_test.rb b/test/controllers/announcements_controller_test.rb
index fac413a..f61d37f 100644
--- a/test/controllers/announcements_controller_test.rb
+++ b/test/controllers/announcements_controller_test.rb
@@ -29,7 +29,7 @@ class AnnouncementsControllerTest < ActionDispatch::IntegrationTest
 
   test 'authenticated user should not create blank announcement' do
     sign_in users(:one)
-    assert_no_changes('Announcement.count') do
+    assert_no_difference('Announcement.count') do
       post announcements_url, params: { announcement: { text: '' } }
     end
   end
@@ -49,20 +49,17 @@ class AnnouncementsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test 'unauthenticated user should not update announcement' do
-    assert_no_changes('@announcement.text') do
-      @modified_announcement = @announcement
-      @modified_announcement.text = 'Modified text'
-      put announcement_url(@announcement), params: { announcement: @modified_announcement }
+    assert_no_changes('Announcement.find(@announcement.id).text') do
+      patch announcement_url(@announcement), params: { announcement: {id: 1, text: 'Modified text'} }
     end
     assert_redirected_to '/users/sign_in'
   end
 
   test 'authenticated user should update announcement' do
     sign_in users(:one)    
-    assert_changes('@announcement.text') do
-      @modified_announcement = @announcement
-      @modified_announcement.text = 'Modified text'
-      put announcement_url(@announcement), params: { announcement: @modified_announcement }
+    assert_changes('Announcement.find(@announcement.id).text') do
+      patch announcement_url(@announcement), params: { announcement: {id: 1,  text: 'Modified text'} }
     end
+    assert_redirected_to announcements_url
   end
 end
\ No newline at end of file

From 7826a77830b3e11747ecfd5cd0536ff7989475c5 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 10:42:45 -0400
Subject: [PATCH 123/148] update controller to make tests pass

---
 app/controllers/announcements_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/announcements_controller.rb b/app/controllers/announcements_controller.rb
index f113a37..4486c04 100644
--- a/app/controllers/announcements_controller.rb
+++ b/app/controllers/announcements_controller.rb
@@ -1,6 +1,6 @@
 class AnnouncementsController < ApplicationController
   before_action :authenticate_user!, except: [:index, :show]
-  before_action :set_announcement, only: [:show, :edit, :update, :destroy]
+  before_action :set_announcement, only: [:show, :update, :destroy]
 
   # GET /announcements
   # GET /announcements
@@ -17,7 +17,7 @@ def create
         format.html { redirect_to announcements_url, notice: 'Announcement was successfully created.' }
         format.json { render :show, status: :created, location: announcements_url }
       else
-        format.html { render :new }
+        format.html { redirect_to announcements_url }
         format.json { render json: @announcement.errors, status: :unprocessable_entity }
       end
     end

From d76707c2ded60fe70a28098219cb53cb04ce7b0d Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 10:53:55 -0400
Subject: [PATCH 124/148] add new announcement form and reorder announcement
 display

---
 app/controllers/announcements_controller.rb |  9 +++++++--
 app/views/admin/_navbar.html.erb            |  9 ++++++---
 app/views/announcements/_form.html.erb      | 22 +++++++++++++++++++++
 app/views/announcements/new.html.erb        |  1 +
 4 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 app/views/announcements/_form.html.erb
 create mode 100644 app/views/announcements/new.html.erb

diff --git a/app/controllers/announcements_controller.rb b/app/controllers/announcements_controller.rb
index 4486c04..f0ae241 100644
--- a/app/controllers/announcements_controller.rb
+++ b/app/controllers/announcements_controller.rb
@@ -3,9 +3,14 @@ class AnnouncementsController < ApplicationController
   before_action :set_announcement, only: [:show, :update, :destroy]
 
   # GET /announcements
-  # GET /announcements
+  # GET /announcements.json
   def index
-    @announcements = Announcement.order(created_at: :asc).page(params[:page])
+    @announcements = Announcement.order(created_at: :desc).page(params[:page])
+  end
+
+  # GET /announcements/new
+  def new
+  	@announcement = Announcement.new
   end
 
   # POST /announcements
diff --git a/app/views/admin/_navbar.html.erb b/app/views/admin/_navbar.html.erb
index 13d6b29..88e0ab6 100644
--- a/app/views/admin/_navbar.html.erb
+++ b/app/views/admin/_navbar.html.erb
@@ -1,10 +1,13 @@
-<div class="col-md-1"></div>			
+<div class="col-md-1"></div>
 <div class="col-md-10" id="navbar">
 	<nav class="navbar navbar-expand-md navbar-right" role="navigation">
 		<ul class="navbar-nav">
-			<li class="nav-item">				
+			<li class="nav-item">
+				<%= link_to 'Post Announcement', '/announcements/new', class: 'nav-link' %>
+			</li>
+			<li class="nav-item">
 				<%= link_to 'Flagged Quotes', '/flagged', class: 'nav-link' %>
-			</li>			
+			</li>
 			<li class="nav-item">
 				<%= link_to 'Submitted Quotes', '/submitted', class: 'nav-link' %>
 			</li>
diff --git a/app/views/announcements/_form.html.erb b/app/views/announcements/_form.html.erb
new file mode 100644
index 0000000..5a36295
--- /dev/null
+++ b/app/views/announcements/_form.html.erb
@@ -0,0 +1,22 @@
+<%= form_with(model: announcement, local: true) do |form| %>
+  <% if announcement.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(announcement.errors.count, "error") %> prohibited this announcement from being saved:</h2>
+
+      <ul>
+      <% announcement.errors.full_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= form.label :text %>
+    <%= form.text_area :text %>
+  </div>
+
+  <div class="actions">
+    <%= form.submit %>
+  </div>
+<% end %>
diff --git a/app/views/announcements/new.html.erb b/app/views/announcements/new.html.erb
new file mode 100644
index 0000000..2c4feca
--- /dev/null
+++ b/app/views/announcements/new.html.erb
@@ -0,0 +1 @@
+<%= render 'form', announcement: @announcement %>
\ No newline at end of file

From 7f851869d3bad935c75a67a7759a730edfdf28a8 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 10:58:42 -0400
Subject: [PATCH 125/148] remove lorem ipsum from homepage view

---
 app/views/announcements/index.html.erb | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/views/announcements/index.html.erb b/app/views/announcements/index.html.erb
index 08a6e08..5fb96d2 100644
--- a/app/views/announcements/index.html.erb
+++ b/app/views/announcements/index.html.erb
@@ -1,14 +1,6 @@
 <div class="row">
   <div class="col-sm-6">
-   Lorem ipsum dolor sit amet, sit eu eligendi scriptorem liberavisse, no pro civibus consetetur appellantur, feugiat bonorum vis at. Ea prima habemus senserit nec, feugiat torquatos contentiones ea has. Meis commodo ullamcorper no eam, sit eu modo menandri laboramus, eum id tation discere dolores. Elit inermis ocurreret at per.<br /><br />
-
-  In detraxit percipitur qui. Nam ferri inermis id, movet pertinax adipiscing nam in. Idque facilisi efficiantur pro id. Lorem nonumes ad pri, suas noster pertinax at quo, duo facilisis neglegentur ad.<br /><br />
-
-  No per simul munere putent, cu principes conceptam qui. Cum purto tempor aeterno ne, legere theophrastus in eum. Choro cetero legimus no ius. Exerci vivendo liberavisse ei usu, quo at legendos argumentum. Eos an aliquid perpetua, ex eum dolores oporteat suavitate. Cum ei affert adipisci.<br/><br />
-
-  Graeci commodo praesent vix ad, esse reprimique cu vim, commune accusata tractatos his ei. Et aperiam accumsan vel, ei cum ferri constituam definitiones. Duo cu putent veritus referrentur. Mei in wisi utinam insolens, in mea stet illum pertinax.<br /><br />
-
-  Vel dicta vidisse percipitur ex, qui purto possim no, quo id partiendo periculis reprehendunt. Iisque verterem consulatu cu sit, accusata petentium ea nam. Aeterno complectitur qui cu, in est interesset necessitatibus. Mei te zril urbanitas pertinacia. Mel ea reformidans ullamcorper, atqui putant aperiam vix in, an pri clita omnes fabellas. At putent sapientem mel.
+    <p>Welcome to Rash Quote Database!</p>
   </div>
   <div class="announcements col-sm-6">
     <%= paginate(@announcements) %>

From 2e669ce5f353390997704b3e671daadca5c1f29e Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 10:59:45 -0400
Subject: [PATCH 126/148] add pg workaround instructions to README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 155d80e..33c0b8f 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@ Install [RVM](https://rvm.io) and Ruby 2.5.1:
 
 Install bundled ruby gems:
 * ```bundle install```
+* Note: if bundle install fails due to postgres errors, you can safely skip this for development and testing by running: ```bundle install --without production```
 
 Installation:
 * ```bundle exec rake db:migrate```

From 5494b8600be665747d223476fd887a848d2a2088 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 11:08:32 -0400
Subject: [PATCH 127/148] cleanup routes

---
 config/routes.rb | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index f78f965..b918369 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -9,6 +9,7 @@
   root to: 'announcements#index'
 
   get 'admin',        to: 'admin#index'
+  get 'bottom',       to: 'quotes#bottom'  
   get 'browse',       to: 'quotes#index'
   get 'flagged',      to: 'admin#flagged'
   get 'latest',       to: 'quotes#latest'
@@ -18,22 +19,16 @@
   post '/search',     to: 'search#index'  
   get 'submitted',    to: 'admin#submitted'
   get 'top',          to: 'quotes#top'
-  get 'bottom',       to: 'quotes#bottom'
 
   resources :announcements
 
   resources :quotes do
     member do
       get :downvote
-      post :downvote
       get :upvote
-      post :upvote
       get :flag
-      post :flag
       get :unflag
-      post :unflag
       get :approve
-      post :approve
       get :search
       post :search
     end

From 70075a36dc30f9b51041a4a2a0663c98b8870880 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 11:09:20 -0400
Subject: [PATCH 128/148] cleanup quotes controller

---
 app/controllers/quotes_controller.rb | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index fef4010..0944865 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -1,5 +1,6 @@
 class QuotesController < ApplicationController
-  before_action :set_quote, only: [:show, :edit, :update, :destroy]
+  before_action :authenticate_user!, except: [:index, :show, :new, :create, :search, :downvote, :upvote, :flag, :latest, :random, :random1, :bottom, :top ]
+  before_action :set_quote, only: [:show, :update, :destroy]
 
   # GET /quotes
   # GET /quotes.json
@@ -34,7 +35,7 @@ def downvote
         format.html { redirect_to @quote, notice: 'Quote was successfully downvoted.' }
         format.json { render :show, status: :ok, location: @quote }
       else
-        format.html { render :edit }
+        format.html { render :show }
         format.json { render json: @quote.errors, status: :unprocessable_entity }
       end
     end
@@ -50,7 +51,7 @@ def upvote
         format.html { redirect_to @quote, notice: 'Quote was successfully upvoted.' }
         format.json { render :show, status: :ok, location: @quote }
       else
-        format.html { render :edit }
+        format.html { render :show }
         format.json { render json: @quote.errors, status: :unprocessable_entity }
       end
     end
@@ -59,7 +60,6 @@ def upvote
   # GET /quotes/1/approve
   # POST /quotes/1/approve
   def approve
-    authenticate_user!
     @quote = Quote.find(params[:id])
     @quote.update(approved: true)
     respond_to do |format|
@@ -67,7 +67,7 @@ def approve
         format.html { redirect_to @quote, notice: 'Quote was successfully approved.' }
         format.json { render :show, status: :ok, location: @quote }
       else
-        format.html { render :edit }
+        format.html { render :show }
         format.json { render json: @quote.errors, status: :unprocessable_entity }
       end
     end
@@ -84,16 +84,14 @@ def flag
         format.html { redirect_to @quote, notice: 'Quote was successfully flagged.' }
         format.json { render :show, status: :ok, location: @quote }
       else
-        format.html { render :edit }
+        format.html { render :show }
         format.json { render json: @quote.errors, status: :unprocessable_entity }
       end
     end
   end
 
   # GET /quotes/1/unflag
-  # POST /quotes/1/unflag
   def unflag
-    authenticate_user! unless user_signed_in?
     @quote = Quote.find(params[:id])
     @quote.update(flagged: false)
     respond_to do |format|
@@ -101,7 +99,7 @@ def unflag
         format.html { redirect_to @quote, notice: 'Quote was successfully unflagged.' }
         format.json { render :show, status: :ok, location: @quote }
       else
-        format.html { render :edit }
+        format.html { render :show }
         format.json { render json: @quote.errors, status: :unprocessable_entity }
       end
     end
@@ -199,7 +197,7 @@ def update
         format.html { redirect_to @quote, notice: 'Quote was successfully updated.' }
         format.json { render :show, status: :ok, location: @quote }
       else
-        format.html { render :edit }
+        format.html { render :show }
         format.json { render json: @quote.errors, status: :unprocessable_entity }
       end
     end
@@ -208,7 +206,6 @@ def update
   # DELETE /quotes/1
   # DELETE /quotes/1.json
   def destroy
-    authenticate_user!
     @quote.destroy
     respond_to do |format|
       format.html { redirect_to quotes_url, notice: 'Quote was successfully deleted.' }

From 70b756355dbb8958f07832613c4f3376459203af Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 11:11:36 -0400
Subject: [PATCH 129/148] remove outdated test

---
 test/controllers/quotes_controller_test.rb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/controllers/quotes_controller_test.rb b/test/controllers/quotes_controller_test.rb
index 966d37c..f2032fd 100644
--- a/test/controllers/quotes_controller_test.rb
+++ b/test/controllers/quotes_controller_test.rb
@@ -28,11 +28,6 @@ class QuotesControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
   end
 
-  test 'should update quote' do
-    patch quote_url(@quote), params: { quote: { score: @quote.score, text: @quote.text } }
-    assert_redirected_to quote_url(@quote)
-  end
-
   test 'authenticated user should destroy quote' do
     sign_in users(:one)
     assert_difference('Quote.count', -1) do
@@ -44,7 +39,7 @@ class QuotesControllerTest < ActionDispatch::IntegrationTest
     assert_no_difference('Quote.count') do
       delete quote_url(@quote)
     end
-    assert_redirected_to '/users/sign_in'    
+    assert_redirected_to '/users/sign_in'
   end
 
   test 'unauthenticated user should not unflag quote' do
@@ -69,17 +64,22 @@ class QuotesControllerTest < ActionDispatch::IntegrationTest
 
     get '/random'
     assert_select "pre", {:class => "quote_output", :count=>0}
-    assert_response :success    
+    assert_response :success
   end
 
   test 'unauthenticated user should not update quote' do
-    assert false
+    assert_no_changes('Quote.find(@quote.id).text') do
+      patch quote_url(@quote), params: { quote: {id: 1, text: 'Modified text'} }
+    end
     assert_redirected_to '/users/sign_in'
   end
-  
+
   test 'authenticated user should update quote' do
     sign_in users(:one)
-    assert false
+    assert_changes('Quote.find(@quote.id).text') do
+      patch quote_url(@quote), params: { quote: {id: 1,  text: 'Modified text'} }
+    end
+    assert_redirected_to quote_url(@quote)
   end
 
 end

From 0b72f3cf88a192a0699fafe56c640356a95f3df6 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 22:41:57 -0400
Subject: [PATCH 130/148] add test for upvote/downvote

---
 test/controllers/quotes_controller_test.rb | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/test/controllers/quotes_controller_test.rb b/test/controllers/quotes_controller_test.rb
index f2032fd..862c2db 100644
--- a/test/controllers/quotes_controller_test.rb
+++ b/test/controllers/quotes_controller_test.rb
@@ -18,7 +18,7 @@ class QuotesControllerTest < ActionDispatch::IntegrationTest
   end
 
   test 'should create quote' do
-    assert_difference('Quote.count') do
+    assert_difference('Quote.count', +1) do
       post quotes_url, params: { quote: { score: @quote.score, text: @quote.text } }
     end
   end
@@ -28,6 +28,20 @@ class QuotesControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
   end
 
+  test 'should upvote quote' do
+    assert_difference('Quote.find(@quote.id).score', +1) do
+      get "/quotes/#{@quote.id}/upvote"
+    end
+    assert_redirected_to quote_url(@quote)
+  end
+
+  test 'should downvote quote' do
+    assert_difference('Quote.find(@quote.id).score', -1) do
+      get "/quotes/#{@quote.id}/downvote"
+    end
+    assert_redirected_to quote_url(@quote)
+  end  
+
   test 'authenticated user should destroy quote' do
     sign_in users(:one)
     assert_difference('Quote.count', -1) do

From 3b03903d0db170760746ebda21974d95723d24f8 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 22:42:12 -0400
Subject: [PATCH 131/148] add votes model/controller

---
 app/assets/javascripts/votes.coffee       |  3 +++
 app/assets/stylesheets/votes.scss         |  3 +++
 app/controllers/quotes_controller.rb      |  1 -
 app/controllers/votes_controller.rb       |  3 +++
 app/helpers/votes_helper.rb               |  2 ++
 app/models/quote.rb                       |  1 +
 app/models/vote.rb                        |  3 +++
 db/migrate/20180523022941_create_votes.rb | 11 +++++++++++
 db/schema.rb                              | 11 ++++++++++-
 test/controllers/votes_controller_test.rb |  7 +++++++
 test/fixtures/votes.yml                   | 11 +++++++++++
 test/models/vote_test.rb                  |  7 +++++++
 12 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 app/assets/javascripts/votes.coffee
 create mode 100644 app/assets/stylesheets/votes.scss
 create mode 100644 app/controllers/votes_controller.rb
 create mode 100644 app/helpers/votes_helper.rb
 create mode 100644 app/models/vote.rb
 create mode 100644 db/migrate/20180523022941_create_votes.rb
 create mode 100644 test/controllers/votes_controller_test.rb
 create mode 100644 test/fixtures/votes.yml
 create mode 100644 test/models/vote_test.rb

diff --git a/app/assets/javascripts/votes.coffee b/app/assets/javascripts/votes.coffee
new file mode 100644
index 0000000..24f83d1
--- /dev/null
+++ b/app/assets/javascripts/votes.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/votes.scss b/app/assets/stylesheets/votes.scss
new file mode 100644
index 0000000..4756424
--- /dev/null
+++ b/app/assets/stylesheets/votes.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the votes controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 0944865..ac5351c 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -26,7 +26,6 @@ def search
   end
 
   # GET /quotes/1/downvote
-  # POST /quotes/1/downvote
   def downvote
     @quote = Quote.find(params[:id])
     @quote.update(score: @quote.score - 1)
diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb
new file mode 100644
index 0000000..c29fd27
--- /dev/null
+++ b/app/controllers/votes_controller.rb
@@ -0,0 +1,3 @@
+class VotesController < ApplicationController
+
+end
diff --git a/app/helpers/votes_helper.rb b/app/helpers/votes_helper.rb
new file mode 100644
index 0000000..5a82eed
--- /dev/null
+++ b/app/helpers/votes_helper.rb
@@ -0,0 +1,2 @@
+module VotesHelper
+end
diff --git a/app/models/quote.rb b/app/models/quote.rb
index bfa5513..e6a6432 100644
--- a/app/models/quote.rb
+++ b/app/models/quote.rb
@@ -1,2 +1,3 @@
 class Quote < ApplicationRecord
+	has_many :votes
 end
diff --git a/app/models/vote.rb b/app/models/vote.rb
new file mode 100644
index 0000000..728a3c5
--- /dev/null
+++ b/app/models/vote.rb
@@ -0,0 +1,3 @@
+class Vote < ApplicationRecord
+  belongs_to :quote_id
+end
diff --git a/db/migrate/20180523022941_create_votes.rb b/db/migrate/20180523022941_create_votes.rb
new file mode 100644
index 0000000..8187832
--- /dev/null
+++ b/db/migrate/20180523022941_create_votes.rb
@@ -0,0 +1,11 @@
+class CreateVotes < ActiveRecord::Migration[5.2]
+  def change
+    create_table :votes do |t|
+      t.references :quote_id, foreign_key: true
+      t.string :ipaddress
+      t.integer :value
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index e335b48..288ab39 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2018_05_22_142058) do
+ActiveRecord::Schema.define(version: 2018_05_23_022941) do
 
   create_table "announcements", force: :cascade do |t|
     t.string "text", null: false
@@ -50,4 +50,13 @@
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end
 
+  create_table "votes", force: :cascade do |t|
+    t.integer "quote_id_id"
+    t.string "ipaddress"
+    t.integer "value"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["quote_id_id"], name: "index_votes_on_quote_id_id"
+  end
+
 end
diff --git a/test/controllers/votes_controller_test.rb b/test/controllers/votes_controller_test.rb
new file mode 100644
index 0000000..fac08af
--- /dev/null
+++ b/test/controllers/votes_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class VotesControllerTest < ActionDispatch::IntegrationTest
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml
new file mode 100644
index 0000000..478b649
--- /dev/null
+++ b/test/fixtures/votes.yml
@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  quote_id: one
+  ipaddress: MyString
+  value: 1
+
+two:
+  quote_id: two
+  ipaddress: MyString
+  value: 1
diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb
new file mode 100644
index 0000000..f31f992
--- /dev/null
+++ b/test/models/vote_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class VoteTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

From 52d4c1fc71d6864e39dc1dd3672f0c242f9b0d89 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 23:15:14 -0400
Subject: [PATCH 132/148] voting logic

---
 app/controllers/quotes_controller.rb       | 26 +++++++++++-----
 app/models/quote.rb                        |  6 +++-
 app/models/vote.rb                         |  2 +-
 db/migrate/20180523022941_create_votes.rb  |  6 ++--
 db/schema.rb                               | 11 +++----
 db/seeds.rb                                | 36 +++++++++++-----------
 test/controllers/quotes_controller_test.rb |  4 +--
 test/fixtures/quotes.yml                   |  2 --
 test/fixtures/votes.yml                    |  8 ++---
 9 files changed, 56 insertions(+), 45 deletions(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index ac5351c..88432c5 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -1,6 +1,6 @@
 class QuotesController < ApplicationController
   before_action :authenticate_user!, except: [:index, :show, :new, :create, :search, :downvote, :upvote, :flag, :latest, :random, :random1, :bottom, :top ]
-  before_action :set_quote, only: [:show, :update, :destroy]
+  before_action :set_quote, only: [:show, :update, :destroy, :upvote, :downvote]
 
   # GET /quotes
   # GET /quotes.json
@@ -27,10 +27,15 @@ def search
 
   # GET /quotes/1/downvote
   def downvote
-    @quote = Quote.find(params[:id])
-    @quote.update(score: @quote.score - 1)
+    votes = Vote.where(quote: @quote, ipaddress: request.remote_ip)
+    if votes.count > 0
+      vote = votes.first
+      vote.update(value: -1)
+    else
+      vote = Vote.new(quote: @quote, ipaddress: request.remote_ip, value: -1)
+    end
     respond_to do |format|
-      if @quote.save
+      if vote.save
         format.html { redirect_to @quote, notice: 'Quote was successfully downvoted.' }
         format.json { render :show, status: :ok, location: @quote }
       else
@@ -41,12 +46,16 @@ def downvote
   end
 
   # GET /quotes/1/upvote
-  # POST /quotes/1/upvote
   def upvote
-    @quote = Quote.find(params[:id])
-    @quote.update(score: @quote.score + 1)
+    votes = Vote.where(quote: @quote, ipaddress: request.remote_ip)
+    if votes.count > 0
+      vote = votes.first
+      vote.update(value: +1)
+    else
+      vote = Vote.new(quote: @quote, ipaddress: request.remote_ip, value: +1)
+    end
     respond_to do |format|
-      if @quote.save
+      if vote.save
         format.html { redirect_to @quote, notice: 'Quote was successfully upvoted.' }
         format.json { render :show, status: :ok, location: @quote }
       else
@@ -56,6 +65,7 @@ def upvote
     end
   end
 
+
   # GET /quotes/1/approve
   # POST /quotes/1/approve
   def approve
diff --git a/app/models/quote.rb b/app/models/quote.rb
index e6a6432..f171031 100644
--- a/app/models/quote.rb
+++ b/app/models/quote.rb
@@ -1,3 +1,7 @@
 class Quote < ApplicationRecord
-	has_many :votes
+  has_many :votes
+
+  def score
+    votes = Vote.where(quote: self)
+  end
 end
diff --git a/app/models/vote.rb b/app/models/vote.rb
index 728a3c5..e55c8cb 100644
--- a/app/models/vote.rb
+++ b/app/models/vote.rb
@@ -1,3 +1,3 @@
 class Vote < ApplicationRecord
-  belongs_to :quote_id
+  belongs_to :quote
 end
diff --git a/db/migrate/20180523022941_create_votes.rb b/db/migrate/20180523022941_create_votes.rb
index 8187832..6ce0c7d 100644
--- a/db/migrate/20180523022941_create_votes.rb
+++ b/db/migrate/20180523022941_create_votes.rb
@@ -1,9 +1,9 @@
 class CreateVotes < ActiveRecord::Migration[5.2]
   def change
     create_table :votes do |t|
-      t.references :quote_id, foreign_key: true
-      t.string :ipaddress
-      t.integer :value
+      t.references :quote, foreign_key: true
+      t.string :ipaddress, null: false
+      t.integer :value, null: false
 
       t.timestamps
     end
diff --git a/db/schema.rb b/db/schema.rb
index 288ab39..0acd8fe 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2018_05_23_022941) do
+ActiveRecord::Schema.define(version: 2018_05_23_030416) do
 
   create_table "announcements", force: :cascade do |t|
     t.string "text", null: false
@@ -20,7 +20,6 @@
 
   create_table "quotes", force: :cascade do |t|
     t.string "text", null: false
-    t.integer "score", default: 0, null: false
     t.boolean "approved", default: false, null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -51,12 +50,12 @@
   end
 
   create_table "votes", force: :cascade do |t|
-    t.integer "quote_id_id"
-    t.string "ipaddress"
-    t.integer "value"
+    t.integer "quote_id"
+    t.string "ipaddress", null: false
+    t.integer "value", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["quote_id_id"], name: "index_votes_on_quote_id_id"
+    t.index ["quote_id"], name: "index_votes_on_quote_id"
   end
 
 end
diff --git a/db/seeds.rb b/db/seeds.rb
index 2c1be2e..31affbb 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -13,7 +13,7 @@
   {email: 'admin@admin.admin', password: 'password'}
 ])
 
-Quote.create(approved:true, score:10, text:
+Quote.create(approved:true, text:
 '<Cthon98> hey, if you type in your pw, it will show as stars
 <Cthon98> ********* see!
 <AzureDiamond> hunter2
@@ -34,11 +34,11 @@
 
 Quote.create(approved: false, text: '<erno> hm. I\'ve lost a machine.. literally _lost_. it responds to ping, it works completely, I just can\'t figure out where in my apartment it is.')
 
-Quote.create(approved: true, flagged: true, score: 1, text: '<jeebus> the "bishop" came to our church today
+Quote.create(approved: true, flagged: true, text: '<jeebus> the "bishop" came to our church today
 <jeebus> he was a fucken impostor
 <jeebus> never once moved diagonally')
 
-Quote.create(approved: true, score: 1, text: '< nutbar> [root@linux!/usr/src/bind] grep "{" named.conf.newer | wc -l
+Quote.create(approved: true, text: '< nutbar> [root@linux!/usr/src/bind] grep "{" named.conf.newer | wc -l
 < nutbar>   19314
 < nutbar> [root@linux!/usr/src/bind] grep "}" named.conf.newer | wc -l
 < nutbar>   19313
@@ -47,31 +47,31 @@
 * nutbar fumes
 < nutbar> one fucking missing }')
 
-Quote.create(approved: true, score: 1, text: '<GaRlic> how you like my new name?
+Quote.create(approved: true, text: '<GaRlic> how you like my new name?
 <drunkers> it stinks')
-Quote.create(approved: true, score: 1, text: '<danie2> do you have a gf?
+Quote.create(approved: true, text: '<danie2> do you have a gf?
 <ieatrocks> hahahahahah
 <ieatrocks> wow, thanks for even asking.')
-Quote.create(approved: true, score: 1, text: '<VolteFace`> don\'t you hate it when you shit on the floor, and you can hear it fall but you have no idea where it actually landed, and spend like 5 minutes looking for it
+Quote.create(approved: true, text: '<VolteFace`> don\'t you hate it when you shit on the floor, and you can hear it fall but you have no idea where it actually landed, and spend like 5 minutes looking for it
 <peng> ...
 <peng> what?
 <VolteFace`> oh shit
 <VolteFace`> don\'t you hate it when you DROP shit')
-Quote.create(approved: true, score: 1, text: '<fppe> The worst thing about a prostate exam is when he finds out you\'re not a real doctor.')
-Quote.create(approved: true, score: 1, text: '<ednos> technically, I\'m not pedantic')
-Quote.create(approved: true, score: 1, text: '<tttb> Why did the programmer quit his job?
+Quote.create(approved: true, text: '<fppe> The worst thing about a prostate exam is when he finds out you\'re not a real doctor.')
+Quote.create(approved: true, text: '<ednos> technically, I\'m not pedantic')
+Quote.create(approved: true, text: '<tttb> Why did the programmer quit his job?
 <tttb> because he didn\'t get arrays')
-Quote.create(approved: true, score: 1, text: '<@apexthief> Okay we have taco tuesday I need other food day of the week ideas
+Quote.create(approved: true, text: '<@apexthief> Okay we have taco tuesday I need other food day of the week ideas
 <@AltRhombu> taco wednesday
 <@AltRhombu> taco thursday')
-Quote.create(approved: true, score: 1, text: '<Papa_Wa> Anyone else struggling to login?
+Quote.create(approved: true, text: '<Papa_Wa> Anyone else struggling to login?
 <Udungoof> i\'m struggling most of the time
 <Udungoof> not necessarily with loginservers though
 <Udongoof> life mostly')
-Quote.create(approved: true, score: 1, text: '')
-Quote.create(approved: true, score: 1, text: '')
-Quote.create(approved: true, score: 1, text: '')
-Quote.create(approved: true, score: 1, text: '')
-Quote.create(approved: true, score: 1, text: '')
-Quote.create(approved: true, score: 1, text: '')
-Quote.create(approved: true, score: 1, text: '')
+Quote.create(approved: true, text: '')
+Quote.create(approved: true, text: '')
+Quote.create(approved: true, text: '')
+Quote.create(approved: true, text: '')
+Quote.create(approved: true, text: '')
+Quote.create(approved: true, text: '')
+Quote.create(approved: true, text: '')
diff --git a/test/controllers/quotes_controller_test.rb b/test/controllers/quotes_controller_test.rb
index 862c2db..84d0a4b 100644
--- a/test/controllers/quotes_controller_test.rb
+++ b/test/controllers/quotes_controller_test.rb
@@ -19,7 +19,7 @@ class QuotesControllerTest < ActionDispatch::IntegrationTest
 
   test 'should create quote' do
     assert_difference('Quote.count', +1) do
-      post quotes_url, params: { quote: { score: @quote.score, text: @quote.text } }
+      post quotes_url, params: { quote: { text: @quote.text } }
     end
   end
 
@@ -29,7 +29,7 @@ class QuotesControllerTest < ActionDispatch::IntegrationTest
   end
 
   test 'should upvote quote' do
-    assert_difference('Quote.find(@quote.id).score', +1) do
+    assert_difference('@quote.score', +1) do
       get "/quotes/#{@quote.id}/upvote"
     end
     assert_redirected_to quote_url(@quote)
diff --git a/test/fixtures/quotes.yml b/test/fixtures/quotes.yml
index 57aebbc..16e0b7b 100644
--- a/test/fixtures/quotes.yml
+++ b/test/fixtures/quotes.yml
@@ -3,10 +3,8 @@
 one:
   id: 1
   text: MyString1
-  score: 1
 
 two:
   id: 2
   text: MyString2
-  score: 3
   flagged: true
diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml
index 478b649..b62fa79 100644
--- a/test/fixtures/votes.yml
+++ b/test/fixtures/votes.yml
@@ -1,11 +1,11 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
 one:
-  quote_id: one
+  quote: 1
   ipaddress: MyString
   value: 1
 
 two:
-  quote_id: two
-  ipaddress: MyString
-  value: 1
+  quote: 2
+  ipaddress: MyString2
+  value: -1

From 06b4ac8ac4e95d0ded1846768756d747dca871f3 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 23:33:26 -0400
Subject: [PATCH 133/148] finish voting logic

---
 app/models/quote.rb                                   |  2 ++
 db/migrate/20180523030416_remove_score_from_quotes.rb |  5 +++++
 test/fixtures/votes.yml                               |  8 +++++---
 test/models/quote_test.rb                             | 10 +++++++---
 4 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 db/migrate/20180523030416_remove_score_from_quotes.rb

diff --git a/app/models/quote.rb b/app/models/quote.rb
index f171031..5e02c08 100644
--- a/app/models/quote.rb
+++ b/app/models/quote.rb
@@ -3,5 +3,7 @@ class Quote < ApplicationRecord
 
   def score
     votes = Vote.where(quote: self)
+    tally = votes.sum(:value)
+    tally
   end
 end
diff --git a/db/migrate/20180523030416_remove_score_from_quotes.rb b/db/migrate/20180523030416_remove_score_from_quotes.rb
new file mode 100644
index 0000000..70d8813
--- /dev/null
+++ b/db/migrate/20180523030416_remove_score_from_quotes.rb
@@ -0,0 +1,5 @@
+class RemoveScoreFromQuotes < ActiveRecord::Migration[5.2]
+  def change
+    remove_column :quotes, :score, :integer
+  end
+end
diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml
index b62fa79..ee45d9b 100644
--- a/test/fixtures/votes.yml
+++ b/test/fixtures/votes.yml
@@ -1,11 +1,13 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
 one:
-  quote: 1
+  id: 1
+  quote_id: 1
   ipaddress: MyString
   value: 1
 
 two:
-  quote: 2
+  id: 2
+  quote_id: 1
   ipaddress: MyString2
-  value: -1
+  value: 4
diff --git a/test/models/quote_test.rb b/test/models/quote_test.rb
index 1662c08..dfe3dd2 100644
--- a/test/models/quote_test.rb
+++ b/test/models/quote_test.rb
@@ -1,7 +1,11 @@
 require 'test_helper'
 
 class QuoteTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
+  setup do
+    @quote = quotes(:one)
+  end
+
+  test 'score' do
+    assert_equal(5, @quote.score)
+  end
 end

From 81f93c937e0cf98f45463c0325350718dba8c732 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 23:48:39 -0400
Subject: [PATCH 134/148] add tests to expose bug in /top and /bottom

---
 test/controllers/quotes_controller_test.rb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/test/controllers/quotes_controller_test.rb b/test/controllers/quotes_controller_test.rb
index 84d0a4b..f3a5c5f 100644
--- a/test/controllers/quotes_controller_test.rb
+++ b/test/controllers/quotes_controller_test.rb
@@ -28,6 +28,21 @@ class QuotesControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
   end
 
+  test 'should show top quotes' do
+    get '/top'
+    assert_response :success
+  end
+
+  test 'should show bottom quotes' do
+    get '/bottom'
+    assert_response :success
+  end
+
+  test 'should show random quotes' do
+    get '/bottom'
+    assert_response :success
+  end
+
   test 'should upvote quote' do
     assert_difference('@quote.score', +1) do
       get "/quotes/#{@quote.id}/upvote"

From e95824b224651a73cbe6f1ddaf5a04faf86d9773 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Tue, 22 May 2018 23:50:32 -0400
Subject: [PATCH 135/148] add tests to expose bug in /top and /bottom

---
 test/controllers/quotes_controller_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/controllers/quotes_controller_test.rb b/test/controllers/quotes_controller_test.rb
index f3a5c5f..d0ef1cc 100644
--- a/test/controllers/quotes_controller_test.rb
+++ b/test/controllers/quotes_controller_test.rb
@@ -39,7 +39,7 @@ class QuotesControllerTest < ActionDispatch::IntegrationTest
   end
 
   test 'should show random quotes' do
-    get '/bottom'
+    get '/random'
     assert_response :success
   end
 

From 77f762300c9543a7f45da59c0ebe78b0217a3047 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Thu, 7 Jun 2018 19:21:35 -0400
Subject: [PATCH 136/148] restore score to quotes

---
 app/models/quote.rb                                   | 6 ------
 db/migrate/20180523030416_remove_score_from_quotes.rb | 5 -----
 db/schema.rb                                          | 3 ++-
 3 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 db/migrate/20180523030416_remove_score_from_quotes.rb

diff --git a/app/models/quote.rb b/app/models/quote.rb
index 5e02c08..c21c39a 100644
--- a/app/models/quote.rb
+++ b/app/models/quote.rb
@@ -1,9 +1,3 @@
 class Quote < ApplicationRecord
   has_many :votes
-
-  def score
-    votes = Vote.where(quote: self)
-    tally = votes.sum(:value)
-    tally
-  end
 end
diff --git a/db/migrate/20180523030416_remove_score_from_quotes.rb b/db/migrate/20180523030416_remove_score_from_quotes.rb
deleted file mode 100644
index 70d8813..0000000
--- a/db/migrate/20180523030416_remove_score_from_quotes.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class RemoveScoreFromQuotes < ActiveRecord::Migration[5.2]
-  def change
-    remove_column :quotes, :score, :integer
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index 0acd8fe..6b6b559 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2018_05_23_030416) do
+ActiveRecord::Schema.define(version: 2018_05_23_022941) do
 
   create_table "announcements", force: :cascade do |t|
     t.string "text", null: false
@@ -20,6 +20,7 @@
 
   create_table "quotes", force: :cascade do |t|
     t.string "text", null: false
+    t.integer "score", default: 0, null: false
     t.boolean "approved", default: false, null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false

From f4cc699b599c7f42d6ad3fac31816fb01b1e4407 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Thu, 7 Jun 2018 19:21:43 -0400
Subject: [PATCH 137/148] add score back to tests

---
 test/fixtures/quotes.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/fixtures/quotes.yml b/test/fixtures/quotes.yml
index 16e0b7b..d06d838 100644
--- a/test/fixtures/quotes.yml
+++ b/test/fixtures/quotes.yml
@@ -3,8 +3,10 @@
 one:
   id: 1
   text: MyString1
+  score: 5
 
 two:
   id: 2
   text: MyString2
   flagged: true
+  score: 0

From 086c52e0da52e45b08deacefba57752e6151943b Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Thu, 7 Jun 2018 19:22:04 -0400
Subject: [PATCH 138/148] add quote update/save in quotes_controller

---
 app/controllers/quotes_controller.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 88432c5..8c9b1cb 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -34,8 +34,9 @@ def downvote
     else
       vote = Vote.new(quote: @quote, ipaddress: request.remote_ip, value: -1)
     end
+    @quote.update(score: @quote.score - 1)
     respond_to do |format|
-      if vote.save
+      if vote.save and @quote.save
         format.html { redirect_to @quote, notice: 'Quote was successfully downvoted.' }
         format.json { render :show, status: :ok, location: @quote }
       else
@@ -54,8 +55,9 @@ def upvote
     else
       vote = Vote.new(quote: @quote, ipaddress: request.remote_ip, value: +1)
     end
+    @quote.update(score: @quote.score + 1)
     respond_to do |format|
-      if vote.save
+      if vote.save and @quote.save
         format.html { redirect_to @quote, notice: 'Quote was successfully upvoted.' }
         format.json { render :show, status: :ok, location: @quote }
       else

From f1e2e4ce8c3c620840471fd330d3b905e6be9295 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Thu, 7 Jun 2018 19:29:10 -0400
Subject: [PATCH 139/148] cleanup using set_quote

---
 app/controllers/quotes_controller.rb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 8c9b1cb..6be4c87 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -1,6 +1,6 @@
 class QuotesController < ApplicationController
   before_action :authenticate_user!, except: [:index, :show, :new, :create, :search, :downvote, :upvote, :flag, :latest, :random, :random1, :bottom, :top ]
-  before_action :set_quote, only: [:show, :update, :destroy, :upvote, :downvote]
+  before_action :set_quote, only: [:show, :update, :destroy, :approve, :flag, :unflag, :upvote, :downvote]
 
   # GET /quotes
   # GET /quotes.json
@@ -71,7 +71,6 @@ def upvote
   # GET /quotes/1/approve
   # POST /quotes/1/approve
   def approve
-    @quote = Quote.find(params[:id])
     @quote.update(approved: true)
     respond_to do |format|
       if @quote.save
@@ -88,7 +87,6 @@ def approve
   # GET /quotes/1/flag
   # POST /quotes/1/flag
   def flag
-    @quote = Quote.find(params[:id])
     @quote.update(flagged: true)
     respond_to do |format|
       if @quote.save
@@ -103,7 +101,6 @@ def flag
 
   # GET /quotes/1/unflag
   def unflag
-    @quote = Quote.find(params[:id])
     @quote.update(flagged: false)
     respond_to do |format|
       if @quote.save

From 06058efa2ac9931622fa6005463dab07ae41ec4d Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Thu, 7 Jun 2018 19:29:24 -0400
Subject: [PATCH 140/148] cleanup using set_quote

---
 app/controllers/quotes_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 6be4c87..45606c3 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -11,7 +11,7 @@ def index
   # GET /quotes/1
   # GET /quotes/1.json
   def show
-    @quotes = [Quote.find(params[:id])]
+    @quotes = [@quote]
   end
 
   # GET /quotes/new

From f5bd4b6be9264d07f2f18ff1a71e2865eeb41b4d Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Thu, 7 Jun 2018 19:34:32 -0400
Subject: [PATCH 141/148] fix upvote test

---
 test/controllers/quotes_controller_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/controllers/quotes_controller_test.rb b/test/controllers/quotes_controller_test.rb
index d0ef1cc..ad2db7a 100644
--- a/test/controllers/quotes_controller_test.rb
+++ b/test/controllers/quotes_controller_test.rb
@@ -44,11 +44,11 @@ class QuotesControllerTest < ActionDispatch::IntegrationTest
   end
 
   test 'should upvote quote' do
-    assert_difference('@quote.score', +1) do
+    assert_difference('Quote.find(@quote.id).score', +1) do
       get "/quotes/#{@quote.id}/upvote"
     end
     assert_redirected_to quote_url(@quote)
-  end
+  end 
 
   test 'should downvote quote' do
     assert_difference('Quote.find(@quote.id).score', -1) do

From 2e64d989879c4dd070c8593c18680d9423a5e439 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Thu, 7 Jun 2018 19:39:45 -0400
Subject: [PATCH 142/148] add tests for voting restrictions

---
 test/controllers/quotes_controller_test.rb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/test/controllers/quotes_controller_test.rb b/test/controllers/quotes_controller_test.rb
index ad2db7a..4afcac9 100644
--- a/test/controllers/quotes_controller_test.rb
+++ b/test/controllers/quotes_controller_test.rb
@@ -43,19 +43,21 @@ class QuotesControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
   end
 
-  test 'should upvote quote' do
+  test 'should upvote quote only once' do
     assert_difference('Quote.find(@quote.id).score', +1) do
-      get "/quotes/#{@quote.id}/upvote"
+      3.times { get "/quotes/#{@quote.id}/upvote" }
     end
     assert_redirected_to quote_url(@quote)
-  end 
+  end
 
-  test 'should downvote quote' do
+  test 'should downvote quote only once' do
     assert_difference('Quote.find(@quote.id).score', -1) do
-      get "/quotes/#{@quote.id}/downvote"
+      3.times do |i|
+        get "/quotes/#{@quote.id}/upvote"        
+      end
     end
     assert_redirected_to quote_url(@quote)
-  end  
+  end
 
   test 'authenticated user should destroy quote' do
     sign_in users(:one)

From a8026cbfd291f01ec5a3612d0d2a3bf5fb4ea060 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Thu, 7 Jun 2018 19:56:12 -0400
Subject: [PATCH 143/148] fix upvote/downvote

---
 app/controllers/quotes_controller.rb       | 16 ++++++++--------
 test/controllers/quotes_controller_test.rb |  8 +++++---
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 45606c3..463cb21 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -27,14 +27,14 @@ def search
 
   # GET /quotes/1/downvote
   def downvote
-    votes = Vote.where(quote: @quote, ipaddress: request.remote_ip)
-    if votes.count > 0
-      vote = votes.first
+    previous_votes = Vote.where(quote: @quote, ipaddress: request.remote_ip)
+    if previous_votes.count > 0
+      vote = previous_votes.first
       vote.update(value: -1)
     else
       vote = Vote.new(quote: @quote, ipaddress: request.remote_ip, value: -1)
     end
-    @quote.update(score: @quote.score - 1)
+    @quote.update(score: Vote.where(quote: @quote).sum(:value))
     respond_to do |format|
       if vote.save and @quote.save
         format.html { redirect_to @quote, notice: 'Quote was successfully downvoted.' }
@@ -48,14 +48,14 @@ def downvote
 
   # GET /quotes/1/upvote
   def upvote
-    votes = Vote.where(quote: @quote, ipaddress: request.remote_ip)
-    if votes.count > 0
-      vote = votes.first
+    previous_votes = Vote.where(quote: @quote, ipaddress: request.remote_ip)
+    if previous_votes.count > 0
+      vote = previous_votes.first
       vote.update(value: +1)
     else
       vote = Vote.new(quote: @quote, ipaddress: request.remote_ip, value: +1)
     end
-    @quote.update(score: @quote.score + 1)
+    @quote.update(score: Vote.where(quote: @quote).sum(:value))
     respond_to do |format|
       if vote.save and @quote.save
         format.html { redirect_to @quote, notice: 'Quote was successfully upvoted.' }
diff --git a/test/controllers/quotes_controller_test.rb b/test/controllers/quotes_controller_test.rb
index 4afcac9..a96dfae 100644
--- a/test/controllers/quotes_controller_test.rb
+++ b/test/controllers/quotes_controller_test.rb
@@ -45,15 +45,17 @@ class QuotesControllerTest < ActionDispatch::IntegrationTest
 
   test 'should upvote quote only once' do
     assert_difference('Quote.find(@quote.id).score', +1) do
-      3.times { get "/quotes/#{@quote.id}/upvote" }
+      3.times do
+        get "/quotes/#{@quote.id}/upvote"
+      end
     end
     assert_redirected_to quote_url(@quote)
   end
 
   test 'should downvote quote only once' do
     assert_difference('Quote.find(@quote.id).score', -1) do
-      3.times do |i|
-        get "/quotes/#{@quote.id}/upvote"        
+      3.times do
+        get "/quotes/#{@quote.id}/downvote"
       end
     end
     assert_redirected_to quote_url(@quote)

From e0c0a34e1f497fd2035fa85b680ec044208e9276 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Thu, 7 Jun 2018 19:57:45 -0400
Subject: [PATCH 144/148] add bottom view

---
 app/views/quotes/bottom.html.erb | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 app/views/quotes/bottom.html.erb

diff --git a/app/views/quotes/bottom.html.erb b/app/views/quotes/bottom.html.erb
new file mode 100644
index 0000000..44f8d0d
--- /dev/null
+++ b/app/views/quotes/bottom.html.erb
@@ -0,0 +1,4 @@
+<%= paginate(@quotes) %>
+<% @quotes.each do |quote| -%>
+<%= render 'quotes/show', :quote => quote %>
+<% end -%>
\ No newline at end of file

From 5269470102b629979cf0f6c6aff2ebf8fe1d64bb Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Thu, 7 Jun 2018 20:04:32 -0400
Subject: [PATCH 145/148] fix update logic for voting to fix first votes

---
 app/controllers/quotes_controller.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
index 463cb21..95a982c 100644
--- a/app/controllers/quotes_controller.rb
+++ b/app/controllers/quotes_controller.rb
@@ -31,10 +31,11 @@ def downvote
     if previous_votes.count > 0
       vote = previous_votes.first
       vote.update(value: -1)
+      @quote.update(score: Vote.where(quote: @quote).sum(:value))
     else
       vote = Vote.new(quote: @quote, ipaddress: request.remote_ip, value: -1)
+      @quote.update(score: -1)
     end
-    @quote.update(score: Vote.where(quote: @quote).sum(:value))
     respond_to do |format|
       if vote.save and @quote.save
         format.html { redirect_to @quote, notice: 'Quote was successfully downvoted.' }
@@ -52,10 +53,11 @@ def upvote
     if previous_votes.count > 0
       vote = previous_votes.first
       vote.update(value: +1)
+      @quote.update(score: Vote.where(quote: @quote).sum(:value))
     else
       vote = Vote.new(quote: @quote, ipaddress: request.remote_ip, value: +1)
+      @quote.update(score: +1)
     end
-    @quote.update(score: Vote.where(quote: @quote).sum(:value))
     respond_to do |format|
       if vote.save and @quote.save
         format.html { redirect_to @quote, notice: 'Quote was successfully upvoted.' }

From 56bb53104fa1bddb50df085ff7ee645ab59c1b5f Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Thu, 7 Jun 2018 20:11:25 -0400
Subject: [PATCH 146/148] cleanup db seeds

---
 db/seeds.rb | 66 ++++-------------------------------------------------
 1 file changed, 5 insertions(+), 61 deletions(-)

diff --git a/db/seeds.rb b/db/seeds.rb
index 31affbb..8c82620 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -13,65 +13,9 @@
   {email: 'admin@admin.admin', password: 'password'}
 ])
 
-Quote.create(approved:true, text:
-'<Cthon98> hey, if you type in your pw, it will show as stars
-<Cthon98> ********* see!
-<AzureDiamond> hunter2
-<AzureDiamond> doesnt look like stars to me
-<Cthon98> <AzureDiamond> *******
-<Cthon98> thats what I see
-<AzureDiamond> oh, really?
-<Cthon98> Absolutely
-<AzureDiamond> you can go hunter2 my hunter2-ing hunter2
-<AzureDiamond> haha, does that look funny to you?
-<Cthon98> lol, yes. See, when YOU type hunter2, it shows to us as *******
-<AzureDiamond> thats neat, I didnt know IRC did that
-<Cthon98> yep, no matter how many times you type hunter2, it will show to us as *******
-<AzureDiamond> awesome!
-<AzureDiamond> wait, how do you know my pw?
-<Cthon98> er, I just copy pasted YOUR ******\'s and it appears to YOU as hunter2 cause its your pw
-<AzureDiamond> oh, ok.')
+99.times do
+  Quote.create(approved: true, text: 'This quote has been approved. It is possibly awesome!')
+  Quote.create(approved: false, text: 'This quote has been submitted, but not yet reviewed for approval/deletion.')
+  Quote.create(approved: true, flagged: true, text: 'This quote has been approved, but it has been flagged for admin review.')
+end
 
-Quote.create(approved: false, text: '<erno> hm. I\'ve lost a machine.. literally _lost_. it responds to ping, it works completely, I just can\'t figure out where in my apartment it is.')
-
-Quote.create(approved: true, flagged: true, text: '<jeebus> the "bishop" came to our church today
-<jeebus> he was a fucken impostor
-<jeebus> never once moved diagonally')
-
-Quote.create(approved: true, text: '< nutbar> [root@linux!/usr/src/bind] grep "{" named.conf.newer | wc -l
-< nutbar>   19314
-< nutbar> [root@linux!/usr/src/bind] grep "}" named.conf.newer | wc -l
-< nutbar>   19313
-< nutbar> [root@linux!/usr/src/bind]
-< nutbar> great
-* nutbar fumes
-< nutbar> one fucking missing }')
-
-Quote.create(approved: true, text: '<GaRlic> how you like my new name?
-<drunkers> it stinks')
-Quote.create(approved: true, text: '<danie2> do you have a gf?
-<ieatrocks> hahahahahah
-<ieatrocks> wow, thanks for even asking.')
-Quote.create(approved: true, text: '<VolteFace`> don\'t you hate it when you shit on the floor, and you can hear it fall but you have no idea where it actually landed, and spend like 5 minutes looking for it
-<peng> ...
-<peng> what?
-<VolteFace`> oh shit
-<VolteFace`> don\'t you hate it when you DROP shit')
-Quote.create(approved: true, text: '<fppe> The worst thing about a prostate exam is when he finds out you\'re not a real doctor.')
-Quote.create(approved: true, text: '<ednos> technically, I\'m not pedantic')
-Quote.create(approved: true, text: '<tttb> Why did the programmer quit his job?
-<tttb> because he didn\'t get arrays')
-Quote.create(approved: true, text: '<@apexthief> Okay we have taco tuesday I need other food day of the week ideas
-<@AltRhombu> taco wednesday
-<@AltRhombu> taco thursday')
-Quote.create(approved: true, text: '<Papa_Wa> Anyone else struggling to login?
-<Udungoof> i\'m struggling most of the time
-<Udungoof> not necessarily with loginservers though
-<Udongoof> life mostly')
-Quote.create(approved: true, text: '')
-Quote.create(approved: true, text: '')
-Quote.create(approved: true, text: '')
-Quote.create(approved: true, text: '')
-Quote.create(approved: true, text: '')
-Quote.create(approved: true, text: '')
-Quote.create(approved: true, text: '')

From 048d54628f41f83e20bddfb3b164359143479c52 Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Thu, 7 Jun 2018 20:24:00 -0400
Subject: [PATCH 147/148] move app version to configuration file and set to 0.1

---
 app/views/layouts/application.html.erb | 2 +-
 config/application.rb                  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 1d45b73..1405bda 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -41,7 +41,7 @@
 			<div class="row">
 				<div class="col-md-1"></div>						
 				<div class="col-md-10" id="versionbar">
-					RQDB Version: pre-alpha
+					RQDB Version: <%= Rails.configuration.version %>
 				</div>
 				<div class="col-md-1"></div>
 			</div>
diff --git a/config/application.rb b/config/application.rb
index 9c0b08c..fed705c 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -15,5 +15,7 @@ class Application < Rails::Application
     # Application configuration can go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded after loading
     # the framework and any gems in your application.
+
+    config.version = "0.1"
   end
 end

From a0124bfb3408db78b8292e1912991c20fc9e96fb Mon Sep 17 00:00:00 2001
From: Ben Plunkert <bplunkert@bplunkert>
Date: Thu, 7 Jun 2018 20:30:05 -0400
Subject: [PATCH 148/148] add Heroku status/link to readme

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 33c0b8f..79d7cba 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # RQDB: Rash Quote Database
 [![Build Status](https://travis-ci.org/bplunkert/rqdb.svg?branch=development)](https://travis-ci.org/bplunkert/rqdb)
+[![Heroku Status](https://heroku-badge.herokuapp.com/?app=rqdb)](https://rqdb.herokuapp.com)
+
 
 Rash/Rails Quote Database is a simple web application for publishing, sharing, and ranking quotes. It's a ground-up rebuild of the [Rash Quote Management System (RQMS)](http://rqms.sourceforge.net), originally written in PHP by Tom Cuchta. RQDB is written in Ruby on Rails instead of PHP and does not share any common code with the original version.