From 63b2cfed81d062580bed786bac351673cb7a2194 Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Mon, 7 Oct 2019 15:54:45 -0700 Subject: [PATCH 01/69] Rails.new --- .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..b37716faa --- /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 @@ + + + + RideShareRails + <%= csrf_meta_tags %> + <%= csp_meta_tag %> + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 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..c3cd1cf95 --- /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..6f38c693c --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +7fhpbRUW5r4Aj6J6BPvWuCG2VkQygtHyQk2pC8DqIyv+K6N5/VDfIE6ts7j30S0C1WW4+gkisuvKy+wTV2sR0vY2bxQL1vx2ayCPChBG+WjBQUb/wj/LdfOVEYeqePMBs+RSgAr82BiC3n5Rahez39wyOg0I0y453cXdclumjnlnovN2WdIOZHkSv32spb5gUcQNNcctzyVrf0ALgTwAF69f4aL3LYqlD6rBziswE/A0KEkXF0ImPsCa/OHDNA2GvrAPCyx/APOz4hnmzfKIbm6Wyt20lm851GpV1NNwk/OaN3dhUSckw6w5VePDEib6LslLG46SY4WEdzT7vQXiU0uK5hOl/H3aJEqGyNuSGuH8Kdzh2AkZ0EGKuZ/qWRHWmrk1owD5DoooG5fYYjMlo+99b9Y+4zdk6gov--f9uwDj7Ad4eGOFMt--m92L858dudo1mBzXGBvXOQ== \ 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 @@ + + + + The page you were looking for doesn't exist (404) + + + + + + +
+
+

The page you were looking for doesn't exist.

+

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

+
+

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

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

The change you wanted was rejected.

+

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

+
+

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

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

We're sorry, but something went wrong.

+
+

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

+
+ + diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png new file mode 100644 index 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 8153327da73408ce3a5968ac8e152e3b4f3f1d83 Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Mon, 7 Oct 2019 16:01:19 -0700 Subject: [PATCH 02/69] Generated empty Driver model --- app/models/driver.rb | 2 ++ db/migrate/20191007230027_create_drivers.rb | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 app/models/driver.rb create mode 100644 db/migrate/20191007230027_create_drivers.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/db/migrate/20191007230027_create_drivers.rb b/db/migrate/20191007230027_create_drivers.rb new file mode 100644 index 000000000..926953694 --- /dev/null +++ b/db/migrate/20191007230027_create_drivers.rb @@ -0,0 +1,8 @@ +class CreateDrivers < ActiveRecord::Migration[5.2] + def change + create_table :drivers do |t| + + t.timestamps + end + end +end From 5d26159a56046d6eb9027e725065f8311245cb51 Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Mon, 7 Oct 2019 16:01:47 -0700 Subject: [PATCH 03/69] Generated empty Passenger model. --- app/models/passenger.rb | 2 ++ db/migrate/20191007230130_create_passengers.rb | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 app/models/passenger.rb create mode 100644 db/migrate/20191007230130_create_passengers.rb 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/db/migrate/20191007230130_create_passengers.rb b/db/migrate/20191007230130_create_passengers.rb new file mode 100644 index 000000000..92192d2c0 --- /dev/null +++ b/db/migrate/20191007230130_create_passengers.rb @@ -0,0 +1,8 @@ +class CreatePassengers < ActiveRecord::Migration[5.2] + def change + create_table :passengers do |t| + + t.timestamps + end + end +end From fb6a3e4ec3915d398546f660ec285e73a6632242 Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Mon, 7 Oct 2019 16:08:09 -0700 Subject: [PATCH 04/69] Generated Trip model. --- app/models/trip.rb | 2 ++ db/migrate/20191007230754_create_trips.rb | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 app/models/trip.rb create mode 100644 db/migrate/20191007230754_create_trips.rb 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/20191007230754_create_trips.rb b/db/migrate/20191007230754_create_trips.rb new file mode 100644 index 000000000..a45c923c5 --- /dev/null +++ b/db/migrate/20191007230754_create_trips.rb @@ -0,0 +1,8 @@ +class CreateTrips < ActiveRecord::Migration[5.2] + def change + create_table :trips do |t| + + t.timestamps + end + end +end From 16a91bef2019e8c244609e8fd796dc5a32ff8698 Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Mon, 7 Oct 2019 16:15:07 -0700 Subject: [PATCH 05/69] Added columns to driver table. --- db/migrate/20191007231048_data_drivers.rb | 7 +++++ db/schema.rb | 35 +++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 db/migrate/20191007231048_data_drivers.rb create mode 100644 db/schema.rb diff --git a/db/migrate/20191007231048_data_drivers.rb b/db/migrate/20191007231048_data_drivers.rb new file mode 100644 index 000000000..49e697a73 --- /dev/null +++ b/db/migrate/20191007231048_data_drivers.rb @@ -0,0 +1,7 @@ +class DataDrivers < ActiveRecord::Migration[5.2] + def change + + add_column :drivers, :name, :string + add_column :drivers, :vin, :string + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..bb0b0e094 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,35 @@ +# 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_07_231048) 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.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "name" + t.string "vin" + end + + create_table "passengers", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "trips", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end From 90b8356f84f6c8bcce22704914897c0998180312 Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Mon, 7 Oct 2019 16:20:56 -0700 Subject: [PATCH 06/69] Added columns to Passenger table. --- db/migrate/20191007231756_data_passenger.rb | 6 ++++++ db/schema.rb | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20191007231756_data_passenger.rb diff --git a/db/migrate/20191007231756_data_passenger.rb b/db/migrate/20191007231756_data_passenger.rb new file mode 100644 index 000000000..58071b389 --- /dev/null +++ b/db/migrate/20191007231756_data_passenger.rb @@ -0,0 +1,6 @@ +class DataPassenger < ActiveRecord::Migration[5.2] + def change + add_column :passengers, :name, :string + add_column :passengers, :phone_num, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index bb0b0e094..bb3646fbe 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_10_07_231048) do +ActiveRecord::Schema.define(version: 2019_10_07_231756) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,8 @@ create_table "passengers", force: :cascade do |t| t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.string "name" + t.string "phone_num" end create_table "trips", force: :cascade do |t| From f908cf9a1092747da681b22a6d5da90a26955768 Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Mon, 7 Oct 2019 16:49:03 -0700 Subject: [PATCH 07/69] generated migration for Trips to update columns --- db/migrate/20191007232117_data_trips.rb | 7 +++++++ db/schema.rb | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20191007232117_data_trips.rb diff --git a/db/migrate/20191007232117_data_trips.rb b/db/migrate/20191007232117_data_trips.rb new file mode 100644 index 000000000..9c734b881 --- /dev/null +++ b/db/migrate/20191007232117_data_trips.rb @@ -0,0 +1,7 @@ +class DataTrips < ActiveRecord::Migration[5.2] + def change + add_column :trips, :date, :date + add_column :trips, :rating, :integer + add_column :trips, :cost, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index bb3646fbe..097b168f0 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_10_07_231756) do +ActiveRecord::Schema.define(version: 2019_10_07_232117) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -32,6 +32,9 @@ create_table "trips", force: :cascade do |t| t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.date "date" + t.integer "rating" + t.integer "cost" end end From 3b79143028b524228d56df29b8d34f89871e39fd Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Mon, 7 Oct 2019 16:51:40 -0700 Subject: [PATCH 08/69] Generate controllers for Drivers, Trips, and Passengers. --- 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 | 2 ++ app/controllers/passengers_controller.rb | 2 ++ app/controllers/trips_controller.rb | 8 ++++++++ app/helpers/drivers_helper.rb | 2 ++ app/helpers/passengers_helper.rb | 2 ++ app/helpers/trips_helper.rb | 2 ++ 12 files changed, 33 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..951cb9876 --- /dev/null +++ b/app/controllers/drivers_controller.rb @@ -0,0 +1,2 @@ +class DriversController < ApplicationController +end diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb new file mode 100644 index 000000000..7b08e4832 --- /dev/null +++ b/app/controllers/passengers_controller.rb @@ -0,0 +1,2 @@ +class PassengersController < ApplicationController +end diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb new file mode 100644 index 000000000..7e507c444 --- /dev/null +++ b/app/controllers/trips_controller.rb @@ -0,0 +1,8 @@ +class TripsController < ApplicationController + + def index + end + + def show + 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 e8e7b97efca725fa45f2ce138c7b87fabf71fed2 Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Mon, 7 Oct 2019 16:54:44 -0700 Subject: [PATCH 09/69] added routes --- config/routes.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 787824f88..97782adff 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,7 @@ 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 end From fb4b539caca04768ca4151d5cc43f6d0a28ffaae Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Mon, 7 Oct 2019 16:56:49 -0700 Subject: [PATCH 10/69] Added HomepagesController --- app/assets/javascripts/homepages.js | 2 ++ app/assets/stylesheets/homepages.scss | 3 +++ app/controllers/homepages_controller.rb | 2 ++ app/helpers/homepages_helper.rb | 2 ++ config/routes.rb | 1 + 5 files changed, 10 insertions(+) create mode 100644 app/assets/javascripts/homepages.js create mode 100644 app/assets/stylesheets/homepages.scss create mode 100644 app/controllers/homepages_controller.rb create mode 100644 app/helpers/homepages_helper.rb 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/homepages.scss b/app/assets/stylesheets/homepages.scss new file mode 100644 index 000000000..2305c36d1 --- /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/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/config/routes.rb b/config/routes.rb index 97782adff..018a01157 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,4 +4,5 @@ resources :passengers resources :drivers resources :trips + end From cac4d34d3f782ba2212e08a23d1d613427d60bf3 Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Mon, 7 Oct 2019 17:00:26 -0700 Subject: [PATCH 11/69] Added first view index.html. --- app/controllers/drivers_controller.rb | 8 ++++++++ app/controllers/passengers_controller.rb | 5 +++++ app/views/drivers/index.html.erb | 1 + 3 files changed, 14 insertions(+) create mode 100644 app/views/drivers/index.html.erb diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 951cb9876..abd332bdd 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -1,2 +1,10 @@ class DriversController < ApplicationController + def index + @drivers = Driver.all + end + + def show + driver_id = params[:id] + @driver = Driver.find_by(id: driver_id) + end end diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb index 7b08e4832..45e81ffd2 100644 --- a/app/controllers/passengers_controller.rb +++ b/app/controllers/passengers_controller.rb @@ -1,2 +1,7 @@ class PassengersController < ApplicationController + def index + end + + def show + end end diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb new file mode 100644 index 000000000..f09c56913 --- /dev/null +++ b/app/views/drivers/index.html.erb @@ -0,0 +1 @@ +

Driver Index

\ No newline at end of file From 3ed96e654bab5c1b5615393c6c766aaf6e31ed9f Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Tue, 8 Oct 2019 10:43:02 -0700 Subject: [PATCH 12/69] deleted complete trip test per Jared's note in slack --- test/models/passenger_test.rb | 101 +++++++++++++++++----------------- 1 file changed, 49 insertions(+), 52 deletions(-) diff --git a/test/models/passenger_test.rb b/test/models/passenger_test.rb index 66ac353d3..f13a98b16 100644 --- a/test/models/passenger_test.rb +++ b/test/models/passenger_test.rb @@ -2,69 +2,66 @@ 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_number: "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_number].each do |field| + # Assert - expect(new_passenger.valid?).must_equal true + expect(passenger).must_respond_to field end +end - it "will have the required fields" do +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 +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 +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_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 +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 +# Tests for methods you create should go here +describe "custom methods" do + describe "request a ride" do + # Your code here end + + # You may have additional methods to test here +end end From a21ab8ff8a9b0193a316abdfcbaf84fa18432a5e Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Tue, 8 Oct 2019 11:13:32 -0700 Subject: [PATCH 13/69] Added foreign key driver_id and passenger_id to trip. --- .../20191008180142_passenger_and_driver_id_trips.rb | 6 ++++++ .../20191008180925_remove_passenger_id_from_trips.rb | 5 +++++ db/migrate/20191008181016_remove_driver_id_from_trips.rb | 5 +++++ db/migrate/20191008181102_add_foreign_keys_to_trips.rb | 6 ++++++ db/schema.rb | 8 +++++++- 5 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20191008180142_passenger_and_driver_id_trips.rb create mode 100644 db/migrate/20191008180925_remove_passenger_id_from_trips.rb create mode 100644 db/migrate/20191008181016_remove_driver_id_from_trips.rb create mode 100644 db/migrate/20191008181102_add_foreign_keys_to_trips.rb diff --git a/db/migrate/20191008180142_passenger_and_driver_id_trips.rb b/db/migrate/20191008180142_passenger_and_driver_id_trips.rb new file mode 100644 index 000000000..2f15dc12d --- /dev/null +++ b/db/migrate/20191008180142_passenger_and_driver_id_trips.rb @@ -0,0 +1,6 @@ +class PassengerAndDriverIdTrips < ActiveRecord::Migration[5.2] + def change + add_column :trips, :passenger_id, :integer + add_column :trips, :driver_id, :integer + end +end diff --git a/db/migrate/20191008180925_remove_passenger_id_from_trips.rb b/db/migrate/20191008180925_remove_passenger_id_from_trips.rb new file mode 100644 index 000000000..4dc6bc024 --- /dev/null +++ b/db/migrate/20191008180925_remove_passenger_id_from_trips.rb @@ -0,0 +1,5 @@ +class RemovePassengerIdFromTrips < ActiveRecord::Migration[5.2] + def change + remove_column :trips, :passenger_id, :integer + end +end diff --git a/db/migrate/20191008181016_remove_driver_id_from_trips.rb b/db/migrate/20191008181016_remove_driver_id_from_trips.rb new file mode 100644 index 000000000..ebdce13d5 --- /dev/null +++ b/db/migrate/20191008181016_remove_driver_id_from_trips.rb @@ -0,0 +1,5 @@ +class RemoveDriverIdFromTrips < ActiveRecord::Migration[5.2] + def change + remove_column :trips, :driver_id, :integer + end +end diff --git a/db/migrate/20191008181102_add_foreign_keys_to_trips.rb b/db/migrate/20191008181102_add_foreign_keys_to_trips.rb new file mode 100644 index 000000000..d58ac499b --- /dev/null +++ b/db/migrate/20191008181102_add_foreign_keys_to_trips.rb @@ -0,0 +1,6 @@ +class AddForeignKeysToTrips < ActiveRecord::Migration[5.2] + def change + add_reference :trips, :passenger, foreign_key: true + add_reference :trips, :driver, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 097b168f0..aee51d4c3 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_10_07_232117) do +ActiveRecord::Schema.define(version: 2019_10_08_181102) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -35,6 +35,12 @@ t.date "date" t.integer "rating" t.integer "cost" + t.bigint "passenger_id" + t.bigint "driver_id" + t.index ["driver_id"], name: "index_trips_on_driver_id" + t.index ["passenger_id"], name: "index_trips_on_passenger_id" end + add_foreign_key "trips", "drivers" + add_foreign_key "trips", "passengers" end From 7072ab29c57215674b7688410e49ef131ef66656 Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Tue, 8 Oct 2019 11:15:18 -0700 Subject: [PATCH 14/69] Established model 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..197e65507 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..2fef89192 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..3f761103a 100644 --- a/app/models/trip.rb +++ b/app/models/trip.rb @@ -1,2 +1,4 @@ class Trip < ApplicationRecord + belongs_to :passenger + belongs_to :driver end From 0b4865382b42090a1606bdda41e4433875e7effd Mon Sep 17 00:00:00 2001 From: Rinostar Date: Tue, 8 Oct 2019 14:37:32 -0700 Subject: [PATCH 15/69] added index actions and views to Driver and Passenger --- app/controllers/passengers_controller.rb | 1 + app/views/drivers/index.html.erb | 12 +++++++++++- app/views/passengers/index.html.erb | 11 +++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 app/views/passengers/index.html.erb diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb index 45e81ffd2..6372e64d8 100644 --- a/app/controllers/passengers_controller.rb +++ b/app/controllers/passengers_controller.rb @@ -1,5 +1,6 @@ class PassengersController < ApplicationController def index + @passengers = Passenger.all end def show diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb index f09c56913..bdd0af7f6 100644 --- a/app/views/drivers/index.html.erb +++ b/app/views/drivers/index.html.erb @@ -1 +1,11 @@ -

Driver Index

\ No newline at end of file +

Driver Index

+ +
    + <% @drivers.each do |driver| %> +
  • + <%= driver.id %>. + <%= driver.name %> | + <%= driver.vin %> +
    • + <% end %> +
\ No newline at end of file diff --git a/app/views/passengers/index.html.erb b/app/views/passengers/index.html.erb new file mode 100644 index 000000000..75ea70813 --- /dev/null +++ b/app/views/passengers/index.html.erb @@ -0,0 +1,11 @@ +

Passenger Index

+ +
    + <% @passengers.each do |passenger| %> +
  • + <%= passenger.id %>. + <%= passenger.name %> | + <%= passenger.phone_num %> +
    • + <% end %> +
\ No newline at end of file From d44f427931d73b8e7a1e2ce1893054c34b176108 Mon Sep 17 00:00:00 2001 From: Rinostar Date: Tue, 8 Oct 2019 14:41:44 -0700 Subject: [PATCH 16/69] added index action and view to Trip --- app/controllers/trips_controller.rb | 2 +- app/views/trips/index.html.erb | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 app/views/trips/index.html.erb diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 7e507c444..d18a5c4bf 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -1,6 +1,6 @@ class TripsController < ApplicationController - def index + @trips = Trip.all end def show diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb new file mode 100644 index 000000000..72a3e4327 --- /dev/null +++ b/app/views/trips/index.html.erb @@ -0,0 +1,14 @@ +

Trip Index

+ +
    + <% @trips.each do |trip| %> +
  • + <%= trip.id %>. + Date: <%= trip.date %> | + Rating: <%= trip.rating %> | + Cost: <%= trip.cost %> | + Passenger: <%= trip.passenger_id %> | + Driver: <%= trip.driver_id %> | +
    • + <% end %> +
\ No newline at end of file From e32dfbe0327aa07fdfabf6e37665f0edec77d7b7 Mon Sep 17 00:00:00 2001 From: Rinostar Date: Tue, 8 Oct 2019 15:04:41 -0700 Subject: [PATCH 17/69] added new, create, and show actions to Driver --- app/controllers/drivers_controller.rb | 22 ++++++++++++++++++++++ app/views/drivers/_form.html.erb | 10 ++++++++++ app/views/drivers/new.html.erb | 1 + app/views/drivers/show.html.erb | 6 ++++++ 4 files changed, 39 insertions(+) create mode 100644 app/views/drivers/_form.html.erb create mode 100644 app/views/drivers/new.html.erb create mode 100644 app/views/drivers/show.html.erb diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index abd332bdd..f23bf5ad0 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -7,4 +7,26 @@ def show driver_id = params[:id] @driver = Driver.find_by(id: driver_id) end + + def new + @driver = Driver.new + end + + def create + @driver = Driver.new(driver_params) + if @driver.save + redirect_to driver_path(@driver) + return + else + render :new + return + end + end + + private + + def driver_params + return params.require(:driver).permit(:name, :vin) + end + end diff --git a/app/views/drivers/_form.html.erb b/app/views/drivers/_form.html.erb new file mode 100644 index 000000000..29a038208 --- /dev/null +++ b/app/views/drivers/_form.html.erb @@ -0,0 +1,10 @@ +

<%= verb %> a new driver

+ +
+ <%= form_for @driver do |f| %> + Name: <%= f.text_field :name %>
+ VIN: <%= f.text_field :vin %>
> + + <%= f.submit action_name %> + <% end %> +
\ No newline at end of file diff --git a/app/views/drivers/new.html.erb b/app/views/drivers/new.html.erb new file mode 100644 index 000000000..39c23335c --- /dev/null +++ b/app/views/drivers/new.html.erb @@ -0,0 +1 @@ +<%= render partial: "form", locals: { action_name: "New Driver", verb: "Create" } %> diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb new file mode 100644 index 000000000..307704ee0 --- /dev/null +++ b/app/views/drivers/show.html.erb @@ -0,0 +1,6 @@ +

Driver Infomration

+ +
    +
  • Name: <%= @driver.name %>
    • +
  • VIN: <%= @driver.vin %>
    • +
\ No newline at end of file From 7630e1164c2ffded6d7eea713ff1ab099a57b806 Mon Sep 17 00:00:00 2001 From: Rinostar Date: Tue, 8 Oct 2019 15:19:51 -0700 Subject: [PATCH 18/69] added new, show, create actions to Passenger --- app/controllers/passengers_controller.rb | 26 +++++++++++++++++++++++- app/views/drivers/show.html.erb | 1 + app/views/passengers/_form.html.erb | 10 +++++++++ app/views/passengers/new.html.erb | 1 + app/views/passengers/show.html.erb | 7 +++++++ 5 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 app/views/passengers/_form.html.erb create mode 100644 app/views/passengers/new.html.erb create mode 100644 app/views/passengers/show.html.erb diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb index 6372e64d8..91c7f9409 100644 --- a/app/controllers/passengers_controller.rb +++ b/app/controllers/passengers_controller.rb @@ -4,5 +4,29 @@ def index end def show + passenger_id = params[:id] + @passenger = Passenger.find_by(id: passenger_id) end -end + + def new + @passenger = Passenger.new + end + + def create + @passenger = Passenger.new(passenger_params) + if @passenger.save + redirect_to passenger_path(@passenger) + return + else + render :new + return + end + end + + private + + def passenger_params + return params.require(:passenger).permit(:name, :phone_num) + 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 307704ee0..e240ba10a 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -1,6 +1,7 @@

Driver Infomration

    +
  • ID: <%= @driver.id %>
  • Name: <%= @driver.name %>
  • VIN: <%= @driver.vin %>
\ No newline at end of file diff --git a/app/views/passengers/_form.html.erb b/app/views/passengers/_form.html.erb new file mode 100644 index 000000000..47cb31f9d --- /dev/null +++ b/app/views/passengers/_form.html.erb @@ -0,0 +1,10 @@ +

<%= verb %> a new passenger

+ +
+ <%= form_for @passenger do |f| %> + Name: <%= f.text_field :name %>
+ Phone_num: <%= f.text_field :phone_num %>
> + + <%= f.submit action_name %> + <% end %> +
\ No newline at end of file diff --git a/app/views/passengers/new.html.erb b/app/views/passengers/new.html.erb new file mode 100644 index 000000000..7736e206f --- /dev/null +++ b/app/views/passengers/new.html.erb @@ -0,0 +1 @@ +<%= render partial: "form", locals: { action_name: "New Passenger", verb: "Create" } %> \ No newline at end of file diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb new file mode 100644 index 000000000..620a4b345 --- /dev/null +++ b/app/views/passengers/show.html.erb @@ -0,0 +1,7 @@ +

Passenger Infomration

+ +
    +
  • ID: <%= @passenger.id %>
    • +
  • Name: <%= @passenger.name %>
    • +
  • Phone Number: <%= @passenger.phone_num %>
    • +
\ No newline at end of file From 4f0e3e5f2d9c2fbddf3935f277a412d99e334e2f Mon Sep 17 00:00:00 2001 From: Rinostar Date: Tue, 8 Oct 2019 15:27:24 -0700 Subject: [PATCH 19/69] added new, show, create actions to Trip --- app/controllers/trips_controller.rb | 26 +++++++++++++++++++++++++- app/views/trips/_form.html.erb | 13 +++++++++++++ app/views/trips/new.html.erb | 1 + app/views/trips/show.html.erb | 9 +++++++++ 4 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 app/views/trips/_form.html.erb create mode 100644 app/views/trips/new.html.erb create mode 100644 app/views/trips/show.html.erb diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index d18a5c4bf..d4347ccd7 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -2,7 +2,31 @@ class TripsController < ApplicationController def index @trips = Trip.all end - + def show + trip_id = params[:id] + @trip = Trip.find_by(id: trip_id) end + + def new + @trip = Trip.new + end + + def create + @trip = Trip.new(trip_params) + if @trip.save + redirect_to trip_path(@trip) + return + else + render :new + return + end + end + + private + + def trip_params + return params.require(:trip).permit(:date, :rating, :cost, :passenger_id, :driver_id) + end + end diff --git a/app/views/trips/_form.html.erb b/app/views/trips/_form.html.erb new file mode 100644 index 000000000..53f2247ec --- /dev/null +++ b/app/views/trips/_form.html.erb @@ -0,0 +1,13 @@ +

<%= verb %> a new trip

+ +
+ <%= form_for @trip do |f| %> + Date: <%= f.text_field :date %>
+ Rating: <%= f.text_field :rating %>
+ Cost: <%= f.text_field :cost %>
+ Passenger: <%= f.text_field :passenger_id %>
+ Driver: <%= f.text_field :driver_id %>
+ + <%= f.submit action_name %> + <% end %> +
\ No newline at end of file diff --git a/app/views/trips/new.html.erb b/app/views/trips/new.html.erb new file mode 100644 index 000000000..e84d7dbe9 --- /dev/null +++ b/app/views/trips/new.html.erb @@ -0,0 +1 @@ +<%= render partial: "form", locals: { action_name: "New Trip", verb: "Create" } %> \ No newline at end of file diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb new file mode 100644 index 000000000..039060fb4 --- /dev/null +++ b/app/views/trips/show.html.erb @@ -0,0 +1,9 @@ +

Trip Information

+ +
    +
  • Date: <%= @trip.date %>
    • +
  • Rating: <%= @trip.rating %>
    • +
  • Cost: <%= @trip.cost %>
    • +
  • Passenger: <%= @trip.passenger %>
    • +
  • Driver: <%= @trip.driver%>
    • +
\ No newline at end of file From 11d9dfa856fe69aa3089a71c0530089b876f59fd Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Tue, 8 Oct 2019 15:50:07 -0700 Subject: [PATCH 20/69] Edit Index and Show actions for DriversController --- app/controllers/drivers_controller.rb | 46 ++++++++++++++++++++++++--- app/views/drivers/edit.html.erb | 1 + app/views/drivers/index.html.erb | 5 ++- app/views/drivers/show.html.erb | 2 +- 4 files changed, 47 insertions(+), 7 deletions(-) create mode 100644 app/views/drivers/edit.html.erb diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index f23bf5ad0..82958f429 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -7,11 +7,11 @@ def show driver_id = params[:id] @driver = Driver.find_by(id: driver_id) end - + def new @driver = Driver.new end - + def create @driver = Driver.new(driver_params) if @driver.save @@ -22,11 +22,47 @@ def create return end end - + + def edit + @driver = Driver.find_by(id: params[:id]) + + if @driver.nil? + flash[:error] = "Could not find driver ID #{ @driver.id }" + redirect_to drivers_path + return + end + end + + def update + @driver = Driver.find_by(id: params[:id]) + + if @driver.update(driver_params) + redirect_to drivers_path(@driver) + return + else + render :edit + return + end + end + + def destroy + @driver = Driver.find_by(id: params[:id]) + + if @driver.nil? + flash[:error] = "Could not find driver ID #{ @driver.id }" + redirect_to drivers_path + return + end + + @driver.destroy + redirect_to drivers_path + return + end + private - + def driver_params return params.require(:driver).permit(:name, :vin) end - + end diff --git a/app/views/drivers/edit.html.erb b/app/views/drivers/edit.html.erb new file mode 100644 index 000000000..3ce35f5e1 --- /dev/null +++ b/app/views/drivers/edit.html.erb @@ -0,0 +1 @@ +<%= render partial: "form", locals: { action_name: "Edit Driver", verb: "update" } %> diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb index bdd0af7f6..dd94370c9 100644 --- a/app/views/drivers/index.html.erb +++ b/app/views/drivers/index.html.erb @@ -5,7 +5,10 @@
  • <%= driver.id %>. <%= driver.name %> | - <%= driver.vin %> + <%= driver.vin %> | + <%= link_to "Edit", edit_driver_path(driver) %> + <%= link_to "Delete", driver_path(driver), method: :delete, data: { confirm: "Are you sure you want to delete #{driver.name}?"} %>
    • <% end %> + \ No newline at end of file diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index e240ba10a..c0fc93cd2 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -1,4 +1,4 @@ -

    Driver Infomration

    +

    Driver Information

    • ID: <%= @driver.id %>
      • From ff53f740b4c3a450e6182bdd2c6da3740c618a5b Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Tue, 8 Oct 2019 15:55:10 -0700 Subject: [PATCH 21/69] Added Passenger#Edit and Passenger#Delete actions. --- app/controllers/passengers_controller.rb | 46 +++++++++++++++++++++--- app/views/drivers/_form.html.erb | 2 +- app/views/passengers/_form.html.erb | 2 +- app/views/passengers/edit.html.erb | 1 + app/views/passengers/index.html.erb | 2 ++ app/views/passengers/show.html.erb | 2 +- 6 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 app/views/passengers/edit.html.erb diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb index 91c7f9409..b674a6417 100644 --- a/app/controllers/passengers_controller.rb +++ b/app/controllers/passengers_controller.rb @@ -7,11 +7,11 @@ def show passenger_id = params[:id] @passenger = Passenger.find_by(id: passenger_id) end - + def new @passenger = Passenger.new end - + def create @passenger = Passenger.new(passenger_params) if @passenger.save @@ -22,11 +22,47 @@ def create return end end - + + def edit + @passenger = Passenger.find_by(id: params[:id]) + + if @passenger.nil? + flash[:error] = "Could not find passenger ID #{ @passenger.id }" + redirect_to passengers_path + return + end + end + + def update + @passenger = Passenger.find_by(id: params[:id]) + + if @passenger.update(passenger_params) + redirect_to passengers_path(@passenger) + return + else + render :edit + return + end + end + + def destroy + @passenger = Passenger.find_by(id: params[:id]) + + if @passenger.nil? + flash[:error] = "Could not find passenger ID #{ @passenger.id }" + redirect_to passengers_path + return + end + + @passenger.destroy + redirect_to passengers_path + return + end + private - + def passenger_params return params.require(:passenger).permit(:name, :phone_num) 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 29a038208..555b5e175 100644 --- a/app/views/drivers/_form.html.erb +++ b/app/views/drivers/_form.html.erb @@ -3,7 +3,7 @@
      <%= form_for @driver do |f| %> Name: <%= f.text_field :name %>
      - VIN: <%= f.text_field :vin %>
      > + VIN: <%= f.text_field :vin %>
      <%= f.submit action_name %> <% end %> diff --git a/app/views/passengers/_form.html.erb b/app/views/passengers/_form.html.erb index 47cb31f9d..c7fa3c96a 100644 --- a/app/views/passengers/_form.html.erb +++ b/app/views/passengers/_form.html.erb @@ -3,7 +3,7 @@
      <%= form_for @passenger do |f| %> Name: <%= f.text_field :name %>
      - Phone_num: <%= f.text_field :phone_num %>
      > + Phone_num: <%= f.text_field :phone_num %>
      <%= f.submit action_name %> <% end %> diff --git a/app/views/passengers/edit.html.erb b/app/views/passengers/edit.html.erb new file mode 100644 index 000000000..ab8577a8c --- /dev/null +++ b/app/views/passengers/edit.html.erb @@ -0,0 +1 @@ +<%= render partial: "form", locals: { action_name: "Edit Passenger", verb: "update" } %> diff --git a/app/views/passengers/index.html.erb b/app/views/passengers/index.html.erb index 75ea70813..72f842a1e 100644 --- a/app/views/passengers/index.html.erb +++ b/app/views/passengers/index.html.erb @@ -6,6 +6,8 @@ <%= passenger.id %>. <%= passenger.name %> | <%= passenger.phone_num %> + <%= link_to "Edit", edit_passenger_path(passenger) %> + <%= link_to "Delete", passenger_path(passenger), method: :delete, data: { confirm: "Are you sure you want to delete #{passenger.name}?"} %> <% end %>
    \ No newline at end of file diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index 620a4b345..976851ca3 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -1,4 +1,4 @@ -

    Passenger Infomration

    +

    Passenger Information

    • ID: <%= @passenger.id %>
      • From bbbb5a6a9ff3da472ee8ee06c1c6ad5b65e55f39 Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Tue, 8 Oct 2019 16:00:32 -0700 Subject: [PATCH 22/69] Added Trip#Edit and Trips#Delete actions to the controller. --- app/controllers/trips_controller.rb | 50 +++++++++++++++++++++++++---- app/views/trips/edit.html.erb | 1 + app/views/trips/index.html.erb | 2 ++ 3 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 app/views/trips/edit.html.erb diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index d4347ccd7..db38f241d 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -2,16 +2,16 @@ class TripsController < ApplicationController def index @trips = Trip.all end - + def show trip_id = params[:id] @trip = Trip.find_by(id: trip_id) end - + def new @trip = Trip.new end - + def create @trip = Trip.new(trip_params) if @trip.save @@ -22,11 +22,47 @@ def create return end end - + + def edit + @trip = Trip.find_by(id: params[:id]) + + if @trip.nil? + flash[:error] = "Could not find trip ID #{ @trip.id }" + redirect_to trips_path + return + end + end + + def update + @trip = Trip.find_by(id: params[:id]) + + if @trip.update(trip_params) + redirect_to trips_path(@trip) + return + else + render :edit + return + end + end + + def destroy + @trip = Trip.find_by(id: params[:id]) + + if @trip.nil? + flash[:error] = "Could not find trip ID #{ @trip.id }" + redirect_to trips_path + return + end + + @trip.destroy + redirect_to trips_path + return + end + private - + def trip_params - return params.require(:trip).permit(:date, :rating, :cost, :passenger_id, :driver_id) + return params.require(:trip).permit(:date, :rating, :cost, :trip_id, :driver_id) end - + end diff --git a/app/views/trips/edit.html.erb b/app/views/trips/edit.html.erb new file mode 100644 index 000000000..3129d7a4a --- /dev/null +++ b/app/views/trips/edit.html.erb @@ -0,0 +1 @@ +<%= render partial: "form", locals: { action_name: "Edit Trip", verb: "update" } %> diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb index 72a3e4327..17d56f408 100644 --- a/app/views/trips/index.html.erb +++ b/app/views/trips/index.html.erb @@ -9,6 +9,8 @@ Cost: <%= trip.cost %> | Passenger: <%= trip.passenger_id %> | Driver: <%= trip.driver_id %> | + <%= link_to "Edit", edit_trip_path(trip) %> + <%= link_to "Delete", trip_path(trip), method: :delete, data: { confirm: "Are you sure you want to delete Trip #{trip.id}?"} %> <% end %>
    \ No newline at end of file From c01346855dc80648276e228c6c88bae4893843c9 Mon Sep 17 00:00:00 2001 From: Rinostar Date: Wed, 9 Oct 2019 15:10:21 -0700 Subject: [PATCH 23/69] added Active column to Driver --- app/controllers/drivers_controller.rb | 5 + app/models/driver.rb | 5 +- ...91009220840_add_active_column_to_driver.rb | 5 + db/schema.rb | 3 +- test/controllers/drivers_controller_test.rb | 219 +++++++++--------- test/models/driver_test.rb | 7 +- test/test_helper.rb | 4 + 7 files changed, 131 insertions(+), 117 deletions(-) create mode 100644 db/migrate/20191009220840_add_active_column_to_driver.rb diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 82958f429..3b2fca057 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -6,6 +6,11 @@ def index def show driver_id = params[:id] @driver = Driver.find_by(id: driver_id) + + if @driver.nil? + head :not_found + return + end end def new diff --git a/app/models/driver.rb b/app/models/driver.rb index 197e65507..d94703408 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -1,3 +1,6 @@ class Driver < ApplicationRecord has_many :trips -end + + validates :name, presence: true + validates :vin, presence: true +end \ No newline at end of file diff --git a/db/migrate/20191009220840_add_active_column_to_driver.rb b/db/migrate/20191009220840_add_active_column_to_driver.rb new file mode 100644 index 000000000..a8213dc19 --- /dev/null +++ b/db/migrate/20191009220840_add_active_column_to_driver.rb @@ -0,0 +1,5 @@ +class AddActiveColumnToDriver < ActiveRecord::Migration[5.2] + def change + add_column :drivers, :active, :boolean, default: false + end +end diff --git a/db/schema.rb b/db/schema.rb index aee51d4c3..46d28128c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_10_08_181102) do +ActiveRecord::Schema.define(version: 2019_10_09_220840) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -20,6 +20,7 @@ t.datetime "updated_at", null: false t.string "name" t.string "vin" + t.boolean "active", default: false end create_table "passengers", force: :cascade do |t| diff --git a/test/controllers/drivers_controller_test.rb b/test/controllers/drivers_controller_test.rb index 48aef7556..6dc19995d 100644 --- a/test/controllers/drivers_controller_test.rb +++ b/test/controllers/drivers_controller_test.rb @@ -1,175 +1,172 @@ -require "test_helper" +require "../test_helper" 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 + let (:driver) { + Driver.create name: "George", vin: "123456789" + } - # Act + it "responds with success when there are many drivers in the database" do + driver - # Assert + get drivers_path + must_respond_with :success end - it "responds with success when there are no drivers saved" do - # Arrange - # Ensure that there are zero drivers saved - - # Act + it "responds with success when there are no drivers in the database" do + driver.destroy - # 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 + describe "show" do + let (:driver) { + Driver.create name: "Wallis", vin: "987654321" + } - # Assert + it "responds with success when showing an existing valid driver" do + get driver_path(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(-1) + must_respond_with :missing end end + describe "new" do it "responds with success" do end end - describe "create" do - it "can create a new driver with valid information accurately, and redirect" do - # Arrange - # Set up the form data +# 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 +# # 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 +# # 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 +# 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 +# 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 +# # Act-Assert +# # Ensure that there is no change in Driver.count - # Assert - # Check that the controller redirects +# # Assert +# # Check that the controller redirects - end - end +# end +# 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 +# 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 +# # Act - # Assert +# # Assert - end +# 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 +# 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 +# # Act - # Assert +# # Assert - end - end +# 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 +# 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 +# # 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 +# # 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 - end +# 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 +# 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 +# # Act-Assert +# # Ensure that there is no change in Driver.count - # Assert - # Check that the controller gave back a 404 +# # Assert +# # Check that the controller gave back a 404 - end +# 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 +# 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 +# # Act-Assert +# # Ensure that there is no change in Driver.count - # Assert - # Check that the controller redirects +# # Assert +# # Check that the controller redirects - end - end +# 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 +# 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 +# # Act-Assert +# # Ensure that there is a change of -1 in Driver.count - # Assert - # Check that the controller redirects +# # Assert +# # Check that the controller redirects - end +# 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 +# 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 +# # Act-Assert +# # Ensure that there is no change in Driver.count - # Assert - # Check that the controller responds or redirects with whatever your group decides +# # Assert +# # Check that the controller responds or redirects with whatever your group decides - end - end +# end +# end end diff --git a/test/models/driver_test.rb b/test/models/driver_test.rb index 9f12d286c..f7de4679d 100644 --- a/test/models/driver_test.rb +++ b/test/models/driver_test.rb @@ -1,9 +1,8 @@ -require "test_helper" +require "../test_helper" describe Driver do let (:new_driver) { - Driver.new(name: "Kari", vin: "123", active: true, - car_make: "Cherry", car_model: "DR5") + Driver.new(name: "Kari", vin: "123", active: true) } it "can be instantiated" do # Assert @@ -14,7 +13,7 @@ # Arrange new_driver.save driver = Driver.first - [:name, :vin, :active, :car_make, :car_model].each do |field| + [:name, :vin, :active].each do |field| # Assert expect(driver).must_respond_to field diff --git a/test/test_helper.rb b/test/test_helper.rb index 3ab84e3d1..afb743093 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -2,6 +2,10 @@ 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 From ca2e556194a857c4f7784f0efaa4c5835496cf12 Mon Sep 17 00:00:00 2001 From: Rinostar Date: Wed, 9 Oct 2019 15:22:15 -0700 Subject: [PATCH 24/69] added validation for Passenger --- app/models/passenger.rb | 3 + test/models/driver_test.rb | 2 +- test/models/passenger_test.rb | 105 +++++++++++++++++----------------- 3 files changed, 58 insertions(+), 52 deletions(-) diff --git a/app/models/passenger.rb b/app/models/passenger.rb index 2fef89192..5df27c9a8 100644 --- a/app/models/passenger.rb +++ b/app/models/passenger.rb @@ -1,3 +1,6 @@ class Passenger < ApplicationRecord has_many :trips + + validates :name, presence: true + validates :phone_num, presence: true end diff --git a/test/models/driver_test.rb b/test/models/driver_test.rb index f7de4679d..58031f0e0 100644 --- a/test/models/driver_test.rb +++ b/test/models/driver_test.rb @@ -1,4 +1,4 @@ -require "../test_helper" +require "test_helper" describe Driver do let (:new_driver) { diff --git a/test/models/passenger_test.rb b/test/models/passenger_test.rb index f13a98b16..e268f6ad4 100644 --- a/test/models/passenger_test.rb +++ b/test/models/passenger_test.rb @@ -1,67 +1,70 @@ -require "test_helper" +require "../test_helper" describe Passenger do let (:new_passenger) { - Passenger.new(name: "Kari", phone_number: "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_number].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"] - 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"] + 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 -end -# Tests for methods you create should go here -describe "custom methods" do - describe "request a ride" do - # Your code here + 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_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 - # You may have additional methods to test here -end -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 742205f18387619a174dface52ca70c27e7c9747 Mon Sep 17 00:00:00 2001 From: Rinostar Date: Wed, 9 Oct 2019 15:47:07 -0700 Subject: [PATCH 25/69] updated schema for Trip --- ..._default_cost_and_rating_columns_to_nil.rb | 6 ++++ ...lt_cost_and_rating_columns_to_nil_step2.rb | 6 ++++ db/schema.rb | 6 ++-- test/models/passenger_test.rb | 4 +-- test/models/trip_test.rb | 35 ++++++++++++++++--- 5 files changed, 48 insertions(+), 9 deletions(-) create mode 100644 db/migrate/20191009223318_default_cost_and_rating_columns_to_nil.rb create mode 100644 db/migrate/20191009223615_default_cost_and_rating_columns_to_nil_step2.rb diff --git a/db/migrate/20191009223318_default_cost_and_rating_columns_to_nil.rb b/db/migrate/20191009223318_default_cost_and_rating_columns_to_nil.rb new file mode 100644 index 000000000..6ccfc774d --- /dev/null +++ b/db/migrate/20191009223318_default_cost_and_rating_columns_to_nil.rb @@ -0,0 +1,6 @@ +class DefaultCostAndRatingColumnsToNil < ActiveRecord::Migration[5.2] + def change + remove_column :trips, :cost, :integer + remove_column :trips, :rating, :integer + end +end diff --git a/db/migrate/20191009223615_default_cost_and_rating_columns_to_nil_step2.rb b/db/migrate/20191009223615_default_cost_and_rating_columns_to_nil_step2.rb new file mode 100644 index 000000000..28a5c6c8f --- /dev/null +++ b/db/migrate/20191009223615_default_cost_and_rating_columns_to_nil_step2.rb @@ -0,0 +1,6 @@ +class DefaultCostAndRatingColumnsToNilStep2 < ActiveRecord::Migration[5.2] + def change + add_column :trips, :cost, :integer, default: nil + add_column :trips, :rating, :integer, default: nil + end +end diff --git a/db/schema.rb b/db/schema.rb index 46d28128c..dca3cf4bf 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_10_09_220840) do +ActiveRecord::Schema.define(version: 2019_10_09_223615) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -34,10 +34,10 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.date "date" - t.integer "rating" - t.integer "cost" t.bigint "passenger_id" t.bigint "driver_id" + t.integer "cost" + t.integer "rating" t.index ["driver_id"], name: "index_trips_on_driver_id" t.index ["passenger_id"], name: "index_trips_on_passenger_id" end diff --git a/test/models/passenger_test.rb b/test/models/passenger_test.rb index e268f6ad4..6a5762167 100644 --- a/test/models/passenger_test.rb +++ b/test/models/passenger_test.rb @@ -1,4 +1,4 @@ -require "../test_helper" +require "test_helper" describe Passenger do let (:new_passenger) { @@ -67,4 +67,4 @@ end # You may have additional methods to test here end -end \ No newline at end of file +end diff --git a/test/models/trip_test.rb b/test/models/trip_test.rb index 0b0b2da32..b223ca8ee 100644 --- a/test/models/trip_test.rb +++ b/test/models/trip_test.rb @@ -1,16 +1,43 @@ -require "test_helper" +require "../test_helper" describe Trip do + let (:new_trip) { + Trip.new( + date: Date.today, + rating: , + cost: nil, + passenger_id: 1, + driver_id: 1 + ) + } it "can be instantiated" do - # Your code here + # Assert + expect(new_trip.valid?).must_equal true end it "will have the required fields" do - # Your code here + # Arrange + new_trip.save + trip = Trip.first + [:date, :rating, :cost, :passenger_id, :driver_id].each do |field| + + # Assert + expect(trip).must_respond_to field + end end describe "relationships" do - # Your tests go here + it "can have one passenger" do + # Arrange + new_trip.save + trip = Trip.first + + # Assert + expect(trip.passengers.count).must_be :>, 0 + trip.passengers.each do |trip| + expect(passengers).must_be_instance_of Passenger + end + end end describe "validations" do From f76f9a188c89b49b80fa454c620429d803b96da7 Mon Sep 17 00:00:00 2001 From: Rinostar Date: Wed, 9 Oct 2019 17:57:57 -0700 Subject: [PATCH 26/69] updated model tests --- test/models/trip_test.rb | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/test/models/trip_test.rb b/test/models/trip_test.rb index b223ca8ee..2093f8efd 100644 --- a/test/models/trip_test.rb +++ b/test/models/trip_test.rb @@ -1,16 +1,29 @@ require "../test_helper" describe Trip do + let (:new_driver) { + Driver.new(name: "Kari", vin: "123", active: true) + } + + + let (:new_passenger) { + Passenger.new(name: "Kari", phone_num: "111-111-1211") + } + + let (:new_trip) { Trip.new( date: Date.today, - rating: , - cost: nil, - passenger_id: 1, - driver_id: 1 + cost: 10, + passenger_id: new_passenger.id, + driver_id: new_driver.id ) } + it "can be instantiated" do + #Arrange + new_driver.save + new_passenger.save # Assert expect(new_trip.valid?).must_equal true end @@ -19,7 +32,7 @@ # Arrange new_trip.save trip = Trip.first - [:date, :rating, :cost, :passenger_id, :driver_id].each do |field| + [:date, :passenger_id, :driver_id, :cost, :rating].each do |field| # Assert expect(trip).must_respond_to field From 4efa826f7f9a4c46f49d994508e43e5378081e09 Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Wed, 9 Oct 2019 20:26:27 -0700 Subject: [PATCH 27/69] Added link to Passenger Index View to see a passenger's detail. --- app/views/passengers/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/passengers/index.html.erb b/app/views/passengers/index.html.erb index 72f842a1e..70b52248a 100644 --- a/app/views/passengers/index.html.erb +++ b/app/views/passengers/index.html.erb @@ -4,7 +4,7 @@ <% @passengers.each do |passenger| %>
  • <%= passenger.id %>. - <%= passenger.name %> | + <%= link_to passenger.name, passenger_path(passenger) %> | <%= passenger.phone_num %> <%= link_to "Edit", edit_passenger_path(passenger) %> <%= link_to "Delete", passenger_path(passenger), method: :delete, data: { confirm: "Are you sure you want to delete #{passenger.name}?"} %> From 8f9495571accdb9a493eed6ed232aab3cd2a56ce Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Wed, 9 Oct 2019 21:46:33 -0700 Subject: [PATCH 28/69] Added iteration to list all trips for a given Passenger on Passenger Show view. --- app/views/passengers/show.html.erb | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index 976851ca3..b15c0aac0 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -4,4 +4,24 @@
  • ID: <%= @passenger.id %>
  • Name: <%= @passenger.name %>
  • Phone Number: <%= @passenger.phone_num %>
    • - \ No newline at end of file + # here's where I'd add the sum of all trips costs from the model + <%#
  • Total Amount Charged: <%= @passenger.trips.cost.sum%> + # here's where I want to see all of the trips the passenger went on + + + +
    + Trips: +
    +<% trip_array = Trip.where(passenger_id: @passenger.id).to_a %> +<% trip_array.each do |element| %> +
      +
    • Trip ID: <%= element.id %>
      • +
    • Trip Cost: $<%= (element.cost.to_f) / 100 %>
      • +
    • Rating: <%= element.rating %>
      • +
    • Driver Name: <%= element.driver.name %>
      • +
    +<% end %> + + +
    \ No newline at end of file From c265894e60a9bb065722e062afb5f519d25bf372 Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Wed, 9 Oct 2019 22:17:23 -0700 Subject: [PATCH 29/69] Links to delete and edit passenger on passenger show page. --- app/views/passengers/show.html.erb | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index b15c0aac0..07f8f6b93 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -1,12 +1,15 @@

    Passenger Information

      -
    • ID: <%= @passenger.id %>
      • -
    • Name: <%= @passenger.name %>
      • -
    • Phone Number: <%= @passenger.phone_num %>
      • - # here's where I'd add the sum of all trips costs from the model - <%#
    • Total Amount Charged: <%= @passenger.trips.cost.sum%> - # here's where I want to see all of the trips the passenger went on +
    • ID: <%= @passenger.id %>
      • +
    • Name: <%= @passenger.name %>
      • +
    • Phone Number: <%= @passenger.phone_num %>
      • +
    • Total Costs: (PUT SUM HERE)
      • + +
    • <%= link_to "Edit Passenger Info", edit_passenger_path(@passenger) %>
      • + <%= link_to "Delete passenger", passenger_path(@passenger), method: :delete, data: { confirm: "Are you sure you want to delete #{@passenger.name}?"} %> + +
    @@ -14,12 +17,14 @@ Trips:
    <% trip_array = Trip.where(passenger_id: @passenger.id).to_a %> -<% trip_array.each do |element| %> +<% trip_array.each do |trip| %>
      -
    • Trip ID: <%= element.id %>
      • -
    • Trip Cost: $<%= (element.cost.to_f) / 100 %>
      • -
    • Rating: <%= element.rating %>
      • -
    • Driver Name: <%= element.driver.name %>
      • + + +
    • Trip ID: <%= link_to trip.id, trip_path(trip) %>
      • +
    • Trip Cost: $<%= (trip.cost.to_f) / 100 %>
      • +
    • Rating: <%= trip.rating %>
      • +
    • Driver Name: <%= trip.driver.name %>
    <% end %> From 852c7dd11f19f5c43b30477845091183cfdd7b64 Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Wed, 9 Oct 2019 22:30:00 -0700 Subject: [PATCH 30/69] Display error messages when attemping to edit a passenger without a name or phone number --- app/views/passengers/edit.html.erb | 10 ++++++++++ app/views/passengers/show.html.erb | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/app/views/passengers/edit.html.erb b/app/views/passengers/edit.html.erb index ab8577a8c..d75fe5120 100644 --- a/app/views/passengers/edit.html.erb +++ b/app/views/passengers/edit.html.erb @@ -1 +1,11 @@ <%= render partial: "form", locals: { action_name: "Edit Passenger", verb: "update" } %> +<% if @passenger.errors.any? %> +

    Errors

    +
      + <% @passenger.errors.each do |column, message| %> +
    • + <%= column.capitalize %> <%= message %> +
      • + <% end %> +
    +<% end %> diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index 07f8f6b93..6dbbf57da 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -1,5 +1,12 @@

    Passenger Information

    + + + + + + +
    • ID: <%= @passenger.id %>
    • Name: <%= @passenger.name %>
      • From fa8d7e22382f132d5434ba00d2f1427d650d0613 Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Wed, 9 Oct 2019 22:35:38 -0700 Subject: [PATCH 31/69] Added error validation for when you create a new passenger. --- app/views/passengers/index.html.erb | 2 +- app/views/passengers/new.html.erb | 15 ++++++++++++++- app/views/passengers/show.html.erb | 7 ------- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/app/views/passengers/index.html.erb b/app/views/passengers/index.html.erb index 70b52248a..1be8bc3b0 100644 --- a/app/views/passengers/index.html.erb +++ b/app/views/passengers/index.html.erb @@ -1,5 +1,5 @@

      Passenger Index

      - +

      <%= link_to "New Passenger", new_passenger_path %>

        <% @passengers.each do |passenger| %>
      • diff --git a/app/views/passengers/new.html.erb b/app/views/passengers/new.html.erb index 7736e206f..5066b0893 100644 --- a/app/views/passengers/new.html.erb +++ b/app/views/passengers/new.html.erb @@ -1 +1,14 @@ -<%= render partial: "form", locals: { action_name: "New Passenger", verb: "Create" } %> \ No newline at end of file + + +<%= render partial: "form", locals: { action_name: "New Passenger", verb: "Create" } %> + +<% if @passenger.errors.any? %> +

        Errors

        +
          + <% @passenger.errors.each do |column, message| %> +
        • + <%= column.capitalize %> <%= message %> +
          • + <% end %> +
        +<% end %> \ No newline at end of file diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index 6dbbf57da..07f8f6b93 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -1,12 +1,5 @@

        Passenger Information

        - - - - - - -
        • ID: <%= @passenger.id %>
        • Name: <%= @passenger.name %>
          • From 1099bfc525741c715713c44b4b5008a68e0d98a9 Mon Sep 17 00:00:00 2001 From: Rinostar Date: Wed, 9 Oct 2019 22:46:38 -0700 Subject: [PATCH 32/69] Fixed and passed test for Trip Model --- test/models/trip_test.rb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/test/models/trip_test.rb b/test/models/trip_test.rb index 2093f8efd..2e1910b77 100644 --- a/test/models/trip_test.rb +++ b/test/models/trip_test.rb @@ -1,4 +1,4 @@ -require "../test_helper" +require "test_helper" describe Trip do let (:new_driver) { @@ -30,6 +30,8 @@ it "will have the required fields" do # Arrange + new_driver.save + new_passenger.save new_trip.save trip = Trip.first [:date, :passenger_id, :driver_id, :cost, :rating].each do |field| @@ -42,14 +44,13 @@ describe "relationships" do it "can have one passenger" do # Arrange + new_driver.save + new_passenger.save new_trip.save trip = Trip.first # Assert - expect(trip.passengers.count).must_be :>, 0 - trip.passengers.each do |trip| - expect(passengers).must_be_instance_of Passenger - end + expect(trip.passenger).must_be_instance_of Passenger end end @@ -61,4 +62,4 @@ describe "custom methods" do # Your tests here end -end +end \ No newline at end of file From f0614c949234141c89f162af638e0de194095b3f Mon Sep 17 00:00:00 2001 From: Rinostar Date: Wed, 9 Oct 2019 22:51:56 -0700 Subject: [PATCH 33/69] * Follow-up fix on test for Trip Model --- test/models/trip_test.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/models/trip_test.rb b/test/models/trip_test.rb index 2e1910b77..07364438b 100644 --- a/test/models/trip_test.rb +++ b/test/models/trip_test.rb @@ -52,6 +52,17 @@ # Assert expect(trip.passenger).must_be_instance_of Passenger end + + it "can have one driver" do + # Arrange + new_driver.save + new_passenger.save + new_trip.save + trip = Trip.first + + # Assert + expect(trip.driver).must_be_instance_of Driver + end end describe "validations" do From 168695a1a8823360dfaf74947088fdafb7c66ff2 Mon Sep 17 00:00:00 2001 From: Rinostar Date: Wed, 9 Oct 2019 23:28:01 -0700 Subject: [PATCH 34/69] added functionalities for Driver (driver story) --- app/views/drivers/index.html.erb | 4 ++-- app/views/drivers/show.html.erb | 19 +++++++++++++++++-- app/views/trips/show.html.erb | 4 ++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb index dd94370c9..a0ea207ef 100644 --- a/app/views/drivers/index.html.erb +++ b/app/views/drivers/index.html.erb @@ -1,10 +1,10 @@ -

          Driver Index

          +

          Drivers List

            <% @drivers.each do |driver| %>
          • <%= driver.id %>. - <%= driver.name %> | + <%= link_to "#{driver.name}", driver_path(driver) %> | <%= driver.vin %> | <%= link_to "Edit", edit_driver_path(driver) %> <%= link_to "Delete", driver_path(driver), method: :delete, data: { confirm: "Are you sure you want to delete #{driver.name}?"} %> diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index c0fc93cd2..f87385adc 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -3,5 +3,20 @@
            • ID: <%= @driver.id %>
            • Name: <%= @driver.name %>
              • -
            • VIN: <%= @driver.vin %>
              • -
            \ No newline at end of file +
          • vin: <%= @driver.vin %>
            • + <%= link_to "Edit", edit_driver_path(@driver) %> + <%= link_to "Delete", driver_path(@driver), method: :delete, data: { confirm: "Are you sure you want to delete #{@driver.name}?"} %> +
          + +
          + Trips: + <% @driver.trips.each do |trip| %> +
        • ID: <%= link_to "#{trip.id}", trip_path(trip) %>
          • +
        • Date: <%= trip.date %>
          • +
        • Passenger: <%= trip.passenger.name %> - ID: <%= trip.passenger.id %>
          • +
        • Cost: <%= trip.cost %>
          • +
        • Rating: <%= trip.rating %>
          • + <% end %> +
          + +<%= link_to "Back to drivers list", drivers_path %> \ No newline at end of file diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb index 039060fb4..57a7f8c9d 100644 --- a/app/views/trips/show.html.erb +++ b/app/views/trips/show.html.erb @@ -4,6 +4,6 @@
        • Date: <%= @trip.date %>
        • Rating: <%= @trip.rating %>
        • Cost: <%= @trip.cost %>
          • -
        • Passenger: <%= @trip.passenger %>
          • -
        • Driver: <%= @trip.driver%>
          • +
        • Passenger: <%= @trip.passenger.name %> - ID: <%= @trip.passenger.id %>
          • +
        • Driver: <%= @trip.driver.name %> - ID: <%= @trip.driver.id %>
        \ No newline at end of file From 68255514610c05cee801b93adfab6ecf0015b203 Mon Sep 17 00:00:00 2001 From: Rinostar Date: Wed, 9 Oct 2019 23:45:37 -0700 Subject: [PATCH 35/69] Added funcationalities for Driver (admin story) --- app/views/drivers/_form.html.erb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/views/drivers/_form.html.erb b/app/views/drivers/_form.html.erb index 555b5e175..b0e75b3b2 100644 --- a/app/views/drivers/_form.html.erb +++ b/app/views/drivers/_form.html.erb @@ -1,3 +1,14 @@ +<% if @driver.errors.any? %> +

        Errors

        +
          + <% @driver.errors.each do |column, message| %> +
        • + <%= column.capitalize %> <%= message %> +
          • + <% end %> +
        +<% end %> +

        <%= verb %> a new driver

        From 72fa77a7eba3a15494776be728d56098ecf2bf31 Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Thu, 10 Oct 2019 14:12:59 -0700 Subject: [PATCH 36/69] Incluing notes from afternoon discussion- passenger show view --- app/views/passengers/show.html.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index 07f8f6b93..d0ebaaac2 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -14,6 +14,8 @@
        + <%# add a trip here %> + Trips:
        <% trip_array = Trip.where(passenger_id: @passenger.id).to_a %> From d3195fdd430983fe27146004a1ba7f9c5c0f4904 Mon Sep 17 00:00:00 2001 From: Rinostar Date: Thu, 10 Oct 2019 16:27:17 -0700 Subject: [PATCH 37/69] added total_earning & average_rating to Driver (model & view) --- app/models/driver.rb | 28 ++++++++++++++++++++++++++++ app/views/drivers/show.html.erb | 8 ++++++++ 2 files changed, 36 insertions(+) diff --git a/app/models/driver.rb b/app/models/driver.rb index d94703408..af829eb40 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -3,4 +3,32 @@ class Driver < ApplicationRecord validates :name, presence: true validates :vin, presence: true + + def total_earning + sum = 0 + self.trips.each do |trip| + if trip.cost != nil + sum += (trip.cost - 1.65) * 0.8 + end + end + return sum + end + + def average_rating + sum = 0 + count = 0 + self.trips.each do |trip| + if trip.rating != nil + sum += (trip.rating) + count += 1 + end + end + + + if count == 0 + return "There is no rating info avaliable" + else + return (sum / count) + 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 f87385adc..650cd4e0f 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -8,6 +8,14 @@ <%= link_to "Delete", driver_path(@driver), method: :delete, data: { confirm: "Are you sure you want to delete #{@driver.name}?"} %>
      +

      Total_Earning: + $<%= @driver.total_earning %> +

      + +

      Average_Rating: + <%= @driver.average_rating%> +

      +
      Trips: <% @driver.trips.each do |trip| %> From 9bb11121a47b0777ca4ab6ba6904e812fd619162 Mon Sep 17 00:00:00 2001 From: Rinostar Date: Thu, 10 Oct 2019 17:00:44 -0700 Subject: [PATCH 38/69] enable driver to be deleted (driver model) --- app/models/driver.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/driver.rb b/app/models/driver.rb index af829eb40..a1f3eb850 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -1,5 +1,5 @@ class Driver < ApplicationRecord - has_many :trips + has_many :trips, dependent: :nullify validates :name, presence: true validates :vin, presence: true From 3a6d8c2d60627b0cc06cad1dd82cea6fd8dcac24 Mon Sep 17 00:00:00 2001 From: Rinostar Date: Thu, 10 Oct 2019 17:19:18 -0700 Subject: [PATCH 39/69] added class method "available_driver" to driver model --- app/models/driver.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/models/driver.rb b/app/models/driver.rb index a1f3eb850..663481b41 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -31,4 +31,15 @@ def average_rating return (sum / count) end end + + def self.available_driver + driver = nil + driver = Driver.find_by(active: false) + + if driver = nil + return "There is no available driver at the moment" + else + return driver + end + end end \ No newline at end of file From 6bc7f5290907452d42e766b893101250b5571d25 Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Thu, 10 Oct 2019 18:30:21 -0700 Subject: [PATCH 40/69] Added total_cost method to Passenger Model --- app/models/driver.rb | 10 +++++----- app/models/passenger.rb | 15 ++++++++++++++- app/views/passengers/show.html.erb | 2 +- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/app/models/driver.rb b/app/models/driver.rb index 663481b41..10335de9c 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -1,9 +1,9 @@ class Driver < ApplicationRecord has_many :trips, dependent: :nullify - + validates :name, presence: true validates :vin, presence: true - + def total_earning sum = 0 self.trips.each do |trip| @@ -13,7 +13,7 @@ def total_earning end return sum end - + def average_rating sum = 0 count = 0 @@ -31,11 +31,11 @@ def average_rating return (sum / count) end end - + def self.available_driver driver = nil driver = Driver.find_by(active: false) - + if driver = nil return "There is no available driver at the moment" else diff --git a/app/models/passenger.rb b/app/models/passenger.rb index 5df27c9a8..f80096b10 100644 --- a/app/models/passenger.rb +++ b/app/models/passenger.rb @@ -1,6 +1,19 @@ class Passenger < ApplicationRecord has_many :trips - + validates :name, presence: true validates :phone_num, presence: true + + + def total_cost + sum = 0 + self.trips.each do |trip| + if trip.cost != nil + sum += trip.cost + end + end + return sum + end + + end diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index d0ebaaac2..0832d8e11 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -4,7 +4,7 @@
    • ID: <%= @passenger.id %>
    • Name: <%= @passenger.name %>
    • Phone Number: <%= @passenger.phone_num %>
      • -
    • Total Costs: (PUT SUM HERE)
      • +
    • Total Costs: <%= @passenger.total_cost %>
    • <%= link_to "Edit Passenger Info", edit_passenger_path(@passenger) %>
      • <%= link_to "Delete passenger", passenger_path(@passenger), method: :delete, data: { confirm: "Are you sure you want to delete #{@passenger.name}?"} %> From 2a7fee3836ac256eb61aa64f919d90b0eafe724a Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Thu, 10 Oct 2019 20:39:24 -0700 Subject: [PATCH 41/69] Commit for now. --- app/controllers/homepages_controller.rb | 6 + app/controllers/trips_controller.rb | 9 +- app/views/passengers/show.html.erb | 11 +- config/routes.rb | 6 + test/controllers/drivers_controller_test.rb | 270 ++++++++++---------- 5 files changed, 159 insertions(+), 143 deletions(-) diff --git a/app/controllers/homepages_controller.rb b/app/controllers/homepages_controller.rb index 8663bd848..10eee6b35 100644 --- a/app/controllers/homepages_controller.rb +++ b/app/controllers/homepages_controller.rb @@ -1,2 +1,8 @@ class HomepagesController < ApplicationController + + # def index + # @drivers = Driver.all + # @passengers= Passenger.all + # end + end diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index db38f241d..5decf87b1 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -9,8 +9,13 @@ def show end def new - @trip = Trip.new - end + if params[:id] + passenger = Passenger.find_by(id: passenger.id) + @trip = passenger.trips.new + else + @trip = Trip.new + end + end def create @trip = Trip.new(trip_params) diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index 0832d8e11..8730229d7 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -9,15 +9,14 @@
    • <%= link_to "Edit Passenger Info", edit_passenger_path(@passenger) %>
      • <%= link_to "Delete passenger", passenger_path(@passenger), method: :delete, data: { confirm: "Are you sure you want to delete #{@passenger.name}?"} %> +
    • <%= link_to "Add New Passenger", new_passenger_path(@passenger) %>
      • +
    • <%= link_to "Add a Trip", new_passenger_trip_path %>
    - - +<%# request method lives in passenger show page, and call for the Driver.available_driver method and the create action for trip. %>
    - <%# add a trip here %> - - Trips: -
    +Trips: +
    <% trip_array = Trip.where(passenger_id: @passenger.id).to_a %> <% trip_array.each do |trip| %>
      diff --git a/config/routes.rb b/config/routes.rb index 018a01157..321ff921c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,8 +1,14 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + resources :passengers do + resources :trips, only: [ :new] + end + + resources :passengers resources :drivers resources :trips + end diff --git a/test/controllers/drivers_controller_test.rb b/test/controllers/drivers_controller_test.rb index 6dc19995d..9b3482508 100644 --- a/test/controllers/drivers_controller_test.rb +++ b/test/controllers/drivers_controller_test.rb @@ -1,172 +1,172 @@ -require "../test_helper" +require "test_helper" describe DriversController do describe "index" do let (:driver) { Driver.create name: "George", vin: "123456789" } - + it "responds with success when there are many drivers in the database" do driver - + get drivers_path - + must_respond_with :success end - + it "responds with success when there are no drivers in the database" do driver.destroy - + get drivers_path - + must_respond_with :success end end - - + + describe "show" do let (:driver) { Driver.create name: "Wallis", vin: "987654321" } - + it "responds with success when showing an existing valid driver" do get driver_path(driver.id) - + must_respond_with :success end - + it "responds with 404 with an invalid driver id" do get driver_path(-1) - + must_respond_with :missing end end - - + + describe "new" do it "responds with success" do 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 - -# end -# 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 - -# 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 - -# # 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 - -# 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 -# 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 + + end + 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 + + 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 + + # 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 + + 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 + end end From ed745fc460c58118e9107a3cb38bc14cf8c46dd1 Mon Sep 17 00:00:00 2001 From: Rinostar Date: Thu, 10 Oct 2019 20:41:41 -0700 Subject: [PATCH 42/69] tests for drivers controller (1/2) --- app/controllers/drivers_controller.rb | 1 - test/controllers/drivers_controller_test.rb | 198 ++++++++++---------- 2 files changed, 99 insertions(+), 100 deletions(-) diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 3b2fca057..65a7138cd 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -32,7 +32,6 @@ def edit @driver = Driver.find_by(id: params[:id]) if @driver.nil? - flash[:error] = "Could not find driver ID #{ @driver.id }" redirect_to drivers_path return end diff --git a/test/controllers/drivers_controller_test.rb b/test/controllers/drivers_controller_test.rb index 6dc19995d..372bf4c68 100644 --- a/test/controllers/drivers_controller_test.rb +++ b/test/controllers/drivers_controller_test.rb @@ -1,7 +1,8 @@ -require "../test_helper" +require "test_helper" describe DriversController do - describe "index" do + + describe "index action" do let (:driver) { Driver.create name: "George", vin: "123456789" } @@ -23,8 +24,7 @@ end end - - describe "show" do + describe "show action" do let (:driver) { Driver.create name: "Wallis", vin: "987654321" } @@ -43,130 +43,130 @@ end end - - describe "new" do + describe "new action" 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 + describe "create action" do + it "can create a new driver with valid information accurately, and redirect" do + driver_hash = { + driver: { + name: "SpongeBob", + vin: "1234567890" + } + } -# end + expect { + post drivers_path, params: driver_hash + }.must_differ 'Driver.count', 1 -# 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 - -# end -# end + must_redirect_to driver_path(Driver.find_by(name: "SpongeBob")) + end + 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 + describe "edit action" do + let (:driver) { + Driver.create name: "Patrick Star", vin: "9876543210" + } -# 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 + it "responds with success when getting the edit page for an existing, valid driver" do + get edit_driver_path(driver) -# # Act + must_respond_with :success + end -# # Assert + it "responds with redirect when getting the edit page for a non-existing driver" do + get edit_driver_path(-1) -# end -# end + must_respond_with :redirect + 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 + describe "update" do + let (:driver) { + Driver.create name: "Sammy Sam", vin: "235320" + } -# # Act-Assert -# # Ensure that there is no change in Driver.count + it "can update an existing driver with valid information accurately, and redirect" do + existing_driver = Driver.first + updated_driver_form_data = { + driver: { + name: "Spammy Spam", + vin: "000000" + } + } + + expect { + patch driver_path(existing_driver.id), params: updated_driver_form_data + }.wont_change 'Driver.count' + + expect ( + Driver.find_by(id: existing_driver.id).name + ).must_equal "Spammy Spam" -# # 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 + expect ( + Driver.find_by(id: existing_driver.id).vin + ).must_equal "000000" -# end + must_respond_with :redirect + 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 + # 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 + # # Act-Assert + # # Ensure that there is no change in Driver.count -# # Assert -# # Check that the controller gave back a 404 + # # Assert + # # Check that the controller gave back a 404 -# end + # 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 + # 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 + # # Act-Assert + # # Ensure that there is no change in Driver.count -# # Assert -# # Check that the controller redirects + # # Assert + # # Check that the controller redirects -# end -# end + # 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 + # 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 + # # Act-Assert + # # Ensure that there is a change of -1 in Driver.count -# # Assert -# # Check that the controller redirects + # # Assert + # # Check that the controller redirects -# end + # 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 + # 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 + # # Act-Assert + # # Ensure that there is no change in Driver.count -# # Assert -# # Check that the controller responds or redirects with whatever your group decides + # # Assert + # # Check that the controller responds or redirects with whatever your group decides -# end -# end + # end + # end end From 5ee948c1eb25e7af85ff6d891dcf3ac38558243f Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Thu, 10 Oct 2019 20:54:44 -0700 Subject: [PATCH 43/69] modify Passenger views to have error messages in the form. --- app/controllers/trips_controller.rb | 2 +- app/views/passengers/_form.html.erb | 11 +++++++++++ app/views/passengers/edit.html.erb | 11 +---------- app/views/passengers/new.html.erb | 10 ---------- app/views/passengers/show.html.erb | 2 +- 5 files changed, 14 insertions(+), 22 deletions(-) diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 5decf87b1..1c45d44a2 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -10,7 +10,7 @@ def show def new if params[:id] - passenger = Passenger.find_by(id: passenger.id) + passenger = Passenger.find_by(passenger_id: passenger.id) @trip = passenger.trips.new else @trip = Trip.new diff --git a/app/views/passengers/_form.html.erb b/app/views/passengers/_form.html.erb index c7fa3c96a..9969f4516 100644 --- a/app/views/passengers/_form.html.erb +++ b/app/views/passengers/_form.html.erb @@ -1,5 +1,16 @@

      <%= verb %> a new passenger

      +<% if @passenger.errors.any? %> +

      Errors

      +
        + <% @passenger.errors.each do |column, message| %> +
      • + <%= column.capitalize %> <%= message %> +
        • + <% end %> +
      +<% end %> +
      <%= form_for @passenger do |f| %> Name: <%= f.text_field :name %>
      diff --git a/app/views/passengers/edit.html.erb b/app/views/passengers/edit.html.erb index d75fe5120..5178a47c8 100644 --- a/app/views/passengers/edit.html.erb +++ b/app/views/passengers/edit.html.erb @@ -1,11 +1,2 @@ <%= render partial: "form", locals: { action_name: "Edit Passenger", verb: "update" } %> -<% if @passenger.errors.any? %> -

      Errors

      -
        - <% @passenger.errors.each do |column, message| %> -
      • - <%= column.capitalize %> <%= message %> -
        • - <% end %> -
      -<% end %> + diff --git a/app/views/passengers/new.html.erb b/app/views/passengers/new.html.erb index 5066b0893..9dcf246e6 100644 --- a/app/views/passengers/new.html.erb +++ b/app/views/passengers/new.html.erb @@ -2,13 +2,3 @@ <%= render partial: "form", locals: { action_name: "New Passenger", verb: "Create" } %> -<% if @passenger.errors.any? %> -

      Errors

      -
        - <% @passenger.errors.each do |column, message| %> -
      • - <%= column.capitalize %> <%= message %> -
        • - <% end %> -
      -<% end %> \ No newline at end of file diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index 8730229d7..031fed7da 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -11,7 +11,7 @@
    • <%= link_to "Add New Passenger", new_passenger_path(@passenger) %>
      • -
    • <%= link_to "Add a Trip", new_passenger_trip_path %>
      • +
    • <%= link_to "Add a Trip", new_passenger_trip_path(@passenger) %>
    <%# request method lives in passenger show page, and call for the Driver.available_driver method and the create action for trip. %>
    From b5ce71b996d2eff17519a77d6a6fcb52cf8827e6 Mon Sep 17 00:00:00 2001 From: Rinostar Date: Thu, 10 Oct 2019 21:16:57 -0700 Subject: [PATCH 44/69] tests (2/3) --- test/controllers/drivers_controller_test.rb | 41 +++++++-------------- 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/test/controllers/drivers_controller_test.rb b/test/controllers/drivers_controller_test.rb index 372bf4c68..5b4a937ea 100644 --- a/test/controllers/drivers_controller_test.rb +++ b/test/controllers/drivers_controller_test.rb @@ -115,34 +115,21 @@ must_respond_with :redirect 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 - - # # 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 + it "does not update any driver if given an invalid id, and responds with a 404" do + updated_driver_form_data = { + driver: { + name: "Spammy Spam", + vin: "000000" + } + } - # # Assert - # # Check that the controller redirects + expect { + patch driver_path(-1), params: updated_driver_form_data + }.wont_change 'Driver.count' - # end - # end + must_respond_with :missing + end + end # describe "destroy" do # it "destroys the driver instance in db when driver exists, then redirects" do @@ -169,4 +156,4 @@ # end # end -end +end \ No newline at end of file From dfb72617ea6072450b9ab6916845e481a8a985fd Mon Sep 17 00:00:00 2001 From: Rinostar Date: Thu, 10 Oct 2019 22:28:31 -0700 Subject: [PATCH 45/69] add_trip method for Passenger (1/2) --- app/models/driver.rb | 6 +---- app/models/passenger.rb | 21 ++++++++++++++--- app/views/passengers/show.html.erb | 38 ++++++++++++------------------ 3 files changed, 34 insertions(+), 31 deletions(-) diff --git a/app/models/driver.rb b/app/models/driver.rb index 10335de9c..1308d3a83 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -36,10 +36,6 @@ def self.available_driver driver = nil driver = Driver.find_by(active: false) - if driver = nil - return "There is no available driver at the moment" - else - return driver - end + return driver end end \ No newline at end of file diff --git a/app/models/passenger.rb b/app/models/passenger.rb index f80096b10..d174da448 100644 --- a/app/models/passenger.rb +++ b/app/models/passenger.rb @@ -1,5 +1,5 @@ class Passenger < ApplicationRecord - has_many :trips + has_many :trips, dependent: :nullify validates :name, presence: true validates :phone_num, presence: true @@ -14,6 +14,21 @@ def total_cost end return sum end - - + + def add_trip + if Driver.available_driver != nil + trip_hash = { + date: Date.today, + passenger_id: self.id, + driver_id: Driver.available_driver.id, + cost: rand(1..999), + rating: nil + } + new_trip = Trip.create(trip_hash) + Driver.available_driver.active = true + return new_trip + else + return "There is no available driver" + end + end end diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index 031fed7da..55fe40172 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -4,30 +4,22 @@
  • ID: <%= @passenger.id %>
  • Name: <%= @passenger.name %>
  • Phone Number: <%= @passenger.phone_num %>
    • -
  • Total Costs: <%= @passenger.total_cost %>
    • - -
  • <%= link_to "Edit Passenger Info", edit_passenger_path(@passenger) %>
    • - <%= link_to "Delete passenger", passenger_path(@passenger), method: :delete, data: { confirm: "Are you sure you want to delete #{@passenger.name}?"} %> - -
  • <%= link_to "Add New Passenger", new_passenger_path(@passenger) %>
    • - -
  • <%= link_to "Add a Trip", new_passenger_trip_path(@passenger) %>
    • + <%= link_to "Edit", edit_passenger_path(@passenger) %> | + <%= link_to "Delete", passenger_path(@passenger), method: :delete, data: { confirm: "Are you sure you want to delete #{@passenger.name}?"} %> -<%# request method lives in passenger show page, and call for the Driver.available_driver method and the create action for trip. %> -
    -Trips: -
    -<% trip_array = Trip.where(passenger_id: @passenger.id).to_a %> -<% trip_array.each do |trip| %> -
      - -
    • Trip ID: <%= link_to trip.id, trip_path(trip) %>
      • -
    • Trip Cost: $<%= (trip.cost.to_f) / 100 %>
      • -
    • Rating: <%= trip.rating %>
      • -
    • Driver Name: <%= trip.driver.name %>
      • -
    -<% end %> +

    Total_Cost: $<%= @passenger.total_cost %>

    + +
    + Trips: + <% @passenger.trips.each do |trip| %> +
  • ID: <%= link_to "#{trip.id}", trip_path(trip) %>
    • +
  • Date: <%= trip.date %>
    • +
  • Driver: <%= trip.driver.name %> - ID: <%= trip.driver.id %>
    • +
  • Cost: <%= trip.cost %>
    • +
  • Rating: <%= trip.rating %>
    • + <% end %> +
    -
    \ No newline at end of file +<%= link_to "Back to drivers list", drivers_path %> \ No newline at end of file From 48cc97c62996adaac34a651662792d13cba1a354 Mon Sep 17 00:00:00 2001 From: Rinostar Date: Thu, 10 Oct 2019 22:47:06 -0700 Subject: [PATCH 46/69] functionalities for trip (2/3) --- app/controllers/trips_controller.rb | 2 +- app/views/trips/index.html.erb | 2 +- app/views/trips/show.html.erb | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 1c45d44a2..496d83dd6 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -42,7 +42,7 @@ def update @trip = Trip.find_by(id: params[:id]) if @trip.update(trip_params) - redirect_to trips_path(@trip) + redirect_to trip_path(@trip) return else render :edit diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb index 17d56f408..d34bbae26 100644 --- a/app/views/trips/index.html.erb +++ b/app/views/trips/index.html.erb @@ -3,7 +3,7 @@
      <% @trips.each do |trip| %>
    • - <%= trip.id %>. + ID: <%= link_to "#{trip.id}", trip_path(trip) %> | Date: <%= trip.date %> | Rating: <%= trip.rating %> | Cost: <%= trip.cost %> | diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb index 57a7f8c9d..6aba85877 100644 --- a/app/views/trips/show.html.erb +++ b/app/views/trips/show.html.erb @@ -4,6 +4,8 @@
    • Date: <%= @trip.date %>
    • Rating: <%= @trip.rating %>
    • Cost: <%= @trip.cost %>
      • -
    • Passenger: <%= @trip.passenger.name %> - ID: <%= @trip.passenger.id %>
      • -
    • Driver: <%= @trip.driver.name %> - ID: <%= @trip.driver.id %>
      • -
    \ No newline at end of file +
  • Passenger: <%= link_to "#{@trip.passenger.name}", passenger_path(@trip.passenger) %> - ID: <%= @trip.passenger.id %>
    • +
  • Driver: <%= link_to "#{@trip.driver.name}", driver_path(@trip.driver) %>- ID: <%= @trip.driver.id %>
    • + + +<%= link_to "Back to drivers list", trips_path %> \ No newline at end of file From d949e7c6c3b48fac569806515d4197c49c7e6436 Mon Sep 17 00:00:00 2001 From: Rinostar Date: Thu, 10 Oct 2019 23:00:31 -0700 Subject: [PATCH 47/69] setup homepage --- app/controllers/homepages_controller.rb | 9 +++++---- app/views/homepages/index.html.erb | 5 +++++ config/routes.rb | 6 ++++-- 3 files changed, 14 insertions(+), 6 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 10eee6b35..f11b393ae 100644 --- a/app/controllers/homepages_controller.rb +++ b/app/controllers/homepages_controller.rb @@ -1,8 +1,9 @@ class HomepagesController < ApplicationController - # def index - # @drivers = Driver.all - # @passengers= Passenger.all - # end + def index + @drivers = Driver.all + @passengers = Passenger.all + @trips = Trip.all + end end diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb new file mode 100644 index 000000000..82d6eb358 --- /dev/null +++ b/app/views/homepages/index.html.erb @@ -0,0 +1,5 @@ +

    Community RideShare

    + +

    <%= link_to "All Drivers", drivers_path %>

    +

    <%= link_to "All Passengers", passengers_path %>

    +

    <%= link_to "All Trips", trips_path %>

    \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 321ff921c..5f300bb6e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,8 @@ 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, only: [ :new] end @@ -9,6 +11,6 @@ resources :passengers resources :drivers resources :trips - + resources :homepages, only: [:index] end From 1e7f7e99f0fa0719fae0bf3b59c157ba3700834f Mon Sep 17 00:00:00 2001 From: Rinostar Date: Fri, 11 Oct 2019 11:31:33 -0700 Subject: [PATCH 48/69] fix set status method for Driver (1/2) --- app/controllers/drivers_controller.rb | 16 +++++++++++++++- app/models/driver.rb | 21 +++++++++++++++++---- app/models/passenger.rb | 3 +-- config/routes.rb | 17 ++++++++--------- 4 files changed, 41 insertions(+), 16 deletions(-) diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 65a7138cd..c06150f16 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -59,9 +59,23 @@ def destroy end @driver.destroy - redirect_to drivers_path + redirect_to driver_path(@driver) return end + + def set_status + @driver = Driver.find_by(id: params[:id]) + + if @driver.nil? + flash[:error] = "Could not find driver ID #{ @driver.id }" + redirect_to drivers_path + return + end + + @driver.change_status + redirect_to driver_path(driver) + return + end private diff --git a/app/models/driver.rb b/app/models/driver.rb index 1308d3a83..a256a62d2 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -24,7 +24,6 @@ def average_rating end end - if count == 0 return "There is no rating info avaliable" else @@ -32,10 +31,24 @@ def average_rating end end - def self.available_driver - driver = nil + def self.available_driver driver = Driver.find_by(active: false) - return driver + if driver + driver.become_active + return driver + else + return nil + end + end + + def become_active + self.active = false + + if self.save + return self + else + return false + end end end \ No newline at end of file diff --git a/app/models/passenger.rb b/app/models/passenger.rb index d174da448..abfb23705 100644 --- a/app/models/passenger.rb +++ b/app/models/passenger.rb @@ -4,7 +4,6 @@ class Passenger < ApplicationRecord validates :name, presence: true validates :phone_num, presence: true - def total_cost sum = 0 self.trips.each do |trip| @@ -31,4 +30,4 @@ def add_trip return "There is no available driver" end end -end +end \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 5f300bb6e..7d48c9e75 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,16 +1,15 @@ 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, only: [ :new] - end + resources :homepages, only: [:index] - resources :passengers resources :drivers - resources :trips - resources :homepages, only: [:index] + patch '/drivers/:id/status', to: 'drivers#set_status', as: 'set_status' -end + resources :passengers do + resources :trips, only: [:create] + end + + resources :trips +end \ No newline at end of file From 2073cb6355470d5c50e5385c641e9e4378807f56 Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Fri, 11 Oct 2019 11:42:30 -0700 Subject: [PATCH 49/69] Driver Test, can update an existing driver with valid information accurately and redirect. --- test/controllers/drivers_controller_test.rb | 41 +++++++++------------ 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/test/controllers/drivers_controller_test.rb b/test/controllers/drivers_controller_test.rb index b27f120db..53456ebcf 100644 --- a/test/controllers/drivers_controller_test.rb +++ b/test/controllers/drivers_controller_test.rb @@ -95,29 +95,24 @@ } it "can update an existing driver with valid information accurately, and redirect" do - existing_driver = Driver.first - updated_driver_form_data = { + driver_hash = { driver: { name: "Spammy Spam", vin: "000000" } } - expect { - patch driver_path(existing_driver.id), params: updated_driver_form_data - }.wont_change 'Driver.count' + patch driver_path(driver.id), params: driver_hash - expect ( - Driver.find_by(id: existing_driver.id).name - ).must_equal "Spammy Spam" - - expect ( - Driver.find_by(id: existing_driver.id).vin - ).must_equal "000000" + updated_driver = Driver.find_by(id: driver.id) + expect(updated_driver.name).must_equal driver_hash[:driver][:name] + expect(updated_driver.vin).must_equal driver_hash[:driver][:vin] must_respond_with :redirect + must_redirect_to drivers_path(driver) + end - + it "does not update any driver if given an invalid id, and responds with a 404" do updated_driver_form_data = { driver: { @@ -125,38 +120,38 @@ vin: "000000" } } - + expect { patch driver_path(-1), params: updated_driver_form_data }.wont_change 'Driver.count' - + must_respond_with :missing 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 # end end From 4f661a1d0f09b0b259eed3cc56d054f70cef7fa4 Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Fri, 11 Oct 2019 11:57:00 -0700 Subject: [PATCH 50/69] Destroy test passing. --- test/controllers/drivers_controller_test.rb | 82 ++++++++++++--------- 1 file changed, 47 insertions(+), 35 deletions(-) diff --git a/test/controllers/drivers_controller_test.rb b/test/controllers/drivers_controller_test.rb index 53456ebcf..4418fe60e 100644 --- a/test/controllers/drivers_controller_test.rb +++ b/test/controllers/drivers_controller_test.rb @@ -114,45 +114,57 @@ end it "does not update any driver if given an invalid id, and responds with a 404" do - updated_driver_form_data = { - driver: { - name: "Spammy Spam", - vin: "000000" - } - } + # update drivers controller wtih something like this + # if driver.nil? + # flash[:error] = "Could not driver task with drier_id: #{driver.id}" + # redirect_to drivers_path + # return - expect { - patch driver_path(-1), params: updated_driver_form_data - }.wont_change 'Driver.count' + # updated_driver_form_data = { + # driver: { + # name: "Spammy Spam", + # vin: "007700" + # } + # } + + # patch driver_path(-1), params: updated_driver_form_data + + # must_respond_with :redirect + # must_redirect_to drivers_path - must_respond_with :missing 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 - # end + describe "destroy" do + it "destroys the driver instance in db when driver exists, then redirects" do + # Arrange + count = Driver.count + new_driver = Driver.create name: "Spammy Spam", vin: "007700" + + # Ensure there is an existing driver saved + expect(Driver.count).must_equal (count + 1) + + expect{ + delete driver_path(new_driver.id) + }.must_change "Driver.count", 1 + must_respond_with :redirect + must_redirect_to driver_path(new_driver) + + + 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 + end end From 857850204d42e34aef9f5ed0560f656a283c8170 Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Fri, 11 Oct 2019 12:00:08 -0700 Subject: [PATCH 51/69] Destroy test --- test/controllers/drivers_controller_test.rb | 23 +++++++++------------ 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/test/controllers/drivers_controller_test.rb b/test/controllers/drivers_controller_test.rb index 4418fe60e..29ec40691 100644 --- a/test/controllers/drivers_controller_test.rb +++ b/test/controllers/drivers_controller_test.rb @@ -149,22 +149,19 @@ }.must_change "Driver.count", 1 must_respond_with :redirect must_redirect_to driver_path(new_driver) + 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 - - # 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 end end From f08ab4f8d76a52c6d36fc9fa64d1af120cd9e576 Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Fri, 11 Oct 2019 13:25:20 -0700 Subject: [PATCH 52/69] Drivers controller_test --- test/controllers/drivers_controller_test.rb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/test/controllers/drivers_controller_test.rb b/test/controllers/drivers_controller_test.rb index 29ec40691..db415b237 100644 --- a/test/controllers/drivers_controller_test.rb +++ b/test/controllers/drivers_controller_test.rb @@ -151,14 +151,16 @@ must_redirect_to driver_path(new_driver) 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 + it "does not change the db when the driver does not exist " do + + before_count = Driver.count + + delete driver_path(-1) + + after_count = Driver.count - # Act-Assert - # Ensure that there is no change in Driver.count + expect(before_count).must_equal after_count - # Assert # Check that the controller responds or redirects with whatever your group decides end From 6165e59f6ae920e3de569ea4a51d4b2bf495dba0 Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Fri, 11 Oct 2019 14:08:08 -0700 Subject: [PATCH 53/69] Passengers_controller#create test. --- app/controllers/passengers_controller.rb | 6 ++ test/controllers/drivers_controller_test.rb | 6 -- .../controllers/passengers_controller_test.rb | 84 +++++++++++++------ test/models/passenger_test.rb | 31 +++---- 4 files changed, 82 insertions(+), 45 deletions(-) diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb index b674a6417..acbec72a4 100644 --- a/app/controllers/passengers_controller.rb +++ b/app/controllers/passengers_controller.rb @@ -6,6 +6,12 @@ def index def show passenger_id = params[:id] @passenger = Passenger.find_by(id: passenger_id) + + if @passenger.nil? + flash[:error] = "Could not find passenger ID #{ @passenger.id }" + render passengers_path + return + end end def new diff --git a/test/controllers/drivers_controller_test.rb b/test/controllers/drivers_controller_test.rb index db415b237..29e5dd234 100644 --- a/test/controllers/drivers_controller_test.rb +++ b/test/controllers/drivers_controller_test.rb @@ -9,9 +9,7 @@ it "responds with success when there are many drivers in the database" do driver - get drivers_path - must_respond_with :success end @@ -156,13 +154,9 @@ before_count = Driver.count delete driver_path(-1) - after_count = Driver.count expect(before_count).must_equal after_count - - # Check that the controller responds or redirects with whatever your group decides - end end end diff --git a/test/controllers/passengers_controller_test.rb b/test/controllers/passengers_controller_test.rb index 60acbdfb6..59d5b7b03 100644 --- a/test/controllers/passengers_controller_test.rb +++ b/test/controllers/passengers_controller_test.rb @@ -1,31 +1,65 @@ require "test_helper" describe PassengersController do + let (:passenger) { + Passenger.create name: "Dolly", phone_num: "360-931-1677" + } describe "index" do - # Your tests go here - end - - describe "show" do - # Your tests go here - end - - describe "new" do - # Your tests go here - 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 + it "can get the index path" do + get passengers_path + must_respond_with :success + end + + describe "show" do + it "can get a valid passenger" do + get passengers_path(passenger.id) + must_respond_with :success + end + + it "will redirect for an invalid passenger" do + get passengers_path(-1) + must_respond_with :success + end + end + + describe "new" do + it "can display the new passenger page" do + get new_passenger_path + must_respond_with :success + end + end + + describe "create" do + it "can create a new passenger" do + new_passenger_params = { + passenger: { + name: "Fido", + phone_num: "xxx-xxx-xxxx", + }, + } + + expect { + post passengers_path, params: new_passenger_params + }.must_change "Passenger.count", 1 + + new_passenger = Passenger.find_by(name: new_passenger_params[:passenger][:name]) + expect(new_passenger.phone_num).must_equal new_passenger_params[:passenger][:phone_num] + + must_respond_with :redirect + must_redirect_to passenger_path(new_passenger) + end + 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 end end diff --git a/test/models/passenger_test.rb b/test/models/passenger_test.rb index 6a5762167..4b685b367 100644 --- a/test/models/passenger_test.rb +++ b/test/models/passenger_test.rb @@ -2,30 +2,33 @@ describe Passenger do let (:new_passenger) { - Passenger.new(name: "Kari", phone_num: "111-111-1211") + Passenger.create(name: "Kari", phone_num: "111-111-1211") } - it "can be instantiated" do - # Assert - expect(new_passenger.valid?).must_equal true + + describe "passenger#index" do + it "should instantiate a passenger" do + # Assert + expect(new_passenger.valid?).must_equal true + end end - + it "will have the required fields" do # Arrange new_passenger.save passenger = Passenger.first [:name, :phone_num].each do |field| - + # Assert expect(passenger).must_respond_to field 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| @@ -33,35 +36,35 @@ 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 - + 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 - + # 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 From edf9a26a3272dca4a0e51cc3edd57f371427432e Mon Sep 17 00:00:00 2001 From: Rinostar Date: Fri, 11 Oct 2019 14:19:53 -0700 Subject: [PATCH 54/69] finished the add trip function --- app/controllers/drivers_controller.rb | 23 +++++++++++++++++++---- app/controllers/trips_controller.rb | 25 ++++++++++++++++++------- app/models/driver.rb | 20 -------------------- app/models/passenger.rb | 17 ----------------- app/models/trip.rb | 12 ++++++++++++ app/views/passengers/show.html.erb | 2 +- config/routes.rb | 3 ++- 7 files changed, 52 insertions(+), 50 deletions(-) diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index c06150f16..45fe617f6 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -63,7 +63,7 @@ def destroy return end - def set_status + def mark_online @driver = Driver.find_by(id: params[:id]) if @driver.nil? @@ -72,8 +72,23 @@ def set_status return end - @driver.change_status - redirect_to driver_path(driver) + @driver.active = false + redirect_to driver_path(@driver) + return + end + + + def mark_offline + @driver = Driver.find_by(id: params[:id]) + + if @driver.nil? + flash[:error] = "Could not find driver ID #{ @driver.id }" + redirect_to drivers_path + return + end + + @driver.active = true + redirect_to driver_path(@driver) return end @@ -83,4 +98,4 @@ def driver_params return params.require(:driver).permit(:name, :vin) end -end +end \ No newline at end of file diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 496d83dd6..754f5f8e1 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -18,15 +18,26 @@ def new end def create - @trip = Trip.new(trip_params) - if @trip.save - redirect_to trip_path(@trip) - return + if params[:passenger_id] + trip_parameter = Trip.new_trip + @trip = Trip.new( + passenger_id: params[:passenger_id], + driver_id: trip_parameter[:driver].id, + date: trip_parameter[:date], + cost: trip_parameter[:cost] + ) + + if @trip.save + redirect_to passenger_path(params[:passenger_id]) + return + else + render :new + return + end else - render :new - return + redirect_to trips_path end - end + end def edit @trip = Trip.find_by(id: params[:id]) diff --git a/app/models/driver.rb b/app/models/driver.rb index a256a62d2..10289502b 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -31,24 +31,4 @@ def average_rating end end - def self.available_driver - driver = Driver.find_by(active: false) - - if driver - driver.become_active - return driver - else - return nil - end - end - - def become_active - self.active = false - - if self.save - return self - else - return false - end - end end \ No newline at end of file diff --git a/app/models/passenger.rb b/app/models/passenger.rb index abfb23705..eebfb2ab6 100644 --- a/app/models/passenger.rb +++ b/app/models/passenger.rb @@ -13,21 +13,4 @@ def total_cost end return sum end - - def add_trip - if Driver.available_driver != nil - trip_hash = { - date: Date.today, - passenger_id: self.id, - driver_id: Driver.available_driver.id, - cost: rand(1..999), - rating: nil - } - new_trip = Trip.create(trip_hash) - Driver.available_driver.active = true - return new_trip - else - return "There is no available driver" - end - end end \ No newline at end of file diff --git a/app/models/trip.rb b/app/models/trip.rb index 3f761103a..16a8c2d0e 100644 --- a/app/models/trip.rb +++ b/app/models/trip.rb @@ -1,4 +1,16 @@ class Trip < ApplicationRecord belongs_to :passenger belongs_to :driver + + def self.new_trip + available_driver = Driver.all.find { |driver| driver.active == false } + trip_hash = { + driver: available_driver, + date: Date.today, + cost: rand(1..999).to_i, + } + available_driver.update(active: true) + + return trip_hash + end end diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index 55fe40172..c546f71d1 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -9,7 +9,7 @@

    Total_Cost: $<%= @passenger.total_cost %>

    - +

    <%= link_to "Add Trip", passenger_trips_path(@passenger.id), method: :post %>

    Trips: diff --git a/config/routes.rb b/config/routes.rb index 7d48c9e75..3dd1ec89a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,7 +5,8 @@ resources :homepages, only: [:index] resources :drivers - patch '/drivers/:id/status', to: 'drivers#set_status', as: 'set_status' + patch '/drivers/:id/status', to: 'drivers#mark_online', as: 'mark_online' + patch '/drivers/:id/status', to: 'drivers#mark_offline', as: 'mark_offline' resources :passengers do resources :trips, only: [:create] From 4739f762a649b994db22de36a14c6931e6a656c1 Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Fri, 11 Oct 2019 14:45:26 -0700 Subject: [PATCH 55/69] Commit before continuing --- .../controllers/passengers_controller_test.rb | 35 +++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/test/controllers/passengers_controller_test.rb b/test/controllers/passengers_controller_test.rb index 59d5b7b03..ce7e496e1 100644 --- a/test/controllers/passengers_controller_test.rb +++ b/test/controllers/passengers_controller_test.rb @@ -51,15 +51,46 @@ end describe "edit" do - # Your tests go here + it "can show the edit page for passenger" do + get edit_passenger_path(passenger) + must_respond_with :success + end + + it "redirects when given invalid passenger id" do + + get edit_passenger_path(-1) + must_respond_with :success + end end + + describe "update" do # Your tests go here end describe "destroy" do - # Your tests go here + it "destroys the passenger instance in db when passenger exists, then redirects" do + # Arrange + count = Passenger.count + new_passenger = Passenger.create name: "Spammy Spam", phone_num: "333-333-3333" + + expect(Passenger.count).must_equal (count + 1) + + expect{ + delete passenger_path(new_passenger.id) + }.must_change "Passenger.count", 1 + must_respond_with :redirect + must_redirect_to passengers_path + end + + it "does not change the db when the passenger does not exist " do + before_count = Passenger.count + delete passenger_path(-1) + after_count = Passenger.count + + expect(before_count).must_equal after_count + end end end end From fdfcbdd89e78ef7d9b4ed8afc9bebbfb748ef97e Mon Sep 17 00:00:00 2001 From: Rinostar Date: Fri, 11 Oct 2019 14:46:26 -0700 Subject: [PATCH 56/69] quick fix --- app/models/driver.rb | 2 +- app/views/drivers/show.html.erb | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/models/driver.rb b/app/models/driver.rb index 10289502b..24fc6da7d 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -30,5 +30,5 @@ def average_rating return (sum / count) 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 650cd4e0f..ba1e55626 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -16,8 +16,12 @@ <%= @driver.average_rating%>

    +

    Change_Status: + <%= @driver.average_rating%> +

    +
    - Trips: + Trips: <% @driver.trips.each do |trip| %>
  • ID: <%= link_to "#{trip.id}", trip_path(trip) %>
  • Date: <%= trip.date %>
    • From 21dd44283977f06a9ffa9afdc43d2fb69da4b27a Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Fri, 11 Oct 2019 14:58:07 -0700 Subject: [PATCH 57/69] passengers controller test complete --- test/controllers/passengers_controller_test.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/controllers/passengers_controller_test.rb b/test/controllers/passengers_controller_test.rb index ce7e496e1..05465127f 100644 --- a/test/controllers/passengers_controller_test.rb +++ b/test/controllers/passengers_controller_test.rb @@ -1,5 +1,6 @@ require "test_helper" + describe PassengersController do let (:passenger) { Passenger.create name: "Dolly", phone_num: "360-931-1677" @@ -59,7 +60,7 @@ it "redirects when given invalid passenger id" do get edit_passenger_path(-1) - must_respond_with :success + must_redirect_to passengers_path end end From d21cf3e1d707747e7bdf7344fb7cde85f552acc0 Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Fri, 11 Oct 2019 14:58:46 -0700 Subject: [PATCH 58/69] Modified error message in Passengers and Drivers controllers --- app/controllers/drivers_controller.rb | 8 ++++---- app/controllers/passengers_controller.rb | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index c06150f16..4fd766e73 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -6,7 +6,7 @@ def index def show driver_id = params[:id] @driver = Driver.find_by(id: driver_id) - + if @driver.nil? head :not_found return @@ -53,7 +53,7 @@ def destroy @driver = Driver.find_by(id: params[:id]) if @driver.nil? - flash[:error] = "Could not find driver ID #{ @driver.id }" + flash[:error] = "Could not find driver ID #{ params[:id] }" redirect_to drivers_path return end @@ -62,7 +62,7 @@ def destroy redirect_to driver_path(@driver) return end - + def set_status @driver = Driver.find_by(id: params[:id]) @@ -71,7 +71,7 @@ def set_status redirect_to drivers_path return end - + @driver.change_status redirect_to driver_path(driver) return diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb index acbec72a4..457e7021b 100644 --- a/app/controllers/passengers_controller.rb +++ b/app/controllers/passengers_controller.rb @@ -33,7 +33,7 @@ def edit @passenger = Passenger.find_by(id: params[:id]) if @passenger.nil? - flash[:error] = "Could not find passenger ID #{ @passenger.id }" + flash[:error] = "Could not find passenger ID #{ params[:id] }" redirect_to passengers_path return end @@ -55,7 +55,7 @@ def destroy @passenger = Passenger.find_by(id: params[:id]) if @passenger.nil? - flash[:error] = "Could not find passenger ID #{ @passenger.id }" + flash[:error] = "Could not find passenger ID #{ params[:id]}" redirect_to passengers_path return end From b89b4f7ac9db017aaaa074f6a76edcfaa82b2fc5 Mon Sep 17 00:00:00 2001 From: Rinostar Date: Fri, 11 Oct 2019 15:04:37 -0700 Subject: [PATCH 59/69] add change status option for Driver --- app/views/drivers/show.html.erb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index ba1e55626..668947cec 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -16,8 +16,16 @@ <%= @driver.average_rating%>

    -

    Change_Status: - <%= @driver.average_rating%> +

    Driver_Status (active in trip?): + <%= @driver.active%> +

    + +

    + <% if @driver.active == false %> + <%= link_to "mark_offline", mark_online_path(@driver), method: :patch %> + <% else %> + <%= link_to "mark_online", mark_offline_path(@driver), method: :patch %> + <% end %>

    From 846487f79cab66cae09a636c36624dcba41f9ca2 Mon Sep 17 00:00:00 2001 From: Rinostar Date: Fri, 11 Oct 2019 15:55:28 -0700 Subject: [PATCH 60/69] finished status change for Driver --- app/controllers/drivers_controller.rb | 8 ++++---- app/views/drivers/show.html.erb | 4 ++-- config/routes.rb | 7 +++++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 82dc02a16..fb6421968 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -6,7 +6,7 @@ def index def show driver_id = params[:id] @driver = Driver.find_by(id: driver_id) - + if @driver.nil? head :not_found return @@ -53,7 +53,7 @@ def destroy @driver = Driver.find_by(id: params[:id]) if @driver.nil? - flash[:error] = "Could not find driver ID #{ params[:id] }" + flash[:error] = "Could not find driver ID #{ @driver.id }" redirect_to drivers_path return end @@ -72,7 +72,7 @@ def mark_online return end - @driver.active = false + @driver.update(active: false) redirect_to driver_path(@driver) return end @@ -87,7 +87,7 @@ def mark_offline return end - @driver.active = true + @driver.update(active: true) redirect_to driver_path(@driver) return end diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index 668947cec..74f84c0ba 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -22,9 +22,9 @@

    <% if @driver.active == false %> - <%= link_to "mark_offline", mark_online_path(@driver), method: :patch %> + <%= link_to "mark_offline", mark_offline_path(@driver.id), method: :patch %> <% else %> - <%= link_to "mark_online", mark_offline_path(@driver), method: :patch %> + <%= link_to "mark_online", mark_online_path(@driver.id), method: :patch %> <% end %>

    diff --git a/config/routes.rb b/config/routes.rb index 3dd1ec89a..16f705b27 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,9 +4,12 @@ resources :homepages, only: [:index] + patch '/drivers/:id/status/online', to: 'drivers#mark_online', as: 'mark_online' + patch '/drivers/:id/status/offline', to: 'drivers#mark_offline', as: 'mark_offline' + resources :drivers - patch '/drivers/:id/status', to: 'drivers#mark_online', as: 'mark_online' - patch '/drivers/:id/status', to: 'drivers#mark_offline', as: 'mark_offline' + # patch '/drivers/:id/status', to: 'drivers#mark_online', as: 'mark_online' + # patch '/drivers/:id/status', to: 'drivers#mark_offline', as: 'mark_offline' resources :passengers do resources :trips, only: [:create] From 32a8a32984c402d73f41bac5ae410abb62f77ac1 Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Fri, 11 Oct 2019 16:02:14 -0700 Subject: [PATCH 61/69] Happy to add a drop down menu to add a rating to a trip. --- app/models/trip.rb | 11 ++++++----- app/views/trips/show.html.erb | 6 ++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/models/trip.rb b/app/models/trip.rb index 16a8c2d0e..d37a74663 100644 --- a/app/models/trip.rb +++ b/app/models/trip.rb @@ -1,16 +1,17 @@ class Trip < ApplicationRecord belongs_to :passenger belongs_to :driver - + def self.new_trip available_driver = Driver.all.find { |driver| driver.active == false } trip_hash = { driver: available_driver, date: Date.today, cost: rand(1..999).to_i, - } - available_driver.update(active: true) + } + available_driver.update(active: true) + + return trip_hash +end - return trip_hash - end end diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb index 6aba85877..563030485 100644 --- a/app/views/trips/show.html.erb +++ b/app/views/trips/show.html.erb @@ -6,6 +6,12 @@
  • Cost: <%= @trip.cost %>
  • Passenger: <%= link_to "#{@trip.passenger.name}", passenger_path(@trip.passenger) %> - ID: <%= @trip.passenger.id %>
  • Driver: <%= link_to "#{@trip.driver.name}", driver_path(@trip.driver) %>- ID: <%= @trip.driver.id %>
    • + +<%= form_for @trip do |form| %> + <%= form.select :rating, [[1], [2], [3], [4], [5]] %> + <%= form.submit "Update Rating"%> +<% end %> + <%= link_to "Back to drivers list", trips_path %> \ No newline at end of file From 97d60458f44ccfa615e83f2ede4c96011ce77cfd Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Fri, 11 Oct 2019 16:08:19 -0700 Subject: [PATCH 62/69] Working on tests --- app/controllers/drivers_controller.rb | 16 ++++++++-------- test/controllers/drivers_controller_test.rb | 4 +--- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index fb6421968..ac43a018b 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -6,7 +6,7 @@ def index def show driver_id = params[:id] @driver = Driver.find_by(id: driver_id) - + if @driver.nil? head :not_found return @@ -53,16 +53,16 @@ def destroy @driver = Driver.find_by(id: params[:id]) if @driver.nil? - flash[:error] = "Could not find driver ID #{ @driver.id }" + flash[:error] = "Could not find driver ID #{ params[:id] }" redirect_to drivers_path return end @driver.destroy - redirect_to driver_path(@driver) + redirect_to drivers_path return end - + def mark_online @driver = Driver.find_by(id: params[:id]) @@ -71,13 +71,13 @@ def mark_online redirect_to drivers_path return end - + @driver.update(active: false) redirect_to driver_path(@driver) return end - - + + def mark_offline @driver = Driver.find_by(id: params[:id]) @@ -86,7 +86,7 @@ def mark_offline redirect_to drivers_path return end - + @driver.update(active: true) redirect_to driver_path(@driver) return diff --git a/test/controllers/drivers_controller_test.rb b/test/controllers/drivers_controller_test.rb index 29e5dd234..41e689872 100644 --- a/test/controllers/drivers_controller_test.rb +++ b/test/controllers/drivers_controller_test.rb @@ -146,16 +146,14 @@ delete driver_path(new_driver.id) }.must_change "Driver.count", 1 must_respond_with :redirect - must_redirect_to driver_path(new_driver) + must_redirect_to drivers_path end it "does not change the db when the driver does not exist " do before_count = Driver.count - delete driver_path(-1) after_count = Driver.count - expect(before_count).must_equal after_count end end From 1acf3241dfde96377bd4b1d26f1285c75991797a Mon Sep 17 00:00:00 2001 From: Natalie Tapias Date: Fri, 11 Oct 2019 17:10:33 -0700 Subject: [PATCH 63/69] Saving some tests --- app/controllers/trips_controller.rb | 8 +- app/models/trip.rb | 16 ++-- app/views/trips/show.html.erb | 2 +- test/controllers/drivers_controller_test.rb | 21 +---- test/controllers/trips_controller_test.rb | 95 +++++++++++++++++---- 5 files changed, 97 insertions(+), 45 deletions(-) diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 754f5f8e1..f4ab13e8d 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -6,6 +6,12 @@ def index def show trip_id = params[:id] @trip = Trip.find_by(id: trip_id) + + if @trip.nil? + flash[:error] = "Could not find trip ID #{ params[:id] }" + redirect_to trips_path + return + end end def new @@ -26,7 +32,7 @@ def create date: trip_parameter[:date], cost: trip_parameter[:cost] ) - + if @trip.save redirect_to passenger_path(params[:passenger_id]) return diff --git a/app/models/trip.rb b/app/models/trip.rb index d37a74663..70d60355f 100644 --- a/app/models/trip.rb +++ b/app/models/trip.rb @@ -5,13 +5,13 @@ class Trip < ApplicationRecord def self.new_trip available_driver = Driver.all.find { |driver| driver.active == false } trip_hash = { - driver: available_driver, - date: Date.today, - cost: rand(1..999).to_i, - } - available_driver.update(active: true) + driver: available_driver, + date: Date.today, + cost: rand(1..999).to_i, + } + available_driver.update(active: true) + + return trip_hash + end - return trip_hash -end - end diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb index 563030485..ff6e19d43 100644 --- a/app/views/trips/show.html.erb +++ b/app/views/trips/show.html.erb @@ -14,4 +14,4 @@ -<%= link_to "Back to drivers list", trips_path %> \ No newline at end of file +<%= link_to "Back to trips list", trips_path %> \ No newline at end of file diff --git a/test/controllers/drivers_controller_test.rb b/test/controllers/drivers_controller_test.rb index 41e689872..8493e8141 100644 --- a/test/controllers/drivers_controller_test.rb +++ b/test/controllers/drivers_controller_test.rb @@ -82,7 +82,6 @@ it "responds with redirect when getting the edit page for a non-existing driver" do get edit_driver_path(-1) - must_respond_with :redirect end end @@ -112,23 +111,9 @@ end it "does not update any driver if given an invalid id, and responds with a 404" do - # update drivers controller wtih something like this - # if driver.nil? - # flash[:error] = "Could not driver task with drier_id: #{driver.id}" - # redirect_to drivers_path - # return - - # updated_driver_form_data = { - # driver: { - # name: "Spammy Spam", - # vin: "007700" - # } - # } - - # patch driver_path(-1), params: updated_driver_form_data - - # must_respond_with :redirect - # must_redirect_to drivers_path + + patch driver_path(-1) + must_respond_with :redirect end end diff --git a/test/controllers/trips_controller_test.rb b/test/controllers/trips_controller_test.rb index 59455c041..bcedce1eb 100644 --- a/test/controllers/trips_controller_test.rb +++ b/test/controllers/trips_controller_test.rb @@ -1,23 +1,84 @@ require "test_helper" describe TripsController do - describe "show" do - # Your tests go here - end - - describe "create" do - # Your tests go here - end - - describe "edit" do - # Your tests go here + let (:driver) { + Driver.create(name: "George", vin: "123456789") + } + + let (:passenger) { + Passenger.create(name: "Dolly", phone_num: "360-931-1677") + } + + let (:trip) { + Trip.create(passenger_id: passenger.id) + } + + describe "new" do end - - describe "update" do - # Your tests go here - end - - describe "destroy" do - # Your tests go here + + describe "show" do + it "should show a valid trip" do + get trip_path(trip) + must_respond_with :success + end + + it "will redirect for an invalid trip id" do + get trip_path(-1) + must_respond_with :redirect + end end + + # describe "create" do + # # let (:driver) { + # # Driver.create name: "George", vin: "123456789" + # # } + + # # let (:passenger) { + # # Passenger.create name: "Dolly", phone_num: "360-931-1677" + # # } + + # # it "can create a new trip with valid information accurately, and redirect" do + # # the_driver = Driver.find_by(vin: "123456789") + # # the_passenger = Passenger.find_by(phone_num: "360-931-1677") + # # trip_params = { + # # trip: { + # # passenger_id: the_passenger.id, driver_id: the_driver.id, date: Date.today, cost: 222, rating: nil + # # } + # # } + # # expect { + # # create trip_path, params: trip_params + # # }.must_differ "Trip.count", 1 + # end + # end + + # describe "edit" do + # let (:driver) { + # Driver.create(name: "George", vin: "123456789") + # } + + # let (:passenger) { + # Passenger.create(name: "Dolly", phone_num: "360-931-1677") + # } + + # let (:trip) { + # Trip.create(passenger_id: passenger.id) + # } + + # it "responds with success when updating a trip" do + # patch trip_path(trip) + # must_respond_with :success + # end + + # it "successfully updates a trip" do + + # end + # end + + # describe "update" do + # # Your tests go here + # end + + # describe "destroy" do + # # Your tests go here end + From 974f318537462ec51cb0d8d6837c87c614469e4b Mon Sep 17 00:00:00 2001 From: Rinostar Date: Fri, 11 Oct 2019 17:11:14 -0700 Subject: [PATCH 64/69] styling (1/3) --- app/views/drivers/_form.html.erb | 2 -- app/views/drivers/index.html.erb | 4 ++-- app/views/drivers/new.html.erb | 2 +- app/views/drivers/show.html.erb | 12 ++---------- app/views/homepages/index.html.erb | 7 ++----- app/views/layouts/application.html.erb | 10 ++++++++++ app/views/passengers/new.html.erb | 2 -- 7 files changed, 17 insertions(+), 22 deletions(-) diff --git a/app/views/drivers/_form.html.erb b/app/views/drivers/_form.html.erb index b0e75b3b2..a939ddde2 100644 --- a/app/views/drivers/_form.html.erb +++ b/app/views/drivers/_form.html.erb @@ -9,8 +9,6 @@ <% end %> -

    <%= verb %> a new driver

    -
    <%= form_for @driver do |f| %> Name: <%= f.text_field :name %>
    diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb index a0ea207ef..538495180 100644 --- a/app/views/drivers/index.html.erb +++ b/app/views/drivers/index.html.erb @@ -1,11 +1,11 @@ -

    Drivers List

    +

    Rideshare Drivers

      <% @drivers.each do |driver| %>
    • <%= driver.id %>. <%= link_to "#{driver.name}", driver_path(driver) %> | - <%= driver.vin %> | + Average Rating: <%= driver.average_rating %> | <%= link_to "Edit", edit_driver_path(driver) %> <%= link_to "Delete", driver_path(driver), method: :delete, data: { confirm: "Are you sure you want to delete #{driver.name}?"} %>
      • diff --git a/app/views/drivers/new.html.erb b/app/views/drivers/new.html.erb index 39c23335c..96437630b 100644 --- a/app/views/drivers/new.html.erb +++ b/app/views/drivers/new.html.erb @@ -1 +1 @@ -<%= render partial: "form", locals: { action_name: "New Driver", verb: "Create" } %> +<%= render partial: "form", locals: { action_name: "Create Driver", verb: "Create" } %> diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index 74f84c0ba..ba75918d9 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -4,18 +4,10 @@
    • ID: <%= @driver.id %>
    • Name: <%= @driver.name %>
    • vin: <%= @driver.vin %>
      • - <%= link_to "Edit", edit_driver_path(@driver) %> - <%= link_to "Delete", driver_path(@driver), method: :delete, data: { confirm: "Are you sure you want to delete #{@driver.name}?"} %> +
    • Total_Earning: $<%= @driver.total_earning %>
      • +
    • Average_Rating: <%= @driver.average_rating %>
    -

    Total_Earning: - $<%= @driver.total_earning %> -

    - -

    Average_Rating: - <%= @driver.average_rating%> -

    -

    Driver_Status (active in trip?): <%= @driver.active%>

    diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb index 82d6eb358..43fac5cf2 100644 --- a/app/views/homepages/index.html.erb +++ b/app/views/homepages/index.html.erb @@ -1,5 +1,2 @@ -

    Community RideShare

    - -

    <%= link_to "All Drivers", drivers_path %>

    -

    <%= link_to "All Passengers", passengers_path %>

    -

    <%= link_to "All Trips", trips_path %>

    \ No newline at end of file +

    <%= link_to "Manage Drivers", drivers_path %>

    +

    <%= link_to "Manager Passengers", passengers_path %>

    \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 692ca547e..b52f5fa82 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,6 +10,16 @@ +
    + Affordable Community RideShare | + <%= link_to "Add New Driver", new_driver_path(@driver) %> | + <%= link_to "Add New Passenger", new_passenger_path(@driver) %> +
    + <%= yield %> + +
    +

    All Rights Reserved: Natalie & Yitgop @2019

    +
    diff --git a/app/views/passengers/new.html.erb b/app/views/passengers/new.html.erb index 9dcf246e6..6d736d1ca 100644 --- a/app/views/passengers/new.html.erb +++ b/app/views/passengers/new.html.erb @@ -1,4 +1,2 @@ - - <%= render partial: "form", locals: { action_name: "New Passenger", verb: "Create" } %> From db96982d95f0ef334878d298ea77516c038bc644 Mon Sep 17 00:00:00 2001 From: Rinostar Date: Sat, 12 Oct 2019 23:07:48 -0700 Subject: [PATCH 65/69] styling layout --- app/assets/stylesheets/application.css | 57 ++++++++++++++++++++++++++ app/assets/stylesheets/trips.scss | 18 ++++++++ app/views/layouts/application.html.erb | 25 +++++++---- app/views/trips/show.html.erb | 36 +++++++++++----- 4 files changed, 118 insertions(+), 18 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index d05ea0f51..574ce292a 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -13,3 +13,60 @@ *= require_tree . *= require_self */ + +ul { + list-style: none; +} + +a { + text-decoration: none; + color: inherit; +} + +a:hover { + background-color: #68a6da; +} + +body { + display: flex; + min-height: 100vh; + flex-direction: column; + padding: 5px; + font-family: 'Roboto', sans-serif; +} + +header { + height: 75px; + background-color: #b2b2bd; +} + +header section { + padding: 7px; +} + +header section li { + display: inline; +} + +#title { + float: left; + font-weight: bold; + font-size: 20px; + margin-left: -15px; +} + +#function { + float: right; + margin-right: 30px; + margin-top: 2.5px; +} + +main { + flex: 1; + margin: 20px; +} + +footer { + text-align: center; + font-size: 0.9em; +} \ No newline at end of file diff --git a/app/assets/stylesheets/trips.scss b/app/assets/stylesheets/trips.scss index f1f72ad11..707bd3908 100644 --- a/app/assets/stylesheets/trips.scss +++ b/app/assets/stylesheets/trips.scss @@ -1,3 +1,21 @@ // 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/ + +#trips { + text-align: left; + padding: 10px; + border-collapse: collapse; + width: 80%; +} + +th { + border: 1px solid black; + background-color: #2196f3; + color: white; + height: 30px; +} + +td { + border: 1px solid black; +} \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index b52f5fa82..a26b78448 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,19 +7,28 @@ <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + -
    - Affordable Community RideShare | - <%= link_to "Add New Driver", new_driver_path(@driver) %> | - <%= link_to "Add New Passenger", new_passenger_path(@driver) %> -
    +
    +
    +
      +
    • Affordable Community RideShare
      • +
        +
      • <%= link_to "Add New Driver", new_driver_path(@driver) %> |
        • +
      • <%= link_to "Add New Passenger", new_passenger_path(@driver) %>
        • +
      +
    +
    +
    +
    <%= yield %> +
    -
    +

    All Rights Reserved: Natalie & Yitgop @2019

    -
    + - + \ No newline at end of file diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb index ff6e19d43..597ce32d4 100644 --- a/app/views/trips/show.html.erb +++ b/app/views/trips/show.html.erb @@ -1,17 +1,33 @@ -

    Trip Information

    +

    Trip Details

    -
      -
    • Date: <%= @trip.date %>
      • -
    • Rating: <%= @trip.rating %>
      • -
    • Cost: <%= @trip.cost %>
      • -
    • Passenger: <%= link_to "#{@trip.passenger.name}", passenger_path(@trip.passenger) %> - ID: <%= @trip.passenger.id %>
      • -
    • Driver: <%= link_to "#{@trip.driver.name}", driver_path(@trip.driver) %>- ID: <%= @trip.driver.id %>
      • + + + + + + + + + + + + + + + + + + + +
      ID Date Driver Passenger Rating Cost
      <%= @trip.id %> <%= @trip.date %> <%= @trip.driver.name %> <%= @trip.passenger.name %> <%= @trip.rating %> $<%= @trip.cost %>
      + +
      <%= form_for @trip do |form| %> <%= form.select :rating, [[1], [2], [3], [4], [5]] %> <%= form.submit "Update Rating"%> <% end %> - -
    -<%= link_to "Back to trips list", trips_path %> \ No newline at end of file +
    + +<%= link_to "Back to Homepage", root_path %> \ No newline at end of file From afde0ba17a94e24dbceee9deeca61340d05f34af Mon Sep 17 00:00:00 2001 From: Rinostar Date: Sun, 13 Oct 2019 00:57:29 -0700 Subject: [PATCH 66/69] drivers styling --- app/assets/stylesheets/application.css | 22 ++++++++++-- app/assets/stylesheets/drivers.scss | 21 +++++++++++ app/assets/stylesheets/passengers.scss | 21 +++++++++++ app/views/drivers/_form.html.erb | 8 +++-- app/views/drivers/index.html.erb | 32 +++++++++++------ app/views/drivers/new.html.erb | 7 ++++ app/views/drivers/show.html.erb | 48 ++++++++++++++++---------- app/views/homepages/index.html.erb | 4 +-- app/views/layouts/application.html.erb | 2 +- app/views/passengers/_form.html.erb | 2 +- app/views/passengers/show.html.erb | 33 ++++++++++++------ app/views/trips/_form.html.erb | 2 +- 12 files changed, 153 insertions(+), 49 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 574ce292a..5ff5dbd7c 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -51,14 +51,15 @@ header section li { #title { float: left; font-weight: bold; - font-size: 20px; + font-size: 23px; margin-left: -15px; } #function { float: right; - margin-right: 30px; - margin-top: 2.5px; + font-size: 15px; + margin-right: 25px; + margin-top: 4.5px; } main { @@ -69,4 +70,19 @@ main { footer { text-align: center; font-size: 0.9em; +} + +.submission_form { + border-radius: 5px; + background-color: #f2f2f2; + padding: 20px; +} + +input[type=text] { + width: 95%; + padding: 14px 20px; + margin: 8px 0; + border: none; + border-radius: 4px; + cursor: pointer; } \ No newline at end of file diff --git a/app/assets/stylesheets/drivers.scss b/app/assets/stylesheets/drivers.scss index 8c1768a14..80d4d184b 100644 --- a/app/assets/stylesheets/drivers.scss +++ b/app/assets/stylesheets/drivers.scss @@ -1,3 +1,24 @@ // 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/ +input[type=submit]:hover { + background-color: #68a6da; +} + +#driver_trips { + text-align: left; + padding: 10px; + border-collapse: collapse; + width: 80%; +} + +th { + border: 1px solid black; + background-color: #2196f3; + color: white; + height: 30px; +} + +td { + border: 1px solid black; +} \ No newline at end of file diff --git a/app/assets/stylesheets/passengers.scss b/app/assets/stylesheets/passengers.scss index 0e27942f7..52dcf4e7e 100644 --- a/app/assets/stylesheets/passengers.scss +++ b/app/assets/stylesheets/passengers.scss @@ -1,3 +1,24 @@ // 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/ + + + + +#passenger_trips { + text-align: left; + padding: 10px; + border-collapse: collapse; + width: 80%; +} + +th { + border: 1px solid black; + background-color: #2196f3; + color: white; + height: 30px; +} + +td { + border: 1px solid black; +} \ No newline at end of file diff --git a/app/views/drivers/_form.html.erb b/app/views/drivers/_form.html.erb index a939ddde2..c719aec1a 100644 --- a/app/views/drivers/_form.html.erb +++ b/app/views/drivers/_form.html.erb @@ -9,10 +9,12 @@ <% end %> -
    +
    <%= form_for @driver do |f| %> - Name: <%= f.text_field :name %>
    - VIN: <%= f.text_field :vin %>
    + Name:
    + <%= f.text_field :name %>
    + VIN:
    + <%= f.text_field :vin %>
    <%= f.submit action_name %> <% end %> diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb index 538495180..727ec7639 100644 --- a/app/views/drivers/index.html.erb +++ b/app/views/drivers/index.html.erb @@ -1,14 +1,26 @@ -

    Rideshare Drivers

    +

    All Drivers

    + + + + + + + + + + -
      <% @drivers.each do |driver| %> -
    • - <%= driver.id %>. - <%= link_to "#{driver.name}", driver_path(driver) %> | - Average Rating: <%= driver.average_rating %> | - <%= link_to "Edit", edit_driver_path(driver) %> - <%= link_to "Delete", driver_path(driver), method: :delete, data: { confirm: "Are you sure you want to delete #{driver.name}?"} %> -
      • +
    + + + + + + + <% end %> +
    ID Name Average_Rating Total_Earning Edit Delete
    <%= link_to "#{driver.id}", driver_path(driver) %> <%= driver.name %> <%= driver.average_rating %> <%= driver.total_earning %> <%= link_to "Edit", edit_driver_path(driver) %> <%= link_to "Delete", driver_path(driver), method: :delete, data: { confirm: "Are you sure you want to delete #{driver.name}?"} %>
    - \ No newline at end of file +
    +<%= link_to "Back to Homepage", root_path %> \ No newline at end of file diff --git a/app/views/drivers/new.html.erb b/app/views/drivers/new.html.erb index 96437630b..c4204ce65 100644 --- a/app/views/drivers/new.html.erb +++ b/app/views/drivers/new.html.erb @@ -1 +1,8 @@ +

    Add a New Driver

    <%= render partial: "form", locals: { action_name: "Create Driver", verb: "Create" } %> + +
    +
    +<%= link_to "Back to Drivers List", drivers_path %> +
    +<%= link_to "Back to Homepage", root_path %> \ No newline at end of file diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index ba75918d9..b1802bf21 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -1,34 +1,46 @@ -

    Driver Information

    +

    Driver Information

    • ID: <%= @driver.id %>
    • Name: <%= @driver.name %>
      • -
    • vin: <%= @driver.vin %>
      • +
    • VIN: <%= @driver.vin %>
    • Total_Earning: $<%= @driver.total_earning %>
    • Average_Rating: <%= @driver.average_rating %>
      • +
    • Active_in_Trip: <%= @driver.active%>
    -

    Driver_Status (active in trip?): - <%= @driver.active%> -

    -

    <% if @driver.active == false %> - <%= link_to "mark_offline", mark_offline_path(@driver.id), method: :patch %> + <%= link_to "Change Status to Offline", mark_offline_path(@driver.id), method: :patch %> <% else %> - <%= link_to "mark_online", mark_online_path(@driver.id), method: :patch %> + <%= link_to "Change Status to Online", mark_online_path(@driver.id), method: :patch %> <% end %>

    -
    - Trips: +
    + + + + + + + + + + <% @driver.trips.each do |trip| %> -
  • ID: <%= link_to "#{trip.id}", trip_path(trip) %>
    • -
  • Date: <%= trip.date %>
    • -
  • Passenger: <%= trip.passenger.name %> - ID: <%= trip.passenger.id %>
    • -
  • Cost: <%= trip.cost %>
    • -
  • Rating: <%= trip.rating %>
    • - <% end %> - + + + + + + + + <% end %> +
    ID Date Passenger Rating Cost
    <%= link_to "#{trip.id}", trip_path(trip) %> <%= trip.date %> <%= trip.passenger.name %> <%= trip.rating %> $<%= trip.cost %>
    -<%= link_to "Back to drivers list", drivers_path %> \ No newline at end of file +
    +
    +<%= link_to "Back to Drivers List", drivers_path %> +
    +<%= link_to "Back to Homepage", root_path %> \ No newline at end of file diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb index 43fac5cf2..ffb815756 100644 --- a/app/views/homepages/index.html.erb +++ b/app/views/homepages/index.html.erb @@ -1,2 +1,2 @@ -

    <%= link_to "Manage Drivers", drivers_path %>

    -

    <%= link_to "Manager Passengers", passengers_path %>

    \ No newline at end of file +

    <%= link_to "Manage Drivers", drivers_path %>

    +

    <%= link_to "Manager Passengers", passengers_path %>

    \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index a26b78448..58ecded73 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -28,7 +28,7 @@
    -

    All Rights Reserved: Natalie & Yitgop @2019

    +

    All Rights Reserved: NT & YY @2019

    \ No newline at end of file diff --git a/app/views/passengers/_form.html.erb b/app/views/passengers/_form.html.erb index 9969f4516..53be2eedd 100644 --- a/app/views/passengers/_form.html.erb +++ b/app/views/passengers/_form.html.erb @@ -11,7 +11,7 @@ <% end %> -
    +
    <%= form_for @passenger do |f| %> Name: <%= f.text_field :name %>
    Phone_num: <%= f.text_field :phone_num %>
    diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index c546f71d1..a074e7ea3 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -11,15 +11,28 @@

    Total_Cost: $<%= @passenger.total_cost %>

    <%= link_to "Add Trip", passenger_trips_path(@passenger.id), method: :post %>

    -
    - Trips: + + + + + + + + + <% @passenger.trips.each do |trip| %> -
  • ID: <%= link_to "#{trip.id}", trip_path(trip) %>
    • -
  • Date: <%= trip.date %>
    • -
  • Driver: <%= trip.driver.name %> - ID: <%= trip.driver.id %>
    • -
  • Cost: <%= trip.cost %>
    • -
  • Rating: <%= trip.rating %>
    • - <% end %> - + + + + + + + + <% end %> +
    ID Date Driver Rating Cost
    <%= link_to "#{trip.id}", trip_path(trip) %> <%= trip.date %> <%= trip.driver.name %> <%= trip.rating %> $<%= trip.cost %>
    -<%= link_to "Back to drivers list", drivers_path %> \ No newline at end of file +
    +
    +<%= link_to "Back to Passengers List", passengers_path %> +
    +<%= link_to "Back to Homepage", root_path %> \ No newline at end of file diff --git a/app/views/trips/_form.html.erb b/app/views/trips/_form.html.erb index 53f2247ec..1ff7bc333 100644 --- a/app/views/trips/_form.html.erb +++ b/app/views/trips/_form.html.erb @@ -1,6 +1,6 @@

    <%= verb %> a new trip

    -
    +
    <%= form_for @trip do |f| %> Date: <%= f.text_field :date %>
    Rating: <%= f.text_field :rating %>
    From ae76c87b0adb951054bd3da7b1406c6176c0e4af Mon Sep 17 00:00:00 2001 From: Rinostar Date: Sun, 13 Oct 2019 00:58:21 -0700 Subject: [PATCH 67/69] fix driver 'total_earning' rounding issues --- app/models/driver.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/driver.rb b/app/models/driver.rb index 24fc6da7d..fe1e5cab1 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -11,7 +11,7 @@ def total_earning sum += (trip.cost - 1.65) * 0.8 end end - return sum + return sum.to_i end def average_rating From 8e9207acef4338649e96e3ed866a36f95f4dd903 Mon Sep 17 00:00:00 2001 From: Rinostar Date: Sun, 13 Oct 2019 01:46:15 -0700 Subject: [PATCH 68/69] passenger & trip styling --- app/assets/stylesheets/application.css | 23 ++++++++++++++++ app/assets/stylesheets/drivers.scss | 23 +--------------- app/assets/stylesheets/passengers.scss | 21 --------------- app/views/drivers/edit.html.erb | 8 ++++++ app/views/drivers/index.html.erb | 4 +-- app/views/drivers/show.html.erb | 6 +++-- app/views/passengers/_form.html.erb | 2 -- app/views/passengers/edit.html.erb | 7 +++++ app/views/passengers/index.html.erb | 33 +++++++++++++++-------- app/views/passengers/new.html.erb | 7 +++++ app/views/passengers/show.html.erb | 8 +++--- app/views/trips/edit.html.erb | 9 +++++++ app/views/trips/index.html.erb | 36 ++++++++++++++++---------- app/views/trips/new.html.erb | 10 ++++++- app/views/trips/show.html.erb | 13 +++++++--- 15 files changed, 128 insertions(+), 82 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 5ff5dbd7c..e42a0928b 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -85,4 +85,27 @@ input[type=text] { border: none; border-radius: 4px; cursor: pointer; +} + +input[type=submit]:hover { + background-color: #68a6da; +} + +.lists { + text-align: left; + padding: 10px; + border-collapse: collapse; + width: 80%; +} + +.lists th { + border: 1px solid black; + background-color: #2196f3; + color: white; + height: 30px; +} + +.lists td { + border: 1px solid black; + padding: 5px; } \ No newline at end of file diff --git a/app/assets/stylesheets/drivers.scss b/app/assets/stylesheets/drivers.scss index 80d4d184b..1bf0c25f0 100644 --- a/app/assets/stylesheets/drivers.scss +++ b/app/assets/stylesheets/drivers.scss @@ -1,24 +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/ -input[type=submit]:hover { - background-color: #68a6da; -} - -#driver_trips { - text-align: left; - padding: 10px; - border-collapse: collapse; - width: 80%; -} - -th { - border: 1px solid black; - background-color: #2196f3; - color: white; - height: 30px; -} - -td { - border: 1px solid black; -} \ No newline at end of file +// You can use Sass (SCSS) here: http://sass-lang.com \ No newline at end of file diff --git a/app/assets/stylesheets/passengers.scss b/app/assets/stylesheets/passengers.scss index 52dcf4e7e..0e27942f7 100644 --- a/app/assets/stylesheets/passengers.scss +++ b/app/assets/stylesheets/passengers.scss @@ -1,24 +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/ - - - - -#passenger_trips { - text-align: left; - padding: 10px; - border-collapse: collapse; - width: 80%; -} - -th { - border: 1px solid black; - background-color: #2196f3; - color: white; - height: 30px; -} - -td { - border: 1px solid black; -} \ No newline at end of file diff --git a/app/views/drivers/edit.html.erb b/app/views/drivers/edit.html.erb index 3ce35f5e1..226197c49 100644 --- a/app/views/drivers/edit.html.erb +++ b/app/views/drivers/edit.html.erb @@ -1 +1,9 @@ +

    Edit the Driver

    + <%= render partial: "form", locals: { action_name: "Edit Driver", verb: "update" } %> + +
    +
    +<%= link_to "Back to the Driver's Page", driver_path(@driver) %> +
    +<%= link_to "Back to Homepage", root_path %> diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb index 727ec7639..12b1b157b 100644 --- a/app/views/drivers/index.html.erb +++ b/app/views/drivers/index.html.erb @@ -1,6 +1,6 @@

    All Drivers

    - +
    @@ -15,7 +15,7 @@ - + diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index b1802bf21..b5f66bb59 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -6,7 +6,9 @@
  • VIN: <%= @driver.vin %>
  • Total_Earning: $<%= @driver.total_earning %>
  • Average_Rating: <%= @driver.average_rating %>
    • -
  • Active_in_Trip: <%= @driver.active%>
    • +
  • Active_in_Trip: <%= @driver.active %>
    • + <%= link_to "Edit", edit_driver_path(@driver) %> | + <%= link_to "Delete", driver_path(@driver), method: :delete, data: { confirm: "Are you sure you want to delete #{@driver.name}?"} %>

    @@ -19,7 +21,7 @@
    -

    ID Name <%= link_to "#{driver.id}", driver_path(driver) %> <%= driver.name %> <%= driver.average_rating %> <%= driver.total_earning %> $<%= driver.total_earning %> <%= link_to "Edit", edit_driver_path(driver) %> <%= link_to "Delete", driver_path(driver), method: :delete, data: { confirm: "Are you sure you want to delete #{driver.name}?"} %>
    +
    diff --git a/app/views/passengers/_form.html.erb b/app/views/passengers/_form.html.erb index 53be2eedd..572fcac28 100644 --- a/app/views/passengers/_form.html.erb +++ b/app/views/passengers/_form.html.erb @@ -1,5 +1,3 @@ -

    <%= verb %> a new passenger

    - <% if @passenger.errors.any? %>

    Errors

      diff --git a/app/views/passengers/edit.html.erb b/app/views/passengers/edit.html.erb index 5178a47c8..018e2b263 100644 --- a/app/views/passengers/edit.html.erb +++ b/app/views/passengers/edit.html.erb @@ -1,2 +1,9 @@ +

      Edit the Passenger

      + <%= render partial: "form", locals: { action_name: "Edit Passenger", verb: "update" } %> +
      +
      +<%= link_to "Back to the Passenger's Page", passenger_path(@passenger) %> +
      +<%= link_to "Back to Homepage", root_path %> diff --git a/app/views/passengers/index.html.erb b/app/views/passengers/index.html.erb index 1be8bc3b0..1bcd8d968 100644 --- a/app/views/passengers/index.html.erb +++ b/app/views/passengers/index.html.erb @@ -1,13 +1,24 @@ -

      Passenger Index

      -

      <%= link_to "New Passenger", new_passenger_path %>

      -
        +

        All Passengers

        + +
    ID Date
    + + + + + + + + <% @passengers.each do |passenger| %> -
  • - <%= passenger.id %>. - <%= link_to passenger.name, passenger_path(passenger) %> | - <%= passenger.phone_num %> - <%= link_to "Edit", edit_passenger_path(passenger) %> - <%= link_to "Delete", passenger_path(passenger), method: :delete, data: { confirm: "Are you sure you want to delete #{passenger.name}?"} %> -
    • + + + + + + + <% end %> - \ No newline at end of file +
    ID Name Phone_Number Edit Delete
    <%= link_to "#{passenger.id}", passenger_path(passenger) %> <%= passenger.name %> <%= passenger.phone_num %> <%= link_to "Edit", edit_passenger_path(passenger) %> <%= link_to "Delete", passenger_path(passenger), method: :delete, data: { confirm: "Are you sure you want to delete #{passenger.name}?"} %>
    + +
    +<%= link_to "Back to Homepage", root_path %> \ No newline at end of file diff --git a/app/views/passengers/new.html.erb b/app/views/passengers/new.html.erb index 6d736d1ca..5ed54379c 100644 --- a/app/views/passengers/new.html.erb +++ b/app/views/passengers/new.html.erb @@ -1,2 +1,9 @@ +

    Add a New Passenger

    + <%= render partial: "form", locals: { action_name: "New Passenger", verb: "Create" } %> +
    +
    +<%= link_to "Back to Passengers List", passengers_path %> +
    +<%= link_to "Back to Homepage", root_path %> \ No newline at end of file diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index a074e7ea3..0cea6b8be 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -1,17 +1,17 @@ -

    Passenger Information

    +

    Passenger Information

    • ID: <%= @passenger.id %>
    • Name: <%= @passenger.name %>
      • +
    • Total_Cost: $<%= @passenger.total_cost %>
    • Phone Number: <%= @passenger.phone_num %>
      • <%= link_to "Edit", edit_passenger_path(@passenger) %> | <%= link_to "Delete", passenger_path(@passenger), method: :delete, data: { confirm: "Are you sure you want to delete #{@passenger.name}?"} %>
    -

    Total_Cost: $<%= @passenger.total_cost %>

    -

    <%= link_to "Add Trip", passenger_trips_path(@passenger.id), method: :post %>

    +

    <%= link_to "Request a New Trip", passenger_trips_path(@passenger.id), method: :post %>

    - +
    diff --git a/app/views/trips/edit.html.erb b/app/views/trips/edit.html.erb index 3129d7a4a..76f3211be 100644 --- a/app/views/trips/edit.html.erb +++ b/app/views/trips/edit.html.erb @@ -1 +1,10 @@ +

    Edit the Trip

    + <%= render partial: "form", locals: { action_name: "Edit Trip", verb: "update" } %> + +
    +
    +<%= link_to "Back to the Trip's Page", trip_path(@trip) %> +
    +<%= link_to "Back to Homepage", root_path %> + diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb index d34bbae26..1db313b59 100644 --- a/app/views/trips/index.html.erb +++ b/app/views/trips/index.html.erb @@ -1,16 +1,24 @@ -

    Trip Index

    +

    All Trips

    + +
    ID Date
    + + + + + + + -
      <% @trips.each do |trip| %> -
    • - ID: <%= link_to "#{trip.id}", trip_path(trip) %> | - Date: <%= trip.date %> | - Rating: <%= trip.rating %> | - Cost: <%= trip.cost %> | - Passenger: <%= trip.passenger_id %> | - Driver: <%= trip.driver_id %> | - <%= link_to "Edit", edit_trip_path(trip) %> - <%= link_to "Delete", trip_path(trip), method: :delete, data: { confirm: "Are you sure you want to delete Trip #{trip.id}?"} %> -
      • - <% end %> -
    \ No newline at end of file + + + + + + + + <% end %> +
    ID Date Driver Rating Cost
    <%= link_to "#{trip.id}", trip_path(trip) %> <%= trip.date %> <%= trip.driver.name %> <%= trip.rating %> $<%= trip.cost %>
    + +
    +<%= link_to "Back to Homepage", root_path %> \ No newline at end of file diff --git a/app/views/trips/new.html.erb b/app/views/trips/new.html.erb index e84d7dbe9..6b6abafd6 100644 --- a/app/views/trips/new.html.erb +++ b/app/views/trips/new.html.erb @@ -1 +1,9 @@ -<%= render partial: "form", locals: { action_name: "New Trip", verb: "Create" } %> \ No newline at end of file +

    Add a New Trip

    + +<%= render partial: "form", locals: { action_name: "New Trip", verb: "Create" } %> + +
    +
    +<%= link_to "Back to Trips List", trips_path %> +
    +<%= link_to "Back to Homepage", root_path %> \ No newline at end of file diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb index 597ce32d4..6d4840f38 100644 --- a/app/views/trips/show.html.erb +++ b/app/views/trips/show.html.erb @@ -1,6 +1,12 @@

    Trip Details

    - + +<%= link_to "Edit", edit_trip_path(@trip) %> | +<%= link_to "Delete", trip_path(@trip), method: :delete, data: { confirm: "Are you sure you want to delete Trip # #{@trip.id}?"} %> + + + +
    @@ -22,12 +28,13 @@
    ID Date

    - <%= form_for @trip do |form| %> <%= form.select :rating, [[1], [2], [3], [4], [5]] %> <%= form.submit "Update Rating"%> <% end %>
    - +
    +<%= link_to "Back to the Passenger's Page", passenger_path(@trip.passenger.id) %> +
    <%= link_to "Back to Homepage", root_path %> \ No newline at end of file From a262c73296b6a7bc75d5f9912fd59adf1b6d4561 Mon Sep 17 00:00:00 2001 From: Rinostar Date: Sun, 13 Oct 2019 11:03:42 -0700 Subject: [PATCH 69/69] added passenger and driver link in trip details --- app/views/trips/show.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb index 6d4840f38..c42e7e0a1 100644 --- a/app/views/trips/show.html.erb +++ b/app/views/trips/show.html.erb @@ -19,8 +19,8 @@ <%= @trip.id %> <%= @trip.date %> - <%= @trip.driver.name %> - <%= @trip.passenger.name %> + <%= link_to "#{@trip.driver.name}", driver_path(@trip.driver.id) %> + <%= link_to "#{@trip.passenger.name}", passenger_path(@trip.passenger.id) %> <%= @trip.rating %> $<%= @trip.cost %>