From fad2934a487afc48f22971ac9ffc68711919996b Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Mon, 7 Oct 2019 15:29:06 -0700
Subject: [PATCH 01/55] setting up rails

---
 .gitignore                                    |  30 ++
 .ruby-version                                 |   1 +
 Gemfile                                       |  83 ++++++
 Gemfile.lock                                  | 277 ++++++++++++++++++
 Guardfile                                     |   9 +
 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/stylesheets/application.css        |  15 +
 app/channels/application_cable/channel.rb     |   4 +
 app/channels/application_cable/connection.rb  |   4 +
 app/controllers/application_controller.rb     |   2 +
 app/controllers/concerns/.keep                |   0
 app/helpers/application_helper.rb             |   2 +
 app/jobs/application_job.rb                   |   2 +
 app/mailers/application_mailer.rb             |   4 +
 app/models/application_record.rb              |   3 +
 app/models/concerns/.keep                     |   0
 app/views/layouts/application.html.erb        |  15 +
 app/views/layouts/mailer.html.erb             |  13 +
 app/views/layouts/mailer.text.erb             |   1 +
 bin/bundle                                    |   3 +
 bin/rails                                     |   9 +
 bin/rake                                      |   9 +
 bin/setup                                     |  36 +++
 bin/spring                                    |  17 ++
 bin/update                                    |  31 ++
 bin/yarn                                      |  11 +
 config.ru                                     |   5 +
 config/application.rb                         |  26 ++
 config/boot.rb                                |   4 +
 config/cable.yml                              |  10 +
 config/credentials.yml.enc                    |   1 +
 config/database.yml                           |  85 ++++++
 config/environment.rb                         |   5 +
 config/environments/development.rb            |  61 ++++
 config/environments/production.rb             |  94 ++++++
 config/environments/test.rb                   |  46 +++
 config/initializers/action_view.rb            |   1 +
 .../application_controller_renderer.rb        |   8 +
 config/initializers/assets.rb                 |  14 +
 config/initializers/backtrace_silencers.rb    |   7 +
 .../initializers/content_security_policy.rb   |  25 ++
 config/initializers/cookies_serializer.rb     |   5 +
 .../initializers/filter_parameter_logging.rb  |   4 +
 config/initializers/inflections.rb            |  16 +
 config/initializers/mime_types.rb             |   4 +
 config/initializers/wrap_parameters.rb        |  14 +
 config/locales/en.yml                         |  33 +++
 config/puma.rb                                |  34 +++
 config/routes.rb                              |   3 +
 config/spring.rb                              |   6 +
 config/storage.yml                            |  34 +++
 lib/assets/.keep                              |   0
 lib/tasks/.keep                               |   0
 log/.keep                                     |   0
 package.json                                  |   5 +
 public/404.html                               |  67 +++++
 public/422.html                               |  67 +++++
 public/500.html                               |  66 +++++
 public/apple-touch-icon-precomposed.png       |   0
 public/apple-touch-icon.png                   |   0
 public/favicon.ico                            |   0
 public/robots.txt                             |   1 +
 storage/.keep                                 |   0
 test/application_system_test_case.rb          |   5 +
 test/controllers/.keep                        |   0
 test/fixtures/.keep                           |   0
 test/fixtures/files/.keep                     |   0
 test/helpers/.keep                            |   0
 test/integration/.keep                        |   0
 test/mailers/.keep                            |   0
 test/models/.keep                             |   0
 test/system/.keep                             |   0
 test/test_helper.rb                           |  10 +
 tmp/.keep                                     |   0
 vendor/.keep                                  |   0
 80 files changed, 1385 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 .ruby-version
 create mode 100644 Gemfile
 create mode 100644 Gemfile.lock
 create mode 100644 Guardfile
 create mode 100644 Rakefile
 create mode 100644 app/assets/config/manifest.js
 create mode 100644 app/assets/images/.keep
 create mode 100644 app/assets/javascripts/application.js
 create mode 100644 app/assets/javascripts/cable.js
 create mode 100644 app/assets/javascripts/channels/.keep
 create mode 100644 app/assets/stylesheets/application.css
 create mode 100644 app/channels/application_cable/channel.rb
 create mode 100644 app/channels/application_cable/connection.rb
 create mode 100644 app/controllers/application_controller.rb
 create mode 100644 app/controllers/concerns/.keep
 create mode 100644 app/helpers/application_helper.rb
 create mode 100644 app/jobs/application_job.rb
 create mode 100644 app/mailers/application_mailer.rb
 create mode 100644 app/models/application_record.rb
 create mode 100644 app/models/concerns/.keep
 create mode 100644 app/views/layouts/application.html.erb
 create mode 100644 app/views/layouts/mailer.html.erb
 create mode 100644 app/views/layouts/mailer.text.erb
 create mode 100755 bin/bundle
 create mode 100755 bin/rails
 create mode 100755 bin/rake
 create mode 100755 bin/setup
 create mode 100755 bin/spring
 create mode 100755 bin/update
 create mode 100755 bin/yarn
 create mode 100644 config.ru
 create mode 100644 config/application.rb
 create mode 100644 config/boot.rb
 create mode 100644 config/cable.yml
 create mode 100644 config/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/action_view.rb
 create mode 100644 config/initializers/application_controller_renderer.rb
 create mode 100644 config/initializers/assets.rb
 create mode 100644 config/initializers/backtrace_silencers.rb
 create mode 100644 config/initializers/content_security_policy.rb
 create mode 100644 config/initializers/cookies_serializer.rb
 create mode 100644 config/initializers/filter_parameter_logging.rb
 create mode 100644 config/initializers/inflections.rb
 create mode 100644 config/initializers/mime_types.rb
 create mode 100644 config/initializers/wrap_parameters.rb
 create mode 100644 config/locales/en.yml
 create mode 100644 config/puma.rb
 create mode 100644 config/routes.rb
 create mode 100644 config/spring.rb
 create mode 100644 config/storage.yml
 create mode 100644 lib/assets/.keep
 create mode 100644 lib/tasks/.keep
 create mode 100644 log/.keep
 create mode 100644 package.json
 create mode 100644 public/404.html
 create mode 100644 public/422.html
 create mode 100644 public/500.html
 create mode 100644 public/apple-touch-icon-precomposed.png
 create mode 100644 public/apple-touch-icon.png
 create mode 100644 public/favicon.ico
 create mode 100644 public/robots.txt
 create mode 100644 storage/.keep
 create mode 100644 test/application_system_test_case.rb
 create mode 100644 test/controllers/.keep
 create mode 100644 test/fixtures/.keep
 create mode 100644 test/fixtures/files/.keep
 create mode 100644 test/helpers/.keep
 create mode 100644 test/integration/.keep
 create mode 100644 test/mailers/.keep
 create mode 100644 test/models/.keep
 create mode 100644 test/system/.keep
 create mode 100644 test/test_helper.rb
 create mode 100644 tmp/.keep
 create mode 100644 vendor/.keep

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..11a546eaa
--- /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 all logfiles and tempfiles.
+/log/*
+/tmp/*
+!/log/.keep
+!/tmp/.keep
+
+# Ignore uploaded files in development
+/storage/*
+!/storage/.keep
+
+/node_modules
+/yarn-error.log
+
+/public/assets
+.byebug_history
+/coverage
+.DS_Store
+
+
+# Ignore master key for decrypting credentials and more.
+/config/master.key
diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 000000000..160fe391c
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+2.5.5
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 000000000..87a48610f
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,83 @@
+source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+ruby '2.5.5'
+
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '~> 5.2.3'
+# Use postgresql as the database for Active Record
+gem 'pg', '>= 0.18', '< 2.0'
+# Use Puma as the app server
+gem 'puma', '~> 3.11'
+# Use SCSS for stylesheets
+gem 'sass-rails', '~> 5.0'
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier', '>= 1.3.0'
+# See https://github.com/rails/execjs#readme for more supported runtimes
+# gem 'mini_racer', platforms: :ruby
+
+# Use CoffeeScript for .coffee assets and views
+# gem 'coffee-rails', '~> 4.2'
+# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
+gem 'turbolinks', '~> 5'
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+gem 'jbuilder', '~> 2.5'
+# Use Redis adapter to run Action Cable in production
+# gem 'redis', '~> 4.0'
+# Use ActiveModel has_secure_password
+# gem 'bcrypt', '~> 3.1.7'
+
+# Use ActiveStorage variant
+# gem 'mini_magick', '~> 4.8'
+
+# Use Capistrano for deployment
+# gem 'capistrano-rails', group: :development
+
+# Reduces boot times through caching; required in config/boot.rb
+gem 'bootsnap', '>= 1.1.0', require: false
+
+group :development, :test do
+  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
+end
+
+group :development do
+  # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
+  gem 'web-console', '>= 3.3.0'
+  gem 'listen', '>= 3.0.5', '< 3.2'
+  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+  gem 'spring'
+  gem 'spring-watcher-listen', '~> 2.0.0'
+end
+
+group :test do
+  # Adds support for Capybara system testing and selenium driver
+  gem 'capybara', '>= 2.15'
+  gem 'selenium-webdriver'
+  # Easy installation and use of chromedriver to run system tests with Chrome
+  gem 'chromedriver-helper'
+end
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+gem 'jquery-turbolinks'
+gem 'jquery-rails'
+group :development, :test do
+  gem 'pry-rails'
+end
+
+group :development do
+  gem 'better_errors'
+  gem 'binding_of_caller'
+  gem 'guard'
+  gem 'guard-minitest'
+  gem 'debase', '>= 0.2.4.1'
+  gem 'ruby-debug-ide', '>= 0.7.0'
+end
+
+group :test do
+  gem 'minitest-rails'
+  gem 'minitest-reporters'
+  gem 'minitest-skip'
+end
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 000000000..1696f55d3
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,277 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.2.3)
+      actionpack (= 5.2.3)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.3)
+      actionview (= 5.2.3)
+      activesupport (= 5.2.3)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.3)
+      activesupport (= 5.2.3)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.3)
+      activesupport (= 5.2.3)
+      globalid (>= 0.3.6)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
+      arel (>= 9.0)
+    activestorage (5.2.3)
+      actionpack (= 5.2.3)
+      activerecord (= 5.2.3)
+      marcel (~> 0.3.1)
+    activesupport (5.2.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ansi (1.5.0)
+    archive-zip (0.12.0)
+      io-like (~> 0.3.0)
+    arel (9.0.0)
+    better_errors (2.5.1)
+      coderay (>= 1.0.0)
+      erubi (>= 1.0.0)
+      rack (>= 0.9.0)
+    bindex (0.8.1)
+    binding_of_caller (0.8.0)
+      debug_inspector (>= 0.0.1)
+    bootsnap (1.4.5)
+      msgpack (~> 1.0)
+    builder (3.2.3)
+    byebug (11.0.1)
+    capybara (3.29.0)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.5)
+      xpath (~> 3.2)
+    childprocess (3.0.0)
+    chromedriver-helper (2.1.1)
+      archive-zip (~> 0.10)
+      nokogiri (~> 1.8)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
+    debase (0.2.4.1)
+      debase-ruby_core_source (>= 0.10.2)
+    debase-ruby_core_source (0.10.6)
+    debug_inspector (0.0.3)
+    erubi (1.9.0)
+    execjs (2.7.0)
+    ffi (1.11.1)
+    formatador (0.2.5)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    guard (2.15.1)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-minitest (2.4.6)
+      guard-compat (~> 1.2)
+      minitest (>= 3.0)
+    i18n (1.7.0)
+      concurrent-ruby (~> 1.0)
+    io-like (0.3.0)
+    jbuilder (2.9.1)
+      activesupport (>= 4.2.0)
+    jquery-rails (4.3.5)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
+    jquery-turbolinks (2.1.0)
+      railties (>= 3.1.0)
+      turbolinks
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    loofah (2.3.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    lumberjack (1.0.13)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.2)
+    mimemagic (0.3.3)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.12.2)
+    minitest-rails (5.2.0)
+      minitest (~> 5.10)
+      railties (~> 5.2.0)
+    minitest-reporters (1.4.0)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    minitest-skip (0.0.1)
+      minitest (~> 5.0)
+    msgpack (1.3.1)
+    nenv (0.3.0)
+    nio4r (2.5.2)
+    nokogiri (1.10.4)
+      mini_portile2 (~> 2.4.0)
+    notiffany (0.1.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    pg (1.1.4)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-rails (0.3.9)
+      pry (>= 0.10.4)
+    public_suffix (4.0.1)
+    puma (3.12.1)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.3)
+      actioncable (= 5.2.3)
+      actionmailer (= 5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
+      activemodel (= 5.2.3)
+      activerecord (= 5.2.3)
+      activestorage (= 5.2.3)
+      activesupport (= 5.2.3)
+      bundler (>= 1.3.0)
+      railties (= 5.2.3)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (5.2.3)
+      actionpack (= 5.2.3)
+      activesupport (= 5.2.3)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.19.0, < 2.0)
+    rake (13.0.0)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    regexp_parser (1.6.0)
+    ruby-debug-ide (0.7.0)
+      rake (>= 0.8.1)
+    ruby-progressbar (1.10.1)
+    ruby_dep (1.5.0)
+    rubyzip (2.0.0)
+    sass (3.7.4)
+      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.1.0)
+      railties (>= 5.2.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
+    selenium-webdriver (3.142.6)
+      childprocess (>= 0.5, < 4.0)
+      rubyzip (>= 1.2.2)
+    shellany (0.0.1)
+    spring (2.1.0)
+    spring-watcher-listen (2.0.1)
+      listen (>= 2.7, < 4.0)
+      spring (>= 1.2, < 3.0)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tilt (2.0.10)
+    turbolinks (5.2.1)
+      turbolinks-source (~> 5.2)
+    turbolinks-source (5.2.0)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    uglifier (4.2.0)
+      execjs (>= 0.3.0, < 3)
+    web-console (3.7.0)
+      actionview (>= 5.0)
+      activemodel (>= 5.0)
+      bindex (>= 0.4.0)
+      railties (>= 5.0)
+    websocket-driver (0.7.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.4)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  better_errors
+  binding_of_caller
+  bootsnap (>= 1.1.0)
+  byebug
+  capybara (>= 2.15)
+  chromedriver-helper
+  debase (>= 0.2.4.1)
+  guard
+  guard-minitest
+  jbuilder (~> 2.5)
+  jquery-rails
+  jquery-turbolinks
+  listen (>= 3.0.5, < 3.2)
+  minitest-rails
+  minitest-reporters
+  minitest-skip
+  pg (>= 0.18, < 2.0)
+  pry-rails
+  puma (~> 3.11)
+  rails (~> 5.2.3)
+  ruby-debug-ide (>= 0.7.0)
+  sass-rails (~> 5.0)
+  selenium-webdriver
+  spring
+  spring-watcher-listen (~> 2.0.0)
+  turbolinks (~> 5)
+  tzinfo-data
+  uglifier (>= 1.3.0)
+  web-console (>= 3.3.0)
+
+RUBY VERSION
+   ruby 2.5.5p157
+
+BUNDLED WITH
+   2.0.2
diff --git a/Guardfile b/Guardfile
new file mode 100644
index 000000000..e34f706f4
--- /dev/null
+++ b/Guardfile
@@ -0,0 +1,9 @@
+guard :minitest, autorun: false, spring: true do
+  watch(%r{^app/(.+).rb$})                               { |m| "test/#{m[1]}_test.rb" }
+  watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' }
+  watch(%r{^app/controllers/(.+)_controller.rb$})        { |m| "test/integration/#{m[1]}_test.rb" }
+  watch(%r{^app/views/(.+)_mailer/.+})                    { |m| "test/mailers/#{m[1]}_mailer_test.rb" }
+  watch(%r{^lib/(.+).rb$})                               { |m| "test/lib/#{m[1]}_test.rb" }
+  watch(%r{^test/.+_test.rb$})
+  watch(%r{^test/test_helper.rb$}) { 'test' }
+end
diff --git a/Rakefile b/Rakefile
new file mode 100644
index 000000000..e85f91391
--- /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 000000000..b16e53d6d
--- /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 000000000..e69de29bb
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
new file mode 100644
index 000000000..82e6f0f6c
--- /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 000000000..739aa5f02
--- /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 000000000..e69de29bb
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
new file mode 100644
index 000000000..d05ea0f51
--- /dev/null
+++ b/app/assets/stylesheets/application.css
@@ -0,0 +1,15 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's
+ * vendor/assets/stylesheets directory can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
+ * files in this directory. Styles in this file should be added after the last require_* statement.
+ * It is generally better to create a new file per style scope.
+ *
+ *= require_tree .
+ *= require_self
+ */
diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb
new file mode 100644
index 000000000..d67269728
--- /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 000000000..0ff5442f4
--- /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 000000000..09705d12a
--- /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 000000000..e69de29bb
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
new file mode 100644
index 000000000..de6be7945
--- /dev/null
+++ b/app/helpers/application_helper.rb
@@ -0,0 +1,2 @@
+module ApplicationHelper
+end
diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb
new file mode 100644
index 000000000..a009ace51
--- /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 000000000..286b2239d
--- /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 000000000..10a4cba84
--- /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 000000000..e69de29bb
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
new file mode 100644
index 000000000..692ca547e
--- /dev/null
+++ b/app/views/layouts/application.html.erb
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>RideShareRails</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>
+    <%= yield %>
+  </body>
+</html>
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
new file mode 100644
index 000000000..cbd34d2e9
--- /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 000000000..37f0bddbd
--- /dev/null
+++ b/app/views/layouts/mailer.text.erb
@@ -0,0 +1 @@
+<%= yield %>
diff --git a/bin/bundle b/bin/bundle
new file mode 100755
index 000000000..f19acf5b5
--- /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 000000000..5badb2fde
--- /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 000000000..d87d5f578
--- /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 000000000..94fd4d797
--- /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 000000000..d89ee495f
--- /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 000000000..58bfaed51
--- /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 000000000..460dd565b
--- /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 000000000..f7ba0b527
--- /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 000000000..39685a85a
--- /dev/null
+++ b/config/application.rb
@@ -0,0 +1,26 @@
+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 RideShareRails
+  class Application < Rails::Application
+    config.generators do |g|
+      # Force new test files to be generated in the minitest-spec style
+      g.test_framework :minitest, spec: true
+
+      # Always use .js files, never .coffee
+      g.javascript_engine :js
+    end
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 5.2
+
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration can go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded after loading
+    # the framework and any gems in your application.
+  end
+end
diff --git a/config/boot.rb b/config/boot.rb
new file mode 100644
index 000000000..b9e460cef
--- /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 000000000..0b6186ad8
--- /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: ride-share-rails_production
diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc
new file mode 100644
index 000000000..dcd7f517e
--- /dev/null
+++ b/config/credentials.yml.enc
@@ -0,0 +1 @@
+xs693zusoh5EGfAb4wXB6XFqEpyZs6qf2dm59OgtA5AFXvWmtFhNzXo9pNSt7jST4Q6LPT7g4i138tnRKPXMBjYBq53IdXjxVOVULq5N3BPLKXrp7TNPPT9/Zed3R0WWOcEb+q1+llvqDtRPY5q3QsxeSOTJaePBI+0b1yjKEtgct4PkUOWF6BHlLb3HkEP4x2YsmPSFXevZNDET2JWe3bDM1ayr6R35AWhz/0xzOz1bBVezD6ZNnYws1un5tp8bDyvAZGQ6iOEtno5GCITNwJD10Ux4oYZaXXyGuQvugQ0DZB0lDMpDBs8ZA7x9Y6VGtiJuojb6tTe4wgdcSghWcgpLBP3ZB9DTLxjbp5OZ8UWKIu3yrjzmQ0WNGqPBGyC2Uv0U7t+rLqD+i7pQLsmLgnvtWO0kH74RdmOS--0NBYkbSbG27bw6wB--FB66H0Co21vmn+zfv62o9g==
\ No newline at end of file
diff --git a/config/database.yml b/config/database.yml
new file mode 100644
index 000000000..684902e69
--- /dev/null
+++ b/config/database.yml
@@ -0,0 +1,85 @@
+# PostgreSQL. Versions 9.1 and up are supported.
+#
+# Install the pg driver:
+#   gem install pg
+# On OS X with Homebrew:
+#   gem install pg -- --with-pg-config=/usr/local/bin/pg_config
+# On OS X with MacPorts:
+#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
+# On Windows:
+#   gem install pg
+#       Choose the win32 build.
+#       Install PostgreSQL and put its /bin directory on your path.
+#
+# Configure Using Gemfile
+# gem 'pg'
+#
+default: &default
+  adapter: postgresql
+  encoding: unicode
+  # For details on connection pooling, see Rails configuration guide
+  # http://guides.rubyonrails.org/configuring.html#database-pooling
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+
+development:
+  <<: *default
+  database: ride-share-rails_development
+
+  # The specified database role being used to connect to postgres.
+  # To create additional roles in postgres see `$ createuser --help`.
+  # When left blank, postgres will use the default role. This is
+  # the same name as the operating system user that initialized the database.
+  #username: ride-share-rails
+
+  # The password associated with the postgres role (username).
+  #password:
+
+  # Connect on a TCP socket. Omitted by default since the client uses a
+  # domain socket that doesn't need configuration. Windows does not have
+  # domain sockets, so uncomment these lines.
+  #host: localhost
+
+  # The TCP port the server listens on. Defaults to 5432.
+  # If your server runs on a different port number, change accordingly.
+  #port: 5432
+
+  # Schema search path. The server defaults to $user,public
+  #schema_search_path: myapp,sharedapp,public
+
+  # Minimum log levels, in increasing order:
+  #   debug5, debug4, debug3, debug2, debug1,
+  #   log, notice, warning, error, fatal, and panic
+  # Defaults to warning.
+  #min_messages: notice
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  <<: *default
+  database: ride-share-rails_test
+
+# As with config/secrets.yml, you never want to store sensitive information,
+# like your database password, in your source code. If your source code is
+# ever seen by anyone, they now have access to your database.
+#
+# Instead, provide the password as a unix environment variable when you boot
+# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database
+# for a full rundown on how to provide these environment variables in a
+# production deployment.
+#
+# On Heroku and other platform providers, you may have a full connection URL
+# available as an environment variable. For example:
+#
+#   DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase"
+#
+# You can use this database configuration with:
+#
+#   production:
+#     url: <%= ENV['DATABASE_URL'] %>
+#
+production:
+  <<: *default
+  database: ride-share-rails_production
+  username: ride-share-rails
+  password: <%= ENV['RIDE-SHARE-RAILS_DATABASE_PASSWORD'] %>
diff --git a/config/environment.rb b/config/environment.rb
new file mode 100644
index 000000000..426333bb4
--- /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 000000000..1311e3e4e
--- /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 000000000..cee449f7b
--- /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 = "ride-share-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 000000000..0a38fd3ce
--- /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/action_view.rb b/config/initializers/action_view.rb
new file mode 100644
index 000000000..142d382f8
--- /dev/null
+++ b/config/initializers/action_view.rb
@@ -0,0 +1 @@
+Rails.application.config.action_view.form_with_generates_remote_forms = false
diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb
new file mode 100644
index 000000000..89d2efab2
--- /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 000000000..4b828e80c
--- /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 000000000..59385cdf3
--- /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 000000000..d3bcaa5ec
--- /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 000000000..5a6a32d37
--- /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 000000000..4a994e1e7
--- /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 000000000..ac033bf9d
--- /dev/null
+++ b/config/initializers/inflections.rb
@@ -0,0 +1,16 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format. Inflections
+# are locale specific, and you may define rules for as many different
+# locales as you wish. All of these examples are active by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end
+
+# These inflection rules are supported but not enabled by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+#   inflect.acronym 'RESTful'
+# end
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
new file mode 100644
index 000000000..dc1899682
--- /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 000000000..bbfc3961b
--- /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 000000000..decc5a857
--- /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 000000000..a5eccf816
--- /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 000000000..787824f88
--- /dev/null
+++ b/config/routes.rb
@@ -0,0 +1,3 @@
+Rails.application.routes.draw do
+  # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
+end
diff --git a/config/spring.rb b/config/spring.rb
new file mode 100644
index 000000000..9fa7863f9
--- /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 000000000..d32f76e8f
--- /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/lib/assets/.keep b/lib/assets/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/tasks/.keep b/lib/tasks/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/log/.keep b/log/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/package.json b/package.json
new file mode 100644
index 000000000..75b35d319
--- /dev/null
+++ b/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "ride-share-rails",
+  "private": true,
+  "dependencies": {}
+}
diff --git a/public/404.html b/public/404.html
new file mode 100644
index 000000000..2be3af26f
--- /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 000000000..c08eac0d1
--- /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 000000000..78a030af2
--- /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 000000000..e69de29bb
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
new file mode 100644
index 000000000..e69de29bb
diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 000000000..e69de29bb
diff --git a/public/robots.txt b/public/robots.txt
new file mode 100644
index 000000000..37b576a4a
--- /dev/null
+++ b/public/robots.txt
@@ -0,0 +1 @@
+# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
diff --git a/storage/.keep b/storage/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
new file mode 100644
index 000000000..d19212abd
--- /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 000000000..e69de29bb
diff --git a/test/fixtures/.keep b/test/fixtures/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/helpers/.keep b/test/helpers/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/integration/.keep b/test/integration/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/mailers/.keep b/test/mailers/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/models/.keep b/test/models/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/system/.keep b/test/system/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/test_helper.rb b/test/test_helper.rb
new file mode 100644
index 000000000..3ab84e3d1
--- /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 000000000..e69de29bb
diff --git a/vendor/.keep b/vendor/.keep
new file mode 100644
index 000000000..e69de29bb

From 6579471a668f89f05e5693928499d8fe7581ed12 Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Tue, 8 Oct 2019 11:18:07 -0700
Subject: [PATCH 02/55] Created Models

---
 app/models/driver.rb                           |  2 ++
 app/models/passenger.rb                        |  2 ++
 app/models/trip.rb                             |  2 ++
 db/migrate/20191008181158_create_passengers.rb | 10 ++++++++++
 db/migrate/20191008181414_create_drivers.rb    | 13 +++++++++++++
 db/migrate/20191008181751_create_trips.rb      | 13 +++++++++++++
 6 files changed, 42 insertions(+)
 create mode 100644 app/models/driver.rb
 create mode 100644 app/models/passenger.rb
 create mode 100644 app/models/trip.rb
 create mode 100644 db/migrate/20191008181158_create_passengers.rb
 create mode 100644 db/migrate/20191008181414_create_drivers.rb
 create mode 100644 db/migrate/20191008181751_create_trips.rb

diff --git a/app/models/driver.rb b/app/models/driver.rb
new file mode 100644
index 000000000..1ff364562
--- /dev/null
+++ b/app/models/driver.rb
@@ -0,0 +1,2 @@
+class Driver < ApplicationRecord
+end
diff --git a/app/models/passenger.rb b/app/models/passenger.rb
new file mode 100644
index 000000000..2c5748ac2
--- /dev/null
+++ b/app/models/passenger.rb
@@ -0,0 +1,2 @@
+class Passenger < ApplicationRecord
+end
diff --git a/app/models/trip.rb b/app/models/trip.rb
new file mode 100644
index 000000000..a8c077a10
--- /dev/null
+++ b/app/models/trip.rb
@@ -0,0 +1,2 @@
+class Trip < ApplicationRecord
+end
diff --git a/db/migrate/20191008181158_create_passengers.rb b/db/migrate/20191008181158_create_passengers.rb
new file mode 100644
index 000000000..aeced4891
--- /dev/null
+++ b/db/migrate/20191008181158_create_passengers.rb
@@ -0,0 +1,10 @@
+class CreatePassengers < ActiveRecord::Migration[5.2]
+  def change
+    create_table :passengers do |t|
+      t.string :name
+      t.string :phone_num
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20191008181414_create_drivers.rb b/db/migrate/20191008181414_create_drivers.rb
new file mode 100644
index 000000000..310efb626
--- /dev/null
+++ b/db/migrate/20191008181414_create_drivers.rb
@@ -0,0 +1,13 @@
+class CreateDrivers < ActiveRecord::Migration[5.2]
+  def change
+    create_table :drivers do |t|
+      t.string :name
+      t.string :vin
+      t.string :make
+      t.string :model
+      t.boolean :active
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20191008181751_create_trips.rb b/db/migrate/20191008181751_create_trips.rb
new file mode 100644
index 000000000..f62d12396
--- /dev/null
+++ b/db/migrate/20191008181751_create_trips.rb
@@ -0,0 +1,13 @@
+class CreateTrips < ActiveRecord::Migration[5.2]
+  def change
+    create_table :trips do |t|
+      t.date, :date
+      t.float, :cost
+      t.integer, :rating
+      t.integer, :passenger_id
+      t.integer :driver_id
+
+      t.timestamps
+    end
+  end
+end

From 49a9588af5148945609bb0aafeb60cd3a7f5a148 Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Tue, 8 Oct 2019 11:20:25 -0700
Subject: [PATCH 03/55] Added Relationships

---
 app/models/driver.rb    | 1 +
 app/models/passenger.rb | 1 +
 app/models/trip.rb      | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/app/models/driver.rb b/app/models/driver.rb
index 1ff364562..4f1af2985 100644
--- a/app/models/driver.rb
+++ b/app/models/driver.rb
@@ -1,2 +1,3 @@
 class Driver < ApplicationRecord
+  has_many: trips
 end
diff --git a/app/models/passenger.rb b/app/models/passenger.rb
index 2c5748ac2..db6a4d86e 100644
--- a/app/models/passenger.rb
+++ b/app/models/passenger.rb
@@ -1,2 +1,3 @@
 class Passenger < ApplicationRecord
+  has_many: trips
 end
diff --git a/app/models/trip.rb b/app/models/trip.rb
index a8c077a10..0d306499d 100644
--- a/app/models/trip.rb
+++ b/app/models/trip.rb
@@ -1,2 +1,4 @@
 class Trip < ApplicationRecord
+  belongs_to: driver
+  belongs_to: passenger
 end

From 17e52496b53f69658b19bfcabfa133730510f003 Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Tue, 8 Oct 2019 11:24:46 -0700
Subject: [PATCH 04/55] Database Seeded

---
 app/models/driver.rb                      |  2 +-
 app/models/passenger.rb                   |  2 +-
 app/models/trip.rb                        |  4 +-
 db/migrate/20191008181751_create_trips.rb | 10 ++---
 db/schema.rb                              | 45 +++++++++++++++++++++++
 5 files changed, 54 insertions(+), 9 deletions(-)
 create mode 100644 db/schema.rb

diff --git a/app/models/driver.rb b/app/models/driver.rb
index 4f1af2985..197e65507 100644
--- a/app/models/driver.rb
+++ b/app/models/driver.rb
@@ -1,3 +1,3 @@
 class Driver < ApplicationRecord
-  has_many: trips
+  has_many :trips
 end
diff --git a/app/models/passenger.rb b/app/models/passenger.rb
index db6a4d86e..2fef89192 100644
--- a/app/models/passenger.rb
+++ b/app/models/passenger.rb
@@ -1,3 +1,3 @@
 class Passenger < ApplicationRecord
-  has_many: trips
+  has_many :trips
 end
diff --git a/app/models/trip.rb b/app/models/trip.rb
index 0d306499d..8e2566cd8 100644
--- a/app/models/trip.rb
+++ b/app/models/trip.rb
@@ -1,4 +1,4 @@
 class Trip < ApplicationRecord
-  belongs_to: driver
-  belongs_to: passenger
+  belongs_to :driver
+  belongs_to :passenger
 end
diff --git a/db/migrate/20191008181751_create_trips.rb b/db/migrate/20191008181751_create_trips.rb
index f62d12396..4850ee892 100644
--- a/db/migrate/20191008181751_create_trips.rb
+++ b/db/migrate/20191008181751_create_trips.rb
@@ -1,12 +1,12 @@
 class CreateTrips < ActiveRecord::Migration[5.2]
   def change
     create_table :trips do |t|
-      t.date, :date
-      t.float, :cost
-      t.integer, :rating
-      t.integer, :passenger_id
+      t.date :date
+      t.float :cost
+      t.integer :rating
+      t.integer :passenger_id
       t.integer :driver_id
-
+      
       t.timestamps
     end
   end
diff --git a/db/schema.rb b/db/schema.rb
new file mode 100644
index 000000000..f219c639c
--- /dev/null
+++ b/db/schema.rb
@@ -0,0 +1,45 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 2019_10_08_181751) do
+
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
+
+  create_table "drivers", force: :cascade do |t|
+    t.string "name"
+    t.string "vin"
+    t.string "make"
+    t.string "model"
+    t.boolean "active"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "passengers", force: :cascade do |t|
+    t.string "name"
+    t.string "phone_num"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "trips", force: :cascade do |t|
+    t.date "date"
+    t.float "cost"
+    t.integer "rating"
+    t.integer "passenger_id"
+    t.integer "driver_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+end

From 6bf5e437540951412c5281df39b03b71f8e1229e Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Tue, 8 Oct 2019 12:23:07 -0700
Subject: [PATCH 05/55] Added Models, Seeded Database, and Verified Seeding

---
 app/models/driver.rb    | 4 ++++
 app/models/passenger.rb | 4 ++++
 app/models/trip.rb      | 3 +++
 3 files changed, 11 insertions(+)

diff --git a/app/models/driver.rb b/app/models/driver.rb
index 197e65507..02a3e8c28 100644
--- a/app/models/driver.rb
+++ b/app/models/driver.rb
@@ -1,3 +1,7 @@
 class Driver < ApplicationRecord
   has_many :trips
+  
+  ##Validation Code
+  #validates :name, presence: true;
+  #validates :vin presence: true, uniqueness: true
 end
diff --git a/app/models/passenger.rb b/app/models/passenger.rb
index 2fef89192..579a0174b 100644
--- a/app/models/passenger.rb
+++ b/app/models/passenger.rb
@@ -1,3 +1,7 @@
 class Passenger < ApplicationRecord
   has_many :trips
+  
+  # #Validation Code
+  # validates :name, presence: true;
+  # validates :phone_num, presence: true, uniqueness: true
 end
diff --git a/app/models/trip.rb b/app/models/trip.rb
index 8e2566cd8..aedb3cc01 100644
--- a/app/models/trip.rb
+++ b/app/models/trip.rb
@@ -1,4 +1,7 @@
 class Trip < ApplicationRecord
   belongs_to :driver
   belongs_to :passenger
+  
+  #Validation Code
+  
 end

From f02f495061417da116800ab1047077bb92fe9274 Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Tue, 8 Oct 2019 12:28:17 -0700
Subject: [PATCH 06/55] Passengers, Drivers, Trips Controllers Created

---
 app/assets/javascripts/drivers.js        |  2 ++
 app/assets/javascripts/passengers.js     |  2 ++
 app/assets/javascripts/trips.js          |  2 ++
 app/assets/stylesheets/drivers.scss      |  3 +++
 app/assets/stylesheets/passengers.scss   |  3 +++
 app/assets/stylesheets/trips.scss        |  3 +++
 app/controllers/drivers_controller.rb    | 21 +++++++++++++++++++++
 app/controllers/passengers_controller.rb | 21 +++++++++++++++++++++
 app/controllers/trips_controller.rb      | 21 +++++++++++++++++++++
 app/helpers/drivers_helper.rb            |  2 ++
 app/helpers/passengers_helper.rb         |  2 ++
 app/helpers/trips_helper.rb              |  2 ++
 12 files changed, 84 insertions(+)
 create mode 100644 app/assets/javascripts/drivers.js
 create mode 100644 app/assets/javascripts/passengers.js
 create mode 100644 app/assets/javascripts/trips.js
 create mode 100644 app/assets/stylesheets/drivers.scss
 create mode 100644 app/assets/stylesheets/passengers.scss
 create mode 100644 app/assets/stylesheets/trips.scss
 create mode 100644 app/controllers/drivers_controller.rb
 create mode 100644 app/controllers/passengers_controller.rb
 create mode 100644 app/controllers/trips_controller.rb
 create mode 100644 app/helpers/drivers_helper.rb
 create mode 100644 app/helpers/passengers_helper.rb
 create mode 100644 app/helpers/trips_helper.rb

diff --git a/app/assets/javascripts/drivers.js b/app/assets/javascripts/drivers.js
new file mode 100644
index 000000000..dee720fac
--- /dev/null
+++ b/app/assets/javascripts/drivers.js
@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.
diff --git a/app/assets/javascripts/passengers.js b/app/assets/javascripts/passengers.js
new file mode 100644
index 000000000..dee720fac
--- /dev/null
+++ b/app/assets/javascripts/passengers.js
@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.
diff --git a/app/assets/javascripts/trips.js b/app/assets/javascripts/trips.js
new file mode 100644
index 000000000..dee720fac
--- /dev/null
+++ b/app/assets/javascripts/trips.js
@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.
diff --git a/app/assets/stylesheets/drivers.scss b/app/assets/stylesheets/drivers.scss
new file mode 100644
index 000000000..8c1768a14
--- /dev/null
+++ b/app/assets/stylesheets/drivers.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the Drivers 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/passengers.scss b/app/assets/stylesheets/passengers.scss
new file mode 100644
index 000000000..0e27942f7
--- /dev/null
+++ b/app/assets/stylesheets/passengers.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the Passengers 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/trips.scss b/app/assets/stylesheets/trips.scss
new file mode 100644
index 000000000..f1f72ad11
--- /dev/null
+++ b/app/assets/stylesheets/trips.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the Trips 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/drivers_controller.rb b/app/controllers/drivers_controller.rb
new file mode 100644
index 000000000..ca77a6b82
--- /dev/null
+++ b/app/controllers/drivers_controller.rb
@@ -0,0 +1,21 @@
+class DriversController < ApplicationController
+  def index
+  end
+  
+  def show
+  end
+  
+  def edit
+  end
+  
+  def update
+    #Handle Validation Errors
+  end
+  
+  def new
+  end
+  
+  def create
+    #Handle Validation Errors
+  end
+end
diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb
new file mode 100644
index 000000000..ea0040083
--- /dev/null
+++ b/app/controllers/passengers_controller.rb
@@ -0,0 +1,21 @@
+class PassengersController < ApplicationController
+  def index
+  end
+  
+  def show
+  end
+  
+  def edit
+  end
+  
+  def update
+    #Handle Validation Errors
+  end
+  
+  def new
+  end
+  
+  def create
+    #Handle Validation Errors
+  end
+end
diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb
new file mode 100644
index 000000000..4954fcc77
--- /dev/null
+++ b/app/controllers/trips_controller.rb
@@ -0,0 +1,21 @@
+class TripsController < ApplicationController
+  def index
+  end
+  
+  def show
+  end
+  
+  def edit
+  end
+  
+  def update
+    #Handle Validation Errors
+  end
+  
+  def new
+  end
+  
+  def create
+    #Handle Validation Errors
+  end
+end
diff --git a/app/helpers/drivers_helper.rb b/app/helpers/drivers_helper.rb
new file mode 100644
index 000000000..e5fc532e4
--- /dev/null
+++ b/app/helpers/drivers_helper.rb
@@ -0,0 +1,2 @@
+module DriversHelper
+end
diff --git a/app/helpers/passengers_helper.rb b/app/helpers/passengers_helper.rb
new file mode 100644
index 000000000..1af9e68f1
--- /dev/null
+++ b/app/helpers/passengers_helper.rb
@@ -0,0 +1,2 @@
+module PassengersHelper
+end
diff --git a/app/helpers/trips_helper.rb b/app/helpers/trips_helper.rb
new file mode 100644
index 000000000..04f333d46
--- /dev/null
+++ b/app/helpers/trips_helper.rb
@@ -0,0 +1,2 @@
+module TripsHelper
+end

From 2875c0a5af1b7aec963293aa25f2653762a3a2ab Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Tue, 8 Oct 2019 12:33:11 -0700
Subject: [PATCH 07/55] Added Content to Index Method

---
 app/controllers/drivers_controller.rb    | 1 +
 app/controllers/passengers_controller.rb | 9 +++++++++
 app/controllers/trips_controller.rb      | 1 +
 3 files changed, 11 insertions(+)

diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb
index ca77a6b82..6d6c30134 100644
--- a/app/controllers/drivers_controller.rb
+++ b/app/controllers/drivers_controller.rb
@@ -1,5 +1,6 @@
 class DriversController < ApplicationController
   def index
+    @drivers = Driver.all
   end
   
   def show
diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb
index ea0040083..df320d70d 100644
--- a/app/controllers/passengers_controller.rb
+++ b/app/controllers/passengers_controller.rb
@@ -1,8 +1,17 @@
 class PassengersController < ApplicationController
   def index
+    @passengers = Passenger.all
   end
   
   def show
+    # passenger_id = params[:id]
+    # @passenger = Passenger.find_by(id: passenger_id)
+    # if @passenger.nil?
+    #   head :not_found
+    #   return
+    # end
+    
+    #Should this be @passengers? Link: https://github.com/Ada-Developers-Academy/textbook-curriculum/blob/master/08-rails/using-active-record-in-code.md
   end
   
   def edit
diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb
index 4954fcc77..2b3315480 100644
--- a/app/controllers/trips_controller.rb
+++ b/app/controllers/trips_controller.rb
@@ -1,5 +1,6 @@
 class TripsController < ApplicationController
   def index
+    @trips = Trip.all
   end
   
   def show

From 2c414ecec673670199ef92e550536e0f36aa5720 Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Tue, 8 Oct 2019 12:45:58 -0700
Subject: [PATCH 08/55] Added Show Method to Passengers, Drivers, and Trips

---
 app/controllers/drivers_controller.rb    |  6 ++++++
 app/controllers/passengers_controller.rb | 14 ++++++--------
 app/controllers/trips_controller.rb      |  6 ++++++
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb
index 6d6c30134..31c4b6803 100644
--- a/app/controllers/drivers_controller.rb
+++ b/app/controllers/drivers_controller.rb
@@ -4,6 +4,12 @@ def index
   end
   
   def show
+    driver_id = params[:id]
+    @driver = Driver.find_by(id: driver_id)
+    if @driver.nil?
+      head :not_found
+      return
+    end
   end
   
   def edit
diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb
index df320d70d..b0c30d4bd 100644
--- a/app/controllers/passengers_controller.rb
+++ b/app/controllers/passengers_controller.rb
@@ -4,14 +4,12 @@ def index
   end
   
   def show
-    # passenger_id = params[:id]
-    # @passenger = Passenger.find_by(id: passenger_id)
-    # if @passenger.nil?
-    #   head :not_found
-    #   return
-    # end
-    
-    #Should this be @passengers? Link: https://github.com/Ada-Developers-Academy/textbook-curriculum/blob/master/08-rails/using-active-record-in-code.md
+    passenger_id = params[:id]
+    @passenger = Passenger.find_by(id: passenger_id)
+    if @passenger.nil?
+      head :not_found
+      return
+    end
   end
   
   def edit
diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb
index 2b3315480..eeeb0fb1f 100644
--- a/app/controllers/trips_controller.rb
+++ b/app/controllers/trips_controller.rb
@@ -4,6 +4,12 @@ def index
   end
   
   def show
+    trip_id = params[:id]
+    @trip = Trip.find_by(id: trip_id)
+    if @trip.nil?
+      head :not_found
+      return
+    end
   end
   
   def edit

From 3f84fcdeec775c4e742458ae4f97d63a0084deb1 Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Tue, 8 Oct 2019 14:14:32 -0700
Subject: [PATCH 09/55] Added Routes

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

diff --git a/config/routes.rb b/config/routes.rb
index 787824f88..084ed854f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,3 +1,21 @@
 Rails.application.routes.draw do
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
+  
+  resources :passengers
+  resources :drivers
+  resources :trips
+  
+  
+  # NOTES FOR REFERENCE: 
+  # RESTful Routes Include:
+  # Rails.application.routes.draw do
+  # get "/books" , to: "books#index", as: :book
+  # post "/books" , to: "books#create"
+  # get "/books/new" , to: "books#new", as: :new_book
+  # get "/books/:id" , to: "books#show", as: :book
+  # patch "/books/:id" , to: "books#update"
+  # put "/books/:id" , to: "books#update"
+  # delete "/books/:id" , to: "books#destroy"
+  # get "/books/:id/edit" , to: "books#edit", as: :edit_book
+  # end
 end

From cdcaa17a0057f59e71d22dd33e9a70aac730cd6e Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Tue, 8 Oct 2019 14:18:17 -0700
Subject: [PATCH 10/55] Added View html.erb files

---
 app/views/drivers/edit.html.erb     | 0
 app/views/drivers/index.html.erb    | 0
 app/views/drivers/new.html.erb      | 0
 app/views/drivers/show.html.erb     | 0
 app/views/passengers/edit.html.erb  | 0
 app/views/passengers/index.html.erb | 0
 app/views/passengers/new.html.erb   | 0
 app/views/passengers/show.html.erb  | 0
 app/views/trips/edit.html.erb       | 0
 app/views/trips/index.html.erb      | 0
 app/views/trips/new.html.erb        | 0
 app/views/trips/show.html.erb       | 0
 12 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 app/views/drivers/edit.html.erb
 create mode 100644 app/views/drivers/index.html.erb
 create mode 100644 app/views/drivers/new.html.erb
 create mode 100644 app/views/drivers/show.html.erb
 create mode 100644 app/views/passengers/edit.html.erb
 create mode 100644 app/views/passengers/index.html.erb
 create mode 100644 app/views/passengers/new.html.erb
 create mode 100644 app/views/passengers/show.html.erb
 create mode 100644 app/views/trips/edit.html.erb
 create mode 100644 app/views/trips/index.html.erb
 create mode 100644 app/views/trips/new.html.erb
 create mode 100644 app/views/trips/show.html.erb

diff --git a/app/views/drivers/edit.html.erb b/app/views/drivers/edit.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/drivers/new.html.erb b/app/views/drivers/new.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/passengers/edit.html.erb b/app/views/passengers/edit.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/passengers/index.html.erb b/app/views/passengers/index.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/passengers/new.html.erb b/app/views/passengers/new.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/trips/edit.html.erb b/app/views/trips/edit.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/trips/new.html.erb b/app/views/trips/new.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb
new file mode 100644
index 000000000..e69de29bb

From fc95128f0da48598c5610428e41f17defffcf6f0 Mon Sep 17 00:00:00 2001
From: ohcloud <cloudylopez@icloud.com>
Date: Tue, 8 Oct 2019 14:23:29 -0700
Subject: [PATCH 11/55] first commit for new drives class

---
 test/models/trip_test.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/models/trip_test.rb b/test/models/trip_test.rb
index 0b0b2da32..57127f1ae 100644
--- a/test/models/trip_test.rb
+++ b/test/models/trip_test.rb
@@ -4,19 +4,19 @@
   it "can be instantiated" do
     # Your code here
   end
-
+  
   it "will have the required fields" do
     # Your code here
   end
-
+  
   describe "relationships" do
     # Your tests go here
   end
-
+  
   describe "validations" do
     # Your tests go here
   end
-
+  
   # Tests for methods you create should go here
   describe "custom methods" do
     # Your tests here

From 98f017dda7791a67ad4f15e25e700e34506a9692 Mon Sep 17 00:00:00 2001
From: ohcloud <cloudylopez@icloud.com>
Date: Tue, 8 Oct 2019 14:36:19 -0700
Subject: [PATCH 12/55] added drivers index show for all drivers

---
 app/views/drivers/index.html.erb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb
index e69de29bb..8a2c8bc95 100644
--- a/app/views/drivers/index.html.erb
+++ b/app/views/drivers/index.html.erb
@@ -0,0 +1,9 @@
+<h1>Drivers</h1>
+<ul>
+  <% @drivers.each do |driver|  %>
+    <li>
+      <%= link_to driver.name, driver_path(driver) %>
+      
+    </li>
+  <% end %>
+</ul>
\ No newline at end of file

From a8c4d54cf1d540d0caac85933b4f9f334db12064 Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Tue, 8 Oct 2019 14:36:51 -0700
Subject: [PATCH 13/55] Added Index Page

---
 app/views/passengers/index.html.erb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/views/passengers/index.html.erb b/app/views/passengers/index.html.erb
index e69de29bb..7e5246bf3 100644
--- a/app/views/passengers/index.html.erb
+++ b/app/views/passengers/index.html.erb
@@ -0,0 +1,8 @@
+<h1>Passengers</h1>
+<ul>
+  <% @passengers.each do |passenger|  %>
+    <li>
+       <%= link_to passenger.name, passenger_path(passenger) %>
+    </li>
+  <% end %>
+</ul>
\ No newline at end of file

From fbb8ab85e03d079569ff460e07d4253c1761ff54 Mon Sep 17 00:00:00 2001
From: ohcloud <cloudylopez@icloud.com>
Date: Tue, 8 Oct 2019 14:57:47 -0700
Subject: [PATCH 14/55] added show logic to see list of all drivers and a
 single driver.

---
 app/models/driver.rb            |  2 +-
 app/views/drivers/show.html.erb | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/models/driver.rb b/app/models/driver.rb
index 02a3e8c28..66802a867 100644
--- a/app/models/driver.rb
+++ b/app/models/driver.rb
@@ -4,4 +4,4 @@ class Driver < ApplicationRecord
   ##Validation Code
   #validates :name, presence: true;
   #validates :vin presence: true, uniqueness: true
-end
+end
\ No newline at end of file
diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb
index e69de29bb..5372ca05c 100644
--- a/app/views/drivers/show.html.erb
+++ b/app/views/drivers/show.html.erb
@@ -0,0 +1,11 @@
+  <h3>Name: <%= @driver.name %></h3>
+ 
+  <p> Driver Info:
+
+  <%= @driver.vin %>
+  <%= @driver.make %>
+  <%= @driver.model %>
+  <%= @driver.active %>
+  </p>
+  
+  <p><%= link_to "Return to Drivers List", drivers_path %></p>

From bb39eebed3a78e3e949dd3b05e09fcfba8446e2e Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Tue, 8 Oct 2019 14:58:04 -0700
Subject: [PATCH 15/55] Add Passenger Form Created

---
 app/views/passengers/_form.html.erb | 13 +++++++++++++
 app/views/passengers/new.html.erb   |  1 +
 app/views/passengers/show.html.erb  |  5 +++++
 3 files changed, 19 insertions(+)
 create mode 100644 app/views/passengers/_form.html.erb

diff --git a/app/views/passengers/_form.html.erb b/app/views/passengers/_form.html.erb
new file mode 100644
index 000000000..a44719888
--- /dev/null
+++ b/app/views/passengers/_form.html.erb
@@ -0,0 +1,13 @@
+
+
+<%= form_with model: @passenger, class: 'create-passenger' do |f| %>
+<p>Please provide the following information to <%= verb_name %> a passenger to our database:</p>
+
+<%= f.label :name, "Name: " %>
+<%= f.text_field :name %>
+
+<%= f.label :phone_num, "Phone Number: " %>
+<%= f.text_field :phone_num %>
+
+<%= f.submit "Save Passenger", class: "passenger-save" %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/passengers/new.html.erb b/app/views/passengers/new.html.erb
index e69de29bb..ca2e248fb 100644
--- a/app/views/passengers/new.html.erb
+++ b/app/views/passengers/new.html.erb
@@ -0,0 +1 @@
+  <%= render partial: "form", locals: { action_name: "New", verb_name: "add" }  %>
\ No newline at end of file
diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb
index e69de29bb..6476df669 100644
--- a/app/views/passengers/show.html.erb
+++ b/app/views/passengers/show.html.erb
@@ -0,0 +1,5 @@
+<h2>Name: <%= @passenger.name %></h2>
+<h3>Phone Number: <%= @passenger.phone_num %></h3>
+<h3>Total Amount Spent: 
+
+<p><%= link_to "Return to Passenger List", passengers_path %></p>
\ No newline at end of file

From 5b23bc2b1861f52c11f777bf5fe6e38987a3d48a Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Tue, 8 Oct 2019 15:27:10 -0700
Subject: [PATCH 16/55] updating passenger form

---
 app/controllers/passengers_controller.rb | 9 +++++++++
 app/views/passengers/_form.html.erb      | 3 +--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb
index b0c30d4bd..9e758ecd6 100644
--- a/app/controllers/passengers_controller.rb
+++ b/app/controllers/passengers_controller.rb
@@ -24,5 +24,14 @@ def new
   
   def create
     #Handle Validation Errors
+    
+    @passenger = Passenger.new(passenger_params) #instantiate a new passenger
+    if @passenger.save # save returns true if the database insert succeeds
+      redirect_to passengers_path # go to the index so we can see the passenger in the list
+      return
+    else # save failed :(
+      render :new # show the new book form view again
+      return
+    end
   end
 end
diff --git a/app/views/passengers/_form.html.erb b/app/views/passengers/_form.html.erb
index a44719888..5bd149097 100644
--- a/app/views/passengers/_form.html.erb
+++ b/app/views/passengers/_form.html.erb
@@ -1,7 +1,6 @@
-
+<p>Please provide the following information to <%= verb_name %> a passenger to our database:</p>
 
 <%= form_with model: @passenger, class: 'create-passenger' do |f| %>
-<p>Please provide the following information to <%= verb_name %> a passenger to our database:</p>
 
 <%= f.label :name, "Name: " %>
 <%= f.text_field :name %>

From d8b6d04c21991f962c39b662b597def61ffde1a7 Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Tue, 8 Oct 2019 15:34:13 -0700
Subject: [PATCH 17/55] Add New Passenger Form Working

---
 app/controllers/passengers_controller.rb | 9 +++++++++
 app/views/passengers/show.html.erb       | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb
index 9e758ecd6..26b3fde34 100644
--- a/app/controllers/passengers_controller.rb
+++ b/app/controllers/passengers_controller.rb
@@ -6,6 +6,7 @@ def index
   def show
     passenger_id = params[:id]
     @passenger = Passenger.find_by(id: passenger_id)
+    
     if @passenger.nil?
       head :not_found
       return
@@ -20,6 +21,7 @@ def update
   end
   
   def new
+    @passenger = Passenger.new
   end
   
   def create
@@ -34,4 +36,11 @@ def create
       return
     end
   end
+  
+  private
+  
+  def passenger_params
+    return params.require(:passenger).permit(:passenger_id, :name, :phone_num)
+  end
+  
 end
diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb
index 6476df669..3094dc266 100644
--- a/app/views/passengers/show.html.erb
+++ b/app/views/passengers/show.html.erb
@@ -1,5 +1,5 @@
 <h2>Name: <%= @passenger.name %></h2>
 <h3>Phone Number: <%= @passenger.phone_num %></h3>
-<h3>Total Amount Spent: 
+<h3>Total Amount Spent: $
 
 <p><%= link_to "Return to Passenger List", passengers_path %></p>
\ No newline at end of file

From 0d4a1a4dbe12ced7a5633f2be0c3f47861427a65 Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Tue, 8 Oct 2019 15:38:46 -0700
Subject: [PATCH 18/55] Edit Passenger Form Completed

---
 app/controllers/passengers_controller.rb | 15 +++++++++++++++
 app/views/passengers/edit.html.erb       |  1 +
 2 files changed, 16 insertions(+)

diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb
index 26b3fde34..b92730824 100644
--- a/app/controllers/passengers_controller.rb
+++ b/app/controllers/passengers_controller.rb
@@ -14,10 +14,25 @@ def show
   end
   
   def edit
+    @passenger = Passenger.find_by(id: params[:id])
+    
+    if @passenger.nil?
+      head :not_found
+      return
+    end
   end
   
   def update
     #Handle Validation Errors
+    
+    @passenger = Passenger.find_by(id: params[:id])
+    if @passenger.update(passenger_params)
+      redirect_to passengers_path # go to the index so we can see the book in the list
+      return
+    else # save failed :(
+      render :edit # show the new book form view again
+      return
+    end
   end
   
   def new
diff --git a/app/views/passengers/edit.html.erb b/app/views/passengers/edit.html.erb
index e69de29bb..71cfdd82e 100644
--- a/app/views/passengers/edit.html.erb
+++ b/app/views/passengers/edit.html.erb
@@ -0,0 +1 @@
+<%= render(partial: "form", locals: { action_name: "Edit", verb_name: "update" }) %>
\ No newline at end of file

From 6b7d02d812d0c673e48b4d442c2056dab8466bc6 Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Tue, 8 Oct 2019 15:55:10 -0700
Subject: [PATCH 19/55] Can Delete Passenger

---
 app/controllers/passengers_controller.rb | 15 +++++++++++++++
 app/views/passengers/index.html.erb      |  1 +
 app/views/passengers/show.html.erb       |  3 ++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb
index b92730824..5849fae62 100644
--- a/app/controllers/passengers_controller.rb
+++ b/app/controllers/passengers_controller.rb
@@ -52,6 +52,21 @@ def create
     end
   end
   
+  def destroy
+    passenger_id = params[:id]
+    @passenger = Passenger.find_by(id: passenger_id)
+    
+    if @passenger.nil?
+      head :not_found
+      return
+    end
+    
+    @passenger.destroy
+    
+    redirect_to passengers_path
+    return
+  end
+  
   private
   
   def passenger_params
diff --git a/app/views/passengers/index.html.erb b/app/views/passengers/index.html.erb
index 7e5246bf3..9ab2b75bc 100644
--- a/app/views/passengers/index.html.erb
+++ b/app/views/passengers/index.html.erb
@@ -1,4 +1,5 @@
 <h1>Passengers</h1>
+<p><%= link_to "Add New Passenger", new_passenger_path %></p>
 <ul>
   <% @passengers.each do |passenger|  %>
     <li>
diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb
index 3094dc266..ec42b237f 100644
--- a/app/views/passengers/show.html.erb
+++ b/app/views/passengers/show.html.erb
@@ -1,5 +1,6 @@
 <h2>Name: <%= @passenger.name %></h2>
 <h3>Phone Number: <%= @passenger.phone_num %></h3>
 <h3>Total Amount Spent: $
-
+<p><%= link_to "Edit Passenger", edit_passenger_path %></p>
+<p><%= link_to "Delete", passenger_path(@passenger), method: :delete, data: {confirm: "Are you sure?"}%></p>
 <p><%= link_to "Return to Passenger List", passengers_path %></p>
\ No newline at end of file

From f671d2b8d8e7018562cb65a96974b742851e6f5b Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Tue, 8 Oct 2019 16:09:49 -0700
Subject: [PATCH 20/55] Added Basic Nav Bar Function

---
 app/assets/stylesheets/application.css | 44 ++++++++++++++++++++++++++
 app/views/layouts/application.html.erb | 16 ++++++++++
 2 files changed, 60 insertions(+)

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index d05ea0f51..328ea2695 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -13,3 +13,47 @@
  *= require_tree .
  *= require_self
  */
+nav {
+  padding-bottom: 40px;
+}
+ /* Dropdown Button */
+.dropbtn {
+  background-color: #4CAF50;
+  color: white;
+  padding: 16px;
+  font-size: 16px;
+  border: none;
+}
+
+/* The container <div> - needed to position the dropdown content */
+.dropdown {
+  position: relative;
+  display: inline-block;
+}
+
+/* Dropdown Content (Hidden by Default) */
+.dropdown-content {
+  display: none;
+  position: absolute;
+  background-color: #f1f1f1;
+  min-width: 160px;
+  box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
+  z-index: 1;
+}
+
+/* Links inside the dropdown */
+.dropdown-content a {
+  color: black;
+  padding: 12px 16px;
+  text-decoration: none;
+  display: block;
+}
+
+/* Change color of dropdown links on hover */
+.dropdown-content a:hover {background-color: #ddd;}
+
+/* Show the dropdown menu on hover */
+.dropdown:hover .dropdown-content {display: block;}
+
+/* Change the background color of the dropdown button when the dropdown content is shown */
+.dropdown:hover .dropbtn {background-color: #3e8e41;}
\ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 692ca547e..0e304d0eb 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -9,7 +9,23 @@
     <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
   </head>
 
+
   <body>
+  <nav>
+  <section class="dropdown">
+  <a href="../passengers"><button class="dropbtn">Passengers</button></a>
+  <div class="dropdown-content">
+    <a href="../passengers/new">Add Passenger</a>
+  </div>
+</div>
+
+<section class="dropdown">
+  <a href="../drivers"><button class="dropbtn">Drivers</button></a>
+  <div class="dropdown-content">
+    <a href="../drivers/new">Add Driver</a>
+  </div>
+</div>
+  </nav>
     <%= yield %>
   </body>
 </html>

From e285228ce25c0c6368089fa12bb6c82b98b68880 Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Tue, 8 Oct 2019 16:16:36 -0700
Subject: [PATCH 21/55] Updated Passenger Tests Sent from Jared

---
 test/models/passenger_test.rb | 112 +++++++++++++++++-----------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/test/models/passenger_test.rb b/test/models/passenger_test.rb
index 66ac353d3..8c5553f65 100644
--- a/test/models/passenger_test.rb
+++ b/test/models/passenger_test.rb
@@ -1,70 +1,70 @@
 require "test_helper"
-
+​
 describe Passenger do
   let (:new_passenger) {
-    Passenger.new(name: "Kari", phone_number: "111-111-1211")
-  }
-  it "can be instantiated" do
+  Passenger.new(name: "Kari", phone_num: "111-111-1211")
+}
+it "can be instantiated" do
+  # Assert
+  expect(new_passenger.valid?).must_equal true
+end
+​
+it "will have the required fields" do
+  # Arrange
+  new_passenger.save
+  passenger = Passenger.first
+  [:name, :phone_num].each do |field|
+    ​
     # Assert
-    expect(new_passenger.valid?).must_equal true
+    expect(passenger).must_respond_to field
   end
-
-  it "will have the required fields" do
+end
+​
+describe "relationships" do
+  it "can have many trips" do
     # Arrange
     new_passenger.save
     passenger = Passenger.first
-    [:name, :phone_number].each do |field|
-
-      # Assert
-      expect(passenger).must_respond_to field
+    ​
+    # Assert
+    expect(passenger.trips.count).must_be :>, 0
+    passenger.trips.each do |trip|
+      expect(trip).must_be_instance_of Trip
     end
   end
-
-  describe "relationships" do
-    it "can have many trips" do
-      # Arrange
-      new_passenger.save
-      passenger = Passenger.first
-
-      # Assert
-      expect(passenger.trips.count).must_be :>, 0
-      passenger.trips.each do |trip|
-        expect(trip).must_be_instance_of Trip
-      end
-    end
+end
+​
+describe "validations" do
+  it "must have a name" do
+    # Arrange
+    new_passenger.name = nil
+    ​
+    # Assert
+    expect(new_passenger.valid?).must_equal false
+    expect(new_passenger.errors.messages).must_include :name
+    expect(new_passenger.errors.messages[:name]).must_equal ["can't be blank"]
   end
-
-  describe "validations" do
-    it "must have a name" do
-      # Arrange
-      new_passenger.name = nil
-
-      # Assert
-      expect(new_passenger.valid?).must_equal false
-      expect(new_passenger.errors.messages).must_include :name
-      expect(new_passenger.errors.messages[:name]).must_equal ["can't be blank"]
-    end
-
-    it "must have a phone number" do
-      # Arrange
-      new_passenger.phone_number = nil
-
-      # Assert
-      expect(new_passenger.valid?).must_equal false
-      expect(new_passenger.errors.messages).must_include :new_passenger
-      expect(new_passenger.errors.messages[:new_passenger]).must_equal ["can't be blank"]
-    end
+  ​
+  it "must have a phone number" do
+    # Arrange
+    new_passenger.phone_num = nil
+    ​
+    # Assert
+    expect(new_passenger.valid?).must_equal false
+    expect(new_passenger.errors.messages).must_include :phone_num
+    expect(new_passenger.errors.messages[:phone_num]).must_equal ["can't be blank"]
   end
-
-  # Tests for methods you create should go here
-  describe "custom methods" do
-    describe "request a ride" do
-      # Your code here
-    end
-
-    describe "complete trip" do
-      # Your code here
-    end
-    # You may have additional methods to test here
+end
+​
+# Tests for methods you create should go here
+describe "custom methods" do
+  describe "request a ride" do
+    # Your code here
+  end
+  ​
+  describe "complete trip" do
+    # Your code here
   end
+  # You may have additional methods to test here
 end
+end
\ No newline at end of file

From b7b3e7dd32416ae4f899742c770e0e65544d9124 Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Tue, 8 Oct 2019 16:51:58 -0700
Subject: [PATCH 22/55] Started setting up trips, but stuck.  Need to decide
 how we want to handle trips.

---
 app/controllers/trips_controller.rb               | 15 +++++++++++++++
 .../trips/{index.html.erb => _form.html.erb}      |  0
 app/views/trips/show.html.erb                     | 13 +++++++++++++
 3 files changed, 28 insertions(+)
 rename app/views/trips/{index.html.erb => _form.html.erb} (100%)

diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb
index eeeb0fb1f..d93cf0fb3 100644
--- a/app/controllers/trips_controller.rb
+++ b/app/controllers/trips_controller.rb
@@ -13,10 +13,25 @@ def show
   end
   
   def edit
+    @trip = Trip.find_by(id: params[:id])
+    
+    if @trip.nil?
+      head :not_found
+      return
+    end
   end
   
   def update
     #Handle Validation Errors
+    
+    @trip = Trip.find_by(id: params[:id])
+    if @trip.update(trip_params)
+      redirect_to trips_path # go to the index so we can see the book in the list
+      return
+    else # save failed :(
+      render :edit # show the new book form view again
+      return
+    end
   end
   
   def new
diff --git a/app/views/trips/index.html.erb b/app/views/trips/_form.html.erb
similarity index 100%
rename from app/views/trips/index.html.erb
rename to app/views/trips/_form.html.erb
diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb
index e69de29bb..6d6134342 100644
--- a/app/views/trips/show.html.erb
+++ b/app/views/trips/show.html.erb
@@ -0,0 +1,13 @@
+<h2>Trip ID: <%= @trip.id %></h2>
+<h3>Date: <%= @trip.date %></h3>
+<h3>Driver ID: <%= @trip.driver.id %></h3>
+<h3>Driver: <%= @trip.driver.name %></h3>
+<h3>Passenger ID: <%= @trip.passenger.id %></h3>
+<h3>Passenger: <%= @trip.passenger.name %></h3>
+<h3>Rating: <%= @trip.rating %></h3>
+<h3>Cost: <%= @trip.cost %></h3>
+
+<p><%= link_to "Edit Trip", edit_trip_path %></p>
+<p><%= link_to "Delete", trip_path(@trip), method: :delete, data: {confirm: "Are you sure?"}%></p>
+<p><%= link_to "Return to Passenger List", passengers_path %></p>
+<p><%= link_to "Return to Driver List", drivers_path %></p>
\ No newline at end of file

From 8dfbd0ef71ebf63a916ce1c463b3cd2559142b4a Mon Sep 17 00:00:00 2001
From: ohcloud <cloudylopez@icloud.com>
Date: Tue, 8 Oct 2019 16:57:22 -0700
Subject: [PATCH 23/55] completed all logic in view model index form show for
 driver. we can now delete edit view all drivers

---
 app/controllers/drivers_controller.rb | 52 ++++++++++++++++++++++++---
 app/views/drivers/_form.html.erb      | 19 ++++++++++
 app/views/drivers/edit.html.erb       |  1 +
 app/views/drivers/index.html.erb      |  1 +
 app/views/drivers/new.html.erb        |  1 +
 app/views/drivers/show.html.erb       | 15 ++++----
 config/routes.rb                      |  2 +-
 db/schema.rb                          | 10 +++---
 8 files changed, 83 insertions(+), 18 deletions(-)
 create mode 100644 app/views/drivers/_form.html.erb

diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb
index 31c4b6803..0ae4268b5 100644
--- a/app/controllers/drivers_controller.rb
+++ b/app/controllers/drivers_controller.rb
@@ -12,17 +12,59 @@ def show
     end
   end
   
-  def edit
+  def new
+    @driver = Driver.new
   end
   
-  def update
+  def create
     #Handle Validation Errors
+    @driver = Driver.new(driver_params)
+    if @driver.save
+      redirect_to drivers_path
+      return 
+    else 
+      render :new
+    end
   end
   
-  def new
+  def edit
+    @driver = Driver.find_by(id: params[:id])
+    if @driver.nil?
+      head :not_found
+      return
+    end
   end
   
-  def create
+  def update
     #Handle Validation Errors
+    @driver = Driver.find_by(id: params[:id])
+    if @driver.update(driver_params)
+      redirect_to driver_path
+      return
+    else
+      render :edit
+    end
+  end
+  
+  def destroy
+    driver_id = params[:id]
+    @driver = Driver.find_by(id: driver_id)
+    if @driver.nil?
+      head :not_found
+      return
+    end
+    @driver.destroy
+    redirect_to drivers_path
+    return
   end
-end
+  
+  private
+  
+  def driver_params
+    return params.require(:driver).permit(:driver_id, :name, 
+      :vin, :make, :model, :active)
+    end
+  end#end of class
+  
+  
+  
\ No newline at end of file
diff --git a/app/views/drivers/_form.html.erb b/app/views/drivers/_form.html.erb
new file mode 100644
index 000000000..18759fcd0
--- /dev/null
+++ b/app/views/drivers/_form.html.erb
@@ -0,0 +1,19 @@
+<p>Please provide the following information to <%= verb_name %> be a new drivers in our database:</p>
+
+<%= form_with model: @driver, class: "driver-input" do |f| %>
+
+  <%= f.label :name %>
+  <%= f.text_field :name %>
+
+  <%= f.label :vin%>
+  <%= f.text_area :vin %>
+
+  <%= f.label :make %>
+  <%= f.text_area :make %>
+
+  <%= f.label :model %>
+  <%= f.text_area :model %>
+
+  <%= f.submit "#{action_name} Driver", class: "driver-button" %>
+
+<% end %>
diff --git a/app/views/drivers/edit.html.erb b/app/views/drivers/edit.html.erb
index e69de29bb..703e2ff85 100644
--- a/app/views/drivers/edit.html.erb
+++ b/app/views/drivers/edit.html.erb
@@ -0,0 +1 @@
+<%= render(partial: "form", locals: { action_name: "Edit", verb_name: "update" }) %>
diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb
index 8a2c8bc95..7d7b78e2d 100644
--- a/app/views/drivers/index.html.erb
+++ b/app/views/drivers/index.html.erb
@@ -5,5 +5,6 @@
       <%= link_to driver.name, driver_path(driver) %>
       
     </li>
+
   <% end %>
 </ul>
\ No newline at end of file
diff --git a/app/views/drivers/new.html.erb b/app/views/drivers/new.html.erb
index e69de29bb..f560b17f2 100644
--- a/app/views/drivers/new.html.erb
+++ b/app/views/drivers/new.html.erb
@@ -0,0 +1 @@
+<%= render partial: "form", locals: { action_name: "New", verb_name: "create" }  %>
diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb
index 5372ca05c..775d3de46 100644
--- a/app/views/drivers/show.html.erb
+++ b/app/views/drivers/show.html.erb
@@ -1,11 +1,12 @@
   <h3>Name: <%= @driver.name %></h3>
- 
-  <p> Driver Info:
+ <ul>
+  <p> Driver Info: </p>
 
-  <%= @driver.vin %>
-  <%= @driver.make %>
-  <%= @driver.model %>
-  <%= @driver.active %>
+  <li>Vin #: <%= @driver.vin %></li>
+  <li>Car Make: <%= @driver.make %></li>
+  <li>Car Model: <%= @driver.model %></li>
+  <li>Status: <%= @driver.active %></li>
   </p>
-  
+  <%= link_to "Edit", edit_driver_path(@driver) %>
+  <%= link_to "Delete", driver_path(@driver), method: :delete, data: {confirm: "Are you sure?"}%>
   <p><%= link_to "Return to Drivers List", drivers_path %></p>
diff --git a/config/routes.rb b/config/routes.rb
index 084ed854f..e44494630 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -9,7 +9,7 @@
   # NOTES FOR REFERENCE: 
   # RESTful Routes Include:
   # Rails.application.routes.draw do
-  # get "/books" , to: "books#index", as: :book
+  # get "/drivers" , to: "drivers#index", as: :driver
   # post "/books" , to: "books#create"
   # get "/books/new" , to: "books#new", as: :new_book
   # get "/books/:id" , to: "books#show", as: :book
diff --git a/db/schema.rb b/db/schema.rb
index f219c639c..1a34bf58e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,10 +11,10 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(version: 2019_10_08_181751) do
-
+  
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
-
+  
   create_table "drivers", force: :cascade do |t|
     t.string "name"
     t.string "vin"
@@ -24,14 +24,14 @@
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
-
+  
   create_table "passengers", force: :cascade do |t|
     t.string "name"
     t.string "phone_num"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
-
+  
   create_table "trips", force: :cascade do |t|
     t.date "date"
     t.float "cost"
@@ -41,5 +41,5 @@
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
-
+  
 end

From 593e928548abd7ccdb5895e20ac181100a63f5f2 Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Wed, 9 Oct 2019 09:39:01 -0700
Subject: [PATCH 24/55] Added Trip List for Passengers and Total Amout Spent

---
 app/models/passenger.rb            |  9 +++++++++
 app/views/passengers/show.html.erb | 11 ++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/models/passenger.rb b/app/models/passenger.rb
index 579a0174b..d8de86467 100644
--- a/app/models/passenger.rb
+++ b/app/models/passenger.rb
@@ -1,6 +1,15 @@
 class Passenger < ApplicationRecord
   has_many :trips
   
+  def total_spent
+    total = 0
+    self.trips.each do |trip|
+      total += trip.cost
+    end
+    total = total * 0.10
+    return total
+  end
+  
   # #Validation Code
   # validates :name, presence: true;
   # validates :phone_num, presence: true, uniqueness: true
diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb
index ec42b237f..b81dcd7cc 100644
--- a/app/views/passengers/show.html.erb
+++ b/app/views/passengers/show.html.erb
@@ -1,6 +1,15 @@
 <h2>Name: <%= @passenger.name %></h2>
 <h3>Phone Number: <%= @passenger.phone_num %></h3>
-<h3>Total Amount Spent: $
+<h3>Total Amount Spent: $<%= @passenger.total_spent %>
+
+<% @passenger.trips.each do |trip| %>
+<h2>Trip ID: <%= trip.id %></h2>
+<h3>Date: <%= trip.date %></h3>
+<h3>Driver ID: <%= trip.driver.id %></h3>
+<h3>Rating: <%= trip.rating %></h3>
+<h3>Cost: $<%=(trip.cost * 0.10).round(2) %></h3>
+<% end %>
+
 <p><%= link_to "Edit Passenger", edit_passenger_path %></p>
 <p><%= link_to "Delete", passenger_path(@passenger), method: :delete, data: {confirm: "Are you sure?"}%></p>
 <p><%= link_to "Return to Passenger List", passengers_path %></p>
\ No newline at end of file

From aa4fa37250a272914795ff44c492c147bae49dbb Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Wed, 9 Oct 2019 10:03:38 -0700
Subject: [PATCH 25/55] Added Error Handling for Incorrect Input for New
 Passenger

---
 app/models/passenger.rb             |  7 ++++---
 app/views/passengers/_form.html.erb | 11 +++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/models/passenger.rb b/app/models/passenger.rb
index d8de86467..01c04de49 100644
--- a/app/models/passenger.rb
+++ b/app/models/passenger.rb
@@ -1,6 +1,10 @@
 class Passenger < ApplicationRecord
   has_many :trips
   
+  #Validation Code
+  validates :name, presence: true;
+  validates :phone_num, presence: true, uniqueness: true
+  
   def total_spent
     total = 0
     self.trips.each do |trip|
@@ -10,7 +14,4 @@ def total_spent
     return total
   end
   
-  # #Validation Code
-  # validates :name, presence: true;
-  # validates :phone_num, presence: true, uniqueness: true
 end
diff --git a/app/views/passengers/_form.html.erb b/app/views/passengers/_form.html.erb
index 5bd149097..90e4c7174 100644
--- a/app/views/passengers/_form.html.erb
+++ b/app/views/passengers/_form.html.erb
@@ -1,3 +1,14 @@
+<% if @passenger.errors.any? %>
+  <h1>Errors</h1>
+  <ul class="errors">
+    <% @passenger.errors.each do |column, message| %>
+      <li>
+        <strong><%= column.capitalize %></strong> <%= message %>
+      </li>
+    <% end %>
+  </ul>
+<% end %>
+
 <p>Please provide the following information to <%= verb_name %> a passenger to our database:</p>
 
 <%= form_with model: @passenger, class: 'create-passenger' do |f| %>

From 23c9392fa75a338f67ebbf034e30fea141ca1ba7 Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Wed, 9 Oct 2019 10:14:53 -0700
Subject: [PATCH 26/55] Edited Passenger Show

---
 app/views/passengers/show.html.erb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb
index b81dcd7cc..d95f2ac5d 100644
--- a/app/views/passengers/show.html.erb
+++ b/app/views/passengers/show.html.erb
@@ -2,14 +2,16 @@
 <h3>Phone Number: <%= @passenger.phone_num %></h3>
 <h3>Total Amount Spent: $<%= @passenger.total_spent %>
 
+<p><%= link_to "Edit Passenger", edit_passenger_path %></p>
+<p><%= link_to "Delete Passenger", passenger_path(@passenger), method: :delete, data: {confirm: "Are you sure?"}%></p>
+
 <% @passenger.trips.each do |trip| %>
 <h2>Trip ID: <%= trip.id %></h2>
 <h3>Date: <%= trip.date %></h3>
 <h3>Driver ID: <%= trip.driver.id %></h3>
 <h3>Rating: <%= trip.rating %></h3>
 <h3>Cost: $<%=(trip.cost * 0.10).round(2) %></h3>
+<p><%= link_to "Edit Trip", edit_trip_path %></p>
 <% end %>
 
-<p><%= link_to "Edit Passenger", edit_passenger_path %></p>
-<p><%= link_to "Delete", passenger_path(@passenger), method: :delete, data: {confirm: "Are you sure?"}%></p>
 <p><%= link_to "Return to Passenger List", passengers_path %></p>
\ No newline at end of file

From fd287156ed7aec8fab9a3509ef36406ce5e29c1a Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Wed, 9 Oct 2019 10:57:30 -0700
Subject: [PATCH 27/55] Partial Trip Form Created, Missing Drop Down of
 Passengers/Drivers

---
 app/controllers/trips_controller.rb |  2 ++
 app/views/trips/_form.html.erb      | 27 +++++++++++++++++++++++++++
 app/views/trips/edit.html.erb       |  1 +
 app/views/trips/new.html.erb        |  1 +
 4 files changed, 31 insertions(+)

diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb
index d93cf0fb3..f2b21d70d 100644
--- a/app/controllers/trips_controller.rb
+++ b/app/controllers/trips_controller.rb
@@ -1,6 +1,8 @@
 class TripsController < ApplicationController
   def index
     @trips = Trip.all
+    @drivers = Driver.all
+    @passengers = Passenger.all
   end
   
   def show
diff --git a/app/views/trips/_form.html.erb b/app/views/trips/_form.html.erb
index e69de29bb..a770dfb29 100644
--- a/app/views/trips/_form.html.erb
+++ b/app/views/trips/_form.html.erb
@@ -0,0 +1,27 @@
+<% if @trip.errors.any? %>
+  <h1>Errors</h1>
+  <ul class="errors">
+    <% @trip.errors.each do |column, message| %>
+      <li>
+        <strong><%= column.capitalize %></strong> <%= message %>
+      </li>
+    <% end %>
+  </ul>
+<% end %>
+
+<p>Please provide the following information to <%= verb_name %> a trip to our database:</p>
+
+<%= form_with model: @trip, class: 'create-trip' do |f| %>
+
+<%= f.label :date, "Date: " %>
+<%= f.date_field :date %>
+
+
+<%= f.label :rating, "Rating: " %>
+<%= f.select :rating, [' ', '1', '2', '3', '4', '5']%>
+
+<%= f.label :date, "Cost: $" %>
+<%= f.text_field :cost %>
+
+<%= f.submit "Save Trip", class: "trip-save" %>
+<% end %>
diff --git a/app/views/trips/edit.html.erb b/app/views/trips/edit.html.erb
index e69de29bb..71cfdd82e 100644
--- a/app/views/trips/edit.html.erb
+++ b/app/views/trips/edit.html.erb
@@ -0,0 +1 @@
+<%= render(partial: "form", locals: { action_name: "Edit", verb_name: "update" }) %>
\ No newline at end of file
diff --git a/app/views/trips/new.html.erb b/app/views/trips/new.html.erb
index e69de29bb..db0951467 100644
--- a/app/views/trips/new.html.erb
+++ b/app/views/trips/new.html.erb
@@ -0,0 +1 @@
+ <%= render partial: "form", locals: { action_name: "New", verb_name: "add" }  %>
\ No newline at end of file

From bfcf20f353deb3c0e63bc46f91fa64884277e1d3 Mon Sep 17 00:00:00 2001
From: ohcloud <cloudylopez@icloud.com>
Date: Wed, 9 Oct 2019 14:48:03 -0700
Subject: [PATCH 28/55] we have now merged driver and passenger back into
 master branch. tests are not running, we are still investigating. next up, we
 create a homepage and trips controller and figure out testing.

---
 test/test_helper.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 3ab84e3d1..5dd55fa02 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,10 +1,14 @@
 ENV['RAILS_ENV'] ||= 'test'
 require_relative '../config/environment'
 require 'rails/test_help'
+require 'minitest/rails'
+require 'minitest/autorun'
+require 'minitest/reporters'
+
 
 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

From 26efbef92bbd83949e136eeb76b6ff49aa971fd9 Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Wed, 9 Oct 2019 15:49:35 -0700
Subject: [PATCH 29/55] All Tests Passing for Passenger

---
 .../controllers/passengers_controller_test.rb | 115 ++++++++++++++++--
 test/test_helper.rb                           |   5 +-
 2 files changed, 106 insertions(+), 14 deletions(-)

diff --git a/test/controllers/passengers_controller_test.rb b/test/controllers/passengers_controller_test.rb
index 60acbdfb6..679613c57 100644
--- a/test/controllers/passengers_controller_test.rb
+++ b/test/controllers/passengers_controller_test.rb
@@ -2,30 +2,119 @@
 
 describe PassengersController do
   describe "index" do
-    # Your tests go here
+    
+    it "gives back a successful response" do
+      
+      get passengers_path
+      must_respond_with :success
+      
+    end
+    
   end
-
+  
   describe "show" do
-    # Your tests go here
+    
+    it 'responds with a success when id given exists' do
+      
+      valid_passenger = Passenger.create(name: "Ada Lovelace", phone_num: "503-569-9987")
+      
+      get passenger_path(valid_passenger.id)
+      must_respond_with :success
+      
+    end
+    
+    it 'responds with a not_found when id given does not exist' do
+      
+      get passenger_path("5000")
+      must_respond_with :not_found
+      
+    end
+    
   end
-
+  
   describe "new" do
-    # Your tests go here
+    it "gives back a successful response" do
+      
+      get new_passenger_path
+      must_respond_with :success
+      
+    end
   end
-
+  
   describe "create" do
-    # Your tests go here
+    
+    it 'creates a new passenger successfully with valid data, and redirects the user to the passenger page' do
+      
+      passenger_hash = {
+        passenger: {
+          name: "Ada Lovelace",
+          phone_num: "503-569-9987"
+        }
+      }
+      
+      expect {
+        post passengers_path, params: passenger_hash
+      }.must_differ 'Passenger.count', 1
+      
+      must_redirect_to passengers_path
+    end
+    
   end
-
+  
   describe "edit" do
-    # Your tests go here
+    it "gives back a successful response" do
+      
+      get new_passenger_path
+      must_respond_with :success
+      
+    end
   end
-
+  
   describe "update" do
-    # Your tests go here
+    before do
+      @valid_passenger = Passenger.create(name: "Ada Lovelace", phone_num: "503-569-9987")
+    end
+    
+    it "updates an existing passenger successfully and redirects to home" do
+      
+      existing_passenger = Passenger.first
+      
+      updated_passenger_hash = {
+        passenger: {
+          name: "Bill Gates",
+          phone_num: "541-569-9987"
+        }
+      }
+      
+      expect {
+        patch passenger_path(existing_passenger.id), params: updated_passenger_hash
+      }.wont_change 'Passenger.count'
+      
+      # Assert
+      expect( Passenger.find_by(id: existing_passenger.id).name ).must_equal "Bill Gates"
+      expect( Passenger.find_by(id: existing_passenger.id).phone_num ).must_equal "541-569-9987"
+    end
   end
-
+  
   describe "destroy" do
-    # Your tests go here
+    
+    it 'deletes a new passenger successfully with valid data, and redirects the user to the passengers page' do
+      
+      passenger_hash = {
+        passenger: {
+          name: "Ada Lovelace",
+          phone_num: "503-569-9987"
+        }
+      }
+      
+      post passengers_path, params: passenger_hash
+      identifier = Passenger.find_by(name: "Ada Lovelace")
+      
+      expect {
+        delete passenger_path(identifier.id)
+      }.must_differ 'Passenger.count', -1
+      
+      must_redirect_to passengers_path
+    end
   end
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 3ab84e3d1..aa7ea1406 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,10 +1,13 @@
 ENV['RAILS_ENV'] ||= 'test'
 require_relative '../config/environment'
 require 'rails/test_help'
+require 'minitest/rails'
+require 'minitest/autorun'
+require 'minitest/reporters'
 
 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

From 172d6cd91e00affc7796bc5144b2aebac570ff46 Mon Sep 17 00:00:00 2001
From: ohcloud <cloudylopez@icloud.com>
Date: Wed, 9 Oct 2019 19:14:24 -0700
Subject: [PATCH 30/55] added some tests to driver controller

---
 test/controllers/drivers_controller_test.rb | 253 ++++++++++----------
 test/models/passenger_test.rb               | 104 ++++----
 2 files changed, 176 insertions(+), 181 deletions(-)

diff --git a/test/controllers/drivers_controller_test.rb b/test/controllers/drivers_controller_test.rb
index 48aef7556..d4d2d61b1 100644
--- a/test/controllers/drivers_controller_test.rb
+++ b/test/controllers/drivers_controller_test.rb
@@ -2,174 +2,169 @@
 
 describe DriversController do
   # Note: If any of these tests have names that conflict with either the requirements or your team's decisions, feel empowered to change the test names. For example, if a given test name says "responds with 404" but your team's decision is to respond with redirect, please change the test name.
-
+  
   describe "index" do
     it "responds with success when there are many drivers saved" do
-      # Arrange
-      # Ensure that there is at least one Driver saved
-
-      # Act
-
-      # Assert
-
-    end
-
-    it "responds with success when there are no drivers saved" do
-      # Arrange
-      # Ensure that there are zero drivers saved
-
-      # Act
-
-      # Assert
-
+      get drivers_path
+      
+      must_respond_with :success
     end
   end
-
+  
   describe "show" do
-    it "responds with success when showing an existing valid driver" do
-      # Arrange
-      # Ensure that there is a driver saved
-
-      # Act
-
-      # Assert
-
+    it 'responds with a success when id given exists' do
+      valid_driver = Driver.create(name: "Ada Lovelace", vin: 5035699987, make: "toyota", model: "prius", active: true)
+      get driver_path(valid_driver.id)
+      must_respond_with :success
     end
-
+    
+    
     it "responds with 404 with an invalid driver id" do
-      # Arrange
-      # Ensure that there is an id that points to no driver
-
-      # Act
-
-      # Assert
-
+      get driver_path("5000")
+      must_respond_with :not_found
     end
   end
-
+  
   describe "new" do
     it "responds with success" do
+      get new_driver_path
+      must_respond_with :success
     end
   end
-
+  
   describe "create" do
     it "can create a new driver with valid information accurately, and redirect" do
       # Arrange
       # Set up the form data
-
-      # Act-Assert
-      # Ensure that there is a change of 1 in Driver.count
-
-      # Assert
-      # Find the newly created Driver, and check that all its attributes match what was given in the form data
-      # Check that the controller redirected the user
-
-    end
-
-    it "does not create a driver if the form data violates Driver validations, and responds with a redirect" do
-      # Note: This will not pass until ActiveRecord Validations lesson
-      # Arrange
-      # Set up the form data so that it violates Driver validations
-
-      # Act-Assert
-      # Ensure that there is no change in Driver.count
-
-      # Assert
-      # Check that the controller redirects
-
+      driver_hash = {
+        driver: {
+          name: "ada lovelace",
+          vin: "2342334234242",
+          make: "toyota",
+          model: "prius"
+        }
+      }
+      expect {
+        post drivers_path, params: driver_hash
+      }.must_differ 'Driver.count', 1
+      must_redirect_to drivers_path
     end
   end
   
+  xit "does not create a driver If the form data violates Driver validations, and responds with a redirect" do
+    # Note: This will not pass Until ActiveRecord Validations lesson
+    # Arrange
+    # Set up the form data so that it violates Driver validations
+    
+    # Act-Assert
+    # Ensure that there is no change in Driver.count
+    
+    # Assert
+    # Check that the controller redirects
+    
+  end
+  
+  
   describe "edit" do
     it "responds with success when getting the edit page for an existing, valid driver" do
       # Arrange
       # Ensure there is an existing driver saved
-
+      
       # Act
-
+      
       # Assert
-
+      
     end
-
+    
     it "responds with redirect when getting the edit page for a non-existing driver" do
       # Arrange
       # Ensure there is an invalid id that points to no driver
-
+      
       # Act
-
+      
       # Assert
-
+      
     end
   end
-
+  
   describe "update" do
-    it "can update an existing driver with valid information accurately, and redirect" do
-      # Arrange
-      # Ensure there is an existing driver saved
-      # Assign the existing driver's id to a local variable
-      # Set up the form data
-
-      # Act-Assert
-      # Ensure that there is no change in Driver.count
-
-      # Assert
-      # Use the local variable of an existing driver's id to find the driver again, and check that its attributes are updated
-      # Check that the controller redirected the user
-
+    before do
+      @valid_driver = Driver.create(name: "Ada Lovelace", vin: "234834978", make: "Toyota", model: "Prius")
     end
-
-    it "does not update any driver if given an invalid id, and responds with a 404" do
-      # Arrange
-      # Ensure there is an invalid id that points to no driver
-      # Set up the form data
-
-      # Act-Assert
-      # Ensure that there is no change in Driver.count
-
+    it "updates an existing driver successfully and redirects to home" do
+      existing_driver = Driver.first
+      updated_driver_hash = {
+        driver: {
+          name: "Bill Gates",
+          vin: "234834978",
+          make: "Toyota",
+          model: "Prius"
+        }
+      }
+      expect {
+        patch driver_path(existing_driver.id), params: updated_driver_hash
+      }.wont_change 'Driver.count'
       # Assert
-      # Check that the controller gave back a 404
-
-    end
-
-    it "does not create a driver if the form data violates Driver validations, and responds with a redirect" do
-      # Note: This will not pass until ActiveRecord Validations lesson
-      # Arrange
-      # Ensure there is an existing driver saved
-      # Assign the existing driver's id to a local variable
-      # Set up the form data so that it violates Driver validations
-
-      # Act-Assert
-      # Ensure that there is no change in Driver.count
-
-      # Assert
-      # Check that the controller redirects
-
+      expect( Driver.find_by(id: existing_driver.id).name ).must_equal "Bill Gates"
+      expect( Driver.find_by(id: existing_driver.id).vin ).must_equal "234834978"
+      expect( Driver.find_by(id: existing_driver.id).make ).must_equal "Toyota"
+      expect( Driver.find_by(id: existing_driver.id).model ).must_equal "Prius"
     end
   end
+  
+  it "does not update any driver if given an invalid id, and responds with a 404" do
+    driver_hash = {
+      driver: {
+        name: "ada lovelace",
+        vin: "2342334234242",
+        make: "toyota",
+        model: "prius"
+      }
+    }
+    expect {
+      post drivers_path, params: driver_hash
+    }.must_differ 'Driver.count', -1
+    must_redirect_to drivers_path
+  end
+  
+  it "does not create a driver If the form data violates Driver validations, and responds with a redirect" do
+    # Note: This will not pass Until ActiveRecord Validations lesson
+    # Arrange
+    # Ensure there is an existing driver saved
+    # Assign the existing driver's id to a local variable
+    # Set up the form data so that it violates Driver validations
+    
+    # Act-Assert
+    # Ensure that there is no change in Driver.count
+    
+    # Assert
+    # Check that the controller redirects
+  end
+end
 
-  describe "destroy" do
-    it "destroys the driver instance in db when driver exists, then redirects" do
-      # Arrange
-      # Ensure there is an existing driver saved
-
-      # Act-Assert
-      # Ensure that there is a change of -1 in Driver.count
-
-      # Assert
-      # Check that the controller redirects
-
-    end
-
-    it "does not change the db when the driver does not exist, then responds with " do
-      # Arrange
-      # Ensure there is an invalid id that points to no driver
-
-      # Act-Assert
-      # Ensure that there is no change in Driver.count
-
-      # Assert
-      # Check that the controller responds or redirects with whatever your group decides
-
-    end
+describe "destroy" do
+  it "destroys the driver instance in db when driver exists, then redirects" do
+    # Arrange
+    # Ensure there is an existing driver saved
+    
+    # Act-Assert
+    # Ensure that there is a change of -1 in Driver.count
+    
+    # Assert
+    # Check that the controller redirects
+    
+  end
+  
+  it "does not change the db when the driver does not exist, then responds with " do
+    # Arrange
+    # Ensure there is an invalid id that points to no driver
+    
+    # Act-Assert
+    # Ensure that there is no change in Driver.count
+    
+    # Assert
+    # Check that the controller responds or redirects with whatever your group decides
+    
   end
 end
+
diff --git a/test/models/passenger_test.rb b/test/models/passenger_test.rb
index 8c5553f65..a077b540e 100644
--- a/test/models/passenger_test.rb
+++ b/test/models/passenger_test.rb
@@ -2,69 +2,69 @@
 ​
 describe Passenger do
   let (:new_passenger) {
-  Passenger.new(name: "Kari", phone_num: "111-111-1211")
-}
-it "can be instantiated" do
-  # Assert
-  expect(new_passenger.valid?).must_equal true
-end
-​
-it "will have the required fields" do
-  # Arrange
-  new_passenger.save
-  passenger = Passenger.first
-  [:name, :phone_num].each do |field|
-    ​
+    Passenger.new(name: "Kari", phone_num: "111-111-1211")
+  }
+  it "can be instantiated" do
     # Assert
-    expect(passenger).must_respond_to field
+    expect(new_passenger.valid?).must_equal true
   end
-end
-​
-describe "relationships" do
-  it "can have many trips" do
+  ​
+  it "will have the required fields" do
     # Arrange
     new_passenger.save
     passenger = Passenger.first
-    ​
-    # Assert
-    expect(passenger.trips.count).must_be :>, 0
-    passenger.trips.each do |trip|
-      expect(trip).must_be_instance_of Trip
+    [:name, :phone_num].each do |field|
+      ​
+      # Assert
+      expect(passenger).must_respond_to field
     end
   end
-end
-​
-describe "validations" do
-  it "must have a name" do
-    # Arrange
-    new_passenger.name = nil
-    ​
-    # Assert
-    expect(new_passenger.valid?).must_equal false
-    expect(new_passenger.errors.messages).must_include :name
-    expect(new_passenger.errors.messages[:name]).must_equal ["can't be blank"]
+  ​
+  describe "relationships" do
+    it "can have many trips" do
+      # Arrange
+      new_passenger.save
+      passenger = Passenger.first
+      ​
+      # Assert
+      expect(passenger.trips.count).must_be :>, 0
+      passenger.trips.each do |trip|
+        expect(trip).must_be_instance_of Trip
+      end
+    end
   end
   ​
-  it "must have a phone number" do
-    # Arrange
-    new_passenger.phone_num = nil
+  describe "validations" do
+    it "must have a name" do
+      # Arrange
+      new_passenger.name = nil
+      ​
+      # Assert
+      expect(new_passenger.valid?).must_equal false
+      expect(new_passenger.errors.messages).must_include :name
+      expect(new_passenger.errors.messages[:name]).must_equal ["can't be blank"]
+    end
     ​
-    # Assert
-    expect(new_passenger.valid?).must_equal false
-    expect(new_passenger.errors.messages).must_include :phone_num
-    expect(new_passenger.errors.messages[:phone_num]).must_equal ["can't be blank"]
-  end
-end
-​
-# Tests for methods you create should go here
-describe "custom methods" do
-  describe "request a ride" do
-    # Your code here
+    it "must have a phone number" do
+      # Arrange
+      new_passenger.phone_num = nil
+      ​
+      # Assert
+      expect(new_passenger.valid?).must_equal false
+      expect(new_passenger.errors.messages).must_include :phone_num
+      expect(new_passenger.errors.messages[:phone_num]).must_equal ["can't be blank"]
+    end
   end
   ​
-  describe "complete trip" do
-    # Your code here
+  # Tests for methods you create should go here
+  describe "custom methods" do
+    describe "request a ride" do
+      # Your code here
+    end
+    ​
+    describe "complete trip" do
+      # Your code here
+    end
+    # You may have additional methods to test here
   end
-  # You may have additional methods to test here
-end
 end
\ No newline at end of file

From a707a29b416ed33b5a3c35955d1ae7f27bfc93f2 Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Wed, 9 Oct 2019 22:03:59 -0700
Subject: [PATCH 31/55] Added Functionality to Form to Lock in Passenger and
 Driver info for Edit Trip.

---
 app/controllers/trips_controller.rb | 14 +++++++++++
 app/views/trips/_form.html.erb      | 17 ++++++++++++++
 app/views/trips/edit.html.erb       |  3 ++-
 config/routes.rb                    | 36 ++++++++++++++++++-----------
 4 files changed, 56 insertions(+), 14 deletions(-)

diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb
index f2b21d70d..523ace6ee 100644
--- a/app/controllers/trips_controller.rb
+++ b/app/controllers/trips_controller.rb
@@ -41,5 +41,19 @@ def new
   
   def create
     #Handle Validation Errors
+    @trip = Trip.new(trip_params) #instantiate a new book
+    if @trip.save # save returns true if the database insert succeeds
+      redirect_to passenger_path(trip_params.passenger_id) # go to the index so we can see the book in the list
+      return
+    else # save failed :(
+      render :new # show the new book form view again
+      return
+    end
+  end
+  
+  private
+  
+  def trip_params
+    return params.require(:trip).permit(:trip_id, :date, :passenger_id, :driver_id, :price, :rating)
   end
 end
diff --git a/app/views/trips/_form.html.erb b/app/views/trips/_form.html.erb
index a770dfb29..cb9e8c5c6 100644
--- a/app/views/trips/_form.html.erb
+++ b/app/views/trips/_form.html.erb
@@ -16,6 +16,23 @@
 <%= f.label :date, "Date: " %>
 <%= f.date_field :date %>
 
+<% if @trip.passenger.nil? %>
+  <%= f.label :passenger_id %>
+  <%= f.select :passenger_id, Passenger.all.map{ |passenger| [passenger.name, passenger.id] } %>
+<% else %>
+  <%= f.hidden_field :passenger_id %>
+  <%= hidden_field_tag 'passenger_id', @trip.passenger.id  %>
+  Passenger: <%= @trip.passenger.name %>
+<% end %>
+
+<% if @trip.driver.nil? %>
+  <%= f.label :driver_id %>
+  <%= f.select :driver_id, Driver.all.map{ |driver| [driver.name, driver.id] } %>
+<% else %>
+  <%= f.hidden_field :driver_id %>
+  <%= hidden_field_tag 'driver_id', @trip.driver.id  %>
+  Driver: <%= @trip.driver.name %>
+<% end %>
 
 <%= f.label :rating, "Rating: " %>
 <%= f.select :rating, [' ', '1', '2', '3', '4', '5']%>
diff --git a/app/views/trips/edit.html.erb b/app/views/trips/edit.html.erb
index 71cfdd82e..059737d4c 100644
--- a/app/views/trips/edit.html.erb
+++ b/app/views/trips/edit.html.erb
@@ -1 +1,2 @@
-<%= render(partial: "form", locals: { action_name: "Edit", verb_name: "update" }) %>
\ No newline at end of file
+
+<%= render(partial: "form", locals: { action_name: "Edit", verb_name: "update" }) %>
diff --git a/config/routes.rb b/config/routes.rb
index 084ed854f..bec99b86e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,21 +1,31 @@
 Rails.application.routes.draw do
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
   
-  resources :passengers
+  resources :passengers do
+    resources :trips
+  end
+  
   resources :drivers
   resources :trips
   
+  root 'books#index'
+  
+  # resources :books #, except: [:index]
   
-  # NOTES FOR REFERENCE: 
-  # RESTful Routes Include:
-  # Rails.application.routes.draw do
-  # get "/books" , to: "books#index", as: :book
-  # post "/books" , to: "books#create"
-  # get "/books/new" , to: "books#new", as: :new_book
-  # get "/books/:id" , to: "books#show", as: :book
-  # patch "/books/:id" , to: "books#update"
-  # put "/books/:id" , to: "books#update"
-  # delete "/books/:id" , to: "books#destroy"
-  # get "/books/:id/edit" , to: "books#edit", as: :edit_book
-  # end
+  # resources :authors, only: [:index, :show] do
+  #   resources :books, only: [:index, :new]
 end
+
+# NOTES FOR REFERENCE: 
+# RESTful Routes Include:
+# Rails.application.routes.draw do
+# get "/books" , to: "books#index", as: :book
+# post "/books" , to: "books#create"
+# get "/books/new" , to: "books#new", as: :new_book
+# get "/books/:id" , to: "books#show", as: :book
+# patch "/books/:id" , to: "books#update"
+# put "/books/:id" , to: "books#update"
+# delete "/books/:id" , to: "books#destroy"
+# get "/books/:id/edit" , to: "books#edit", as: :edit_book
+# end
+

From 7bbb957c28fd5f1b9077c03b35dddbb3bd42f164 Mon Sep 17 00:00:00 2001
From: ohcloud <cloudylopez@icloud.com>
Date: Thu, 10 Oct 2019 09:07:42 -0700
Subject: [PATCH 32/55] driver controller tests done

---
 test/controllers/drivers_controller_test.rb | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/test/controllers/drivers_controller_test.rb b/test/controllers/drivers_controller_test.rb
index d4d2d61b1..b455450b1 100644
--- a/test/controllers/drivers_controller_test.rb
+++ b/test/controllers/drivers_controller_test.rb
@@ -71,19 +71,19 @@
       # Ensure there is an existing driver saved
       
       # Act
-      
+      get edit_driver_path(driver.id)
       # Assert
-      
+      must_respond_with :success
     end
     
     it "responds with redirect when getting the edit page for a non-existing driver" do
       # Arrange
       # Ensure there is an invalid id that points to no driver
-      
+      driver_id = -1
       # Act
-      
+      get edit_driver_path(driver.id)
       # Assert
-      
+      must_respond_with :redirect
     end
   end
   
@@ -127,7 +127,7 @@
     must_redirect_to drivers_path
   end
   
-  it "does not create a driver If the form data violates Driver validations, and responds with a redirect" do
+  xit "does not create a driver If the form data violates Driver validations, and responds with a redirect" do
     # Note: This will not pass Until ActiveRecord Validations lesson
     # Arrange
     # Ensure there is an existing driver saved
@@ -146,16 +146,17 @@
   it "destroys the driver instance in db when driver exists, then redirects" do
     # Arrange
     # Ensure there is an existing driver saved
-    
+    new_driver = Driver.create(name: "Bill Gates", vin: "234834978", make: "Toyota", model: "Prius")
     # Act-Assert
     # Ensure that there is a change of -1 in Driver.count
-    
+    expect { delete_driver_path(new_driver.id) }.must_change "Driver Count", -1
     # Assert
     # Check that the controller redirects
-    
+    must_respond_with :redirect
+    must_redirect_to drivers_path
   end
   
-  it "does not change the db when the driver does not exist, then responds with " do
+  xit "does not change the db when the driver does not exist, then responds with " do
     # Arrange
     # Ensure there is an invalid id that points to no driver
     

From 1d4075111462d9af662519b90abcd5400c7f65f8 Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Thu, 10 Oct 2019 09:29:41 -0700
Subject: [PATCH 33/55] Can create a new trip from passenger and edit trip.

---
 app/controllers/trips_controller.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb
index 523ace6ee..59c63c62b 100644
--- a/app/controllers/trips_controller.rb
+++ b/app/controllers/trips_controller.rb
@@ -37,6 +37,15 @@ def update
   end
   
   def new
+    if params[:passenger_id]
+      # This is the nested route, /author/:author_id/books/new
+      passenger = Passenger.find_by(id: params[:passenger_id])
+      @trip = passenger.trips.new
+      
+    else
+      # This is the 'regular' route, /books/new
+      @trip = Trip.new
+    end
   end
   
   def create

From 4b300bc927925afac64e5512514f1187cc3f18d9 Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Thu, 10 Oct 2019 10:33:11 -0700
Subject: [PATCH 34/55] Fixed Nav Routes

---
 app/views/layouts/application.html.erb | 23 ++++++++++++-----------
 app/views/passengers/show.html.erb     |  1 +
 config/routes.rb                       |  2 +-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 0e304d0eb..e70b6139e 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -13,18 +13,19 @@
   <body>
   <nav>
   <section class="dropdown">
-  <a href="../passengers"><button class="dropbtn">Passengers</button></a>
-  <div class="dropdown-content">
-    <a href="../passengers/new">Add Passenger</a>
-  </div>
-</div>
+    <%= button_to "Passengers", passengers_path, :method => "get" %>
+      <section class="dropdown-content">
+        <%= button_to "Add Passenger", new_passenger_path, :method => "get" %>
+      </section>
+  </section>
 
-<section class="dropdown">
-  <a href="../drivers"><button class="dropbtn">Drivers</button></a>
-  <div class="dropdown-content">
-    <a href="../drivers/new">Add Driver</a>
-  </div>
-</div>
+  <section class="dropdown">
+  <%= button_to "Drivers", drivers_path, :method => "get" %>
+    <section class="dropdown-content">
+      <%= button_to "Add Driver", new_driver_path, :method => "get" %>
+    </section>
+  </section>
+  
   </nav>
     <%= yield %>
   </body>
diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb
index d95f2ac5d..72efa8140 100644
--- a/app/views/passengers/show.html.erb
+++ b/app/views/passengers/show.html.erb
@@ -14,4 +14,5 @@
 <p><%= link_to "Edit Trip", edit_trip_path %></p>
 <% end %>
 
+<p><%= link_to "Add New Trip", new_trip_path %></p>
 <p><%= link_to "Return to Passenger List", passengers_path %></p>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index bec99b86e..76a97cd0e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -8,7 +8,7 @@
   resources :drivers
   resources :trips
   
-  root 'books#index'
+  #root 'books#index'
   
   # resources :books #, except: [:index]
   

From 56ae6d276cad56240581323aff30e34bdb4639a6 Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Thu, 10 Oct 2019 10:36:31 -0700
Subject: [PATCH 35/55] Fixed Add Trip to Passenger Path

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

diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb
index 72efa8140..e5119274f 100644
--- a/app/views/passengers/show.html.erb
+++ b/app/views/passengers/show.html.erb
@@ -14,5 +14,5 @@
 <p><%= link_to "Edit Trip", edit_trip_path %></p>
 <% end %>
 
-<p><%= link_to "Add New Trip", new_trip_path %></p>
+<p><%= link_to "Add New Trip", new_passenger_trip_path(@passenger.id) %></p>
 <p><%= link_to "Return to Passenger List", passengers_path %></p>
\ No newline at end of file

From 9102fb55d3e8b5e845581881ecc5d5a4aad13632 Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Thu, 10 Oct 2019 13:35:40 -0700
Subject: [PATCH 36/55] Fixed Routing Errors, Still working on cost - bugs
 exist

---
 app/controllers/passengers_controller.rb |  2 +-
 app/controllers/trips_controller.rb      | 21 +++++++++++++++++++--
 app/models/passenger.rb                  |  2 +-
 app/views/passengers/show.html.erb       |  5 +++--
 app/views/trips/_form.html.erb           | 18 +++++++++++++-----
 5 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb
index 5849fae62..6f00e382a 100644
--- a/app/controllers/passengers_controller.rb
+++ b/app/controllers/passengers_controller.rb
@@ -27,7 +27,7 @@ def update
     
     @passenger = Passenger.find_by(id: params[:id])
     if @passenger.update(passenger_params)
-      redirect_to passengers_path # go to the index so we can see the book in the list
+      redirect_to passenger_path(@passenger.id) # go to the index so we can see the book in the list
       return
     else # save failed :(
       render :edit # show the new book form view again
diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb
index 59c63c62b..a15010e0b 100644
--- a/app/controllers/trips_controller.rb
+++ b/app/controllers/trips_controller.rb
@@ -28,7 +28,7 @@ def update
     
     @trip = Trip.find_by(id: params[:id])
     if @trip.update(trip_params)
-      redirect_to trips_path # go to the index so we can see the book in the list
+      redirect_to passenger_path(@trip.passenger_id) # go to the index so we can see the book in the list
       return
     else # save failed :(
       render :edit # show the new book form view again
@@ -36,6 +36,7 @@ def update
     end
   end
   
+  
   def new
     if params[:passenger_id]
       # This is the nested route, /author/:author_id/books/new
@@ -52,7 +53,7 @@ def create
     #Handle Validation Errors
     @trip = Trip.new(trip_params) #instantiate a new book
     if @trip.save # save returns true if the database insert succeeds
-      redirect_to passenger_path(trip_params.passenger_id) # go to the index so we can see the book in the list
+      redirect_to passenger_path(params[:passenger_id]) # go to the index so we can see the book in the list
       return
     else # save failed :(
       render :new # show the new book form view again
@@ -60,6 +61,22 @@ def create
     end
   end
   
+  def destroy
+    trip_id = params[:id]
+    passenger_id = params[:passenger_id]
+    @trip = Trip.find_by(id: trip_id)
+    
+    if @trip.nil?
+      head :not_found
+      return
+    end
+    
+    @trip.destroy
+    
+    redirect_to passenger_path(@trip.passenger_id)
+    return
+  end
+  
   private
   
   def trip_params
diff --git a/app/models/passenger.rb b/app/models/passenger.rb
index 01c04de49..136603bc6 100644
--- a/app/models/passenger.rb
+++ b/app/models/passenger.rb
@@ -8,7 +8,7 @@ class Passenger < ApplicationRecord
   def total_spent
     total = 0
     self.trips.each do |trip|
-      total += trip.cost
+      total += trip.cost.to_f
     end
     total = total * 0.10
     return total
diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb
index e5119274f..64a7ef672 100644
--- a/app/views/passengers/show.html.erb
+++ b/app/views/passengers/show.html.erb
@@ -10,8 +10,9 @@
 <h3>Date: <%= trip.date %></h3>
 <h3>Driver ID: <%= trip.driver.id %></h3>
 <h3>Rating: <%= trip.rating %></h3>
-<h3>Cost: $<%=(trip.cost * 0.10).round(2) %></h3>
-<p><%= link_to "Edit Trip", edit_trip_path %></p>
+<h3>Cost: $<%= trip.cost%></h3>
+<p><%= link_to "Edit Trip Rating", edit_trip_path(trip.id) %></p>
+<p><%= link_to "Delete Trip", trip_path(trip.id), method: :delete, data: {confirm: "Are you sure?"}%></p>
 <% end %>
 
 <p><%= link_to "Add New Trip", new_passenger_trip_path(@passenger.id) %></p>
diff --git a/app/views/trips/_form.html.erb b/app/views/trips/_form.html.erb
index cb9e8c5c6..f488b67a0 100644
--- a/app/views/trips/_form.html.erb
+++ b/app/views/trips/_form.html.erb
@@ -13,15 +13,21 @@
 
 <%= form_with model: @trip, class: 'create-trip' do |f| %>
 
-<%= f.label :date, "Date: " %>
-<%= f.date_field :date %>
+<% if @trip.date.nil? %>
+  <%= f.label :date %>
+  <%= f.date_field :date %>
+<% else %>
+<%= hidden_field_tag 'date', @trip.date%>
+<%= f.hidden_field :date %>
+Date: <%= @trip.date %>
+<% end %>
 
 <% if @trip.passenger.nil? %>
   <%= f.label :passenger_id %>
   <%= f.select :passenger_id, Passenger.all.map{ |passenger| [passenger.name, passenger.id] } %>
 <% else %>
   <%= f.hidden_field :passenger_id %>
-  <%= hidden_field_tag 'passenger_id', @trip.passenger.id  %>
+  <%= hidden_field_tag 'passenger_id', @trip.passenger.id  %> 
   Passenger: <%= @trip.passenger.name %>
 <% end %>
 
@@ -37,8 +43,10 @@
 <%= f.label :rating, "Rating: " %>
 <%= f.select :rating, [' ', '1', '2', '3', '4', '5']%>
 
-<%= f.label :date, "Cost: $" %>
-<%= f.text_field :cost %>
+
+  <%= f.label :cost, "Cost: $" %>
+  <%= f.number_field :cost %>
+
 
 <%= f.submit "Save Trip", class: "trip-save" %>
 <% end %>

From 306d4745c916f91a36a0ae1cb7b81c8bd1ca86be Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Thu, 10 Oct 2019 14:01:36 -0700
Subject: [PATCH 37/55] Fixed Cost Update Error

---
 app/controllers/trips_controller.rb | 3 +--
 app/views/trips/_form.html.erb      | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb
index a15010e0b..9a4e8f564 100644
--- a/app/controllers/trips_controller.rb
+++ b/app/controllers/trips_controller.rb
@@ -36,7 +36,6 @@ def update
     end
   end
   
-  
   def new
     if params[:passenger_id]
       # This is the nested route, /author/:author_id/books/new
@@ -80,6 +79,6 @@ def destroy
   private
   
   def trip_params
-    return params.require(:trip).permit(:trip_id, :date, :passenger_id, :driver_id, :price, :rating)
+    return params.require(:trip).permit(:trip_id, :date, :passenger_id, :driver_id, :cost, :rating)
   end
 end
diff --git a/app/views/trips/_form.html.erb b/app/views/trips/_form.html.erb
index f488b67a0..6ad484ec8 100644
--- a/app/views/trips/_form.html.erb
+++ b/app/views/trips/_form.html.erb
@@ -44,8 +44,8 @@ Date: <%= @trip.date %>
 <%= f.select :rating, [' ', '1', '2', '3', '4', '5']%>
 
 
-  <%= f.label :cost, "Cost: $" %>
-  <%= f.number_field :cost %>
+<%= f.label :cost, "Cost: $" %>
+<%= f.number_field :cost %>
 
 
 <%= f.submit "Save Trip", class: "trip-save" %>

From d2bb0c83b37e1d26fc888a298ea06f1f98330fc1 Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Thu, 10 Oct 2019 14:45:07 -0700
Subject: [PATCH 38/55] Generates Random Amount to Charge

---
 app/models/passenger.rb            |  2 +-
 app/views/passengers/show.html.erb |  2 +-
 app/views/trips/_form.html.erb     | 13 ++++++++++---
 app/views/trips/show.html.erb      |  2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/models/passenger.rb b/app/models/passenger.rb
index 136603bc6..2fb59cde7 100644
--- a/app/models/passenger.rb
+++ b/app/models/passenger.rb
@@ -10,7 +10,7 @@ def total_spent
     self.trips.each do |trip|
       total += trip.cost.to_f
     end
-    total = total * 0.10
+    # total = total * 0.10
     return total
   end
   
diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb
index 64a7ef672..54994a7c0 100644
--- a/app/views/passengers/show.html.erb
+++ b/app/views/passengers/show.html.erb
@@ -8,7 +8,7 @@
 <% @passenger.trips.each do |trip| %>
 <h2>Trip ID: <%= trip.id %></h2>
 <h3>Date: <%= trip.date %></h3>
-<h3>Driver ID: <%= trip.driver.id %></h3>
+<h3>Driver: <%= trip.driver.name %></h3>
 <h3>Rating: <%= trip.rating %></h3>
 <h3>Cost: $<%= trip.cost%></h3>
 <p><%= link_to "Edit Trip Rating", edit_trip_path(trip.id) %></p>
diff --git a/app/views/trips/_form.html.erb b/app/views/trips/_form.html.erb
index 6ad484ec8..8cca25984 100644
--- a/app/views/trips/_form.html.erb
+++ b/app/views/trips/_form.html.erb
@@ -43,9 +43,16 @@ Date: <%= @trip.date %>
 <%= f.label :rating, "Rating: " %>
 <%= f.select :rating, [' ', '1', '2', '3', '4', '5']%>
 
-
-<%= f.label :cost, "Cost: $" %>
-<%= f.number_field :cost %>
+<% if @trip.cost.nil?%>
+  <%  random_cost = rand(100..500) %>
+  <%= f.hidden_field :cost, :value => random_cost %></p> 
+  <%= hidden_field_tag 'cost', random_cost %>
+  Cost: $<%= random_cost %>
+<% else %>
+  <%= f.hidden_field :cost %>
+  <%= hidden_field_tag 'cost', @trip.cost %>
+  Cost: $<%= @trip.cost %>
+<% end %>
 
 
 <%= f.submit "Save Trip", class: "trip-save" %>
diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb
index 6d6134342..3c8056f0b 100644
--- a/app/views/trips/show.html.erb
+++ b/app/views/trips/show.html.erb
@@ -5,7 +5,7 @@
 <h3>Passenger ID: <%= @trip.passenger.id %></h3>
 <h3>Passenger: <%= @trip.passenger.name %></h3>
 <h3>Rating: <%= @trip.rating %></h3>
-<h3>Cost: <%= @trip.cost %></h3>
+<h3>Cost: <%= (@trip.cost)*.10 %></h3>
 
 <p><%= link_to "Edit Trip", edit_trip_path %></p>
 <p><%= link_to "Delete", trip_path(@trip), method: :delete, data: {confirm: "Are you sure?"}%></p>

From bafd4d97cd7c8351c8fb08ca7692e7cbae7c7b0c Mon Sep 17 00:00:00 2001
From: ohcloud <cloudylopez@icloud.com>
Date: Thu, 10 Oct 2019 14:52:22 -0700
Subject: [PATCH 39/55] CONTROLLER TESTS FINISHED AND PASSING

---
 app/controllers/drivers_controller.rb       | 12 ++-
 test/controllers/drivers_controller_test.rb | 97 +++++++++++----------
 2 files changed, 59 insertions(+), 50 deletions(-)

diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb
index 0ae4268b5..a8e7ca021 100644
--- a/app/controllers/drivers_controller.rb
+++ b/app/controllers/drivers_controller.rb
@@ -30,7 +30,8 @@ def create
   def edit
     @driver = Driver.find_by(id: params[:id])
     if @driver.nil?
-      head :not_found
+      redirect_to driver_path
+      # head :not_found
       return
     end
   end
@@ -38,11 +39,16 @@ def edit
   def update
     #Handle Validation Errors
     @driver = Driver.find_by(id: params[:id])
+    if @driver.nil? 
+      head :not_found
+      return
+      #anytime we do a head or render or redirect
+    end
     if @driver.update(driver_params)
-      redirect_to driver_path
+      redirect_to driver_path(params)
       return
     else
-      render :edit
+      render driver_path
     end
   end
   
diff --git a/test/controllers/drivers_controller_test.rb b/test/controllers/drivers_controller_test.rb
index b455450b1..b22b067c7 100644
--- a/test/controllers/drivers_controller_test.rb
+++ b/test/controllers/drivers_controller_test.rb
@@ -51,27 +51,28 @@
     end
   end
   
-  xit "does not create a driver If the form data violates Driver validations, and responds with a redirect" do
-    # Note: This will not pass Until ActiveRecord Validations lesson
-    # Arrange
-    # Set up the form data so that it violates Driver validations
-    
-    # Act-Assert
-    # Ensure that there is no change in Driver.count
-    
-    # Assert
-    # Check that the controller redirects
-    
-  end
+  # xit "does not create a driver If the form data violates Driver validations, and responds with a redirect" do
+  #   # Note: This will not pass Until ActiveRecord Validations lesson
+  #   # Arrange
+  #   # Set up the form data so that it violates Driver validations
+  
+  #   # Act-Assert
+  #   # Ensure that there is no change in Driver.count
+  
+  #   # Assert
+  #   # Check that the controller redirects
+  
+  # end
   
   
   describe "edit" do
+    #this is being a butthead
+    #get form only
     it "responds with success when getting the edit page for an existing, valid driver" do
       # Arrange
-      # Ensure there is an existing driver saved
-      
+      # Ensure there is an existing driver save
       # Act
-      get edit_driver_path(driver.id)
+      get edit_driver_path(Driver.first.id)
       # Assert
       must_respond_with :success
     end
@@ -81,7 +82,7 @@
       # Ensure there is an invalid id that points to no driver
       driver_id = -1
       # Act
-      get edit_driver_path(driver.id)
+      get edit_driver_path(driver_id)
       # Assert
       must_respond_with :redirect
     end
@@ -112,6 +113,7 @@
     end
   end
   
+  # this is being a butthead
   it "does not update any driver if given an invalid id, and responds with a 404" do
     driver_hash = {
       driver: {
@@ -121,51 +123,52 @@
         model: "prius"
       }
     }
-    expect {
-      post drivers_path, params: driver_hash
-    }.must_differ 'Driver.count', -1
-    must_redirect_to drivers_path
-  end
-  
-  xit "does not create a driver If the form data violates Driver validations, and responds with a redirect" do
-    # Note: This will not pass Until ActiveRecord Validations lesson
-    # Arrange
-    # Ensure there is an existing driver saved
-    # Assign the existing driver's id to a local variable
-    # Set up the form data so that it violates Driver validations
+    invalid_id = -1
     
-    # Act-Assert
-    # Ensure that there is no change in Driver.count
-    
-    # Assert
-    # Check that the controller redirects
+    patch driver_path(invalid_id), params: driver_hash
+    must_respond_with :not_found
+    #{only if var changes or raises error}
   end
+  
+  # xit "does not create a driver If the form data violates Driver validations, and responds with a redirect" do
+  #   # Note: This will not pass Until ActiveRecord Validations lesson
+  #   # Arrange
+  #   # Ensure there is an existing driver saved
+  #   # Assign the existing driver's id to a local variable
+  #   # Set up the form data so that it violates Driver validations
+  
+  #   # Act-Assert
+  #   # Ensure that there is no change in Driver.count
+  
+  #   # Assert
+  #   # Check that the controller redirects
+  # end
 end
 
-describe "destroy" do
+describe "destroy" do 
   it "destroys the driver instance in db when driver exists, then redirects" do
     # Arrange
     # Ensure there is an existing driver saved
     new_driver = Driver.create(name: "Bill Gates", vin: "234834978", make: "Toyota", model: "Prius")
     # Act-Assert
-    # Ensure that there is a change of -1 in Driver.count
-    expect { delete_driver_path(new_driver.id) }.must_change "Driver Count", -1
+    #Ensure that there is a change of -1 in Driver.count
+    expect {delete driver_path(new_driver.id)}.must_differ 'Driver.count', -1
     # Assert
     # Check that the controller redirects
     must_respond_with :redirect
     must_redirect_to drivers_path
   end
   
-  xit "does not change the db when the driver does not exist, then responds with " do
-    # Arrange
-    # Ensure there is an invalid id that points to no driver
-    
-    # Act-Assert
-    # Ensure that there is no change in Driver.count
-    
-    # Assert
-    # Check that the controller responds or redirects with whatever your group decides
-    
-  end
+  # xit "does not change the db when the driver does not exist, then responds with " do
+  #   # Arrange
+  #   # Ensure there is an invalid id that points to no driver
+  
+  #   # Act-Assert
+  #   # Ensure that there is no change in Driver.count
+  
+  #   # Assert
+  #   # Check that the controller responds or redirects with whatever your group decides
+  
+  # end
 end
 

From f17339f6e62c6d0db66c5fb93d7ce3e06932731f Mon Sep 17 00:00:00 2001
From: ohcloud <cloudylopez@icloud.com>
Date: Thu, 10 Oct 2019 15:24:37 -0700
Subject: [PATCH 40/55] created homepage controller and realized thats wrong,
 recreated homepageS controller

---
 app/assets/javascripts/homepage.js            | 2 ++
 app/assets/javascripts/homepages.js           | 2 ++
 app/assets/stylesheets/homepage.scss          | 3 +++
 app/assets/stylesheets/homepages.scss         | 3 +++
 app/controllers/homepages_controller.rb       | 2 ++
 app/helpers/homepage_helper.rb                | 2 ++
 app/helpers/homepages_helper.rb               | 2 ++
 test/controllers/homepages_controller_test.rb | 8 +++-----
 8 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 app/assets/javascripts/homepage.js
 create mode 100644 app/assets/javascripts/homepages.js
 create mode 100644 app/assets/stylesheets/homepage.scss
 create mode 100644 app/assets/stylesheets/homepages.scss
 create mode 100644 app/controllers/homepages_controller.rb
 create mode 100644 app/helpers/homepage_helper.rb
 create mode 100644 app/helpers/homepages_helper.rb

diff --git a/app/assets/javascripts/homepage.js b/app/assets/javascripts/homepage.js
new file mode 100644
index 000000000..dee720fac
--- /dev/null
+++ b/app/assets/javascripts/homepage.js
@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.
diff --git a/app/assets/javascripts/homepages.js b/app/assets/javascripts/homepages.js
new file mode 100644
index 000000000..dee720fac
--- /dev/null
+++ b/app/assets/javascripts/homepages.js
@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.
diff --git a/app/assets/stylesheets/homepage.scss b/app/assets/stylesheets/homepage.scss
new file mode 100644
index 000000000..9027e07a0
--- /dev/null
+++ b/app/assets/stylesheets/homepage.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the homepage 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/homepages.scss b/app/assets/stylesheets/homepages.scss
new file mode 100644
index 000000000..e42583ae8
--- /dev/null
+++ b/app/assets/stylesheets/homepages.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the homepages 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/homepages_controller.rb b/app/controllers/homepages_controller.rb
new file mode 100644
index 000000000..8663bd848
--- /dev/null
+++ b/app/controllers/homepages_controller.rb
@@ -0,0 +1,2 @@
+class HomepagesController < ApplicationController
+end
diff --git a/app/helpers/homepage_helper.rb b/app/helpers/homepage_helper.rb
new file mode 100644
index 000000000..c5bbfe518
--- /dev/null
+++ b/app/helpers/homepage_helper.rb
@@ -0,0 +1,2 @@
+module HomepageHelper
+end
diff --git a/app/helpers/homepages_helper.rb b/app/helpers/homepages_helper.rb
new file mode 100644
index 000000000..4bd8098f3
--- /dev/null
+++ b/app/helpers/homepages_helper.rb
@@ -0,0 +1,2 @@
+module HomepagesHelper
+end
diff --git a/test/controllers/homepages_controller_test.rb b/test/controllers/homepages_controller_test.rb
index 9dd7648db..cef86edea 100644
--- a/test/controllers/homepages_controller_test.rb
+++ b/test/controllers/homepages_controller_test.rb
@@ -1,9 +1,7 @@
 require "test_helper"
 
 describe HomepagesController do
-  it "can get the homepage" do
-    get root_path
-
-    must_respond_with :success
-  end
+  # it "does a thing" do
+  #   value(1+1).must_equal 2
+  # end
 end

From e452aa7b05590daddbccf91de862e15aa6333029 Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Thu, 10 Oct 2019 15:26:57 -0700
Subject: [PATCH 41/55] Automatically Adds Trip

---
 app/controllers/trips_controller.rb | 8 +++++++-
 app/models/trip.rb                  | 5 +++++
 app/views/passengers/show.html.erb  | 2 +-
 app/views/trips/_form.html.erb      | 4 ++--
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb
index 9a4e8f564..1e22214dd 100644
--- a/app/controllers/trips_controller.rb
+++ b/app/controllers/trips_controller.rb
@@ -50,7 +50,13 @@ def new
   
   def create
     #Handle Validation Errors
-    @trip = Trip.new(trip_params) #instantiate a new book
+    generated_trips_params = {
+      date: Time.now, 
+      passenger_id: params[:passenger_id], 
+      driver_id: 1,
+      cost: 5
+    }
+    @trip = Trip.new(generated_trips_params) #instantiate a new book
     if @trip.save # save returns true if the database insert succeeds
       redirect_to passenger_path(params[:passenger_id]) # go to the index so we can see the book in the list
       return
diff --git a/app/models/trip.rb b/app/models/trip.rb
index aedb3cc01..cfc57ba3b 100644
--- a/app/models/trip.rb
+++ b/app/models/trip.rb
@@ -4,4 +4,9 @@ class Trip < ApplicationRecord
   
   #Validation Code
   
+  def trip_cost
+    random_cost = (rand(100.00..500.99)).round(2)
+    return random_cost
+  end
+  
 end
diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb
index 54994a7c0..147754e9c 100644
--- a/app/views/passengers/show.html.erb
+++ b/app/views/passengers/show.html.erb
@@ -15,5 +15,5 @@
 <p><%= link_to "Delete Trip", trip_path(trip.id), method: :delete, data: {confirm: "Are you sure?"}%></p>
 <% end %>
 
-<p><%= link_to "Add New Trip", new_passenger_trip_path(@passenger.id) %></p>
+<p><%= link_to "Add New Trip", passenger_trips_path(@passenger.id), method: :post %></p>
 <p><%= link_to "Return to Passenger List", passengers_path %></p>
\ No newline at end of file
diff --git a/app/views/trips/_form.html.erb b/app/views/trips/_form.html.erb
index 8cca25984..aea89f587 100644
--- a/app/views/trips/_form.html.erb
+++ b/app/views/trips/_form.html.erb
@@ -44,9 +44,9 @@ Date: <%= @trip.date %>
 <%= f.select :rating, [' ', '1', '2', '3', '4', '5']%>
 
 <% if @trip.cost.nil?%>
-  <%  random_cost = rand(100..500) %>
+  <% random_cost = @trip.trip_cost %>
   <%= f.hidden_field :cost, :value => random_cost %></p> 
-  <%= hidden_field_tag 'cost', random_cost %>
+  <%= hidden_field_tag 'cost', @trip.cost %>
   Cost: $<%= random_cost %>
 <% else %>
   <%= f.hidden_field :cost %>

From f51d2828772423114164505c6a95913db4af0fdb Mon Sep 17 00:00:00 2001
From: ohcloud <cloudylopez@icloud.com>
Date: Thu, 10 Oct 2019 15:35:23 -0700
Subject: [PATCH 42/55] fixed drivers edit page to save and route properly

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

diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb
index a8e7ca021..5b079cde4 100644
--- a/app/controllers/drivers_controller.rb
+++ b/app/controllers/drivers_controller.rb
@@ -45,7 +45,7 @@ def update
       #anytime we do a head or render or redirect
     end
     if @driver.update(driver_params)
-      redirect_to driver_path(params)
+      redirect_to driver_path(@driver.id)
       return
     else
       render driver_path

From 8132ec47c684daaab6c3482ceaa166a19b399222 Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Thu, 10 Oct 2019 16:00:37 -0700
Subject: [PATCH 43/55] Added Homepage Route

---
 app/controllers/homepages_controller.rb |  4 ++++
 app/views/drivers/_form.html.erb        |  1 +
 app/views/homepages/index.html.erb      |  1 +
 config/routes.rb                        | 10 +++++-----
 4 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 app/views/homepages/index.html.erb

diff --git a/app/controllers/homepages_controller.rb b/app/controllers/homepages_controller.rb
index 8663bd848..675c43707 100644
--- a/app/controllers/homepages_controller.rb
+++ b/app/controllers/homepages_controller.rb
@@ -1,2 +1,6 @@
 class HomepagesController < ApplicationController
+  
+  def index
+    
+  end
 end
diff --git a/app/views/drivers/_form.html.erb b/app/views/drivers/_form.html.erb
index 18759fcd0..ff114b6bf 100644
--- a/app/views/drivers/_form.html.erb
+++ b/app/views/drivers/_form.html.erb
@@ -1,3 +1,4 @@
+
 <p>Please provide the following information to <%= verb_name %> be a new drivers in our database:</p>
 
 <%= form_with model: @driver, class: "driver-input" do |f| %>
diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb
new file mode 100644
index 000000000..a3d746c63
--- /dev/null
+++ b/app/views/homepages/index.html.erb
@@ -0,0 +1 @@
+<h1>Welcome to Ride Share Rails</h1>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index bdf64b350..7bac83acf 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,6 +1,6 @@
 Rails.application.routes.draw do
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
-  
+  root 'homepages#index'
   resources :passengers do
     resources :trips
   end
@@ -8,14 +8,14 @@
   resources :drivers
   resources :trips
   
-  #root 'books#index'
+  
   
   # resources :books #, except: [:index]
   
-
+  
   # resources :authors, only: [:index, :show] do
   #   resources :books, only: [:index, :new]
-
+  
   # NOTES FOR REFERENCE: 
   # RESTful Routes Include:
   # Rails.application.routes.draw do
@@ -28,7 +28,7 @@
   # delete "/books/:id" , to: "books#destroy"
   # get "/books/:id/edit" , to: "books#edit", as: :edit_book
   # end
-
+  
 end
 
 

From 50a54ff516b7b25368dfa1adc099f564764838ac Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Thu, 10 Oct 2019 16:40:02 -0700
Subject: [PATCH 44/55] Finished Auto Complete Date for Add Trip, Created Trip
 Views

---
 app/views/layouts/application.html.erb |  8 ++++++++
 app/views/trips/_form.html.erb         |  2 +-
 app/views/trips/edit.html.erb          |  2 ++
 app/views/trips/index.html.erb         | 16 ++++++++++++++++
 app/views/trips/show.html.erb          |  2 +-
 5 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 app/views/trips/index.html.erb

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index e70b6139e..8cc84b476 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -25,6 +25,14 @@
       <%= button_to "Add Driver", new_driver_path, :method => "get" %>
     </section>
   </section>
+
+    <section class="dropdown">
+    <%= button_to "Trip", trips_path, :method => "get" %>
+      <section class="dropdown-content">
+        <%= button_to "Add Trip", new_trip_path, :method => "get" %>
+      </section>
+  </section>
+
   
   </nav>
     <%= yield %>
diff --git a/app/views/trips/_form.html.erb b/app/views/trips/_form.html.erb
index aea89f587..80fe0bb46 100644
--- a/app/views/trips/_form.html.erb
+++ b/app/views/trips/_form.html.erb
@@ -15,7 +15,7 @@
 
 <% if @trip.date.nil? %>
   <%= f.label :date %>
-  <%= f.date_field :date %>
+  <%= f.date_field :date, :value => Time.now.strftime('%Y-%m-%d') %>
 <% else %>
 <%= hidden_field_tag 'date', @trip.date%>
 <%= f.hidden_field :date %>
diff --git a/app/views/trips/edit.html.erb b/app/views/trips/edit.html.erb
index 059737d4c..b5d6e925b 100644
--- a/app/views/trips/edit.html.erb
+++ b/app/views/trips/edit.html.erb
@@ -1,2 +1,4 @@
 
 <%= render(partial: "form", locals: { action_name: "Edit", verb_name: "update" }) %>
+
+
diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb
new file mode 100644
index 000000000..5accc4fb6
--- /dev/null
+++ b/app/views/trips/index.html.erb
@@ -0,0 +1,16 @@
+<h1>Trips</h1>
+<p><%= link_to "Add New Trip", new_trip_path %></p>
+<ul>
+  <% @trips.each do |trip|  %>
+    <li>
+      Trip #: <%= link_to trip.id, trip_path(trip.id) %>
+      Date: <%= trip.date %>
+       Passenger ID:<%= link_to trip.passenger_id, passenger_path(trip.passenger_id) %>
+       Driver ID: <%= link_to trip.driver_id, driver_path(trip.driver_id) %>
+       Rating: <%= trip.rating %>
+       Cost: $<%= trip.cost %>
+       <%= link_to "Edit Trip", edit_trip_path(trip.id) %>
+       <%= link_to "Delete", trip_path(trip.id), method: :delete, data: {confirm: "Are you sure?"}%>
+    </li>
+  <% end %>
+</ul>
\ No newline at end of file
diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb
index 3c8056f0b..324bb57c9 100644
--- a/app/views/trips/show.html.erb
+++ b/app/views/trips/show.html.erb
@@ -5,7 +5,7 @@
 <h3>Passenger ID: <%= @trip.passenger.id %></h3>
 <h3>Passenger: <%= @trip.passenger.name %></h3>
 <h3>Rating: <%= @trip.rating %></h3>
-<h3>Cost: <%= (@trip.cost)*.10 %></h3>
+<h3>Cost: $<%= @trip.cost %></h3>
 
 <p><%= link_to "Edit Trip", edit_trip_path %></p>
 <p><%= link_to "Delete", trip_path(@trip), method: :delete, data: {confirm: "Are you sure?"}%></p>

From cd33c277cc7aa366ff219f49a56beff2f4f746e4 Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Thu, 10 Oct 2019 17:03:56 -0700
Subject: [PATCH 45/55] Changes to Edit

---
 app/views/passengers/show.html.erb |  1 +
 app/views/trips/_form.html.erb     | 13 ++++++++-----
 app/views/trips/show.html.erb      |  3 ++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb
index 147754e9c..b98448ab1 100644
--- a/app/views/passengers/show.html.erb
+++ b/app/views/passengers/show.html.erb
@@ -1,3 +1,4 @@
+@user = "Passenger"
 <h2>Name: <%= @passenger.name %></h2>
 <h3>Phone Number: <%= @passenger.phone_num %></h3>
 <h3>Total Amount Spent: $<%= @passenger.total_spent %>
diff --git a/app/views/trips/_form.html.erb b/app/views/trips/_form.html.erb
index 80fe0bb46..314fb2cd3 100644
--- a/app/views/trips/_form.html.erb
+++ b/app/views/trips/_form.html.erb
@@ -13,7 +13,7 @@
 
 <%= form_with model: @trip, class: 'create-trip' do |f| %>
 
-<% if @trip.date.nil? %>
+<% if @trip.date.nil?  %>
   <%= f.label :date %>
   <%= f.date_field :date, :value => Time.now.strftime('%Y-%m-%d') %>
 <% else %>
@@ -22,7 +22,7 @@
 Date: <%= @trip.date %>
 <% end %>
 
-<% if @trip.passenger.nil? %>
+<% if @trip.passenger.nil?  %>
   <%= f.label :passenger_id %>
   <%= f.select :passenger_id, Passenger.all.map{ |passenger| [passenger.name, passenger.id] } %>
 <% else %>
@@ -31,7 +31,7 @@ Date: <%= @trip.date %>
   Passenger: <%= @trip.passenger.name %>
 <% end %>
 
-<% if @trip.driver.nil? %>
+<% if @trip.driver.nil?  %>
   <%= f.label :driver_id %>
   <%= f.select :driver_id, Driver.all.map{ |driver| [driver.name, driver.id] } %>
 <% else %>
@@ -43,10 +43,13 @@ Date: <%= @trip.date %>
 <%= f.label :rating, "Rating: " %>
 <%= f.select :rating, [' ', '1', '2', '3', '4', '5']%>
 
-<% if @trip.cost.nil?%>
-  <% random_cost = @trip.trip_cost %>
+<% random_cost = @trip.trip_cost %>
+<% if @trip.cost.nil? %>
   <%= f.hidden_field :cost, :value => random_cost %></p> 
   <%= hidden_field_tag 'cost', @trip.cost %>
+<% elsif @user == "trip" %>
+  <% f.label :cost %>
+  <% f.text_field :cost, :value => @trip.cost %>
   Cost: $<%= random_cost %>
 <% else %>
   <%= f.hidden_field :cost %>
diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb
index 324bb57c9..f3f220410 100644
--- a/app/views/trips/show.html.erb
+++ b/app/views/trips/show.html.erb
@@ -1,3 +1,4 @@
+@user = "Trip"
 <h2>Trip ID: <%= @trip.id %></h2>
 <h3>Date: <%= @trip.date %></h3>
 <h3>Driver ID: <%= @trip.driver.id %></h3>
@@ -10,4 +11,4 @@
 <p><%= link_to "Edit Trip", edit_trip_path %></p>
 <p><%= link_to "Delete", trip_path(@trip), method: :delete, data: {confirm: "Are you sure?"}%></p>
 <p><%= link_to "Return to Passenger List", passengers_path %></p>
-<p><%= link_to "Return to Driver List", drivers_path %></p>
\ No newline at end of file
+<p><%= link_to "Return to Driver List", drivers_path %></p>

From 60eb0a81ac55fc020d487ba2c573546149d52099 Mon Sep 17 00:00:00 2001
From: ohcloud <cloudylopez@icloud.com>
Date: Thu, 10 Oct 2019 17:09:27 -0700
Subject: [PATCH 46/55] completed drivers model and show.

---
 app/models/driver.rb            | 26 ++++++++++++++++++++++++--
 app/models/passenger.rb         |  2 +-
 app/views/drivers/show.html.erb | 16 +++++++++++++++-
 3 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/app/models/driver.rb b/app/models/driver.rb
index 66802a867..02b9f5060 100644
--- a/app/models/driver.rb
+++ b/app/models/driver.rb
@@ -2,6 +2,28 @@ class Driver < ApplicationRecord
   has_many :trips
   
   ##Validation Code
-  #validates :name, presence: true;
-  #validates :vin presence: true, uniqueness: true
+  validates :name, presence: true;
+  validates :vin, presence: true, uniqueness: true
+  
+  #logic for drivers total earnings here. 
+  #logic for drivers average rating here. 
+  def average_rating
+    average = 0
+    count = 0 
+    self.trips.each do |trip|
+      average += trip.rating.to_i
+      count += 1
+    end
+    return average / count
+  end
+  
+  def total_earnings
+    total = 0
+    self.trips.each do |trip|
+      total += (trip.cost.to_f - 1.65) * 0.80
+    end
+    # total = total * 0.10
+    return total
+  end
+  
 end
\ No newline at end of file
diff --git a/app/models/passenger.rb b/app/models/passenger.rb
index 2fb59cde7..a69b92f85 100644
--- a/app/models/passenger.rb
+++ b/app/models/passenger.rb
@@ -14,4 +14,4 @@ def total_spent
     return total
   end
   
-end
+end
\ No newline at end of file
diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb
index 775d3de46..d634d7350 100644
--- a/app/views/drivers/show.html.erb
+++ b/app/views/drivers/show.html.erb
@@ -1,12 +1,26 @@
   <h3>Name: <%= @driver.name %></h3>
+  <h3>Average Rating: <%= @driver.average_rating%>
+  <h3>Average Earnings: <%= @driver.total_earnings%>  
+
  <ul>
   <p> Driver Info: </p>
-
   <li>Vin #: <%= @driver.vin %></li>
   <li>Car Make: <%= @driver.make %></li>
   <li>Car Model: <%= @driver.model %></li>
   <li>Status: <%= @driver.active %></li>
   </p>
+
+
   <%= link_to "Edit", edit_driver_path(@driver) %>
   <%= link_to "Delete", driver_path(@driver), method: :delete, data: {confirm: "Are you sure?"}%>
   <p><%= link_to "Return to Drivers List", drivers_path %></p>
+
+
+
+<% @driver.trips.each do |trip| %>
+<h2>Trip ID: <%= trip.id %></h2>
+<h3>Date: <%= trip.date %></h3>
+<h3>Passenger: <%= trip.passenger.name %></h3>
+<h3>Rating: <%= trip.rating %></h3>
+<h3>Cost: $<%= trip.cost%></h3>
+<% end %>
\ No newline at end of file

From 0caa73ab77d005076b756ddb56d2478314209e24 Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Thu, 10 Oct 2019 23:40:38 -0700
Subject: [PATCH 47/55] Added CSS

---
 app/assets/images/header_blue.png         | Bin 0 -> 3516 bytes
 app/assets/images/header_logo.png         | Bin 0 -> 3811 bytes
 app/assets/images/rideshare.png           | Bin 0 -> 17125 bytes
 app/assets/images/skyline_grey.png        | Bin 0 -> 3214 bytes
 app/assets/images/skyline_grey_header.png | Bin 0 -> 2056 bytes
 app/assets/images/title_green.png         | Bin 0 -> 17256 bytes
 app/assets/images/top_corner_logo.png     | Bin 0 -> 5651 bytes
 app/assets/stylesheets/application.css    |  84 +++++++++++++++++++---
 app/assets/stylesheets/homepages.scss     |  10 +++
 app/assets/stylesheets/trips.scss         |  26 +++++++
 app/views/drivers/index.html.erb          |  14 ++--
 app/views/homepages/index.html.erb        |   7 +-
 app/views/layouts/application.html.erb    |  40 ++++++-----
 app/views/passengers/index.html.erb       |  13 ++--
 app/views/trips/index.html.erb            |  35 +++++----
 15 files changed, 173 insertions(+), 56 deletions(-)
 create mode 100644 app/assets/images/header_blue.png
 create mode 100644 app/assets/images/header_logo.png
 create mode 100644 app/assets/images/rideshare.png
 create mode 100644 app/assets/images/skyline_grey.png
 create mode 100644 app/assets/images/skyline_grey_header.png
 create mode 100644 app/assets/images/title_green.png
 create mode 100644 app/assets/images/top_corner_logo.png

diff --git a/app/assets/images/header_blue.png b/app/assets/images/header_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..59553ca4541e6950f5b8fc4ae4cc06a0c0a77e04
GIT binary patch
literal 3516
zcmeH~e^Aq99LJxDx6~ldFvSWj7$Yi32x343f+@~1@SsjzDjdflHNs|y>+lB`UEZu9
z;TjGJ)LmAm2+AT<jJv2ja*m%4V+{g10umwF5jX}t&zn1McTN7TyZy24d!Og^yg%>H
z`}=&in`%o!oZGS|mk~nT#G6D(ge+>MuWd`Xv?9^9`O$iTSoGTK%I;C4eEE{aE3fr+
z$mCVu)*0!0i23@t_8aNO&v>WS$L^JQsYOS31bN4Jsk|~`(#`}m$MaM<$2LE&(P)0v
z>-BdAyvswczSXiP&+v$#dUl1Ij8Djxfu)3`M!S%FjvFD|U_v~o0ahRt)PjBC0r9(Y
zi!(9jf%y+TFLTMO%cBU1mhMo-o?T4H+x@3c$b9J2?Y_FVJ)A@G%jySaIIP}o>gKU}
zskx1hdPAR<KF*y#KJn>V2_Yx>=NoEwE+QmEanoGn%gC*v*_DufFYySZyRG5ui^IK3
zI4%Ntu*BD$kgru-X#{$PM&1g8_NDEm*kK&p3Ba^&q>M=gXSMk=AhYvg9u&HogpV_Y
zpNlN<%*5SyCUUTF*tCne6P4s%g~FLpD|+7uw@4XSw*LUeP!2WE0{qy}0-)-$>m~-s
z_In;@Ep@}MJcpJh+cfiZ+MHYf#Yy221d?c33vW3i6KSk<+n2pH0OfO~@Rsee5umUl
z57P~WWu^m^kDo>B%4f9z554qB0&9K0Q2=iq>$9>L82Ii~JyYzTUQvx?V>c$i<41*M
z@aX!K(2sfah|Ji_HvDz3-VgWYh1*|YC@nu8_h{D%fe>KCa1~Qbn;Fmm{Lrr!7F2r-
zu)vpAmayp?0&klEj_5A|)NP*txMobB$h`JcTzQ5m9=G-U0MIbA0pM@TSHbJVssJ&-
z6kRX_x7AE(F-()sb>#SyWGj!I3W>T3w@@9B@;Ph$qE)$%4RfKtBm|1T+>~R(8}dlp
zLgRtU0Z_C~--lxDz7#0^X*{f93g>!j0vT|tMv)99MaLim(>ezIp*UDwhj`ws%SJrk
z_tYVtsSIl&6iuEHXgQX9cQYFz_h4fL6m3mKP)Lj#!*r8(rhTw*<?k-+{I2&9@|hg9
zdSjt+t_2I#jk8Gjv8She*@8ehp32NAhFVVn81HL>^fB)^B(04rg2`)zo-kRsE{guZ
zMoY^D3NHw}e-Fn=G1B=B1T4cH5YW858v?bv=TG(@hA$wHRLm16g}KP+N6<+haWT*F
z<(gIs6m$G3;P|pRUrhnmObR%@6mxYHNRO6KA;*^s^@pp4`p>&sp#Qw9h5EzQL*}<j
z#qs=hRmbz&RUb0HT`JBf9-I|t6wWCA{k8G`I~BH2+oPO<S3A{QOBVf0M8q2sMCW5t
GKlle3S_LNn

literal 0
HcmV?d00001

diff --git a/app/assets/images/header_logo.png b/app/assets/images/header_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..1694315a8d75e2c8bc100acecfb99b28d14050d5
GIT binary patch
literal 3811
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
Z{{xTDJr%RFk3s+d002ovPDHLkV1g`1K;!@b

literal 0
HcmV?d00001

diff --git a/app/assets/images/rideshare.png b/app/assets/images/rideshare.png
new file mode 100644
index 0000000000000000000000000000000000000000..8144ab22e4f44c988a5e6f4ab51b7b0f3af51d0e
GIT binary patch
literal 17125
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

literal 0
HcmV?d00001

diff --git a/app/assets/images/skyline_grey.png b/app/assets/images/skyline_grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..676f364c1f65702a7f64f6e1150774dabc3943a5
GIT binary patch
literal 3214
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
Ti{=$$xoWqgtHXVwfBb&{Z|<j8

literal 0
HcmV?d00001

diff --git a/app/assets/images/skyline_grey_header.png b/app/assets/images/skyline_grey_header.png
new file mode 100644
index 0000000000000000000000000000000000000000..724ecac16df3d49a953dc9fd1c120b72275dea31
GIT binary patch
literal 2056
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

literal 0
HcmV?d00001

diff --git a/app/assets/images/title_green.png b/app/assets/images/title_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..99ea5c124c9b2b755ec7319db965ee3204a33757
GIT binary patch
literal 17256
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

literal 0
HcmV?d00001

diff --git a/app/assets/images/top_corner_logo.png b/app/assets/images/top_corner_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f3a4387c27119a7a03f99fb7f4a51505cec15ae
GIT binary patch
literal 5651
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

literal 0
HcmV?d00001

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 328ea2695..b881d25ef 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -13,11 +13,45 @@
  *= require_tree .
  *= require_self
  */
+ *{
+  font-family: 'Nunito', sans-serif;
+ }
 nav {
-  padding-bottom: 40px;
+  text-align: right;
+ 
+  
 }
- /* Dropdown Button */
-.dropbtn {
+
+.grid-container{
+  display: grid;
+  grid-template-columns: 80% auto auto auto;
+  align-items: center;
+
+}
+
+.nav_img {
+  grid-column: 1;
+  display: inline;
+  float: left;
+
+}
+
+.dropdown_p {
+  grid-column: 2;
+}
+.dropdown_d {
+  grid-column: 3;
+}
+.dropdown_t {
+  grid-column: 4;
+}
+
+nav section {
+    width: 20%;
+  }
+
+ /*Dropdown Button */
+button {
   background-color: #4CAF50;
   color: white;
   padding: 16px;
@@ -36,7 +70,6 @@ nav {
   display: none;
   position: absolute;
   background-color: #f1f1f1;
-  min-width: 160px;
   box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
   z-index: 1;
 }
@@ -44,16 +77,51 @@ nav {
 /* Links inside the dropdown */
 .dropdown-content a {
   color: black;
-  padding: 12px 16px;
   text-decoration: none;
   display: block;
+  
 }
 
 /* Change color of dropdown links on hover */
 .dropdown-content a:hover {background-color: #ddd;}
 
 /* Show the dropdown menu on hover */
-.dropdown:hover .dropdown-content {display: block;}
-
+.dropdown_p:hover .dropdown-content {display: block; max-width: 75px;}
+.dropdown_t:hover .dropdown-content {display: block; max-width: 75px;}
+.dropdown_d:hover .dropdown-content {display: block; max-width: 75px;}
 /* Change the background color of the dropdown button when the dropdown content is shown */
-.dropdown:hover .dropbtn {background-color: #3e8e41;}
\ No newline at end of file
+.dropdown_p:hover .dropbtn {background-color: #3e8e41;}
+
+
+
+.wrapper_trips {
+  width: 90%;
+  margin-left: 5%;
+
+  justify-items: center;
+  display: grid;
+  grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr;
+  grid-gap: 10px;
+  grid-auto-rows: 20px;
+}
+
+.wrapper_people {
+  width: 90%;
+  margin-left: 5%;
+  justify-items: left;
+  display: flex;
+  max-height: 1600px;
+  flex-direction: column;
+  flex-wrap: wrap;
+}
+
+.heading {
+  width: 80%;
+  display: grid;
+  grid-template-columns: 1fr 4fr;
+  text-align: left;
+  margin-left: 5%;
+
+  align-items: center;
+
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/homepages.scss b/app/assets/stylesheets/homepages.scss
index e42583ae8..ebcd5fec3 100644
--- a/app/assets/stylesheets/homepages.scss
+++ b/app/assets/stylesheets/homepages.scss
@@ -1,3 +1,13 @@
 // Place all the styles related to the homepages controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
+.header_img {
+  margin-top: 5%;
+  text-align: center;
+}
+.footer_img {
+  text-align: center;
+  margin-top: 5%;
+  width: 100%;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/trips.scss b/app/assets/stylesheets/trips.scss
index f1f72ad11..41ce2e5ad 100644
--- a/app/assets/stylesheets/trips.scss
+++ b/app/assets/stylesheets/trips.scss
@@ -1,3 +1,29 @@
 // Place all the styles related to the Trips controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
+.wrapper {
+  width: 90%;
+  margin-left: 5%;
+
+  justify-items: center;
+  display: grid;
+  grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr;
+  grid-gap: 10px;
+  grid-auto-rows: 20px;
+}
+
+.heading {
+  width: 80%;
+  display: grid;
+  grid-template-columns: 1fr 4fr;
+  text-align: left;
+  margin-left: 5%;
+
+  align-items: center;
+
+}
+
+
+
+
diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb
index 7d7b78e2d..4283fe47d 100644
--- a/app/views/drivers/index.html.erb
+++ b/app/views/drivers/index.html.erb
@@ -1,10 +1,8 @@
-<h1>Drivers</h1>
-<ul>
+<section class="heading">
+<h1>Drivers</h1> <%= button_to "Add New Driver", new_driver_path, :method => "get" %>
+</section>
+<div class="wrapper_people">
   <% @drivers.each do |driver|  %>
-    <li>
-      <%= link_to driver.name, driver_path(driver) %>
-      
-    </li>
-
+      <div><%= driver.id %>:<%= link_to driver.name, driver_path(driver) %></div>
   <% end %>
-</ul>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb
index a3d746c63..1ad2503c4 100644
--- a/app/views/homepages/index.html.erb
+++ b/app/views/homepages/index.html.erb
@@ -1 +1,6 @@
-<h1>Welcome to Ride Share Rails</h1>
\ No newline at end of file
+<section class="header_img">
+  <%= image_tag "rideshare.png" %>
+</section>
+<section class="footer_img">
+  <%= image_tag "skyline_grey.png" %>
+</section>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 8cc84b476..2d9a0216b 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -4,37 +4,41 @@
     <title>RideShareRails</title>
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
-
+    <link href="https://fonts.googleapis.com/css?family=Cardo|Fredoka+One|Nunito&display=swap" rel="stylesheet">
     <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
   </head>
 
 
   <body>
-  <nav>
-  <section class="dropdown">
-    <%= button_to "Passengers", passengers_path, :method => "get" %>
-      <section class="dropdown-content">
-        <%= button_to "Add Passenger", new_passenger_path, :method => "get" %>
-      </section>
-  </section>
-
-  <section class="dropdown">
-  <%= button_to "Drivers", drivers_path, :method => "get" %>
-    <section class="dropdown-content">
-      <%= button_to "Add Driver", new_driver_path, :method => "get" %>
+  <nav class="grid-container">
+    <section class="nav_img_text">
+    <%= link_to image_tag("top_corner_logo.png"), root_path %>
+    </section>
+    <section class="dropdown_p">
+      <%= button_to "Passengers", passengers_path, :method => "get" %>
+        <section class="dropdown-content">
+          <%= button_to "Add Passenger", new_passenger_path, :method => "get" %>
+        </section>
     </section>
-  </section>
 
-    <section class="dropdown">
-    <%= button_to "Trip", trips_path, :method => "get" %>
+    <section class="dropdown_d">
+    <%= button_to "Drivers", drivers_path, :method => "get" %>
       <section class="dropdown-content">
-        <%= button_to "Add Trip", new_trip_path, :method => "get" %>
+        <%= button_to "Add Driver", new_driver_path, :method => "get" %>
       </section>
-  </section>
+    </section>
+
+      <section class="dropdown_t">
+      <%= button_to "Trip", trips_path, :method => "get" %>
+        <section class="dropdown-content">
+          <%= button_to "Add Trip", new_trip_path, :method => "get" %>
+        </section>
+    </section>
 
   
   </nav>
+  <hr>
     <%= yield %>
   </body>
 </html>
diff --git a/app/views/passengers/index.html.erb b/app/views/passengers/index.html.erb
index 9ab2b75bc..8526bebf2 100644
--- a/app/views/passengers/index.html.erb
+++ b/app/views/passengers/index.html.erb
@@ -1,9 +1,8 @@
-<h1>Passengers</h1>
-<p><%= link_to "Add New Passenger", new_passenger_path %></p>
-<ul>
+<section class="heading">
+<h1>Passengers</h1> <%= button_to "Add New Passenger", new_passenger_path, :method => "get" %>
+</section>
+<div class="wrapper_people">
   <% @passengers.each do |passenger|  %>
-    <li>
-       <%= link_to passenger.name, passenger_path(passenger) %>
-    </li>
+    <div><%= passenger.id %>:  <%= link_to passenger.name, passenger_path(passenger) %></div>
   <% end %>
-</ul>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb
index 5accc4fb6..d67f8b55e 100644
--- a/app/views/trips/index.html.erb
+++ b/app/views/trips/index.html.erb
@@ -1,16 +1,23 @@
-<h1>Trips</h1>
-<p><%= link_to "Add New Trip", new_trip_path %></p>
-<ul>
+<section class="heading">
+<h1>Trips</h1> <%= button_to "Add Trip", new_trip_path, :method => "get" %>
+</section>
+<div class="wrapper_trips">
+  <div>TRIP #</div>
+  <div>DATE</div>
+  <div>PASSENGER ID</div>
+  <div>DRIVER ID</div>
+  <div>RATING</div>
+  <div>COST</div>
+  <div>EDIT</div>
+  <div>DELETE</div>
   <% @trips.each do |trip|  %>
-    <li>
-      Trip #: <%= link_to trip.id, trip_path(trip.id) %>
-      Date: <%= trip.date %>
-       Passenger ID:<%= link_to trip.passenger_id, passenger_path(trip.passenger_id) %>
-       Driver ID: <%= link_to trip.driver_id, driver_path(trip.driver_id) %>
-       Rating: <%= trip.rating %>
-       Cost: $<%= trip.cost %>
-       <%= link_to "Edit Trip", edit_trip_path(trip.id) %>
-       <%= link_to "Delete", trip_path(trip.id), method: :delete, data: {confirm: "Are you sure?"}%>
-    </li>
+      <div><%= link_to trip.id, trip_path(trip.id) %></div>
+      <div><%= trip.date %></div>
+       <div><%= link_to trip.passenger_id, passenger_path(trip.passenger_id) %></div>
+       <div><%= link_to trip.driver_id, driver_path(trip.driver_id) %></div>
+       <div><%= trip.rating %></div>
+       <div>$ <%= trip.cost %></div>
+       <div><%= link_to "Edit Trip", edit_trip_path(trip.id) %></div>
+       <div><%= link_to "Delete", trip_path(trip.id), method: :delete, data: {confirm: "Are you sure?"}%></div>
   <% end %>
-</ul>
\ No newline at end of file
+  </div>
\ No newline at end of file

From 16230d91c59aa350a001129160b6d0dbd0e98cb5 Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Fri, 11 Oct 2019 00:00:44 -0700
Subject: [PATCH 48/55] Further CSS changes

---
 app/assets/stylesheets/application.css | 10 ++++++++++
 app/assets/stylesheets/passengers.scss | 10 ++++++++++
 app/assets/stylesheets/trips.scss      | 11 +++++++++++
 app/views/drivers/show.html.erb        | 22 +++++++++++++++-------
 app/views/passengers/show.html.erb     | 25 ++++++++++++++++---------
 app/views/trips/show.html.erb          |  1 -
 6 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index b881d25ef..8487f623c 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -105,6 +105,16 @@ button {
   grid-auto-rows: 20px;
 }
 
+.wrapper_pd_trips {
+  width: 90%;
+  margin-left: 5%;
+  justify-items: center;
+  display: grid;
+  grid-template-columns: 1fr 1fr 2fr 1fr 1fr 1fr 1fr;
+  grid-gap: 10px;
+  grid-auto-rows: 20px;
+}
+
 .wrapper_people {
   width: 90%;
   margin-left: 5%;
diff --git a/app/assets/stylesheets/passengers.scss b/app/assets/stylesheets/passengers.scss
index 0e27942f7..b1127a635 100644
--- a/app/assets/stylesheets/passengers.scss
+++ b/app/assets/stylesheets/passengers.scss
@@ -1,3 +1,13 @@
 // Place all the styles related to the Passengers controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
+.wrapper_passenger_trips {
+  width: 90%;
+  margin-left: 5%;
+  justify-items: center;
+  display: grid;
+  grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr;
+  grid-gap: 10px;
+  grid-auto-rows: 20px;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/trips.scss b/app/assets/stylesheets/trips.scss
index 41ce2e5ad..df36bae3a 100644
--- a/app/assets/stylesheets/trips.scss
+++ b/app/assets/stylesheets/trips.scss
@@ -24,6 +24,17 @@
 
 }
 
+.wrapper_passenger_trips {
+  width: 90%;
+  margin-left: 5%;
+
+  justify-items: center;
+  display: grid;
+  grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr;
+  grid-gap: 10px;
+  grid-auto-rows: 20px;
+}
+
 
 
 
diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb
index d634d7350..6c29236f9 100644
--- a/app/views/drivers/show.html.erb
+++ b/app/views/drivers/show.html.erb
@@ -15,12 +15,20 @@
   <%= link_to "Delete", driver_path(@driver), method: :delete, data: {confirm: "Are you sure?"}%>
   <p><%= link_to "Return to Drivers List", drivers_path %></p>
 
-
-
+<div class="wrapper_pd_trips">
+<div>TRIP ID</div>
+<div>DATE</div>
+<div>PASSENGER</div>
+<div>RATING</div>
+<div>COST</div>
+<div>EDIT</div>
+<div>DELETE</div>
 <% @driver.trips.each do |trip| %>
-<h2>Trip ID: <%= trip.id %></h2>
-<h3>Date: <%= trip.date %></h3>
-<h3>Passenger: <%= trip.passenger.name %></h3>
-<h3>Rating: <%= trip.rating %></h3>
-<h3>Cost: $<%= trip.cost%></h3>
+<div><%= trip.id %></div>
+<div><%= trip.date %></div>
+<div><%= trip.passenger.name %></div>
+<div><%= trip.rating %></div>
+<div>$<%= trip.cost%></div>
+<div><%= link_to "Edit Trip", edit_trip_path(trip.id) %></div>
+<div><%= link_to "Delete Trip", trip_path(trip.id), method: :delete, data: {confirm: "Are you sure?"}%></div>
 <% end %>
\ No newline at end of file
diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb
index b98448ab1..74a47d868 100644
--- a/app/views/passengers/show.html.erb
+++ b/app/views/passengers/show.html.erb
@@ -1,20 +1,27 @@
-@user = "Passenger"
 <h2>Name: <%= @passenger.name %></h2>
 <h3>Phone Number: <%= @passenger.phone_num %></h3>
 <h3>Total Amount Spent: $<%= @passenger.total_spent %>
 
 <p><%= link_to "Edit Passenger", edit_passenger_path %></p>
 <p><%= link_to "Delete Passenger", passenger_path(@passenger), method: :delete, data: {confirm: "Are you sure?"}%></p>
-
+<div class="wrapper_pd_trips">
+<div>TRIP ID</div>
+<div>DATE</div>
+<div>DRIVER</div>
+<div>RATING</div>
+<div>COST</div>
+<div>EDIT</div>
+<div>DELETE</div>
 <% @passenger.trips.each do |trip| %>
-<h2>Trip ID: <%= trip.id %></h2>
-<h3>Date: <%= trip.date %></h3>
-<h3>Driver: <%= trip.driver.name %></h3>
-<h3>Rating: <%= trip.rating %></h3>
-<h3>Cost: $<%= trip.cost%></h3>
-<p><%= link_to "Edit Trip Rating", edit_trip_path(trip.id) %></p>
-<p><%= link_to "Delete Trip", trip_path(trip.id), method: :delete, data: {confirm: "Are you sure?"}%></p>
+<div><%= trip.id %></div>
+<div><%= trip.date %></div>
+<div><%= trip.driver.name %></div>
+<div><%= trip.rating %></div>
+<div>$<%= trip.cost%></div>
+<div><%= link_to "Edit Trip Rating", edit_trip_path(trip.id) %></div>
+<div><%= link_to "Delete Trip", trip_path(trip.id), method: :delete, data: {confirm: "Are you sure?"}%></div>
 <% end %>
+</div>
 
 <p><%= link_to "Add New Trip", passenger_trips_path(@passenger.id), method: :post %></p>
 <p><%= link_to "Return to Passenger List", passengers_path %></p>
\ No newline at end of file
diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb
index f3f220410..5db989412 100644
--- a/app/views/trips/show.html.erb
+++ b/app/views/trips/show.html.erb
@@ -1,4 +1,3 @@
-@user = "Trip"
 <h2>Trip ID: <%= @trip.id %></h2>
 <h3>Date: <%= @trip.date %></h3>
 <h3>Driver ID: <%= @trip.driver.id %></h3>

From db7036bcbabdc67fd099aa6fcaf2f475ab6159ef Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Fri, 11 Oct 2019 09:59:50 -0700
Subject: [PATCH 49/55] Adding Basic Test Outline

---
 test/controllers/trips_controller_test.rb | 24 ++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/test/controllers/trips_controller_test.rb b/test/controllers/trips_controller_test.rb
index 59455c041..ab0d33dd8 100644
--- a/test/controllers/trips_controller_test.rb
+++ b/test/controllers/trips_controller_test.rb
@@ -2,21 +2,35 @@
 
 describe TripsController do
   describe "show" do
-    # Your tests go here
+    it 'responds with a success when id given exists' do
+      
+      valid_trip = Trip.create(date: Time.now, passenger_id: 1, driver_id: 1, rating: nil, cost: 5)
+      
+      get trip_path(valid_trip.id)
+      must_respond_with :success
+      
+    end
+    
+    # it 'responds with a not_found when id given does not exist' do
+    
+    #   get passenger_path("5000")
+    #   must_respond_with :not_found
+    
+    # end
   end
-
+  
   describe "create" do
     # Your tests go here
   end
-
+  
   describe "edit" do
     # Your tests go here
   end
-
+  
   describe "update" do
     # Your tests go here
   end
-
+  
   describe "destroy" do
     # Your tests go here
   end

From 7314d7a5d47aa67cf20e2a0d178b0697be6448e3 Mon Sep 17 00:00:00 2001
From: ohcloud <cloudylopez@icloud.com>
Date: Fri, 11 Oct 2019 13:22:43 -0700
Subject: [PATCH 50/55] poushing and pulling to get up to speed

---
 app/models/driver.rb             | 11 +++++++++++
 app/views/drivers/_form.html.erb | 13 +++++++++++++
 app/views/drivers/index.html.erb |  6 +++---
 app/views/drivers/show.html.erb  | 13 +++++++------
 config/routes.rb                 |  2 +-
 5 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/app/models/driver.rb b/app/models/driver.rb
index 02b9f5060..949159db8 100644
--- a/app/models/driver.rb
+++ b/app/models/driver.rb
@@ -26,4 +26,15 @@ def total_earnings
     return total
   end
   
+  def active? #to see available drivers
+    self.trips.each do |trip|
+      if trip.rating == nil
+        @driver.active == true
+      else
+        @driver.active = false
+      end
+      @driver.save
+    end
+  end
+  
 end
\ No newline at end of file
diff --git a/app/views/drivers/_form.html.erb b/app/views/drivers/_form.html.erb
index ff114b6bf..7af3b3b65 100644
--- a/app/views/drivers/_form.html.erb
+++ b/app/views/drivers/_form.html.erb
@@ -1,3 +1,13 @@
+<% if @driver.errors.any? %>
+  <h1>Errors</h1>
+  <ul class="errors">
+    <% @trip.errors.each do |column, message| %>
+      <li>
+        <strong><%= column.capitalize %></strong> <%= message %>
+      </li>
+    <% end %>
+  </ul>
+<% end %>
 
 <p>Please provide the following information to <%= verb_name %> be a new drivers in our database:</p>
 
@@ -15,6 +25,9 @@
   <%= f.label :model %>
   <%= f.text_area :model %>
 
+  <%= f.label :active %>
+  <%= check_box 'active', 'available', {}, 'true', 'false' %>
+
   <%= f.submit "#{action_name} Driver", class: "driver-button" %>
 
 <% end %>
diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb
index 7d7b78e2d..174836f24 100644
--- a/app/views/drivers/index.html.erb
+++ b/app/views/drivers/index.html.erb
@@ -3,8 +3,8 @@
   <% @drivers.each do |driver|  %>
     <li>
       <%= link_to driver.name, driver_path(driver) %>
+  <% end %>
       
-    </li>
+      </li>
 
-  <% end %>
-</ul>
\ No newline at end of file
+</ul>  
\ No newline at end of file
diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb
index d634d7350..7c5cedf17 100644
--- a/app/views/drivers/show.html.erb
+++ b/app/views/drivers/show.html.erb
@@ -1,22 +1,23 @@
   <h3>Name: <%= @driver.name %></h3>
-  <h3>Average Rating: <%= @driver.average_rating%>
-  <h3>Average Earnings: <%= @driver.total_earnings%>  
+  <h3>Average Rating: <%= @driver.average_rating%></h3>
+  <h3>Average Earnings: <%= @driver.total_earnings%></h3>
 
  <ul>
   <p> Driver Info: </p>
   <li>Vin #: <%= @driver.vin %></li>
   <li>Car Make: <%= @driver.make %></li>
   <li>Car Model: <%= @driver.model %></li>
-  <li>Status: <%= @driver.active %></li>
+  <li>Active: <% @driver.active? %></li> 
+                  Available
+            <% else %>
+                  Unavailable
+            <% end %>   
   </p>
 
-
   <%= link_to "Edit", edit_driver_path(@driver) %>
   <%= link_to "Delete", driver_path(@driver), method: :delete, data: {confirm: "Are you sure?"}%>
   <p><%= link_to "Return to Drivers List", drivers_path %></p>
 
-
-
 <% @driver.trips.each do |trip| %>
 <h2>Trip ID: <%= trip.id %></h2>
 <h3>Date: <%= trip.date %></h3>
diff --git a/config/routes.rb b/config/routes.rb
index 7bac83acf..46af2bd68 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -9,7 +9,7 @@
   resources :trips
   
   
-  
+  # post '/drivers/:id/active', to: 'drivers#active', as: 'active_driver'
   # resources :books #, except: [:index]
   
   

From 98e87eb64b1f69981e9e56562e224e64871e594a Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Fri, 11 Oct 2019 13:34:47 -0700
Subject: [PATCH 51/55] testing still under construction

---
 app/assets/stylesheets/passengers.scss        |  9 ----
 app/assets/stylesheets/trips.scss             |  9 ----
 .../controllers/passengers_controller_test.rb | 19 ++++++--
 test/controllers/trips_controller_test.rb     | 45 ++++++++++++++-----
 4 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/app/assets/stylesheets/passengers.scss b/app/assets/stylesheets/passengers.scss
index b1127a635..12e64e3e7 100644
--- a/app/assets/stylesheets/passengers.scss
+++ b/app/assets/stylesheets/passengers.scss
@@ -2,12 +2,3 @@
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
 
-.wrapper_passenger_trips {
-  width: 90%;
-  margin-left: 5%;
-  justify-items: center;
-  display: grid;
-  grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr;
-  grid-gap: 10px;
-  grid-auto-rows: 20px;
-}
\ No newline at end of file
diff --git a/app/assets/stylesheets/trips.scss b/app/assets/stylesheets/trips.scss
index df36bae3a..47a08bf9e 100644
--- a/app/assets/stylesheets/trips.scss
+++ b/app/assets/stylesheets/trips.scss
@@ -24,16 +24,7 @@
 
 }
 
-.wrapper_passenger_trips {
-  width: 90%;
-  margin-left: 5%;
 
-  justify-items: center;
-  display: grid;
-  grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr;
-  grid-gap: 10px;
-  grid-auto-rows: 20px;
-}
 
 
 
diff --git a/test/controllers/passengers_controller_test.rb b/test/controllers/passengers_controller_test.rb
index 679613c57..4cef98f02 100644
--- a/test/controllers/passengers_controller_test.rb
+++ b/test/controllers/passengers_controller_test.rb
@@ -1,6 +1,10 @@
 require "test_helper"
 
 describe PassengersController do
+  let (:passenger) {
+    Passenger.create name: "Johnny Appleseed", phone_num: "541-433-7865"
+  }
+  
   describe "index" do
     
     it "gives back a successful response" do
@@ -62,11 +66,18 @@
   end
   
   describe "edit" do
-    it "gives back a successful response" do
-      
-      get new_passenger_path
+    it "can get the edit page for an existing task" do
+      #skip
+      # Your code here
+      get edit_passenger_path(passenger.id)
       must_respond_with :success
-      
+    end
+    
+    it "will respond with redirect when attempting to edit a nonexistant task" do
+      #skip
+      # Your code here
+      get edit_passenger_path(9999)
+      must_respond_with :not_found
     end
   end
   
diff --git a/test/controllers/trips_controller_test.rb b/test/controllers/trips_controller_test.rb
index ab0d33dd8..6bfccbbae 100644
--- a/test/controllers/trips_controller_test.rb
+++ b/test/controllers/trips_controller_test.rb
@@ -1,36 +1,61 @@
 require "test_helper"
 
 describe TripsController do
+  before do
+    @sample = Trip.create date: Time.now, passenger_id: 1, driver_id: 1, cost: 5, rating: nil
+  end
+  
   describe "show" do
     it 'responds with a success when id given exists' do
       
       valid_trip = Trip.create(date: Time.now, passenger_id: 1, driver_id: 1, rating: nil, cost: 5)
       
-      get trip_path(valid_trip.id)
+      get trips_path(valid_trip.id)
       must_respond_with :success
       
     end
     
-    # it 'responds with a not_found when id given does not exist' do
-    
-    #   get passenger_path("5000")
-    #   must_respond_with :not_found
-    
-    # end
+    it 'responds with a not_found when id given does not exist' do
+      
+      get trip_path("-1")
+      must_respond_with :not_found
+      
+    end
   end
   
   describe "create" do
-    # Your tests go here
+    it 'creates a new trip successfully with valid data, and redirects the user to the passenger page' do
+      
+      trip_hash = {
+        trip: {
+          date: Time.now, 
+          passenger_id: 1, 
+          driver_id: 1, 
+          cost: 5
+        }
+      }
+      
+      expect {
+        post trips_path, params: trip_hash
+      }.must_change "Trip.count", 1
+      
+      must_redirect_to trips_path
+    end
   end
   
   describe "edit" do
-    # Your tests go here
+    
+    it "will respond with redirect when attempting to edit a nonexistant task" do
+      #skip
+      # Your code here
+      get edit_trip_path("9999999999")
+      must_respond_with :not_found
+    end
   end
   
   describe "update" do
     # Your tests go here
   end
-  
   describe "destroy" do
     # Your tests go here
   end

From 5fa903e0a8307ec576483b6124ea3928b75578d4 Mon Sep 17 00:00:00 2001
From: ohcloud <cloudylopez@icloud.com>
Date: Fri, 11 Oct 2019 13:58:58 -0700
Subject: [PATCH 52/55] working on toggle for status availability. otherwise,
 everything works.

---
 app/models/driver.rb               | 12 ++++++++----
 app/views/drivers/_form.html.erb   |  2 +-
 app/views/drivers/show.html.erb    | 13 +++++++------
 app/views/passengers/show.html.erb |  4 +++-
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/app/models/driver.rb b/app/models/driver.rb
index 949159db8..e52e27997 100644
--- a/app/models/driver.rb
+++ b/app/models/driver.rb
@@ -26,14 +26,18 @@ def total_earnings
     return total
   end
   
-  def active? #to see available drivers
+  def toggle_active? #to see available drivers
     self.trips.each do |trip|
-      if trip.rating == nil
-        @driver.active == true
+      if trip.rating != nil
+        @driver.toggle(:active).save #stack overflow
+        # @driver.active = true
+        # return true
       else
         @driver.active = false
       end
-      @driver.save
+      # @driver.save
+      return 
+      
     end
   end
   
diff --git a/app/views/drivers/_form.html.erb b/app/views/drivers/_form.html.erb
index 7af3b3b65..53a6e1f8c 100644
--- a/app/views/drivers/_form.html.erb
+++ b/app/views/drivers/_form.html.erb
@@ -26,7 +26,7 @@
   <%= f.text_area :model %>
 
   <%= f.label :active %>
-  <%= check_box 'active', 'available', {}, 'true', 'false' %>
+  <%= check_box 'available', 'active', {}, 'true', 'false' %>
 
   <%= f.submit "#{action_name} Driver", class: "driver-button" %>
 
diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb
index be1a31270..38706df38 100644
--- a/app/views/drivers/show.html.erb
+++ b/app/views/drivers/show.html.erb
@@ -7,11 +7,10 @@
   <li>Vin #: <%= @driver.vin %></li>
   <li>Car Make: <%= @driver.make %></li>
   <li>Car Model: <%= @driver.model %></li>
-  <li>Active: <% @driver.active? %></li> 
-                  Available
-            <% else %>
-                  Unavailable
-            <% end %>   
+  <li>Availability: <%= @driver.active %></li>
+
+   
+
   </p>
 
   <%= link_to "Edit", edit_driver_path(@driver) %>
@@ -26,6 +25,7 @@
 <div>COST</div>
 <div>EDIT</div>
 <div>DELETE</div>
+
 <% @driver.trips.each do |trip| %>
 <div><%= trip.id %></div>
 <div><%= trip.date %></div>
@@ -34,4 +34,5 @@
 <div>$<%= trip.cost%></div>
 <div><%= link_to "Edit Trip", edit_trip_path(trip.id) %></div>
 <div><%= link_to "Delete Trip", trip_path(trip.id), method: :delete, data: {confirm: "Are you sure?"}%></div>
-<% end %>
\ No newline at end of file
+<% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb
index 74a47d868..e4b3ae11a 100644
--- a/app/views/passengers/show.html.erb
+++ b/app/views/passengers/show.html.erb
@@ -24,4 +24,6 @@
 </div>
 
 <p><%= link_to "Add New Trip", passenger_trips_path(@passenger.id), method: :post %></p>
-<p><%= link_to "Return to Passenger List", passengers_path %></p>
\ No newline at end of file
+<p><%= link_to "Return to Passenger List", passengers_path %></p>
+
+

From b696b3c6d8b0f5fa9b8b9b520673c33e1472f67d Mon Sep 17 00:00:00 2001
From: ohcloud <cloudylopez@icloud.com>
Date: Fri, 11 Oct 2019 14:25:30 -0700
Subject: [PATCH 53/55] toggle TOGGLES FOR AVAILBILITY. YESSSS

---
 app/controllers/drivers_controller.rb | 16 +++++++++++++++-
 app/models/driver.rb                  | 15 ---------------
 app/views/drivers/_form.html.erb      |  2 +-
 app/views/drivers/index.html.erb      |  2 ++
 app/views/drivers/show.html.erb       | 12 +++++++-----
 5 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb
index 5b079cde4..c43db3b27 100644
--- a/app/controllers/drivers_controller.rb
+++ b/app/controllers/drivers_controller.rb
@@ -31,7 +31,7 @@ def edit
     @driver = Driver.find_by(id: params[:id])
     if @driver.nil?
       redirect_to driver_path
-      # head :not_found
+      head :not_found
       return
     end
   end
@@ -52,6 +52,20 @@ def update
     end
   end
   
+  def active    
+    driver_id = params[:id]
+    @driver = Driver.find_by(id: params[:id])
+    if @driver.active == true
+      @driver.active = false
+      @driver.save
+    else
+      @driver.active == false
+      @driver.active = true
+      @driver.save
+    end
+    redirect_to drivers_path
+  end
+  
   def destroy
     driver_id = params[:id]
     @driver = Driver.find_by(id: driver_id)
diff --git a/app/models/driver.rb b/app/models/driver.rb
index e52e27997..02b9f5060 100644
--- a/app/models/driver.rb
+++ b/app/models/driver.rb
@@ -26,19 +26,4 @@ def total_earnings
     return total
   end
   
-  def toggle_active? #to see available drivers
-    self.trips.each do |trip|
-      if trip.rating != nil
-        @driver.toggle(:active).save #stack overflow
-        # @driver.active = true
-        # return true
-      else
-        @driver.active = false
-      end
-      # @driver.save
-      return 
-      
-    end
-  end
-  
 end
\ No newline at end of file
diff --git a/app/views/drivers/_form.html.erb b/app/views/drivers/_form.html.erb
index 53a6e1f8c..82ed64670 100644
--- a/app/views/drivers/_form.html.erb
+++ b/app/views/drivers/_form.html.erb
@@ -26,7 +26,7 @@
   <%= f.text_area :model %>
 
   <%= f.label :active %>
-  <%= check_box 'available', 'active', {}, 'true', 'false' %>
+  <%= f. check_box :active, { onChange: 'this.form.submit();' , checked: @driver.active != nil} %>
 
   <%= f.submit "#{action_name} Driver", class: "driver-button" %>
 
diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb
index 7c5ffd6c9..4266aec71 100644
--- a/app/views/drivers/index.html.erb
+++ b/app/views/drivers/index.html.erb
@@ -5,4 +5,6 @@
   <% @drivers.each do |driver|  %>
       <div><%= driver.id %>:<%= link_to driver.name, driver_path(driver) %></div>
   <% end %>
+
+  
 </div>
diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb
index 38706df38..e2f2009a2 100644
--- a/app/views/drivers/show.html.erb
+++ b/app/views/drivers/show.html.erb
@@ -7,11 +7,13 @@
   <li>Vin #: <%= @driver.vin %></li>
   <li>Car Make: <%= @driver.make %></li>
   <li>Car Model: <%= @driver.model %></li>
-  <li>Availability: <%= @driver.active %></li>
-
-   
-
-  </p>
+  <li>Availability: </li>
+  <% if @driver.active == true %>
+  <%= "active" %>
+  <% else %>
+  <%= "inactive" %>
+  <% end%>
+  </ul>
 
   <%= link_to "Edit", edit_driver_path(@driver) %>
   <%= link_to "Delete", driver_path(@driver), method: :delete, data: {confirm: "Are you sure?"}%>

From 3e66d3d80590779d59f424662f378b0aaa4f18f0 Mon Sep 17 00:00:00 2001
From: KKennedyCodes <holmstedtk@gmail.com>
Date: Fri, 11 Oct 2019 14:57:09 -0700
Subject: [PATCH 54/55] tests added, still not passing

---
 app/controllers/trips_controller.rb       | 26 +++++----
 test/controllers/trips_controller_test.rb | 66 ++++++++++++++++++++++-
 2 files changed, 77 insertions(+), 15 deletions(-)

diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb
index 1e22214dd..1b6f1240f 100644
--- a/app/controllers/trips_controller.rb
+++ b/app/controllers/trips_controller.rb
@@ -54,9 +54,10 @@ def create
       date: Time.now, 
       passenger_id: params[:passenger_id], 
       driver_id: 1,
-      cost: 5
+      cost: rand(4..99)
     }
     @trip = Trip.new(generated_trips_params) #instantiate a new book
+    
     if @trip.save # save returns true if the database insert succeeds
       redirect_to passenger_path(params[:passenger_id]) # go to the index so we can see the book in the list
       return
@@ -67,19 +68,16 @@ def create
   end
   
   def destroy
-    trip_id = params[:id]
-    passenger_id = params[:passenger_id]
-    @trip = Trip.find_by(id: trip_id)
-    
-    if @trip.nil?
-      head :not_found
-      return
-    end
-    
-    @trip.destroy
-    
-    redirect_to passenger_path(@trip.passenger_id)
-    return
+    # Arrange
+    # Ensure there is an existing driver saved
+    new_trip = Trip.create(date: Time.now, passenger_id: "4", driver_id: "5", cost: 8)
+    # Act-Assert
+    #Ensure that there is a change of -1 in Driver.count
+    expect {delete trip_path(new_trip.id)}.must_differ 'Trip.count', -1
+    # Assert
+    # Check that the controller redirects
+    must_respond_with :redirect
+    must_redirect_to trips_path
   end
   
   private
diff --git a/test/controllers/trips_controller_test.rb b/test/controllers/trips_controller_test.rb
index 6bfccbbae..dcf689ff5 100644
--- a/test/controllers/trips_controller_test.rb
+++ b/test/controllers/trips_controller_test.rb
@@ -45,7 +45,7 @@
   
   describe "edit" do
     
-    it "will respond with redirect when attempting to edit a nonexistant task" do
+    it "will respond with redirect when attempting to edit a nonexistant trip" do
       #skip
       # Your code here
       get edit_trip_path("9999999999")
@@ -55,8 +55,72 @@
   
   describe "update" do
     # Your tests go here
+    before do
+      rider = Passenger.new(name: "Lila Keating", phone_num: "431-309-4939")
+      rider2 = Passenger.new(name: "Granny Smith", phone_num: "455-789-9988")
+      taxi = Driver.new(name: "Dale Masters", vin: "456567678")
+      taxi2 = Driver.new(name: "Grumpy Frank", vin: "1000678")
+      valid_trip = Trip.create(date: Time.now, passenger_id: rider[:id], driver_id: taxi[:id], rating: nil, cost: 1)
+    end
+    # Note:  If there was a way to fail to save the changes to a trip, that would be a great
+    #        thing to test. 
+    
+    it "updates an existing trip successfully and redirects to home" do
+      
+      rider = Passenger.new(name: "Lila Keating", phone_num: "431-309-4939")
+      rider2 = Passenger.new(name: "Granny Smith", phone_num: "455-789-9988")
+      taxi = Driver.new(name: "Dale Masters", vin: "456567678")
+      taxi2 = Driver.new(name: "Grumpy Frank", vin: "1000678")
+      valid_trip = Trip.create(date: Time.now, passenger_id: rider[:id], driver_id: taxi[:id], rating: nil, cost: 1)
+      
+      updated_trip_hash = {
+        trip: {
+          date: Time.now, 
+          passenger_id: rider2[:id], 
+          driver_id: taxi2[:id], 
+          cost: 5
+        }
+      }
+      
+      expect {
+        patch trip_path(valid_trip[:id]), params: updated_trip_hash
+      }.wont_change 'Trip.count'
+      
+      # Assert
+      expect( Trip.find_by(id: existing_trip.id).passenger_id ).must_equal 1
+      expect( Trip.find_by(id: existing_trip.id).driver_id ).must_equal 1
+    end
+    
+    
+    it "will redirect to the root page if given an invalid id" do
+      get trip_path("5000")
+      must_respond_with :not_found
+    end
   end
+  
   describe "destroy" do
     # Your tests go here
+    it 'deletes a new trip successfully with valid data, and redirects the user to the trip page' do
+      
+      trip_hash = {
+        trip: {
+          date: Time.now, 
+          passenger_id: 1, 
+          driver_id: 1, 
+          cost: 5
+        }
+      }
+      
+      post trips_path, params: trip_hash
+      identifier = Trip.first
+      
+      expect {
+        delete trip_path(identifier.id)
+      }.must_differ 'Trip.count', -1
+      
+      must_redirect_to trips_path
+    end
+    
   end
+  
 end

From 9b35b7059d326d3e8399767c852d1cd71618198b Mon Sep 17 00:00:00 2001
From: ohcloud <cloudylopez@icloud.com>
Date: Wed, 23 Oct 2019 15:56:42 -0700
Subject: [PATCH 55/55] fleshing out the controller for orders. not complete,
 will pair to finish.

---
 app/helpers/application_helper.rb |   9 +++
 test/models/driver_test.rb        | 129 +++++++++++++++---------------
 2 files changed, 74 insertions(+), 64 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index de6be7945..7f3770729 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,2 +1,11 @@
 module ApplicationHelper
+
+  def readable_date(date)
+    return "[unknown]" unless date
+    return (
+      "<span class='date' title=' "date.to.s"' >".html_safe + 
+			time_ago_in_words(date) + " ago</span>".html_safe
+    )
+  end
+
 end
diff --git a/test/models/driver_test.rb b/test/models/driver_test.rb
index 9f12d286c..37374c325 100644
--- a/test/models/driver_test.rb
+++ b/test/models/driver_test.rb
@@ -3,78 +3,79 @@
 describe Driver do
   let (:new_driver) {
     Driver.new(name: "Kari", vin: "123", active: true,
-               car_make: "Cherry", car_model: "DR5")
-  }
-  it "can be instantiated" do
-    # Assert
-    expect(new_driver.valid?).must_equal true
-  end
-
-  it "will have the required fields" do
-    # Arrange
-    new_driver.save
-    driver = Driver.first
-    [:name, :vin, :active, :car_make, :car_model].each do |field|
-
+      car_make: "Cherry", car_model: "DR5")
+    }
+    it "can be instantiated" do
       # Assert
-      expect(driver).must_respond_to field
+      expect(new_driver.valid?).must_equal true
     end
-  end
-
-  describe "relationships" do
-    it "can have many trips" do
+    
+    it "will have the required fields" do
       # Arrange
       new_driver.save
       driver = Driver.first
-
-      # Assert
-      expect(driver.trips.count).must_be :>=, 0
-      driver.trips.each do |trip|
-        expect(trip).must_be_instance_of Trip
+      [:name, :vin, :active, :car_make, :car_model].each do |field|
+        
+        # Assert
+        expect(driver).must_respond_to field
       end
     end
-  end
-
-  describe "validations" do
-    it "must have a name" do
-      # Arrange
-      new_driver.name = nil
-
-      # Assert
-      expect(new_driver.valid?).must_equal false
-      expect(new_driver.errors.messages).must_include :name
-      expect(new_driver.errors.messages[:name]).must_equal ["can't be blank"]
-    end
-
-    it "must have a VIN number" do
-      # Arrange
-      new_driver.vin = nil
-
-      # Assert
-      expect(new_driver.valid?).must_equal false
-      expect(new_driver.errors.messages).must_include :vin
-      expect(new_driver.errors.messages[:vin]).must_equal ["can't be blank"]
-    end
-  end
-
-  # Tests for methods you create should go here
-  describe "custom methods" do
-    describe "average rating" do
-      # Your code here
-    end
-
-    describe "total earnings" do
-      # Your code here
+    
+    describe "relationships" do
+      it "can have many trips" do
+        # Arrange
+        new_driver.save
+        driver = Driver.first
+        
+        # Assert
+        expect(driver.trips.count).must_be :>=, 0
+        driver.trips.each do |trip|
+          expect(trip).must_be_instance_of Trip
+        end
+      end
     end
-
-    describe "can go online" do
-      # Your code here
+    
+    describe "validations" do
+      it "must have a name" do
+        # Arrange
+        new_driver.name = nil
+        
+        # Assert
+        expect(new_driver.valid?).must_equal false
+        expect(new_driver.errors.messages).must_include :name
+        expect(new_driver.errors.messages[:name]).must_equal ["can't be blank"]
+      end
+      
+      it "must have a VIN number" do
+        # Arrange
+        new_driver.vin = nil
+        
+        # Assert
+        expect(new_driver.valid?).must_equal false
+        expect(new_driver.errors.messages).must_include :vin
+        expect(new_driver.errors.messages[:vin]).must_equal ["can't be blank"]
+      end
     end
-
-    describe "can go offline" do
-      # Your code here
+    
+    # Tests for methods you create should go here
+    describe "custom methods" do
+      describe "average rating" do
+        # Your code here
+      end
+      
+      describe "total earnings" do
+        # Your code here
+      end
+      
+      describe "can go online" do
+        # Your code here
+      end
+      
+      describe "can go offline" do
+        # Your code here
+      end
+      
+      # You may have additional methods to test
     end
-
-    # You may have additional methods to test
   end
-end
+  
\ No newline at end of file